fix slotting and java support on all major versions, add rpc support to db-4.[01]

11 files changed, 424 insertions, 5 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index ba20846f3291..b7676f2bd30c 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-libs/db
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.60 2003/10/15 17:50:39 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.61 2003/10/18 10:29:17 robbat2 Exp $
+
+*db-4.1.25_p1-r2 (18 Oct 2003)
+*db-4.0.14-r3 (18 Oct 2003)
+*db-3.2.9-r10 (18 Oct 2003)
+
+  18 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> db-3.2.9-r10.ebuild,
+  db-4.0.14-r3.ebuild, db-4.1.25_p1-r2.ebuild,
+  files/db-3.2.9-jarlocation.patch, files/db-4.0.14-jarlocation.patch,
+  files/db-4.1.25_p1-jarlocation.patch:
+  new revision of db-3 and db-4.[01] packages adding patch to avoid db.jar
+  overwriting, adds java support to db-3.2.9-r10, and rpc support in db-4.[01]
 
   15 Oct 2003; Brad House <brad_mssw@gentoo.org> db-1.85-r1.ebuild,
   db-3.2.9-r7.ebuild:
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 936165a41bc3..efc6065c24d9 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,9 +1,9 @@
 MD5 13068beff9ee4497ca9677fae2b4dc4a db-3.3.11.ebuild 2403
-MD5 0ea46ce8562756d4d01d92104d6a8fc3 db-4.1.25_p1-r2.ebuild 1946
+MD5 3281a8d086e25132d06b516b121a9f01 db-4.1.25_p1-r2.ebuild 2028
 MD5 c115c4647ce164c64f5b300f9a73b347 db-3.2.9-r6.ebuild 4318
 MD5 cb078ac1be48b149d9623de86c13136a db-4.1.25_p1.ebuild 2748
-MD5 6d2fb50968b3dfeea822385dad57fc76 db-4.0.14-r3.ebuild 2150
-MD5 82e5b0116fd36a30462c1b8dba0c233c db-3.2.9-r10.ebuild 3557
+MD5 dded0fea9b73766c9d454dde22ed0477 db-4.0.14-r3.ebuild 2296
+MD5 d2064914666f76f82597f681e0cf2157 db-3.2.9-r10.ebuild 4149
 MD5 19f1d74220e52dfaf90ba666de92ddac db-3.2.9-r8.ebuild 3418
 MD5 6460d838b54a13298c087e15b34a0b0b db-4.1.25_p1-r1.ebuild 1888
 MD5 3825995eb7152e1a7ea90cfe817f17f7 db-1.85-r1.ebuild 1404
@@ -13,12 +13,13 @@ MD5 18bdfc7bc022eef7d592fe1be34b80ee db-3.2.9-r2.ebuild 3215
 MD5 23f0326b43284366187b25b2b2d790b1 db-4.1.25.ebuild 2242
 MD5 5ec1f98930b632b39f0d991f97f2e55d db-4.0.14.ebuild 2386
 MD5 27486c5d7554e3c4c10e4c3f927ed3d5 db-3.2.9-r9.ebuild 3512
-MD5 fc58d8eb58609b6d92fb2c905111dba0 ChangeLog 10727
+MD5 aa1a495ba74fac92fc1820201e66bacd ChangeLog 11200
 MD5 5c921197970cd970a8fbb4cad2d7df7b metadata.xml 1457
 MD5 9459b483d0d82e9957737c2813822a62 db-4.0.14-r1.ebuild 2705
 MD5 6eb8be5f7803acaa5bcfd4ed5ffabf83 files/db-3.2.9-jarlocation.patch 492
 MD5 2bb2a5dbe8d16f858d177e1193639b70 files/db-4.1.25_p1-jarlocation.patch 626
 MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r10 61
+MD5 0101200dac8a9299fc1578081ac72b71 files/db-4.0.14-jarlocation.patch 565
 MD5 eb9b0f2c1d8440c6c49fc1d916c2dc0e files/db-4.0.14-fix-dep-link.patch 1119
 MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r2 61
 MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r6 61
