Clean up ebuilds to not suck anymore.

(Portage version: 2.0.52-r1 http://ronaldmcnightrider.ytmnd.com/ )

6 files changed, 112 insertions, 44 deletions

diff --git a/dev-lang/swi-prolog-lite/ChangeLog b/dev-lang/swi-prolog-lite/ChangeLog
index 99ebf01f2c4b..4bbcac414bfe 100644
--- a/dev-lang/swi-prolog-lite/ChangeLog
+++ b/dev-lang/swi-prolog-lite/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/swi-prolog-lite
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog-lite/ChangeLog,v 1.16 2005/04/01 02:41:29 josejx Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog-lite/ChangeLog,v 1.17 2005/09/17 03:00:23 vapier Exp $
+
+*swi-prolog-lite-5.3.14 (01 Dec 2004)
+
+  16 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/swi-prolog-lite-5.2.11-parallel-build.patch,
+  +files/swi-prolog-lite-5.3.14-parallel-build.patch, files/destdir.patch,
+  swi-prolog-lite-5.2.11.ebuild, swi-prolog-lite-5.3.14.ebuild:
+  Clean up ebuilds to not suck anymore.
 
   01 Apr 2005; Joseph Jezak <josejx@gentoo.org>
   swi-prolog-lite-5.0.10.ebuild, swi-prolog-lite-5.2.11.ebuild:
diff --git a/dev-lang/swi-prolog-lite/files/destdir.patch b/dev-lang/swi-prolog-lite/files/destdir.patch
index 45806c796e70..05399cebc842 100644
--- a/dev-lang/swi-prolog-lite/files/destdir.patch
+++ b/dev-lang/swi-prolog-lite/files/destdir.patch
@@ -1,5 +1,7 @@
---- src/Makefile.in	2002-11-01 19:27:25.000000000 -0500
-+++ src/Makefile.in.old	2002-11-01 19:26:49.000000000 -0500
+Add support for installing with `make install DESTDIR=/blah`
+
+--- src/Makefile.in
++++ src/Makefile.in
 @@ -37,7 +37,8 @@
  
  PL=@PL@@RT@
diff --git a/dev-lang/swi-prolog-lite/files/swi-prolog-lite-5.2.11-parallel-build.patch b/dev-lang/swi-prolog-lite/files/swi-prolog-lite-5.2.11-parallel-build.patch
new file mode 100644
index 000000000000..648882127c4c
--- /dev/null
+++ b/dev-lang/swi-prolog-lite/files/swi-prolog-lite-5.2.11-parallel-build.patch
@@ -0,0 +1,13 @@
+Fix make dependencies so `make -j` works
+
+--- src/Makefile.in
++++ src/Makefile.in
+@@ -169,7 +169,7 @@
+ rc-lib:
+ 		@(cd rc && $(MAKE) COFLAGS="$(COFLAGS)")
+ 
+-index:
++index: $(PL) $(STARTUPPATH)
+ 		./$(PL) -x $(STARTUPPATH) \
+ 			-f none -F none \
+ 			-g make_library_index\(\'../library\'\) \
diff --git a/dev-lang/swi-prolog-lite/files/swi-prolog-lite-5.3.14-parallel-build.patch b/dev-lang/swi-prolog-lite/files/swi-prolog-lite-5.3.14-parallel-build.patch
new file mode 100644
index 000000000000..0660362a57df
--- /dev/null
+++ b/dev-lang/swi-prolog-lite/files/swi-prolog-lite-5.3.14-parallel-build.patch
@@ -0,0 +1,35 @@
+Fix make dependencies so `make -j` works
+
+--- src/Makefile.in
++++ src/Makefile.in
+@@ -161,7 +161,7 @@
+ 		@echo "****************"
+ 
+ 
+-$(PL):		$(RUNTIME) $(PLOBJ)
++$(PL):		$(RUNTIME) $(PLOBJ) $(RUNTIMEDIR)/$(SHARED)
+ 		$(LDEXE) $(LDFLAGS) -o $(PL) $(PLOBJ) -L../lib/$(ARCH) -lpl $(LNLIBS)
+ 
+ $(STARTUPPATH):	$(PLINIT) $(PLSRC) $(PL)
+@@ -188,7 +188,7 @@
+ rc-lib:
+ 		@(cd rc && $(MAKE) COFLAGS="$(COFLAGS)")
+ 
+-../library/INDEX.pl:	../library ../library/[a-z]*.pl
++../library/INDEX.pl:	../library ../library/[a-z]*.pl $(DEVPL) $(STARTUPPATH)
+ 		$(DEVPL) -x $(STARTUPPATH) \
+ 			-f none -F none \
+ 			-g make_library_index\(\'../library\'\) \
+@@ -243,11 +243,7 @@
+ 		@echo "#define C_LDFLAGS    \"$(LDFLAGS)\""    >> $@%
+ 		@if cmp -s $@% $@; then rm $@%; else mv $@% $@; fi
+ 
+-pl-main.o:	parms.h
+-pl-setup.o:	parms.h
+-pl-wic.o:	parms.h
+-pl-funct.o:	$(srcdir)/pl-funct.ih
+-pl-atom.o:	$(srcdir)/pl-funct.ih
++$(OBJ): headers parms.h $(srcdir)/pl-funct.ih
+ pl-wam.o:	pl-alloc.c pl-index.c pl-fli.c
+ 
+ $(srcdir)/pl-funct.ih:	$(srcdir)/ATOMS
diff --git a/dev-lang/swi-prolog-lite/swi-prolog-lite-5.2.11.ebuild b/dev-lang/swi-prolog-lite/swi-prolog-lite-5.2.11.ebuild
index e9d8b0329016..f0028e46e7b0 100644
--- a/dev-lang/swi-prolog-lite/swi-prolog-lite-5.2.11.ebuild
+++ b/dev-lang/swi-prolog-lite/swi-prolog-lite-5.2.11.ebuild
@@ -1,40 +1,45 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog-lite/swi-prolog-lite-5.2.11.ebuild,v 1.7 2005/04/01 02:41:29 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog-lite/swi-prolog-lite-5.2.11.ebuild,v 1.8 2005/09/17 03:00:23 vapier Exp $
 
-IUSE="readline static"
+inherit eutils
 
-S="${WORKDIR}/pl-${PV}"
 DESCRIPTION="free, small, and standard compliant Prolog compiler"
 HOMEPAGE="http://www.swi-prolog.org/"
 SRC_URI="http://www.swi.psy.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~amd64 ~sparc ~ppc"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="readline static threads"
 
 DEPEND="sys-libs/ncurses
-	sys-apps/gawk
-	sys-apps/sed
-	sys-devel/binutils
 	readline? ( sys-libs/readline )"
 
-src_compile() {
-	cd ${S}/src
-	#S="${S}/src"
-
-	local myconf
-	use readline || myconf="${myconf} --disable-readline"
-	use static && myconf="${myconf} --disable-shared"
+S=${WORKDIR}/pl-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"/src
+	epatch "${FILESDIR}"/destdir.patch
+	epatch "${FILESDIR}"/${P}-parallel-build.patch
+	sed -i \
+		-e '/COFLAGS=/s:=.*:=$CFLAGS:' \
+		-e '/LDFLAGS=/s:-O3::' \
+		configure || die
+}
 
-	econf ${myconf} --enable-mt || die "econf failed"
-	MAKEOPTS="-j1" emake || die "make failed"
+src_compile() {
+	cd src
+	econf \
+		$(use_enable readline) \
+		$(use_enable !static shared) \
+		$(use_enable threads mt) \
+		|| die "econf failed"
+	emake || die "make failed"
 }
 
 src_install() {
-	cd ${S}/src
-	einstall
-
-	cd ${S}
+	make -C src DESTDIR="${D}" install || die
 	dodoc ANNOUNCE ChangeLog INSTALL INSTALL.notes PORTING README VERSION
 }
diff --git a/dev-lang/swi-prolog-lite/swi-prolog-lite-5.3.14.ebuild b/dev-lang/swi-prolog-lite/swi-prolog-lite-5.3.14.ebuild
index fd0f5a6cf5f5..404aa4021619 100644
--- a/dev-lang/swi-prolog-lite/swi-prolog-lite-5.3.14.ebuild
+++ b/dev-lang/swi-prolog-lite/swi-prolog-lite-5.3.14.ebuild
@@ -1,40 +1,45 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog-lite/swi-prolog-lite-5.3.14.ebuild,v 1.4 2005/02/19 20:36:35 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog-lite/swi-prolog-lite-5.3.14.ebuild,v 1.5 2005/09/17 03:00:23 vapier Exp $
 
-IUSE="readline static"
+inherit eutils
 
-S="${WORKDIR}/pl-${PV}"
 DESCRIPTION="free, small, and standard compliant Prolog compiler"
 HOMEPAGE="http://www.swi-prolog.org/"
 SRC_URI="http://www.swi.psy.uva.nl/cgi-bin/nph-download/SWI-Prolog/BETA/pl-5.3.14.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="ppc-macos"
+KEYWORDS="~amd64 ppc-macos ~x86"
+IUSE="readline static threads"
 
 DEPEND="sys-libs/ncurses
-	sys-apps/gawk
-	sys-apps/sed
-	virtual/libc
 	readline? ( sys-libs/readline )"
 
-src_compile() {
-	cd ${S}/src
-	#S="${S}/src"
-
-	local myconf
-	use readline || myconf="${myconf} --disable-readline"
-	use static && myconf="${myconf} --disable-shared"
+S=${WORKDIR}/pl-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"/src
+	epatch "${FILESDIR}"/destdir.patch
+	epatch "${FILESDIR}"/${P}-parallel-build.patch
+	sed -i \
+		-e '/COFLAGS=/s:=.*:=$CFLAGS:' \
+		-e '/LDFLAGS=/s:-O3::' \
+		configure || die
+}
 
-	econf ${myconf} --enable-mt || die "econf failed"
-	MAKEOPTS="-j1" emake || die "make failed"
+src_compile() {
+	cd src
+	econf \
+		$(use_enable readline) \
+		$(use_enable !static shared) \
+		$(use_enable threads mt) \
+		|| die "econf failed"
+	emake || die "make failed"
 }
 
 src_install() {
-	cd ${S}/src
-	einstall
-
-	cd ${S}
+	make -C src DESTDIR="${D}" install || die
 	dodoc ANNOUNCE ChangeLog INSTALL INSTALL.notes PORTING README VERSION
 }