Use fixed tarballs from bug #291736 to install the gentoo-ten themes correct. Remove revision with the incorrect tarballs. Use doins instead of cp.

Package-Manager: portage-2.1.6.13/cvs/Linux i686
RepoMan-Options: --force

3 files changed, 26 insertions, 17 deletions

diff --git a/x11-themes/slim-themes/ChangeLog b/x11-themes/slim-themes/ChangeLog
index 0c62506bc582..cd80d15cc7cc 100644
--- a/x11-themes/slim-themes/ChangeLog
+++ b/x11-themes/slim-themes/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-themes/slim-themes
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/slim-themes/ChangeLog,v 1.24 2009/12/09 15:36:16 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/slim-themes/ChangeLog,v 1.25 2009/12/19 16:19:53 billie Exp $
+
+*slim-themes-1.2.3a-r5 (19 Dec 2009)
+
+  19 Dec 2009; Daniel Pielmeier <billie@gentoo.org>
+  -slim-themes-1.2.3a-r4.ebuild, +slim-themes-1.2.3a-r5.ebuild:
+  Use fixed tarballs from bug #291736 to install the gentoo-ten themes
+  correct. Remove revision with the incorrect tarballs. Use doins instead
+  of cp.
 
   09 Dec 2009; Brent Baude <ranger@gentoo.org> ChangeLog:
   Marking slim-themes-1.2.3a-r3 ppc64 and -r4 ~ppc64 for bug 293332
diff --git a/x11-themes/slim-themes/Manifest b/x11-themes/slim-themes/Manifest
index bb262aa81a03..f67d5a5c8be1 100644
--- a/x11-themes/slim-themes/Manifest
+++ b/x11-themes/slim-themes/Manifest
@@ -1,7 +1,7 @@
 DIST 48605-xfce-g-box-slim-0.1.tar.gz 477441 RMD160 8206023aa0eb67ee1d88af4cacecf7ffbc8067a6 SHA1 c378bb8031e4b38bf02713bdbf4ee6bc22cfc7a7 SHA256 39e86a21d041778e955302d73f3631559e184384e666a6fe52540780a82b7c42
-DIST gentoo_10_blue.tar.bz2 1507034 RMD160 ebe069ceb84595966c5868f92392d23db0b79e58 SHA1 0d92bbe5f251b584eee519e6a2ef362057ccb273 SHA256 1683fb67ef6286b26d3b7a97cbc6e06332ed4ab6aa1b1ab3110796b991ef1951
-DIST gentoo_10_dark.tar.bz2 411448 RMD160 c5db4ecd438ea6877a08de19ae1b812fdc65d27d SHA1 d455b2e7dfa5a1a3658bbe65012913158dd9eddb SHA256 aaf903f7ea688e2b7fb737523fe3f2c52ce0c037d1e1dc6e7a33da65d9db37c3
-DIST gentoo_10_purple.tar.bz2 1397608 RMD160 b62951857c379157cea9312d6753f6a889e52f99 SHA1 34361596f0f38969399c28d80c6b43ee05dfea9e SHA256 0c9c18121a1ce9be18e86b280a5cb56d0aec89397916fab1eac9985557c05c21
+DIST gentoo_10_blue.tar.bz2 1507298 RMD160 2fa63125ac08c59a4ca35bd1f5ab3c2fc2ff0fa7 SHA1 9fa1e7b5a73b617cf921e9d6927794ada792b699 SHA256 403d8c25c4d3bb9b1e7ea7198169e09557102f8fab9e4a3094dd59b901bfa415
+DIST gentoo_10_dark.tar.bz2 411413 RMD160 0f14a8f431f56674c37eecbb72c4912a6164dbad SHA1 c7c9033e117f11bc1d6ecd4b32eca2769b86e761 SHA256 0c190a67bb3ca07f8fdb1c7f79876a3df7c94b581ade03b1958530650344ccfc
+DIST gentoo_10_purple.tar.bz2 1397713 RMD160 e3bfc7e84d8a1c9ce3d43e017f4e18fec3be0d0c SHA1 ba8784530e42a3ba2db0f8d5484bd157b540dd15 SHA256 13f5944d7100de03bc9c06f370e1a1ffc3e57cd734c287f149d8aa89162f5c10
 DIST slim-1.2.3-themepack1a.tar.gz 1919561 RMD160 93aefe47d42eacb93fb0ee52c219d4ecea32b7e7 SHA1 d01e40fcea408290b76d35255af34eeedc418418 SHA256 244b7326157eee947348ce4b48a1d62587600affaded9bc4ad4199a2d6f1825b
 DIST slim-archlinux-simple.tar.gz 10078 RMD160 26b499d11130d27ed2acb382fc5d34c47c0e683e SHA1 4bc79f730d398f748f8bbd0fbb365bec7ec524e9 SHA256 7d60d6782fa86302646fe67253467c04692d247f89bdbe87178f690f32b270db
 DIST slim-archlinux.tar.gz 137157 RMD160 568689c05870c215fb6388b23cd82320d64672fe SHA1 dc57109b8c940a3e428372ccba18ac7c5f6f3592 SHA256 8e8a4c51675dd7ce32ce38a6af43e109047cbf604105d6ba739fe1339f2b53dd
