Fluxbox 1.3.0 is released! (Bug #355643)

Package-Manager: portage-2.1.9.34/cvs/Linux i686

4 files changed, 134 insertions, 12 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 76c3f09a6178..d4156e36731e 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.283 2011/02/20 23:50:34 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.284 2011/02/22 13:22:55 lack Exp $
+
+*fluxbox-1.3.0 (21 Feb 2011)
+
+  21 Feb 2011; Jim Ramsay <lack@gentoo.org> +fluxbox-1.3.0.ebuild,
+  +files/fluxbox-1.3.0-osx-has-otool.patch:
+  Fluxbox 1.3.0 is released! (Bug #355643)
 
   20 Feb 2011; Joseph Jezak <josejx@gentoo.org> fluxbox-1.1.1-r3.ebuild:
   Marked ppc/ppc64 stable for bug #352833.
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index c986a9fd4946..c291fa3b107b 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.0.0/gcc-4.3.patch 258 RMD160 c2a45bbb135f43ed008bb76c8e545d113169dcb8 SHA1 9ff072a88470c277f9e4ab641587f0a35aa81548 SHA256 d4de739b1883377947ac2d67677bac79be0af10ef8272e75bb86f729374125c2
 AUX 1.0.0/generate-menu.patch 1369 RMD160 58c1e756f7a2eb2d25d87dda9b6aaa7efb31288a SHA1 975b782c35d43a7ddbf408ba5e7a743f7872f969 SHA256 93bfb1d51eba8ad06eb7c47896c0d17bb107f9bc04309049a8acf6f522fa08ef
 AUX 1.0.0/gentoo_style_location.patch 700 RMD160 1c8feeaf840c7ef51515a7f59921a9c38a08ffbd SHA1 c76b59783e290a33dac9a832a9d958d109b87fce SHA256 e692b421558ea1c761eabbcff291ac6378c7b92b585c562ad563e2af796a5d37
@@ -9,6 +6,7 @@ AUX fbsetbg-quiet-1.1.1.patch 2342 RMD160 211d9a868d608d87804ca79062a982838c12aa
 AUX fluxbox-1.0.0-interix.patch 963 RMD160 dafd89f3691a283ddf7e922a0c7499d734a9d2e4 SHA1 ad2e0fdb5c3a7ba793efa3e854d389a46e8f4626 SHA256 f3f04a2b8ae569eb90fd3b14c9ef0199b8b665dc6c1924d4f06b635d62291416
 AUX fluxbox-1.1.1-multiscreen.patch 2439 RMD160 139e49b60b491472dc2d5dff97f5a7ddfa70324a SHA1 12cd1348f6b80b3a917dcfd116df7bf0e6ccf5c8 SHA256 0c895fabb908ccdd8fb8cd9e90438f88289851d961398971753aa593b6bd1d09
 AUX fluxbox-1.1.1-osx-has-otool.patch 581 RMD160 89d2a183a3782538fff98ea174d3999176b8fa31 SHA1 a149be1522c4d1d1c54ca3b3c90774e1ca7bfcf3 SHA256 6edfdc7196e33abba32f5035ad4c68271e680dbcf730a6bfd99d16c8c9a1a362
+AUX fluxbox-1.3.0-osx-has-otool.patch 581 RMD160 89d2a183a3782538fff98ea174d3999176b8fa31 SHA1 a149be1522c4d1d1c54ca3b3c90774e1ca7bfcf3 SHA256 6edfdc7196e33abba32f5035ad4c68271e680dbcf730a6bfd99d16c8c9a1a362
 AUX fluxbox.desktop 202 RMD160 255bb2cdae75e1fc204d4b60f39c8aba66770e7a SHA1 d57b4d0fad653660cc6cf0a2cd808b7a34d72b95 SHA256 8859f44f3eccc7b3e08c9f61f40351c49cd77c4624aabe3029572a3412687834
 AUX fluxbox.xsession 2004 RMD160 9a5f192628d6d888734f24b9ff4f6f1b7e8f178b SHA1 ec59f4611868866b8bc6d7fc9762bbc9bca640c3 SHA256 dbff4840a2c32c8ab837e4f34cb002f810dccca107f5e04a28c22d33db2a59bd
 AUX gentoo_style_location-1.1.x.patch 735 RMD160 fb14a4d9d91b4a23992ec90c65e1a8def40cb75c SHA1 899131f61bb5e1cd46e76dbad719ff03c3511475 SHA256 d3031c3ebdd05c23a243e1ec2c0173206bb56a85ef3129ed70c5d7de434f65d9
@@ -22,19 +20,14 @@ AUX styles-menu-user 93 RMD160 2a6831b45ce1d655586b699d16c0547de201d187 SHA1 84a
 DIST fluxbox-1.0.0.tar.bz2 767586 RMD160 320b11a1cf96a757da079886cd6496b9d84ab202 SHA1 7985e35fbb170fda24b9e04610690cd04c7a8748 SHA256 3c27672fdd4709d7f5c7968b4197ef704fce82766f51a5bebf411953516794c5
 DIST fluxbox-1.1.0.1.tar.bz2 778639 RMD160 319158d5c618302a3505db8e58de60bef82ee251 SHA1 70d41a0192b77d2da491221185ce1a7ec4ebda3c SHA256 5876363c6cb13a68be86c193027634ced4333027b4edc23b511346166884f1fc
 DIST fluxbox-1.1.1.tar.bz2 777660 RMD160 aabfdd10c835d0ef903885646a7f34f7df75af17 SHA1 6d49deb6c4c7d73f7567e1cf7d2575c7edc4825f SHA256 903f676a71a301513cd0b3db17e49f88c8d91583793176c4c70358a3012cca34
+DIST fluxbox-1.3.0.tar.bz2 794865 RMD160 f580071660e12bedb8c046879a59f5d260837b2d SHA1 b4b1732f1c3ad9499cd9ec0aa03fbaee59c69d49 SHA256 3afa696c4616a4ad80c1e0852fc9dbbf568530a23227a436f4aad86cd92c964c
 EBUILD fluxbox-1.0.0-r2.ebuild 3439 RMD160 e5d968d8710c64a914b2aed021162aabbf96b34d SHA1 30148718699329b392835151396cb831966b6c21 SHA256 a2372168a67631636b30de040fdc64ed7d2a2cb1b5a1192af5fd3149fb0e0077
 EBUILD fluxbox-1.0.0.ebuild 3158 RMD160 1b67abd77417874b09aa57ace7c3ae274db3fead SHA1 57a4efc087fa7e1f8023bdc3ee92db9364764744 SHA256 1ce9adaaede435628e0be2e5fdbf4c0253f6e6b49ee511b69e432ceae90a8f81
 EBUILD fluxbox-1.1.0.1.ebuild 3255 RMD160 b3fe06bb8f90c09e3b16ac8f773e491c49972c48 SHA1 8f224d0d5ce4bc7482285464b6a0f0312d1b63f9 SHA256 28548be030bbfa55afde8635e0e21845322edcf832c8cb0bd8a1a6d2bec6c8d6
 EBUILD fluxbox-1.1.1-r1.ebuild 3508 RMD160 5c4ddbdaa6b8944ac711d0f91f600ce92f125e25 SHA1 3fedc9963522c71c0c01f35d3e2077c78fb2e699 SHA256 6be9a4d8b39ce02e0457a6e8ba4accffd69a228f76612e53f20ae10bf589cc98
 EBUILD fluxbox-1.1.1-r2.ebuild 3790 RMD160 ed3ac3a00bc4df0cdb531994a5ebb3cf2731008f SHA1 b01a42b157aae05376892409164f26579d11b1ed SHA256 7421a16f7e358e1a2b0b3f10ba4e477c0ed0270030a5f614f5b1a878250a5599
 EBUILD fluxbox-1.1.1-r3.ebuild 3898 RMD160 627cdb1ffa06f5ffe8008e03432eb54e5c27ce72 SHA1 f068f2367a81fc2af08bae0cb6bfa8fa4cb5a6d9 SHA256 b5d0040fac53d1bfb2bd51d908ae7a6f41b04fa642b5988ef28a253381d49bb0
+EBUILD fluxbox-1.3.0.ebuild 3272 RMD160 7f5bab1d18b9faebf05dce84346aa22b2a13182b SHA1 d25dad815b57245194e464fc487177897a1275f7 SHA256 e68cc6b703a73f5ca305ffc667c4f8f4fbfab236fb1fa7b23432bc18a4743eed
 EBUILD fluxbox-9999.ebuild 3228 RMD160 c16a9467ea088e049571678a397e91b3bf17c86c SHA1 57cc19b4c5db43b9f3369c454225fa35616a3865 SHA256 05826d9a2df2ed823a6a678d2d3607df6c6c6c2d4231d68a01e6944a4769fd99
-MISC ChangeLog 51970 RMD160 fbc1f94f11c694db18070583b2da9cf8e65182cb SHA1 ae05622e0fb4327cc06daaeb14d5c4b89de050db SHA256 ab7aa4148b99bdad968b2fa164f5dc2ea87f75cead99df1bff0d16bd380b3281
+MISC ChangeLog 52153 RMD160 0d8600576fe3181e0b478af4e6db91e8c0d0c423 SHA1 cea1d1f93e4d2831a5bf4ba3ebd2b8c2e59c62ff SHA256 363426e1291b8f153bb132c33f58c2367c68832f905dd211239a34722b8fe6dc
 MISC metadata.xml 1124 RMD160 ade07b2ec508cf3be2e6d439c5e6b3d7e94fe792 SHA1 ce24cca05659fcfa1fcdd5697082d87e8d9c501d SHA256 4a4c6e8e71d6d258fd9af8843f5eaa0c3d90f004f21121123e58abedba060e95
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk1hqKEACgkQcsIHjyDViGTW0gCfQNzoQvgmV3ayVcuHATcM2lCx
-FaMAoM/YWLLdYzr4Cio9BcBJnaghW0qY
-=3f8l
------END PGP SIGNATURE-----
diff --git a/x11-wm/fluxbox/files/fluxbox-1.3.0-osx-has-otool.patch b/x11-wm/fluxbox/files/fluxbox-1.3.0-osx-has-otool.patch
new file mode 100644
index 000000000000..637d2a824669
--- /dev/null
+++ b/x11-wm/fluxbox/files/fluxbox-1.3.0-osx-has-otool.patch
@@ -0,0 +1,14 @@
+--- util/fbsetbg
++++ util/fbsetbg
+@@ -356,7 +356,10 @@
+             if [ ! "$wpsetter" = Esetroot ]; then
+                 WPSETTER=$wpsetter
+                 break
+-            elif ldd `which Esetroot`|grep libImlib 2>&1 > /dev/null; then
++            elif ( [[ `type -t otool` == file ]] \
++                && otool -L `which Esetroot`|grep libImlib 2>&1 > /dev/null ) \
++              || ( [[ `type -t ldd` == file ]] \
++                && ldd `which Esetroot`|grep libImlib 2>&1 > /dev/null ); then
+                 WPSETTER=$wpsetter
+                 break
+             else
diff --git a/x11-wm/fluxbox/fluxbox-1.3.0.ebuild b/x11-wm/fluxbox/fluxbox-1.3.0.ebuild
new file mode 100644
index 000000000000..bafd08822d38
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-1.3.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.0.ebuild,v 1.1 2011/02/22 13:22:55 lack Exp $
+
+EAPI="4"
+inherit eutils prefix
+
+IUSE="nls xinerama bidi +truetype gnome +imlib +slit +toolbar vim-syntax"
+
+DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
+
+SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.bz2"
+HOMEPAGE="http://www.fluxbox.org"
+
+# Please note that USE="gnome" simply adds support for some gnome protocols, and
+# does not depend on external libraries.  However, it does make the binary a
+# fair bit bigger, so we don't want to turn it on unless the user actually wants
+# it.
+
+RDEPEND="x11-libs/libXpm
+	x11-libs/libXrandr
+	xinerama? ( x11-libs/libXinerama )
+	x11-apps/xmessage
+	x11-libs/libXft
+	truetype? ( media-libs/freetype )
+	bidi? ( dev-libs/fribidi )
+	imlib? ( >=media-libs/imlib2-1.2.0[X] )
+	vim-syntax? ( app-vim/fluxbox-syntax )
+	!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
+	!!<=x11-misc/fluxconf-0.9.9
+	!!<=x11-misc/fbdesk-1.2.1"
+DEPEND="nls? ( sys-devel/gettext )
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )
+	${RDEPEND}"
+PROVIDE="virtual/blackbox"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
+
+src_prepare() {
+	# We need to be able to include directories rather than just plain
+	# files in menu [include] items. This patch will allow us to do clever
+	# things with style ebuilds.
+	epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch"
+	eprefixify util/fluxbox-generate_menu.in
+
+	epatch "${FILESDIR}"/${P}-osx-has-otool.patch
+
+	# Add in the Gentoo -r number to fluxbox -version output.
+	if [[ "${PR}" == "r0" ]] ; then
+		suffix="gentoo"
+	else
+		suffix="gentoo-${PR}"
+	fi
+	sed -i \
+		-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
+		version.h.in || die "version sed failed"
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable xinerama) \
+		$(use_enable truetype xft) \
+		$(use_enable gnome) \
+		$(use_enable imlib imlib2) \
+		$(use_enable bidi fribidi ) \
+		$(use_enable slit ) \
+		$(use_enable toolbar ) \
+		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
+		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge \
+		${myconf}
+}
+
+src_compile() {
+	default
+
+	ebegin "Creating a menu file (may take a while)"
+	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
+	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
+		CHECKINIT="no. go away." HOME="${T}/home" \
+		"${S}/util/fluxbox-generate_menu" -is -ds \
+		|| die "menu generation failed"
+	eend $?
+}
+
+src_install() {
+	dodir /usr/share/fluxbox
+	emake DESTDIR="${D}" STRIP="" install || die "install failed"
+	dodoc README* AUTHORS TODO* ChangeLog NEWS
+
+	dodir /usr/share/xsessions
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/${PN}.desktop"
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}/${PN}.xsession" fluxbox
+
+	dodir /usr/share/fluxbox/menu.d
+
+	# Styles menu framework
+	dodir /usr/share/fluxbox/menu.d/styles
+	insinto /usr/share/fluxbox/menu.d/styles
+	doins "${FILESDIR}/styles-menu-fluxbox" || die
+	doins "${FILESDIR}/styles-menu-commonbox" || die
+	doins "${FILESDIR}/styles-menu-user" || die
+}