1 |
lack 07/12/26 19:27:03 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: fluxbox-1.0.0-r1.ebuild |
5 |
Log: |
6 |
Removed negative USE flags, added 'vim-syntax' USE, and fixed bugs #199437, #199439, and #201535. |
7 |
(Portage version: 2.1.4_rc4) |
8 |
|
9 |
Revision Changes Path |
10 |
1.244 x11-wm/fluxbox/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/ChangeLog?rev=1.244&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/ChangeLog?rev=1.244&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/ChangeLog?r1=1.243&r2=1.244 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v |
19 |
retrieving revision 1.243 |
20 |
retrieving revision 1.244 |
21 |
diff -u -r1.243 -r1.244 |
22 |
--- ChangeLog 25 Dec 2007 16:13:37 -0000 1.243 |
23 |
+++ ChangeLog 26 Dec 2007 19:27:02 -0000 1.244 |
24 |
@@ -1,6 +1,16 @@ |
25 |
# ChangeLog for x11-wm/fluxbox |
26 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.243 2007/12/25 16:13:37 phreak Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.244 2007/12/26 19:27:02 lack Exp $ |
29 |
+ |
30 |
+*fluxbox-1.0.0-r1 (26 Dec 2007) |
31 |
+ |
32 |
+ 26 Dec 2007; Jim Ramsay <lack@g.o> |
33 |
+ +files/1.0.0/generate-menu.patch, +files/fluxbox.xsession, |
34 |
+ +fluxbox-1.0.0-r1.ebuild: |
35 |
+ Changed 'disableslit' and 'disabletoolbar' to 'slit' and 'toolbar' using new |
36 |
+ EAPI=1 USE-defaults. Added 'vim-syntax' plugin to pull in |
37 |
+ app-vim/fluxbox-syntax. Fixed menu generation for bugs #199437 and #199439. |
38 |
+ Adding proper xsession script, as per #201535 |
39 |
|
40 |
25 Dec 2007; Christian Heim <phreak@g.o> metadata.xml: |
41 |
Removing tercel from metadata.xml as per #88960. |
42 |
|
43 |
|
44 |
|
45 |
1.1 x11-wm/fluxbox/fluxbox-1.0.0-r1.ebuild |
46 |
|
47 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0-r1.ebuild?rev=1.1&view=markup |
48 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0-r1.ebuild?rev=1.1&content-type=text/plain |
49 |
|
50 |
Index: fluxbox-1.0.0-r1.ebuild |
51 |
=================================================================== |
52 |
# Copyright 1999-2007 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0-r1.ebuild,v 1.1 2007/12/26 19:27:02 lack Exp $ |
55 |
|
56 |
EAPI=1 |
57 |
inherit eutils |
58 |
|
59 |
IUSE="nls xinerama truetype kde gnome imlib +slit +toolbar vim-syntax" |
60 |
|
61 |
DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar" |
62 |
|
63 |
SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.bz2" |
64 |
HOMEPAGE="http://www.fluxbox.org" |
65 |
|
66 |
# Please note that USE="kde gnome" simply adds support for the respective |
67 |
# protocols, and does not depend on external libraries. They do, however, |
68 |
# make the binary a fair bit bigger, so we don't want to turn them on unless |
69 |
# the user actually wants them. |
70 |
|
71 |
RDEPEND="x11-libs/libXpm |
72 |
x11-libs/libXrandr |
73 |
xinerama? ( x11-libs/libXinerama ) |
74 |
x11-apps/xmessage |
75 |
virtual/xft |
76 |
truetype? ( media-libs/freetype ) |
77 |
imlib? ( >=media-libs/imlib2-1.2.0 ) |
78 |
vim-syntax? ( app-vim/fluxbox-syntax ) |
79 |
!<x11-themes/fluxbox-styles-fluxmod-20040809-r1 |
80 |
!<=x11-misc/fluxconf-0.9.9 |
81 |
!<=x11-misc/fbdesk-1.2.1" |
82 |
DEPEND="nls? ( sys-devel/gettext ) |
83 |
x11-proto/xextproto |
84 |
xinerama? ( x11-proto/xineramaproto ) |
85 |
${RDEPEND}" |
86 |
PROVIDE="virtual/blackbox" |
87 |
|
88 |
SLOT="0" |
89 |
LICENSE="MIT" |
90 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
91 |
|
92 |
pkg_setup() { |
93 |
if use imlib && ! built_with_use media-libs/imlib2 X ; then |
94 |
eerror "To build fluxbox with imlib in USE, you need an X enabled" |
95 |
eerror "media-libs/imlib2 . Either recompile imlib2 with the X" |
96 |
eerror "USE flag turned on or disable the imlib USE flag for fluxbox." |
97 |
die "USE=imlib requires imlib2 with USE=X" |
98 |
fi |
99 |
} |
100 |
|
101 |
src_unpack() { |
102 |
unpack ${A} |
103 |
cd "${S}" |
104 |
|
105 |
# We need to be able to include directories rather than just plain |
106 |
# files in menu [include] items. This patch will allow us to do clever |
107 |
# things with style ebuilds. |
108 |
epatch "${FILESDIR}/${PV}/gentoo_style_location.patch" |
109 |
|
110 |
# A couple menu generation fixes, #199437 and #199439 |
111 |
epatch "${FILESDIR}/${PV}/generate-menu.patch" |
112 |
|
113 |
# Add in the Gentoo -r number to fluxbox -version output. |
114 |
if [[ "${PR}" == "r0" ]] ; then |
115 |
suffix="gentoo" |
116 |
else |
117 |
suffix="gentoo-${PR}" |
118 |
fi |
119 |
sed -i \ |
120 |
-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \ |
121 |
version.h.in || die "version sed failed" |
122 |
} |
123 |
|
124 |
src_compile() { |
125 |
econf \ |
126 |
$(use_enable nls) \ |
127 |
$(use_enable xinerama) \ |
128 |
$(use_enable truetype xft) \ |
129 |
$(use_enable kde) \ |
130 |
$(use_enable gnome) \ |
131 |
$(use_enable imlib imlib2) \ |
132 |
$(use_enable slit ) \ |
133 |
$(use_enable toolbar ) \ |
134 |
--sysconfdir=/etc/X11/${PN} \ |
135 |
--with-style=/usr/share/fluxbox/styles/Emerge \ |
136 |
${myconf} || die "configure failed" |
137 |
|
138 |
emake || die "make failed" |
139 |
|
140 |
ebegin "Creating a menu file (may take a while)" |
141 |
mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed" |
142 |
MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \ |
143 |
CHECKINIT="no. go away." HOME="${T}/home" \ |
144 |
"${S}/util/fluxbox-generate_menu" -is -ds \ |
145 |
|| die "menu generation failed" |
146 |
eend $? |
147 |
} |
148 |
|
149 |
src_install() { |
150 |
dodir /usr/share/fluxbox |
151 |
emake DESTDIR="${D}" install || die "install failed" |
152 |
dodoc README* AUTHORS TODO* ChangeLog NEWS |
153 |
|
154 |
dodir /usr/share/xsessions |
155 |
insinto /usr/share/xsessions |
156 |
doins "${FILESDIR}/${PN}.desktop" |
157 |
|
158 |
exeinto /etc/X11/Sessions |
159 |
newexe "${FILESDIR}/${PN}.xsession" fluxbox |
160 |
|
161 |
dodir /usr/share/fluxbox/menu.d |
162 |
|
163 |
# Styles menu framework |
164 |
dodir /usr/share/fluxbox/menu.d/styles |
165 |
insinto /usr/share/fluxbox/menu.d/styles |
166 |
doins "${FILESDIR}/styles-menu-fluxbox" || die |
167 |
doins "${FILESDIR}/styles-menu-commonbox" || die |
168 |
doins "${FILESDIR}/styles-menu-user" || die |
169 |
} |
170 |
|
171 |
|
172 |
|
173 |
-- |
174 |
gentoo-commits@g.o mailing list |