Automatically match DBD version to what libapr was built with; idea & code by Martin von Gagern in bug #291624. Removed -j1 from where it does not seem to be required. Tested on a dual hex-core system with -j12; please file a bug if you can make it fail. Removed old ebuild.

Package-Manager: portage-2.1.10.10/cvs/Linux x86_64

3 files changed, 30 insertions, 28 deletions

diff --git a/dev-vcs/subversion/ChangeLog b/dev-vcs/subversion/ChangeLog
index 2c44373ca76c..b064a7069af0 100644
--- a/dev-vcs/subversion/ChangeLog
+++ b/dev-vcs/subversion/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-vcs/subversion
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.47 2011/08/22 11:21:31 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.48 2011/08/22 21:40:17 chainsaw Exp $
+
+*subversion-1.6.17-r4 (22 Aug 2011)
+
+  22 Aug 2011; Tony Vroon <chainsaw@gentoo.org> -subversion-1.6.17-r2.ebuild,
+  +subversion-1.6.17-r4.ebuild:
+  Automatically match DBD version to what libapr was built with; idea & code by
+  Martin von Gagern in bug #291624. Removed -j1 from where it does not seem to
+  be required. Tested on a dual hex-core system with -j12; please file a bug if
+  you can make it fail. Removed old ebuild.
 
 *subversion-1.6.17-r3 (22 Aug 2011)
 
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index b3bb46dc46d0..7a2be5210b97 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 47_mod_dav_svn.conf 422 RMD160 658703e00882a0bce007709372cf40a407fee915 SHA1 3a1ffd40391a1cca3cb9cfb1b9d153c1a4f169a0 SHA256 bdb10203ae3154da723655b07118f630ef1e83ec38a79e31a53e436e0c071d27
 AUX 70svn-gentoo.el 443 RMD160 300189eea80dfefa0f2a8479f67d255b39fd2adb SHA1 245b5ed611755276016bc76de2eabdc117e2c511 SHA256 23aa9effa5aea7ae73d14ae4df1a9269135137a5e483b4ff2a501dc130d7d1be
 AUX subversion-1.6.0-disable_linking_against_unneeded_libraries.patch 1769 RMD160 89d165463a2e8a7e2ae5855bc4e4e290f20416ae SHA1 3fc9a49e80992b13b016d1c56babae43957f1b91 SHA256 a54a4dd37e197d030b9d56b2954e4cd38f8a7f1b191cfe59f863b75a164d5f96
@@ -15,15 +12,8 @@ DIST subversion-1.6.16.tar.bz2 5509729 RMD160 f12d7eb31372486290e08143ec1afda029
 DIST subversion-1.6.17.tar.bz2 5504298 RMD160 b0937be80622774fee5d4557e740ad44f7f47172 SHA1 6e3ed7c87d98fdf5f0a999050ab601dcec6155a1 SHA256 d629c657e171616d30cc0cbddf1011a065770813bfc32f78c6940d09ca868124
 EBUILD subversion-1.6.15.ebuild 31841 RMD160 0b018adda55fc51e2a7fb05e7bfdeb1b11f318c4 SHA1 9f73ff35e92d60692d551382a68dac87b56655df SHA256 a1eba80dd50f7ec4092884c410228c7aa0778ca0a812c097deb36139c5907712
 EBUILD subversion-1.6.16.ebuild 31846 RMD160 c2714b45a69939db231e5f03ad26b6def895f397 SHA1 994949ce558dc39e8d8e9b0cf4d248937c628ef7 SHA256 8e4ae636dcb868a4a9ed17dc01c42451c62b8c73f890e99c3b16125c7267af11
-EBUILD subversion-1.6.17-r2.ebuild 15900 RMD160 24083b9bf07c25ed30576340873036359d28f0d3 SHA1 ccb5eb9277bbb2eb1e719c6eba28ba8089d4aae1 SHA256 bca84bd62183398e3f2896adccb91ff330be2371c3bf0dfd19ebc541ccd3e877
 EBUILD subversion-1.6.17-r3.ebuild 15715 RMD160 69fdeb726a3b215e8b47f83f9d7116654acd8cac SHA1 49c07b1fb0b4722d79417620448b8f01dc8b66af SHA256 2c442307b1845fa544d7a523591b8e470e77d06be5af86ce9092fbb80b71a108
+EBUILD subversion-1.6.17-r4.ebuild 15819 RMD160 b3b491ed7aab6cd28fdb6ad3996fc5a7c17e3284 SHA1 afaa12b64453f0829665ed21613973cd8aab8ce5 SHA256 9a18d9dfb082967fb0b315a9174dae6574046e2df174de409aab58151c23a11e
 EBUILD subversion-1.6.17.ebuild 31736 RMD160 f737154399931fc9691ec0e3d377b0518f98a4c4 SHA1 2ede6c3c8c3dc36058e5dc9995fe10b3d1b040a7 SHA256 243009278832093ab797b7535d333da5cb5e4d9f0f02f95b31249a9fdd5a7625
