Version bump.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64

3 files changed, 154 insertions, 2 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index a7ff5729d174..5e8fd363934f 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.252 2008/08/16 05:32:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.253 2008/08/16 05:33:46 robbat2 Exp $
+
+*db-4.7.25_p1 (16 Aug 2008)
+
+  16 Aug 2008; Robin H. Johnson <robbat2@gentoo.org> +db-4.7.25_p1.ebuild:
+  Version bump.
 
 *db-4.6.21_p3 (16 Aug 2008)
 
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 1c9f227f1367..3200eab5e8d6 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -49,6 +49,7 @@ DIST patch.4.5.20.2 1752 RMD160 d35069e8267f02e64e6f1be046d6cb9e75e9e720 SHA1 a3
 DIST patch.4.6.21.1 2475 RMD160 8c11e9b991ac6559f22ece2d93617b16126049e8 SHA1 c7c155705687e4de03d06c2ea86940f573fdac0b SHA256 d28c0723c465a2cf3ff2ddc5ed3c643b40c955c4e64d56580961f2fd799cbb53
 DIST patch.4.6.21.2 892 RMD160 f8abf554552db668037e046dea54700ce3340bf8 SHA1 a694b71088ba99b74042e7568f395fe467bb6590 SHA256 9496a6cad44377ad1fab8c617f17c6f541e3423814663bfa81c3abb4001622d9
 DIST patch.4.6.21.3 1517 RMD160 63743d910f8c3832409bdc6e7d74db0fcdd686a5 SHA1 a893f6bcdb6ae1f9395c027431c038168d500c9b SHA256 3f531b18d88ce68ff080761cd62ef621444e675593aa23045d69121cd2c7c638
+DIST patch.4.7.25.1 2072 RMD160 89c58f5235f95e82e65bab447d1b9019bf26ed25 SHA1 3ae3c02fb541dc8f8dee903a75450d2dbc0736a7 SHA256 e91590af872705efc34414afb702abc630a75c55ba61570dca2216c783e0a83a
 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 4896 RMD160 21783a7f5ec04e0357bf4a33f48a9694c0a43048 SHA1 b1bb1f99ced5fe399bbb56f0afe96023b0dda5d3 SHA256 1baf48f35a49ae66588719725220640651afc77230f64e5e90b26d054e4c5e62
@@ -61,5 +62,6 @@ EBUILD db-4.5.20_p2.ebuild 3937 RMD160 d7857fc73ba5e3e46f3d2e056863112e6b0b01b2
 EBUILD db-4.6.21_p1.ebuild 3938 RMD160 73adabeb81be1df6cdefbd92838c31980d473f1a SHA1 41ca803b0c7fac5d156f9ad2ff594ccd20458b52 SHA256 6dfb6e2516531b3716df28a5da2955a89d142f5126b059b171a8dba036d402b2
 EBUILD db-4.6.21_p3.ebuild 3948 RMD160 16bc15d03ec7dfbc6ec74afcdd4fd33863d93a78 SHA1 c54aeca496c02ae5e37eb7ed068f8db15fc09ddf SHA256 7d93f4471fff67da3ee6c2d15be5705a63e92c752edfbbd503435e9504f65e90
 EBUILD db-4.7.25.ebuild 3933 RMD160 98c4ddf234c7a274d7ae655008f2f010fda3bedc SHA1 1b0438c3811c64b66ac9a9711523fbe925e66027 SHA256 32ee208e2ab19cc48c04d732d2a7694803e9a15f84faa90374329600698e5669
-MISC ChangeLog 38432 RMD160 ad9c4fa852650ed1ab6f41e30521b7160d82363a SHA1 621b5b157a087e0782cff5b31d0f0c05c7a748ac SHA256 e9ca7cdd4eba6f6b9f691a1184bc1257b109486b76169141eefcd8b6a850d67f
+EBUILD db-4.7.25_p1.ebuild 3936 RMD160 a61846bc739c71452b7e72489c639ffbe7aa9591 SHA1 a1723f9759a2d6030f4c2e0fad5bf97677db1aaf SHA256 2ee7ea6bce661792a46b92c2943688101a3b5c9c3c3f8b348eeede1c08d3228c
+MISC ChangeLog 38553 RMD160 8227cd2c88eabba401feff1fd0fc2221a4993f8a SHA1 4d8a9c6f284c8b6be61bc4c3c3ab0f2114398282 SHA256 17eca52fbbbd1aa4fd9cfbf866ddcda61813b7eb1932eeb0d4230c2a82ecab50
 MISC metadata.xml 1651 RMD160 cbdc138b8fd0fab28ec59db03fca18f2e0e74818 SHA1 e70ae3f07e5559a43dd85fad3270b7f7f185b996 SHA256 895bfb43a1bd60170937b4523f396d5772a3914384a95105345ac1f24c606550
diff --git a/sys-libs/db/db-4.7.25_p1.ebuild b/sys-libs/db/db-4.7.25_p1.ebuild
new file mode 100644
index 000000000000..7ac44cf14a7b
--- /dev/null
+++ b/sys-libs/db/db-4.7.25_p1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2008 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_p1.ebuild,v 1.1 2008/08/16 05:33:46 robbat2 Exp $
+
+inherit eutils db flag-o-matic java-pkg-opt-2
+
+#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="tcl java doc nocxx bootstrap"
+
+DEPEND="tcl? ( >=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
+
+	sed -i \
+		-e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" \
+		"${S}"/../dist/configure
+}
+
+src_compile() {
+	# compilation with -O0 fails on amd64, see bug #171231
+	if use amd64; then
+		replace-flags -O0 -O2
+		is-flag -O[s123] || append-flags -O2
+	fi
+
+	local myconf=""
+
+	use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
+
+	use bootstrap \
+		&& myconf="${myconf} --disable-cxx" \
+		|| myconf="${myconf} $(use_enable !nocxx cxx)"
+
+	use tcl \
+		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
+		|| myconf="${myconf} --disable-tcl"
+
+	myconf="${myconf} $(use_enable java)"
+	if use java; then
+		myconf="${myconf} --with-java-prefix=${JAVA_HOME}"
+		# Can't get this working any other way, since it returns spaces, and
+		# bash doesn't seem to want to pass correctly in any way i try
+		local javaconf="-with-javac-flags=$(java-pkg_javac-args)"
+	fi
+
+	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
+
+	# the entire testsuite needs the TCL functionality
+	if use tcl && has test $FEATURES ; then
+		myconf="${myconf} --enable-test"
+	else
+		myconf="${myconf} --disable-test"
+	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 econf \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--datadir=/usr/share \
+		--sysconfdir=/etc \
+		--localstatedir=/var/lib \
+		--libdir=/usr/"$(get_libdir)" \
+		--enable-compat185 \
+		--without-uniquename \
+		--enable-rpc \
+		--host="${CHOST}" \
+		${myconf}  "${javaconf}" || die "configure failed"
+
+	sed -e "s,\(^STRIP *=\).*,\1\"true\"," Makefile > Makefile.cpy \
+	    && mv Makefile.cpy Makefile
+
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	einstall libdir="${D}/usr/$(get_libdir)" STRIP="true" || 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
+}