Fix build for Darwin, fix for Prefix, marked ~ppc-macos and ~x64-macos, bug #388231

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

3 files changed, 39 insertions, 7 deletions

diff --git a/dev-scheme/tinyscheme/ChangeLog b/dev-scheme/tinyscheme/ChangeLog
index a769c383851e..e4dce2bc6bc5 100644
--- a/dev-scheme/tinyscheme/ChangeLog
+++ b/dev-scheme/tinyscheme/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-scheme/tinyscheme
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/tinyscheme/ChangeLog,v 1.10 2011/02/28 16:45:17 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/tinyscheme/ChangeLog,v 1.11 2011/11/30 14:51:15 grobian Exp $
+
+  30 Nov 2011; Fabian Groffen <grobian@gentoo.org> tinyscheme-1.40.ebuild:
+  Fix build for Darwin, fix for Prefix, marked ~ppc-macos and ~x64-macos, bug
+  #388231
 
 *tinyscheme-1.40 (28 Feb 2011)
 
diff --git a/dev-scheme/tinyscheme/Manifest b/dev-scheme/tinyscheme/Manifest
index 14bf45a206b9..e73832ea57a4 100644
--- a/dev-scheme/tinyscheme/Manifest
+++ b/dev-scheme/tinyscheme/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST tinyscheme-1.40.tar.gz 60160 RMD160 1eac087a90c2c2e8ca5f4cefbc5660b96491e4b3 SHA1 e03f7ac41f0517bb35eced2772c79eb9db42ea82 SHA256 c594c84633b1dcfe832e0416cbc9f889b6bae352845e14503883119a941a12fc
 DIST tinyscheme1.38.zip 58182 RMD160 1a0630fd6a238e155714478a334ba7d2b4dac7b3 SHA1 e20b81940b92b48b48a3a8ead812e7f0f12ca6ae SHA256 7d716794b9a20624ebb80a2e6b6a288301fc673d47ce6ae4d845aa40d9305803
 DIST tinyscheme1.39.zip 58751 RMD160 d8d365ccceb9482ffd457fd6d4f97c1651e131e9 SHA1 d759bff93683399ee7abbfd1a822d000adb22a0c SHA256 5b53bcacd5f48031c57567a8c76dc20f56db4a8a98ee9d4859556dfd6203ffbd
 EBUILD tinyscheme-1.38-r1.ebuild 1143 RMD160 ad92acb3301edcb950945fe66bbde3090106cf74 SHA1 85ed9ed007af085a6b6b84f552bd582bf93db128 SHA256 88568adf30c78f35e93057073d5bcd0cc8cb845834d8ef2d6a98a6d678c483ce
 EBUILD tinyscheme-1.39-r1.ebuild 1272 RMD160 7ae5042cf63f2c63096e9c59079c9ecd751a8ba7 SHA1 4c0c016d21afc94442ce156425e1f0a1de40ed0d SHA256 c8775e66164c163d93061caebd6d5ad1a1f72088455d1af24780e3a742198708
