Clean up ebuilds to not suck anymore.
authorMike Frysinger <vapier@gentoo.org>
Sat, 17 Sep 2005 03:00:23 +0000 (03:00 +0000)
committerMike Frysinger <vapier@gentoo.org>
Sat, 17 Sep 2005 03:00:23 +0000 (03:00 +0000)
Package-Manager: portage-2.0.52-r1 http://ronaldmcnightrider.ytmnd.com/

dev-lang/swi-prolog-lite/ChangeLog
dev-lang/swi-prolog-lite/Manifest
dev-lang/swi-prolog-lite/files/destdir.patch
dev-lang/swi-prolog-lite/files/swi-prolog-lite-5.2.11-parallel-build.patch [new file with mode: 0644]
dev-lang/swi-prolog-lite/files/swi-prolog-lite-5.3.14-parallel-build.patch [new file with mode: 0644]
dev-lang/swi-prolog-lite/swi-prolog-lite-5.2.11.ebuild
dev-lang/swi-prolog-lite/swi-prolog-lite-5.3.14.ebuild

index 99ebf01f2c4b3054bf0c6d6586000a20b05aac2c..4bbcac414bfe4d77f0ded9e042d2dbcb1279ae2e 100644 (file)
@@ -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:
index 2ad679e3dac4578efc89d27f4a06c8e281888246..8911f9274fbf15b204fcbe7354898e39f015515e 100644 (file)
@@ -1,13 +1,25 @@
-MD5 6ca0f16df8fd885c76485abe0f8b96f9 ChangeLog 2039
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 5532502b84186d942b9e511ac418da60 swi-prolog-lite-5.1.13.ebuild 1243
-MD5 00d02057c78550b2647bd4494b9225ec swi-prolog-lite-5.3.14.ebuild 1017
-MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159
 MD5 28974c6eec2ffa2a5940540b42eb2d12 swi-prolog-lite-5.2.8.ebuild 1011
+MD5 7d72dd5171c98a306021fbf58e52fb43 swi-prolog-lite-5.2.11.ebuild 1157
+MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159
+MD5 be596388fad4de48f793387c95875120 swi-prolog-lite-5.3.14.ebuild 1154
 MD5 279806ebf5d32d9c17d55d4ab837991e swi-prolog-lite-5.0.10.ebuild 1250
-MD5 a8689147c4c32fb6f2473962bc62a30e swi-prolog-lite-5.2.11.ebuild 1039
-MD5 a162047529de9300ae67de9aa8f509be files/destdir.patch 502
-MD5 97c1cf99da9729fcc068d022fe2f3288 files/digest-swi-prolog-lite-5.2.8 61
-MD5 77eba3e801d4ef6f690fc09986ab029c files/digest-swi-prolog-lite-5.2.11 62
+MD5 0153efe757aa7b10e432d279b97cf5da ChangeLog 2362
+MD5 640ff31e82704bfbbd79ac576d005850 files/digest-swi-prolog-lite-5.1.13 62
+MD5 8eed8feaa65a3ab28f60e67e609ed512 files/destdir.patch 488
 MD5 cb98bd8233429346b32b20d397d03388 files/digest-swi-prolog-lite-5.3.14 62
 MD5 ac0b2bc6ebbb0b4d807dc2e7f88c0edf files/digest-swi-prolog-lite-5.0.10 67
-MD5 640ff31e82704bfbbd79ac576d005850 files/digest-swi-prolog-lite-5.1.13 62
+MD5 e26e7dd2a9ab9cadfc1e456bff5cfb35 files/swi-prolog-lite-5.2.11-parallel-build.patch 293
+MD5 97c1cf99da9729fcc068d022fe2f3288 files/digest-swi-prolog-lite-5.2.8 61
+MD5 77eba3e801d4ef6f690fc09986ab029c files/digest-swi-prolog-lite-5.2.11 62
+MD5 437771b4e9daf7608ee59186097e2f20 files/swi-prolog-lite-5.3.14-parallel-build.patch 1034
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDK4bjgIKl8Uu19MoRAiucAJ9cyj/G8+dJJgu+Mca/XmlUuA+fPwCdFi3z
+KPZQ0NghS1WgkynvhMK8aPo=
+=RRgE
+-----END PGP SIGNATURE-----
index 45806c796e7091914e355b4b0509c236b2f81220..05399cebc842c1fd2cbfb50785cbb1e61ee12f7f 100644 (file)
@@ -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 (file)
index 0000000..6488821
--- /dev/null
@@ -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 (file)
index 0000000..0660362
--- /dev/null
@@ -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
index e9d8b0329016d3272bad2343856188d8d9d331b1..f0028e46e7b0da16bb7cfc70b260ec4acd4aff3b 100644 (file)
@@ -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
 }
index fd0f5a6cf5f5cb1fdb234f71694ac3e0ec2d986b..404aa40216194ca5fec8fe0dc7f19859bff69c31 100644 (file)
@@ -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
 }