fix ancient ecls ebuilds, bug 156182

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r4 i686

3 files changed, 33 insertions, 44 deletions

diff --git a/dev-lisp/ecls/ChangeLog b/dev-lisp/ecls/ChangeLog
index 1eca91b83f59..b3264ab0f418 100644
--- a/dev-lisp/ecls/ChangeLog
+++ b/dev-lisp/ecls/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lisp/ecls
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ChangeLog,v 1.26 2008/01/11 14:50:18 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ChangeLog,v 1.27 2008/07/13 18:51:40 pchrist Exp $
+
+  13 Jul 2008; Panagiotis Christopoulos <pchrist@gentoo.org>
+  ecls-0.9i.ebuild:
+  fix ancient ecls ebuilds, bug 156182
 
 *ecls-0.9j_p1 (11 Jan 2008)
 
diff --git a/dev-lisp/ecls/Manifest b/dev-lisp/ecls/Manifest
index a5b8d2361cda..080159ac5ae6 100644
--- a/dev-lisp/ecls/Manifest
+++ b/dev-lisp/ecls/Manifest
@@ -11,7 +11,7 @@ DIST ecl-0.9j-p1.tgz 4972867 RMD160 5281a50c202f76023b415db2d5227e88fe24afb8 SHA
 EBUILD ecls-0.9g.ebuild 1511 RMD160 94b1ebed646695f0b957fef461e063cc9e97b5a6 SHA1 8cf51eed42f991ce29d4764f9317b117fad39827 SHA256 48929073466dbb4b9eef24d97ff32a55b8627138f21e78ac377a13cfdbe43e3c
 EBUILD ecls-0.9h-r1.ebuild 1604 RMD160 e00123888b74cc84ba1e4685544902bae17932a6 SHA1 1624b589cf3494cb9a757520874b17143c187787 SHA256 7b71e79ae5265cd2c378db865299452b0583346ad990dbc1610cc1dbb54e8850
 EBUILD ecls-0.9h.ebuild 1509 RMD160 eff06fc2da39da349b984b3644b4ee2b197f0a33 SHA1 79040a0e7ce6d1d4518d0c8d33594309bf40bde8 SHA256 e9f9fbf14280eaef6d56c834682ad595dd6ab1a595cf9b3033835d954708b66f
-EBUILD ecls-0.9i.ebuild 1736 RMD160 1c738138d217044f24665c324d88b7775dedad7c SHA1 6b2a683db5e6681f28b917f69bfbb902fbbef08a SHA256 8f855b65b048e669086ad522dea71e95086de97623eb0cfec4683d52c064d9f6
+EBUILD ecls-0.9i.ebuild 1200 RMD160 69de5d61ffcf5e89fcde37c21a42142b50b91014 SHA1 a708cd2d8c03093be1f2946551163581ab826b2f SHA256 a519aae2a87dfa8a304aad1a33a4082e7925c383efa51ac3632f67d4049b94a7
 EBUILD ecls-0.9j_p1.ebuild 1169 RMD160 427c695b762192d10c78076fd2e4fbe7371f79c1 SHA1 ad9aa6510cceac2d8b8d37f34f01d02840d3dd70 SHA256 fa13731979f978453370caf93284b29427609639edadceb5cb5c012756730694
-MISC ChangeLog 4835 RMD160 27ef78f5e74adced255cba60828147c6a8171732 SHA1 c2726b096d12e42f34b6fcba340ec4baff81f9ce SHA256 a2a07820472490a077503b596a121f4cabbd5d6114f74ae6d562f8dab5380f40
+MISC ChangeLog 4958 RMD160 ad55374c73825fc49c689157e11db382a3533b97 SHA1 f2814537544cb42cdb33089aa121c001a612c2f6 SHA256 41dfcb33bf0cd29407771ee7bc0fdda0601e0009e0522598e1a7f93c6f98f6f1
 MISC metadata.xml 459 RMD160 6e5f517c105a091c8d2b066ee0333aea6d783283 SHA1 9f07e0968a2863f45a3f7515bb49cedd7fd4733d SHA256 7a385182f8ffcb8bf6a6a856cb54529dd768f83751f7b4fbdfdb28594d42ef82
diff --git a/dev-lisp/ecls/ecls-0.9i.ebuild b/dev-lisp/ecls/ecls-0.9i.ebuild
index 2b3f791cd6b4..621ecd958be4 100644
--- a/dev-lisp/ecls/ecls-0.9i.ebuild
+++ b/dev-lisp/ecls/ecls-0.9i.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ecls-0.9i.ebuild,v 1.1 2006/07/09 16:33:30 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ecls-0.9i.ebuild,v 1.2 2008/07/13 18:51:40 pchrist Exp $
 
 inherit eutils
 
@@ -10,57 +10,42 @@ HOMEPAGE="http://ecls.sourceforge.net/"
 SLOT="0"
 LICENSE="BSD LGPL-2"
 KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
-
 DEPEND="=dev-libs/gmp-4*
 	app-text/texi2html"
-
-# ECL fails to build with a system-installed Boehm GC (which apparently is a
-# rare configuration since most distributions neglect to install the useful
-# private headers). Until this is properly isolated, we use the Boehm GC
-# included with ECL.
-
-#	dev-libs/boehm-gc
-
-IUSE="X c++"
-
+IUSE="X"
 PROVIDE="virtual/commonlisp"
-
 S=${WORKDIR}/ecl-${PV:0:4}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-headers-gentoo.patch || die
-	# waiting on upstream to fix this http://sourceforge.net/tracker/?func=detail&aid=1519256&group_id=30035&atid=398053
-#	epatch ${FILESDIR}/${PV}-sockets-c++-gentoo.patch || die
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}-headers-gentoo.patch"
 }
 
 src_compile() {
-	local myconf="--with-system-gmp
-		--enable-boehm=included
-		--with-tcp
-		--with-ffi
-		--with-clos-streams
-		--with-cmuformat
-		--with-asdf
-		`use_with c++ cxx`
-		`use_with X x`
-		`use_with X clx`"
-	einfo "Configuring with: $myconf"
-	econf ${myconf} || die
-	make || die
+	econf --with-system-gmp \
+		--enable-boehm=included \
+		--with-tcp \
+		--with-ffi \
+		--with-clos-streams \
+		--with-cmuformat \
+		--with-asdf \
+		$(use_with X x) \
+		$(use_with X clx) \
+		|| die "econf failed"
+	emake -j1 || die "emake died"
 }
 
 src_install () {
-	make bindir=${D}/usr/bin \
-		infodir=${D}/usr/share/info \
-		mandir=${D}/usr/share/man \
-		libdir=${D}/usr/lib/ecl \
-		includedir=${D}/usr/include \
-		docdir=${D}/usr/share/doc/${PF} install || true
-	dohtml doc/*.html
-	dodoc ANNOUNCEMENT Copyright LGPL
+	local libso="libecl.so"
+
+	emake DESTDIR="${D}" install \
+	|| die "emake install failed."
 
-	insinto /usr/share/doc/${PF}/
-	doins ${FILESDIR}/README.Gentoo
+	rm -v "${D}/usr/lib/ecl/${libso}"
+	rm -v "${D}/usr/share/doc/ecl"
+	dolib.so "build/${libso}"
+
+	dohtml doc/*.html
+	dodoc ANNOUNCEMENT Copyright LGPL "${FILESDIR}/README.Gentoo"
 }