| 1 |
lack 11/02/28 00:32:30 |
| 2 |
|
| 3 |
Modified: fluxbox-1.1.1-r3.ebuild fluxbox-1.3.0.ebuild |
| 4 |
ChangeLog fluxbox-1.1.1-r1.ebuild |
| 5 |
fluxbox-1.1.1-r2.ebuild |
| 6 |
Added: fluxbox-1.3.1.ebuild |
| 7 |
Log: |
| 8 |
Fluxbox-1.3.1 is released. Plus cleanup of a prefix patch for osx (Bug #355177) |
| 9 |
|
| 10 |
(Portage version: 2.1.9.34/cvs/Linux i686) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.7 x11-wm/fluxbox/fluxbox-1.1.1-r3.ebuild |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r3.ebuild?rev=1.7&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r3.ebuild?rev=1.7&content-type=text/plain |
| 17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r3.ebuild?r1=1.6&r2=1.7 |
| 18 |
|
| 19 |
Index: fluxbox-1.1.1-r3.ebuild |
| 20 |
=================================================================== |
| 21 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r3.ebuild,v |
| 22 |
retrieving revision 1.6 |
| 23 |
retrieving revision 1.7 |
| 24 |
diff -u -r1.6 -r1.7 |
| 25 |
--- fluxbox-1.1.1-r3.ebuild 20 Feb 2011 23:50:34 -0000 1.6 |
| 26 |
+++ fluxbox-1.1.1-r3.ebuild 28 Feb 2011 00:32:30 -0000 1.7 |
| 27 |
@@ -1,6 +1,6 @@ |
| 28 |
# Copyright 1999-2011 Gentoo Foundation |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r3.ebuild,v 1.6 2011/02/20 23:50:34 josejx Exp $ |
| 31 |
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r3.ebuild,v 1.7 2011/02/28 00:32:30 lack Exp $ |
| 32 |
|
| 33 |
EAPI="3" |
| 34 |
inherit eutils prefix |
| 35 |
@@ -45,7 +45,7 @@ |
| 36 |
epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch" |
| 37 |
eprefixify util/fluxbox-generate_menu.in |
| 38 |
|
| 39 |
- epatch "${FILESDIR}"/${P}-osx-has-otool.patch |
| 40 |
+ epatch "${FILESDIR}"/osx-has-otool.patch |
| 41 |
|
| 42 |
# Patch to handle a broken key file gracefully, #263379 |
| 43 |
epatch "${FILESDIR}/macrocmd-crash-1.1.1.patch" |
| 44 |
|
| 45 |
|
| 46 |
|
| 47 |
1.3 x11-wm/fluxbox/fluxbox-1.3.0.ebuild |
| 48 |
|
| 49 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.0.ebuild?rev=1.3&view=markup |
| 50 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.0.ebuild?rev=1.3&content-type=text/plain |
| 51 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.0.ebuild?r1=1.2&r2=1.3 |
| 52 |
|
| 53 |
Index: fluxbox-1.3.0.ebuild |
| 54 |
=================================================================== |
| 55 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.0.ebuild,v |
| 56 |
retrieving revision 1.2 |
| 57 |
retrieving revision 1.3 |
| 58 |
diff -u -r1.2 -r1.3 |
| 59 |
--- fluxbox-1.3.0.ebuild 22 Feb 2011 13:31:16 -0000 1.2 |
| 60 |
+++ fluxbox-1.3.0.ebuild 28 Feb 2011 00:32:30 -0000 1.3 |
| 61 |
@@ -1,6 +1,6 @@ |
| 62 |
# Copyright 1999-2011 Gentoo Foundation |
| 63 |
# Distributed under the terms of the GNU General Public License v2 |
| 64 |
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.0.ebuild,v 1.2 2011/02/22 13:31:16 scarabeus Exp $ |
| 65 |
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.0.ebuild,v 1.3 2011/02/28 00:32:30 lack Exp $ |
| 66 |
|
| 67 |
EAPI=4 |
| 68 |
inherit eutils prefix |
| 69 |
@@ -46,7 +46,7 @@ |
| 70 |
epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch" |
| 71 |
eprefixify util/fluxbox-generate_menu.in |
| 72 |
|
| 73 |
- epatch "${FILESDIR}"/${P}-osx-has-otool.patch |
| 74 |
+ epatch "${FILESDIR}"/osx-has-otool.patch |
| 75 |
|
| 76 |
# Add in the Gentoo -r number to fluxbox -version output. |
| 77 |
if [[ "${PR}" == "r0" ]] ; then |
| 78 |
|
| 79 |
|
| 80 |
|
| 81 |
1.286 x11-wm/fluxbox/ChangeLog |
| 82 |
|
| 83 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/ChangeLog?rev=1.286&view=markup |
| 84 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/ChangeLog?rev=1.286&content-type=text/plain |
| 85 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/ChangeLog?r1=1.285&r2=1.286 |
| 86 |
|
| 87 |
Index: ChangeLog |
| 88 |
=================================================================== |
| 89 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v |
| 90 |
retrieving revision 1.285 |
| 91 |
retrieving revision 1.286 |
| 92 |
diff -u -r1.285 -r1.286 |
| 93 |
--- ChangeLog 22 Feb 2011 13:31:16 -0000 1.285 |
| 94 |
+++ ChangeLog 28 Feb 2011 00:32:30 -0000 1.286 |
| 95 |
@@ -1,6 +1,16 @@ |
| 96 |
# ChangeLog for x11-wm/fluxbox |
| 97 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 98 |
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.285 2011/02/22 13:31:16 scarabeus Exp $ |
| 99 |
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.286 2011/02/28 00:32:30 lack Exp $ |
| 100 |
+ |
| 101 |
+*fluxbox-1.3.1 (28 Feb 2011) |
| 102 |
+ |
| 103 |
+ 28 Feb 2011; Jim Ramsay <lack@g.o> fluxbox-1.1.1-r1.ebuild, |
| 104 |
+ fluxbox-1.1.1-r2.ebuild, fluxbox-1.1.1-r3.ebuild, |
| 105 |
+ -files/fluxbox-1.1.1-osx-has-otool.patch, fluxbox-1.3.0.ebuild, |
| 106 |
+ -files/fluxbox-1.3.0-osx-has-otool.patch, +fluxbox-1.3.1.ebuild, |
| 107 |
+ +files/osx-has-otool.patch: |
| 108 |
+ Fluxbox-1.3.1 is released. Plus cleanup of a prefix patch for osx (Bug |
| 109 |
+ #355177) |
| 110 |
|
| 111 |
22 Feb 2011; Tomáš Chvátal <scarabeus@g.o> fluxbox-1.3.0.ebuild: |
| 112 |
Remove needless ||die statements with eapi4. |
| 113 |
|
| 114 |
|
| 115 |
|
| 116 |
1.9 x11-wm/fluxbox/fluxbox-1.1.1-r1.ebuild |
| 117 |
|
| 118 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r1.ebuild?rev=1.9&view=markup |
| 119 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r1.ebuild?rev=1.9&content-type=text/plain |
| 120 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r1.ebuild?r1=1.8&r2=1.9 |
| 121 |
|
| 122 |
Index: fluxbox-1.1.1-r1.ebuild |
| 123 |
=================================================================== |
| 124 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r1.ebuild,v |
| 125 |
retrieving revision 1.8 |
| 126 |
retrieving revision 1.9 |
| 127 |
diff -u -r1.8 -r1.9 |
| 128 |
--- fluxbox-1.1.1-r1.ebuild 16 Aug 2010 19:43:13 -0000 1.8 |
| 129 |
+++ fluxbox-1.1.1-r1.ebuild 28 Feb 2011 00:32:30 -0000 1.9 |
| 130 |
@@ -1,6 +1,6 @@ |
| 131 |
-# Copyright 1999-2010 Gentoo Foundation |
| 132 |
+# Copyright 1999-2011 Gentoo Foundation |
| 133 |
# Distributed under the terms of the GNU General Public License v2 |
| 134 |
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r1.ebuild,v 1.8 2010/08/16 19:43:13 abcd Exp $ |
| 135 |
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r1.ebuild,v 1.9 2011/02/28 00:32:30 lack Exp $ |
| 136 |
|
| 137 |
EAPI="3" |
| 138 |
inherit eutils prefix |
| 139 |
@@ -45,7 +45,7 @@ |
| 140 |
epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch" |
| 141 |
eprefixify util/fluxbox-generate_menu.in |
| 142 |
|
| 143 |
- epatch "${FILESDIR}"/${P}-osx-has-otool.patch |
| 144 |
+ epatch "${FILESDIR}"/osx-has-otool.patch |
| 145 |
|
| 146 |
# Patch to handle a broken key file gracefully, #263379 |
| 147 |
epatch "${FILESDIR}/macrocmd-crash-1.1.1.patch" |
| 148 |
|
| 149 |
|
| 150 |
|
| 151 |
1.3 x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild |
| 152 |
|
| 153 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild?rev=1.3&view=markup |
| 154 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild?rev=1.3&content-type=text/plain |
| 155 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild?r1=1.2&r2=1.3 |
| 156 |
|
| 157 |
Index: fluxbox-1.1.1-r2.ebuild |
| 158 |
=================================================================== |
| 159 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild,v |
| 160 |
retrieving revision 1.2 |
| 161 |
retrieving revision 1.3 |
| 162 |
diff -u -r1.2 -r1.3 |
| 163 |
--- fluxbox-1.1.1-r2.ebuild 16 Aug 2010 19:43:13 -0000 1.2 |
| 164 |
+++ fluxbox-1.1.1-r2.ebuild 28 Feb 2011 00:32:30 -0000 1.3 |
| 165 |
@@ -1,6 +1,6 @@ |
| 166 |
-# Copyright 1999-2010 Gentoo Foundation |
| 167 |
+# Copyright 1999-2011 Gentoo Foundation |
| 168 |
# Distributed under the terms of the GNU General Public License v2 |
| 169 |
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild,v 1.2 2010/08/16 19:43:13 abcd Exp $ |
| 170 |
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild,v 1.3 2011/02/28 00:32:30 lack Exp $ |
| 171 |
|
| 172 |
EAPI="3" |
| 173 |
inherit eutils prefix |
| 174 |
@@ -45,7 +45,7 @@ |
| 175 |
epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch" |
| 176 |
eprefixify util/fluxbox-generate_menu.in |
| 177 |
|
| 178 |
- epatch "${FILESDIR}"/${P}-osx-has-otool.patch |
| 179 |
+ epatch "${FILESDIR}"/osx-has-otool.patch |
| 180 |
|
| 181 |
# Patch to handle a broken key file gracefully, #263379 |
| 182 |
epatch "${FILESDIR}/macrocmd-crash-1.1.1.patch" |
| 183 |
|
| 184 |
|
| 185 |
|
| 186 |
1.1 x11-wm/fluxbox/fluxbox-1.3.1.ebuild |
| 187 |
|
| 188 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.1.ebuild?rev=1.1&view=markup |
| 189 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.1.ebuild?rev=1.1&content-type=text/plain |
| 190 |
|
| 191 |
Index: fluxbox-1.3.1.ebuild |
| 192 |
=================================================================== |
| 193 |
# Copyright 1999-2011 Gentoo Foundation |
| 194 |
# Distributed under the terms of the GNU General Public License v2 |
| 195 |
# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.1.ebuild,v 1.1 2011/02/28 00:32:30 lack Exp $ |
| 196 |
|
| 197 |
EAPI=4 |
| 198 |
inherit eutils prefix |
| 199 |
|
| 200 |
IUSE="nls xinerama bidi +truetype gnome +imlib +slit +toolbar vim-syntax" |
| 201 |
|
| 202 |
DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar" |
| 203 |
|
| 204 |
SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.bz2" |
| 205 |
HOMEPAGE="http://www.fluxbox.org" |
| 206 |
|
| 207 |
# Please note that USE="gnome" simply adds support for some gnome protocols, and |
| 208 |
# does not depend on external libraries. However, it does make the binary a |
| 209 |
# fair bit bigger, so we don't want to turn it on unless the user actually wants |
| 210 |
# it. |
| 211 |
|
| 212 |
RDEPEND="x11-libs/libXpm |
| 213 |
x11-libs/libXrandr |
| 214 |
xinerama? ( x11-libs/libXinerama ) |
| 215 |
x11-apps/xmessage |
| 216 |
x11-libs/libXft |
| 217 |
truetype? ( media-libs/freetype ) |
| 218 |
bidi? ( dev-libs/fribidi ) |
| 219 |
imlib? ( >=media-libs/imlib2-1.2.0[X] ) |
| 220 |
vim-syntax? ( app-vim/fluxbox-syntax ) |
| 221 |
!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1 |
| 222 |
!!<=x11-misc/fluxconf-0.9.9 |
| 223 |
!!<=x11-misc/fbdesk-1.2.1" |
| 224 |
DEPEND="nls? ( sys-devel/gettext ) |
| 225 |
x11-proto/xextproto |
| 226 |
xinerama? ( x11-proto/xineramaproto ) |
| 227 |
${RDEPEND}" |
| 228 |
PROVIDE="virtual/blackbox" |
| 229 |
|
| 230 |
SLOT="0" |
| 231 |
LICENSE="MIT" |
| 232 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux" |
| 233 |
|
| 234 |
src_prepare() { |
| 235 |
# We need to be able to include directories rather than just plain |
| 236 |
# files in menu [include] items. This patch will allow us to do clever |
| 237 |
# things with style ebuilds. |
| 238 |
epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch" |
| 239 |
eprefixify util/fluxbox-generate_menu.in |
| 240 |
|
| 241 |
epatch "${FILESDIR}"/osx-has-otool.patch |
| 242 |
|
| 243 |
# Add in the Gentoo -r number to fluxbox -version output. |
| 244 |
if [[ "${PR}" == "r0" ]] ; then |
| 245 |
suffix="gentoo" |
| 246 |
else |
| 247 |
suffix="gentoo-${PR}" |
| 248 |
fi |
| 249 |
sed -i \ |
| 250 |
-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \ |
| 251 |
version.h.in || die "version sed failed" |
| 252 |
} |
| 253 |
|
| 254 |
src_configure() { |
| 255 |
econf \ |
| 256 |
$(use_enable nls) \ |
| 257 |
$(use_enable xinerama) \ |
| 258 |
$(use_enable truetype xft) \ |
| 259 |
$(use_enable gnome) \ |
| 260 |
$(use_enable imlib imlib2) \ |
| 261 |
$(use_enable bidi fribidi ) \ |
| 262 |
$(use_enable slit ) \ |
| 263 |
$(use_enable toolbar ) \ |
| 264 |
--sysconfdir="${EPREFIX}"/etc/X11/${PN} \ |
| 265 |
--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge \ |
| 266 |
${myconf} |
| 267 |
} |
| 268 |
|
| 269 |
src_compile() { |
| 270 |
default |
| 271 |
|
| 272 |
ebegin "Creating a menu file (may take a while)" |
| 273 |
mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed" |
| 274 |
MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \ |
| 275 |
CHECKINIT="no. go away." HOME="${T}/home" \ |
| 276 |
"${S}/util/fluxbox-generate_menu" -is -ds \ |
| 277 |
|| die "menu generation failed" |
| 278 |
eend $? |
| 279 |
} |
| 280 |
|
| 281 |
src_install() { |
| 282 |
dodir /usr/share/fluxbox |
| 283 |
emake DESTDIR="${D}" STRIP="" install |
| 284 |
dodoc README* AUTHORS TODO* ChangeLog NEWS |
| 285 |
|
| 286 |
dodir /usr/share/xsessions |
| 287 |
insinto /usr/share/xsessions |
| 288 |
doins "${FILESDIR}/${PN}.desktop" |
| 289 |
|
| 290 |
exeinto /etc/X11/Sessions |
| 291 |
newexe "${FILESDIR}/${PN}.xsession" fluxbox |
| 292 |
|
| 293 |
dodir /usr/share/fluxbox/menu.d |
| 294 |
|
| 295 |
# Styles menu framework |
| 296 |
dodir /usr/share/fluxbox/menu.d/styles |
| 297 |
insinto /usr/share/fluxbox/menu.d/styles |
| 298 |
doins "${FILESDIR}/styles-menu-fluxbox" |
| 299 |
doins "${FILESDIR}/styles-menu-commonbox" |
| 300 |
doins "${FILESDIR}/styles-menu-user" |
| 301 |
} |
Archives