libgdbm tweaks

4 files changed, 19 insertions, 9 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/Manifest b/dev-lang/perl/Manifest
index 43141f496642..bfaa81c4010c 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,10 +1,10 @@
 MD5 707b371352152840e612b8a2e564092f perl-5.8.2-r1.ebuild 9710
-MD5 b0dbe4d3ec235c3fc0d591d78fafa032 ChangeLog 28122
+MD5 eb58a51f8e2d12099cb64a5cc0cdfe95 ChangeLog 28435
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 e19632db485015436b61679d9c9473e6 perl-5.8.4-r1.ebuild 11585
 MD5 97d09cd8530364af2829ec70ad9c67a2 perl-5.8.3.ebuild 9679
-MD5 20476e908629c2b8d166df67691b13a7 perl-5.8.5.ebuild 11152
+MD5 5713db98f6efbdd171d30625e4e5f487 perl-5.8.4-r1.ebuild 11789
 MD5 25410e9d0f4652ce66bd7ba5a1a34169 perl-5.8.4.ebuild 10475
+MD5 96a08ba0ec7f1088066a67a40cd3640a perl-5.8.5.ebuild 11152
 MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.2-picdl.patch 250
 MD5 8381e239056a7895edf8f3c6c05c835c files/digest-perl-5.8.2-r1 64
 MD5 35eb3b7645102bbcc4088d900dc28984 files/digest-perl-5.8.3 64
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'