Version bump.

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

3 files changed, 228 insertions, 2 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index a815febdf340..663a8938236b 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.320 2011/07/16 19:43:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.321 2011/11/01 07:35:52 robbat2 Exp $
+
+*db-5.2.36 (01 Nov 2011)
+
+  01 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> +db-5.2.36.ebuild:
+  Version bump.
 
 *db-5.2.28 (16 Jul 2011)
 
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 7ef96c803c7f..b20112c1f1a7 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -44,6 +44,7 @@ DIST db-5.0.32.tar.gz 29325258 RMD160 82997d94a1d542b127cceae0356f484d2cc79d7a S
 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.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
 DIST patch.3.2.9.1 2139 RMD160 a018e1e91102c972279ec017e1d87d6d87f99a56 SHA1 34108ae9ce03c40c4d1016e9e54690d5d8fc4135 SHA256 6d89a42ee0be9e47b3e8a42981c65266a556de84bc6281edcf0f977f52547798
 DIST patch.3.2.9.2 495 RMD160 c9982844d99e1c78efddcb7b7615c41f6225e6b9 SHA1 c447c089f44c401c174244a7f9f7967522ba92a4 SHA256 61db874796fe8789b0045f456285b27c5b8b7b8902a5e342a115456015716d0e
@@ -89,5 +90,6 @@ EBUILD db-5.0.32.ebuild 5393 RMD160 bf91cf04b6ff4a04f108f2000e25d2b713d98db1 SHA
 EBUILD db-5.1.19-r2.ebuild 5400 RMD160 364a9523060ef0dc2e2c8daa9e2369686b4b8303 SHA1 5f1063f5c053fdbaa3a378b314964e029dcd01b1 SHA256 ad14b81961f492619e1924bddc07dae0463fbb10a8ed4cfe99de9cb028b77911
 EBUILD db-5.1.25.ebuild 5397 RMD160 cc32fc27e92747da633c1b1ecf918823d9ef961d SHA1 95fd9e2a3ac2cbead5cbbb887a09f18f48d41c33 SHA256 08ace4571a299cdde67de6882d3ad0af01ff82d3be8eb60ae304c9ba3281d56c
 EBUILD db-5.2.28.ebuild 6024 RMD160 dee589a7262c1075fbba2c1c002d01ec15d57f71 SHA1 39aabe0489d2148f4126674ab3fd9d27345de3b3 SHA256 bb6b352ec39fc474aac65d262ced1df4a47fc3c4c679aa4566c27a76442e3174
-MISC ChangeLog 50058 RMD160 bd4a843205c85c50a2a3c3e660758defab46eb38 SHA1 46b970032a26e31d32cbf71918c41edd9a31ad95 SHA256 421d782b0ed7ea87ced784291f6d8a1068e9d7c16006e6c62da5e82b5fc4f647
+EBUILD db-5.2.36.ebuild 6067 RMD160 951dd7a387a2d9106809b09e3f08148551fac4d0 SHA1 3859b9a2a30dcc371da837e439294798207cdcdc SHA256 04a9cb287e18869840546ae041ab07af267158c1d0c0bb65131121556593c749
+MISC ChangeLog 50173 RMD160 216c5da60149cc1d4633a8f2c03d5f885f24f56f SHA1 076107aed80969a711edef09e8bcbbdfc9d46e94 SHA256 63cbb7d48be13acc8d6a305f7e41c86c97b2eec69757c1c26357e518074e3cac
 MISC metadata.xml 1463 RMD160 8e4cb5bc76931b83b9b1e8d4cbe719224fda40f3 SHA1 0120fead11c4452b41738edb1456cfa1edc31a05 SHA256 c6d35d6a2053996f868d12532f33d943e28c9ee27df5b61c83c2836f77cdb34c
diff --git a/sys-libs/db/db-5.2.36.ebuild b/sys-libs/db/db-5.2.36.ebuild
new file mode 100644
index 000000000000..241fc8d1349f
--- /dev/null
+++ b/sys-libs/db/db-5.2.36.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.2.36.ebuild,v 1.1 2011/11/01 07:35:52 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.2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="doc java nocxx 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
+	#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 !nocxx cxx) \
+		$(use_enable !nocxx 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
+}