New version: 1.0.0 is released! (bug 195197)

Package-Manager: portage-2.1.3.9

5 files changed, 161 insertions, 5 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 09971375f7b5..220cf4be58b5 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.233 2007/09/25 16:20:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.234 2007/10/09 14:45:29 lack Exp $
+
+*fluxbox-1.0.0 (09 Oct 2007)
+
+  09 Oct 2007; Jim Ramsay <lack@gentoo.org>
+  +files/1.0.0/gentoo_style_location.patch, +fluxbox-1.0.0.ebuild:
+  New version: 1.0.0 is released! (bug 195197)
 
   25 Sep 2007; Raúl Porcel <armin76@gentoo.org>
   fluxbox-1.0_rc3_p4983.ebuild:
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index b8b936ce0f7e..a37566095b4d 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -6,6 +6,10 @@ AUX 0.9.15/fluxbox-0.9.15-our-styles-go-over-here.patch 653 RMD160 32e2d79cf6510
 MD5 17110f6fe071a751aaa29832e92832fd files/0.9.15/fluxbox-0.9.15-our-styles-go-over-here.patch 653
 RMD160 32e2d79cf651073efffb3f27aa54fa8b1738e98f files/0.9.15/fluxbox-0.9.15-our-styles-go-over-here.patch 653
 SHA256 699f2e563f582362b0ed9d4f53a20fa930abfca1262bb0fb71e7f738e8eadcc4 files/0.9.15/fluxbox-0.9.15-our-styles-go-over-here.patch 653
+AUX 1.0.0/gentoo_style_location.patch 676 RMD160 1425985eaa03a4404a4a0128d7e695dbbc14d51f SHA1 83d725fd320b8f9af329176bc8941b843e4ab559 SHA256 3765d1d02fa0db808d8d657b996508bd8425ed6ef6d898f4ecb0b7fe39d26a5f
+MD5 2440cd51fb1517b9f949fbbdc50d8d19 files/1.0.0/gentoo_style_location.patch 676
+RMD160 1425985eaa03a4404a4a0128d7e695dbbc14d51f files/1.0.0/gentoo_style_location.patch 676
+SHA256 3765d1d02fa0db808d8d657b996508bd8425ed6ef6d898f4ecb0b7fe39d26a5f files/1.0.0/gentoo_style_location.patch 676
 AUX 1.0_rc3/fluxbox-1.0_rc3-flicker.patch 761 RMD160 9450d4b1b32270df3325f327e88b4a67544dbd4c SHA1 2f74cff436bf9835b13368d0bb2cc67f879594a9 SHA256 afddd79a46887a954facf3cdd0e8a2e3e9accb924a363c8cd387532b87dbedbe
 MD5 70be9f7bf9b5189a0e4bb4de15b6fc37 files/1.0_rc3/fluxbox-1.0_rc3-flicker.patch 761
 RMD160 9450d4b1b32270df3325f327e88b4a67544dbd4c files/1.0_rc3/fluxbox-1.0_rc3-flicker.patch 761
@@ -47,6 +51,7 @@ MD5 9ae40c5c7aebae1c5919adbd888710b4 files/styles-menu-user 93
 RMD160 2a6831b45ce1d655586b699d16c0547de201d187 files/styles-menu-user 93
 SHA256 5f708a443c602485d958cb21cf55d9680e86aa3369215552c35ed9f46429e946 files/styles-menu-user 93
 DIST fluxbox-0.9.15.1.tar.bz2 685740 RMD160 aa9418de9ff700c14b21911f6de24503449e7f0f SHA1 94652432037203f1619ba8ed657339fb85b3c894 SHA256 b72bfcbe26651323d975a2469ba426da8e8e7d96b813061386f4bc5148dfb2b9
