bumped sys-libs/db:4.7 to latest ~ (4.7.25_p4)

8 files changed, 298 insertions, 3 deletions

diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 805284941..2578faa3e 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -4,5 +4,7 @@ AUX nspr-4.6.1-lang.patch 1718 RMD160 6c3fb440f4b4004289de3f65b996936bcfcbaa45 S
 AUX nspr-4.7.0-prtime.patch 964 RMD160 a963c21fb1ce5e8913d3c41753ca37b24e80798d SHA1 b47ffa12022ea83b738e5d847e61cca026ec7f07 SHA256 3fd4f3c68257dced021c0bfa00245d0da2d6c64205135b1cc89f96a3375dffc7
 DIST nspr-4.7.3.tar.gz 1254585 RMD160 532417c8c4d04a32d6cfc09ea8f2279d5ee69e72 SHA1 351c34c8f26d11a441bc3130655cd9144e724899 SHA256 b1d2419ef1807c38944fc746fff14fda8506589e5462dc31194a9d1b494b9f49
 DIST nspr-4.7.4.tar.gz 1256846 RMD160 7f6478f889dbddd91271d2182ace910f32a2c375 SHA1 7653b922b1953bb21d25fb445d0ead90ac79dd21 SHA256 5532056aff17d6769953727ac7ba8dc62741612e936c5be84496671f8a2d08cd
+DIST nspr-4.8.tar.gz 1170419 RMD160 f63468de3613793a8b564e967f3a963aab977c99 SHA1 ac30ec18bf0d070a9663d1a8c2d258004f3f42ad SHA256 a2de84aa21a7bbabd93c4f172123d58c6432c2358807bb260ac338b2dc61dbfe
 EBUILD nspr-4.7.3.ebuild 2718 RMD160 cafc65b81279ddd7615e3b8be8558d0bf9eaa5bc SHA1 14923895a88459e2be4aa85883d859f1327304df SHA256 44b97cb4d5b3062ef7429842190ba76551dffae27cdd2898e9710cff25d7f90c
 EBUILD nspr-4.7.4.ebuild 2719 RMD160 6988b1108f6d304360b4b17a40d18f86d283ef47 SHA1 3d80082ce33943d50b2eb412a1b5d31a44009dd4 SHA256 24468f20d2c7fe22adf1bddf42b8aefefee25bd8db3bb559ecbd72f8709787fb
