Use get_libname instead of hardcoding .so for shared libraries for Darwin, by nietonfir in bug #388275

Package-Manager: portage-2.2.01.19572-prefix/cvs/Darwin i386

3 files changed, 21 insertions, 7 deletions

diff --git a/dev-vcs/subversion/ChangeLog b/dev-vcs/subversion/ChangeLog
index 2197d21898d0..813e71663d29 100644
--- a/dev-vcs/subversion/ChangeLog
+++ b/dev-vcs/subversion/ChangeLog
@@ -1,6 +1,10 @@
 # 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.66 2011/11/06 16:07:18 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.67 2011/11/30 14:28:49 grobian Exp $
+
+  30 Nov 2011; Fabian Groffen <grobian@gentoo.org> subversion-1.7.1.ebuild:
+  Use get_libname instead of hardcoding .so for shared libraries for Darwin, by
+  nietonfir in bug #388275
 
   06 Nov 2011; Brent Baude <ranger@gentoo.org> subversion-1.6.17-r7.ebuild:
   Marking subversion-1.6.17-r7 ppc for bug 386899
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index b145abaa4a89..c65d665ef47b 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -1,3 +1,6 @@
+-----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.5.4-interix.patch 4375 RMD160 4e10804e8a5ed2a61e66674588a6ccf0f61bba75 SHA1 fd614971d98c21dd4c9794b8f8b3d8c34d8e25d1 SHA256 1cb7dec795921a89e90f792d0176c52239aa3d87064bafbd5af9ded4df981dbe
@@ -17,6 +20,13 @@ EBUILD subversion-1.6.17-r6.ebuild 16778 RMD160 64d5e3ecd40b8c5f64033031b52cadef
 EBUILD subversion-1.6.17-r7.ebuild 16358 RMD160 dd05e74fd30f6941ce9eb4734b9dcade3f9b4303 SHA1 211798f014c2a214404121573c5ee164e3df0082 SHA256 3682243435c6c240d7d7eecb4f339595da9844ffb8cab8be5282088f07081d0f
 EBUILD subversion-1.6.17.ebuild 31726 RMD160 1fadbce9c87e6e752939358da88ca5759915d9d3 SHA1 e5965787a4b125db056b7889a6315601829d6702 SHA256 8d518450171a35ee4b4526ec0fe8e73ff29aa087ae8db978914cf5a9da673b36
 EBUILD subversion-1.7.0.ebuild 14771 RMD160 e8010c248bbf6e07932bb1c558f99a359e816286 SHA1 0d662971c2720cfcf97588078088b8252f89acfd SHA256 aba4e2fb89889c8a15fef5c59e676f346af3d2a068368672f4929d09a3dd53f3
-EBUILD subversion-1.7.1.ebuild 14771 RMD160 ba218bc451048667a5d2123645e14a0620db92dc SHA1 8c8d89a5447a6423b80465229f7199ebaeeee82c SHA256 ee1074b0cbca1dcdf46a4cb766510c54d0e16827738631b00a368199afeaef84
-MISC ChangeLog 82169 RMD160 eef8a39292cf4db33760ed17dcfbaa41727425e6 SHA1 7bc320cbd19d3b535bb4d7c333246871365a775c SHA256 522309efa41b40b199d226abb4f8cafef0f55ac4210fea8d1182a7341bd51b57
+EBUILD subversion-1.7.1.ebuild 14803 RMD160 bd93961c59e135c06a39dfbba98c50f60ae2ac9e SHA1 72bc455988c71690d43ded67bcb902205abcd50b SHA256 764053436db8b25b5130ffe72f946f5c0e9ef6a8036c3cb33bc5d87912b63cf8
+MISC ChangeLog 82354 RMD160 024dff2cadf00dead62238b1522c131cb4e65689 SHA1 4ede652c2678fcfd22ab087d6db0a82b27349dc3 SHA256 27dbc62c39d106473c6c9c60638566fdfdf50ccbd6a09149560468aba49882c1
 MISC metadata.xml 628 RMD160 3443c53b68aab8c4ebe7af9fd0e99170c1c6c736 SHA1 bf7a9a06c9ff7e94569bf7ca70a19161d7b87211 SHA256 ef0b17a03f45da0b6cf376d047aa492cbc8c7ad9ce8a3843fdc5f58a5ee96d61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (Darwin)
+
+iEYEARECAAYFAk7WPaYACgkQX3X2B8XHTolhBQCeL0ZZshxhB4fGKmsmMESHutXk
+S3EAoJ94vYmFvGgbAz7a5+cVRIxuDnUh
+=/B39
+-----END PGP SIGNATURE-----
diff --git a/dev-vcs/subversion/subversion-1.7.1.ebuild b/dev-vcs/subversion/subversion-1.7.1.ebuild
index 5c23b0647235..37fdecd47a69 100644
--- a/dev-vcs/subversion/subversion-1.7.1.ebuild
+++ b/dev-vcs/subversion/subversion-1.7.1.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.7.1.ebuild,v 1.1 2011/10/26 14:31:06 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.1.ebuild,v 1.2 2011/11/30 14:28:49 grobian Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -297,7 +297,7 @@ src_install() {
 
 	if use java; then
 		emake DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed"
-		java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*.so
+		java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*$(get_libname)
 		java-pkg_dojar "${ED}"usr/$(get_libdir)/svn-javahl/svn-javahl.jar
 		rm -fr "${ED}"usr/$(get_libdir)/svn-javahl/*.jar
 	fi
@@ -363,8 +363,8 @@ EOF
 pkg_preinst() {
 	# Compare versions of Berkeley DB, bug 122877.
 	if use berkdb && [[ -f "${EROOT}usr/bin/svn" ]]; then
-		OLD_BDB_VERSION="$(scanelf -nq "${EROOT}usr/$(get_libdir)/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		NEW_BDB_VERSION="$(scanelf -nq "${ED}usr/$(get_libdir)/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+		OLD_BDB_VERSION="$(scanelf -nq "${EROOT}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+		NEW_BDB_VERSION="$(scanelf -nq "${ED}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
 		if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]]; then
 			CHANGED_BDB_VERSION="1"
 		fi