Rewrite lib paths in src_unpack(); Resolves Bug #127105; Use multilib instead of hardcoding /usr/lib.

Package-Manager: portage-2.1_pre6-r5

4 files changed, 99 insertions, 10 deletions

diff --git a/dev-scheme/scheme48/ChangeLog b/dev-scheme/scheme48/ChangeLog
index 59afdc48f115..1cc1b0027495 100644
--- a/dev-scheme/scheme48/ChangeLog
+++ b/dev-scheme/scheme48/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-scheme/scheme48
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scheme48/ChangeLog,v 1.1 2005/09/06 21:46:17 araujo Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scheme48/ChangeLog,v 1.2 2006/03/22 06:04:55 mkennedy Exp $
+
+*scheme48-1.3-r1 (22 Mar 2006)
+
+  22 Mar 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  +scheme48-1.3-r1.ebuild:
+  Rewrite lib paths in src_unpack(); Resolves Bug #127105; Use multilib
+  instead of hardcoding /usr/lib.
 
 *scheme48-1.3 (06 Sep 2005)
 
diff --git a/dev-scheme/scheme48/Manifest b/dev-scheme/scheme48/Manifest
index 70dbdb85e266..4130c5e74ad4 100644
--- a/dev-scheme/scheme48/Manifest
+++ b/dev-scheme/scheme48/Manifest
@@ -1,15 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a5fa3d26bdf7fc67b4d372a6c4c7ba03 scheme48-1.3.ebuild 1477
-MD5 3ced4838ea1f70eee5d0d0f0e14b18b1 metadata.xml 532
-MD5 62abba4ea4abfc67bf8a42af61e8af60 ChangeLog 389
-MD5 2581231c4cfe40f47b763109ff22dd73 files/digest-scheme48-1.3 62
+MD5 eecdf482a0e7917958e98b96dbf03289 ChangeLog 610
+RMD160 f6ddfd93a8964e4904237c14f14f78604995ba9c ChangeLog 610
+SHA256 0da2ea2d351f3b0d2102ce0a1f828fab789901694c33fbcd8eee527c3fecbc96 ChangeLog 610
 MD5 75e4b8751b0c3e96501efc5218e39523 files/50scheme48-gentoo.el 198
+RMD160 27ce388121bb1927b4c647d8ceffa71faf0e00e6 files/50scheme48-gentoo.el 198
+SHA256 6aaa0729ea2383855c6d3c6e254b0656ad03fdd97e5ea80de99a04e7c0585024 files/50scheme48-gentoo.el 198
+MD5 2581231c4cfe40f47b763109ff22dd73 files/digest-scheme48-1.3 62
+RMD160 37dc5bb3545e9b1c6cb34fbfcb5255ef88e1be5c files/digest-scheme48-1.3 62
+SHA256 26f0ec22941af152bc72e4d0f50c913870d860acc3240e22b80855f882a3101b files/digest-scheme48-1.3 62
+MD5 caded5191014bbaba8002bdd5dacd1dd files/digest-scheme48-1.3-r1 232
+RMD160 213a8d0d6effe991702de670bdb3e3f178e6fa39 files/digest-scheme48-1.3-r1 232
+SHA256 665bd9994692ba9250316622b10355c27461f090976db6ef81f05a2133936d5f files/digest-scheme48-1.3-r1 232
+MD5 3ced4838ea1f70eee5d0d0f0e14b18b1 metadata.xml 532
+RMD160 130ae0288c47f06e72ae2225c8fc08e32b0ce428 metadata.xml 532
+SHA256 58724fd8ef37b1b7edfca3d69536c1302ecafb00240112a3f442ea1a017819ab metadata.xml 532
+MD5 81e5a6d764f7cee7e969778495a209e9 scheme48-1.3-r1.ebuild 1712
+RMD160 f5c6a6498c8d7c93a87ca5579b1ece93059224af scheme48-1.3-r1.ebuild 1712
+SHA256 dd15a7abac963d2f37b07c4785488306774525ead45c753aa320e79c73f4185a scheme48-1.3-r1.ebuild 1712
+MD5 a5fa3d26bdf7fc67b4d372a6c4c7ba03 scheme48-1.3.ebuild 1477
+RMD160 609d756c2e10c4bc8fbae196847ef6b3779d46d9 scheme48-1.3.ebuild 1477
+SHA256 1c71698ee0a6f4af0d49d08da6f8de69f4a8f35952a9ab923fc41fb8d752b4b7 scheme48-1.3.ebuild 1477
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFDHg5JBQBy/eDH5uERAvXpAJ9XYlI5l7KRaYMllAhiQvgxqf1CjACfTSSr
-uEcd8N40DEgvssMbWlX9U10=
-=uRZt
+iD8DBQFEIOkTyiNZaEAZA+ARAih6AJ46DipPvp33i4YWO+yElGHYb9yEFgCfReNy
+Z8G6HvY3d4p9KG1acvRZh6k=
+=IiBr
 -----END PGP SIGNATURE-----
