Fix broken swig deps, after removing old swig ebuilds, reported by Mr_Bones

Package-Manager: portage-2.1.8.3/cvs/Linux i686

6 files changed, 23 insertions, 17 deletions

diff --git a/net-libs/opal/ChangeLog b/net-libs/opal/ChangeLog
index 2984300b5cb3..c082c2e2bd3d 100644
--- a/net-libs/opal/ChangeLog
+++ b/net-libs/opal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/opal
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.64 2010/07/20 18:41:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.65 2010/07/24 16:47:03 pchrist Exp $
+
+  24 Jul 2010; Panagiotis Christopoulos <pchrist@gentoo.org>
+  opal-3.6.4.ebuild, opal-3.6.4-r1.ebuild, opal-3.6.6.ebuild,
+  opal-3.6.7.ebuild:
+  Fix broken swig deps, after removing old swig ebuilds, reported by
+  Mr_Bones
 
   20 Jul 2010; Jeroen Roovers <jer@gentoo.org> opal-2.2.11.ebuild:
   Drop HPPA keywording (bug #324511).
diff --git a/net-libs/opal/Manifest b/net-libs/opal/Manifest
index 3c189b71980d..8ed444fd29be 100644
--- a/net-libs/opal/Manifest
+++ b/net-libs/opal/Manifest
@@ -9,9 +9,9 @@ DIST opal-3.6.6.tar.bz2 7062422 RMD160 b639709f7e28ce607478bddc41d171e0e54bee9f
 DIST opal-3.6.7-htmldoc.tar.bz2 5842269 RMD160 039b138991334e0ecdc243d73a8dbca6d13c4df4 SHA1 cb2c5ee78f8461a2e027f0142c96c0c5a70a55c1 SHA256 d6c11b162b4b26cfc3df2c2c12b5d8a0e1b2dfa5c6869995b0fafa2f2a716e7b
 DIST opal-3.6.7.tar.bz2 6874118 RMD160 bd0bf514f36a50b9eae2aedb150b868ea248fe62 SHA1 7da368a5b8464a1e71156d8076e76e006bcc6b1d SHA256 34cb1989c7b8b9e9b34b43f85384399403dabd9348e602651859c384b4cea03a
 EBUILD opal-2.2.11.ebuild 2604 RMD160 2dadccb1206d340d3c33987aa1147a43ab622463 SHA1 b3b29f137eae3437cc19118ea59d6d8ee8adba3a SHA256 8595bd00d707830cfc52f7de3b8993c0658f50306ddef296dea97c74d0285ba7
-EBUILD opal-3.6.4-r1.ebuild 8115 RMD160 9e4f678fa6cfa727caa49d444e540dda738ce2e9 SHA1 8a83b051fa6c3a25b6940e9d3660f7b17d9c1d50 SHA256 31839afcc9066d2b23c441c14fb3cb350b16740c49ca6efe54ed87762ffaed31
-EBUILD opal-3.6.4.ebuild 8152 RMD160 fdeaff42736a20d13d86cf34dc5e9b2b3b6e0c6c SHA1 d2cc3e882083a0ebedec169197e58435386c41a2 SHA256 896b8c6f9d04221af8ea6883639e13533bd4bde6cb101eff0bcaf3776b7859d5
-EBUILD opal-3.6.6.ebuild 8199 RMD160 4a691f2f7c11292367997ab21b71ff03cda1b0ae SHA1 da85dd9f1143912ffa5d78b983d9d47432fcee66 SHA256 f8123d8964afcc62f3d0eae46681a881c32f16ec605f56904b6847897f0b790a
-EBUILD opal-3.6.7.ebuild 8299 RMD160 1d88ad54571fad79c9ff63dbc35045baec583fa6 SHA1 3f7b47c594bea81d7a5aa6f371d1fd731fc355fa SHA256 f0da0506e88c6c860e981bf92181856f6b313d9ccfa417235be1f68f41371052
-MISC ChangeLog 8613 RMD160 0c9fc785163afba42646d99f1955f18b46f24720 SHA1 89d752f18b09dd1b7d11b510019f5b8a4c943303 SHA256 68a75d9d5e87dbfe419d904f9abe3a0d1435c7e69169c14a4f7dba5bd5ac3976
+EBUILD opal-3.6.4-r1.ebuild 8109 RMD160 e793814a8bb4a7c4f7ae281ab1049abe60b770ce SHA1 fe03fbd302b48b9596fabae7c65ce47eb609d966 SHA256 cf99ea743fe1a17f679f2dd9f27f2925c703898a9eef6bf88cec47a80dad2fd8
+EBUILD opal-3.6.4.ebuild 8146 RMD160 a6f09de2fed809700e351885a8c6635a9d1d95fe SHA1 e42c23a37d352ccbd2afca1cf2f0e22d84990ffe SHA256 2ff4bdc8be33e8aae8f9b69a0c2fff72d4891fb89086364abb016a612ee4bad5
+EBUILD opal-3.6.6.ebuild 8164 RMD160 884212975100305bdbc361e62dfe4431e2ce9ede SHA1 5c7e58d115b92bf6116e46b1d137c06be75d96e4 SHA256 3b18f866b58409111f1fe1c7ff3bb82f2478cd13454d571157d57df98f033558
+EBUILD opal-3.6.7.ebuild 8262 RMD160 2f958ac588fff29f37dacf8ba290930f74c25e71 SHA1 ebb7388135c7494ff7b8de469de09957ff00ad2a SHA256 b16e11d13c8fe45ee0139f5a877d893f9a8324a5d1e5a316d41a60f8b55805ec
+MISC ChangeLog 8842 RMD160 4fbb845f67ca536fc73c124285300159178e8750 SHA1 8c92d37bc71c3d62b5b054d9baeb78acbaea16d0 SHA256 e93f0e269e78dfdf9aed09c83739f9830f41a260c0c208a46178841d30718acb
 MISC metadata.xml 2065 RMD160 72f5b31577c61334a802fa85c51b4163c81aced1 SHA1 d1b558b04691f19a9eccc648708487c8d169db82 SHA256 065bbfbad937a4e217f16a4d2f410f4ff282ca5f869ca9387986d85a99add8b4
diff --git a/net-libs/opal/opal-3.6.4-r1.ebuild b/net-libs/opal/opal-3.6.4-r1.ebuild
index ff5909ea16c2..0c1692a09dd7 100644
--- a/net-libs/opal/opal-3.6.4-r1.ebuild
+++ b/net-libs/opal/opal-3.6.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.6.4-r1.ebuild,v 1.4 2009/12/17 16:38:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.6.4-r1.ebuild,v 1.5 2010/07/24 16:47:03 pchrist Exp $
 
 EAPI="2"
 
@@ -38,7 +38,7 @@ RDEPEND=">=net-libs/ptlib-2.0.0[stun,debug=,audio?,dtmf?,ipv6?,ldap?,ssl?,video?
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=sys-devel/gcc-3
-	java? ( swig? ( dev-lang/swig[java] )
+	java? ( swig? ( dev-lang/swig )
 		>=virtual/jdk-1.4 )"
 
 # NOTES:
diff --git a/net-libs/opal/opal-3.6.4.ebuild b/net-libs/opal/opal-3.6.4.ebuild
index 5097551baa18..b3709d3e036c 100644
--- a/net-libs/opal/opal-3.6.4.ebuild
+++ b/net-libs/opal/opal-3.6.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.6.4.ebuild,v 1.5 2009/12/17 16:38:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.6.4.ebuild,v 1.6 2010/07/24 16:47:03 pchrist Exp $
 
 EAPI="2"
 
@@ -37,7 +37,7 @@ RDEPEND=">=net-libs/ptlib-2.0.0[stun,debug=,audio?,dtmf?,ipv6?,ldap?,ssl?,video?
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=sys-devel/gcc-3
-	java? ( swig? ( dev-lang/swig[java] )
+	java? ( swig? ( dev-lang/swig )
 		>=virtual/jdk-1.4 )"
 
 # NOTES:
diff --git a/net-libs/opal/opal-3.6.6.ebuild b/net-libs/opal/opal-3.6.6.ebuild
index c2f24c311683..b7fc1dead678 100644
--- a/net-libs/opal/opal-3.6.6.ebuild
+++ b/net-libs/opal/opal-3.6.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.6.6.ebuild,v 1.5 2009/12/17 16:38:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.6.6.ebuild,v 1.6 2010/07/24 16:47:03 pchrist Exp $
 
 EAPI="2"
 
@@ -38,7 +38,7 @@ RDEPEND=">=net-libs/ptlib-2.6.4[stun,debug=,audio?,dtmf?,ipv6?,ldap?,ssl?,video?
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=sys-devel/gcc-3
-	java? ( swig? ( || ( dev-lang/swig[java] >dev-lang/swig-1.3.36 ) )
+	java? ( swig? ( dev-lang/swig )
 		>=virtual/jdk-1.4 )"
 
 # NOTES:
diff --git a/net-libs/opal/opal-3.6.7.ebuild b/net-libs/opal/opal-3.6.7.ebuild
index 1cf890736d22..56834469dd8f 100644
--- a/net-libs/opal/opal-3.6.7.ebuild
+++ b/net-libs/opal/opal-3.6.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.6.7.ebuild,v 1.4 2010/06/21 12:48:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.6.7.ebuild,v 1.5 2010/07/24 16:47:03 pchrist Exp $
 
 EAPI="2"
 
@@ -38,7 +38,7 @@ RDEPEND=">=net-libs/ptlib-2.6.6[stun,debug=,audio?,dtmf?,ipv6?,ldap?,ssl?,video?
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=sys-devel/gcc-3
-	java? ( swig? ( || ( dev-lang/swig[java] >dev-lang/swig-1.3.36 ) )
+	java? ( swig? ( dev-lang/swig )
 		>=virtual/jdk-1.4 )"
 
 # NOTES: