Bug 150702; also cleaned up unused patches

Package-Manager: portage-2.1.2_rc1-r7

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index df68e04d9cb0e2c512cc9f1774dd5380ec4232fb..e9093f413075c99d9c78a14b1bd8fb99eae28488 100644 (file)
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/perl
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.232 2006/10/23 19:35:29 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.233 2006/11/18 16:24:14 mcummings Exp $
+
+  18 Nov 2006; Michael Cummings <mcummings@gentoo.org>
+  -files/perl-5.8.7-CAN-2005-0448-rmtree.patch,
+  -files/perl-5.8.7-regexp-nossp.patch, -files/perl-5.8.7-tempfiles.patch,
+  -files/perl-exp_intwrap.patch, -files/perl-nonblock.patch,
+  -files/perl-reorder-INC.patch, perl-5.8.8-r2.ebuild:
+  Bug 150702; also cleaned up unused patches
 
   23 Oct 2006; Michael Cummings <mcummings@gentoo.org>
   -perl-5.8.7-r3.ebuild:

diff --git a/dev-lang/perl/perl-5.8.8-r2.ebuild b/dev-lang/perl/perl-5.8.8-r2.ebuild
index a5b14db1397e5b4d69f95a1ff187c7ff70295753..85701ff1cc77de528cce36ef3c5f0be332c05f52 100644 (file)
--- a/dev-lang/perl/perl-5.8.8-r2.ebuild
+++ b/dev-lang/perl/perl-5.8.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r2.ebuild,v 1.22 2006/10/17 08:21:23 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r2.ebuild,v 1.23 2006/11/18 16:24:14 mcummings Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://cpan/src/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.perl.org/"
 LIBPERL="libperl$(get_libname ${PERLSLOT}.${SHORT_PV})"
 
-LICENSE="Artistic GPL-2"
+LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ~ppc-macos ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="berkdb debug doc gdbm ithreads perlsuid build"