Cleanup old rules, add in s390x, and make sure we catch future additions automatically.

Package-Manager: portage-2.1.4_rc14

5 files changed, 57 insertions, 38 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index c8838f68f65e..2d858484278e 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/cdrtools
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.195 2008/01/05 06:15:22 beandog Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.196 2008/01/11 03:59:03 vapier Exp $
+
+  11 Jan 2008; Mike Frysinger <vapier@gentoo.org>
+  cdrtools-2.01.01_alpha34.ebuild, cdrtools-2.01.01_alpha36.ebuild,
+  cdrtools-2.01.01_alpha36-r1.ebuild:
+  Cleanup old rules, add in s390x, and make sure we catch future additions
+  automatically.
 
 *cdrtools-2.01.01_alpha36-r1 (05 Jan 2008)
 
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 3eacca6a4d74..60720790fc6a 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cdrtools-2.01-scsi-remote.patch 938 RMD160 146ba7ddd5a0d987ea554bcf7e50aea5bf0690ff SHA1 0388616bf453e46fa3186c93cc17f881508aa562 SHA256 93719cbcbf594be14e0aa993b49157fc6be2885e94f4a92947ea73bd58ed2a62
 MD5 3b1ffea11e1653b7b16c2c89597d1c5a files/cdrtools-2.01-scsi-remote.patch 938
 RMD160 146ba7ddd5a0d987ea554bcf7e50aea5bf0690ff files/cdrtools-2.01-scsi-remote.patch 938
@@ -38,22 +41,22 @@ EBUILD cdrtools-2.01.01_alpha25.ebuild 3675 RMD160 8148cf8633d9ce054015ac628fe3c
 MD5 498bc5d11eb5b38f2dfc3b28d4c7af10 cdrtools-2.01.01_alpha25.ebuild 3675
 RMD160 8148cf8633d9ce054015ac628fe3cc1f1b7bcc7b cdrtools-2.01.01_alpha25.ebuild 3675
 SHA256 a0740b34e28a8cc7f568dddb14b8e6794730fbaa2fce14ee1b6e0239281868ad cdrtools-2.01.01_alpha25.ebuild 3675
