Bug 234691. Using multilib_toolchain_setup to enable amd64.

(Portage version: 2.2_rc27/cvs/Linux x86_64)

2 files changed, 31 insertions, 31 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/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}"
 }