get rid of s390x IUSE flag

Package-Manager: portage-2.0.51.22-r1

3 files changed, 29 insertions, 21 deletions

diff --git a/sys-apps/s390-oco/Manifest b/sys-apps/s390-oco/Manifest
index b17bf687ff7f..443c360ca8ca 100644
--- a/sys-apps/s390-oco/Manifest
+++ b/sys-apps/s390-oco/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 fad2894ed4b2781615035f6906fd756a s390-oco-2.4.21-r1.ebuild 1143
-MD5 91ab81cab9dc710402dd3b0fe947a820 s390-oco-2.6.5.ebuild 1149
-MD5 04903ee85a4cc5273646eca776969064 ChangeLog 946
+MD5 a8f8af4a76613c1ac6eba7876eac6f14 s390-oco-2.4.21-r1.ebuild 1179
 MD5 64ff0642bc91fe55820a19224b0f6cd4 metadata.xml 300
+MD5 4b6e1c4094b9704f04e04b9315690f50 s390-oco-2.6.5.ebuild 1185
+MD5 04903ee85a4cc5273646eca776969064 ChangeLog 946
+MD5 db71e65184d8020e3eabce05a1a4964f files/digest-s390-oco-2.6.5 163
 MD5 41a32754cfe21639279f3113146493bc files/digest-s390-oco-2.4.21-r1 167
 MD5 b43c4c5b51c43d85b1aab3939e18ea03 files/s390-oco 65
-MD5 db71e65184d8020e3eabce05a1a4964f files/digest-s390-oco-2.6.5 163
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC0dwuBXaUFmZvwyMRAghWAKCb8ynozcb0XBkeST0392wqQY1pfQCgpdau
-YEbqIxB3aP9qHyFIRdaugmI=
-=0FrT
+iD8DBQFC0x9TgIKl8Uu19MoRAsitAJwP5tWOUgWETw8PcgRMT9akbFpX5wCeMsXB
+dplB5wRNWyfftFmMwPmqtKw=
+=XjBw
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/s390-oco/s390-oco-2.4.21-r1.ebuild b/sys-apps/s390-oco/s390-oco-2.4.21-r1.ebuild
index edee3c78bb75..cc9b1b58cf58 100644
--- a/sys-apps/s390-oco/s390-oco-2.4.21-r1.ebuild
+++ b/sys-apps/s390-oco/s390-oco-2.4.21-r1.ebuild
@@ -1,19 +1,23 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-oco/s390-oco-2.4.21-r1.ebuild,v 1.2 2005/07/11 02:40:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-oco/s390-oco-2.4.21-r1.ebuild,v 1.3 2005/07/12 01:38:16 vapier Exp $
 
 DESCRIPTION="Object-code only (OCO) modules for s390"
-SRC_URI="s390x? ( tape3590-2.4.21-s390x-02-june2003.tar.gz )
-	!s390x? ( tape3590-2.4.21-s390-02-june2003.tar.gz )"
 HOMEPAGE="http://oss.software.ibm.com/developerworks/opensource/linux390/june2003_recommended.shtml"
+if [[ ${CTARGET:-${CHOST}} == s390x-* ]] ; then
+SRC_URI="tape3590-2.4.21-s390x-02-june2003.tar.gz"
+else
+SRC_URI="tape3590-2.4.21-s390-02-june2003.tar.gz"
+fi
+
 LICENSE="IBM-ILNWP"
-KEYWORDS="~s390"
 SLOT="${KV}"
-DEPEND="=sys-kernel/vanilla-sources-2.4.21"
-IUSE="s390x"
-
+KEYWORDS="~s390"
+IUSE=""
 RESTRICT="fetch"
 
+DEPEND="~sys-kernel/vanilla-sources-2.4.21"
+
 pkg_nofetch() {
 	einfo "Please download ${A} from"
 	einfo ""
diff --git a/sys-apps/s390-oco/s390-oco-2.6.5.ebuild b/sys-apps/s390-oco/s390-oco-2.6.5.ebuild
index 45a00f5a5166..1a8e69e451b6 100644
--- a/sys-apps/s390-oco/s390-oco-2.6.5.ebuild
+++ b/sys-apps/s390-oco/s390-oco-2.6.5.ebuild
@@ -1,19 +1,23 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-oco/s390-oco-2.6.5.ebuild,v 1.6 2005/07/11 02:40:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-oco/s390-oco-2.6.5.ebuild,v 1.7 2005/07/12 01:38:16 vapier Exp $
 
 DESCRIPTION="Object-code only (OCO) modules for s390"
-SRC_URI="s390x? ( tape_3590-2.6.5-s390x-april2004.tar.gz )
-	!s390x? ( tape_3590-2.6.5-s390-april2004.tar.gz )"
 HOMEPAGE="http://www10.software.ibm.com/developerworks/opensource/linux390/tape_3590-2.6.5-s390-april2004.shtml"
+if [[ ${CTARGET:-${CHOST}} == s390x-* ]] ; then
+SRC_URI="tape_3590-2.6.5-s390x-april2004.tar.gz"
+else
+SRC_URI="tape_3590-2.6.5-s390-april2004.tar.gz"
+fi
+
 LICENSE="IBM-ILNWP"
-KEYWORDS="~s390"
 SLOT="${KV}"
-DEPEND="~sys-kernel/vanilla-sources-2.6.5"
-IUSE="s390x"
-
+KEYWORDS="~s390"
+IUSE=""
 RESTRICT="fetch"
 
+DEPEND="~sys-kernel/vanilla-sources-2.6.5"
+
 pkg_nofetch() {
 	einfo "Please download ${A} from"
 	einfo ""