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

(Portage version: 2.1.4_rc14)

4 files changed, 31 insertions, 22 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/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() {