Fix building perl bindings, when python bindings are not requested

4 files changed, 35 insertions, 18 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index b0ba7df3578c..9f56c0a0c029 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.94 2004/09/01 11:00:21 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.95 2004/09/05 19:00:40 pauldv Exp $
+
+  05 Sep 2004; Paul de Vrieze,,, <paul@gentoo.org> subversion-1.0.6.ebuild
+  subversion-1.1.0_rc2.ebuild:
+  Fix bug #62753. swig is now build when either python or perl is in the
+  useflags, not python only.
 
   01 Sep 2004; <pauldv@gentoo.org> subversion-1.1.0_rc2.ebuild:
   Change the book installation location to it's own dir, to make it easier 
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index 042774424008..aa8a9a78f3e6 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -1,24 +1,24 @@
-MD5 c33ef8c1323364d5b65912964e8a331e ChangeLog 15828
-MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222
-MD5 1b9acc042ae6c0b58071cf9ea8adc57a subversion-0.27.0.ebuild 7880
-MD5 8e7e9cc71b32aa077ad07b7cc5a91fb5 subversion-0.32.1.ebuild 8129
 MD5 07f9802daceb1d3593dbc9c92d74a93f subversion-1.0.1.ebuild 8707
 MD5 6be599117174a63a1810de08ab2a068d subversion-1.0.2.ebuild 9223
 MD5 50b381d130b73e50c2cddbf95cf8ad42 subversion-1.0.3.ebuild 9229
+MD5 1b9acc042ae6c0b58071cf9ea8adc57a subversion-0.27.0.ebuild 7880
+MD5 8e7e9cc71b32aa077ad07b7cc5a91fb5 subversion-0.32.1.ebuild 8129
 MD5 6d782eebdb1eb7b3296fd8f7b9c3f98e subversion-1.0.4-r1.ebuild 9541
+MD5 ba77020b7a3e2a89993d6961a11d5c9b ChangeLog 16037
+MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222
 MD5 11edc2e84a30096642ba71e234b20108 subversion-1.0.4.ebuild 9381
-MD5 5f8e8ed51646a2be6ad0444f817649e5 subversion-1.0.6.ebuild 9541
-MD5 23c2b05780a072b0406c5c9898de8ec3 subversion-1.1.0_rc2.ebuild 8944
-MD5 4fd39b311d09602c93a9ff0aceaf8596 files/70svn-gentoo.el 136
+MD5 682fb327869fafeda7a079491c6393dd subversion-1.0.6.ebuild 9625
+MD5 91e10ceb13f0dd81b23587de67771ed4 subversion-1.1.0_rc2.ebuild 9030
 MD5 e232822bee0a8ed00f6b9d7805b83307 files/digest-subversion-0.27.0 132
-MD5 69cf99186dd88a6b26c6c121fc4c16a9 files/digest-subversion-0.32.1 132
 MD5 44e762d79cdf7048a3300c29c77f0e81 files/digest-subversion-1.0.1 70
 MD5 a92dea7d8f92e84faf8e695b2bd93d42 files/digest-subversion-1.0.2 70
+MD5 69cf99186dd88a6b26c6c121fc4c16a9 files/digest-subversion-0.32.1 132
 MD5 13e74109573f8771bd51e54f3f7ece95 files/digest-subversion-1.0.3 70
 MD5 8cfa170f6a78d0d7a1ab27cd35753efd files/digest-subversion-1.0.4 70
-MD5 8cfa170f6a78d0d7a1ab27cd35753efd files/digest-subversion-1.0.4-r1 70
 MD5 ea9382a1d5e2df9bc52c79d886a602ad files/digest-subversion-1.0.6 70
-MD5 6a166a8172b53473986039399e2e32d1 files/digest-subversion-1.1.0_rc2 74
-MD5 f3e0d5ef77de21c20c17dad5c1c5ce04 files/subversion-1.1.0-rc2-build.patch 1208
+MD5 4fd39b311d09602c93a9ff0aceaf8596 files/70svn-gentoo.el 136
 MD5 ce6f3698724b55cf49e647727207cca5 files/subversion-db4.patch 563
+MD5 8cfa170f6a78d0d7a1ab27cd35753efd files/digest-subversion-1.0.4-r1 70
 MD5 5246b9044c4d5fbd25d9e15268495fc2 files/subversion-pre-1.0.5.patch 3268
+MD5 6a166a8172b53473986039399e2e32d1 files/digest-subversion-1.1.0_rc2 74
+MD5 f3e0d5ef77de21c20c17dad5c1c5ce04 files/subversion-1.1.0-rc2-build.patch 1208
diff --git a/dev-util/subversion/subversion-1.0.6.ebuild b/dev-util/subversion/subversion-1.0.6.ebuild
index 41c101847bb8..ffb98d3279b2 100644
--- a/dev-util/subversion/subversion-1.0.6.ebuild
+++ b/dev-util/subversion/subversion-1.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.0.6.ebuild,v 1.8 2004/09/03 16:53:53 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.0.6.ebuild,v 1.9 2004/09/05 19:00:40 pauldv Exp $
 
 inherit elisp-common libtool python eutils
 
@@ -109,8 +109,14 @@ src_compile() {
 	use berkdb && myconf="${myconf} --with-berkeley-db"
 	use berkdb || myconf="${myconf} --without-berkeley-db"
 
-	use python && myconf="${myconf} --with-python=/usr/bin/python --with-swig"
-	use python || myconf="${myconf} --without-python --without-swig"
+	use python && myconf="${myconf} --with-python=/usr/bin/python"
+	use python || myconf="${myconf} --without-python"
+
+	if use python || use perl; then
+		myconf="${myconf} --with-swig"
+	else
+		myconf="${myconf} --without-swig"
+	fi
 
 	econf ${myconf} \
 		--with-neon=/usr \
diff --git a/dev-util/subversion/subversion-1.1.0_rc2.ebuild b/dev-util/subversion/subversion-1.1.0_rc2.ebuild
index 451566bc3ab7..da58206782a0 100644
--- a/dev-util/subversion/subversion-1.1.0_rc2.ebuild
+++ b/dev-util/subversion/subversion-1.1.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.1.0_rc2.ebuild,v 1.3 2004/09/01 11:00:21 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.1.0_rc2.ebuild,v 1.4 2004/09/05 19:00:40 pauldv Exp $
 
 inherit elisp-common libtool python eutils
 
@@ -103,8 +103,14 @@ src_compile() {
 	use berkdb && myconf="${myconf} --with-berkeley-db"
 	use berkdb || myconf="${myconf} --without-berkeley-db"
 
-	use python && myconf="${myconf} --with-python=/usr/bin/python --with-swig"
-	use python || myconf="${myconf} --without-python --without-swig"
+	use python && myconf="${myconf} --with-python=/usr/bin/python"
+	use python || myconf="${myconf} --without-python"
+
+	if use python || use perl; then
+		myconf="${myconf} --with-swig"
+	else
+		myconf="${myconf} --without-swig"
+	fi
 
 	econf ${myconf} \
 		--with-neon=/usr \