Punt unnecessary fluxbox depend wrt #229805. Punt epause. Punt old versions, ...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 10 insertions, 163 deletions

diff --git a/x11-themes/fluxbox-styles-fluxmod/Manifest b/x11-themes/fluxbox-styles-fluxmod/Manifest
index 0cec51469f30..98fbcc8cad6e 100644
--- a/x11-themes/fluxbox-styles-fluxmod/Manifest
+++ b/x11-themes/fluxbox-styles-fluxmod/Manifest
@@ -1,10 +1,5 @@
 AUX styles-menu-fluxmod 116 RMD160 cb5b0fed8365310798b24518cf2273fd21958c95 SHA1 51f0f0303058a122686447438940ed091b28dfb9 SHA256 779cd6d7f17d5641e373acbadb051de930f0479681f083a7fff95c0598ec5030
-DIST fluxbox-styles-fluxmod-20040809.tar.bz2 187728 RMD160 79cea7ab47bef698b8d7792a362bde3901829698 SHA1 3bc89c7e70cc9af3c9cc141db323680c75c34ce2 SHA256 2a07c53a8cb9a774212ce4f106e56097013788d45ffbc512feb17f62c2d89cab
-DIST fluxbox-styles-fluxmod-20041024.tar.bz2 246097 RMD160 fbfd4a9c69847178345e861e2afa65bb21a709fa SHA1 ff274e5e587f1d3aa0f5a01076f6565a36540813 SHA256 3e176ab65074e2d6e132fa12efcebe50fd5a0cadf22892c87c4f51f774ccca9b
 DIST fluxbox-styles-fluxmod-20050128.tar.bz2 1279479 RMD160 20b2144732820c5915a6b8f87c588b1378b6182c SHA1 261507e6a082fc3b21b812084880dbd4e1ac4089 SHA256 edd3ae38a95e64129cc4de882eb31700694fc2cb684f217d130788e524f0a8ff
-EBUILD fluxbox-styles-fluxmod-20040809.ebuild 1109 RMD160 d175072f90f39baf10698d156c5812d9860d69d7 SHA1 025484c7758d39ccc6c9309254128c9cb31b4cca SHA256 56f3b0e030085c840d4340c7d06ad5a0019f862fcfcc590af13f57ea18ec043d
-EBUILD fluxbox-styles-fluxmod-20041024.ebuild 1504 RMD160 5bbec1e40164019789c7f6c28478740431b260f3 SHA1 8ee40d8bb438ba72b6c12b242fe27e12f713c926 SHA256 bd0cdcfd3ac61acc0fe7c28ce02fe3a0c1284cbe3895e45deeb50b8d2ed9bdb2
-EBUILD fluxbox-styles-fluxmod-20050128-r1.ebuild 1776 RMD160 1fe00211a6c9670ece02459dae839222a5d4d768 SHA1 6e1d626c85fd34b5b0ad276455cb82c3037e53eb SHA256 df0806206920c82434c0e3ea13f7462d7f292ac203107bd07621fc630e8aaf05
-EBUILD fluxbox-styles-fluxmod-20050128.ebuild 1753 RMD160 83c4baf2bafb5ce026740f2830710d18f20157f2 SHA1 4cce41f85e8842931daa76127fd41f13fcf72745 SHA256 fb44ebe24356beb49a47670f081d9bf27bf540490452501c1c38d752a70e04b7
+EBUILD fluxbox-styles-fluxmod-20050128-r1.ebuild 1653 RMD160 3ee144e154a99e810ad1c944b1d5c93c6919d862 SHA1 8123731b9fe2d4c63ab727988954ee89e7f90a8e SHA256 e8de13af4e80127075196e71cd3bfce731eba5d8ab42a9c19cf971da80e5f49f
 MISC ChangeLog 5074 RMD160 43f9f8299c7a6ca9c00d40c7aa3a5fa7bb56e538 SHA1 972f8f2c6f12b7755ad69e8388d0064772c33154 SHA256 92d652b8ae8eefca8c64eaffc8d019ea6b6647f2488e82b7493bddc23294495a
 MISC metadata.xml 164 RMD160 23268eae8516f64e7363a3689f829cc65f0fcfb8 SHA1 770506baf689455e0eb3861186483c8177e22216 SHA256 810ed71a717688d6f1aea13a6af28f7eefd9db2177e29c740511089752357263
