Version bump, from #272983

Package-Manager: portage-2.1.6.13/cvs/Linux i686

3 files changed, 155 insertions, 2 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 621d70e415e2..a7c474ced0cf 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.284 2009/06/01 12:01:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.285 2009/06/21 13:43:28 caleb Exp $
+
+*db-4.7.25_p4 (21 Jun 2009)
+
+  21 Jun 2009; Caleb Tennis <caleb@gentoo.org> +db-4.7.25_p4.ebuild:
+  Version bump, from #272983
 
   01 Jun 2009; Raúl Porcel <armin76@gentoo.org> db-4.6.21_p4.ebuild:
   arm/ia64/m68k/s390/sh/sparc stable wrt #248905
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 430b3ecd05dc..8de3a88bfa33 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -54,6 +54,7 @@ DIST patch.4.6.21.4 41501 RMD160 f1d18e59c311fb4e1f00a3b6220269fca17df312 SHA1 e
 DIST patch.4.7.25.1 2072 RMD160 89c58f5235f95e82e65bab447d1b9019bf26ed25 SHA1 3ae3c02fb541dc8f8dee903a75450d2dbc0736a7 SHA256 e91590af872705efc34414afb702abc630a75c55ba61570dca2216c783e0a83a
 DIST patch.4.7.25.2 2210 RMD160 097a6bc3e8efd43fe5bd0fd77a4b793cd0d6bc18 SHA1 e3d56ad6e4a9bc092495f62c40c0cdf11ab2443c SHA256 05d6cde0ab1bfdb80394a7a88ff7233d0407f0b09103b0dd3791ebfccbbcca31
 DIST patch.4.7.25.3 8442 RMD160 a0ef673d8127be825444aaa12711dcf75b7fda1a SHA1 1f707e6c65c8ebe9fa7b36333c6de76f2d480cf5 SHA256 e5393cbfc8538cc21cc939d26ceca3e5782b4a4259a644884d91790e18ed39f3
+DIST patch.4.7.25.4 5500 RMD160 614765c392e3a5854736df2034f8ae041d31034c SHA1 0e3687a8f90d071a557fe91df85ce28fcfa947ab SHA256 deac958adf12621f6f05874e8021f7bc1e5efe502cb42efcbfdf961255a85272
 EBUILD db-1.85-r3.ebuild 1380 RMD160 5f83a60a3e196d9988af40a0e1a5c1b4781f81ca SHA1 07998d65f70d2ff4703f7f87cb73f6b35f545b19 SHA256 2547f9e976def8144f3ce8ab21c396b6555bc98193bef3ab54656e2b829ab994
 EBUILD db-3.2.9-r11.ebuild 4425 RMD160 3da3794a23f356fcf6fbbccae274afb4001d16fc SHA1 d5fecadf49d8ad9ee8f9bff0f3cc9df6e37ffa0b SHA256 04cbaa35c5e27d25a483432b8c3b709c7a68f7a9c98d11b95efb70c5cdcdcc4a
 EBUILD db-3.2.9_p2.ebuild 4927 RMD160 57ca7aaa0fe43c1c82cc7a0497ffbf9e6af2214c SHA1 a5a988fabad3a1e4385dde22fc5598d4a374ec26 SHA256 6c5ed4f04dbc87456278308a6baee539f2a7846dfeba8960a681e2fddea7433d
@@ -69,5 +70,6 @@ EBUILD db-4.5.20_p2-r1.ebuild 4919 RMD160 4d2638e9ec7cd0b8b9d897138495ef7f32b940
 EBUILD db-4.5.20_p2.ebuild 3866 RMD160 a67a4a5d1f136b3c865163a4698a1657d488a24e SHA1 1ae58a1f131fa1fef1db3abd38b0ae8bd3b23e27 SHA256 ddb3601e41436f3a914ce4e5566eed3ead320f56d250e96f9a538ce6338e312c
 EBUILD db-4.6.21_p4.ebuild 4645 RMD160 eb8438598c3bf39f2550a2408fccdd1421d86ed9 SHA1 c6897f0929719f49b1bbb017b9092b1f5ee9d5c8 SHA256 4a14883ebd55b7b9aaa7870b82fba0110610ff082746fdb0ac0618638adda672
 EBUILD db-4.7.25_p3.ebuild 3969 RMD160 09ea8ff35bd50a1e13b5fbca45ee1321018a528f SHA1 3097b15d1807a684d20dc9c1fbd9b0f414b88ddd SHA256 7cffd88df1cdfb5108dd1b32b0ac986665b68538ee10fe00d85fce0840e5a5fb
-MISC ChangeLog 44062 RMD160 df353eec13b832307f48de05e7067cd3a6a57da9 SHA1 d663d50efefa1e767fe1a6f59f308b801da4a002 SHA256 4280fd59e6e1f4efab166d9d682eb1d123ecc4b055e0bb019d7bbe4a3cef079c
+EBUILD db-4.7.25_p4.ebuild 3969 RMD160 5b79b90c6b695b225c8367e9644214683cfc20f8 SHA1 f1f8576a1a57e943e26fbda5f9c5932d087cc1a2 SHA256 5ecfeeb870063af934155455a7ac289a276dbdf97c0d8005156b8edd7c257f04
+MISC ChangeLog 44188 RMD160 424ea796ad44f497d982bfe1ff8b973fc70481ca SHA1 406b19fd4b32d061c1c258491cfb829747daeb67 SHA256 b209545337f6c088db4b887679822141414457e384420f46127de0e9d2aae807
 MISC metadata.xml 1657 RMD160 f474f2ae4512bb017c5f6d344d5d2d1b03dc6b47 SHA1 f24d5b8ab267859ddc9c1ddb0c10992d31809ec9 SHA256 cb82ec7afe1d3df3b38835aa74a6d467f5b31f98a783df9a01396a546acdf044
diff --git a/sys-libs/db/db-4.7.25_p4.ebuild b/sys-libs/db/db-4.7.25_p4.ebuild
new file mode 100644
index 000000000000..050a7fed64b1
--- /dev/null
+++ b/sys-libs/db/db-4.7.25_p4.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.7.25_p4.ebuild,v 1.1 2009/06/21 13:43:28 caleb Exp $
+
+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="${WORKDIR}/${MY_P}/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="4.7"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~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
+	cd "${WORKDIR}"/"${MY_P}"
+	for (( i=1 ; i<=${PATCHNO} ; i++ ))
+	do
+		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
+	done
+	epatch "${FILESDIR}"/"${PN}"-4.6-libtool.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
+
+	# 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}"/../dist/Makefile.in
+
+	cd "${S}"/../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
+	sed -i \
+		-e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \
+		-e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \
+		-e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \
+		-e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \
+		-e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \
+		-e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" configure
+}
+
+src_compile() {
+	# 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
+
+	cd "${S}"
+	ECONF_SOURCE="${S}"/../dist \
+	STRIP="true" \
+	econf \
+		--enable-compat185 \
+		--enable-o_direct \
+		--without-uniquename \
+		--enable-rpc \
+		$(use amd64 && echo --with-mutex=x86/gcc-assembly) \
+		$(use_enable !nocxx cxx) \
+		$(use_enable java) \
+		$(use_enable tcl) \
+		$(use tcl && echo --with-tcl=/usr/$(get_libdir)) \
+		$(use_enable test) \
+		"$@"
+
+	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
+	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
+}