-EBUILD cdrtools-2.01.01_alpha34.ebuild 3616 RMD160 6fac1f8162bf9c1fedb9d285a99194cb77639ecb SHA1 ee118a00b4d150086c3eb02eb9dda2f8f8815f9e SHA256 f4f2172b855fa521960655d8652cacf293dc2dcff5bd0099447697f4a5504206
-MD5 a7c5cd6ab06ce4aa992fd39800651aca cdrtools-2.01.01_alpha34.ebuild 3616
-RMD160 6fac1f8162bf9c1fedb9d285a99194cb77639ecb cdrtools-2.01.01_alpha34.ebuild 3616
-SHA256 f4f2172b855fa521960655d8652cacf293dc2dcff5bd0099447697f4a5504206 cdrtools-2.01.01_alpha34.ebuild 3616
-EBUILD cdrtools-2.01.01_alpha36-r1.ebuild 3663 RMD160 e15ce050cba68366eef3412eb21a57da5d077447 SHA1 422411f66ee169c26b324bda681024829bd64b4d SHA256 e92ec05d2f8f96c1b17c46e0577556f4e8113cc7476a2fb50d3c8decd9379727
-MD5 b56f5e6957745a2c406780331765e7c8 cdrtools-2.01.01_alpha36-r1.ebuild 3663
-RMD160 e15ce050cba68366eef3412eb21a57da5d077447 cdrtools-2.01.01_alpha36-r1.ebuild 3663
-SHA256 e92ec05d2f8f96c1b17c46e0577556f4e8113cc7476a2fb50d3c8decd9379727 cdrtools-2.01.01_alpha36-r1.ebuild 3663
-EBUILD cdrtools-2.01.01_alpha36.ebuild 3642 RMD160 1a52df26946192e67350b0f7064c7b506c0d17e1 SHA1 90625ff55ef1a8b56ff87422a7ccb576cceaf47b SHA256 d9e91f2fab3a2d322a10905b66d80379e19fc80e05f30140dae6388539b11a9e
-MD5 3c49b62a60fdec1b9c8733db31c66255 cdrtools-2.01.01_alpha36.ebuild 3642
-RMD160 1a52df26946192e67350b0f7064c7b506c0d17e1 cdrtools-2.01.01_alpha36.ebuild 3642
-SHA256 d9e91f2fab3a2d322a10905b66d80379e19fc80e05f30140dae6388539b11a9e cdrtools-2.01.01_alpha36.ebuild 3642
-MISC ChangeLog 29272 RMD160 8ac62db14235c783f6744180945b5f25677947c0 SHA1 cdf16eab836cebbd7d48672d96fdb7e681d8250b SHA256 f462fe9afef1352d596c7706a28c7260d4fab70700ec12cf710d4ca0d2f8c2bc
-MD5 93bdb6c7c94895b19b2c3525fab19282 ChangeLog 29272
-RMD160 8ac62db14235c783f6744180945b5f25677947c0 ChangeLog 29272
-SHA256 f462fe9afef1352d596c7706a28c7260d4fab70700ec12cf710d4ca0d2f8c2bc ChangeLog 29272
+EBUILD cdrtools-2.01.01_alpha34.ebuild 3589 RMD160 bc282159bced1662284946d69b90c3609db3b59d SHA1 93ade88b8b12f6acefc054d070a930414fd8dead SHA256 27324a03dabf1459a75815208cf6a2f509404806407eaedc98fe771617dbe371
+MD5 5bdae09799cc352f9a59538771be61ee cdrtools-2.01.01_alpha34.ebuild 3589
+RMD160 bc282159bced1662284946d69b90c3609db3b59d cdrtools-2.01.01_alpha34.ebuild 3589
+SHA256 27324a03dabf1459a75815208cf6a2f509404806407eaedc98fe771617dbe371 cdrtools-2.01.01_alpha34.ebuild 3589
+EBUILD cdrtools-2.01.01_alpha36-r1.ebuild 3635 RMD160 d41bf568c7ab91da2de0cc5a76d54a29597f0e03 SHA1 059f79f935f5e8e37b87280c1c884ed36ab62dc3 SHA256 d8294560997673852e2e85be6521a5d6943eacb2309c892df1e3c001ed7cad11
+MD5 a9245e185cd8a360cc4cf73520e38bba cdrtools-2.01.01_alpha36-r1.ebuild 3635
+RMD160 d41bf568c7ab91da2de0cc5a76d54a29597f0e03 cdrtools-2.01.01_alpha36-r1.ebuild 3635
+SHA256 d8294560997673852e2e85be6521a5d6943eacb2309c892df1e3c001ed7cad11 cdrtools-2.01.01_alpha36-r1.ebuild 3635
+EBUILD cdrtools-2.01.01_alpha36.ebuild 3616 RMD160 2c2c234434d89cbdcf89e6a84777a69a68817f51 SHA1 9194ee550ed5483f88041c4418302580c1e70415 SHA256 55d50722de5215896afae5746e19a7c0c9c612a8b4403c44166c39d4d79315d8
+MD5 20a8509b38a9d3cb305d161e56b54cc5 cdrtools-2.01.01_alpha36.ebuild 3616
+RMD160 2c2c234434d89cbdcf89e6a84777a69a68817f51 cdrtools-2.01.01_alpha36.ebuild 3616
+SHA256 55d50722de5215896afae5746e19a7c0c9c612a8b4403c44166c39d4d79315d8 cdrtools-2.01.01_alpha36.ebuild 3616
+MISC ChangeLog 29520 RMD160 b19032db2ca0201c884ca9c0f05f11a699e9bcd8 SHA1 2a18408119481c9eec2943215b5e35544f33b7cf SHA256 24c10eab6e7fbe29be89593dcbffe0eb8407cfa9f0561192f7ce7c88a383c9db
+MD5 9bdf0f2e681bdaacbe5c5b125ccf7eb0 ChangeLog 29520
+RMD160 b19032db2ca0201c884ca9c0f05f11a699e9bcd8 ChangeLog 29520
+SHA256 24c10eab6e7fbe29be89593dcbffe0eb8407cfa9f0561192f7ce7c88a383c9db ChangeLog 29520
 MISC metadata.xml 254 RMD160 f274a70fa23d8064efddcce296e0aed3344bd86b SHA1 ab52ea446603ae6242dae41e0c90fcf7ae8f09cf SHA256 21400abf2dad3e5b7b0d2f7f9586c33cba6336b42a97e1f2b3e7e8b9db0daae5
 MD5 015ab4293805faaa417d5ac5304750c4 metadata.xml 254
 RMD160 f274a70fa23d8064efddcce296e0aed3344bd86b metadata.xml 254
