Early days, but useful for some testing still. src_test fails dismally still.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64

3 files changed, 228 insertions, 12 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index d44b8ea61055..c7d9bd596b68 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.332 2012/10/21 00:03:09 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.333 2012/11/12 23:09:59 robbat2 Exp $
+
+*db-5.3.21 (12 Nov 2012)
+
+  12 Nov 2012; Robin H. Johnson <robbat2@gentoo.org> +db-5.3.21.ebuild:
+  Early days, but useful for some testing still. src_test fails dismally still.
 
   21 Oct 2012; Anthony G. Basile <blueness@gentoo.org> db-4.8.30.ebuild:
   stable arm, bug #429188
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index af65f9ad7b5f..26da7cb48fa2 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX db-1.85-gentoo-paths.patch 684 SHA256 049052c74c544ac1c1f3b1b91c3e43df76b135c610148212679dfd324470cf2f SHA512 d7e2075a1683c7a04337830730e429c4bf2b5f0bdb49cdc3b625bda83be7cf579f4039204a355f5854c2981b6bd3234767e02bc6a7914e2bcde2a73d698fb914 WHIRLPOOL 272d1acc842c83f9b189deaaf9c38cabc67a0428a21f6b0ff6647899ffb6db7fb4944d18e76884f816baa02ec842d393f5b8c341ef41b820c74adf02d6e86d3a
 AUX db-3.2.9-fix-dep-link.patch 1005 SHA256 57e6f13170db99ba7f2f43aa0c7606085d25094127c63a48b76333c1289f6382 SHA512 42f8a6e495266209d7c9bf35bfba801abddffb10488b7b156a790bacdf8fe2d3d3113d8d0a1afddeca238736f64cf8a881141d181fd4a211e4b04da9ed010587 WHIRLPOOL d01855996c76b18793a6cb68ddfab8f3e9a439a13267c41299be13a294469f56d3842a418600475861181b97e90472e800696745068ffb3f47ccbccd74578513
 AUX db-3.2.9-gcc43.patch 441 SHA256 102ac694f32719deabbefdcfbecd96a255b8a6cdc312095fb537cf99ca6b9d77 SHA512 17d44ae357337d938bbe296b519efc03b914792ce4440936c1178b09dbb21783034e16f4fb2ff03443b00e8af530afc0fce778a937b06f0ba8c598b02cbc989c WHIRLPOOL 89f49f22f7c89d8989b002dc1f9469216666d2e79aaf724f4849b30a05eb108e1c1e4a286b60e2331e6fad7139b74c28eb6eaa93fe16358bf7d29928907c990e
@@ -51,6 +48,7 @@ DIST db-5.1.29.tar.gz 32188074 SHA256 a943cb4920e62df71de1069ddca486d408f6d7a09d
 DIST db-5.2.28.tar.gz 33033536 SHA256 92133e3a5b4bb480db4cc349f1f6e636342910057b629a183389168f4b280e36 SHA512 f55870b09a9a7a3abcbbcf8c75596bedef13201bad96532108587da7e9da668797b67e3395ac25abfcb04f6bdd56df496edfb589c25fb4bcfe4ff3ee48a1fd6e WHIRLPOOL 02b1d063ecc7677429c9feb9e87c29fbf1e89a1a4f634b9160cc58140605d848d8b35e68e44f13193b0547940289c4b5fcf82bbf967e2a0ec7ddbb380043e47d
 DIST db-5.2.36.tar.gz 34664337 SHA256 8828f884cb5d1ecb0c52a18366c8845dce99d804d8b72b6e66f6e553f3d8d984 SHA512 fe51c681ff044750ecfc7da7857b93806976aae8900857421816a7b2904bb69829264197aeaad2e16de00e89a9b6c325141a3834a8e44e06d242785dd24df78d WHIRLPOOL 44b0919bf5264d9f27c10291f4019874b5a782a4f640833459a2edd86ff90d429fe382b5642b81b17ed368d92d4c554f82c693c98eda45e4c2d5e15ada3f235c
 DIST db-5.2.42.tar.gz 34659298 SHA256 5626f51b3f904c0e00b5ce5ea7904d941b46cfc904557545edd4190e7316a1a5 SHA512 8f9e6e38d9aa0a5fb3f9733cd60b37f012ba43a6f0e632af09f1bd3afa552c3d68b1e2a44393eace2bf8692eba855611affc45401e1bee36bab541fd0869c811 WHIRLPOOL df14903e4dfe7a50cb264d54c12aa6ba7116e9f8d565387a816467fd35763640ac6d3b7ad4ee809430b46c834fc9877293f7e64462f2226d8182f7d37949cc91
