Mark db-3.2.9-r5.ebuild as testing, and add new db4.1 version

5 files changed, 119 insertions, 18 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 7ce237af2e4c..e83488a1aac9 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,12 +1,21 @@
 # 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.30 2003/05/28 15:37:35 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.31 2003/05/30 10:04:24 pauldv Exp $
+
+*db-4.1.25 (30 May 2003)
+
+  30 May 2003; Paul de Vrieze <pauldv@gentoo.org> db-4.1.25.ebuild:
+  Add new upstream version db-4.1.25.
 
   28 May 2003; Grant Goodyear <g2boojum@gentoo.org> db-4.0.14.ebuild:
   Changed goofy "-x86" mask to "~x86" masks, since the package
   is still hard-masked in package.mask.  (This way those of us
   trying to test this package can use package.unmask!)
 
+  28 May 2003; Paul de Vrieze <pauldv@gentoo.org> db-3.2.9-r5.ebuild:
+  Masking db-3.2.9-r5 as testing. This should be stable. The only changes are
+  the renaming of all tools from db_<bla> to db3_<bla>
+
   25 May 2003; Paul de Vrieze <pauldv@gentoo.org> db-3.2.9-r5.ebuild,
   db-4.0.14.ebuild, db-4.1.24.ebuild:
   Fix a problem with the auto header linking script. It is not necessary toe
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index db1df11b109c..8c6834794f0b 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,23 +1,25 @@
-MD5 2dd3cac46936c5510bf2133977ff5a48 db-3.3.11.ebuild 2408
-MD5 4be311009c1216a911e76dcf33bb568d db-3.2.9-r1.ebuild 2587
-MD5 f3bfd0cfb4c1930298030a47da11697f db-4.1.24.ebuild 2161
-MD5 af7ea3ee5a3a001d516413c0b9bc52e5 db-3.2.9.ebuild 2464
+MD5 5fff10dda1a1fe063bb1dd378ab7cda1 ChangeLog 5535
 MD5 4e148693b2d6fe0b1e66a8724cbfc20c db-1.85-r1.ebuild 1411
-MD5 aaf980d99e89eb9e6cdb55a5b449c5f0 db-3.2.9-r5.ebuild 4160
 MD5 744542679cd64194e3ac9e84e5f7056e db-3.2.3h-r4.ebuild 2455
+MD5 4be311009c1216a911e76dcf33bb568d db-3.2.9-r1.ebuild 2587
 MD5 e03298e927335414c7db1882f24ed8e4 db-3.2.9-r2.ebuild 3221
+MD5 af7ea3ee5a3a001d516413c0b9bc52e5 db-3.2.9.ebuild 2464
+MD5 64badf49ee0112cc58008c6c9ada4e52 db-3.3.11.ebuild 2408
+MD5 713efe2ab508f0bef006582f29b60857 db-4.1.25.ebuild 2160
+MD5 f3bfd0cfb4c1930298030a47da11697f db-4.1.24.ebuild 2161
 MD5 e61c8b762acd61e18cdd1b4e2015c116 db-4.0.14.ebuild 2317
-MD5 ac2a594dbcee95f3ffd02231e433ea67 ChangeLog 5200
+MD5 797258fc74365ad6ac636969ea8b4037 db-3.2.9-r5.ebuild 4184
+MD5 1260aeee2785bda43e81a36b6cb247be files/digest-db-4.1.25 62
+MD5 194200b3295b95b46b4564980af27f1f files/db-3.2.9-fix-dep-link.patch 1005
+MD5 ecd81fa9868ec49c61306444144d44a9 files/db.1.85.patch 55584
+MD5 3057fcc117c33a02bd4c092586a58e49 files/digest-db-1.85-r1 59
 MD5 355b01acef6125096cee653bdf4c32fc files/digest-db-3.2.3h-r4 62
+MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9 61
 MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r1 61
 MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r2 61
-MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r5 61
-MD5 3057fcc117c33a02bd4c092586a58e49 files/digest-db-1.85-r1 59
-MD5 194200b3295b95b46b4564980af27f1f files/db-3.2.9-fix-dep-link.patch 1005
-MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9 61
 MD5 214b855f6996d3dca754f6606beff672 files/digest-db-3.3.11 62
 MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14 62
 MD5 c42106477e8a2d626da71270d1e56609 files/digest-db-4.1.24 62
-MD5 ecd81fa9868ec49c61306444144d44a9 files/db.1.85.patch 55584
 MD5 9cf113248f29b1e319ae73b266df4986 files/patch.3.2.9.1 2139
 MD5 f8edd1cf6535cd62f9b8ff81e0474273 files/patch.3.2.9.2 495
+MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r5 61
diff --git a/sys-libs/db/db-3.2.9-r5.ebuild b/sys-libs/db/db-3.2.9-r5.ebuild
index de558fbd9822..5e27aeb11f57 100644
--- a/sys-libs/db/db-3.2.9-r5.ebuild
+++ b/sys-libs/db/db-3.2.9-r5.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/sys-libs/db/db-3.2.9-r5.ebuild,v 1.5 2003/05/25 18:49:13 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.2.9-r5.ebuild,v 1.6 2003/05/30 10:04:24 pauldv Exp $
 
 IUSE=""
 
@@ -16,7 +16,7 @@ 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"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
 
 RDEPEND="virtual/glibc"
 DEPEND="${RDEPEND}
@@ -137,13 +137,13 @@ src_install () {
 
 fix_so () {
 	cd /usr/lib
-	target=`find -type f -maxdepth 1 -name "libdb-*.so" |tail -n 1`
+	target=`find -type f -maxdepth 1 -name "libdb-*.so" |sort |tail -n 1`
 	[ ${target} ] && ln -sf ${target//.\//} libdb.so
-	target=`find -type f -maxdepth 1 -name "libdb_cxx*.so" |tail -n 1`
+	target=`find -type f -maxdepth 1 -name "libdb_cxx*.so" |sort |tail -n 1`
 	[ ${target} ] && ln -sf ${target//.\//} libdb_cxx.so
-	target=`find -type f -maxdepth 1 -name "libdb_tcl*.so" |tail -n 1`
+	target=`find -type f -maxdepth 1 -name "libdb_tcl*.so" |sort |tail -n 1`
 	[ ${target} ] && ln -sf ${target//.\//} libdb_tcl.so
-	target=`find -type f -maxdepth 1 -name "libdb_java*.so" |tail -n 1`
+	target=`find -type f -maxdepth 1 -name "libdb_java*.so" |sort |tail -n 1`
 	[ ${target} ] && ln -sf ${target//.\//} libdb_java.so
 	cd -
 	cd /usr/include
diff --git a/sys-libs/db/db-4.1.25.ebuild b/sys-libs/db/db-4.1.25.ebuild
new file mode 100644
index 000000000000..9df88288acf8
--- /dev/null
+++ b/sys-libs/db/db-4.1.25.ebuild
@@ -0,0 +1,89 @@
+# 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.ebuild,v 1.1 2003/05/30 10:04:24 pauldv Exp $
+
+IUSE="tcltk java"
+
+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 "
+
+DEPEND="tcltk? ( dev-lang/tcl )
+	java? ( virtual/jdk )"
+
+src_compile() {
+
+	local myconf
+
+	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 [ -n "${JAVAC}" ]; then
+		export JAVAC=`basename ${JAVAC}`
+		export PATH=`dirname ${JAVAC}`:${PATH}
+	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
+	for fname in ${D}/usr/bin/db_*
+	do
+		mv ${fname} ${fname//\/db_/\/db4_}
+	done
+
+	dodir /usr/include/db4
+	mv ${D}/usr/include/*.h ${D}/usr/include/db4/
+	
+	dodir /usr/share/doc/${PF}/html
+	mv ${D}/usr/docs/* ${D}/usr/share/doc/${PF}/html/
+	ln -s /usr/include/db4/db.h ${D}/usr/include/db.h
+}
+
+fix_so () {
+	cd /usr/lib
+	target=`find -type f -maxdepth 1 -name "libdb-*.so" |sort |tail -n 1`
+	[ ${target} ] && ln -sf ${target//.\//} libdb.so
+	target=`find -type f -maxdepth 1 -name "libdb_cxx*.so" |sort |tail -n 1`
+	[ ${target} ] && ln -sf ${target//.\//} libdb_cxx.so
+	target=`find -type f -maxdepth 1 -name "libdb_tcl*.so" |sort |tail -n 1`
+	[ ${target} ] && ln -sf ${target//.\//} libdb_tcl.so
+	target=`find -type f -maxdepth 1 -name "libdb_java*.so" |sort |tail -n 1`
+	[ ${target} ] && ln -sf ${target//.\//} libdb_java.so
+	cd -
+	cd /usr/include
+	target=`ls -d db? |tail -n 1`
+	[ ${target} ] && ln -sf ${target}/db.h .
+	cd -
+}
+
+pkg_postinst () {
+	fix_so
+}
+
+pkg_postrm () {
+	fix_so
+}
diff --git a/sys-libs/db/files/digest-db-4.1.25 b/sys-libs/db/files/digest-db-4.1.25
new file mode 100644
index 000000000000..b341a5d49705
--- /dev/null
+++ b/sys-libs/db/files/digest-db-4.1.25
@@ -0,0 +1 @@
+MD5 df71961002b552c0e72c6e4e358f27e1 db-4.1.25.tar.gz 3080234