block makemaker

(Portage version: 2.0.53_rc7)

3 files changed, 17 insertions, 9 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index 49441ad9b4ed..72542e75e132 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.193 2005/12/01 08:43:55 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.194 2005/12/06 21:35:13 pauldv Exp $
+
+  06 Dec 2005; Paul de Vrieze <pauldv@gentoo.org>
+  subversion-1.2.3-r3.ebuild, subversion-1.3.0_rc4.ebuild:
+  Block extutils-makemaker as it has security vulnerabilities and isn't needed
+  with newer perl versions. Also mark 1.2.3-r3 stable as it hasn't had bugs for some
+  while.
 
 *subversion-1.3.0_rc4 (01 Dec 2005)
 
diff --git a/dev-util/subversion/subversion-1.2.3-r3.ebuild b/dev-util/subversion/subversion-1.2.3-r3.ebuild
index bb15c88921fb..f466f6f3de3f 100644
--- a/dev-util/subversion/subversion-1.2.3-r3.ebuild
+++ b/dev-util/subversion/subversion-1.2.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.2.3-r3.ebuild,v 1.4 2005/10/25 08:14:50 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.2.3-r3.ebuild,v 1.5 2005/12/06 21:35:13 pauldv Exp $
 
 inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache perl-module
 
@@ -10,18 +10,18 @@ SRC_URI="http://subversion.tigris.org/tarballs/${P/_rc/-rc}.tar.bz2"
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc x86"
 IUSE="apache2 berkdb python emacs perl java nls nowebdav zlib ruby"
 RESTRICT="test"
 
 # Presently subversion doesn't build with swig-1.3.22, bug 65424
 COMMONDEPEND="apache2? ( ${APACHE2_DEPEND} )
 	>=dev-libs/apr-util-0.9.5
-	python? ( >=dev-lang/swig-1.3.21 >=dev-lang/python-2.0 )
-	perl? ( >=dev-lang/swig-1.3.21
+	python? ( <=dev-lang/swig-1.3.25 >=dev-lang/python-2.0 )
+	perl? ( <=dev-lang/swig-1.3.25
 		>=dev-lang/perl-5.8.6-r6
 		!=dev-lang/perl-5.8.7 )
-	ruby? ( >=dev-lang/swig-1.3.25
+	ruby? ( <=dev-lang/swig-1.3.25
 		dev-lang/ruby )
 	!nowebdav? ( ~net-misc/neon-0.24.7 )
 	berkdb? ( =sys-libs/db-4* )
@@ -33,7 +33,8 @@ RDEPEND="${COMMONDEPEND}
 
 DEPEND="${COMMONDEPEND}
 	java? ( virtual/jdk )
-	>=sys-devel/autoconf-2.59"
+	>=sys-devel/autoconf-2.59
+	!perl-core/ExtUtils-MakeMaker"
 # Does not work because jikes is broken
 #	jikes? (dev-java/jikes)"
 
diff --git a/dev-util/subversion/subversion-1.3.0_rc4.ebuild b/dev-util/subversion/subversion-1.3.0_rc4.ebuild
index 7fb261501dbd..60cf55c10be6 100644
--- a/dev-util/subversion/subversion-1.3.0_rc4.ebuild
+++ b/dev-util/subversion/subversion-1.3.0_rc4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.3.0_rc4.ebuild,v 1.1 2005/12/01 08:43:56 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.3.0_rc4.ebuild,v 1.2 2005/12/06 21:35:13 pauldv Exp $
 
 inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache perl-module
 
@@ -30,7 +30,8 @@ RDEPEND="${COMMONDEPEND}
 
 DEPEND="${COMMONDEPEND}
 	java? ( virtual/jdk )
-	>=sys-devel/autoconf-2.59"
+	>=sys-devel/autoconf-2.59
+        perl-core/ExtUtils-MakeMaker"
 # Does not work because jikes is broken
 #	jikes? (dev-java/jikes)"