Upstream has 2 patches, so get a new version

Package-Manager: portage-2.1_pre10-r2

5 files changed, 154 insertions, 1 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index f1ac29b281e4..29340cd853fb 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.157 2006/04/24 01:56:09 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.158 2006/05/08 09:13:11 pauldv Exp $
+
+*db-4.4.20_p2 (08 May 2006)
+
+  08 May 2006; <pauldv@gentoo.org> -db-4.4.20.ebuild, +db-4.4.20_p2.ebuild:
+  Use the upstream patches.
 
   29 Apr 2006; Joshua Kinard <kumba@gentoo.org> db-4.2.52_p2-r1.ebuild:
   Marked stable on mips.
diff --git a/sys-libs/db/db-4.4.20_p2.ebuild b/sys-libs/db/db-4.4.20_p2.ebuild
new file mode 100644
index 000000000000..3209895c8b06
--- /dev/null
+++ b/sys-libs/db/db-4.4.20_p2.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.4.20_p2.ebuild,v 1.1 2006/05/08 09:13:11 pauldv Exp $
+
+inherit eutils gnuconfig db flag-o-matic
+
+#Number of official patches
+#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
+PATCHNO=${PV/*.*.*_p}
+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"
+HOMEPAGE="http://www.sleepycat.com/"
+SRC_URI="ftp://ftp.sleepycat.com/releases/${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
+
+LICENSE="DB"
+SLOT="4.4"
+KEYWORDS="~amd64 ~ia64 ~m68k ~ppc ~sparc ~x86"
+IUSE="tcltk java doc nocxx bootstrap"
+
+DEPEND="tcltk? ( >=dev-lang/tcl-8.4 )
+	java? ( virtual/jdk )
+	>=sys-devel/binutils-2.16.1"
+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
+		epatch ${DISTDIR}/patch.${MY_PV}.${i}
+	done
+	epatch ${FILESDIR}/${PN}-${SLOT}-jarlocation.patch
+	epatch ${FILESDIR}/${PN}-${SLOT}-libtool.patch
+
+	gnuconfig_update "${S}/../dist"
+
+	sed -i -e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" ${S}/../dist/configure
+}
+
+src_compile() {
+	addwrite /proc/self/maps
+
+	local myconf=""
+
+	use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
+
+	use bootstrap \
+		&& myconf="${myconf} --disable-cxx" \
+		|| myconf="${myconf} $(use_enable !nocxx cxx)"
+
+	use tcltk \
+		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
+		|| myconf="${myconf} --disable-tcl"
+
+	myconf="${myconf} $(use_enable java)"
+	if use java && [[ -n ${JAVAC} ]] ; then
+		export PATH=`dirname ${JAVAC}`:${PATH}
+		export JAVAC=`basename ${JAVAC}`
+	fi
+
+	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
+
+	# the entire testsuite needs the TCL functionality
+	if use tcltk && has test $FEATURES ; then
+		myconf="${myconf} --enable-test"
+	else
+		myconf="${myconf} --disable-test"
+	fi
+
+	# Add linker versions to the symbols. Easier to do, and safer than header file
+	# mumbo jumbo.
+	if use userland_GNU; then
+		append-ldflags -Wl,--default-symver
+	fi
+
+	../dist/configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--datadir=/usr/share \
+		--sysconfdir=/etc \
+		--localstatedir=/var/lib \
+		--libdir=/usr/$(get_libdir) \
+		--enable-compat185 \
+		--without-uniquename \
+		--enable-rpc \
+		--host=${CHOST} \
+		${myconf} || die "configure failed"
+
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	einstall libdir="${D}/usr/$(get_libdir)" strip="${D}/bin/strip" || 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_db44_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-1.85-r2 b/sys-libs/db/files/digest-db-1.85-r2
index 6b1c88255e32..10281503f1f3 100644
--- a/sys-libs/db/files/digest-db-1.85-r2
+++ b/sys-libs/db/files/digest-db-1.85-r2
@@ -1,4 +1,6 @@
 MD5 8fb6e2d39bc77fc8521401522ceeebaf db-1.85.patch.bz2 15277
+RMD160 a1b024f5761a531d4f52a35b309242c4a4be38d1 db-1.85.patch.bz2 15277
+SHA256 4339a08fb0b2c001ba819835e190996539e80f2cb6031ca4395f40f3363f8bc5 db-1.85.patch.bz2 15277
 MD5 42cc6c1e1e25818bd3e3f91328edb0f1 db.1.85.tar.gz 270953
 RMD160 594253b7e80323cddc92cd7c89934217d403f58b db.1.85.tar.gz 270953
 SHA256 4220d4ddeb77fb57ba2f37c1aa105d561d3ef85a6fb89c79c3edd735d0e193c6 db.1.85.tar.gz 270953
diff --git a/sys-libs/db/files/digest-db-4.3.29 b/sys-libs/db/files/digest-db-4.3.29
index 2cad95e717ac..8b53cf06bcf3 100644
--- a/sys-libs/db/files/digest-db-4.3.29
+++ b/sys-libs/db/files/digest-db-4.3.29
@@ -1 +1,3 @@
 MD5 13585a20ce32f113b8e8cdb57f52e3bb db-4.3.29.tar.gz 6103264
+RMD160 fac910828a74087124e9cc3cad99c6a6dc88c14b db-4.3.29.tar.gz 6103264
+SHA256 db3e762d819f9a31bc4ebf5ecada53e9787aeb26fc92fa6064b2ba57df806af4 db-4.3.29.tar.gz 6103264
diff --git a/sys-libs/db/files/digest-db-4.4.20_p2 b/sys-libs/db/files/digest-db-4.4.20_p2
new file mode 100644
index 000000000000..f52a67467c0f
--- /dev/null
+++ b/sys-libs/db/files/digest-db-4.4.20_p2
@@ -0,0 +1,9 @@
+MD5 33851f01b455cca48aa601956de93c6f db-4.4.20.tar.gz 8112163
+RMD160 1e62a7583c8064f1e8533e188db4644d6d047f66 db-4.4.20.tar.gz 8112163
+SHA256 56442966cf51a6eb81272f4ab4cec929dcb695a5081b187215afdc7cf7629a57 db-4.4.20.tar.gz 8112163
+MD5 66584d621355df055b6e05b4a02e9c3e patch.4.4.20.1 867
+RMD160 57ecff5ecb934e1eb771c49e4e67246d579702b2 patch.4.4.20.1 867
+SHA256 4eeb18450b88703282251c386405bf7c9efa053a42d1dda97603ee8039ee5869 patch.4.4.20.1 867
+MD5 85df93a0867f6cace3501671cdeb6ed1 patch.4.4.20.2 721
+RMD160 e560b07cc20dbd6865d8aad91941515f8fb031c1 patch.4.4.20.2 721
+SHA256 45949e288482736bbc27bd62c854a99fad4b3e55103897eafd62bce1d5629bbc patch.4.4.20.2 721