Remove x11-wm/icewm dep. Thanks to Alexandre Perrin. bug #180946

(Portage version: 2.1.2.7)

4 files changed, 39 insertions, 37 deletions

diff --git a/x11-themes/icewm-themes/ChangeLog b/x11-themes/icewm-themes/ChangeLog
index fd02757b2309..0f1f560209b6 100644
--- a/x11-themes/icewm-themes/ChangeLog
+++ b/x11-themes/icewm-themes/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-themes/icewm-themes
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/icewm-themes/ChangeLog,v 1.14 2007/03/21 04:51:16 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/icewm-themes/ChangeLog,v 1.15 2007/07/02 14:23:08 coldwind Exp $
+
+  02 Jul 2007; Santiago M. Mola <coldwind@gentoo.org>
+  icewm-themes-0.0.1.ebuild, icewm-themes-0.0.1-r1.ebuild,
+  icewm-themes-0.0.2.ebuild:
+  Remove x11-wm/icewm dep. Thanks to Alexandre Perrin. bug #180946
 
 *icewm-themes-0.0.2 (21 Mar 2007)
 
diff --git a/x11-themes/icewm-themes/icewm-themes-0.0.1-r1.ebuild b/x11-themes/icewm-themes/icewm-themes-0.0.1-r1.ebuild
index 7afad14c65a5..60872ad139a3 100644
--- a/x11-themes/icewm-themes/icewm-themes-0.0.1-r1.ebuild
+++ b/x11-themes/icewm-themes/icewm-themes-0.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/icewm-themes/icewm-themes-0.0.1-r1.ebuild,v 1.7 2007/03/12 17:42:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/icewm-themes/icewm-themes-0.0.1-r1.ebuild,v 1.8 2007/07/02 14:23:08 coldwind Exp $
 
 DESCRIPTION="Collection of IceWM themes"
 HOMEPAGE="http://www.icewm.org/
@@ -18,36 +18,35 @@ SRC_URI="${THEME_URI}/icecrack/icecrack-default-2.0.0.tar.gz
 	${THEME_URI}/ufosightings/ufosightings-1.0.0.tar.gz
 	${THEME_URI}/1in1-xp/1in1-xp-default.tar.gz"
 
-SLOT="0"
-
 # icecrack, icebox, cyrus-icewm, ufosightings -> GPL-2
 # greyscaled -> Public Domain
 # 1in1-xp -> freedist
 LICENSE="GPL-2 public-domain freedist"
 KEYWORDS="amd64 ~ppc sparc x86"
-
+SLOT="0"
 IUSE=""
 
