summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-lang/perl/ChangeLog8
-rw-r--r--dev-lang/perl/perl-5.8.4-r1.ebuild8
-rw-r--r--dev-lang/perl/perl-5.8.5.ebuild6
3 files changed, 16 insertions, 6 deletions
diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index 98a61088f68c..2f0a0c5fb3f8 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-lang/perl
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.85 2004/09/22 17:52:01 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.86 2004/09/25 00:46:57 rac Exp $
+
+ 24 Sep 2004; Robert Coie <rac@gentoo.org> perl-5.8.4-r1.ebuild,
+ perl-5.8.5.ebuild:
+ Make gdbm patch conditional on having 1.8.3, because libgdbm_compat isn't
+ there otherwise, should not affect people who have already built. Made 5.8.5
+ depend on 1.8.3 instead. Again, should not affect installed people.
22 Sep 2004; Robert Coie <rac@gentoo.org> perl-5.8.2-r1.ebuild,
perl-5.8.3.ebuild, perl-5.8.4-r1.ebuild, perl-5.8.4.ebuild,
diff --git a/dev-lang/perl/perl-5.8.4-r1.ebuild b/dev-lang/perl/perl-5.8.4-r1.ebuild
index b48a3407f1f8..abe7fc7a7faa 100644
--- a/dev-lang/perl/perl-5.8.4-r1.ebuild
+++ b/dev-lang/perl/perl-5.8.4-r1.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-lang/perl/perl-5.8.4-r1.ebuild,v 1.11 2004/09/22 17:52:01 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.4-r1.ebuild,v 1.12 2004/09/25 00:46:57 rac Exp $
inherit eutils flag-o-matic gcc
@@ -99,7 +99,11 @@ src_unpack() {
cd ${S}; epatch ${FILESDIR}/${P}-noksh.patch
# see bug 52660
- cd ${S}; epatch ${FILESDIR}/${P}-NDBM-GDBM-compat.patch
+ # i'm not entirely thrilled with this has_version, but can't see
+ # how else to handle it. attempting to link libgdbm_compat is
+ # fatal on systems where it doesn't exist.
+
+ has_version ">=sys-libs/gdbm-1.8.3" && epatch ${FILESDIR}/${P}-NDBM-GDBM-compat.patch
# uclibc support
epatch ${FILESDIR}/perl-5.8.2-uclibc.patch
diff --git a/dev-lang/perl/perl-5.8.5.ebuild b/dev-lang/perl/perl-5.8.5.ebuild
index dafbaae398cc..dfaed869c84d 100644
--- a/dev-lang/perl/perl-5.8.5.ebuild
+++ b/dev-lang/perl/perl-5.8.5.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-lang/perl/perl-5.8.5.ebuild,v 1.5 2004/09/22 17:52:01 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.5.ebuild,v 1.6 2004/09/25 00:46:57 rac Exp $
inherit eutils flag-o-matic gcc
@@ -21,14 +21,14 @@ IUSE="berkdb doc gdbm ithreads uclibc"
DEPEND="!uclibc? ( sys-apps/groff )
berkdb? ( sys-libs/db )
- gdbm? ( >=sys-libs/gdbm-1.8.0 )
+ gdbm? ( >=sys-libs/gdbm-1.8.3 )
>=sys-apps/portage-2.0.48-r4
>=sys-devel/libperl-${PV}
!<dev-perl/ExtUtils-MakeMaker-6.17
!<dev-perl/File-Spec-0.84-r1
!<dev-perl/Test-Simple-0.47-r1"
RDEPEND="berkdb? ( sys-libs/db )
- gdbm? ( >=sys-libs/gdbm-1.8.0 )"
+ gdbm? ( >=sys-libs/gdbm-1.8.3 )"
pkg_setup() {
# I think this should rather be displayed if you *have* 'ithreads'