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