Stop static libraries from being built entirely, instead of deleting them after the fact as suggested by Rafał "galtgendo" Mużyło in bug #380891. Removed old ebuild.

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

3 files changed, 43 insertions, 25 deletions

diff --git a/dev-vcs/subversion/ChangeLog b/dev-vcs/subversion/ChangeLog
index 1d31f8d1cb3b..d1d18ce0be33 100644
--- a/dev-vcs/subversion/ChangeLog
+++ b/dev-vcs/subversion/ChangeLog
@@ -1,6 +1,14 @@
 # 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.54 2011/08/27 11:19:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.55 2011/08/30 11:19:41 chainsaw Exp $
+
+*subversion-1.6.17-r5 (30 Aug 2011)
+
+  30 Aug 2011; Tony Vroon <chainsaw@gentoo.org> -subversion-1.6.17-r3.ebuild,
+  +subversion-1.6.17-r5.ebuild:
+  Stop static libraries from being built entirely, instead of deleting them
+  after the fact as suggested by Rafał "galtgendo" Mużyło in bug #380891.
+  Removed old ebuild.
 
   27 Aug 2011; Raúl Porcel <armin76@gentoo.org> subversion-1.6.17.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #369065
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index a1c097b97d08..9fa139e44e72 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -15,15 +15,15 @@ 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-r3.ebuild 15724 RMD160 73203087957b369a94065a009e42e44080b3aaae SHA1 5c1251a4e2036b26ea997b0eac50e11e5b53fdd0 SHA256 f4be56bcf98c467e97a085ff9e1c4a1eaa09f2095710b4a97387b2f5c7acb7c9
 EBUILD subversion-1.6.17-r4.ebuild 15936 RMD160 644dbaa1eb80eab3001675a27ba94734642913bd SHA1 eebe7e972a16a090cd09fac9aa087e736cf58389 SHA256 c2f70bc6fc5600a0ac8ff069ed5210f869a8a08aa31230f373e59eea847b94f4
+EBUILD subversion-1.6.17-r5.ebuild 15942 RMD160 c25bbe88934a03c487247a6a9ad15f447a844856 SHA1 17f7b9d7e0d7238a867933bb33b293a5fd59c426 SHA256 1a2d97681442ad6620c53ad8dd4dbb186cbca97cefb845b3314bbdc35dc12252
 EBUILD subversion-1.6.17.ebuild 31726 RMD160 1fadbce9c87e6e752939358da88ca5759915d9d3 SHA1 e5965787a4b125db056b7889a6315601829d6702 SHA256 8d518450171a35ee4b4526ec0fe8e73ff29aa087ae8db978914cf5a9da673b36
-MISC ChangeLog 79574 RMD160 fc74aec9d659caeba946792f966b945c6216310b SHA1 90828b6984ad3d87b0a858d58f7087525fa8b4e9 SHA256 0c3296e8874cfc637082e1ab5fcbc01d94968881ebea5ecd6911ac74ddcf6262
+MISC ChangeLog 79898 RMD160 e64248c701394a932f11b5eb71db108d43c35d9a SHA1 803af8d9fb2770193b6eb3513bd682a60eec1736 SHA256 a2e7b4f54f313974fbe598ff2b330b3eaecce72c0ec6ae991a534fb5fd1e256a
 MISC metadata.xml 650 RMD160 17a1bcef59b035ceeb456ff3bcff9f121db2cc5e SHA1 677d1e573840f9f634abfa39dbce0dc4f11e4ee8 SHA256 ca7082ab0d3917e015b6532500bd31ef236513c3ad30782462823c947df1afdb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5Y0scACgkQuQc30/atMkCBOQCgsWR8xOHPFVChfu8hY+2N/v+Q