diff --git a/sys-libs/db/db-3.2.9-r10.ebuild b/sys-libs/db/db-3.2.9-r10.ebuild
new file mode 100644
index 000000000000..6d03f10b168c
--- /dev/null
+++ b/sys-libs/db/db-3.2.9-r10.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.1 2003/10/18 10:29:17 robbat2 Exp $
+
+IUSE="doc java"
+
+inherit libtool
+inherit eutils
+inherit db
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="Berkeley DB for transaction support in MySQL"
+SRC_URI="http://www.sleepycat.com/update/snapshot/${P}.tar.gz"
+HOMEPAGE="http://www.sleepycat.com/"
+
+SLOT="3"
+LICENSE="DB"
+# This ebuild is to be the compatibility ebuild for when db4 is put
+# in the tree.
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ia64"
+
+RDEPEND="virtual/glibc"
+DEPEND="${RDEPEND}
+	=sys-libs/db-1.85*
+	sys-devel/libtool
+	sys-devel/m4
+	java? ( virtual/jdk )"
+# We need m4 too else build fails without config.guess
+
+# This doesn't build without exceptions
+export CXXFLAGS="${CXXFLAGS/-fno-exceptions/-fexceptions}"
+
+src_unpack() {
+	unpack ${A}
+
+	chmod -R ug+w *
+
+	cd ${WORKDIR}/${P}
+	epatch ${FILESDIR}/patch.3.2.9.1
+	epatch ${FILESDIR}/patch.3.2.9.2
+
+	# Get db to link libdb* to correct dependencies ... for example if we use
+	# NPTL or NGPT, db detects usable mutexes, and should link against
+	# libpthread, but does not do so ...
+	# <azarah@gentoo.org> (23 Feb 2003)
+	epatch ${FILESDIR}/${P}-fix-dep-link.patch
+
+	# We should get dump185 to link against system db1 ..
+	# <azarah@gentoo.org> (23 Feb 2003)
+	mv ${S}/dist/Makefile.in ${S}/dist/Makefile.in.orig
+	sed -e 's:DB185INC=:DB185INC= -I/usr/include/db1:' \
+		-e 's:DB185LIB=:DB185LIB= -ldb1:' \
+		${S}/dist/Makefile.in.orig > ${S}/dist/Makefile.in || die "Failed to sed"
+
+	# Fix invalid .la files
+	cd ${WORKDIR}/${P}/dist
+	rm -f ltversion.sh
+	# remove config.guess else we have problems with gcc-3.2
+	rm -f config.guess
+	sed -i "s,\(-D_GNU_SOURCE\),\1 ${CFLAGS}," configure
+
+	epatch ${FILESDIR}/${P}-jarlocation.patch
+}
+
+src_compile() {
+	local conf=
+	local conf_shared=
+	local conf_static=
+
+	conf="${conf}
+		--host=${CHOST} \
+		--build=${CHOST} \
+		--enable-cxx \
+		--enable-compat185 \
+		--enable-dump185 \
+		--prefix=/usr"
+
+	# --enable-rpc DOES NOT BUILD
+	# Robin H. Johnson <robbat2@gentoo.org> (18 Oct 2003)
+
+	conf_shared="${conf_shared}
+		`use_enable java`
+		--enable-dynamic"
+
+	# TCL support is also broken
+	# Robin H. Johnson <robbat2@gentoo.org> (18 Oct 2003)
+	# conf_shared="${conf_shared}
+	#	`use_enable tcltk tcl`
+	#	`use_with tcltk tcl /usr/lib`"
+
+	# NOTE: we should not build both shared and static versions
+	#       of the libraries in the same build root!
+
+	einfo "Configuring ${P} (static)..."
+	mkdir -p ${S}/build-static
+	cd ${S}/build-static
+	../dist/configure ${conf} ${conf_static} \
+		--enable-static || die
+
+	einfo "Configuring ${P} (shared)..."
+	mkdir -p ${S}/build-shared
+	cd ${S}/build-shared
+	../dist/configure ${conf} ${conf_shared} \
+		--enable-shared || die
+
+	# Parallel make does not work
+	MAKEOPTS="${MAKEOPTS} -j1"
+	einfo "Building ${P} (static)..."
+	cd ${S}/build-static
+	emake || die "Static build failed"
+	einfo "Building ${P} (shared)..."
+	cd ${S}/build-shared
+	emake || die "Shared build failed"
+}
+
+src_install () {
+	cd ${S}/build-shared
+	make libdb=libdb-3.2.a \
+		libcxx=libcxx_3.2.a \
+		prefix=${D}/usr \
+		install || die
+
+	cd ${S}/build-static
+	newlib.a libdb.a libdb-3.2.a || die "failed to package static libraries!"
+	newlib.a libdb_cxx.a libdb_cxx-3.2.a || die "failed to package static libraries!"
+
+	db_src_install_headerslot || die "db_src_install_headerslot failed!"
+
+	# this is now done in the db eclass, function db_fix_so and db_src_install_usrlibcleanup
+	#cd ${D}/usr/lib
+	#ln -s libdb-3.2.so libdb.so.3
+
+	# For some reason, db.so's are *not* readable by group or others,
+	# resulting in no one but root being able to use them!!!
+	# This fixes it -- DR 15 Jun 2001
+	cd ${D}/usr/lib
+	chmod go+rx *.so
+	# The .la's aren't readable either
+	chmod go+r *.la
+
+	cd ${S}
+	dodoc README LICENSE
+
+	db_src_install_doc || die "db_src_install_doc failed!"
+
+	db_src_install_usrbinslot || die "db_src_install_usrbinslot failed!"
+
+	db_src_install_usrlibcleanup || die "db_src_install_usrlibcleanup failed!"
+}
+
+pkg_postinst () {
+	db_fix_so
+}
+
+pkg_postrm () {
+	db_fix_so
+}
+
diff --git a/sys-libs/db/db-4.0.14-r3.ebuild b/sys-libs/db/db-4.0.14-r3.ebuild
new file mode 100644
index 000000000000..bb8fc6c190f9
--- /dev/null
+++ b/sys-libs/db/db-4.0.14-r3.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.1 2003/10/18 10:29:17 robbat2 Exp $
+
+IUSE="tcltk java doc"
+
+inherit eutils gnuconfig db
+
+S="${WORKDIR}/${P}/build_unix"
+DESCRIPTION="Berkeley DB"
+SRC_URI="http://www.sleepycat.com/update/snapshot/${P}.tar.gz"
+HOMEPAGE="http://www.sleepycat.com"
+SLOT="4"
+LICENSE="DB"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm amd64 ia64"
+
+DEPEND="tcltk? ( dev-lang/tcl )
+	java? ( virtual/jdk )"
+
+src_unpack() {
+	unpack ${A}
+
+	# Get db to link libdb* to correct dependencies ... for example if we use
+	# NPTL or NGPT, db detects usable mutexes, and should link against
+	# libpthread, but does not do so ...
+	# <azarah@gentoo.org> (23 Feb 2003)
+	cd ${WORKDIR}/${P}; epatch ${FILESDIR}/${P}-fix-dep-link.patch
+
+	cd ${WORKDIR} ; epatch ${FILESDIR}/${P}-jarlocation.patch
+}
+
+src_compile() {
+
+	# gnuconfig doesn't work if ${S} points to build_unix, so we
+	# change it temporarily
+	if use mips; then
+		einfo "Updating config.{guess,sub} for mips"
+		local OLDS="${S}"
+		S="${WORKDIR}/${P}/dist"
+		gnuconfig_update
+		S="${OLDS}"
+	fi
+
+	local myconf="--enable-rpc"
+
+	use java \
+		&& myconf="${myconf} --enable-java" \
+		|| myconf="${myconf} --disable-java"
+
+	use tcltk \
+		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/lib" \
+		|| myconf="${myconf} --disable-tcl"
+
+	if use java && [ -n "${JAVAC}" ]; then
+		export PATH=`dirname ${JAVAC}`:${PATH}
+		export JAVAC=`basename ${JAVAC}`
+	fi
+
+	../dist/configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--datadir=/usr/share \
+		--sysconfdir=/etc \
+		--localstatedir=/var/lib \
+		--enable-compat185 \
+		--enable-cxx \
+		--with-uniquename \
+		${myconf} || die
+
+#	disable posix mutexes as they are not available in linuxthreads from
+#	the standard profile and they should be autodetected if available
+#
+#		--enable-posixmutexes \
+
+	emake || make || die
+}
+
+src_install () {
+
+	einstall || die
+
+	db_src_install_usrbinslot
+
+	db_src_install_headerslot
+
+	db_src_install_doc
+
+	db_src_install_usrlibcleanup
+
+	dodir /usr/sbin
+	mv ${D}/usr/bin/berkeley_db_svc ${D}/usr/sbin/berkeley_db40_svc
+}
+
+pkg_postinst () {
+	db_fix_so
+}
+
+pkg_postrm () {
+	db_fix_so
+}
diff --git a/sys-libs/db/db-4.1.25_p1-r2.ebuild b/sys-libs/db/db-4.1.25_p1-r2.ebuild
new file mode 100644
index 000000000000..cbcf9ae279c7
--- /dev/null
+++ b/sys-libs/db/db-4.1.25_p1-r2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r2.ebuild,v 1.1 2003/10/18 10:29:17 robbat2 Exp $
+
+IUSE="tcltk java doc"
+
+inherit eutils
+inherit db
+
+#Number of official patches
+PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
+if [ "${PATCHNO}" == "${PV}" ]; then
+	MY_PV=${PV}
+	MY_P=${P}
+	PATCHNO=0
+else
+	MY_PV=${PV/_p${PATCHNO}}
+	MY_P=${PN}-${MY_PV}
+fi
+
+S=${WORKDIR}/${MY_P}/build_unix
+DESCRIPTION="Berkeley DB"
+SRC_URI="http://www.sleepycat.com/update/snapshot/${MY_P}.tar.gz"
+
+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.1"
+LICENSE="DB"
+KEYWORDS="ia64 ~x86 ~alpha"
+
+DEPEND="tcltk? ( dev-lang/tcl )
+	java? ( virtual/jdk )"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	cd ${WORKDIR}/${MY_P}
+	for (( i=1 ; i<=$PATCHNO ; i++ ))
+	do
+		patch -p0 <${DISTDIR}/patch.${MY_PV}.${i}
+	done
+	epatch ${FILESDIR}/${P}-jarlocation.patch
+}
+
+src_compile() {
+
+	local myconf="--enable-rpc"
+
+	use java \
+		&& myconf="${myconf} --enable-java" \
+		|| myconf="${myconf} --disable-java"
+
+	use tcltk \
+		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/lib" \
+		|| myconf="${myconf} --disable-tcl"
+
+	if use java && [ -n "${JAVAC}" ]; then
+		export PATH=`dirname ${JAVAC}`:${PATH}
+		export JAVAC=`basename ${JAVAC}`
+	fi
+
+	../dist/configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--datadir=/usr/share \
+		--sysconfdir=/etc \
+		--localstatedir=/var/lib \
+		--enable-compat185 \
+		--enable-cxx \
+		--with-uniquename \
+		${myconf} || die
+
+	emake || make || die
+}
+
+src_install () {
+
+	einstall || die
+
+	db_src_install_usrbinslot
+
+	db_src_install_headerslot
+
+	db_src_install_doc
+
+	db_src_install_usrlibcleanup
+
+	dodir /usr/sbin
+	mv ${D}/usr/bin/berkeley_db_svc ${D}/usr/sbin/berkeley_db41_svc
+}
+
+pkg_postinst () {
+	db_fix_so
+}
+
+pkg_postrm () {
+	db_fix_so
+}
diff --git a/sys-libs/db/files/db-3.2.9-jarlocation.patch b/sys-libs/db/files/db-3.2.9-jarlocation.patch
new file mode 100644
index 000000000000..0654e2ef48e8
--- /dev/null
+++ b/sys-libs/db/files/db-3.2.9-jarlocation.patch
@@ -0,0 +1,12 @@
+diff -ur db-3.2.9.old/dist/Makefile.in db-3.2.9/dist/Makefile.in
+--- db-3.2.9.old/dist/Makefile.in	2003-10-18 02:21:18.000000000 -0700
++++ db-3.2.9/dist/Makefile.in	2003-10-18 02:22:14.000000000 -0700
+@@ -72,7 +72,7 @@
+ JAVA_DBDIR=	$(JAVA_SRCDIR)/$(JAVA_DBREL)
+ JAVA_EXDIR=	$(JAVA_SRCDIR)/com/sleepycat/examples
+ 
+-libj_jarfile=	db.jar
++libj_jarfile=	db-$(SOVERSION).jar
+ libjso_base=	libdb_java
+ libjso=		$(libjso_base)-$(SOVERSION).@SOSUFFIX@
+ libjso_target=	$(libjso_base)-$(SOVERSION).la
diff --git a/sys-libs/db/files/db-4.0.14-jarlocation.patch b/sys-libs/db/files/db-4.0.14-jarlocation.patch
new file mode 100644
index 000000000000..667a32b20d3a
--- /dev/null
+++ b/sys-libs/db/files/db-4.0.14-jarlocation.patch
@@ -0,0 +1,14 @@
+diff -ur db-4.0.14.old/dist/Makefile.in db-4.0.14/dist/Makefile.in
+--- db-4.0.14.old/dist/Makefile.in	2003-10-18 02:24:50.000000000 -0700
++++ db-4.0.14/dist/Makefile.in	2003-10-18 02:25:18.000000000 -0700
+@@ -105,8 +105,8 @@
+ JAVA_DBDIR=	$(JAVA_SRCDIR)/$(JAVA_DBREL)
+ JAVA_EXDIR=	$(JAVA_SRCDIR)/$(JAVA_EXREL)
+ 
+-libj_jarfile=	db.jar
+-libj_exjarfile=	dbexamples.jar
++libj_jarfile=	db-$(SOVERSION).jar
++libj_exjarfile=	dbexamples-$(SOVERSION).jar
+ libjso_base=	libdb_java
+ libjso=		$(libjso_base)-$(SOVERSION).@SOSUFFIX@
+ libjso_static=	$(libjso_base)-$(SOVERSION).a
diff --git a/sys-libs/db/files/db-4.1.25_p1-jarlocation.patch b/sys-libs/db/files/db-4.1.25_p1-jarlocation.patch
new file mode 100644
index 000000000000..1df126f402ae
--- /dev/null
+++ b/sys-libs/db/files/db-4.1.25_p1-jarlocation.patch
@@ -0,0 +1,16 @@
+diff -ur db-4.1.25.old/dist/Makefile.in db-4.1.25/dist/Makefile.in
+--- db-4.1.25.old/dist/Makefile.in	2003-10-18 02:15:45.000000000 -0700
++++ db-4.1.25/dist/Makefile.in	2003-10-18 02:13:47.000000000 -0700
+@@ -107,9 +107,9 @@
+ JAVA_EXDIR=	$(JAVA_SRCDIR)/$(JAVA_EXREL)
+ JAVA_RPCDIR=	$(srcdir)/rpc_server/java
+ 
+-libj_jarfile=	db.jar
+-libj_exjarfile=	dbexamples.jar
+-rpc_jarfile=	dbsvc.jar
++libj_jarfile=	db-$(SOVERSION).jar
++libj_exjarfile=	dbexamples-$(SOVERSION).jar
++rpc_jarfile=	dbsvc-$(SOVERSION).jar
+ libjso_base=	libdb_java
+ libjso=		$(libjso_base)-$(SOVERSION).@JMODSUFFIX@
+ libjso_static=	$(libjso_base)-$(SOVERSION).a
diff --git a/sys-libs/db/files/digest-db-3.2.9-r10 b/sys-libs/db/files/digest-db-3.2.9-r10
new file mode 100644
index 000000000000..cc0f167ea09b
--- /dev/null
+++ b/sys-libs/db/files/digest-db-3.2.9-r10
@@ -0,0 +1 @@
+MD5 4df5c7051b11411e0a970f6c91613942 db-3.2.9.tar.gz 2085238
diff --git a/sys-libs/db/files/digest-db-4.0.14-r3 b/sys-libs/db/files/digest-db-4.0.14-r3
new file mode 100644
index 000000000000..cb9924c89b80
--- /dev/null
+++ b/sys-libs/db/files/digest-db-4.0.14-r3
@@ -0,0 +1 @@
+MD5 12262c64fcd64b772e7cffad8e4d0ebc db-4.0.14.tar.gz 2701799
diff --git a/sys-libs/db/files/digest-db-4.1.25_p1-r2 b/sys-libs/db/files/digest-db-4.1.25_p1-r2
new file mode 100644
index 000000000000..4f81c12b1c1e
--- /dev/null
+++ b/sys-libs/db/files/digest-db-4.1.25_p1-r2
@@ -0,0 +1,2 @@
+MD5 df71961002b552c0e72c6e4e358f27e1 db-4.1.25.tar.gz 3080234
+MD5 1e073d12cd89f9345e281ca07368f74b patch.4.1.25.1 610