+EBUILD nspr-4.8.ebuild 2787 RMD160 ee546b13152be8d49864b05a0d7ba98b034685f4 SHA1 83db63304ee8ea93340414f39177a603b4d7ffc7 SHA256 7c61dfa0fcfc427e8c10e135dc311854946aa9ba7c878e6ded4de4128531cba0
diff --git a/dev-libs/nspr/nspr-4.8.ebuild b/dev-libs/nspr/nspr-4.8.ebuild
new file mode 100644
index 000000000..c123c666c
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.8.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.7.4.ebuild,v 1.7 2009/05/01 14:03:12 maekke Exp $
+
+EAPI="2"
+
+inherit eutils multilib toolchain-funcs multilib-native versionator
+
+MIN_PV="$(get_version_component_range 2)"
+
+DESCRIPTION="Netscape Portable Runtime"
+HOMEPAGE="http://www.mozilla.org/projects/nspr/"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
+
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS=""
+IUSE="ipv6 debug"
+
+DEPEND=">=dev-db/sqlite-3.5[lib32?]"
+RDEPEND="${DEPEND}"
+
+multilib-native_src_prepare_internal() {
+	cd "${S}"
+	mkdir build inst
+	epatch "${FILESDIR}"/${PN}-4.6.1-config.patch
+	epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch
+	epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
+	epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
+		mozilla/nsprpub/config/rules.mk
+}
+
+multilib-native_src_configure_internal() {
+	cd "${S}"/build
+
+	echo > "${T}"/test.c
+	$(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o
+	case $(file "${T}"/test.o) in
+		*64-bit*) myconf="${myconf} --enable-64bit";;
+		*32-bit*) ;;
+		*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+
+	if use ipv6; then
+		myconf="${myconf} --enable-ipv6"
+	fi
+
+	myconf="${myconf} --libdir=/usr/$(get_libdir)/nspr \
+		--enable-system-sqlite"
+
+	ECONF_SOURCE="../mozilla/nsprpub" econf \
+		$(use_enable debug) \
+		${myconf} || die "econf failed"
+}
+
+multilib-native_src_compile_internal() {
+	cd ${S}/build
+	make CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
+}
+
+multilib-native_src_install_internal() {
+	# Their build system is royally fucked, as usual
+	MINOR_VERSION=${MIN_PV} # Used for .so version
+	cd "${S}"/build
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	cd "${D}"/usr/$(get_libdir)/nspr
+	for file in *.so; do
+		mv ${file} ${file}.${MINOR_VERSION}
+		ln -s ${file}.${MINOR_VERSION} ${file}
+	done
+	# cope with libraries being in /usr/lib/nspr
+	dodir /etc/env.d
+	echo "LDPATH=/usr/$(get_libdir)/nspr" > "${D}/etc/env.d/08nspr-${ABI}"
+
+	# install nspr-config
+	dobin "${S}"/build/config/nspr-config
+
+	# create pkg-config file
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins "${S}"/build/config/nspr.pc
+
+	# Remove stupid files in /usr/bin
+	rm "${D}"/usr/bin/{prerr.properties,nspr.pc}
+
+	prep_ml_binaries /usr/bin/nspr-config 
+}
+
+multilib-native_pkg_postinst_internal() {
+	preserve_old_lib_notify /usr/$(get_libdir)/nspr/lib{nspr,plc,plds}4.so.6
+	elog
+	elog "Please make sure you run revdep-rebuild after upgrade, This is extremely important"
+	elog "to ensure your system nspr works proplery."
+	elog
+}
diff --git a/metadata/cache/dev-libs/nspr-4.8 b/metadata/cache/dev-libs/nspr-4.8
new file mode 100644
index 000000000..92124e2e9
--- /dev/null
+++ b/metadata/cache/dev-libs/nspr-4.8
@@ -0,0 +1,22 @@
+>=dev-db/sqlite-3.5[lib32?] sys-apps/abi-wrapper
+>=dev-db/sqlite-3.5[lib32?] sys-apps/abi-wrapper
+0
+ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.8/src/nspr-4.8.tar.gz
+
+http://www.mozilla.org/projects/nspr/
+|| ( MPL-1.1 GPL-2 LGPL-2.1 )
+Netscape Portable Runtime
+
+base eutils multilib multilib-native portability toolchain-funcs versionator
+ipv6 debug lib32
+
+
+
+2
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-libs/cracklib-2.8.13 b/metadata/cache/sys-libs/cracklib-2.8.13
index 80079d197..81c4222be 100644
--- a/metadata/cache/sys-libs/cracklib-2.8.13
+++ b/metadata/cache/sys-libs/cracklib-2.8.13
@@ -7,7 +7,7 @@ http://sourceforge.net/projects/cracklib
 CRACKLIB
 Password Checking Library
 alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-base eutils multilib multilib-native portability toolchain-funcs
+base eutils libtool multilib multilib-native portability toolchain-funcs
 nls python lib32
 
 
