summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Coie <rac@gentoo.org>2003-10-14 23:51:10 +0000
committerRobert Coie <rac@gentoo.org>2003-10-14 23:51:10 +0000
commitfa77cf375e1e70d94e14ee8422f0b7676b87e0e6 (patch)
tree66c963a319595d9437c3bdfadc85c791335e5826 /dev-lang
parentmetadata (diff)
downloadgentoo-2-fa77cf375e1e70d94e14ee8422f0b7676b87e0e6.tar.gz
gentoo-2-fa77cf375e1e70d94e14ee8422f0b7676b87e0e6.tar.bz2
gentoo-2-fa77cf375e1e70d94e14ee8422f0b7676b87e0e6.zip
fix no-db-1 case
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/perl/ChangeLog6
-rw-r--r--dev-lang/perl/Manifest5
-rw-r--r--dev-lang/perl/metadata.xml10
-rw-r--r--dev-lang/perl/perl-5.8.1-r2.ebuild16
4 files changed, 32 insertions, 5 deletions
diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index f0385cfe6666..14f13b565e07 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/perl
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.39 2003/10/02 21:18:08 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.40 2003/10/14 23:51:08 rac Exp $
+
+ 14 Oct 2003; <rac@gentoo.org> perl-5.8.1-r2.ebuild:
+ Allow building even when db-1 is not present, but let ndbm_file use it if it's
+ there
*perl-5.8.1-r2 (02 Oct 2003)
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 801631e51167..fca05f362292 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -4,9 +4,10 @@ MD5 51da78b2203cbf4e81dafb6e24dd2e22 perl-5.8.0-r10.ebuild 14009
MD5 907c3574f85470b1f2148180f7321f20 perl-5.8.0-r9.ebuild 13534
MD5 220bd838139aaf17ec8f8f6cc1a37c61 perl-5.8.0-r12.ebuild 10316
MD5 33226bb561cd0f81cc4f7756c0f7f4c5 perl-5.6.1-r11.ebuild 6141
-MD5 863b06cc6152eca909af4ffa51169d5f perl-5.8.1-r2.ebuild 8985
-MD5 8414f5fcf5d9470acc74d05b6a277619 ChangeLog 19502
+MD5 27e108adf1e79befb9971fdb29e6e7b0 perl-5.8.1-r2.ebuild 9291
+MD5 9427ef50e11c8d3d6203653530108f65 ChangeLog 19646
MD5 31f5ae7d2343aa4819b892820b0ccaf7 perl-5.8.0-r11.ebuild 9890
+MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
MD5 0339818063f904e5a6ebe6b16b4d819f perl-5.6.1-r10.ebuild 6666
MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.1_rc2-reorder-INC.patch 2211
MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch 446
diff --git a/dev-lang/perl/metadata.xml b/dev-lang/perl/metadata.xml
new file mode 100644
index 000000000000..86672fe64c10
--- /dev/null
+++ b/dev-lang/perl/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <description>Primary Maintainer</description>
+ </maintainer>
+ <longdescription></longdescription>
+</pkgmetadata>
diff --git a/dev-lang/perl/perl-5.8.1-r2.ebuild b/dev-lang/perl/perl-5.8.1-r2.ebuild
index d045184e21b8..cbb2069ffdd0 100644
--- a/dev-lang/perl/perl-5.8.1-r2.ebuild
+++ b/dev-lang/perl/perl-5.8.1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.1-r2.ebuild,v 1.1 2003/10/02 21:18:08 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.1-r2.ebuild,v 1.2 2003/10/14 23:51:08 rac Exp $
inherit eutils flag-o-matic
@@ -121,7 +121,19 @@ src_compile() {
fi
if [ "`use berkdb`" ]
then
- myconf="${myconf} -Di_db -Di_ndbm"
+ myconf="${myconf} -Di_db"
+
+ # ndbm.h is only provided by db1 (and perhaps by gdbm in
+ # error). an alternate approach here would be to check for the
+ # presence (or some string therein) of /usr/include/ndbm.h
+ # itself.
+
+ if has_version '=sys-libs/db-1*'
+ then
+ myconf="${myconf} -Di_ndbm"
+ else
+ myconf="${myconf} -Ui_ndbm"
+ fi
else
myconf="${myconf} -Ui_db -Ui_ndbm"
fi