@@ -20,6 +20,6 @@ DIST slim-subway.tar.gz 259307 RMD160 c191199c787f7d71fd3e7153292e4780e3ee11b5 S
 DIST slim-wave.tar.gz 277774 RMD160 785c683b6d198178500343def6cad1724eb70b10 SHA1 3c656c18276358c9bf2e1e8d99453977475d2294 SHA256 be75676da5bf8670daa48379bb9cc1be0b9a5faa09adbea967dfd7125320b959
 DIST slim-zenwalk.tar.gz 337070 RMD160 82d0d02518e5fc00cc6f3f51ba3cf5add8ee6b7d SHA1 0adac560f318d63d8de54c6f11317aff44cf01ff SHA256 f0f41d17ea505b0aa96a036e978fabaf673a51d3f81a919cb0d43364d4bc7a57
 EBUILD slim-themes-1.2.3a-r3.ebuild 1754 RMD160 cd6e2ec3a12fd297ab6051f81289a3857addd95b SHA1 54ceac8d594153d2b8797eeda7450197246526e3 SHA256 6020be21512bdba784c3e01c75c237a933b01bfe667a69c74aeec40d5b2177cb
-EBUILD slim-themes-1.2.3a-r4.ebuild 1913 RMD160 3a8a826b3cd28a70a957c6d441fa39a5681dad14 SHA1 698ed9cfeac1d41020b888334ba52b130f2725c9 SHA256 ff3bc141e8b287f325127ce506d2525f91a05129ee13cb6a33390030ff121f7b
-MISC ChangeLog 3371 RMD160 91246c4b801b828dccdcf8f4609caab0e687d47a SHA1 670b4030d6e5df16a457e4f1f89f13871c723db0 SHA256 b40f81934d2fa85b3b665edae7ae18f4620d992a624ece0fc4a8e1608f148fc3
+EBUILD slim-themes-1.2.3a-r5.ebuild 2049 RMD160 a3ee3e460288f94b4bd027fe664cfd50314018e2 SHA1 a934a55685c413a92e582320b687c97844f3a7f8 SHA256 2dba65a85251dd9d6deeacbecc531a9ab3d94097c2f027ca279925d87ad3826c
+MISC ChangeLog 3680 RMD160 ddc87187fd3562b6751dab54920237bd7958d990 SHA1 a9d59e3a521044d8d7264308373198cd2a712850 SHA256 a5067c4309b99940c37d27761b890edd1154888ed35731142ec7337dae78b55e
 MISC metadata.xml 233 RMD160 cdc8b3d6e2c4eaff8f37088ee4e9c68c6eca7cd2 SHA1 5c3eaf0604c2e1273d7892ce1317a2525ce7d1c4 SHA256 46d923a7ef5b27ee3a8a182c96567dfe7013b0f2eb59930f332d8ade5b09f610
diff --git a/x11-themes/slim-themes/slim-themes-1.2.3a-r4.ebuild b/x11-themes/slim-themes/slim-themes-1.2.3a-r5.ebuild
index 2094d7ab226d..38547eee634c 100644
--- a/x11-themes/slim-themes/slim-themes-1.2.3a-r4.ebuild
+++ b/x11-themes/slim-themes/slim-themes-1.2.3a-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/slim-themes/slim-themes-1.2.3a-r4.ebuild,v 1.4 2009/12/08 19:23:58 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/slim-themes/slim-themes-1.2.3a-r5.ebuild,v 1.1 2009/12/19 16:19:53 billie Exp $
 
 DESCRIPTION="SLiM (Simple Login Manager) themes pack"
 HOMEPAGE="http://slim.berlios.de"
@@ -22,9 +22,9 @@ SRC_URI="mirror://berlios/slim/slim-1.2.3-themepack1a.tar.gz
 	mirror://berlios/slim/slim-lake.tar.gz
 	mirror://gentoo/slim-gentoo-1.0.tar.bz2
 	http://www.xfce-look.org/CONTENT/content-files/48605-xfce-g-box-slim-0.1.tar.gz
-	http://slim.berlios.de/themes/gentoo_10_blue.tar.bz2
-	http://slim.berlios.de/themes/gentoo_10_purple.tar.bz2
-	http://slim.berlios.de/themes/gentoo_10_dark.tar.bz2"
+	http://www.konstantinhansen.de/source/slim_themes/gentoo_10_purple/gentoo_10_purple.tar.bz2
+	http://www.konstantinhansen.de/source/slim_themes/gentoo_10_blue/gentoo_10_blue.tar.bz2
+	http://www.konstantinhansen.de/source/slim_themes/gentoo_10_dark/gentoo_10_dark.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -43,15 +43,16 @@ src_compile() {
 }
 
 src_install() {
-	for i in slim-archlinux capernoited flower2 mindlock lotus-{sage,midnight} \
-		Zenwalk	isolated subway xfce-g-box gentoo; do
-			rm ${i}/README
+	for i in capernoited flower2 gentoo isolated lotus-{sage,midnight} \
+		mindlock slim-archlinux subway xfce-g-box Zenwalk ; do
+			rm ${i}/README || die "rm README"
 	done
 
-	rm parallel-dimensions/{LICENSE*,COPY*} debian-moreblue/COPY* \
-		lotus-{sage,midnight}/{LICENSE*,COPY*} xfce-g-box/COPYRIGHT.panel
+	rm debian-moreblue/COPY* lotus-{sage,midnight}/{LICENSE*,COPY*} \
+		parallel-dimensions/{LICENSE*,COPY*} xfce-g-box/COPYRIGHT.panel \
+		|| die "rm LICENSE"
 
 	local themesdir="/usr/share/slim/themes"
-	dodir ${themesdir}
-	cp -R . "${D}"/${themesdir}
+	insinto ${themesdir}
+	doins -r .
 }