+DIST fluxbox-1.0.0.tar.bz2 767586 RMD160 320b11a1cf96a757da079886cd6496b9d84ab202 SHA1 7985e35fbb170fda24b9e04610690cd04c7a8748 SHA256 3c27672fdd4709d7f5c7968b4197ef704fce82766f51a5bebf411953516794c5
 DIST fluxbox-1.0_rc3_p4983.patch.gz 115293 RMD160 425c937fdd0b25503b50a3c490725aee52b31d29 SHA1 d1782d1d3a88c3b432cad7a68e051780e1d701d3 SHA256 051ce8d5d37f2ab22ac25db71a0a557244adc5b5a67e207dfb6204ffde8788fd
 DIST fluxbox-1.0_rc3_p5059.patch.gz 521106 RMD160 25feec6e777582632dbe490d27c8ec647047c1b7 SHA1 58910bdc0168ac16b3ce5a6291647df4f91d0259 SHA256 fb35f59dba61ccec93ad8a8d912558332253c85945a40f389241bcb7ea511a9c
 DIST fluxbox-1.0rc3.tar.bz2 780622 RMD160 5086545ea2c2b0dd71f17d314838d04f197a1294 SHA1 4524960e3e9702b61e29c5e1dfae8c050abaaf7f SHA256 cf1e2aa77716e42b2457b19989c2b2d2fc5f7d900cc16a3621a2e42372f474b6
@@ -54,6 +59,10 @@ EBUILD fluxbox-0.9.15.1-r2.ebuild 5101 RMD160 691d8e8de1005a729c88b88430f6b52715
 MD5 4df14c6939f328d192e057445f3ab068 fluxbox-0.9.15.1-r2.ebuild 5101
 RMD160 691d8e8de1005a729c88b88430f6b527153a750d fluxbox-0.9.15.1-r2.ebuild 5101
 SHA256 70de14f0efc8dcf9f2de41b30fd7a7a9fdb9333037e79c9e8599bcbbcf01af7c fluxbox-0.9.15.1-r2.ebuild 5101
+EBUILD fluxbox-1.0.0.ebuild 3573 RMD160 eea546abb71e4712710c5fc94ad814a33adea70f SHA1 10b4f62d40c09e4b6e736ecb0246cbd6756ccd0f SHA256 81b9a4c70d280e52020c5eac2b1d9904801421fbef13e8795758d5f187cc524c
+MD5 862d09ffad514dcbc43ca11fdcfaa723 fluxbox-1.0.0.ebuild 3573
+RMD160 eea546abb71e4712710c5fc94ad814a33adea70f fluxbox-1.0.0.ebuild 3573
+SHA256 81b9a4c70d280e52020c5eac2b1d9904801421fbef13e8795758d5f187cc524c fluxbox-1.0.0.ebuild 3573
 EBUILD fluxbox-1.0_rc3.ebuild 5132 RMD160 6389f42ec954078ba6ca1b658d2b682923aba203 SHA1 518622c53085bc0e41c077bb7215b868fda66c7f SHA256 805530ce5c5ff0dc456269c14a9b05bc8c484f86ad609806be66a884b59ac19c
 MD5 c18dfbe9672a653f79f8cf74f9d124f7 fluxbox-1.0_rc3.ebuild 5132
 RMD160 6389f42ec954078ba6ca1b658d2b682923aba203 fluxbox-1.0_rc3.ebuild 5132
@@ -66,10 +75,10 @@ EBUILD fluxbox-1.0_rc3_p5059.ebuild 4080 RMD160 3af4b320937d527f2fe820aebb9c1cd6
 MD5 9f6885bfbbea50f578b8bfe5bf180d98 fluxbox-1.0_rc3_p5059.ebuild 4080
 RMD160 3af4b320937d527f2fe820aebb9c1cd634b7313e fluxbox-1.0_rc3_p5059.ebuild 4080
 SHA256 d3ab9bfdda005b8ac00f6728372f87547c0383c70d319310596fb99ac5bff84c fluxbox-1.0_rc3_p5059.ebuild 4080
