Fix static library installation for db-3.2.9

10 files changed, 26 insertions, 265 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 52d61d466c4d..5e8f0084e0d9 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,13 @@
 # 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.39 2003/08/16 04:44:34 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.40 2003/08/17 08:09:16 pauldv Exp $
+
+*db-3.2.9-r7 (17 Aug 2003)
+
+  17 Aug 2003; Paul de Vrieze <pauldv@gentoo.org> db-3.2.3h-r4.ebuild,
+  db-3.2.9-r1.ebuild, db-3.2.9-r5.ebuild, db-3.2.9-r7.ebuild, db-3.2.9.ebuild:
+  New stable version with support for db-4 and that actually installs the static
+  libraries
 
 *db-4.0.14-r1 (16 Aug 2003)
 
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index bdfe02c7ca38..04494d7eb3d9 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,31 +1,25 @@
-MD5 4c39f02a56211a1bb4c3c8293f648395 ChangeLog 7706
+MD5 473a9fc3887eaa624c729da6e7c67120 ChangeLog 7978
 MD5 f5688fefc8d29c29aa1ae2833131eaa3 db-1.85-r1.ebuild 1412
-MD5 5f58370f7996039a42c4805b7739715b db-3.2.3h-r4.ebuild 2456
-MD5 c6009731de4a567b77ffb70b5be0da4a db-4.0.14-r1.ebuild 2707
-MD5 bb23c5ae6636a708085812b7832e2c60 db-3.2.9.ebuild 2465
+MD5 a037a9713737ca0f498c85f7e0e1dbd6 db-3.2.9-r2.ebuild 3222
 MD5 0dcedfa3f8fa0c10ac06b6f27217e45d db-3.3.11.ebuild 2408
 MD5 0493e4704292527cfb123d8b1f770d1d db-4.0.14.ebuild 2387
-MD5 a037a9713737ca0f498c85f7e0e1dbd6 db-3.2.9-r2.ebuild 3222
-MD5 7bbdb8e7c9f500b78b934c556a7f5eeb db-3.2.9-r1.ebuild 2585
-MD5 89aa256dfbcb71045963bc17ea439796 db-3.2.9-r5.ebuild 4264
-MD5 49e9408a3c27846a20dae4273591e686 db-4.1.25.ebuild 2260
+MD5 c6009731de4a567b77ffb70b5be0da4a db-4.0.14-r1.ebuild 2707
 MD5 c95e9884d4a13b5d17ba264e4b5abf78 db-3.2.9-r6.ebuild 4322
 MD5 5c921197970cd970a8fbb4cad2d7df7b metadata.xml 1457
 MD5 569032897ea0c02bc0c997bacf12e4b2 db-4.1.25_p1.ebuild 2766
+MD5 49e9408a3c27846a20dae4273591e686 db-4.1.25.ebuild 2260
+MD5 d741ed97e2c0ee0bbdbd01e5bbf54fb2 db-3.2.9-r7.ebuild 4371
+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 eb9b0f2c1d8440c6c49fc1d916c2dc0e files/db-4.0.14-fix-dep-link.patch 1119
+MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r2 61
 MD5 214b855f6996d3dca754f6606beff672 files/digest-db-3.3.11 62
 MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14 62
 MD5 9cf113248f29b1e319ae73b266df4986 files/patch.3.2.9.1 2139
 MD5 f8edd1cf6535cd62f9b8ff81e0474273 files/patch.3.2.9.2 495
-MD5 194200b3295b95b46b4564980af27f1f files/db-3.2.9-fix-dep-link.patch 1005
-MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r5 61
-MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r2 61
-MD5 1260aeee2785bda43e81a36b6cb247be files/digest-db-4.1.25 62
+MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r1 62
 MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r6 61
 MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1 118
