Fix compilation and installation on Darwin, by Francois Bissey, bug #410493

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

3 files changed, 19 insertions, 13 deletions

diff --git a/sci-libs/ufconfig/ChangeLog b/sci-libs/ufconfig/ChangeLog
index 1a9c96416f80..603792db5f8e 100644
--- a/sci-libs/ufconfig/ChangeLog
+++ b/sci-libs/ufconfig/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/ufconfig
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ufconfig/ChangeLog,v 1.32 2012/01/20 06:01:06 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ufconfig/ChangeLog,v 1.33 2012/04/23 20:24:59 grobian Exp $
+
+  23 Apr 2012; Fabian Groffen <grobian@gentoo.org> ufconfig-3.7.0.ebuild:
+  Fix compilation and installation on Darwin, by Francois Bissey, bug #410493
 
 *ufconfig-3.7.0 (20 Jan 2012)
 
diff --git a/sci-libs/ufconfig/Manifest b/sci-libs/ufconfig/Manifest
index feacbe8f40e1..cdaa9d17794f 100644
--- a/sci-libs/ufconfig/Manifest
+++ b/sci-libs/ufconfig/Manifest
@@ -10,13 +10,13 @@ EBUILD ufconfig-3.1.0.ebuild 700 RMD160 be2ff53eaa13ca3652baac4abd25826c0e8b76de
 EBUILD ufconfig-3.5.0.ebuild 1503 RMD160 48172dbfc40f7a18f195948aac6d5d542a04659c SHA1 7766a7b9a910c3d97f8ebf35b226db426213254e SHA256 a28efc1273ad3cf5a19878164a720b79eb1b5e50f89dc5855b2cebba9b2e7bb5
 EBUILD ufconfig-3.6.0.ebuild 1514 RMD160 e59cc66de3cb87eac0a5133e383659f27f5ebd8a SHA1 8e6c6518da12284be6085cd6b9428534f91cb233 SHA256 1150c3c7f56288d9c9f566b38b7f5b76b4b2d4b9323b9a1e66fe285b7032d592
 EBUILD ufconfig-3.6.1.ebuild 1483 RMD160 e7383dba7f4ba00552a68cfdc988927152931acc SHA1 8850ddeb40458e2a1f5adf7cea35479febb8f6d4 SHA256 b3e24d99d4262b3b5c9e6c52c05df08776889d012df72e1e19ee462517ad24f4
-EBUILD ufconfig-3.7.0.ebuild 1486 RMD160 607665cfc801c12c32779560e75e0d72485bace5 SHA1 210a15607ec17ddbb5b6fbed2da38bb4a2471e20 SHA256 ff4d815d86d191e07b558390e37db66e14c3d994951667984cbb8da24f2d948d
-MISC ChangeLog 3956 RMD160 6cf4ea8f24f65bca6bd6f0ed57a1cebbb04a542c SHA1 ff09297c1715aaadcb4031cd6b35a6bc00b8e2d2 SHA256 64a03a382a9c2662666e1638c7af7425806ffed3be618cf1cde14eddf34a25b4
+EBUILD ufconfig-3.7.0.ebuild 1705 RMD160 1a4544d132e816b528b2d31de3089bdf8463ee04 SHA1 c6afb68c4475cd2d0492dfb45955653c6b809e00 SHA256 1721c2bd551c5c02f602654ee8ca9f2e2297f265bdda9303b6050c2dd336436e
+MISC ChangeLog 4108 RMD160 b2562681111b2424a1e7a8c977adc324510b97b9 SHA1 d43b6a8d025c497cf6a638c5d752032a266af2a6 SHA256 cf54ff16c8147467a83102c915a17c09976b5db595b52d5ad94d5bbe6c6f10e5
 MISC metadata.xml 357 RMD160 6c5abd6065c92c7100b6855bd4b9581126260281 SHA1 3773ddb8796ceeafad88db153f568173c649e315 SHA256 7ab342b6426a3bb0753d04f4b0cd38698edb177dc1f7c369c04c215baa7d564d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (Darwin)
 
-iEYEARECAAYFAk8ZAysACgkQ1ycZbhPLE2CZ1ACgnkYRSFl+scNDyrVg/QUkm5Q2
-K78An3Qj+KALrX6GfdbapMj2CSp4VOVL
-=k44f
+iEYEARECAAYFAk+VusEACgkQX3X2B8XHTokWIgCgnG8A8GO8WKxCvlRphx2HZw1X
+Q/AAniNoPsKglZtwlTlJ4Oz4atqLlUib
+=PHED
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/ufconfig/ufconfig-3.7.0.ebuild b/sci-libs/ufconfig/ufconfig-3.7.0.ebuild
index e7ced18612b4..1ebe012b5027 100644
--- a/sci-libs/ufconfig/ufconfig-3.7.0.ebuild
+++ b/sci-libs/ufconfig/ufconfig-3.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ufconfig/ufconfig-3.7.0.ebuild,v 1.1 2012/01/20 06:01:06 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ufconfig/ufconfig-3.7.0.ebuild,v 1.2 2012/04/23 20:24:59 grobian Exp $
 
 EAPI=4
 inherit multilib toolchain-funcs
@@ -12,7 +12,7 @@ SRC_URI="http://www.cise.ufl.edu/research/sparse/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="static-libs"
 DEPEND=""
 
@@ -21,8 +21,11 @@ S="${WORKDIR}/${MY_PN}"
 src_compile() {
 	echo  "$(tc-getCC) ${CFLAGS} -fPIC -c UFconfig.c -o UFconfig.lo"
 	$(tc-getCC) ${CFLAGS} -fPIC -c UFconfig.c -o UFconfig.lo || die
-	echo "$(tc-getCC) ${LDFLAGS} -shared -Wl,-soname,libufconfig.so.${PV} -o libufconfig.so.${PV} UFconfig.lo"
-	$(tc-getCC) ${LDFLAGS} -shared -Wl,-soname,libufconfig.so.${PV} -o libufconfig.so.${PV} UFconfig.lo || die
+	local sharedlink="-shared -Wl,-soname,libufconfig$(get_libname ${PV})"
+	[[ ${CHOST} == *-darwin* ]] && \
+		sharedlink="-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libufconfig$(get_libname ${PV})"
+	echo "$(tc-getCC) ${LDFLAGS} ${sharedlink} -o libufconfig$(get_libname ${PV}) UFconfig.lo"
+	$(tc-getCC) ${LDFLAGS} ${sharedlink} -o libufconfig$(get_libname ${PV}) UFconfig.lo || die
 	if use static-libs; then
 		echo "$(tc-getCC) ${CFLAGS} -c UFconfig.c -o UFconfig.o"
 		$(tc-getCC) ${CFLAGS} -c UFconfig.c -o UFconfig.o || die
@@ -32,8 +35,8 @@ src_compile() {
 }
 
 src_install() {
-	dolib.so libufconfig.so.${PV}
-	dosym libufconfig.so.${PV} /usr/$(get_libdir)/libufconfig.so
+	dolib.so libufconfig$(get_libname ${PV})
+	dosym libufconfig$(get_libname ${PV}) /usr/$(get_libdir)/libufconfig$(get_libname)
 	use static-libs && dolib.a libufconfig.a
 	insinto /usr/include
 	doins UFconfig.h