-MISC ChangeLog 43619 RMD160 ab02ad77ab23f57d49884a1556fdf2948e8501bd SHA1 dbc1f846df720e010dcf03367545c3226c4d0eb2 SHA256 c0ef748421dae8834ac9ab4f247736d8e0e284773be4905264ac29b58b8fadb6
-MD5 8afc1b05b450f01cd4c7550a435cd7a9 ChangeLog 43619
-RMD160 ab02ad77ab23f57d49884a1556fdf2948e8501bd ChangeLog 43619
-SHA256 c0ef748421dae8834ac9ab4f247736d8e0e284773be4905264ac29b58b8fadb6 ChangeLog 43619
+MISC ChangeLog 43805 RMD160 a33d20b5e0ee66668e77354c5bedea6be7b7fa91 SHA1 785537d1d7bbcf76aa219a2589963ea6950cbedd SHA256 8d461bb41868d589b185c7ae4a208e9a4ab16447b2cb54a9aeaa5ca3ead563a8
+MD5 063999be700d9bb69937e97bbdd77d62 ChangeLog 43805
+RMD160 a33d20b5e0ee66668e77354c5bedea6be7b7fa91 ChangeLog 43805
+SHA256 8d461bb41868d589b185c7ae4a208e9a4ab16447b2cb54a9aeaa5ca3ead563a8 ChangeLog 43805
 MISC metadata.xml 712 RMD160 28bbbb6c8c1ad0897f5a66d3b3fb251c13b532c1 SHA1 9f493761c477ad9b3f532638a1351489442d4f54 SHA256 415fa5c634f5ee4aa0a77dab674282588c0befbb209ce31c0eb4375e4ec36b65
 MD5 2c8f22e229558b963d967e6ca024506e metadata.xml 712
 RMD160 28bbbb6c8c1ad0897f5a66d3b3fb251c13b532c1 metadata.xml 712
@@ -77,6 +86,9 @@ SHA256 415fa5c634f5ee4aa0a77dab674282588c0befbb209ce31c0eb4375e4ec36b65 metadata
 MD5 7d40f503caa288bafab48f9ee3afabef files/digest-fluxbox-0.9.15.1-r2 253
 RMD160 6517107f981cdef6babc9d593c64d17dee1e2264 files/digest-fluxbox-0.9.15.1-r2 253
 SHA256 e5ca0cf2ad588a6c263c9d2f32d28ecc5e06ce603c71805213bd4a58ac34ac5c files/digest-fluxbox-0.9.15.1-r2 253
+MD5 3a99f696be3311117d9958369fb6e80f files/digest-fluxbox-1.0.0 244
+RMD160 6cdebf42f5f096a58246c074f4b28debf053f000 files/digest-fluxbox-1.0.0 244
+SHA256 5d61d717895c9d2413e9999992553461d3df1da7d215a3b504a8974b4af9a31b files/digest-fluxbox-1.0.0 244
 MD5 fdc3d0163e8c8ff13b9aed68158c5db6 files/digest-fluxbox-1.0_rc3 247
 RMD160 71dc64686695fd855492bfa426f3f9a5986b8247 files/digest-fluxbox-1.0_rc3 247
 SHA256 6594c7d9ba41cbbc106a5de7278f79a7942fafa02af975e9850f21e6ae9d38d8 files/digest-fluxbox-1.0_rc3 247
