Version bump (bug #504248)

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 254 insertions, 17 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index c9105b4743de..ecac0d393fda 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.347 2014/05/15 18:36:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.348 2014/05/20 08:53:18 polynomial-c Exp $
+
+*db-6.0.30 (20 May 2014)
+
+  20 May 2014; Lars Wendler <polynomial-c@gentoo.org> +db-6.0.30.ebuild:
+  Version bump (bug #504248).
 
 *db-4.8.30-r1 (15 May 2014)
 *db-5.3.28-r2 (15 May 2014)
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 2a47886bf3c0..da7fac05d743 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -48,6 +48,7 @@ DIST db-5.2.42.tar.gz 34659298 SHA256 5626f51b3f904c0e00b5ce5ea7904d941b46cfc904
 DIST db-5.3.21.tar.gz 35062469 SHA256 ddd92a930317df92021054c03992392db9ea5cddba43bef8920d392a82114fb8 SHA512 e09a08002b723a056b7a53dea275794a9df104296e7733ec1d7023888f23466095b38614f3ab1acbbb095d10cca70cc14c35c3519a41800eadd6863beb85e3a9 WHIRLPOOL 325aa202825d596fe1e0491c13f3b8da62ab2a4074969b7d09396b96d24dd8f4164a790b7ef2030768479e83cdfd57f15cc163a5ce4791fb4039900385381f60
 DIST db-5.3.28.tar.gz 35090431 SHA256 e0a992d740709892e81f9d93f06daf305cf73fb81b545afe72478043172c3628 SHA512 e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090 WHIRLPOOL ad9042c4509ece1cae42ade4734f69d59a9ec946a85bd486063a7e8f9fa1ae3f925b71f0475fef05a27d33f695ef82ffd06fbaadbd7dc5bfaa77a8caacf9d1dc
 DIST db-6.0.20.tar.gz 36571533 SHA256 806a8a443854e339f07a62d5e010baf48203bce0bbb49e32f245184c9f522203 SHA512 b512d24f0b39b20096897ed81e8bca87c104ce81754d7360dacc11fe68cb16a5d6c18a9b9cda2aa0b56d9e4cfbeda9e62ca1285ea523edffe3d6442b2cad4e58 WHIRLPOOL e62ff517d04e4080457d5e01a565a865b53e1a5ab9b974087c1c1b8c0a11a979bbcda864ba9e2b2a281e8922d6ea93df12bd01d654bbd0b5b9f2bfd8d66fd899
+DIST db-6.0.30.tar.gz 36584356 SHA256 608e4b1cf390e9bf54c0ef00c5bd9ca76d36e2261b9f4d33d54516f3f6a20fd2 SHA512 ea249c59dba18cad391f523840028ba8ef962c32f2c7470942d52f9c07f18ba9fdf964dcd545cb7f2d6c66b91924a0ba1478af1d8f81f0dcbbf94c97ac515cf9 WHIRLPOOL 6784730d250dd480bacf78e966c6acb2fb3ca2c3989668e9440a0a60376b009850b2b48fc35f47e3964b175e78501d18b1c3e3b265831165083fe2dd04a46eb3
 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
@@ -89,24 +90,23 @@ EBUILD db-5.3.28-r1.ebuild 6001 SHA256 a94917d542634b8581da841e3e9ed5d6c63670535
 EBUILD db-5.3.28-r2.ebuild 6486 SHA256 fce961234c88be1b12c62d9aa353dbe6253f92e1a1d66bda64e91111faeda8da SHA512 ae43064ebd5f398145149a1cf0d963bc11d7880376c4d17b5a9d3f4b49d020adeede9f9316d5176ab801481327de5b8f3e810fb17175090cc2871be2b0f2f78c WHIRLPOOL 0db0002a945d7ed54eb7c6de03a5bb8a29ceee21f4c4b27711aaeace7ffafe16340e856a6137b5c9ad2f18c255ad31ee3126aff07edbedc5bd18f4e520b529a7
 EBUILD db-5.3.28.ebuild 6010 SHA256 1af32328c591410a2b215583d685790a3114024f4c1584450f137ce4e6b6786d SHA512 85f4566631aa54655b6ef986eedc06f8c887e8755926421b54ffa0c58b3768c4a8438809cfc39a8167c9e5617598ec4ce3cd88b612bde47c15b21e6694924c19 WHIRLPOOL f09347ced091748261d9db7947abd9fb6332a0c825317d3e08191b597dae84dbfb2a5a7b75869eec93a70cf96c1dcea88ee7cf18dae9fa3d4af10e94b10c3316
 EBUILD db-6.0.20-r1.ebuild 6053 SHA256 803f7b05a2d4b0ae498296f51867e0d244cd40fd47e3cb91a8008cccf6c8e6a9 SHA512 b6d588f7113b131b73f495c50f922f2695cc4c9a2597e5ff4c8c4b5bfae0600def289775e0b6eac39721e7de1ba85bd420869dc1041e4d49e8c1d47b979419aa WHIRLPOOL 8e5d7c6cc3222745304a5bbe629adc2c976bb4eea782fa71563ab59a1b33592febf4d0eb6a653bd3263c6c47d4a00c12c82acc402a049c3a9be6df7b435913b1
-MISC ChangeLog 56388 SHA256 baf90e05ca1c036f460070d2fad7d5619dc5aa71adbd13036e1558cf16ce46e5 SHA512 ff76f77729edba620d565b77b3b16af861ee7d30bd7abd73a5b5c332ca69d628a1c6e79a099232925edb8f332bcc6efb6366e7ac4612e3d0f7064b3e40919f31 WHIRLPOOL b18583f7a2474b5d4dedb8dfadee1ae9d8e4c7ba8244c148ddcf08843ad611cfed99d7e376966ee43f27bc6b3c7a60e05570c0149d95a68ebd6f78425d9254fa
+EBUILD db-6.0.30.ebuild 6614 SHA256 2f43e4afd6a6a84e9315f30a5781554806f3049965fd808a9f52bcb3aaa6d62d SHA512 c166f22193355cac293b0642ebdc79258f07940e99c77fc8035eb595105aeaa54b2d6a739b7f8545610919be8eb7eb8ba25816f5aa8252492c6accf451fee957 WHIRLPOOL b2478a5bda38691a49a4cd1caf445e87442f15763982838086776b1cc70f4348c6a700c4d5afe6b22a89fc326c9dffd25d1ed774d0357511d126d53e47a70c5e
+MISC ChangeLog 56524 SHA256 c3a5bd4d1749e618811aa0c3664343e1c2dcc22646dcdbd5401a3e83311717aa SHA512 c37f70078e22067216b73d8f61567336767620dd1811f321ce667cea97aa1255c74d8d4d0948560a7d448dff72ba6ce12dc7ba7cc5a515e53b0efe12fda0120e WHIRLPOOL 192fa5e94d8678b690ba3ea0c46e7778df4a460ce0cb03a9f50e8f077202f970cd5658c865ab81796ae79dae7519d4a91276c9471798edf9c163469ce6a420bf
 MISC metadata.xml 1231 SHA256 0aac93eb29b4674d00b215122f39eb1ec03248e105cab670bc1921cbcca1e927 SHA512 6d25e610cc6cdcba13f8ffaab19406ca9dd7b5eda0585a6666058408ef1eb23a062428483532f4d1461888039e49a97aad4afc6dceb96baa70b880f7c4cf59b9 WHIRLPOOL 1d6531dd2346d7bc02dd016688a58c1c454a9262c3bad846147a6bce51f3ab0aba11165782162a5fda678a1fae3bafcab0d57eb882d5450814ce4fa7b813de54
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTdQlFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO/GkQAKGwwXL0344SNCRP0eCFy2AA
-pSCJNFXSiESUrmAG2aQGUOC/S30qIbkS4sxlnhzZh/KmeCyyWPCDMomOS/W6s29l
-lKM5aDrXC/LU5y3agpPj82C6rY+EugefvMVFwOE1qqXvbOuHaibMzSrdgn5G1/K/
-xj5sfPorOz7WlnoMyd9XVsGzu6Eu1a5fkjTxlKw+WPTBa7Fj527YhxseFeUcdBXf
-gKWVZ5XxjFaDZTbz0bp9kiEr9YKAeY7ODaV/L58VsDHlNCIe/Zmb3gtmlTCxIDX+
-RCaOr+zPckKDErW+ALE7efvaDX8DNWV3t1L+a+hDfZfuBGEhurDjcuZWA4U4GlwM
-Lx7EOIka1CboSdFeqLzxphsOFbMB53MODck5NFX0OoRupU5yza5IcUej4n4pWcmX
-8VKHlw5DhgJHOzpKm/ZjYkKB2TMvt0+oSalh5kG4GkYlcClQ6Zs89zKJbQ1DPBtT
-Smoi14FzlgMevdMfV4y556L9EBEfeL6Jv1Yv0Y4m5eyGQPB8U+f9e/b1V4129b1b
-AEFsz4Qhar/EaEWfQVBJB2FS6FHSHBsnmV68Exz86cFCpcRcYobrzlmFIscWMu55
-8frvUDbTWzVtyRBYCKDSSg4ss7cxNnOUHUmJTKX8BdDmn+Y5x6kzRr5/hATx4rp+
-1B29hJNgpLEn1zfAxB23
-=BOFI
+iQIcBAEBCAAGBQJTexgAAAoJEPiazRVxLXTFrOoQAL204S4i7rkro9ifDbS1TUdp
+yj4x3sgKPT9DIpPIPGP+A6S8lJohwxtmn4OGXaS7BuZbAcz3oMK/ZLT45CphrVq0
+HLlXGHNqmOWNB8gXuwGjcNp9UjwT4HVK0hNOmkyxzqDl78O39ANUPPdeDzZwVfUt
+k0BcHIU9yWdTUTdjTV2/S2f0JgyN5cQZqSFoUvJVVSy8FunzPOVn+F/O8+Oy288v
+7Hov+K9pAiyFFLeoYCuJmTljdOVdbuPWMeFUadIvnCiq6PTpYqdXJ+N10hZbgamc
+HTaF8eYb5U+ktNAERxBnFE/D90PCgZ33A7gxNqEdOta4qjcuH/s9p/pk9e3Tm8QW
+PCx7rgV0msvkU0jDteMmNLh6POySj7UIyKqe/tlVtOd9/eBsBR7B3ir6FUqSvIrO
+1SYz2aY64qVaKMiHPAkwe3XgzPsFEHqeQo9i5trzqlsmbZGGI1BsbeTxyuH9RQdZ
+ko/iDx9vAaJDOd7a/qpBOzWLGZGVyx6xLPnqgONKHcztURkKMNEJEIETI+1MhkSp
+1rbJsA4f4BsvarDqJ+Lo9/uPvMZNtrh1mHmNjnknAykZ3Q3uVmtrDLgxIsEMT0gR
+slsM7kRHYx79xwiVy3pmUNjRv/KcFIzSjlJmK1FpBzNUY+tDOgv75k8dEOl6w5lz
+xFYHfcA+tLY05b89HcLF
+=lisP
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/db/db-6.0.30.ebuild b/sys-libs/db/db-6.0.30.ebuild
new file mode 100644
index 000000000000..be80d793e052
--- /dev/null
+++ b/sys-libs/db/db-6.0.30.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-6.0.30.ebuild,v 1.1 2014/05/20 08:53:18 polynomial-c Exp $
+
+EAPI=4
+inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal versionator
+
+#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="AGPL-3"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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[${MULTILIB_USEDEP}] )
+	test? ( >=dev-lang/tcl-8.4[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jdk-1.5 )
+	>=sys-devel/binutils-2.16.1"
+RDEPEND="tcl? ( dev-lang/tcl[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jre-1.5 )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/db$(get_version_component_range 1-2)/db.h
+)
+
+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
+
+	# 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
+
+	# sqlite configure call has an extra leading ..
+	# upstreamed:5.2.36, missing in 5.3.x/6.x
+	# still needs to be patched in 6.0.20
+	epatch "${FILESDIR}"/${PN}-6.0.19-sqlite-configure-path.patch
+
+	# The upstream testsuite copies .lib and the binaries for each parallel test
+	# core, ~300MB each. This patch uses links instead, saves a lot of space.
+	epatch "${FILESDIR}"/${PN}-6.0.20-test-link.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 || die
+
+	# 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 || die
+
+	cd "${S_BASE}"/dist || die
+	rm -f aclocal/libtool.m4
+	sed -i \
+		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
+		configure.ac || die
+	sed -i \
+		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
+		aclocal/programs.m4 || die
+	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 || die
+	done
+}
+
+src_configure() {
+	# 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
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	# compilation with -O0 fails on amd64, see bug #171231
+	if [[ ${ABI} == amd64 ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+		replace-flags -O0 -O2
+		is-flagq -O[s123] || append-flags -O2
+	fi
+
+	# use `set` here since the java opts will contain whitespace
+	if multilib_is_native_abi && use java ; then
+		myconf+=(
+			--with-java-prefix="${JAVA_HOME}"
+			--with-javac-flags="$(java-pkg_javac-args)"
+		)
+	fi
+
+	# Bug #270851: test needs TCL support
+	if use tcl || use test ; then
+		myconf+=(
+			--enable-tcl
+			--with-tcl=/usr/$(get_libdir)
+		)
+	else
+		myconf+=(--disable-tcl )
+	fi
+
+	# sql_compat will cause a collision with sqlite3
+	# --enable-sql_compat
+	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 \
+		$([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly) \
+		$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) \
+		$(use_enable cxx) \
+		$(use_enable cxx stl) \
+		$(multilib_native_use_enable java) \
+		${myconf[@]} \
+		$(use_enable test)
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+
+	db_src_install_headerslot
+
+	db_src_install_usrlibcleanup
+
+	if multilib_is_native_abi && 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
+}
+
+multilib_src_install_all() {
+	db_src_install_usrbinslot
+
+	db_src_install_doc
+
+	dodir /usr/sbin
+	# This file is not always built, and no longer exists as of db-4.8
+	if [[ -f "${D}"/usr/bin/berkeley_db_svc ]] ; then
+		mv "${D}"/usr/bin/berkeley_db_svc \
+			"${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
+	fi
+}
+
+pkg_postinst() {
+	multilib_foreach_abi db_fix_so
+}
+
+pkg_postrm() {
+	multilib_foreach_abi 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" || die
+
+	# 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" || die
+
+	multilib-minimal_src_test
+}
+
+multilib_src_test() {
+	multilib_is_native_abi || return
+
+	S=${BUILD_DIR} db_src_test
+}