Fix gnuconfig usage in 4.2 per bug #160192, update for Oracle download location, and include one further patch from upstream to fix minor race bug.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64

3 files changed, 142 insertions, 2 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 96dc070f6609..8048407b9b21 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.248 2008/08/16 04:27:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.249 2008/08/16 04:37:24 robbat2 Exp $
+
+*db-4.2.52_p5 (16 Aug 2008)
+
+  16 Aug 2008; Robin H. Johnson <robbat2@gentoo.org> +db-4.2.52_p5.ebuild:
+  Fix gnuconfig usage in 4.2 per bug #160192, update for Oracle download
+  location, and include one further patch from upstream to fix minor race
+  bug.
 
   16 Aug 2008; Robin H. Johnson <robbat2@gentoo.org> db-3.2.9_p2.ebuild:
   Chop out other old stuff that is not needed since gnuconfig is gone.
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 0eed89ec8eb3..d951bf0b78b3 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -38,6 +38,7 @@ DIST patch.4.2.52.1 988 RMD160 1ff7d93c4e6223b793ed3038070a4f0957dac44e SHA1 fdb
 DIST patch.4.2.52.2 1433 RMD160 880cd32f5bd1430463da0f4169e1d6e4a2b96b81 SHA1 ef55711f1bf643024d9d90f9b3885299f6c7b09a SHA256 c9b132bcc8f1c12e03baaf47abd3801f2adf24ffbd56f35a27617fec12654f32
 DIST patch.4.2.52.3 8672 RMD160 443b5cb93346482166f407c8fb9522035d151f02 SHA1 e3f46b316d69ef4351b0b41023897a4d16b2f2fc SHA256 ca5245d2e1c7a40df5ec57cbabee8bf0106292c69a37eb0ca275d1aa59061907
 DIST patch.4.2.52.4 1311 RMD160 d6154a5e1203348d37e2f537300582fc06fc9def SHA1 0136f050d9cae839d0116a43961a29f0e230c4dc SHA256 c15c82071c02ce1a10024c572e2e9fd72006089007141a01fdd37b889411b973
+DIST patch.4.2.52.5 839 RMD160 77a9af7932e09009b670ed8fbd730e66c252365e SHA1 0023358e2f04273bf30fd6c29d22a82fe15b22f6 SHA256 242f1a9c3efdd61a2b738c12617175849dbc73df6a2bf7cff61c814b13905e06
 DIST patch.4.4.20.1 867 RMD160 57ecff5ecb934e1eb771c49e4e67246d579702b2 SHA1 5843380b67561134432f46dce53b67a133ef7962 SHA256 4eeb18450b88703282251c386405bf7c9efa053a42d1dda97603ee8039ee5869
 DIST patch.4.4.20.2 721 RMD160 e560b07cc20dbd6865d8aad91941515f8fb031c1 SHA1 75f0ae6ef06a23a690e5ebe6460552a11448ef32 SHA256 45949e288482736bbc27bd62c854a99fad4b3e55103897eafd62bce1d5629bbc
 DIST patch.4.4.20.3 1366 RMD160 668c8e88f6fde2c028a9a3ad1d6917a28e7b3e85 SHA1 580265cdccc394ed988a6334f6c9a7d2bb15d141 SHA256 ae54bb752a31655a1a945f12900b740fad397c3e2ddab792ecfd4660d3e6e236
@@ -49,10 +50,11 @@ EBUILD db-1.85-r3.ebuild 1380 RMD160 5f83a60a3e196d9988af40a0e1a5c1b4781f81ca SH
 EBUILD db-3.2.9-r11.ebuild 4425 RMD160 3da3794a23f356fcf6fbbccae274afb4001d16fc SHA1 d5fecadf49d8ad9ee8f9bff0f3cc9df6e37ffa0b SHA256 04cbaa35c5e27d25a483432b8c3b709c7a68f7a9c98d11b95efb70c5cdcdcc4a
 EBUILD db-3.2.9_p2.ebuild 4901 RMD160 9ed8a2a44fa3a4248c6759fb6497e37a74f06685 SHA1 7a4d538bfac91aa9b644b2fef67a758a7615de7d SHA256 49180c424587bd16db6e3a1c39c1b443f9d0a838de176c941d719a5e5bf663b9
 EBUILD db-4.2.52_p4-r2.ebuild 3486 RMD160 de46f7d210692588bbbed1acccb6e8aa5047bb5f SHA1 509c581644371e4735df1bfae0b57f056cb6fb6e SHA256 c29ae939d9740e0d43a57b178e2423a5bf72749a1bd1adc55c9ec901b43077c3