diff --git a/x11-themes/fluxbox-styles-fluxmod/fluxbox-styles-fluxmod-20040809.ebuild b/x11-themes/fluxbox-styles-fluxmod/fluxbox-styles-fluxmod-20040809.ebuild
deleted file mode 100644
index be93a189f86e..000000000000
--- a/x11-themes/fluxbox-styles-fluxmod/fluxbox-styles-fluxmod-20040809.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fluxbox-styles-fluxmod/fluxbox-styles-fluxmod-20040809.ebuild,v 1.8 2009/03/29 16:03:19 solar Exp $
-
-DESCRIPTION="A collection of FluxBox themes from FluxMod"
-HOMEPAGE="http://tenr.de/styles/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="x86 sparc mips ppc ~alpha ~hppa ~amd64 ~ia64 ~ppc64"
-
-IUSE=""
-DEPEND=">=sys-apps/sed-4"
-RDEPEND=">=x11-wm/fluxbox-0.9.8"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# comment out every rootcommand
-	find . -name '*.cfg' -exec \
-		sed -i "{}" -e 's-^\(rootcommand\)-!!! \1-i' \;
-}
-
-src_install() {
-	for d in styles ; do
-		insinto /usr/share/fluxbox/${d}
-		cp -R ${d}/* "${D}"/usr/share/fluxbox/${d}/
-	done
-}
-
-pkg_postinst() {
-	einfo
-	einfo "These styles are installed into /usr/share/fluxbox, which will"
-	einfo "show up in Fluxbox Menu > System Styles by default. You will have"
-	einfo "to either restart Fluxbox or use Fluxbox Menu > Reload config"
-	einfo "for changes to show up."
-	einfo
-}
diff --git a/x11-themes/fluxbox-styles-fluxmod/fluxbox-styles-fluxmod-20041024.ebuild b/x11-themes/fluxbox-styles-fluxmod/fluxbox-styles-fluxmod-20041024.ebuild
deleted file mode 100644
index 2f5a7da6c369..000000000000
--- a/x11-themes/fluxbox-styles-fluxmod/fluxbox-styles-fluxmod-20041024.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fluxbox-styles-fluxmod/fluxbox-styles-fluxmod-20041024.ebuild,v 1.9 2009/03/29 16:03:20 solar Exp $
-
-inherit eutils
-
-DESCRIPTION="A collection of FluxBox themes from FluxMod"
-HOMEPAGE="http://tenr.de/styles/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="x86 sparc ~mips ppc ~alpha ~hppa ~amd64 ~ia64 ppc64"
-
-IUSE=""
-DEPEND=">=sys-apps/sed-4"
-RDEPEND=">=x11-wm/fluxbox-0.9.10-r3"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# comment out every rootcommand
-	find . -name '*.cfg' -exec \
-		sed -i "{}" -e 's-^\(rootcommand\)-!!! \1-i' \;
-}
-
-src_install() {
-	for d in * ; do
-		insinto /usr/share/fluxbox/fluxmod/styles/${d}
-		cp -R ${d}/* "${D}"/usr/share/fluxbox/fluxmod/styles/${d}/
-	done
-	insinto /usr/share/fluxbox/menu.d/styles
-	doins "${FILESDIR}"/styles-menu-fluxmod
-}
-
-pkg_postinst() {
-	einfo
-	einfo "These styles are installed into /usr/share/fluxbox/fluxmod/. The"
-	einfo "best way to use these styles is to ensure that you are running"
-	einfo "fluxbox 0.9.10-r3 or later, and then to place the following in"
-	einfo "your menu file:"
-	einfo
-	einfo "    [submenu] (Styles) {Select a Style}"
-	einfo "        [include] (/usr/share/fluxbox/menu.d/styles/)"
-	einfo "    [end]"
-	einfo
-	einfo "If you use fluxbox-generate_menu or the default global fluxbox"
-	einfo "menu file, this will already be present."
-	einfo
-	epause
-}
diff --git a/x11-themes/fluxbox-styles-fluxmod/fluxbox-styles-fluxmod-20050128-r1.ebuild b/x11-themes/fluxbox-styles-fluxmod/fluxbox-styles-fluxmod-20050128-r1.ebuild
index cff66341cca3..77f387a74638 100644
--- a/x11-themes/fluxbox-styles-fluxmod/fluxbox-styles-fluxmod-20050128-r1.ebuild
+++ b/x11-themes/fluxbox-styles-fluxmod/fluxbox-styles-fluxmod-20050128-r1.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fluxbox-styles-fluxmod/fluxbox-styles-fluxmod-20050128-r1.ebuild,v 1.5 2009/03/29 16:03:20 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fluxbox-styles-fluxmod/fluxbox-styles-fluxmod-20050128-r1.ebuild,v 1.6 2010/06/06 20:27:25 ssuominen Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="A collection of FluxBox themes from FluxMod"
 HOMEPAGE="http://tenr.de/styles/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~arm alpha amd64 hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd"
-
 IUSE=""
+
+RDEPEND=""
 DEPEND=">=sys-apps/sed-4"
-RDEPEND=">=x11-wm/fluxbox-0.9.11"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	# comment out every rootcommand
 	find . -name '*.cfg' -exec \
 		sed -i "{}" -e 's-^\(rootcommand\)-!!! \1-i' \;
@@ -27,11 +26,10 @@ src_unpack() {
 }
 
 src_install() {
-	mkdir -p "${D}"/usr/share/fluxbox/fluxmod/styles/ || die "mkdir eeked"
 	insinto /usr/share/fluxbox/fluxmod/styles
-	doins -r * || die "doins failed"
+	doins -r * || die
 	insinto /usr/share/fluxbox/menu.d/styles
-	doins "${FILESDIR}"/styles-menu-fluxmod
+	doins "${FILESDIR}"/styles-menu-fluxmod || die
 }
 
 pkg_postinst() {
@@ -52,5 +50,4 @@ pkg_postinst() {
 	einfo "these to work, fluxbox must be built with USE=\"imlib\" and"
 	einfo "imlib2 must be built with USE=\"png\"."
 	einfo
-	epause
 }
diff --git a/x11-themes/fluxbox-styles-fluxmod/fluxbox-styles-fluxmod-20050128.ebuild b/x11-themes/fluxbox-styles-fluxmod/fluxbox-styles-fluxmod-20050128.ebuild
deleted file mode 100644
index ac1a6f11e3b6..000000000000
--- a/x11-themes/fluxbox-styles-fluxmod/fluxbox-styles-fluxmod-20050128.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fluxbox-styles-fluxmod/fluxbox-styles-fluxmod-20050128.ebuild,v 1.13 2009/03/29 16:03:19 solar Exp $
-
-inherit eutils
-
-DESCRIPTION="A collection of FluxBox themes from FluxMod"
-HOMEPAGE="http://tenr.de/styles/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
-
-IUSE=""
-DEPEND=">=sys-apps/sed-4"
-RDEPEND=">=x11-wm/fluxbox-0.9.11"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# comment out every rootcommand
-	find . -name '*.cfg' -exec \
-		sed -i "{}" -e 's-^\(rootcommand\)-!!! \1-i' \;
-	# weird tarball...
-	find . -exec chmod a+r '{}' \;
-}
-
-src_install() {
-	mkdir -p "${D}"/usr/share/fluxbox/fluxmod/styles/ || die "mkdir eeked"
-	cp -R ./ "${D}"/usr/share/fluxbox/fluxmod/styles/ || die "cp croaked"
-	insinto /usr/share/fluxbox/menu.d/styles
-	doins "${FILESDIR}"/styles-menu-fluxmod
-}
-
-pkg_postinst() {
-	einfo
-	einfo "These styles are installed into /usr/share/fluxbox/fluxmod/. The"
-	einfo "best way to use these styles is to ensure that you are running"
-	einfo "fluxbox 0.9.10-r3 or later, and then to place the following in"
-	einfo "your menu file:"
-	einfo
-	einfo "    [submenu] (Styles) {Select a Style}"
-	einfo "        [include] (/usr/share/fluxbox/menu.d/styles/)"
-	einfo "    [end]"
-	einfo
-	einfo "If you use fluxbox-generate_menu or the default global fluxbox"
-	einfo "menu file, this will already be present."
-	einfo
-	einfo "Note that some of these styles use the PNG image format. For"
-	einfo "these to work, fluxbox must be built with USE=\"imlib\" and"
-	einfo "imlib2 must be built with USE=\"png\"."
-	einfo
-	epause
-}