Include fix from older db version

3 files changed, 109 insertions, 2 deletions

diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 8a61106fbdf2..26d2d3860a98 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -8,13 +8,13 @@ MD5 296293d3d66b05dac9b047cc6c38ae45 db-3.2.9-r8.ebuild 3419
 MD5 5747a8d696bb562301dd34fe0c0e7f46 db-4.1.25_p1-r1.ebuild 1889
 MD5 8120ef84b99fdbbc1b5c729fce6551ba db-1.85-r1.ebuild 1405
 MD5 d753dfd4f760f41de77f300b946443dd db-4.0.14-r2.ebuild 2137
-MD5 0c0cafed08b38bc486382afd4365fd2a db-4.1.25_p1-r3.ebuild 2095
+MD5 3e73b82841c8cc64b8dfbac9aae8d053 db-4.1.25_p1-r3.ebuild 2094
 MD5 03f9a0dfd0e3437b167f7b84c18c5cd5 db-3.2.9-r7.ebuild 4375
 MD5 4544475bbc1cae88265ff4a054d988da db-3.2.9-r2.ebuild 3216
 MD5 2fe1bf42f458720afa0b21841963efa4 db-4.1.25.ebuild 2243
 MD5 e4786c48dbec363e72e17947c22666bc db-4.0.14.ebuild 2387
 MD5 75469e2c4c582f3270fd3c19d8781400 db-3.2.9-r9.ebuild 3513
-MD5 4c7d742bcd7857b058c9dda5a83ed1f6 ChangeLog 11350
+MD5 66b6111c3cc4378385dfff0c50fea530 ChangeLog 11446
 MD5 5c921197970cd970a8fbb4cad2d7df7b metadata.xml 1457
 MD5 ce84141afa11b6d932844bc8b4684a92 db-4.0.14-r1.ebuild 2706
 MD5 6eb8be5f7803acaa5bcfd4ed5ffabf83 files/db-3.2.9-jarlocation.patch 492
diff --git a/sys-libs/db/db-4.1.25_p1-r3.ebuild b/sys-libs/db/db-4.1.25_p1-r3.ebuild
new file mode 100644
index 000000000000..3f48784beafd
--- /dev/null
+++ b/sys-libs/db/db-4.1.25_p1-r3.ebuild
@@ -0,0 +1,105 @@
+# 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_p1-r3.ebuild,v 1.1 2003/11/02 12:21:01 pauldv Exp $
+
+IUSE="tcltk java doc"
+
+inherit eutils
+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.1"
+LICENSE="DB"
+KEYWORDS="ia64 ~x86 ~ppc ~alpha ~amd64"
+
+DEPEND="tcltk? ( dev-lang/tcl )
+	java? ( virtual/jdk )"
+
+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}/${P}-jarlocation.patch
+
+	epatch ${FILESDIR}/${PN}-4.0.14-fix-dep-link.patch
+
+}
+
+src_compile() {
+
+	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
+
+	../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_db41_svc
+}
+
+pkg_postinst () {
+	db_fix_so
+}
+
+pkg_postrm () {
+	db_fix_so
+}
diff --git a/sys-libs/db/files/digest-db-4.1.25_p1-r3 b/sys-libs/db/files/digest-db-4.1.25_p1-r3
new file mode 100644
index 000000000000..4f81c12b1c1e
--- /dev/null
+++ b/sys-libs/db/files/digest-db-4.1.25_p1-r3
@@ -0,0 +1,2 @@
+MD5 df71961002b552c0e72c6e4e358f27e1 db-4.1.25.tar.gz 3080234
+MD5 1e073d12cd89f9345e281ca07368f74b patch.4.1.25.1 610