Mask db-4.0.14 as testing so people can test it. Everything should go cleanly except for a number of packages blocking on db-4 when compiling. If someone feels like it to fix those, contact me

6 files changed, 39 insertions, 119 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 532ac61ea932..4e107cb3eb8d 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,18 @@
 # 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.36 2003/07/03 08:29:19 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.37 2003/08/01 14:03:55 pauldv Exp $
+
+  01 Aug 2003; Paul de Vrieze <pauldv@gentoo.org> db-4.0.14.ebuild,
+  db-4.1.24.ebuild, db-4.1.25.ebuild:
+  Make sure that db-4.1 is in a different slot as db-4, and that there are no
+  duplicates. db-4 is still masked though
+
+  01 Aug 2003; Paul de Vrieze <pauldv@gentoo.org> db-4.0.14.ebuild:
+  Mark db-4.0.14 as testing. There probably still will be some minor problems,
+  but these can be better handled when the package is testing. Some of the
+  dependent packages do not really like versioned symbols. We do need to use
+  them though to be able to run multiple versions in parallel and so providing
+  an update path
 
   03 Jul 2003; Paul de Vrieze <pauldv@gentoo.org> db-4.1.25.ebuild:
   Allow db-4.0 and db-4.1 to be both installed, by putting db-4.1 in a different
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 3dd15ef945a8..0d61dd7275be 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,28 +1,26 @@
-MD5 e11943e49117bc3d01cb3247dcd93b45 ChangeLog 6612
-MD5 f5688fefc8d29c29aa1ae2833131eaa3 db-1.85-r1.ebuild 1412
-MD5 5f58370f7996039a42c4805b7739715b db-3.2.3h-r4.ebuild 2456
-MD5 7bbdb8e7c9f500b78b934c556a7f5eeb db-3.2.9-r1.ebuild 2585
-MD5 a037a9713737ca0f498c85f7e0e1dbd6 db-3.2.9-r2.ebuild 3222
-MD5 bb23c5ae6636a708085812b7832e2c60 db-3.2.9.ebuild 2465
 MD5 0dcedfa3f8fa0c10ac06b6f27217e45d db-3.3.11.ebuild 2408
-MD5 7e8ae38e640cfbccd2acda2c16eaa57e db-4.1.25.ebuild 2236
-MD5 aee477a37e90373dcd42753f8ae903fb db-4.1.24.ebuild 2234
-MD5 bf484036409a437296d78662b721653f db-4.0.14.ebuild 2385
-MD5 89aa256dfbcb71045963bc17ea439796 db-3.2.9-r5.ebuild 4264
+MD5 7bbdb8e7c9f500b78b934c556a7f5eeb db-3.2.9-r1.ebuild 2585
 MD5 c95e9884d4a13b5d17ba264e4b5abf78 db-3.2.9-r6.ebuild 4322
+MD5 49e9408a3c27846a20dae4273591e686 db-4.1.25.ebuild 2260
+MD5 5f58370f7996039a42c4805b7739715b db-3.2.3h-r4.ebuild 2456
+MD5 f5688fefc8d29c29aa1ae2833131eaa3 db-1.85-r1.ebuild 1412
 MD5 5c921197970cd970a8fbb4cad2d7df7b metadata.xml 1457
-MD5 1260aeee2785bda43e81a36b6cb247be files/digest-db-4.1.25 62
+MD5 a037a9713737ca0f498c85f7e0e1dbd6 db-3.2.9-r2.ebuild 3222
+MD5 ccdd20f158ec0507bbdaf5524d3b5742 ChangeLog 7235
+MD5 89aa256dfbcb71045963bc17ea439796 db-3.2.9-r5.ebuild 4264
+MD5 0493e4704292527cfb123d8b1f770d1d db-4.0.14.ebuild 2387
+MD5 bb23c5ae6636a708085812b7832e2c60 db-3.2.9.ebuild 2465
+MD5 f8edd1cf6535cd62f9b8ff81e0474273 files/patch.3.2.9.2 495
+MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r6 61
+MD5 9cf113248f29b1e319ae73b266df4986 files/patch.3.2.9.1 2139
 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 214b855f6996d3dca754f6606beff672 files/digest-db-3.3.11 62
+MD5 3057fcc117c33a02bd4c092586a58e49 files/digest-db-1.85-r1 59
 MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14 62
