| 1 |
vadimk 09/03/28 22:24:01 |
| 2 |
|
| 3 |
Modified: scsh-0.6.7.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Bug 234691. Using multilib_toolchain_setup to enable amd64. |
| 6 |
(Portage version: 2.2_rc27/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.7 app-shells/scsh/scsh-0.6.7.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/scsh/scsh-0.6.7.ebuild?rev=1.7&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/scsh/scsh-0.6.7.ebuild?rev=1.7&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/scsh/scsh-0.6.7.ebuild?r1=1.6&r2=1.7 |
| 14 |
|
| 15 |
Index: scsh-0.6.7.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/app-shells/scsh/scsh-0.6.7.ebuild,v |
| 18 |
retrieving revision 1.6 |
| 19 |
retrieving revision 1.7 |
| 20 |
diff -u -r1.6 -r1.7 |
| 21 |
--- scsh-0.6.7.ebuild 3 Aug 2008 16:10:31 -0000 1.6 |
| 22 |
+++ scsh-0.6.7.ebuild 28 Mar 2009 22:24:00 -0000 1.7 |
| 23 |
@@ -1,45 +1,42 @@ |
| 24 |
-# Copyright 1999-2008 Gentoo Foundation |
| 25 |
+# Copyright 1999-2009 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-shells/scsh/scsh-0.6.7.ebuild,v 1.6 2008/08/03 16:10:31 pchrist Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-shells/scsh/scsh-0.6.7.ebuild,v 1.7 2009/03/28 22:24:00 vadimk Exp $ |
| 29 |
|
| 30 |
-inherit eutils scsh |
| 31 |
+EAPI="2" |
| 32 |
|
| 33 |
-MV="${PV%*.*}" |
| 34 |
+inherit eutils multilib |
| 35 |
+ |
| 36 |
+MY_PV="${PV%*.*}" |
| 37 |
|
| 38 |
DESCRIPTION="Unix shell embedded in Scheme" |
| 39 |
HOMEPAGE="http://www.scsh.net/" |
| 40 |
-SRC_URI="ftp://ftp.scsh.net/pub/scsh/${MV}/${P}.tar.gz" |
| 41 |
+SRC_URI="ftp://ftp.scsh.net/pub/scsh/${MY_PV}/${P}.tar.gz" |
| 42 |
+ |
| 43 |
LICENSE="as-is BSD" |
| 44 |
SLOT="0" |
| 45 |
-KEYWORDS="-amd64 ppc sparc x86" |
| 46 |
+KEYWORDS="~amd64 ppc sparc x86" |
| 47 |
IUSE="" |
| 48 |
|
| 49 |
-DEPEND="" |
| 50 |
+DEPEND="!dev-scheme/scheme48" |
| 51 |
+RDEPEND="${DEPEND}" |
| 52 |
|
| 53 |
-src_unpack() { |
| 54 |
- # SCSH_LIB_DIRS='$SCSH_SCSH_PATH' |
| 55 |
- set_layout |
| 56 |
- set_path_variables |
| 57 |
- unpack ${A} |
| 58 |
- cd "${S}" |
| 59 |
- if ! use scsh; then |
| 60 |
- epatch "${FILESDIR}/${PV}-Makefile.in-doc-dir-gentoo.patch" || die |
| 61 |
- fi |
| 62 |
+src_prepare() { |
| 63 |
+ epatch "${FILESDIR}/${PV}-Makefile.in-doc-dir-gentoo.patch" |
| 64 |
} |
| 65 |
|
| 66 |
-src_compile() { |
| 67 |
- scsh_conf="--prefix=/usr |
| 68 |
- --libdir=/usr/$(get_libdir) |
| 69 |
- --includedir=/usr/include |
| 70 |
- --with-lib-dirs-list=$(scsh_scsh_path)" |
| 71 |
- econf "${scsh_conf}" || die |
| 72 |
- emake || die |
| 73 |
+src_configure() { |
| 74 |
+ use amd64 && multilib_toolchain_setup x86 |
| 75 |
+ SCSH_LIB_DIRS="/usr/$(get_libdir)/${PN}" |
| 76 |
+ econf \ |
| 77 |
+ --libdir=/usr/$(get_libdir) \ |
| 78 |
+ --includedir=/usr/include \ |
| 79 |
+ --with-lib-dirs-list=${SCSH_LIB_DIRS} |
| 80 |
} |
| 81 |
|
| 82 |
src_install() { |
| 83 |
- make DESTDIR="${D}" install || die |
| 84 |
- dodir /etc/env.d |
| 85 |
- cat >"${D}/etc/env.d/50scsh" <<EOF |
| 86 |
-SCSH_LIB_DIRS='${SCSH_LIB_DIRS}' |
| 87 |
-EOF |
| 88 |
+ emake -j1 DESTDIR="${D}" install || die "make install failed." |
| 89 |
+ |
| 90 |
+ local ENVD="${T}/50scsh" |
| 91 |
+ echo "SCSH_LIB_DIRS=\"${SCSH_LIB_DIRS}\"" > "${ENVD}" |
| 92 |
+ doenvd "${ENVD}" |
| 93 |
} |
| 94 |
|
| 95 |
|
| 96 |
|
| 97 |
1.29 app-shells/scsh/ChangeLog |
| 98 |
|
| 99 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/scsh/ChangeLog?rev=1.29&view=markup |
| 100 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/scsh/ChangeLog?rev=1.29&content-type=text/plain |
| 101 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/scsh/ChangeLog?r1=1.28&r2=1.29 |
| 102 |
|
| 103 |
Index: ChangeLog |
| 104 |
=================================================================== |
| 105 |
RCS file: /var/cvsroot/gentoo-x86/app-shells/scsh/ChangeLog,v |
| 106 |
retrieving revision 1.28 |
| 107 |
retrieving revision 1.29 |
| 108 |
diff -u -r1.28 -r1.29 |
| 109 |
--- ChangeLog 3 Aug 2008 16:10:31 -0000 1.28 |
| 110 |
+++ ChangeLog 28 Mar 2009 22:24:00 -0000 1.29 |
| 111 |
@@ -1,6 +1,9 @@ |
| 112 |
# ChangeLog for app-shells/scsh |
| 113 |
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 114 |
-# $Header: /var/cvsroot/gentoo-x86/app-shells/scsh/ChangeLog,v 1.28 2008/08/03 16:10:31 pchrist Exp $ |
| 115 |
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 116 |
+# $Header: /var/cvsroot/gentoo-x86/app-shells/scsh/ChangeLog,v 1.29 2009/03/28 22:24:00 vadimk Exp $ |
| 117 |
+ |
| 118 |
+ 28 Mar 2009; Vadim Kuznetsov vadimk@g.o scsh-0.6.7.ebuild: |
| 119 |
+ Bug 234691. Using multilib_toolchain_setup to enable amd64 |
| 120 |
|
| 121 |
03 Aug 2008; Panagiotis Christopoulos <pchrist@g.o> |
| 122 |
scsh-0.6.6.ebuild, scsh-0.6.7.ebuild: |
Archives