Verison bump.

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

3 files changed, 211 insertions, 13 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index e07e701ecb83..cf05f08fb17a 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/db
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.323 2011/12/18 17:40:29 halcy0n Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.324 2012/02/10 19:31:00 robbat2 Exp $
+
+*db-5.1.29 (10 Feb 2012)
+
+  10 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> +db-5.1.29.ebuild:
+  Verison bump.
 
   18 Dec 2011; Mark Loeser <halcy0n@gentoo.org> db-4.8.30.ebuild:
   Stable for ppc; bug #387187
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index c22c1f30760c..1c1f532a2999 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX db-1.85-gentoo-paths.patch 684 RMD160 cbfb484127600e180eb432d3f5aa31deba43e8bf SHA1 42a105f2503315a28b1e7f7aad71ee3bd4a56a13 SHA256 049052c74c544ac1c1f3b1b91c3e43df76b135c610148212679dfd324470cf2f
 AUX db-3.2.9-fix-dep-link.patch 1005 RMD160 71f4c2255cc6afffc494341ecd6352a6c754c006 SHA1 437f0eb7c82c0a2b8e7c2cdadddbd889d2735a97 SHA256 57e6f13170db99ba7f2f43aa0c7606085d25094127c63a48b76333c1289f6382
 AUX db-3.2.9-gcc43.patch 441 RMD160 90de42fc7b06e1f92f389b17d1af88da44b36b4d SHA1 7c42a4cba6cbd3ae75c306a5ed9090162f719c49 SHA256 102ac694f32719deabbefdcfbecd96a255b8a6cdc312095fb537cf99ca6b9d77
@@ -46,6 +43,7 @@ DIST db-5.0.26.tar.gz 29319373 RMD160 7b85b1bfbf52c4382270bb21ace4a605842cf3df S
 DIST db-5.0.32.tar.gz 29325258 RMD160 82997d94a1d542b127cceae0356f484d2cc79d7a SHA1 0dff9916aa5c6bfbb9e4781d021b7a49805c7172 SHA256 6d7bc4a927fbb40750f4e047252b3861d640fa74778b3bf1841c2913f053648e
 DIST db-5.1.19.tar.gz 30698224 RMD160 cc08123ec9bade1d2aaf79d9119b7474634e7f40 SHA1 0c84ed9c6e16857ceb66193bedbb15b05ffbebd0 SHA256 0194d4ca9266ba1a1c0bfbc233b18bfd05f63163453c81ebcdfdc7112d5ac850
 DIST db-5.1.25.tar.gz 30804092 RMD160 f9da0d6f970ab2647c2fc20d63ca9f7fad0bbf23 SHA1 1a216821957ce910a269bf9916bf49aba0f08b4d SHA256 72eac5fcae4b51b0f1edc727c0368407f29b42e3f2f50ebc31a282d0d6c0a617
+DIST db-5.1.29.tar.gz 32188074 RMD160 0c1124f08f121fdd8e43e5622cc3b8ddfd724c78 SHA1 42dc96c71873c7fde543c916ed866cadee6fa51d SHA256 a943cb4920e62df71de1069ddca486d408f6d7a09ddbbb5637afe7a229389182
 DIST db-5.2.28.tar.gz 33033536 RMD160 b54918e88cfea6584dbe2e4994aa16ec24f04a83 SHA1 e6572e3356cf8bc998da4e889db3b12638833435 SHA256 92133e3a5b4bb480db4cc349f1f6e636342910057b629a183389168f4b280e36
 DIST db-5.2.36.tar.gz 34664337 RMD160 6e5746424489ee27d8ca9fcc13511d006c93266b SHA1 1a7997e5bcdf504a439f90d9eaed63864806ed5f SHA256 8828f884cb5d1ecb0c52a18366c8845dce99d804d8b72b6e66f6e553f3d8d984
 DIST db.1.85.tar.gz 270953 RMD160 594253b7e80323cddc92cd7c89934217d403f58b SHA1 ccb057b07761d1b2b34626e748c7392c749d5e6d SHA256 4220d4ddeb77fb57ba2f37c1aa105d561d3ef85a6fb89c79c3edd735d0e193c6
