Use newer eapi features in 5.3 ebuild

Package-Manager: portage-2.2.10/cvs/Linux x86_64

3 files changed, 219 insertions, 22 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 585e673977ab..96ef2bd9d891 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.345 2014/01/18 04:14:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.346 2014/04/03 08:47:19 patrick Exp $
+
+*db-5.3.28-r1 (03 Apr 2014)
+
+  03 Apr 2014; Patrick Lauer <patrick@gentoo.org> +db-5.3.28-r1.ebuild:
+  Use newer eapi features in 5.3 ebuild
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> db-1.85-r3.ebuild,
   db-3.2.9_p2.ebuild, db-4.2.52_p5-r1.ebuild, db-4.3.29_p1-r1.ebuild,
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index c7ca4935bef0..88c8446aae39 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
@@ -84,24 +81,8 @@ EBUILD db-5.0.32.ebuild 5461 SHA256 573d8e3e998b7a58109f67418696e1ccf07fa5296045
 EBUILD db-5.1.29.ebuild 5393 SHA256 c6ac68ea12fccd4fe97892af30f25909418d605b1e98e92ff062714bc69a4b12 SHA512 f02dcf3434ca388a97bf59fb5e925503b1d4f332f63941c8d098eaaf8c8c3efda3dbe73852074de0f54329b949e73548fdbefa831f60a16167e2a5c4ac3a22ce WHIRLPOOL 89609f988335d512116ce103baf5ae24adcbb5b707ffd28e1a4c4975eaa7497202e20fd40a455c564f9fc6d0ee2914314dea7be3ca60ed74cead5d94f65fe773
 EBUILD db-5.2.42.ebuild 6267 SHA256 8ac23b6377328fe41e39bce0dd4f41d7bb66ebf20f1fd8dd2fec173f53da268a SHA512 0461767e88f6a4edeba2ca4cbf3fb89beefd56d3c0406db0e01defa7dba0de4ac6bdb92f999a62638eacac7f2eeab06c7c3a7b154a2563b79aec806debbf416e WHIRLPOOL 564c1466b0e490632675b70d06e9e89c7cf2ff3142d929a5d706058fe0baeadb69fb6d60e93c7eee244e5743f4b44514c7a8954c3f081fe21706ac2637b06905
 EBUILD db-5.3.21.ebuild 6284 SHA256 58da34cedccec25cd9eb001204ed58bdad382a8bfaf2a7e405b21c3b0f1cc00b SHA512 fb44d7b2aa60dd32e627d1ab8a67063b761a93a86c1f520ca077ca0d0778bb21fe844a7d9e3d371257a89dd235ce119c5df92c0cbaeaa44afed113b374402c7b WHIRLPOOL 62d50575d67ca0ba10655c0da35cd0a08d270f09d682cec5f9785e6e8311f3c9a91945deae3d3f1fd6a7ed657b0f4c662fd7790172172677dc51d6b11b5c7cf9
+EBUILD db-5.3.28-r1.ebuild 6001 SHA256 a94917d542634b8581da841e3e9ed5d6c63670535ec9c6c8b9270bc3bfef9db2 SHA512 4dbfd845e29d4c85a8418da65f5614410c5a5d30008c99ffe8160757b2d3f0ce3bc19c61a02ebde468ea52e1cb70fac6ec39bda6334c4b4e666d5a82f615e774 WHIRLPOOL a08b10545c146ffa25305576fb906d75012a6eff385b84fdd1626da6c3d3d7f5f9f8113bf12307f887ecfb00d580bbd3b5f5d55d987480f41737ef239c781ef8
 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 56065 SHA256 8eefa6e3b6fc127fd5adba1985cdac53844c5c406832490d7b7521d594154b91 SHA512 d2a9c57f60f5d10b61398d3a510f16b1f4c66d9e712f6b32920b90564872cc50aa28bb070aabf20743a06d4a4d1475c7ae77268ff998fdf9ccd9cb3cce600c42 WHIRLPOOL ec2ad25242288e42f95c25ee5f1d1f01e4d057b68491e940ea7200e2361a988cf7dcd455d53fa4af3c5a4b2e5c51db63076a462f9f430024b274eb63ff34d37f