+DIST db-5.3.21.tar.gz 35062469 SHA256 ddd92a930317df92021054c03992392db9ea5cddba43bef8920d392a82114fb8 SHA512 e09a08002b723a056b7a53dea275794a9df104296e7733ec1d7023888f23466095b38614f3ab1acbbb095d10cca70cc14c35c3519a41800eadd6863beb85e3a9 WHIRLPOOL 325aa202825d596fe1e0491c13f3b8da62ab2a4074969b7d09396b96d24dd8f4164a790b7ef2030768479e83cdfd57f15cc163a5ce4791fb4039900385381f60
 DIST db.1.85.tar.gz 270953 SHA256 4220d4ddeb77fb57ba2f37c1aa105d561d3ef85a6fb89c79c3edd735d0e193c6 SHA512 03bf3a2b0947efdca4e38719542e96378b5eeb57da64d5030dd23ab710773c1826f1c867032d0bea658b7fdd8272db253e97bbc490d198b9437025ffdf9e880e WHIRLPOOL 802346b9fc133f6c9316e987352e8bd8e12792b30b0eae9b4e2b3629c9bc8385ab12244dead428bb824945aab383cd4801de3fc705667797bdf6159066ed1352
 DIST patch.3.2.9.1 2139 SHA256 6d89a42ee0be9e47b3e8a42981c65266a556de84bc6281edcf0f977f52547798 SHA512 f410c43ea4af28a39d8ea47f774d38b53bf1183a34abfcf1f27e253eb61b42f4b5e9f0a3a500e174eb796ea342e6dd50a8bb95ff3eb8ee188461489cc994b8f9 WHIRLPOOL 3a879d5306403739465550ade1fbf53ac62b832fbdf507a204fef13949bc7be9c35ddd972834d3ca74bf17c421791011200556dffd95265eb64849f1d7b647ec
 DIST patch.3.2.9.2 495 SHA256 61db874796fe8789b0045f456285b27c5b8b7b8902a5e342a115456015716d0e SHA512 cc75fef11a641d480beaa2b62201177c72d10c4eb20376b5f15769db6e9e1a0da41c0365d79772af19b4cacdaa9f91dad049c735de9f95b98dcfc4f0b611b557 WHIRLPOOL 1362c32dc16875a97b451ff52415fe4b9e9d37b256a92c7e86c14a52431937352ae55ecee4361459e9036b9bea238c205a8f0d4406ac7e47387a8cda22906879
@@ -99,12 +97,6 @@ EBUILD db-5.1.29.ebuild 5385 SHA256 d8746b7d870fb756b1825d60cdcb872725b48ea7fa38
 EBUILD db-5.2.28.ebuild 6010 SHA256 30a87f7b4f1332c1e6e9c15d53d35a4835b3814252850d3715f30d63e0428a11 SHA512 4eb2a63a239c61dcb51c84261379bf4038ff9d81a2209283324275c209481400640e4ac2fbaa6ba4bff10cead8e0ed87e5e5b2934158a09cf74cd05ec143361a WHIRLPOOL 476a72800199823753e47c29dd314316a037b62e797cc2ffb7c8bcdf56d76b9a60e858148ca2642ac5155578ed8eb29dc7b7f23d503fe087d5a48feb5319cb07
 EBUILD db-5.2.36.ebuild 6054 SHA256 dea99747487675a3690c491df4e3150b197c1191e2e8ae5241b2e0096db011ea SHA512 061e0d60a50d4553f2f957cd511a9bb6255a9817b2dbf03b201ab5bae120de258c55707cf23c0bceb29527d33cd03e73bd9bc5363de41f869eedf9550564125d WHIRLPOOL 32077c25a7b8dd7f7b4fea2b09c8925eaa2ce37199e08cdefda81532f6e24aaa969ee1f8516639d86e8125622de0c17f9d8aa329b60028fbf49afd6f83fec6cf
 EBUILD db-5.2.42.ebuild 6055 SHA256 b6a1dd1a796d983dd330ed8f624127783b335b8e9d8b1c6e176e33a6bd749f05 SHA512 fa38e55a5f2eb3b56e8e30462142790b738176070e3476f4496cf40fe17a0f3420aaf26e608a26b12f2177a90d6fcf5f7a0b4df433e1f7ed0ed300e23f773f48 WHIRLPOOL f1dc743faf47e7ea1d7352006802e510f8fc9c209c291f2166d1bc8c8a2713da22a0998179babad1bdea25e92cff07495b1c50f294da7403684caa5c416d69aa