@@ -92,14 +90,8 @@ EBUILD db-5.0.26.ebuild 5380 RMD160 6743de3d65b432d1be29e8819debd9a9ca436ec9 SHA
 EBUILD db-5.0.32.ebuild 5380 RMD160 1b20a5190c0a0b32c5a3d8e3fb5033c0752cd33e SHA1 4e5be8315ea9b3d1d98eaf42ec4697a563466ba2 SHA256 a37da218c9a553d1b35b0f650276e105aba73c034e3adc7eb4e0221b4fa6faee
 EBUILD db-5.1.19-r2.ebuild 5387 RMD160 98e2f082e0752b0f27d554aa80abae327d676ddc SHA1 bdc0a836ac6576b303b9d04b0069b601b463a7a9 SHA256 d9e9742f3e14b416b36cfa39b709d483313b558c697e219178603ef58dde51d0
 EBUILD db-5.1.25.ebuild 5384 RMD160 e3ffce3798a46121a0ddbb5268cea48da03b17d6 SHA1 ca86b05567c8188eeba51dd54ccd2b5687ae7e56 SHA256 8d9c86731aab3488fd14bb22e3c6ecf7e37d3d2da961a4eb8ddee739cc90efa6
+EBUILD db-5.1.29.ebuild 5385 RMD160 a1d062f9e2f14fabf2dcec5b7b4b6eeb309a100c SHA1 f725e90cc65559684da226d39396231ad4a693c8 SHA256 c7a1a0612e96d347ea467b6119c7a9580b4f2392bcfc0067d988190af3f2ab0d
 EBUILD db-5.2.28.ebuild 6009 RMD160 5babbc8f46bb72e622ee2dc1a5b02fc28b0455cd SHA1 4d40c2947ee585e3c9a0d480f8e060c483ab7a67 SHA256 da8324d59684d50e17a64daf66cc8425e28212522c16bfbc78721c97c3afe809
 EBUILD db-5.2.36.ebuild 6053 RMD160 0837a48da83d3a6cea699c05914b84918d98768e SHA1 809659bd19083d69849170d6e6967fc104400068 SHA256 17a56cc7d3eec19cda7633aae081f7820c8b6d2aec2ac87e09819d618c91a9b9
-MISC ChangeLog 50794 RMD160 b1276c14528b8305a111e53394aa7262f1c36580 SHA1 281205e1aa993fc93f86aac94ed1d5ab639ddaa6 SHA256 887bb475235f0f2811d5ca9ae17443676dd2571e4ec698a394a4498089c12b01
+MISC ChangeLog 50909 RMD160 c9f0a8dbf9709ef0660bec244c6f2872bc7f3b71 SHA1 50aca07103502e36e81ab59c4c6bfc2acb9712ca SHA256 278626c067ff48d149aba9b7ad41efa3b1fbbe90470580bbbadd2c4801fad7f9
 MISC metadata.xml 1463 RMD160 8e4cb5bc76931b83b9b1e8d4cbe719224fda40f3 SHA1 0120fead11c4452b41738edb1456cfa1edc31a05 SHA256 c6d35d6a2053996f868d12532f33d943e28c9ee27df5b61c83c2836f77cdb34c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk7uJZIACgkQCRZPokWLroT6zwCgu/TjKuYpY8FFCnPDhDmsaf9s
-7ucAoLiyt4Gf/C1Q+beC7UWb9LMRlb7X
-=6wci
------END PGP SIGNATURE-----
diff --git a/sys-libs/db/db-5.1.29.ebuild b/sys-libs/db/db-5.1.29.ebuild
new file mode 100644
index 000000000000..7f86a8aad768
--- /dev/null
+++ b/sys-libs/db/db-5.1.29.ebuild
@@ -0,0 +1,201 @@
+# 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.1.29.ebuild,v 1.1 2012/02/10 19:31:00 robbat2 Exp $
+
+EAPI=2
+inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
+
+#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.1"
+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
+	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
+
+	# 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"
+
+	db_src_test
+}