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

(Portage version: 2.2.01.19572-prefix/cvs/Darwin i386)

2 files changed, 27 insertions, 5 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/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
 }