1 |
commit: 341961c0211b1794aab55bdb06e71add506baac6 |
2 |
Author: José María Alonso Josa <nimiux <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 27 16:42:54 2016 +0000 |
4 |
Commit: José María Alonso <nimiux <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 27 16:43:47 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=341961c0 |
7 |
|
8 |
x11-wm/stumpwm: Add contrib modules |
9 |
|
10 |
x11-wm/stumpwm/metadata.xml | 48 +++++++++++++++++++++++++++++-------- |
11 |
x11-wm/stumpwm/stumpwm-0.9.9.ebuild | 22 +++++++++++++---- |
12 |
x11-wm/stumpwm/stumpwm-9999.ebuild | 4 ++-- |
13 |
3 files changed, 58 insertions(+), 16 deletions(-) |
14 |
|
15 |
diff --git a/x11-wm/stumpwm/metadata.xml b/x11-wm/stumpwm/metadata.xml |
16 |
index 55ce781..578e246 100644 |
17 |
--- a/x11-wm/stumpwm/metadata.xml |
18 |
+++ b/x11-wm/stumpwm/metadata.xml |
19 |
@@ -5,22 +5,50 @@ |
20 |
<email>nimiux@g.o</email> |
21 |
<name>Chema Alonso</name> |
22 |
</maintainer> |
23 |
- <longdescription> |
24 |
- Stumpwm is a tiling, keyboard driven X11 Window Manager written entirely in Common Lisp. |
25 |
+ <longdescription lang="en"> |
26 |
+ Stumpwm is a tiling, keyboard driven X11 Window Manager written entirely in |
27 |
+ Common Lisp. |
28 |
|
29 |
- If you're tired of flipping through themes like channel-surfing, and going from one perfect-except-for-just-one-thing |
30 |
- window manager to another even-more-broken-in-some-other-way then perhaps Stumpwm can help. |
31 |
+ If you're tired of flipping through themes like channel-surfing, and going |
32 |
+ from one perfect-except-for-just-one-thing window manager to another |
33 |
+ even-more-broken-in-some-other-way then perhaps Stumpwm can help. |
34 |
|
35 |
- Stumpwm attempts to be customizable yet visually minimal. There are no window decorations, no icons, and no buttons. |
36 |
- It does have various hooks to attach your personal customizations, and variables to tweak. |
37 |
+ Stumpwm attempts to be customizable yet visually minimal. There are no |
38 |
+ window decorations, no icons, and no buttons. |
39 |
+ It does have various hooks to attach your personal customizations, and |
40 |
+ variables to tweak. |
41 |
|
42 |
- * Hack the good hack |
43 |
- * debug your good hack |
44 |
- * customize your window manager |
45 |
+ * Hack the good hack |
46 |
+ * debug your good hack |
47 |
+ * customize your window manager |
48 |
|
49 |
- while it's running. That's right. With a 100% Common Lisp window manager there's no stopping the hacks. Just re-eval and GO! |
50 |
+ while it's running. That's right. With a 100% Common Lisp window manager |
51 |
+ there's no stopping the hacks. Just re-eval and GO! |
52 |
+ </longdescription> |
53 |
+ <longdescription lang="es"> |
54 |
+ Stumpwm es un gestor de ventanas estilo mosaico gestionado por teclado |
55 |
+ escrito completamente en Common Lisp. |
56 |
+ |
57 |
+ Si está cansado de cambiar de temas como navegación por canales y vagar |
58 |
+ de un gestor de ventanas perfecto excepto por esa pequeña característica |
59 |
+ a otro incluso más roto de alguna otra forma, entonces quizá Stumpwm |
60 |
+ pueda ser de ayuda. |
61 |
+ |
62 |
+ Stumpwm persigue ser personalizable a la vez que mínimo. No hay |
63 |
+ decoración en las ventanas, ni iconos ni botones. |
64 |
+ Dispone de varios enganches para realizar nuestras propias configuraciones |
65 |
+ personales y variables que podemos ajustar a nuestras necesidades para: |
66 |
+ |
67 |
+ * Cacharrear de forma correcta |
68 |
+ * Depurar nuestro propio cacharreo |
69 |
+ * Personalizar nuestro gestor de ventanas |
70 |
+ |
71 |
+ mientras está corriendo. Eso está bien. Con un gestor de ventanas escrito |
72 |
+ al 100% en Common Lisp no hay forma de detener el cacharreo. ¡Simplemente |
73 |
+ reevalúe y CONTINÚE! |
74 |
</longdescription> |
75 |
<use> |
76 |
+ <flag name="contrib">Install contrib modules</flag> |
77 |
<flag name="doc">Include documentation</flag> |
78 |
<flag name="emacs">Add support for GNU Emacs</flag> |
79 |
<flag name="clisp">Use CLISP for the runtime</flag> |
80 |
|
81 |
diff --git a/x11-wm/stumpwm/stumpwm-0.9.9.ebuild b/x11-wm/stumpwm/stumpwm-0.9.9.ebuild |
82 |
index e275cdc..d7ebbcf 100644 |
83 |
--- a/x11-wm/stumpwm/stumpwm-0.9.9.ebuild |
84 |
+++ b/x11-wm/stumpwm/stumpwm-0.9.9.ebuild |
85 |
@@ -1,4 +1,4 @@ |
86 |
-# Copyright 1999-2015 Gentoo Foundation |
87 |
+# Copyright 1999-2016 Gentoo Foundation |
88 |
# Distributed under the terms of the GNU General Public License v2 |
89 |
# $Id$ |
90 |
|
91 |
@@ -6,14 +6,14 @@ EAPI=5 |
92 |
|
93 |
inherit common-lisp-3 eutils elisp-common autotools |
94 |
|
95 |
-DESCRIPTION="Stumpwm is a tiling, keyboard driven X11 Window Manager written entirely in Common Lisp." |
96 |
+DESCRIPTION="Stumpwm is a Window Manager written entirely in Common Lisp." |
97 |
HOMEPAGE="http://www.nongnu.org/stumpwm/" |
98 |
SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
99 |
|
100 |
LICENSE="GPL-2" |
101 |
SLOT="0" |
102 |
KEYWORDS="~amd64 ~x86" |
103 |
-IUSE="doc emacs clisp ecl +sbcl" |
104 |
+IUSE="contrib doc emacs clisp ecl +sbcl" |
105 |
|
106 |
RESTRICT="strip mirror" |
107 |
|
108 |
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND} |
109 |
doc? ( virtual/texi2dvi )" |
110 |
|
111 |
SITEFILE=70${PN}-gentoo.el |
112 |
+CONTRIBDIR="${CLSOURCEROOT}/${CLPACKAGE}/contrib" |
113 |
|
114 |
get_lisp() { |
115 |
local lisp |
116 |
@@ -48,20 +49,32 @@ do_doc() { |
117 |
docinto examples ; dodoc sample-stumpwmrc.lisp |
118 |
} |
119 |
|
120 |
+do_contrib() { |
121 |
+ emake install-modules |
122 |
+ rm -r "${D}${CONTRIBDIR}"/.git* || die |
123 |
+} |
124 |
+ |
125 |
src_prepare() { |
126 |
# Upstream didn't change the version before packaging |
127 |
sed -i "${S}/${PN}.asd" -e 's/:version "0.9.8"/:version "0.9.9"/' || die |
128 |
# Bug 534592. Does not build with asdf:oos, using require to load the package |
129 |
sed -i "${S}/load-${PN}.lisp.in" -e "s/asdf:oos 'asdf:load-op/require/" || die |
130 |
+ if use contrib ; then |
131 |
+ # Fix contrib directory |
132 |
+ sed -i -e "s|@CONTRIB_DIR@|@MODULE_DIR@|" make-image.lisp.in || die |
133 |
+ sed -i -e "s|\~\/.${CLPACKAGE}\.d/modules|${D}${CONTRIBDIR}|" Makefile.in || die |
134 |
+ sed -i -e "s|\${HOME}/\.${CLPACKAGE}\.d/modules|${CONTRIBDIR}|" configure.ac || die |
135 |
+ fi |
136 |
eautoreconf |
137 |
} |
138 |
|
139 |
src_configure() { |
140 |
- econf --with-lisp=$(get_lisp sbcl clisp ecl) |
141 |
+ econf --with-lisp=$(get_lisp sbcl clisp ecl) --with-module-dir="${CLSOURCEROOT}/${CLPACKAGE}/contrib" |
142 |
} |
143 |
|
144 |
src_compile() { |
145 |
emake -j1 |
146 |
+ echo "HOLa" |
147 |
} |
148 |
|
149 |
src_install() { |
150 |
@@ -72,6 +85,7 @@ src_install() { |
151 |
common-lisp-install-sources *.lisp |
152 |
common-lisp-install-asdf ${PN}.asd |
153 |
use doc && do_doc |
154 |
+ use contrib && do_contrib |
155 |
} |
156 |
|
157 |
pkg_postinst() { |
158 |
|
159 |
diff --git a/x11-wm/stumpwm/stumpwm-9999.ebuild b/x11-wm/stumpwm/stumpwm-9999.ebuild |
160 |
index cf73b6f..5d604d9 100644 |
161 |
--- a/x11-wm/stumpwm/stumpwm-9999.ebuild |
162 |
+++ b/x11-wm/stumpwm/stumpwm-9999.ebuild |
163 |
@@ -1,4 +1,4 @@ |
164 |
-# Copyright 1999-2014 Gentoo Foundation |
165 |
+# Copyright 1999-2016 Gentoo Foundation |
166 |
# Distributed under the terms of the GNU General Public License v2 |
167 |
# $Id$ |
168 |
|
169 |
@@ -6,7 +6,7 @@ EAPI=5 |
170 |
|
171 |
inherit autotools common-lisp-3 git-2 |
172 |
|
173 |
-DESCRIPTION="Stumpwm is a tiling, keyboard driven X11 Window Manager written entirely in Common Lisp." |
174 |
+DESCRIPTION="Stumpwm is a Window Manager written entirely in Common Lisp." |
175 |
HOMEPAGE="http://www.nongnu.org/stumpwm/index.html" |
176 |
EGIT_REPO_URI="git://github.com/stumpwm/stumpwm" |