diff --git a/x11-wm/fluxbox/files/1.0.0/gentoo_style_location.patch b/x11-wm/fluxbox/files/1.0.0/gentoo_style_location.patch
new file mode 100644
index 000000000000..3bf59802ab1f
--- /dev/null
+++ b/x11-wm/fluxbox/files/1.0.0/gentoo_style_location.patch
@@ -0,0 +1,17 @@
+--- util/fluxbox-generate_menu.in.orig	2007-07-13 13:47:11.000000000 -0600
++++ util/fluxbox-generate_menu.in	2007-07-13 13:51:03.000000000 -0600
+@@ -1803,12 +1803,8 @@
+ append_submenu "${FBSETTINGSMENU}"
+     append "[config] (${CONFIGUREMENU})"
+ 
+-    append_menu "[submenu] (${SYSTEMSTYLES}) {${STYLEMENUTITLE}}"
+-        append "[stylesdir] (${PREFIX}/share/fluxbox/styles)"
+-    append_menu_end
+-
+-    append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}"
+-        append "[stylesdir] (~/.@pkgprefix@fluxbox@pkgsuffix@/styles)"
++    append_submenu "Styles"
++        append "[include] (/usr/share/fluxbox/menu.d/styles/)"
+     append_menu_end
+ 
+     # Backgroundmenu
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-1.0.0 b/x11-wm/fluxbox/files/digest-fluxbox-1.0.0
new file mode 100644
index 000000000000..16570da510f1
--- /dev/null
+++ b/x11-wm/fluxbox/files/digest-fluxbox-1.0.0
@@ -0,0 +1,3 @@
+MD5 990e276ead0d04421dce4080f485caca fluxbox-1.0.0.tar.bz2 767586
+RMD160 320b11a1cf96a757da079886cd6496b9d84ab202 fluxbox-1.0.0.tar.bz2 767586
+SHA256 3c27672fdd4709d7f5c7968b4197ef704fce82766f51a5bebf411953516794c5 fluxbox-1.0.0.tar.bz2 767586
diff --git a/x11-wm/fluxbox/fluxbox-1.0.0.ebuild b/x11-wm/fluxbox/fluxbox-1.0.0.ebuild
new file mode 100644
index 000000000000..c8e78748df2e
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-1.0.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0.ebuild,v 1.1 2007/10/09 14:45:29 lack Exp $
+
+inherit eutils
+
+IUSE="nls xinerama truetype kde gnome imlib disableslit disabletoolbar"
+
+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="kde gnome" simply adds support for the respective
+# protocols, and does not depend on external libraries. They do, however,
+# make the binary a fair bit bigger, so we don't want to turn them on unless
+# the user actually wants them.
+
+RDEPEND="x11-libs/libXpm
+	x11-libs/libXrandr
+	xinerama? ( x11-libs/libXinerama )
+	x11-apps/xmessage
+	virtual/xft
+	truetype? ( media-libs/freetype )
+	imlib? ( >=media-libs/imlib2-1.2.0 )
+	!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
+	!<=x11-misc/fluxconf-0.9.9"
+DEPEND=">=sys-devel/autoconf-2.52
+	nls? ( sys-devel/gettext )
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )
+	${RDEPEND}"
+PROVIDE="virtual/blackbox"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+pkg_setup() {
+	if use imlib ; then
+		if ! built_with_use media-libs/imlib2 X ; then
+			eerror "To build fluxbox with imlib in USE, you need an X enabled"
+			eerror "media-libs/imlib2 . Either recompile imlib2 with the X"
+			eerror "USE flag turned on or disable the imlib USE flag for fluxbox."
+			die "USE=imlib requires imlib2 with USE=X"
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# 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}/${PV}/gentoo_style_location.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_compile() {
+	export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
+
+	econf \
+		$(use_enable nls) \
+		$(use_enable xinerama) \
+		$(use_enable truetype xft) \
+		$(use_enable kde) \
+		$(use_enable gnome) \
+		$(use_enable imlib imlib2) \
+		$(use_enable !disableslit slit ) \
+		$(use_enable !disabletoolbar toolbar ) \
+		--sysconfdir=/etc/X11/${PN} \
+		--with-style=/usr/share/fluxbox/styles/Emerge \
+		${myconf} || die "configure failed"
+
+	emake || die "make failed"
+
+	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
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc README* AUTHORS TODO* ChangeLog NEWS
+
+	dodir /usr/share/xsessions
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/${PN}.desktop"
+
+	dodir /etc/X11/Sessions
+	echo "/usr/bin/startfluxbox" > "${D}/etc/X11/Sessions/fluxbox"
+	fperms a+x /etc/X11/Sessions/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
+}