+EBUILD db-4.2.52_p5.ebuild 3606 RMD160 42553b5807d0f05705a5a124d72463a1f2f50712 SHA1 76aa9fec4f390fc67015cc3ce74d7658cd450557 SHA256 6a1128e6092646fb587269b2a09d6cbc67b334d50da17db70f3e10047cb4e79d
 EBUILD db-4.3.29-r2.ebuild 3715 RMD160 e0533bcad7d7eb9b6b3834ebea4ba4082d4b86f3 SHA1 a9d4f84420e5f1f2666a86efce3b8098b0fd8f8a SHA256 784011081d9ddeaaa611e3bbf982350cd090f2aa02dafa2b829b9f2bc6a9f62b
 EBUILD db-4.4.20_p4.ebuild 3688 RMD160 3c5acb5aead7caf08c1560de5a4a1a8f6329bbe0 SHA1 9d7aa1f23faaa9249d1cc90633700eb87d54b39f SHA256 f14817111a5ceccd4b5a27221c2c931948a09dc433f69296cca5221ab0b9277f
 EBUILD db-4.5.20_p2.ebuild 3942 RMD160 104cae7e5421d3f87dbdc32f2a9c4fa6c51bb4cb SHA1 e76e626f996dbf5894d2929dbf0de4232fb5a699 SHA256 94c1e40ea9cdf06b03c8a253131a34ce2d38cad112e3c88c53d496c7a765c240
 EBUILD db-4.6.21_p1.ebuild 3941 RMD160 d6f61886662411ea3697bb98e39c56338f85dc85 SHA1 52b6393a71f0ee029f8c7d973eff7ea942eb2222 SHA256 bf6c3c1d567a0483fcfa8b8c2ff438eeaf009c06f7f2bd6e80ff711b9e0b2df5
 EBUILD db-4.7.25.ebuild 3938 RMD160 b4aebd7d5cfd7475eadfc9665b2fbede6f2f79aa SHA1 790300b6e6dd0cb06292f5d341e650a275cdb843 SHA256 a651d335074c73fdede5ed997b070b08ef878fe923cd62428b360d302e9916f8
-MISC ChangeLog 37498 RMD160 12da948f8aa07a0dfbd7f0999c2086532525a3d9 SHA1 bca14fe4f91b7086c2ed2c51d0f67989c0dc6039 SHA256 d13c6b56f4dc16c1805d7e1fe7684f024651fb719a58b8dc3904bf463ceb4197
+MISC ChangeLog 37757 RMD160 f63ac9ae69c20cbe5ce72c3c1028ad10e07bf97c SHA1 0f11aaccfe8207cfba437f1bc081c828e2139a8b SHA256 88e143f1ff707a93a68f06fcd7fea37f88e675abd61dc447eb43f3144feb3338
 MISC metadata.xml 1651 RMD160 cbdc138b8fd0fab28ec59db03fca18f2e0e74818 SHA1 e70ae3f07e5559a43dd85fad3270b7f7f185b996 SHA256 895bfb43a1bd60170937b4523f396d5772a3914384a95105345ac1f24c606550
diff --git a/sys-libs/db/db-4.2.52_p5.ebuild b/sys-libs/db/db-4.2.52_p5.ebuild
new file mode 100644
index 000000000000..cf8fa7b96567
--- /dev/null
+++ b/sys-libs/db/db-4.2.52_p5.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p5.ebuild,v 1.1 2008/08/16 04:37:24 robbat2 Exp $
+
+inherit eutils db java-pkg-opt-2
+
+#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="Oracle Berkeley DB"
+HOMEPAGE="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
+SRC_URI="http://download-west.oracle.com/berkeley-db/${MY_P}.tar.gz"
+for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
+	export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}"
+done
+
+LICENSE="DB"
+SLOT="4.2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="tcl java doc nocxx bootstrap"
+
+DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
+	java? ( >=virtual/jdk-1.4 )"
+RDEPEND="tcl? ( dev-lang/tcl )
+	java? ( >=virtual/jre-1.4 )"
+
+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}"-libtool.patch
+	epatch "${FILESDIR}"/"${PN}"-4.0.14-fix-dep-link.patch
+	epatch "${FILESDIR}"/"${PN}"-4.2.52_p2-TXN.patch
+
+	# use the includes from the prefix
+	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch
+	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-listen-to-java-options.patch
+
+	sed -i \
+		-e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" \
+		"${S}"/../dist/configure
+}
+
+src_compile() {
+	local myconf=""
+
+	use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
+
+	use bootstrap \
+		&& myconf="${myconf} --disable-cxx" \
+		|| myconf="${myconf} $(use_enable !nocxx cxx)"
+
+	use tcl \
+		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
+		|| myconf="${myconf} --disable-tcl"
+
+	myconf="${myconf} $(use_enable java)"
+	if use java; then
+		myconf="${myconf} --with-java-prefix=${JAVA_HOME}"
+		# Can't get this working any other way, since it returns spaces, and
+		# bash doesn't seem to want to pass correctly in any way i try
+		local javaconf="-with-javac-flags=$(java-pkg_javac-args)"
+	fi
+
+	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
+
+	# the entire testsuite needs the TCL functionality
+	if use tcl && has test $FEATURES; then
+		myconf="${myconf} --enable-test"
+	else
+		myconf="${myconf} --disable-test"
+	fi
+
+	cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--datadir=/usr/share \
+		--sysconfdir=/etc \
+		--localstatedir=/var/lib \
+		--libdir=/usr/"$(get_libdir)" \
+		--enable-compat185 \
+		--with-uniquename \
+		--enable-rpc \
+		--host="${CHOST}" \
+		${myconf} "${javaconf}" || 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_db"${SLOT/./}"_svc
+
+	if use java; then
+		java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
+		java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar
+		rm -f "${D}"/usr/"$(get_libdir)"/*.jar
+	fi
+}
+
+pkg_postinst() {
+	db_fix_so
+}
+
+pkg_postrm() {
+	db_fix_so
+}