Version bump.

Package-Manager: portage-2.2_rc88/cvs/Linux x86_64

3 files changed, 210 insertions, 2 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 659ac03fa2c5..47b70e89bb05 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.311 2010/09/12 08:48:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.312 2010/10/04 17:09:59 robbat2 Exp $
+
+*db-5.0.26 (04 Oct 2010)
+
+  04 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> +db-5.0.26.ebuild:
+  Version bump.
 
   12 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> -db-3.2.9-r11.ebuild,
   -db-4.2.52_p4-r2.ebuild, -db-4.3.29-r2.ebuild, -files/patch.3.2.9.1,
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 9ca158273386..38d20b54f12b 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -38,6 +38,7 @@ DIST db-4.8.24.tar.gz 22900528 RMD160 848895409f81ab17f6f576d10c00a7897e13bc95 S
 DIST db-4.8.26.tar.gz 22898132 RMD160 816ddaf1b90013e6500255ee6b5d0e5acca486d1 SHA1 f39aff01483aa8de2b1864242028f9a21c38c7cd SHA256 f755d15f79cf6fc5a61d94bc3c8cfd3f9cb0ce3d454379d5981c54b326809d41
 DIST db-4.8.30.tar.gz 22887305 RMD160 dd2fcd4c9b857a91e2f491fd4fadb0c51b993a9c SHA1 ab36c170dda5b2ceaad3915ced96e41c6b7e493c SHA256 e0491a07cdb21fb9aa82773bbbedaeb7639cbd0e7f96147ab46141e0045db72a
 DIST db-5.0.21.tar.gz 29300812 RMD160 957310c66f7be35d07a96a42dce661bea8f97976 SHA1 f852184fdd7d4a0b14e31ec835fd796981f35976 SHA256 061a31a962e992dd1eae5f1e3193241d497a18968e750707526d104b53ab3cc4
+DIST db-5.0.26.tar.gz 29319373 RMD160 7b85b1bfbf52c4382270bb21ace4a605842cf3df SHA1 ab945a9ec9d2e2c6406d583de2554976cfaf3be6 SHA256 b93dcff39fbf2ea48199d6e45a69d815d84a86d36dc989bf61728e7c28a4fab9
 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
@@ -78,5 +79,6 @@ EBUILD db-4.8.24.ebuild 4431 RMD160 3ed6aa7cd48f9824bdf8b2cb4f44b5fc48fe887c SHA
 EBUILD db-4.8.26.ebuild 4431 RMD160 b5ada7784ee0ff0ecff7bcbd10a72a64abb6271c SHA1 c884f625ead196b4e1afaf428cf394b8008ef4a4 SHA256 ba81971dc4090bc318cdfa6ec02e5dad68693b038a5fa03827f83e677089e5fd
 EBUILD db-4.8.30.ebuild 4430 RMD160 0b0e66d53d3fd0307dee10fec9d7205663d12062 SHA1 cbd56d479531e7379702ba7a3e833e12ff7651bb SHA256 f580e50b1d09218fc0c2e3a00802c10ffad1488090f56d92be27bdab1b21981b
 EBUILD db-5.0.21-r1.ebuild 5366 RMD160 473e53358830d7cb37391c98549144df8cd56078 SHA1 89d7a01c4de83e3d14fa08ed81fc714dcd5c37a9 SHA256 6f6e8371ba59d3593592f468e66d83b6e1b737eac1a624445f1c3cba8eb0072a
-MISC ChangeLog 48809 RMD160 b3ec0af2a341769d5b78b7f84b5787748fbcccc6 SHA1 30743a2f367e6877b882bfa8b324237b71252ff5 SHA256 b435518f1074f575fbb75ccd346c40f8546c227cb0a06ca62ff9f8d05181a04b
+EBUILD db-5.0.26.ebuild 5393 RMD160 0010e944a80cf13f4437529f2e5e1b540687eeb9 SHA1 d21aa803b36fe17291533955f294b4d96da96cfd SHA256 219c736c664c1ffffef71b85a8c434ee86a2782b611615ccc714bf7b98c7b03d
+MISC ChangeLog 48924 RMD160 e614434e41e82dc4b1ddf3917959c0b2d9bfd56f SHA1 ef20dbf523ac8045dace5ca5a834a92d9cf871b0 SHA256 9648056104d7881b6ee007497d776de1fe3e0d272551ba4fa8bca22296fe5285
 MISC metadata.xml 1463 RMD160 8e4cb5bc76931b83b9b1e8d4cbe719224fda40f3 SHA1 0120fead11c4452b41738edb1456cfa1edc31a05 SHA256 c6d35d6a2053996f868d12532f33d943e28c9ee27df5b61c83c2836f77cdb34c
diff --git a/sys-libs/db/db-5.0.26.ebuild b/sys-libs/db/db-5.0.26.ebuild
new file mode 100644
index 000000000000..253586149971
--- /dev/null
+++ b/sys-libs/db/db-5.0.26.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.0.26.ebuild,v 1.1 2010/10/04 17:09:59 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.0"
+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
+	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 !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/test.tcl"
+
+	db_src_test
+}