diff --git a/dev-scheme/scheme48/files/digest-scheme48-1.3-r1 b/dev-scheme/scheme48/files/digest-scheme48-1.3-r1
new file mode 100644
index 000000000000..56f736aa0b02
--- /dev/null
+++ b/dev-scheme/scheme48/files/digest-scheme48-1.3-r1
@@ -0,0 +1,3 @@
+MD5 c436e4c7ba0820e591458804eb8aec5a scheme48-1.3.tgz 2322178
+RMD160 25cbf7ddda946ffe114264c3cb4818817eeeb440 scheme48-1.3.tgz 2322178
+SHA256 50d2c540bced74c6015abca3978ba4f65e97d14c78eba1fa8488b3a5c064883b scheme48-1.3.tgz 2322178
diff --git a/dev-scheme/scheme48/scheme48-1.3-r1.ebuild b/dev-scheme/scheme48/scheme48-1.3-r1.ebuild
new file mode 100644
index 000000000000..403eae3484ce
--- /dev/null
+++ b/dev-scheme/scheme48/scheme48-1.3-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scheme48/scheme48-1.3-r1.ebuild,v 1.1 2006/03/22 06:04:55 mkennedy Exp $
+
+inherit elisp-common multilib
+
+DESCRIPTION="Scheme48 is an implementation of the Scheme Programming Language."
+HOMEPAGE="http://www.s48.org/"
+SRC_URI="http://www.s48.org/1.3/${P}.tgz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="doc emacs"
+
+DEPEND="virtual/libc"
+RDEPEND=""
+SITEFILE=50scheme48-gentoo.el
+
+src_unpack() {
+	unpack ${A}
+	sed -i "s:\`pwd\`:/usr/$(get_libdir)/scheme48:" ${S}/Makefile.in
+	sed -i "s:lib=\$(LIB):lib=/usr/$(get_libdir)/scheme48:" ${S}/Makefile.in
+	# Set the correct values for the paths show by the man pages
+	sed -i "s:=\$(bindir)=:=/usr/bin/=:" ${S}/Makefile.in
+	sed -i "s:=\$(LIB)=:=/usr/$(get_libdir)/scheme48=:" ${S}/Makefile.in
+	# From Bug #127105
+	sed -i 's:`(cd $(srcdir) && echo $$PWD)`/scheme:'"/usr/$(get_libdir)/scheme48/:" ${S}/Makefile.in
+	sed -i "s:'\$(LIB)':'/usr/$(get_libdir)/\$(RUNNABLE)':" ${S}/Makefile.in
+}
+
+src_compile() {
+	econf || die "econf failed"
+	emake || die "emake failed"
+	if use emacs; then
+		elisp-compile ${S}/emacs/cmuscheme48.el
+	fi
+}
+
+src_install() {
+	make prefix=${D}/usr \
+		mandir=${D}/usr/share/man/man1 \
+		install || die "make failed"
+	if use emacs; then
+		elisp-install ${PN} emacs/cmuscheme48.el emacs/*.elc
+		elisp-site-file-install ${FILESDIR}/${SITEFILE}
+	fi
+	dodoc README INSTALL
+	if use doc; then
+		dodoc doc/manual.ps doc/manual.pdf doc/*.txt
+		dohtml -r doc/html/*
+		docinto src
+		dodoc doc/src/*
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}