-RDEPEND="x11-wm/icewm"
+RDEPEND=""
+DEPEND=""
 
 S="${WORKDIR}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	find . -name \.xvpics | xargs rm -rf
 	find . -name \*~ | xargs rm -rf
 }
 
 src_install() {
 	local ICEWM_THEMES=/usr/share/icewm/themes
-	dodir ${ICEWM_THEMES}
-	cp -pR * ${D}/${ICEWM_THEMES}
-	chown -R root:0 ${D}/${ICEWM_THEMES}
+	dodir ${ICEWM_THEMES} || die
+	cp -pR * "${D}"/${ICEWM_THEMES} || die
+	chown -R root:0 "${D}"/${ICEWM_THEMES} || die
 	#chmod -R o-w ${D}/${ICEWM_THEMES}
-	rm -f ${D}/${ICEWM_THEMES}/Crus-IceWM/cpframes.sh || die
-	find ${D}/${ICEWM_THEMES} -type d | xargs chmod 755 || die
-	find ${D}/${ICEWM_THEMES} -type f | xargs chmod 644 || die
+	rm -f "${D}"/${ICEWM_THEMES}/Crus-IceWM/cpframes.sh || die
+	find "${D}"/${ICEWM_THEMES} -type d | xargs chmod 755 || die
+	find "${D}"/${ICEWM_THEMES} -type f | xargs chmod 644 || die
 }
 
 pkg_postinst() {
diff --git a/x11-themes/icewm-themes/icewm-themes-0.0.1.ebuild b/x11-themes/icewm-themes/icewm-themes-0.0.1.ebuild
index 6bab733f870a..4b2b68944232 100644
--- a/x11-themes/icewm-themes/icewm-themes-0.0.1.ebuild
+++ b/x11-themes/icewm-themes/icewm-themes-0.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/icewm-themes/icewm-themes-0.0.1.ebuild,v 1.6 2007/02/22 05:43:16 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/icewm-themes/icewm-themes-0.0.1.ebuild,v 1.7 2007/07/02 14:23:08 coldwind Exp $
 
 DESCRIPTION="Collection of IceWM themes"
 HOMEPAGE="http://www.icewm.org/
@@ -18,25 +18,24 @@ SRC_URI="${THEME_URI}/icecrack/icecrack-default-2.0.0.tar.gz
 	${THEME_URI}/ufosightings/ufosightings-1.0.0.tar.gz
 	${THEME_URI}/1in1-xp/1in1-xp-default.tar.gz"
 
-SLOT="0"
-
 # icecrack, icebox, cyrus-icewm, ufosightings -> GPL-2
 # greyscaled -> Public Domain
 # 1in1-xp -> freedist
 LICENSE="GPL-2 public-domain freedist"
-KEYWORDS="x86 ppc ~amd64"
-
+KEYWORDS="~amd64 ppc x86"
+SLOT="0"
 IUSE=""
 
 RDEPEND="x11-wm/icewm"
+DEPEND=""
 
 S="${WORKDIR}"
 
 src_install () {
-	dodir /usr/share/icewm/themes
-	cp -dpR * ${D}/usr/share/icewm/themes/
-	chown -R root:root ${D}/usr/share/icewm/themes/
-	chmod -R o-w ${D}/usr/share/icewm/themes/
+	dodir /usr/share/icewm/themes || die
+	cp -dpR * "${D}"/usr/share/icewm/themes/ || die
+	chown -R root:root "${D}"/usr/share/icewm/themes/ || die
+	chmod -R o-w "${D}"/usr/share/icewm/themes/ || die
 }
 
 pkg_postinst() {
diff --git a/x11-themes/icewm-themes/icewm-themes-0.0.2.ebuild b/x11-themes/icewm-themes/icewm-themes-0.0.2.ebuild
index 34e6838e5eb8..01e5f628d154 100644
--- a/x11-themes/icewm-themes/icewm-themes-0.0.2.ebuild
+++ b/x11-themes/icewm-themes/icewm-themes-0.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/icewm-themes/icewm-themes-0.0.2.ebuild,v 1.2 2007/06/26 03:01:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/icewm-themes/icewm-themes-0.0.2.ebuild,v 1.3 2007/07/02 14:23:08 coldwind Exp $
 
 DESCRIPTION="Collection of IceWM themes"
 HOMEPAGE="http://www.icewm.org/
@@ -44,8 +44,6 @@ SRC_URI="${THEME_URI}/icecrack/icecrack-default-2.0.0.tar.gz
 	http://themes.freshmeat.net/redir/kliin/32422/url_tgz/kliin-default-0.1.tar.gz
 	mirror://sourceforge/icewmsilverxp/SilverXP-1.2.17-single-1.tar.bz2"
 
-SLOT="0"
-
 ## GPL-2:
 # icecrack, icebox, cyrus-icewm, ufosightings, axxlite, phaaba,
 # winclassic, elberg, gertplastic, cruxteal, truecurve, bluecrux,
@@ -59,11 +57,12 @@ SLOT="0"
 ## BSD:
 # icequa
 LICENSE="GPL-2 public-domain freedist free-noncomm BSD"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
-
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+SLOT="0"
 IUSE=""
 
-RDEPEND="x11-wm/icewm"
+RDEPEND=""
+DEPEND=""
 
 S="${WORKDIR}"
 
@@ -76,24 +75,24 @@ src_unpack() {
 
 src_install() {
 	local ICEWM_THEMES=/usr/share/icewm/themes
-	dodir ${ICEWM_THEMES}
-	cp -pR * ${D}/${ICEWM_THEMES}
-	chown -R root:0 ${D}/${ICEWM_THEMES}
+	dodir ${ICEWM_THEMES} || die
+	cp -pR * "${D}"/${ICEWM_THEMES} || die
+	chown -R root:0 "${D}"/${ICEWM_THEMES} || die
 	rm -f ${D}/${ICEWM_THEMES}/Cyrus-IceWM/cpframes.sh || die "Failed in Cyrus-IceWM theme fix"
 
 	# start elberg theme packaging fix
-	mv ${D}/${ICEWM_THEMES}/themes/* ${D}/${ICEWM_THEMES} || die "Error in elberg theme fix"
-	rmdir ${D}/${ICEWM_THEMES}/themes || die "Error in elberg theme fix"
+	mv "${D}"/${ICEWM_THEMES}/themes/* "${D}"/${ICEWM_THEMES} || die "Error in elberg theme fix"
+	rmdir "${D}"/${ICEWM_THEMES}/themes || die "Error in elberg theme fix"
 	# end elberg theme packaging fix
 
 	# start silverxp theme packaging fix
-	mv ${D}/${ICEWM_THEMES}/icewm/themes/* ${D}/${ICEWM_THEMES} || die "Error in sivlerxp theme fix"
-	rm -rf ${D}/${ICEWM_THEMES}/icewm || die "Error in silverxp theme fix"
+	mv "${D}"/${ICEWM_THEMES}/icewm/themes/* "${D}"/${ICEWM_THEMES} || die "Error in sivlerxp theme fix"
+	rm -rf "${D}"/${ICEWM_THEMES}/icewm || die "Error in silverxp theme fix"
 	# end silverxp theme packaging fix
 
 	# use -print0 and xargs --null to handle file names with spaces!
-	find ${D}/${ICEWM_THEMES} -type d -print0 | xargs --null chmod 755 || die "Error changing permissions on theme dirs!"
-	find ${D}/${ICEWM_THEMES} -type f -print0 | xargs --null chmod 644 || die "Error changing permissions on theme files!"
+	find "${D}"/${ICEWM_THEMES} -type d -print0 | xargs --null chmod 755 || die "Error changing permissions on theme dirs!"
+	find "${D}"/${ICEWM_THEMES} -type f -print0 | xargs --null chmod 644 || die "Error changing permissions on theme files!"
 }
 
 pkg_postinst() {