+MISC ChangeLog 56208 SHA256 53525bfb658a763e9230f94b7305db98d15caa7ae7d7105ded377d1300a37375 SHA512 c00a7882616fda84eefc5953cd66f212ec7fdf1074ee3a9f9951177510e58b9c4aeb9d4273bb17848e2d37106bd3162132dfd1fd3a9f5054d60542d21f3e987a WHIRLPOOL efd1685c57739ca17b10ede451091420ba07e514b10dfff6db6a2249d7342de6eff1c8b63f72683220676ddf145463412dd6ea8fdaa176069b59920f810851b0
 MISC metadata.xml 1231 SHA256 0aac93eb29b4674d00b215122f39eb1ec03248e105cab670bc1921cbcca1e927 SHA512 6d25e610cc6cdcba13f8ffaab19406ca9dd7b5eda0585a6666058408ef1eb23a062428483532f4d1461888039e49a97aad4afc6dceb96baa70b880f7c4cf59b9 WHIRLPOOL 1d6531dd2346d7bc02dd016688a58c1c454a9262c3bad846147a6bce51f3ab0aba11165782162a5fda678a1fae3bafcab0d57eb882d5450814ce4fa7b813de54
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJS2f+zAAoJEPGu1DbS6WIAeNgQAI6+SSYrhpstJoGISXOUH8vG
-bstKNi1Mr2NqBwScrkh2Yi2TRLhceOZRDVo1/5ajop91UlfqB9hp7K1FqTVQfe7d
-ujt76nIOoYiSfBMKxPGb6mC2HpJEemjLqU0t9HuP6cMOyiz6j+jGqqOruC0HIw7W
-4jgyn02LjFfLWBQYzehm4TZk7BlEfMR7q3usxxT4DwGrvKr7+7Dsg5iAmyAP4N6K
-Eou5KM9f+8BqsRq5/6aS7DKoC6DZa4aulG/kOi1PzLTGRKqyiOiSqK7yd6r04oAt
-JXGal8UUsbT5xIZAEg6jvWnmc7OEvBJYEf2PMW/3zVo4ji+j/dOML6luSKAgmc2/
-t9XWZkhaZ2p4qPLH8wi7PWKJDbyPNZz7QA6opCxbQEu/btI8m5bGRU0URF+EYvtY
-/gXapEYu407JGArg6ez6Dr9lDLyQBE5hh3Xe0KwyyJDrK1rxfZO2rjrsUIyO7mSi
-FYt7J7KFft4ycOJ+YtyRr1X+/eErygI/lj7oqfuQiO3Kjgjiph1lRANsPNiO6oYE
-/yiOFUhHB4NiqdpKhDG8Ye8YevobCSosgJzE6qk3RTt3+1hmP+QXLxBOyjs0Z9P0
-RhsE4IyT4114nmloKRX+WTgum5NvgP9eEJ8+igjjgrnfp6c1EZl5ZhhtTzYuotWn
-sBA2bTcx2m71azx5guEU
-=Pjsm
------END PGP SIGNATURE-----
diff --git a/sys-libs/db/db-5.3.28-r1.ebuild b/sys-libs/db/db-5.3.28-r1.ebuild
new file mode 100644
index 000000000000..9de82b312849
--- /dev/null
+++ b/sys-libs/db/db-5.3.28-r1.ebuild
@@ -0,0 +1,211 @@
+# 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-5.3.28-r1.ebuild,v 1.1 2014/04/03 08:47:19 patrick Exp $
+
+EAPI=5
+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="Sleepycat"
+SLOT="5.3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="doc java cxx tcl test"
+
+REQUIRED_USE="test? ( tcl )"
+
+# 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_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
+	epatch "${FILESDIR}"/${PN}-5.2.28-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() {
+	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
+	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_install() {
+	emake install DESTDIR="${D}"
+
+	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
+	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
+
+	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" || 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
+
+	db_src_test
+}