diff --git a/metadata/cache/sys-libs/db-4.7.25_p4 b/metadata/cache/sys-libs/db-4.7.25_p4
new file mode 100644
index 000000000..4b930f99b
--- /dev/null
+++ b/metadata/cache/sys-libs/db-4.7.25_p4
@@ -0,0 +1,22 @@
+tcl? ( >=dev-lang/tcl-8.4[lib32?] ) test? ( >=dev-lang/tcl-8.4[lib32?] ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.1.6 ) =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 sys-devel/libtool sys-apps/abi-wrapper
+tcl? ( dev-lang/tcl[lib32?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.6 ) sys-apps/abi-wrapper
+4.7
+http://download.oracle.com/berkeley-db/db-4.7.25.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.2 http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.3 http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.4
+
+http://www.oracle.com/technology/software/products/berkeley-db/index.html
+OracleDB
+Oracle Berkeley DB
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd
+autotools base check-reqs db eutils flag-o-matic java-pkg-opt-2 java-utils-2 libtool multilib multilib-native portability toolchain-funcs versionator
+doc java nocxx tcl test doc test elibc_FreeBSD java gcj multislot lib32
+
+
+
+2
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/x11-libs/qt-webkit-4.5.1 b/metadata/cache/x11-libs/qt-webkit-4.5.1
index 12d03a06a..cd41896f5 100644
--- a/metadata/cache/x11-libs/qt-webkit-4.5.1
+++ b/metadata/cache/x11-libs/qt-webkit-4.5.1
@@ -1,5 +1,5 @@
-~x11-libs/qt-core-4.5.1[debug=,ssl,lib32?] ~x11-libs/qt-gui-4.5.1[debug=,lib32?] !kde? ( || ( ~x11-libs/qt-phonon-4.5.1:4[debug=,lib32?] media-sound/phonon[lib32?] ) ) kde? ( media-sound/phononb[lib32?] ) sys-apps/abi-wrapper
-~x11-libs/qt-core-4.5.1[debug=,ssl,lib32?] ~x11-libs/qt-gui-4.5.1[debug=,lib32?] !kde? ( || ( ~x11-libs/qt-phonon-4.5.1:4[debug=,lib32?] media-sound/phonon[lib32?] ) ) kde? ( media-sound/phononb[lib32?] ) sys-apps/abi-wrapper
+~x11-libs/qt-core-4.5.1[debug=,ssl,lib32?] ~x11-libs/qt-gui-4.5.1[debug=,lib32?] !kde? ( || ( ~x11-libs/qt-phonon-4.5.1:4[debug=,lib32?] media-sound/phonon[lib32?] ) ) kde? ( media-sound/phonon[lib32?] ) sys-apps/abi-wrapper
+~x11-libs/qt-core-4.5.1[debug=,ssl,lib32?] ~x11-libs/qt-gui-4.5.1[debug=,lib32?] !kde? ( || ( ~x11-libs/qt-phonon-4.5.1:4[debug=,lib32?] media-sound/phonon[lib32?] ) ) kde? ( media-sound/phonon[lib32?] ) sys-apps/abi-wrapper
 4
 http://download.qtsoftware.com/qt/source/qt-x11-opensource-src-4.5.1.tar.bz2
 
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 38c3f7855..b81108524 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -36,6 +36,8 @@ 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-4.5.20_p2-r1.ebuild 5069 RMD160 08cd3bf576eb9c238ae7b15a29b89fe933fc683b SHA1 1180636b9e5ca62357b5d253732c45ec01a00004 SHA256 6d10c25110c3df67c77d3de5f91b589e0c9a69b90f4ea15ea09ada43d8d432ee
 EBUILD db-4.6.21_p4.ebuild 4731 RMD160 4e2d648aec4a977108120de54c6e0d6498a65380 SHA1 77eef1c2f0ff54f47fb49eaa7874b87694b275a3 SHA256 ed4ced875aee3798fedf16caa33f757012c74d5c6a4c3a4084451e363df45767
 EBUILD db-4.7.25_p3.ebuild 4123 RMD160 64385ca2cf54c52db8a1c5dd453e82ce6254f610 SHA1 c1b3972517d426aeda34ab316911a35cc2aa6d9b SHA256 23dd5f06e6778af35981a4dd8eb859cf287432ee7494430ec436fd2b572a440f
+EBUILD db-4.7.25_p4.ebuild 4123 RMD160 1d18889860860c21bb3558a14cbe5b448aa61327 SHA1 da6b2acb42ad4e0693ba8e50590b1ec0d51b6e6d SHA256 96e855f918746efa65f8a3db37b90af122ef2b2ad5657247c5a2a6e79edf6857
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 000000000..2dad98597
--- /dev/null
+++ b/sys-libs/db/db-4.7.25_p4.ebuild
@@ -0,0 +1,149 @@
+# 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 $
+
+EAPI="2"
+
+inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool multilib-native
+
+#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[lib32?] )
+	test? ( >=dev-lang/tcl-8.4[lib32?] )
+	java? ( >=virtual/jdk-1.5 )
+	>=sys-devel/binutils-2.16.1"
+RDEPEND="tcl? ( dev-lang/tcl[lib32?] )
+	java? ( >=virtual/jre-1.5 )"
+
+src_unpack() {
+	unpack "${MY_P}".tar.gz
+}
+
+multilib-native_src_prepare_internal() {
+	cd "${S}/.."
+	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
+}
+
+multilib-native_src_configure_internal() {
+	# 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) \
+		"$@"
+}
+
+multilib-native_src_install_internal() {
+	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
+}
+
+multilib-native_pkg_postinst_internal() {
+	db_fix_so
+}
+
+multilib-native_pkg_postrm_internal() {
+	db_fix_so
+}