-MISC ChangeLog 52834 SHA256 606c08ed31440e0a5c1537f0a5a78a4a93aa8634b141835814c7afb4c3cd0301 SHA512 4e5881022ebf6ec53a0e59357a878a94d3e3875401a171fb110d03894a056c9aa93c4ed85772794f2966b2826c0499a932ec5beedc0cd732a087a7c2fd7a3b9b WHIRLPOOL ea7c2ee0f1b960bc2af6848bafdd7d1c6bfdf7712d1219e54b80aa2a0dff7cd904356034bc404548ca346c7854b06b14c64317c473387cd1af251cfd5be754a4
+EBUILD db-5.3.21.ebuild 6072 SHA256 c1c41215663d8c647f9ebe92b6656948ac354b2bade089df0b1d23bee39fdd2c SHA512 c4a3aa48acbd7f1e4cbbc1fad194fb90a22265fd3f9fad35dec599f3f2adf3cd16614560c6d58affd27c9f6fde9f42074cd153e26b1a90bc416522a217541eae WHIRLPOOL fae9d4774e5dddc61348a96e03cb645c82b6f6fab9caef0d2d726ffacc6c6971c98887c5620b560f34b626cfe681ea880e0c55f3028f0e8ea43690f003e39006
+MISC ChangeLog 53012 SHA256 205dac294cbf9b80ac9f364cef3298bce1294bad85b95e4dc473a62403866415 SHA512 18c233b211108dc857af72174a976f06d927b6c64e539abc17a21c4617099107a5380e05a85efb6dff2bef94883068ce6349b0401794b896775aa1727e921462 WHIRLPOOL 54c2b96bb013a89bc363947a3048f08f2eaa4aa4ab59c2aa8eb1301b90fe8b57cc8eed760cabc57f02822c45b062559a4a257cb1047ded09c519c6660f2e85bc
 MISC metadata.xml 1231 SHA256 0aac93eb29b4674d00b215122f39eb1ec03248e105cab670bc1921cbcca1e927 SHA512 6d25e610cc6cdcba13f8ffaab19406ca9dd7b5eda0585a6666058408ef1eb23a062428483532f4d1461888039e49a97aad4afc6dceb96baa70b880f7c4cf59b9 WHIRLPOOL 1d6531dd2346d7bc02dd016688a58c1c454a9262c3bad846147a6bce51f3ab0aba11165782162a5fda678a1fae3bafcab0d57eb882d5450814ce4fa7b813de54
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlCDO38ACgkQl5yvQNBFVTX8HwCfTD9oICgYcDOZt00YEOml3hKJ
-xQcAn2ETLfZyTLcGcIr6ILn4gS47kNMh
-=r8hi
------END PGP SIGNATURE-----
diff --git a/sys-libs/db/db-5.3.21.ebuild b/sys-libs/db/db-5.3.21.ebuild
new file mode 100644
index 000000000000..0b9d68780a1c
--- /dev/null
+++ b/sys-libs/db/db-5.3.21.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.3.21.ebuild,v 1.1 2012/11/12 23:09:59 robbat2 Exp $
+
+EAPI=2
+inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib
+
+#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_BASE="${WORKDIR}/${MY_P}"
+S="${S_BASE}/build_unix"
+DESCRIPTION="Oracle Berkeley DB"
+HOMEPAGE="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
+SRC_URI="http://download.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="OracleDB"
+SLOT="5.3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="doc java cxx tcl test"
+
+# the entire testsuite needs the TCL functionality
+DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
+	test? ( >=dev-lang/tcl-8.4 )
+	java? ( >=virtual/jdk-1.5 )
+	>=sys-devel/binutils-2.16.1"
+RDEPEND="tcl? ( dev-lang/tcl )
+	java? ( >=virtual/jre-1.5 )"
+
+src_unpack() {
+	unpack "${MY_P}".tar.gz
+}
+
+src_prepare() {
+	cd "${WORKDIR}"/"${MY_P}"
+	for (( i=1 ; i<=${PATCHNO} ; i++ ))
+	do
+		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
+	done
+	#epatch "${FILESDIR}"/${PN}-4.8-libtool.patch
+	# upstreamed:5.2.36
+	#epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
+
+	# use the includes from the prefix
+	epatch "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
+	epatch "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
+
+	# upstream autoconf fails to build DBM when it's supposed to
+	# merged upstream in 5.0.26
+	#epatch "${FILESDIR}"/${PN}-5.0.21-enable-dbm-autoconf.patch
+
+	# sqlite configure call has an extra leading ..
+	# upstreamed:5.2.36, missing in 5.3.x
+	epatch "${FILESDIR}"/${PN}-5.2.28-sqlite-configure-path.patch
+
+	# Upstream release script grabs the dates when the script was run, so lets
+	# end-run them to keep the date the same.
+	export REAL_DB_RELEASE_DATE="$(awk \
+		'/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \
+		"${S_BASE}"/dist/configure)"
+	sed -r -i \
+		-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
+		"${S_BASE}"/dist/RELEASE
+
+	# Include the SLOT for Java JAR files
+	# This supersedes the unused jarlocation patches.
+	sed -r -i \
+		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
+		"${S_BASE}"/dist/Makefile.in
+
+	cd "${S_BASE}"/dist
+	rm -f aclocal/libtool.m4
+	sed -i \
+		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
+		configure.ac
+	sed -i \
+		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
+		aclocal/programs.m4
+	AT_M4DIR="aclocal aclocal_java" eautoreconf
+	# Upstream sucks - they do autoconf and THEN replace the version variables.
+	. ./RELEASE
+	for v in \
+		DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \
+		DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \
+		DB_VERSION \
+		DB_RELEASE_DATE ; do
+		local ev="__EDIT_${v}__"
+		sed -i -e "s/${ev}/${!v}/g" configure
+	done
+}
+
+src_configure() {
+	local myconf=''
+
+	# compilation with -O0 fails on amd64, see bug #171231
+	if use amd64; then
+		replace-flags -O0 -O2
+		is-flagq -O[s123] || append-flags -O2
+	fi
+
+	# use `set` here since the java opts will contain whitespace
+	set --
+	if use java ; then
+		set -- "$@" \
+			--with-java-prefix="${JAVA_HOME}" \
+			--with-javac-flags="$(java-pkg_javac-args)"
+	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
+
+	# Bug #270851: test needs TCL support
+	if use tcl || use test ; then
+		myconf="${myconf} --enable-tcl"
+		myconf="${myconf} --with-tcl=/usr/$(get_libdir)"
+	else
+		myconf="${myconf} --disable-tcl"
+	fi
+
+	# sql_compat will cause a collision with sqlite3
+	# --enable-sql_compat
+	cd "${S}"
+	ECONF_SOURCE="${S_BASE}"/dist \
+	STRIP="true" \
+	econf \
+		--enable-compat185 \
+		--enable-dbm \
+		--enable-o_direct \
+		--without-uniquename \
+		--enable-sql \
+		--enable-sql_codegen \
+		--disable-sql_compat \
+		$(use arm && echo --with-mutex=ARM/gcc-assembly) \
+		$(use amd64 && echo --with-mutex=x86/gcc-assembly) \
+		$(use_enable cxx) \
+		$(use_enable cxx stl) \
+		$(use_enable java) \
+		${myconf} \
+		$(use_enable test) \
+		"$@"
+}
+
+src_compile() {
+	emake || die "make failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+
+	db_src_install_usrbinslot
+
+	db_src_install_headerslot
+
+	db_src_install_doc
+
+	db_src_install_usrlibcleanup
+
+	dodir /usr/sbin
+	# This file is not always built, and no longer exists as of db-4.8
+	[[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \
+	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
+}
+
+src_test() {
+	# db_repsite is impossible to build, as upstream strips those sources.
+	# db_repsite is used directly in the setup_site_prog,
+	# setup_site_prog is called from open_site_prog
+	# which is called only from tests in the multi_repmgr group.
+	#sed -ri \
+	#	-e '/set subs/s,multi_repmgr,,g' \
+	#	"${S_BASE}/test/testparams.tcl"
+	sed -ri \
+		-e '/multi_repmgr/d' \
+		"${S_BASE}/test/tcl/test.tcl"
+
+	# This is the only failure in 5.2.28 so far, and looks like a false positive.
+	# Repmgr018 (btree): Test of repmgr stats.
+	#     Repmgr018.a: Start a master.
+	#     Repmgr018.b: Start a client.
+	#     Repmgr018.c: Run some transactions at master.
+	#         Rep_test: btree 20 key/data pairs starting at 0
+	#         Rep_test.a: put/get loop
+	# FAIL:07:05:59 (00:00:00) perm_no_failed_stat: expected 0, got 1
+	sed -ri \
+		-e '/set parms.*repmgr018/d' \
+		-e 's/repmgr018//g' \
+		"${S_BASE}/test/tcl/test.tcl"
+
+	db_src_test
+}