-MD5 c42106477e8a2d626da71270d1e56609 files/digest-db-4.1.24 62
-MD5 9cf113248f29b1e319ae73b266df4986 files/patch.3.2.9.1 2139
-MD5 f8edd1cf6535cd62f9b8ff81e0474273 files/patch.3.2.9.2 495
+MD5 214b855f6996d3dca754f6606beff672 files/digest-db-3.3.11 62
+MD5 1260aeee2785bda43e81a36b6cb247be files/digest-db-4.1.25 62
+MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r2 61
+MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9 61
+MD5 ecd81fa9868ec49c61306444144d44a9 files/db.1.85.patch 55584
+MD5 355b01acef6125096cee653bdf4c32fc files/digest-db-3.2.3h-r4 62
 MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r5 61
-MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r6 61
diff --git a/sys-libs/db/db-4.0.14.ebuild b/sys-libs/db/db-4.0.14.ebuild
index 1614ea1908b7..a2d6c45365d2 100644
--- a/sys-libs/db/db-4.0.14.ebuild
+++ b/sys-libs/db/db-4.0.14.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-4.0.14.ebuild,v 1.26 2003/06/30 06:50:56 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.0.14.ebuild,v 1.27 2003/08/01 14:03:55 pauldv Exp $
 
 IUSE="tcltk java"
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.sleepycat.com/update/snapshot/${P}.tar.gz"
 HOMEPAGE="http://www.sleepycat.com"
 SLOT="4"
 LICENSE="DB"
-KEYWORDS="-*"
+KEYWORDS="~x86"
 
 DEPEND="tcltk? ( dev-lang/tcl )
 	java? ( virtual/jdk )"
diff --git a/sys-libs/db/db-4.1.24.ebuild b/sys-libs/db/db-4.1.24.ebuild
deleted file mode 100644
index 1cfbcf02b5b5..000000000000
--- a/sys-libs/db/db-4.1.24.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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.24.ebuild,v 1.20 2003/06/30 06:50:56 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="amd64"
-
-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 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
-	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 ${ROOT}/usr/lib
-	target=`find -type f -maxdepth 1 -name "libdb-*.so" |sort |tail -n 1`
-	[ -n "${target}" ] && ln -sf ${target//.\//} libdb.so
-	target=`find -type f -maxdepth 1 -name "libdb_cxx*.so" |sort |tail -n 1`
-	[ -n "${target}" ] && ln -sf ${target//.\//} libdb_cxx.so
-	target=`find -type f -maxdepth 1 -name "libdb_tcl*.so" |sort |tail -n 1`
-	[ -n "${target}" ] && ln -sf ${target//.\//} libdb_tcl.so
-	target=`find -type f -maxdepth 1 -name "libdb_java*.so" |sort |tail -n 1`
-	[ -n "${target}" ] && ln -sf ${target//.\//} libdb_java.so
-
-	cd ${ROOT}/usr/include
-	target=`ls -d db? |sort |tail -n 1`
-	[ -n "${target}" ] && ln -sf ${target}/db.h .
-	[ -n "${target}" ] && ln -sf ${target}/db_185.h .
-}
-
-pkg_postinst () {
-	fix_so
-}
-
-pkg_postrm () {
-	fix_so
-}
diff --git a/sys-libs/db/db-4.1.25.ebuild b/sys-libs/db/db-4.1.25.ebuild
index be7042533fb4..3301b9826070 100644
--- a/sys-libs/db/db-4.1.25.ebuild
+++ b/sys-libs/db/db-4.1.25.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-4.1.25.ebuild,v 1.9 2003/07/03 08:29:19 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25.ebuild,v 1.10 2003/08/01 14:03:55 pauldv Exp $
 
 IUSE="tcltk java"
 
@@ -52,15 +52,15 @@ src_install () {
 	einstall || die
 	for fname in ${D}/usr/bin/db_*
 	do
-		mv ${fname} ${fname//\/db_/\/db41_}
+		mv ${fname} ${fname//\/db_/\/db${SLOT}_}
 	done
 
-	dodir /usr/include/db4
-	mv ${D}/usr/include/*.h ${D}/usr/include/db4/
+	dodir /usr/include/db${SLOT}
+	mv ${D}/usr/include/*.h ${D}/usr/include/db${SLOT}/
 	
 	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
+	ln -s /usr/include/db${SLOT}/db.h ${D}/usr/include/db.h
 }
 
 fix_so () {
diff --git a/sys-libs/db/files/digest-db-4.1.24 b/sys-libs/db/files/digest-db-4.1.24
deleted file mode 100644
index c7f7c0a76990..000000000000
--- a/sys-libs/db/files/digest-db-4.1.24
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bf98c80a37809af3d165ba6c9d472846 db-4.1.24.tar.gz 3091291