New patchlevel

4 files changed, 166 insertions, 24 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 4b1cfa32cbc7..038a33b3f21d 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/db
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.86 2004/03/21 07:18:02 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.87 2004/04/15 20:40:15 pauldv Exp $
+
+*db-4.2.52_p2 (15 Apr 2004)
+
+  15 Apr 2004; Paul de Vrieze <pauldv@gentoo.org> db-4.2.52_p2.ebuild:
+  New patch version
 
   21 Mar 2004; Joshua Kinard <kumba@gentoo.org> db-4.1.25_p1-r3.ebuild:
   Tweak to make gnuconfig work again for mips (the 'dist' dir got moved from
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index e4b4d0f23bf6..2085eaf09d5d 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,29 +1,31 @@
+MD5 a4882f7506a0f084e1c71cb8a7b3fcdd db-3.3.11.ebuild 2408
+MD5 d23bb9a64830aa173a4f7f8bc8687a9a db-4.0.14-r2.ebuild 2132
+MD5 ce0e75e9646a539b758d77ef13b88c47 db-4.0.14-r3.ebuild 2379
+MD5 b5fd885ce291016920acb0898f0d5f95 db-4.2.52_p1.ebuild 2772
+MD5 0273bf0e102feaab825a47e581fda1e4 db-3.2.9-r10.ebuild 4152
+MD5 4aeab686bc74c08edbee1f6689bb16ca db-4.2.52_p2.ebuild 2752
+MD5 a000cb32992cba2dc4955e4d06a2ac68 db-1.85-r1.ebuild 1407
+MD5 4af227b6910e010fae7d526216f6679d db-3.2.9-r9.ebuild 3512
+MD5 5c921197970cd970a8fbb4cad2d7df7b metadata.xml 1457
+MD5 d457d7f8756b0c942522de9189dd2c52 ChangeLog 14115
+MD5 69f5afa96c9f2e18c0d637fa4f860715 db-4.1.25_p1-r3.ebuild 2589
+MD5 7b2aed1f7e6a8857d3fbee953e845c3f db-3.2.9-r7.ebuild 4371
+MD5 f8edd1cf6535cd62f9b8ff81e0474273 files/patch.3.2.9.2 495
+MD5 9cf113248f29b1e319ae73b266df4986 files/patch.3.2.9.1 2139
 MD5 194200b3295b95b46b4564980af27f1f files/db-3.2.9-fix-dep-link.patch 1005
-MD5 6eb8be5f7803acaa5bcfd4ed5ffabf83 files/db-3.2.9-jarlocation.patch 492
-MD5 eb9b0f2c1d8440c6c49fc1d916c2dc0e files/db-4.0.14-fix-dep-link.patch 1119
-MD5 0101200dac8a9299fc1578081ac72b71 files/db-4.0.14-jarlocation.patch 565
-MD5 2bb2a5dbe8d16f858d177e1193639b70 files/db-4.1.25_p1-jarlocation.patch 626
-MD5 ecd81fa9868ec49c61306444144d44a9 files/db.1.85.patch 55584
-MD5 3057fcc117c33a02bd4c092586a58e49 files/digest-db-1.85-r1 59
-MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r10 61
-MD5 3c47ce6ed92e948fbde232c1e3571f16 files/db-4.2-jarlocation.patch 599
-MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r7 61
 MD5 35fa694f3db327e4fb015728aca6a082 files/digest-db-4.2.52_p1 118
+MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r10 61
+MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r3 118
+MD5 3057fcc117c33a02bd4c092586a58e49 files/digest-db-1.85-r1 59
 MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r9 61
 MD5 214b855f6996d3dca754f6606beff672 files/digest-db-3.3.11 62
+MD5 68a677d9846ad3fc623f173581ff9aa5 files/digest-db-4.2.52_p2 175
 MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r2 62
+MD5 0101200dac8a9299fc1578081ac72b71 files/db-4.0.14-jarlocation.patch 565
+MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r7 61
+MD5 6eb8be5f7803acaa5bcfd4ed5ffabf83 files/db-3.2.9-jarlocation.patch 492
+MD5 3c47ce6ed92e948fbde232c1e3571f16 files/db-4.2-jarlocation.patch 599
+MD5 ecd81fa9868ec49c61306444144d44a9 files/db.1.85.patch 55584
+MD5 eb9b0f2c1d8440c6c49fc1d916c2dc0e files/db-4.0.14-fix-dep-link.patch 1119
 MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r3 62
-MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r3 118
-MD5 9cf113248f29b1e319ae73b266df4986 files/patch.3.2.9.1 2139
-MD5 f8edd1cf6535cd62f9b8ff81e0474273 files/patch.3.2.9.2 495
-MD5 f1c6d18209edaed7a56c179b8c01ef1e ChangeLog 13993
-MD5 a000cb32992cba2dc4955e4d06a2ac68 db-1.85-r1.ebuild 1407
-MD5 0273bf0e102feaab825a47e581fda1e4 db-3.2.9-r10.ebuild 4152
-MD5 b5fd885ce291016920acb0898f0d5f95 db-4.2.52_p1.ebuild 2772
-MD5 7b2aed1f7e6a8857d3fbee953e845c3f db-3.2.9-r7.ebuild 4371
-MD5 4af227b6910e010fae7d526216f6679d db-3.2.9-r9.ebuild 3512
-MD5 a4882f7506a0f084e1c71cb8a7b3fcdd db-3.3.11.ebuild 2408
-MD5 d23bb9a64830aa173a4f7f8bc8687a9a db-4.0.14-r2.ebuild 2132
-MD5 ce0e75e9646a539b758d77ef13b88c47 db-4.0.14-r3.ebuild 2379
-MD5 69f5afa96c9f2e18c0d637fa4f860715 db-4.1.25_p1-r3.ebuild 2589
-MD5 5c921197970cd970a8fbb4cad2d7df7b metadata.xml 1457
+MD5 2bb2a5dbe8d16f858d177e1193639b70 files/db-4.1.25_p1-jarlocation.patch 626
diff --git a/sys-libs/db/db-4.2.52_p2.ebuild b/sys-libs/db/db-4.2.52_p2.ebuild
new file mode 100644
index 000000000000..051a3711886b
--- /dev/null
+++ b/sys-libs/db/db-4.2.52_p2.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p2.ebuild,v 1.1 2004/04/15 20:40:15 pauldv Exp $
+
+IUSE="tcltk java doc"
+
+inherit eutils gnuconfig
+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.2"
+LICENSE="DB"
+KEYWORDS="~x86"
+
+DEPEND="tcltk? ( >=dev-lang/tcl-8.4 )
+	java? ( virtual/jdk )"
+
+RDEPEND="tcltk? ( dev-lang/tcl )
+	java? ( virtual/jre )"
+
+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}/${PN}-${SLOT}-jarlocation.patch
+
+	epatch ${FILESDIR}/${PN}-4.0.14-fix-dep-link.patch
+
+}
+
+src_compile() {
+	addwrite /proc/self/maps
+
+	# Mips needs a gnuconfig update so obscure things like mips64 are known
+	# db-4.1.25_p1 extracts to ${WORKDIR}/db-4.1.25, so we need to strip the _p1
+	if use mips; then
+		einfo "Updating config.{guess,sub} for mips"
+		local OLDS="${S}"
+		S="${S}/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
+
+	if [ "${PROFILE_ARCH}" = "sparc64" ]; then
+		myconf="${myconf} --host=${CHOST}"
+	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_db42_svc
+
+	if use java; then
+		mkdir -p ${D}/usr/share/db
+		cat <<EOF >${D}/usr/share/db/package.env
+DESCRIPTION=The java bindings for berkeley db version ${MY_PV}
+CLASSPATH=:/usr/lib/db-${SLOT}.jar
+EOF
+	fi
+}
+
+pkg_postinst () {
+	db_fix_so
+}
+
+pkg_postrm () {
+	db_fix_so
+}
diff --git a/sys-libs/db/files/digest-db-4.2.52_p2 b/sys-libs/db/files/digest-db-4.2.52_p2
new file mode 100644
index 000000000000..00d41e6281ca
--- /dev/null
+++ b/sys-libs/db/files/digest-db-4.2.52_p2
@@ -0,0 +1,3 @@
+MD5 cbc77517c9278cdb47613ce8cb55779f db-4.2.52.tar.gz 4073147
+MD5 1227f5f9ff43d48b5b1759e113a1c2d7 patch.4.2.52.1 988
+MD5 3da7efd8d29919a9113e2f6f5166f5b7 patch.4.2.52.2 1433