Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys-libs/db/ChangeLog8
-rw-r--r--sys-libs/db/db-1.85-r1.ebuild4
-rw-r--r--sys-libs/db/db-1.85-r2.ebuild4
-rw-r--r--sys-libs/db/db-3.2.9-r10.ebuild4
-rw-r--r--sys-libs/db/db-3.2.9-r7.ebuild4
-rw-r--r--sys-libs/db/db-4.0.14-r2.ebuild4
-rw-r--r--sys-libs/db/db-4.0.14-r3.ebuild4
-rw-r--r--sys-libs/db/db-4.1.25_p1-r3.ebuild4
-rw-r--r--sys-libs/db/db-4.1.25_p1-r4.ebuild42
-rw-r--r--sys-libs/db/db-4.2.52_p1.ebuild4
-rw-r--r--sys-libs/db/db-4.2.52_p2.ebuild54
11 files changed, 61 insertions, 75 deletions
diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index fb4e0588894d..8f64a1f20551 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/db
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.110 2004/12/16 10:29:20 eradicator Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.111 2005/01/14 02:48:32 vapier Exp $
+
+ 13 Jan 2005; Mike Frysinger <vapier@gentoo.org> db-4.1.25_p1-r4.ebuild,
+ db-4.2.52_p2.ebuild:
+ Clean up USE=uclibc and USE=nocxx usage.
16 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> db-1.85-r1.ebuild,
db-1.85-r2.ebuild, db-3.2.9-r10.ebuild, db-3.2.9-r7.ebuild,
diff --git a/sys-libs/db/db-1.85-r1.ebuild b/sys-libs/db/db-1.85-r1.ebuild
index 2d677d512f8c..64d08c20e825 100644
--- a/sys-libs/db/db-1.85-r1.ebuild
+++ b/sys-libs/db/db-1.85-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-1.85-r1.ebuild,v 1.29 2004/12/16 10:29:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-1.85-r1.ebuild,v 1.30 2005/01/14 02:48:32 vapier Exp $
inherit eutils
diff --git a/sys-libs/db/db-1.85-r2.ebuild b/sys-libs/db/db-1.85-r2.ebuild
index 6be62059f26f..4c26e360e433 100644
--- a/sys-libs/db/db-1.85-r2.ebuild
+++ b/sys-libs/db/db-1.85-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-1.85-r2.ebuild,v 1.6 2004/12/16 10:29:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-1.85-r2.ebuild,v 1.7 2005/01/14 02:48:32 vapier Exp $
inherit eutils toolchain-funcs
diff --git a/sys-libs/db/db-3.2.9-r10.ebuild b/sys-libs/db/db-3.2.9-r10.ebuild
index 04cf814d11a4..6108d970ae18 100644
--- a/sys-libs/db/db-3.2.9-r10.ebuild
+++ b/sys-libs/db/db-3.2.9-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.2.9-r10.ebuild,v 1.15 2004/12/16 10:29:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.2.9-r10.ebuild,v 1.16 2005/01/14 02:48:32 vapier Exp $
inherit gnuconfig libtool eutils db
diff --git a/sys-libs/db/db-3.2.9-r7.ebuild b/sys-libs/db/db-3.2.9-r7.ebuild
index 32ccff5afcd9..3e2ad86fdabb 100644
--- a/sys-libs/db/db-3.2.9-r7.ebuild
+++ b/sys-libs/db/db-3.2.9-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.2.9-r7.ebuild,v 1.16 2004/12/16 10:29:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.2.9-r7.ebuild,v 1.17 2005/01/14 02:48:32 vapier Exp $
IUSE=""
diff --git a/sys-libs/db/db-4.0.14-r2.ebuild b/sys-libs/db/db-4.0.14-r2.ebuild
index c0ac23b5e61d..8c7bef3f6001 100644
--- a/sys-libs/db/db-4.0.14-r2.ebuild
+++ b/sys-libs/db/db-4.0.14-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.0.14-r2.ebuild,v 1.25 2004/12/16 10:29:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.0.14-r2.ebuild,v 1.26 2005/01/14 02:48:32 vapier Exp $
IUSE="tcltk java doc"
diff --git a/sys-libs/db/db-4.0.14-r3.ebuild b/sys-libs/db/db-4.0.14-r3.ebuild
index 2ff5c0aff59a..248ca2556d16 100644
--- a/sys-libs/db/db-4.0.14-r3.ebuild
+++ b/sys-libs/db/db-4.0.14-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.0.14-r3.ebuild,v 1.10 2004/12/16 10:29:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.0.14-r3.ebuild,v 1.11 2005/01/14 02:48:32 vapier Exp $
IUSE="tcltk java doc"
diff --git a/sys-libs/db/db-4.1.25_p1-r3.ebuild b/sys-libs/db/db-4.1.25_p1-r3.ebuild
index af98c10e7b7d..6d5da4cd74c2 100644
--- a/sys-libs/db/db-4.1.25_p1-r3.ebuild
+++ b/sys-libs/db/db-4.1.25_p1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r3.ebuild,v 1.29 2004/12/16 10:29:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r3.ebuild,v 1.30 2005/01/14 02:48:32 vapier Exp $
inherit eutils gnuconfig db
diff --git a/sys-libs/db/db-4.1.25_p1-r4.ebuild b/sys-libs/db/db-4.1.25_p1-r4.ebuild
index 706f25744d7c..d65c6397a59b 100644
--- a/sys-libs/db/db-4.1.25_p1-r4.ebuild
+++ b/sys-libs/db/db-4.1.25_p1-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r4.ebuild,v 1.14 2005/01/05 05:23:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r4.ebuild,v 1.15 2005/01/14 02:48:32 vapier Exp $
inherit eutils gnuconfig db
@@ -18,17 +18,16 @@ fi
S=${WORKDIR}/${MY_P}/build_unix
DESCRIPTION="Berkeley DB"
-HOMEPAGE="http://www.sleepycat.com"
+HOMEPAGE="http://www.sleepycat.com/"
SRC_URI="http://www.sleepycat.com/update/snapshot/${MY_P}.tar.gz"
-for (( i=1 ; i<=$PATCHNO ; i++ ))
-do
+for (( i=1 ; i<=$PATCHNO ; i++ )) ; do
export SRC_URI="${SRC_URI} http://www.sleepycat.com/update/${MY_PV}/patch.${MY_PV}.${i}"
done
LICENSE="DB"
SLOT="4.1"
-KEYWORDS="x86 ~ppc sparc ~mips ~alpha arm hppa amd64 ia64 ~ppc64 s390 sh"
-IUSE="tcltk java doc uclibc"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86"
+IUSE="tcltk java doc nocxx bootstrap"
DEPEND="tcltk? ( dev-lang/tcl )
java? ( virtual/jdk )"
@@ -47,6 +46,7 @@ src_unpack() {
epatch ${FILESDIR}/${PN}-4.0.14-fix-dep-link.patch
epatch ${FILESDIR}/${PN}-4.1.25-uclibc.patch
epatch ${FILESDIR}/${PN}-4.1.25-java.patch
+
gnuconfig_update "${S}/../dist"
}
@@ -55,30 +55,23 @@ src_compile() {
local myconf=""
- # FIXME: dont tie this to uclibc anymore
- use uclibc \
- && myconf="${myconf} --disable-rpc" \
- || myconf="${myconf} --enable-rpc"
- use uclibc \
- && myconf="${myconf} --disable-cxx" \
- || myconf="${myconf} --enable-cxx"
-
- use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
+ use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
- use java \
- && myconf="${myconf} --enable-java" \
- || myconf="${myconf} --disable-java"
+ use bootstrap \
+ && myconf="${myconf} --disable-cxx" \
+ || myconf="${myconf} $(use_enable !nocxx cxx)"
use tcltk \
&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
|| myconf="${myconf} --disable-tcl"
- if use java && [ -n "${JAVAC}" ]; then
+ myconf="${myconf} $(use_enable java)"
+ if use java && [[ -n ${JAVAC} ]] ; then
export PATH=`dirname ${JAVAC}`:${PATH}
export JAVAC=`basename ${JAVAC}`
fi
- [ -n "${CBUILD}" ] && myconf="${myconf} --build=${CBUILD}"
+ [[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
../dist/configure \
--prefix=/usr \
@@ -90,13 +83,14 @@ src_compile() {
--libdir=/usr/$(get_libdir) \
--enable-compat185 \
--with-uniquename \
+ --enable-rpc \
--host=${CHOST} \
- ${myconf} || die
+ ${myconf} || die "configure failed"
- emake || make || die
+ emake || make || die "make failed"
}
-src_install () {
+src_install() {
einstall libdir="${D}/usr/$(get_libdir)" || die
diff --git a/sys-libs/db/db-4.2.52_p1.ebuild b/sys-libs/db/db-4.2.52_p1.ebuild
index 04f299e4e7c6..f9490679fd20 100644
--- a/sys-libs/db/db-4.2.52_p1.ebuild
+++ b/sys-libs/db/db-4.2.52_p1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p1.ebuild,v 1.8 2004/12/16 10:29:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p1.ebuild,v 1.9 2005/01/14 02:48:32 vapier Exp $
IUSE="tcltk java doc"
diff --git a/sys-libs/db/db-4.2.52_p2.ebuild b/sys-libs/db/db-4.2.52_p2.ebuild
index 054091bf396e..1913e78f90af 100644
--- a/sys-libs/db/db-4.2.52_p2.ebuild
+++ b/sys-libs/db/db-4.2.52_p2.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p2.ebuild,v 1.12 2004/12/16 10:29:20 eradicator Exp $
-
-IUSE="tcltk java doc"
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p2.ebuild,v 1.13 2005/01/14 02:48:32 vapier Exp $
inherit eutils gnuconfig db
@@ -20,21 +18,19 @@ fi
S=${WORKDIR}/${MY_P}/build_unix
DESCRIPTION="Berkeley DB"
+HOMEPAGE="http://www.sleepycat.com/"
SRC_URI="http://www.sleepycat.com/update/snapshot/${MY_P}.tar.gz"
-
-for (( i=1 ; i<=$PATCHNO ; i++ ))
-do
+for (( i=1 ; i<=$PATCHNO ; i++ )) ; do
export SRC_URI="${SRC_URI} http://www.sleepycat.com/update/${MY_PV}/patch.${MY_PV}.${i}"
done
-HOMEPAGE="http://www.sleepycat.com"
-SLOT="4.2"
LICENSE="DB"
-KEYWORDS="~x86 ~sparc ~ia64 ~ppc ~amd64"
+SLOT="4.2"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="tcltk java doc nocxx bootstrap"
DEPEND="tcltk? ( >=dev-lang/tcl-8.4 )
java? ( virtual/jdk )"
-
RDEPEND="tcltk? ( dev-lang/tcl )
java? ( virtual/jre )"
@@ -50,40 +46,31 @@ src_unpack() {
epatch ${FILESDIR}/${PN}-4.0.14-fix-dep-link.patch
+ gnuconfig_update "${S}/../dist"
}
src_compile() {
addwrite /proc/self/maps
- # Mips needs a gnuconfig update so obscure things like mips64 are known
- # db-4.1.25_p1 extracts to ${WORKDIR}/db-4.1.25, so we need to strip the _p1
- if use mips; then
- einfo "Updating config.{guess,sub} for mips"
- local OLDS="${S}"
- S="${S}/dist"
- gnuconfig_update
- S="${OLDS}"
- fi
-
+ local myconf=""
- local myconf="--enable-rpc"
+ use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
- use java \
- && myconf="${myconf} --enable-java" \
- || myconf="${myconf} --disable-java"
+ use bootstrap \
+ && myconf="${myconf} --disable-cxx" \
+ || myconf="${myconf} $(use_enable !nocxx cxx)"
use tcltk \
&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
|| myconf="${myconf} --disable-tcl"
- if use java && [ -n "${JAVAC}" ]; then
+ myconf="${myconf} $(use_enable java)"
+ if use java && [[ -n ${JAVAC} ]] ; then
export PATH=`dirname ${JAVAC}`:${PATH}
export JAVAC=`basename ${JAVAC}`
fi
- if [ "${PROFILE_ARCH}" = "sparc64" ]; then
- myconf="${myconf} --host=${CHOST}"
- fi
+ [[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
../dist/configure \
--prefix=/usr \
@@ -94,14 +81,15 @@ src_compile() {
--localstatedir=/var/lib \
--libdir=/usr/$(get_libdir) \
--enable-compat185 \
- --enable-cxx \
--with-uniquename \
- ${myconf} || die
+ --enable-rpc \
+ --host=${CHOST} \
+ ${myconf} || die "configure failed"
- emake || make || die
+ emake || make || die "make failed"
}
-src_install () {
+src_install() {
einstall libdir="${D}/usr/$(get_libdir)" || die