New version - 1.1.0.1 is released (Fixes some issues with the 1.1.0 release)

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 x86_64)

4 files changed, 17 insertions, 53 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 61e16d2052d1..0315ee6bd160 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.257 2008/09/03 13:34:51 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.258 2008/09/04 18:06:14 lack Exp $
+
+*fluxbox-1.1.0.1 (04 Sep 2008)
+
+  04 Sep 2008; Jim Ramsay <lack@gentoo.org>
+  +files/1.1.0.1/gentoo_style_location.patch,
+  -files/1.1.0/gentoo_style_location.patch, -files/1.1.0/windowmenu,
+  -fluxbox-1.1.0-r1.ebuild, +fluxbox-1.1.0.1.ebuild:
+  New version - 1.1.0.1 is released (Fixes some issues with the 1.1.0
+  release)
 
   03 Sep 2008; Jim Ramsay <lack@gentoo.org> fluxbox-1.1.0-r1.ebuild:
   Added ewarn message about potential problem from last 1.1.0-r1 install
diff --git a/x11-wm/fluxbox/files/1.1.0/gentoo_style_location.patch b/x11-wm/fluxbox/files/1.1.0/gentoo_style_location.patch
deleted file mode 100644
index 71183e2754b1..000000000000
--- a/x11-wm/fluxbox/files/1.1.0/gentoo_style_location.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
-index aca8b08..b229046 100755
---- a/util/fluxbox-generate_menu.in
-+++ b/util/fluxbox-generate_menu.in
-@@ -1794,12 +1794,8 @@ fi
- 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/1.1.0/windowmenu b/x11-wm/fluxbox/files/1.1.0/windowmenu
deleted file mode 100644
index d867b64c2299..000000000000
--- a/x11-wm/fluxbox/files/1.1.0/windowmenu
+++ /dev/null
@@ -1,15 +0,0 @@
-[begin]
-  [shade]
-  [stick]
-  [maximize]
-  [iconify]
-  [raise]
-  [lower]
-  [settitledialog]
-  [sendto]
-  [layer]
-  [alpha]
-  [extramenus]
-  [separator]
-  [close]
-[end]
diff --git a/x11-wm/fluxbox/fluxbox-1.1.0-r1.ebuild b/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild
index dfa184d023ad..2cc0ba9f853f 100644
--- a/x11-wm/fluxbox/fluxbox-1.1.0-r1.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.0-r1.ebuild,v 1.2 2008/09/03 13:34:51 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild,v 1.1 2008/09/04 18:06:14 lack Exp $
 
 EAPI=1
 inherit eutils
 
-IUSE="nls xinerama truetype kde gnome +imlib +slit +toolbar vim-syntax"
+IUSE="nls xinerama 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="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.
+# 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
@@ -56,9 +56,6 @@ src_unpack() {
 	# things with style ebuilds.
 	epatch "${FILESDIR}/${PV}/gentoo_style_location.patch"
 
-	# Bug 236523: This file is missing from the upstream tarball:
-	cp "${FILESDIR}/${PV}/windowmenu" "${S}/data/windowmenu"
-
 	# Add in the Gentoo -r number to fluxbox -version output.
 	if [[ "${PR}" == "r0" ]] ; then
 		suffix="gentoo"
@@ -75,7 +72,6 @@ src_compile() {
 		$(use_enable nls) \
 		$(use_enable xinerama) \
 		$(use_enable truetype xft) \
-		$(use_enable kde) \
 		$(use_enable gnome) \
 		$(use_enable imlib imlib2) \
 		$(use_enable slit ) \
@@ -97,7 +93,7 @@ src_compile() {
 
 src_install() {
 	dodir /usr/share/fluxbox
-	emake DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" STRIP="" install || die "install failed"
 	dodoc README* AUTHORS TODO* ChangeLog NEWS
 
 	dodir /usr/share/xsessions
@@ -116,10 +112,3 @@ src_install() {
 	doins "${FILESDIR}/styles-menu-commonbox" || die
 	doins "${FILESDIR}/styles-menu-user" || die
 }
-
-pkg_postinst() {
-	ewarn "If you are upgrading from x11-wm/fluxbox-1.1.0 to"
-	ewarn "x11-wm/fluxbox-1.1.0-r1, please manually copy the file"
-	ewarn "/usr/share/fluxbox/windowmenu in to your home directory,"
-	ewarn "replacing any existing file there."
-}