Restored removed version since it broke deps on mips and hppa.

Package-Manager: portage-2.1.3.9

4 files changed, 183 insertions, 15 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 78cc66628b5b..55c14f3f27f3 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.228 2007/10/25 07:03:32 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.229 2007/10/25 18:02:47 mr_bones_ Exp $
+
+  25 Oct 2007; Michael Sterrett <mr_bones_@gentoo.org> +db-3.2.9-r10.ebuild:
+  Restored removed version since it broke deps on mips and hppa.
 
   25 Oct 2007; Torsten Veller <tove@gentoo.org> db-3.2.9-r11.ebuild:
   Added a missing quote (#196944)
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 4b466c418072..a9848a93d586 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX db-1.85-gentoo-paths.patch 684 RMD160 cbfb484127600e180eb432d3f5aa31deba43e8bf SHA1 42a105f2503315a28b1e7f7aad71ee3bd4a56a13 SHA256 049052c74c544ac1c1f3b1b91c3e43df76b135c610148212679dfd324470cf2f
 MD5 86aca9a49a082dc56e4103ec8112f344 files/db-1.85-gentoo-paths.patch 684
 RMD160 cbfb484127600e180eb432d3f5aa31deba43e8bf files/db-1.85-gentoo-paths.patch 684
@@ -128,6 +125,10 @@ EBUILD db-1.85-r3.ebuild 1210 RMD160 78f28bf46f4adde0df02f9ebe7e4dfbbebb293e9 SH
 MD5 23051304aff15d3991c617f97daa67b4 db-1.85-r3.ebuild 1210
 RMD160 78f28bf46f4adde0df02f9ebe7e4dfbbebb293e9 db-1.85-r3.ebuild 1210
 SHA256 ab969a566111ab49c561bfa9a8f2fdfa3e7c4d13a4b942d821eaf10a5c40b1a0 db-1.85-r3.ebuild 1210
+EBUILD db-3.2.9-r10.ebuild 4403 RMD160 2b3907d782a882efe8a87822a293210ad8f53142 SHA1 223e71b91d84b1d4a8e7f2e4a0a113acc8bcfb4d SHA256 7c431eaf79bcee814143a0f190b5a0e0d10e49fd55032c4f58eb3634effcce8f
+MD5 4f974a78d2b9e2714aee7cee4e6ebcc9 db-3.2.9-r10.ebuild 4403
+RMD160 2b3907d782a882efe8a87822a293210ad8f53142 db-3.2.9-r10.ebuild 4403
+SHA256 7c431eaf79bcee814143a0f190b5a0e0d10e49fd55032c4f58eb3634effcce8f db-3.2.9-r10.ebuild 4403
 EBUILD db-3.2.9-r11.ebuild 4675 RMD160 33b0ac196665c9474ed0ba0f6e10019d9049b17f SHA1 3a7b744f48061d18303f041a27dd85427b12aa12 SHA256 6e300b35b0cd0a147459e00fb16054686f38eb9c8ef464fc670322ba116b9018
 MD5 e01e9419fc0d373138c0b8f252662b14 db-3.2.9-r11.ebuild 4675
 RMD160 33b0ac196665c9474ed0ba0f6e10019d9049b17f db-3.2.9-r11.ebuild 4675
@@ -152,10 +153,10 @@ EBUILD db-4.6.19.ebuild 3938 RMD160 9fc00d58a793ba388a84b91f423e84a9d7dbdee5 SHA
 MD5 120bd6f54a46b00d13fa5b6fa055c30c db-4.6.19.ebuild 3938
 RMD160 9fc00d58a793ba388a84b91f423e84a9d7dbdee5 db-4.6.19.ebuild 3938
 SHA256 b02f92bf555c84949b219db80bca55b35d7a66952c2a6f728dc74898672c865a db-4.6.19.ebuild 3938
-MISC ChangeLog 34741 RMD160 5863d74758932041d79841a7eb7f67c8a9fd56cb SHA1 5541372ffe7bd5e7a5716a5d45c9103da198e3a5 SHA256 a108be48c78384dbb3836ec1c00379d0912f2d7347fd92b41eea17c9991f7a67
-MD5 289614a4636790f7363b86784cbb0ea0 ChangeLog 34741
-RMD160 5863d74758932041d79841a7eb7f67c8a9fd56cb ChangeLog 34741
-SHA256 a108be48c78384dbb3836ec1c00379d0912f2d7347fd92b41eea17c9991f7a67 ChangeLog 34741
+MISC ChangeLog 34889 RMD160 ae00d8570e428692fd67df59308444d9f134c35a SHA1 9e7c425f51c1bdf3ae61037eb5c67b0e05f1d909 SHA256 a82c20b554896e2f80178d83eb979d7910ee85c81fcdce0ab139d40f89758a79
+MD5 39aeed301111f009cf537e2dd10fd526 ChangeLog 34889
+RMD160 ae00d8570e428692fd67df59308444d9f134c35a ChangeLog 34889
+SHA256 a82c20b554896e2f80178d83eb979d7910ee85c81fcdce0ab139d40f89758a79 ChangeLog 34889
 MISC metadata.xml 1651 RMD160 cbdc138b8fd0fab28ec59db03fca18f2e0e74818 SHA1 e70ae3f07e5559a43dd85fad3270b7f7f185b996 SHA256 895bfb43a1bd60170937b4523f396d5772a3914384a95105345ac1f24c606550
 MD5 71519f9e67010bd7b9d8aff6b19b8c15 metadata.xml 1651
 RMD160 cbdc138b8fd0fab28ec59db03fca18f2e0e74818 metadata.xml 1651
@@ -166,6 +167,9 @@ SHA256 e1baf331d288a2846ebbe548b213350829b3459770b07becc689467cf901a010 files/di
 MD5 04b5da67912f6436d6cd018c7535c6e0 files/digest-db-1.85-r3 467
 RMD160 fe68aa9fe1523a966db10488d535592b1f80bb7a files/digest-db-1.85-r3 467
 SHA256 81fea98145a964fea76ca023055f58b30212245bbb3ddf0efeef81299fc68041 files/digest-db-1.85-r3 467
+MD5 89d5c6e9ecc4225d5936a1e05274799d files/digest-db-3.2.9-r10 229
+RMD160 e6aedcada1a91187c51de26ab254a6d3aa411181 files/digest-db-3.2.9-r10 229
+SHA256 829ef6dcac63c8d01a6173e02aad48203ef45dcf4bb27aaa770c520625fc4903 files/digest-db-3.2.9-r10 229
 MD5 89d5c6e9ecc4225d5936a1e05274799d files/digest-db-3.2.9-r11 229
 RMD160 e6aedcada1a91187c51de26ab254a6d3aa411181 files/digest-db-3.2.9-r11 229
 SHA256 829ef6dcac63c8d01a6173e02aad48203ef45dcf4bb27aaa770c520625fc4903 files/digest-db-3.2.9-r11 229
@@ -184,10 +188,3 @@ SHA256 cbec0b3c04af33d3c45800e6e7541405b086000a94b3faa0d376a0efe5f15892 files/di
 MD5 1ab5380b1655ec29f4fce0e224ebd373 files/digest-db-4.6.19 235
 RMD160 3ac73e5abf9de4cb3912d0c37e28e3329f0dba21 files/digest-db-4.6.19 235
 SHA256 76330bd28befebdc546c4efbcee042b577e7a668711e3694d0a6e8c6b952638e files/digest-db-4.6.19 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHID/PV3J2n04EauwRAimfAJ0Xwc2XGjepME4tkW/NrQfcjjrRwwCg3t3W
-qQnIgbFxKqB3wgdMLxiiTzw=
-=hPOQ
------END PGP SIGNATURE-----
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..fbafdaef94b1
--- /dev/null
+++ b/sys-libs/db/db-3.2.9-r10.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2007 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.30 2007/10/25 18:02:47 mr_bones_ Exp $
+
+inherit gnuconfig libtool eutils db java-pkg
+
+DESCRIPTION="Berkeley DB for transaction support in MySQL"
+HOMEPAGE="http://www.sleepycat.com/"
+SRC_URI="ftp://ftp.sleepycat.com/releases/${P}.tar.gz"
+
+LICENSE="DB"
+SLOT="3"
+# This ebuild is to be the compatibility ebuild for when db4 is put
+# in the tree.
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+IUSE="doc java"
+
+RDEPEND="virtual/libc"
+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}"
+
+pkg_setup() {
+	use java && java-pkg_pkg_setup
+}
+
+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
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-jarlocation.patch
+	epatch ${FILESDIR}/db-3.2.9-java15.patch
+	gnuconfig_update
+}
+
+src_compile() {
+	local conf=
+	local conf_shared=
+	local conf_static=
+
+	use java && export JAVACABS="${JAVAC}"
+
+	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 tcl tcl`
+	#	`use_with tcl 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} \
+		--libdir=/usr/$(get_libdir) \
+		--enable-static || die
+
+	einfo "Configuring ${P} (shared)..."
+	mkdir -p ${S}/build-shared
+	cd ${S}/build-shared
+	../dist/configure ${conf} ${conf_shared} \
+		--libdir=/usr/$(get_libdir) \
+		--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 \
+		libdir=${D}/usr/$(get_libdir) \
+		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/$(get_libdir)
+	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/files/digest-db-3.2.9-r10 b/sys-libs/db/files/digest-db-3.2.9-r10
new file mode 100644
index 000000000000..94bf83c2428a
--- /dev/null
+++ b/sys-libs/db/files/digest-db-3.2.9-r10
@@ -0,0 +1,3 @@
+MD5 4df5c7051b11411e0a970f6c91613942 db-3.2.9.tar.gz 2085238
+RMD160 c2c5cdb3ec0e99e5687c0861dfbf76b8878f27cb db-3.2.9.tar.gz 2085238
+SHA256 3eccaec87bca4ca0f5728cf4579650da9d12e331187f1e98321e5c9e9e04b108 db-3.2.9.tar.gz 2085238