Bug 234691. Using multilib_toolchain_setup to enable amd64.

Package-Manager: portage-2.2_rc27/cvs/Linux x86_64

3 files changed, 33 insertions, 33 deletions

diff --git a/app-shells/scsh/ChangeLog b/app-shells/scsh/ChangeLog
index b83ecf8f0fbe..6593c34a0a89 100644
--- a/app-shells/scsh/ChangeLog
+++ b/app-shells/scsh/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-shells/scsh
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/scsh/ChangeLog,v 1.28 2008/08/03 16:10:31 pchrist Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/scsh/ChangeLog,v 1.29 2009/03/28 22:24:00 vadimk Exp $
+
+  28 Mar 2009; Vadim Kuznetsov vadimk@gentoo.org scsh-0.6.7.ebuild:
+  Bug 234691. Using multilib_toolchain_setup to enable amd64
 
   03 Aug 2008; Panagiotis Christopoulos <pchrist@gentoo.org>
   scsh-0.6.6.ebuild, scsh-0.6.7.ebuild:
diff --git a/app-shells/scsh/Manifest b/app-shells/scsh/Manifest
index 232dee45eb5d..8f93e2c56c17 100644
--- a/app-shells/scsh/Manifest
+++ b/app-shells/scsh/Manifest
@@ -3,6 +3,6 @@ AUX 0.6.7-Makefile.in-doc-dir-gentoo.patch 4096 RMD160 39b7eccdb62d98a26f25af9b0
 DIST scsh-0.6.6.tar.gz 4332223 RMD160 f81f7bb60d97035c61912092c2b16eebe953b999 SHA1 5d38ec103e1cb885e634bb3475e8912ac892067b SHA256 3cc162ce6e0ac3905d71a1f45b612bbb92f2df55b1a4c4c5736624777350f5bb
 DIST scsh-0.6.7.tar.gz 4367439 RMD160 f017c5a157cd1a3ad5daeaecba43ce84784c7e51 SHA1 a1eaf0d0593e14914824898a0c3ec166429affd7 SHA256 c4a9f7df2a0bb7a7aa3dafc918aa9e9a566d4ad33a55f0192889de172d1ddb7f
 EBUILD scsh-0.6.6.ebuild 1003 RMD160 6e0118d553b694d62ddca06fe55c5cc165818bdb SHA1 8cca20afcf73b3698eeea52f4985325ba9d281be SHA256 bce8fcb18c6aae242a566b49ab63c454a5074ec5835bd88a1fdb0c4a859e83e4
-EBUILD scsh-0.6.7.ebuild 1003 RMD160 7f94286431deae5d4c0f406b7baffa2d5f80636a SHA1 9977ba0032e114c789f85459901c00e2a2c08947 SHA256 43fe64ffb98728d3a81c219022d98dfdaf24b3692bf44e2fe3cc4cdce8db2d82
-MISC ChangeLog 3931 RMD160 f38d910cbb05c04e170be38266d708c4452bde16 SHA1 eaa8aed6124108826b8c589df8f807e896f40515 SHA256 caf812e2c43a30b5e5b7dab01853ca56731111ec52115f27d8a36ff893cd2ef3
+EBUILD scsh-0.6.7.ebuild 1006 RMD160 1d779543235fc954678763294acf5283a00498ca SHA1 721adbc2dd581cd09e20e1162f17191e09fb689f SHA256 4e5d1b1caab8ea566984538085138195c51034a788fcd8ca7ca609a4946d33b0
+MISC ChangeLog 4060 RMD160 a332180ccc02dd36032bd6b734f26661ce3c3cf6 SHA1 9f071a3ed627137cc3d2fbc11d43d69e2cef0b7e SHA256 bc47b42762d36bdb2bfbb15758c256ae30844f636f0bd9cf43e711f820869a9b
 MISC metadata.xml 962 RMD160 1048bd9ca6ce3f6e41e75f6f651a517603d21ff1 SHA1 e947087245a5a7c455097feed94053e2ecadddd6 SHA256 b03fa9f93563cf5208ff3a29a336c54fdbc00cc177641cc83c35a7404fea16b4
diff --git a/app-shells/scsh/scsh-0.6.7.ebuild b/app-shells/scsh/scsh-0.6.7.ebuild
index 375238e97de4..e37fa22845e4 100644
--- a/app-shells/scsh/scsh-0.6.7.ebuild
+++ b/app-shells/scsh/scsh-0.6.7.ebuild
@@ -1,45 +1,42 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/scsh/scsh-0.6.7.ebuild,v 1.6 2008/08/03 16:10:31 pchrist Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/scsh/scsh-0.6.7.ebuild,v 1.7 2009/03/28 22:24:00 vadimk Exp $
 
-inherit eutils scsh
+EAPI="2"
 
-MV="${PV%*.*}"
+inherit eutils multilib
+
+MY_PV="${PV%*.*}"
 
 DESCRIPTION="Unix shell embedded in Scheme"
 HOMEPAGE="http://www.scsh.net/"
-SRC_URI="ftp://ftp.scsh.net/pub/scsh/${MV}/${P}.tar.gz"
+SRC_URI="ftp://ftp.scsh.net/pub/scsh/${MY_PV}/${P}.tar.gz"
+
 LICENSE="as-is BSD"
 SLOT="0"
-KEYWORDS="-amd64 ppc sparc x86"
+KEYWORDS="~amd64 ppc sparc x86"
 IUSE=""
 
-DEPEND=""
-
-src_unpack() {
-	# SCSH_LIB_DIRS='$SCSH_SCSH_PATH'
-	set_layout
-	set_path_variables
-	unpack ${A}
-	cd "${S}"
-	if ! use scsh; then
-		epatch "${FILESDIR}/${PV}-Makefile.in-doc-dir-gentoo.patch" || die
-	fi
+DEPEND="!dev-scheme/scheme48"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-Makefile.in-doc-dir-gentoo.patch"
 }
 
-src_compile() {
-	scsh_conf="--prefix=/usr
-		--libdir=/usr/$(get_libdir)
-		--includedir=/usr/include
-		--with-lib-dirs-list=$(scsh_scsh_path)"
-	econf "${scsh_conf}" || die
-	emake || die
+src_configure() {
+	use amd64 && multilib_toolchain_setup x86
+	SCSH_LIB_DIRS="/usr/$(get_libdir)/${PN}"
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--includedir=/usr/include \
+		--with-lib-dirs-list=${SCSH_LIB_DIRS}
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
-	dodir /etc/env.d
-	cat >"${D}/etc/env.d/50scsh" <<EOF
-SCSH_LIB_DIRS='${SCSH_LIB_DIRS}'
-EOF
+	emake -j1 DESTDIR="${D}" install || die "make install failed."
+
+	local ENVD="${T}/50scsh"
+	echo "SCSH_LIB_DIRS=\"${SCSH_LIB_DIRS}\"" > "${ENVD}"
+	doenvd "${ENVD}"
 }