Gentoo Archives: gentoo-commits

From: "Jim Ramsay (lack)" <lack@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-wm/fluxbox: ChangeLog fluxbox-9999.ebuild fluxbox-1.3.2.ebuild
Date: Tue, 29 Nov 2011 14:45:45
Message-Id: 20111129140831.CF7672004B@flycatcher.gentoo.org
1 lack 11/11/29 14:08:31
2
3 Modified: ChangeLog fluxbox-9999.ebuild
4 Added: fluxbox-1.3.2.ebuild
5 Log:
6 Version bump: 1.3.2 is released, now with true ARGB (Xrender transparency)
7 support.
8
9 Also fixes bug #388569: Removing 'gnome' USE flag as there is no
10 corresponding option in the application any more.
11
12 (Portage version: 2.1.10.31/cvs/Linux x86_64)
13
14 Revision Changes Path
15 1.297 x11-wm/fluxbox/ChangeLog
16
17 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/ChangeLog?rev=1.297&view=markup
18 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/ChangeLog?rev=1.297&content-type=text/plain
19 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/ChangeLog?r1=1.296&r2=1.297
20
21 Index: ChangeLog
22 ===================================================================
23 RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v
24 retrieving revision 1.296
25 retrieving revision 1.297
26 diff -u -r1.296 -r1.297
27 --- ChangeLog 20 Aug 2011 16:03:39 -0000 1.296
28 +++ ChangeLog 29 Nov 2011 14:08:31 -0000 1.297
29 @@ -1,6 +1,17 @@
30 # ChangeLog for x11-wm/fluxbox
31 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
32 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.296 2011/08/20 16:03:39 jer Exp $
33 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.297 2011/11/29 14:08:31 lack Exp $
34 +
35 +*fluxbox-1.3.2 (29 Nov 2011)
36 +
37 + 29 Nov 2011; Jim Ramsay <jim_ramsay@g.o> +fluxbox-1.3.2.ebuild,
38 + fluxbox-9999.ebuild:
39 + Version bump: 1.3.2 is released, now with true ARGB (Xrender transparency)
40 + support.
41 +
42 + Also fixes bug #388569: Removing 'gnome' USE flag as there is no
43 + corresponding
44 + option in the application any more.
45
46 20 Aug 2011; Jeroen Roovers <jer@g.o> fluxbox-1.3.1.ebuild:
47 Stable for HPPA (bug #375013).
48
49
50
51 1.10 x11-wm/fluxbox/fluxbox-9999.ebuild
52
53 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild?rev=1.10&view=markup
54 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild?rev=1.10&content-type=text/plain
55 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild?r1=1.9&r2=1.10
56
57 Index: fluxbox-9999.ebuild
58 ===================================================================
59 RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild,v
60 retrieving revision 1.9
61 retrieving revision 1.10
62 diff -u -r1.9 -r1.10
63 --- fluxbox-9999.ebuild 14 Jul 2011 03:05:22 -0000 1.9
64 +++ fluxbox-9999.ebuild 29 Nov 2011 14:08:31 -0000 1.10
65 @@ -1,11 +1,11 @@
66 # Copyright 1999-2011 Gentoo Foundation
67 # Distributed under the terms of the GNU General Public License v2
68 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild,v 1.9 2011/07/14 03:05:22 lack Exp $
69 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild,v 1.10 2011/11/29 14:08:31 lack Exp $
70
71 -EAPI=3
72 +EAPI=4
73 inherit eutils git-2 prefix
74
75 -IUSE="nls xinerama bidi +truetype gnome +imlib +slit +toolbar vim-syntax"
76 +IUSE="nls xinerama bidi +truetype +imlib +slit +toolbar vim-syntax"
77
78 DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
79
80 @@ -13,16 +13,13 @@
81 SRC_URI=""
82 HOMEPAGE="http://www.fluxbox.org"
83
84 -# Please note that USE="gnome" simply adds support for the respective
85 -# protocol, and does not depend on external libraries. It does, however,
86 -# make the binary a fair bit bigger, so we don't want to turn it on unless
87 -# the user actually wants them.
88 -
89 RDEPEND="x11-libs/libXpm
90 x11-libs/libXrandr
91 - xinerama? ( x11-libs/libXinerama )
92 - x11-apps/xmessage
93 + x11-libs/libXext
94 x11-libs/libXft
95 + x11-libs/libXrender
96 + || ( x11-misc/gkmessage x11-apps/xmessage )
97 + xinerama? ( x11-libs/libXinerama )
98 truetype? ( media-libs/freetype )
99 bidi? ( dev-libs/fribidi )
100 imlib? ( >=media-libs/imlib2-1.2.0[X] )
101 @@ -32,7 +29,6 @@
102 !!<=x11-misc/fbdesk-1.2.1"
103 DEPEND="nls? ( sys-devel/gettext )
104 x11-proto/xextproto
105 - xinerama? ( x11-proto/xineramaproto )
106 ${RDEPEND}"
107
108 SLOT="0"
109 @@ -61,10 +57,10 @@
110
111 src_configure() {
112 econf \
113 + --disable-dependency-tracking \
114 $(use_enable nls) \
115 $(use_enable xinerama) \
116 $(use_enable truetype xft) \
117 - $(use_enable gnome) \
118 $(use_enable imlib imlib2) \
119 $(use_enable slit ) \
120 $(use_enable toolbar ) \
121
122
123
124 1.1 x11-wm/fluxbox/fluxbox-1.3.2.ebuild
125
126 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.2.ebuild?rev=1.1&view=markup
127 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.2.ebuild?rev=1.1&content-type=text/plain
128
129 Index: fluxbox-1.3.2.ebuild
130 ===================================================================
131 # Copyright 1999-2011 Gentoo Foundation
132 # Distributed under the terms of the GNU General Public License v2
133 # $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.2.ebuild,v 1.1 2011/11/29 14:08:31 lack Exp $
134
135 EAPI=4
136 inherit eutils prefix
137
138 IUSE="nls xinerama bidi +truetype +imlib +slit +toolbar vim-syntax"
139
140 DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
141
142 SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.bz2"
143 HOMEPAGE="http://www.fluxbox.org"
144
145 RDEPEND="x11-libs/libXpm
146 x11-libs/libXrandr
147 x11-libs/libXext
148 x11-libs/libXft
149 x11-libs/libXrender
150 || ( x11-misc/gkmessage x11-apps/xmessage )
151 xinerama? ( x11-libs/libXinerama )
152 truetype? ( media-libs/freetype )
153 bidi? ( dev-libs/fribidi )
154 imlib? ( >=media-libs/imlib2-1.2.0[X] )
155 vim-syntax? ( app-vim/fluxbox-syntax )
156 !!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
157 !!<=x11-misc/fluxconf-0.9.9
158 !!<=x11-misc/fbdesk-1.2.1"
159 DEPEND="nls? ( sys-devel/gettext )
160 x11-proto/xextproto
161 ${RDEPEND}"
162
163 SLOT="0"
164 LICENSE="MIT"
165 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
166
167 src_prepare() {
168 # We need to be able to include directories rather than just plain
169 # files in menu [include] items. This patch will allow us to do clever
170 # things with style ebuilds.
171 epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch"
172 eprefixify util/fluxbox-generate_menu.in
173
174 epatch "${FILESDIR}"/osx-has-otool.patch
175
176 # Add in the Gentoo -r number to fluxbox -version output.
177 if [[ "${PR}" == "r0" ]] ; then
178 suffix="gentoo"
179 else
180 suffix="gentoo-${PR}"
181 fi
182 sed -i \
183 -e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
184 version.h.in || die "version sed failed"
185 }
186
187 src_configure() {
188 econf \
189 $(use_enable nls) \
190 $(use_enable xinerama) \
191 $(use_enable truetype xft) \
192 $(use_enable imlib imlib2) \
193 $(use_enable bidi fribidi ) \
194 $(use_enable slit ) \
195 $(use_enable toolbar ) \
196 --sysconfdir="${EPREFIX}"/etc/X11/${PN} \
197 --with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge \
198 ${myconf}
199 }
200
201 src_compile() {
202 default
203
204 ebegin "Creating a menu file (may take a while)"
205 mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
206 MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
207 CHECKINIT="no. go away." HOME="${T}/home" \
208 "${S}/util/fluxbox-generate_menu" -is -ds \
209 || die "menu generation failed"
210 eend $?
211 }
212
213 src_install() {
214 dodir /usr/share/fluxbox
215 emake DESTDIR="${D}" STRIP="" install
216 dodoc README* AUTHORS TODO* ChangeLog NEWS
217
218 dodir /usr/share/xsessions
219 insinto /usr/share/xsessions
220 doins "${FILESDIR}/${PN}.desktop"
221
222 exeinto /etc/X11/Sessions
223 newexe "${FILESDIR}/${PN}.xsession" fluxbox
224
225 dodir /usr/share/fluxbox/menu.d
226
227 # Styles menu framework
228 dodir /usr/share/fluxbox/menu.d/styles
229 insinto /usr/share/fluxbox/menu.d/styles
230 doins "${FILESDIR}/styles-menu-fluxbox"
231 doins "${FILESDIR}/styles-menu-commonbox"
232 doins "${FILESDIR}/styles-menu-user"
233 }