-MD5 eb9b0f2c1d8440c6c49fc1d916c2dc0e files/db-4.0.14-fix-dep-link.patch 1119
-MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r1 62
+MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r7 61
diff --git a/sys-libs/db/db-3.2.3h-r4.ebuild b/sys-libs/db/db-3.2.3h-r4.ebuild
deleted file mode 100644
index 993dcd5cf415..000000000000
--- a/sys-libs/db/db-3.2.3h-r4.ebuild
+++ /dev/null
@@ -1,68 +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-3.2.3h-r4.ebuild,v 1.16 2003/06/22 05:10:30 seemant Exp $
-
-S=${WORKDIR}/${P}/build_unix
-DESCRIPTION="Berkeley DB for transaction support in MySQL"
-SRC_URI="ftp://mysql.valueclick.com/mysql/Downloads/db/${P}.tar.gz http://download.sourceforge.net/pub/mirrors/mysql/Downloads/db/${P}.tar.gz"
-HOMEPAGE="http://www.mysql.com"
-SLOT="3"
-RDEPEND="virtual/glibc"
-DEPEND="$RDEPEND =sys-libs/db-1.85-r1"
-LICENSE="DB"
-KEYWORDS="x86 ppc sparc "
-
-src_compile() {
-	../dist/configure --host=${CHOST} --enable-compat185 --enable-dump185 --prefix=/usr --enable-shared --enable-static --enable-cxx || die
-	#--enable-rpc does not work
-	echo
-	# Parallel make does not work
-	echo "Building static libs..."
-	make libdb=libdb-3.2.a libdb-3.2.a || die
-	make libcxx=libdb_cxx-3.2.a libdb_cxx-3.2.a || die
-	echo
-	echo "Building db_dump185..."
-	/bin/sh ./libtool --mode=compile cc -c ${CFLAGS} -I/usr/include/db1 -I../dist/../include -D_REENTRANT ../dist/../db_dump185/db_dump185.c || die
-	gcc -s -static -o db_dump185 db_dump185.lo -L/usr/lib -ldb1 || die
-	echo
-	echo "Building everything else..."
-	make libdb=libdb-3.2.a libcxx=libdb_cxx-3.2.a || die
-}
-
-src_install () {
-    make libdb=libdb-3.2.a libcxx=libcxx_3.2.a prefix=${D}/usr install || die
-    dolib.a libdb-3.2.a libdb_cxx-3.2.a
-    dolib libdb-3.2.la libdb_cxx-3.2.la
-
-    dodir usr/include/db3
-    cd ${D}/usr/include
-    mv *.h db3
-    ln db3/db.h db.h
-	
-    cd ${D}/usr/lib
-    ln -s libdb-3.2.so libdb.so.3
-    
-    sed 's,installed=no,installed=yes,' < ${D}/usr/lib/libdb-3.2.la > ${D}/usr/lib/libdb-3.2.la.new
-    mv ${D}/usr/lib/libdb-3.2.la.new ${D}/usr/lib/libdb-3.2.la
-    sed 's,installed=no,installed=yes,' < ${D}/usr/lib/libdb_cxx-3.2.la > ${D}/usr/lib/libdb_cxx-3.2.la.new
-    mv ${D}/usr/lib/libdb_cxx-3.2.la.new ${D}/usr/lib/libdb_cxx-3.2.la
-
-    cd ${S}/..
-    dodoc README LICENSE
-    prepalldocs
-    if [ -d ${D}/usr/share/doc/${PF} ]
-    then
-	mv ${D}/usr/docs ${D}/usr/share/doc/${PF}/html
-    else
-	mv ${D}/usr/docs ${D}/usr/doc/${PF}/html
-    fi
-
-	#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
-	#.la's aren't go readable either
-	chmod go+r *.la
-	#ok, everything should be fixed now :)
-}
-
diff --git a/sys-libs/db/db-3.2.9-r1.ebuild b/sys-libs/db/db-3.2.9-r1.ebuild
deleted file mode 100644
index 8afa2bcf379c..000000000000
--- a/sys-libs/db/db-3.2.9-r1.ebuild
+++ /dev/null
@@ -1,99 +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-3.2.9-r1.ebuild,v 1.14 2003/06/22 05:10:30 seemant Exp $
-
-S=${WORKDIR}/${P}/build_unix
-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"
-KEYWORDS="x86 ppc sparc alpha mips hppa arm"
-
-RDEPEND="virtual/glibc"
-DEPEND="${RDEPEND}
-	=sys-libs/db-1.85-r1
-	sys-devel/libtool
-	sys-devel/m4"
-# We need m4 to else build fails without config.guess
-
-# this doesnt build without exceptions
-export CXXFLAGS="${CXXFLAGS/-fno-exceptions/-fexceptions}"
-
-src_unpack() {
-	unpack ${A}
-	chmod -R ug+w *
-	
-	cd ${WORKDIR}/${P}
-	patch -p0 < ${FILESDIR}/patch.3.2.9.1 || die
-	patch -p0 < ${FILESDIR}/patch.3.2.9.2 || die
-
-	# fix invalid .la files
-	cd ${WORKDIR}/${P}/dist
-	rm -f ltversion.sh
-	cp ${ROOT}/usr/share/libtool/ltmain.sh . || \
-		die "Could not update ltmain.sh"
-	# remove config.guess else we have problems with gcc-3.2
-	rm -f config.guess
-}
-
-src_compile() {
-	../dist/configure --host=${CHOST} \
-		--build=${CHOST} \
-		--enable-compat185 \
-		--enable-dump185 \
-		--prefix=/usr \
-		--enable-shared \
-		--enable-static \
-		--enable-cxx || die
-		
-	#--enable-rpc does not work
-	echo
-	# Parallel make does not work
-	einfo "Building static libs..."
-	emake libdb=libdb-3.2.a libdb-3.2.a || die
-	emake libcxx=libdb_cxx-3.2.a libdb_cxx-3.2.a || die
-	echo
-	einfo "Building db_dump185..."
-	/bin/sh ./libtool --mode=compile ${CC} -c ${CFLAGS} -D_GNU_SOURCE \
-		-I/usr/include/db1 -I../dist/../include -D_REENTRANT \
-		../dist/../db_dump185/db_dump185.c || die
-	gcc -s -static -o db_dump185 db_dump185.lo -L/usr/lib -ldb1 || die
-	echo
-	einfo "Building everything else..."
-	MAKEOPTS="${MAKEOPTS} -j1"
-	emake libdb=libdb-3.2.a libcxx=libdb_cxx-3.2.a || die
-}
-
-src_install () {
-	make libdb=libdb-3.2.a \
-		libcxx=libcxx_3.2.a \
-		prefix=${D}/usr \
-		install || die
-		
-	dolib.a libdb-3.2.a libdb_cxx-3.2.a
-
-	dodir usr/include/db3
-	cd ${D}/usr/include
-	mv *.h db3
-	ln db3/db.h db.h
-	
-	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
-	#.la's aren't go readable either
-	chmod go+r *.la
-	
-	cd ${S}/..
-	dodoc README LICENSE
-
-	dodir /usr/share/doc/${PF}/html
-	mv ${D}/usr/docs/* ${D}/usr/share/doc/${PF}/html
-	rm -rf ${D}/usr/docs
-}
-
diff --git a/sys-libs/db/db-3.2.9-r5.ebuild b/sys-libs/db/db-3.2.9-r7.ebuild
index 947bf17ca4fa..cd44a22dfeb2 100644
--- a/sys-libs/db/db-3.2.9-r5.ebuild
+++ b/sys-libs/db/db-3.2.9-r7.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.11 2003/07/01 15:13:37 todd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.2.9-r7.ebuild,v 1.1 2003/08/17 08:09:17 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}
@@ -103,6 +103,8 @@ src_install () {
 		install || die
 	
 	cd ${S}/build-static
+	cp libdb.a libdb-3.2.a
+	cp libdb_cxx.a libdb_cxx-3.2.a
 	dolib.a libdb-3.2.a libdb_cxx-3.2.a
 
 	dodir usr/include/db3
@@ -133,7 +135,7 @@ src_install () {
 	do
 		mv ${fname} ${fname//\/db_/\/db3_}
 	done
-	ln -sf /usr/include/db4/db.h ${D}/usr/include/db.h
+	ln -sf /usr/include/db3/db.h ${D}/usr/include/db.h
 }
 
 fix_so () {
@@ -148,8 +150,9 @@ fix_so () {
 	[ -n "${target}" ] && ln -sf ${target//.\//} libdb_java.so
 
 	cd ${ROOT}/usr/include
-	target=`ls -d db? |tail -n 1`
+	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 () {
diff --git a/sys-libs/db/db-3.2.9.ebuild b/sys-libs/db/db-3.2.9.ebuild
deleted file mode 100644
index aeb22bc994ec..000000000000
--- a/sys-libs/db/db-3.2.9.ebuild
+++ /dev/null
@@ -1,73 +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-3.2.9.ebuild,v 1.15 2003/06/22 05:10:30 seemant Exp $
-
-S=${WORKDIR}/${P}/build_unix
-DESCRIPTION="Berkeley DB for transaction support in MySQL"
-SRC_URI="http://www.sleepycat.com/update/${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.sleepycat.com/"
-SLOT="3"
-RDEPEND="virtual/glibc"
-DEPEND="$RDEPEND =sys-libs/db-1.85-r1"
-LICENSE="DB"
-KEYWORDS="x86 ppc sparc "
-
-# this doesnt build without exceptions
-export CXXFLAGS="${CXXFLAGS/-fno-exceptions/-fexceptions}"
-src_unpack() {
-	unpack ${A}
-	cd ${WORKDIR}/${P}
-	patch -p0 < ${FILESDIR}/patch.3.2.9.1
-	patch -p0 < ${FILESDIR}/patch.3.2.9.2
-}
-
-src_compile() {
-	../dist/configure --host=${CHOST} --enable-compat185 --enable-dump185 --prefix=/usr --enable-shared --enable-static --enable-cxx || die
-	#--enable-rpc does not work
-	echo
-	# Parallel make does not work
-	echo "Building static libs..."
-	make libdb=libdb-3.2.a libdb-3.2.a || die
-	make libcxx=libdb_cxx-3.2.a libdb_cxx-3.2.a || die
-	echo
-	echo "Building db_dump185..."
-	/bin/sh ./libtool --mode=compile cc -c ${CFLAGS} -I/usr/include/db1 -I../dist/../include -D_REENTRANT ../dist/../db_dump185/db_dump185.c || die
-	gcc -s -static -o db_dump185 db_dump185.lo -L/usr/lib -ldb1 || die
-	echo
-	echo "Building everything else..."
-	make libdb=libdb-3.2.a libcxx=libdb_cxx-3.2.a || die
-}
-
-src_install () {
-	make libdb=libdb-3.2.a libcxx=libcxx_3.2.a prefix=${D}/usr install || die
-	dolib.a libdb-3.2.a libdb_cxx-3.2.a
-	dolib libdb-3.2.la libdb_cxx-3.2.la
-
-	dodir usr/include/db3
-	cd ${D}/usr/include
-	mv *.h db3
-	ln db3/db.h db.h
-	
-	cd ${D}/usr/lib
-	ln -s libdb-3.2.so libdb.so.3
-	
-	sed 's,installed=no,installed=yes,' < ${D}/usr/lib/libdb-3.2.la > ${D}/usr/lib/libdb-3.2.la.new
-	mv ${D}/usr/lib/libdb-3.2.la.new ${D}/usr/lib/libdb-3.2.la
-	sed 's,installed=no,installed=yes,' < ${D}/usr/lib/libdb_cxx-3.2.la > ${D}/usr/lib/libdb_cxx-3.2.la.new
-	mv ${D}/usr/lib/libdb_cxx-3.2.la.new ${D}/usr/lib/libdb_cxx-3.2.la
-
-	cd ${S}/..
-	dodoc README LICENSE
-
-	dodir /usr/share/doc/${PF}/html
-	mv ${D}/usr/docs ${D}/usr/share/doc/${PF}/html
-
-	#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
-	#.la's aren't go readable either
-	chmod go+r *.la
-	#ok, everything should be fixed now :)
-}
-
diff --git a/sys-libs/db/files/digest-db-3.2.3h-r4 b/sys-libs/db/files/digest-db-3.2.3h-r4
deleted file mode 100644
index 8afffe4d28b0..000000000000
--- a/sys-libs/db/files/digest-db-3.2.3h-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7a4a88daa29268eebb57ff2ed58dff53 db-3.2.3h.tar.gz 2074615
diff --git a/sys-libs/db/files/digest-db-3.2.9-r1 b/sys-libs/db/files/digest-db-3.2.9-r1
deleted file mode 100644
index cc0f167ea09b..000000000000
--- a/sys-libs/db/files/digest-db-3.2.9-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4df5c7051b11411e0a970f6c91613942 db-3.2.9.tar.gz 2085238
diff --git a/sys-libs/db/files/digest-db-3.2.9-r5 b/sys-libs/db/files/digest-db-3.2.9-r5
deleted file mode 100644
index cc0f167ea09b..000000000000
--- a/sys-libs/db/files/digest-db-3.2.9-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4df5c7051b11411e0a970f6c91613942 db-3.2.9.tar.gz 2085238
diff --git a/sys-libs/db/files/digest-db-3.2.9 b/sys-libs/db/files/digest-db-3.2.9-r7
index cc0f167ea09b..cc0f167ea09b 100644
--- a/sys-libs/db/files/digest-db-3.2.9
+++ b/sys-libs/db/files/digest-db-3.2.9-r7