@@ -73,3 +76,10 @@ SHA256 3b828d415772a9d605a2f72631e9cd680d307b82478b09aef452eac791f9723b files/di
 MD5 54828e68ade2f0cc3bd4f1bff2f5143a files/digest-cdrtools-2.01.01_alpha36-r1 265
 RMD160 5362c4b6a647652d7954064abf4463797b1fbca2 files/digest-cdrtools-2.01.01_alpha36-r1 265
 SHA256 3b828d415772a9d605a2f72631e9cd680d307b82478b09aef452eac791f9723b files/digest-cdrtools-2.01.01_alpha36-r1 265
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkeG6b8ACgkQj9hvisErhMJlwQCg47jxMSjCCguR2RUV4TZdASkv
+WlYAoOoRFcl1Nqq+JX5BG6QOyQ4beEqz
+=AGa0
+-----END PGP SIGNATURE-----
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha34.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha34.ebuild
index 9b159286b326..23c1d4330386 100644
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha34.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha34.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha34.ebuild,v 1.11 2007/12/11 08:57:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha34.ebuild,v 1.12 2008/01/11 03:59:03 vapier Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -40,12 +40,13 @@ src_unpack() {
 	cd "${S}"/librscg
 	sed -i "s:/opt/schily:/usr:g" scsi-remote.c
 
+	# lame symlinks that all point to the same thing
 	cd "${S}"/RULES
-	ln -sf i386-linux-cc.rul x86_64-linux-cc.rul
-	ln -sf i386-linux-gcc.rul x86_64-linux-gcc.rul
-	ln -sf ppc-linux-cc.rul ppc64-linux-cc.rul
-	ln -sf mips-linux-cc.rul mips64-linux-cc.rul
-	ln -sf i586-linux-cc.rul sh4-linux-cc.rul
+	local t
+	for t in ppc64 sh4 s390x ; do
+		ln -s i586-linux-cc.rul ${t}-linux-cc.rul || die
+		ln -s i586-linux-gcc.rul ${t}-linux-gcc.rul || die
+	done
 }
 
 src_compile() {
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha36-r1.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha36-r1.ebuild
index 4b2e9e3ba689..63c8008ee1e7 100644
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha36-r1.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha36-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha36-r1.ebuild,v 1.1 2008/01/05 06:15:22 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha36-r1.ebuild,v 1.2 2008/01/11 03:59:03 vapier Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -41,12 +41,13 @@ src_unpack() {
 	cd "${S}"/librscg
 	sed -i "s:/opt/schily:/usr:g" scsi-remote.c
 
+	# lame symlinks that all point to the same thing
 	cd "${S}"/RULES
-	ln -sf i386-linux-cc.rul x86_64-linux-cc.rul
-	ln -sf i386-linux-gcc.rul x86_64-linux-gcc.rul
-	ln -sf ppc-linux-cc.rul ppc64-linux-cc.rul
-	ln -sf mips-linux-cc.rul mips64-linux-cc.rul
-	ln -sf i586-linux-cc.rul sh4-linux-cc.rul
+	local t
+	for t in ppc64 sh4 s390x ; do
+		ln -s i586-linux-cc.rul ${t}-linux-cc.rul || die
+		ln -s i586-linux-gcc.rul ${t}-linux-gcc.rul || die
+	done
 }
 
 src_compile() {
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha36.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha36.ebuild
index 9f74b3698706..3e01c7aa3d93 100644
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha36.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha36.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha36.ebuild,v 1.2 2007/11/11 12:18:14 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha36.ebuild,v 1.3 2008/01/11 03:59:03 vapier Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -40,12 +40,13 @@ src_unpack() {
 	cd "${S}"/librscg
 	sed -i "s:/opt/schily:/usr:g" scsi-remote.c
 
+	# lame symlinks that all point to the same thing
 	cd "${S}"/RULES
-	ln -sf i386-linux-cc.rul x86_64-linux-cc.rul
-	ln -sf i386-linux-gcc.rul x86_64-linux-gcc.rul
-	ln -sf ppc-linux-cc.rul ppc64-linux-cc.rul
-	ln -sf mips-linux-cc.rul mips64-linux-cc.rul
-	ln -sf i586-linux-cc.rul sh4-linux-cc.rul
+	local t
+	for t in ppc64 sh4 s390x ; do
+		ln -s i586-linux-cc.rul ${t}-linux-cc.rul || die
+		ln -s i586-linux-gcc.rul ${t}-linux-gcc.rul || die
+	done
 }
 
 src_compile() {