-ksQAnjFi8DSNidmGbxAd5s+tL6F6yS9j
-=zimE
+iEYEARECAAYFAk5cx1YACgkQp5vW4rUFj5qFOgCdE64eiGSfo+Hhpecn48MRwYCO
+O10AoK+RJjURdpx0WpnUDlpu1COydR7J
+=Bjrc
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/subversion/subversion-1.6.17-r3.ebuild b/dev-vcs/subversion/subversion-1.6.17-r5.ebuild
index a9d977e08715..847bb8d0bd73 100644
--- a/dev-vcs/subversion/subversion-1.6.17-r3.ebuild
+++ b/dev-vcs/subversion/subversion-1.6.17-r5.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-r3.ebuild,v 1.2 2011/08/23 08:12:07 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.6.17-r5.ebuild,v 1.1 2011/08/30 11:19:41 chainsaw Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -62,15 +62,22 @@ want_apache
 
 pkg_setup() {
 	if use berkdb; then
+		local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
+			| grep -Eoe '-I${EPREFIX}/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}."
@@ -159,6 +166,7 @@ src_configure() {
 		--enable-local-library-preloading \
 		--disable-mod-activation \
 		--disable-neon-version-check \
+		--disable-static \
 		--with-sqlite="${EPREFIX}/usr"
 }
 
@@ -199,7 +207,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 +255,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" \
@@ -265,17 +273,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"
+		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
@@ -361,7 +369,7 @@ EOF
 		fi
 	fi
 
-	find "${D}" '(' -name '*.la' -o -name '*.a' ')' -print0 | xargs -0 rm -f
+	find "${D}" '(' -name '*.la' ')' -print0 | xargs -0 rm -f
 }
 
 pkg_preinst() {
@@ -421,16 +429,18 @@ pkg_postrm() {
 }
 
 pkg_config() {
-	einfo "Initializing the database in ${EROOT}${SVN_REPOS_LOC}..."
-	if [[ -e "${EROOT}${SVN_REPOS_LOC}/repos" ]]; then
+	# Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
+	# already has EPREFIX in it
+	einfo "Initializing the database in ${ROOT}${SVN_REPOS_LOC}..."
+	if [[ -e "${ROOT}${SVN_REPOS_LOC}/repos" ]]; then
 		echo "A Subversion repository already exists and I will not overwrite it."
-		echo "Delete \"${EROOT}${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
+		echo "Delete \"${ROOT}${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
 	else
-		mkdir -p "${EROOT}${SVN_REPOS_LOC}/conf"
+		mkdir -p "${ROOT}${SVN_REPOS_LOC}/conf"
 
 		einfo "Populating repository directory..."
 		# Create initial repository.
-		"${EROOT}usr/bin/svnadmin" create "${EROOT}${SVN_REPOS_LOC}/repos"
+		"${EROOT}usr/bin/svnadmin" create "${ROOT}${SVN_REPOS_LOC}/repos"
 
 		einfo "Setting repository permissions..."
 		SVNSERVE_USER="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
@@ -444,8 +454,8 @@ pkg_config() {
 			enewgroup "${SVNSERVE_GROUP}"
 			enewuser "${SVNSERVE_USER}" -1 -1 "${SVN_REPOS_LOC}" "${SVNSERVE_GROUP}"
 		fi
-		chown -Rf "${SVNSERVE_USER}:${SVNSERVE_GROUP}" "${EROOT}${SVN_REPOS_LOC}/repos"
-		chmod -Rf go-rwx "${EROOT}${SVN_REPOS_LOC}/conf"
-		chmod -Rf o-rwx "${EROOT}${SVN_REPOS_LOC}/repos"
+		chown -Rf "${SVNSERVE_USER}:${SVNSERVE_GROUP}" "${ROOT}${SVN_REPOS_LOC}/repos"
+		chmod -Rf go-rwx "${ROOT}${SVN_REPOS_LOC}/conf"
+		chmod -Rf o-rwx "${ROOT}${SVN_REPOS_LOC}/repos"
 	fi
 }