-EBUILD tinyscheme-1.40.ebuild 1455 RMD160 a33939c324ea0061d2c33dc9abf491c54a545f9a SHA1 d7ab252db2c64da2a854301de3de367375268bc5 SHA256 1292eecdf72a13871fb49a462cb9cd239ed39238e87102ba02b7dd90d3bcf6ec
-MISC ChangeLog 1697 RMD160 6bcfd95f5de3f82860756aafe4d4482263854631 SHA1 43b177cc418dcd30034a8def50018a610961eec6 SHA256 bf45248f5075f3a743778abbe57f0fb27e1dc29a0e27a9209d7c801ff1dff864
+EBUILD tinyscheme-1.40.ebuild 2238 RMD160 13eb5696039649331dbb4caeb68a515a785958a6 SHA1 4fde09b84ed1fc416d9e7d83a512790ebe83a516 SHA256 e07bd4ba8b8cb372e46c87e60d26be3959ed993f69b339a638deac4a921ded6c
+MISC ChangeLog 1863 RMD160 e7b5a0584374feb50dbb64f8fc937250d17f6b85 SHA1 96a3af9f1ee257d3d649f571886d751ad77a9b1b SHA256 d085e975b44a35bf0ace832ec303b4b641a91ff6ebc505e08ba7c6a687d59973
 MISC metadata.xml 785 RMD160 3f4f4e99386c93895d556711f854b5daf86cbead SHA1 1c6a8ca69fd8c5bd030075fad0ec567d3bce4bc8 SHA256 b07e9079f2a52e389b96ef3289273a9728c16701539174f38667cde3edcba8ee
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (Darwin)
+
+iEYEARECAAYFAk7WQugACgkQX3X2B8XHTokIvQCdGDKiPSr2+n4nTLmwUnhnamO7
+PN4AnAjJ9PRzWO+cLzhwjOLAVwWE7JRS
+=Zxsg
+-----END PGP SIGNATURE-----
diff --git a/dev-scheme/tinyscheme/tinyscheme-1.40.ebuild b/dev-scheme/tinyscheme/tinyscheme-1.40.ebuild
index 3b4b46021d43..cb89fe4370c6 100644
--- a/dev-scheme/tinyscheme/tinyscheme-1.40.ebuild
+++ b/dev-scheme/tinyscheme/tinyscheme-1.40.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/tinyscheme/tinyscheme-1.40.ebuild,v 1.1 2011/02/28 16:45:17 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/tinyscheme/tinyscheme-1.40.ebuild,v 1.2 2011/11/30 14:51:15 grobian Exp $
 
 EAPI="3"
 
+inherit flag-o-matic multilib
+
 DESCRIPTION="Lightweight scheme interpreter"
 HOMEPAGE="http://tinyscheme.sourceforge.net"
 SRC_URI="mirror://sourceforge/tinyscheme/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x64-macos"
 IUSE=""
 
 DEPEND=""
@@ -29,12 +31,28 @@ src_prepare() {
 	sed 's/DEBUG=-g -Wno-char-subscripts -O/DEBUG=/' -i makefile
 	sed "s/LD)/& -Wl,-soname,lib${PN}.so.${PV}/" -i makefile
 
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		append-flags -DOSX
+		sed -i \
+			-e 's/SOsuf=so/SOsuf=dylib/' \
+			-e "s|\(\$(LD)\)[^\$]\+\(\$(\)|\1 -Wl,-install_name,${EPREFIX}/usr/lib/lib${PN}.${PV}.dylib \2|" \
+			makefile || die
+	fi
+
 #	diff -u makefile.old makefile
 }
 
 src_install() {
 	newbin scheme ${PN} || die "newbin failed"
-	dolib libtinyscheme.a libtinyscheme.so || die "dolib failed"
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# this should be done for ELF (all other systems) as well, but only
+		# Darwin/MachO is strict in the install_name (soname) actually pointing
+		# somewhere, so we won't change the ELF scheme here (up to maintainer)
+		mv libtinyscheme$(get_libname) libtinyscheme$(get_libname ${PV}) || die
+		ln -s libtinyscheme$(get_libname ${PV}) libtinyscheme$(get_libname) || die
+		dolib libtinyscheme$(get_libname ${PV}) || die "dolib failed"
+	fi
+	dolib libtinyscheme.a libtinyscheme$(get_libname) || die "dolib failed"
 	dodoc Manual.txt || die "dodoc failed"
 
 	# Bug 328967: dev-scheme/tinyscheme-1.39-r1 doesn't install header file
@@ -44,5 +62,5 @@ src_install() {
 	local INIT_DIR=/usr/share/${PN}/
 	insinto ${INIT_DIR}
 	doins init.scm || die "doins failed"
-	dodir /etc/env.d/ && echo "TINYSCHEMEINIT=\"${INIT_DIR}init.scm\"" > "${D}"/etc/env.d/50tinyscheme
+	dodir /etc/env.d/ && echo "TINYSCHEMEINIT=\"${EPREFIX}${INIT_DIR}init.scm\"" > "${ED}"/etc/env.d/50tinyscheme
 }