-MISC ChangeLog 78290 RMD160 e0c505eff1c0e93e4cc31c3ccf76365e692b0f14 SHA1 76c57b36686d8926306cd0ce3959fc06928f6dc8 SHA256 038142e7405d372d5a4dc75d10df9ccc4082b7926e33828d21675f3e73f08a96
+MISC ChangeLog 78721 RMD160 5ee8913d1896afac13440cc4bbc679c93f4d3530 SHA1 e8b833d374ba89f67e24efef3359e47b07540fa3 SHA256 7ea9879a3a1232226faa7a6814eb3c92df43a00073380b288f48b74577f6b747
 MISC metadata.xml 650 RMD160 17a1bcef59b035ceeb456ff3bcff9f121db2cc5e SHA1 677d1e573840f9f634abfa39dbce0dc4f11e4ee8 SHA256 ca7082ab0d3917e015b6532500bd31ef236513c3ad30782462823c947df1afdb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iEYEARECAAYFAk5SO8MACgkQp5vW4rUFj5oPawCgnXnCWs3ItWtCuRlKqveALZXR
-JOcAn2WY2/ZCYq1k4J5b8kfIiSzLwnxr
-=PQlL
------END PGP SIGNATURE-----
diff --git a/dev-vcs/subversion/subversion-1.6.17-r2.ebuild b/dev-vcs/subversion/subversion-1.6.17-r4.ebuild
index 9bcefc2e4c96..c741ddf14422 100644
--- a/dev-vcs/subversion/subversion-1.6.17-r2.ebuild
+++ b/dev-vcs/subversion/subversion-1.6.17-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.6.17-r2.ebuild,v 1.1 2011/08/19 10:40:53 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.6.17-r4.ebuild,v 1.1 2011/08/22 21:40:17 chainsaw Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -62,15 +62,22 @@ want_apache
 
 pkg_setup() {
 	if use berkdb; then
+		local apu_bdb_version="$(/usr/bin/apu-1-config --includes \
+			| grep -Eoe '-I/usr/include/db[[:digit:]]\.[[:digit:]]' \
+			| sed 's:.*b::')"
 		einfo
 		if [[ -z "${SVN_BDB_VERSION}" ]]; then
-			SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
-			einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
+			if [[ -n "${apu_bdb_version}" ]]; then
+				SVN_BDB_VERSION="${apu_bdb_version}"
+				einfo "Matching db version to apr-util"
+			else
+				SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
+				einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
+			fi
 		fi
 		einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
 		einfo
 
-		local apu_bdb_version="$(scanelf -nq "${EROOT}usr/$(get_libdir)/libaprutil-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
 		if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
 			eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
 			eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
@@ -199,7 +206,7 @@ src_compile() {
 	fi
 
 	if use perl; then
-		emake -j1 swig-pl || die "Building of Subversion SWIG Perl bindings failed"
+		emake swig-pl || die "Building of Subversion SWIG Perl bindings failed"
 	fi
 
 	if use ruby; then
@@ -247,7 +254,7 @@ src_install() {
 		swig_python_bindings_installation() {
 			rm -f subversion/bindings/swig/python
 			ln -s python-${PYTHON_ABI} subversion/bindings/swig/python
-			emake -j1 \
+			emake \
 				DESTDIR="${D}" \
 				PYTHON_VERSION="$(python_get_version)" \
 				swig_pydir="${EPREFIX}$(python_get_sitedir)/libsvn" \
@@ -258,11 +265,6 @@ src_install() {
 			--action-message 'Installation of Subversion SWIG Python bindings with $(python_get_implementation) $(python_get_version)' \
 			--failure-message 'Installation of Subversion SWIG Python bindings failed with $(python_get_implementation) $(python_get_version)' \
 			swig_python_bindings_installation
-
-		delete_static_libraries() {
-			find "${ED}$(python_get_sitedir)" -name "*.a" -print0 | xargs -0 rm -f
-		}
-		python_execute_function -q delete_static_libraries
 	fi
 
 	if use ctypes-python || use python; then
@@ -270,18 +272,17 @@ src_install() {
 	fi
 
 	if use perl; then
-		emake -j1 DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl || die "Installation of Subversion SWIG Perl bindings failed"
+		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl || die "Installation of Subversion SWIG Perl bindings failed"
 		fixlocalpod
 		find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -print0 | xargs -0 rm -fr
 	fi
 
 	if use ruby; then
-		emake -j1 DESTDIR="${D}" install-swig-rb || die "Installation of Subversion SWIG Ruby bindings failed"
-		find "${ED}usr/$(get_libdir)/ruby" "(" -name "*.a" -o -name "*.la" ")" -print0 | xargs -0 rm -f
+		emake DESTDIR="${D}" install-swig-rb || die "Installation of Subversion SWIG Ruby bindings failed"
 	fi
 
 	if use java; then
-		emake -j1 DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed"
+		emake DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed"
 		java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*.so
 		java-pkg_dojar "${ED}"usr/$(get_libdir)/svn-javahl/svn-javahl.jar
 		rm -fr "${ED}"usr/$(get_libdir)/svn-javahl/*.jar
@@ -366,6 +367,8 @@ EOF
 			java-pkg_dojavadoc doc/javadoc
 		fi
 	fi
+
+	find "${D}" '(' -name '*.la' -o -name '*.a' ')' -print0 | xargs -0 rm -f
 }
 
 pkg_preinst() {