Imported prefix changes from overlay

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

5 files changed, 89 insertions, 9 deletions

diff --git a/dev-scheme/scheme48/ChangeLog b/dev-scheme/scheme48/ChangeLog
index f1b7613ab47e..b69ef173e8e8 100644
--- a/dev-scheme/scheme48/ChangeLog
+++ b/dev-scheme/scheme48/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-scheme/scheme48
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scheme48/ChangeLog,v 1.12 2010/08/10 15:43:58 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scheme48/ChangeLog,v 1.13 2010/11/14 16:05:32 jlec Exp $
+
+*scheme48-1.8-r2 (14 Nov 2010)
+
+  14 Nov 2010; Justin Lecher <jlec@gentoo.org> +scheme48-1.8-r2.ebuild:
+  Imported prefix changes from overlay
 
   10 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org>
   scheme48-1.8-r1.ebuild:
diff --git a/dev-scheme/scheme48/scheme48-1.8-r2.ebuild b/dev-scheme/scheme48/scheme48-1.8-r2.ebuild
new file mode 100644
index 000000000000..3a8bbb6c76b5
--- /dev/null
+++ b/dev-scheme/scheme48/scheme48-1.8-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scheme48/scheme48-1.8-r2.ebuild,v 1.1 2010/11/14 16:05:32 jlec Exp $
+
+inherit elisp-common multilib eutils flag-o-matic
+
+DESCRIPTION="Scheme48 is an implementation of the Scheme Programming Language."
+HOMEPAGE="http://www.s48.org/"
+SRC_URI="http://www.s48.org/${PV}/${P}.tgz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="doc emacs"
+
+DEPEND="emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}"
+SITEFILE=50scheme48-gentoo.el
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-as-needed+fix_destdir.patch"
+	sed -i -e "s/\$(LD) /&\$(LFLAGS) /" Makefile.in || die #332007
+}
+
+src_compile() {
+	econf
+	emake LFLAGS="$(raw-ldflags)" || die
+	if use emacs; then
+		elisp-compile "${S}"/emacs/cmuscheme48.el
+	fi
+}
+
+src_install() {
+	# weird parallel failures!
+	emake -j1 DESTDIR="${D}" install || die
+
+	if use emacs; then
+		elisp-install ${PN} emacs/cmuscheme48.el emacs/*.elc
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	dodoc README || die
+	if use doc; then
+		dodoc doc/manual.ps doc/manual.pdf doc/*.txt || die
+		dohtml -r doc/html/* || die
+		docinto src
+		dodoc doc/src/* || die
+	fi
+
+	#this symlink clashes with gambit
+	rm "${ED}"/usr/bin/scheme-r5rs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-scheme/scm/ChangeLog b/dev-scheme/scm/ChangeLog
index 23d23c38f71e..f90f321a967e 100644
--- a/dev-scheme/scm/ChangeLog
+++ b/dev-scheme/scm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-scheme/scm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scm/ChangeLog,v 1.10 2010/04/16 19:17:20 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scm/ChangeLog,v 1.11 2010/11/14 16:10:32 jlec Exp $
+
+  14 Nov 2010; Justin Lecher <jlec@gentoo.org> scm-5.5.6.ebuild:
+  Imported prefix changes from overlay
 
 *scm-5.5.6 (16 Apr 2010)
 
diff --git a/dev-scheme/scm/scm-5.5.6.ebuild b/dev-scheme/scm/scm-5.5.6.ebuild
index c769367ad10e..64fda2de5e8e 100644
--- a/dev-scheme/scm/scm-5.5.6.ebuild
+++ b/dev-scheme/scm/scm-5.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scm/scm-5.5.6.ebuild,v 1.2 2010/04/16 21:23:21 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scm/scm-5.5.6.ebuild,v 1.3 2010/11/14 16:10:32 jlec Exp $
 
 EAPI="2"
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://swiss.csail.mit.edu/~jaffer/SCM"
 
 SLOT="0"
 LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
 IUSE="arrays bignums cautious dynamic-linking engineering-notation gsubr inexact
 ioext macro ncurses posix readline regex sockets unix"
 
@@ -36,7 +36,7 @@ src_prepare() {
 
 src_compile() {
 	# SLIB is required to build SCM.
-	local slibpath="/usr/share/slib/"
+	local slibpath="${EPREFIX}/usr/share/slib/"
 	if [ -n "$SCHEME_LIBRARY_PATH" ]; then
 		einfo "using SLIB $SCHEME_LIBRARY_PATH"
 	elif [ -d ${slibpath} ]; then
@@ -67,8 +67,8 @@ src_compile() {
 
 	./build \
 		--compiler-options="${CFLAGS}" \
-		--linker-options="${LDFLAGS} -L/lib" \
-		-s /usr/lib/scm \
+		--linker-options="${LDFLAGS} -L${EPREFIX}/$(get_libdir)" \
+		-s ${EPREFIX}/usr/$(get_libdir)/scm \
 		-F ${features:="none"} \
 		-h system \
 		-o scm || die
diff --git a/dev-scheme/slib/Manifest b/dev-scheme/slib/Manifest
index 714d8b109afa..b334acd8e112 100644
--- a/dev-scheme/slib/Manifest
+++ b/dev-scheme/slib/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST slib-3b1.zip 1063227 RMD160 225d2226d0c3eb18f8cb154c5d1adea413f59b92 SHA1 e3342e4cb1e728bb3133449654b10b538ed8b043 SHA256 8e3ec24d51be03ebb7357ad9a2f3554056b86dafbc9e48d1d491aeda1efa566f
 DIST slib-3b2.zip 1067021 RMD160 6c298783def3d0dc2d9d7511ee890305922524d9 SHA1 28be8ef62f3bf53eb52f06c113b15fe8de099bdb SHA256 b1cb9c1b7c888e32918ebdd8fca80d9c875024b064bc6989e4700905873bcae8
 DIST slib3a5.zip 1055491 RMD160 1d0e487bde6ecbd4aaa878b56abb25086bbc36aa SHA1 d041f174ee1b4492c69e02da2c2cb4c5320ab80c SHA256 3c4fbfc08de9220f456ed1cd58ca0fb49b4a8cdd4d03697fbea11d9407a16e30
 EBUILD slib-3.1.5-r1.ebuild 4042 RMD160 7961d6f9faf55c3cb5d5b54d83ea95af7e4c61ea SHA1 60bef300e4dbdedbd9c03b612d4cf2e9578f19c3 SHA256 bc3cfda8f33579b2f70cb30e672a9d9a4ed47bcea168cfe9d066646c208c5cae
 EBUILD slib-3.2.1.ebuild 3970 RMD160 355e5c33218711c51c10d9358962525379ae02a6 SHA1 6f60af1c234faafac8b16a5f2b7594fcc812bc55 SHA256 8a4793f54648043a701197ca9be859251fde5aedaca6c62c8641230791acaa82
-EBUILD slib-3.2.2.ebuild 3714 RMD160 d9fb63651dc97c67cb7fd5aec6401897bd75ca4e SHA1 89c1d174a365eff4918e83bd75e9cbe5966e0e54 SHA256 f13331241fb0b3b675758ccfb8a16b4daa05b72a2969a192eb606311447a254a
-MISC ChangeLog 8435 RMD160 5a6c5915329534a3691bba9a7c328d98825052da SHA1 17a060f9ab429a1009dc5ff67fa1899ab3730c19 SHA256 0c3e2ea0812d5b78b49adefe9f691a55070dc2d6aee20ba07dea415b56e6b543
+EBUILD slib-3.2.2.ebuild 3847 RMD160 760784bcd41aa7512ed837a5e32d154654ce1cf2 SHA1 086bdb583a3d8e7672541aca4786018090c376ad SHA256 d3debf84046a6eec6339e6cd833e4ad14db7ed62298d77cccc048826655d1942
+MISC ChangeLog 8526 RMD160 598f77aeb113c9b61757fa4a20397906507739d0 SHA1 a0a41b57206b25afc23a4d7c91237ca559751ef3 SHA256 98b62d3a60b52918035217b3401576e058a802df065fb279b6bb590866b8f7a8
 MISC metadata.xml 398 RMD160 7fabdfdd6bbeac709b9571c0835ec15e588597b3 SHA1 c51deac0a50261fa887a2e2e9e2d35af40605496 SHA256 9f2719a4fba8cfe3430d7dbd7638dab8ab3b9dbbe20a1364544dc35ea5f8d75a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzgClEACgkQgAnW8HDreRaNTACgt/uLYNmu2UYsSv5U3e2pxrJ2
+ECsAoLCMjN5xof+R0OlK+M78JdXwSlKw
+=NCTF
+-----END PGP SIGNATURE-----