Removed old version and re-added slang-2 support.

Package-Manager: portage-2.1.4.1

6 files changed, 76 insertions, 55 deletions

diff --git a/sci-libs/gaul-devel/ChangeLog b/sci-libs/gaul-devel/ChangeLog
index c65fa16ad77e..36cd9a04e437 100644
--- a/sci-libs/gaul-devel/ChangeLog
+++ b/sci-libs/gaul-devel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/gaul-devel
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gaul-devel/ChangeLog,v 1.6 2008/02/09 13:24:32 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gaul-devel/ChangeLog,v 1.7 2008/02/09 16:06:01 markusle Exp $
+
+  09 Feb 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/gaul-devel-0.1849-slang2-config.patch, 
+  +files/gaul-devel-0.1849-slang2-error.patch, 
+  -gaul-devel-0.1846.ebuild,
+  gaul-devel-0.1849-r1.ebuild:
+  Removed old version and re-added slang-2 support.
 
 *gaul-devel-0.1849-r1 (09 Feb 2008)
 
diff --git a/sci-libs/gaul-devel/Manifest b/sci-libs/gaul-devel/Manifest
index 7dca7cf720ac..57141791c914 100644
--- a/sci-libs/gaul-devel/Manifest
+++ b/sci-libs/gaul-devel/Manifest
@@ -1,7 +1,7 @@
-DIST gaul-devel-0.1846-0.tar.gz 497588 RMD160 e3894f91bcf644bdb544e783797d45317cf13dba SHA1 00bcb7c396e47c03b09beda75d99ef394f2efff2 SHA256 f546be54c596e17c2fd5d70c2316dd8d009d61e810d8441f2eefd438152399e9
+AUX gaul-devel-0.1849-slang2-config.patch 913 RMD160 be198f7947c27f88a6ff8662391dd0053caf10d4 SHA1 d45b2826af419fa2fcd08e224f96ae9d57c976e3 SHA256 51352aa671fd7504f67ed72b281d7f090fc1dab982a0cf0f1509869174c1f752
+AUX gaul-devel-0.1849-slang2-error.patch 976 RMD160 36c6ddbe14d46abb6c2553998b1227777b76719b SHA1 2ea21471aa702882310a90b0c39afa8fc4499913 SHA256 78a933c7212244c2bc96b27394a9e30a24b402621ed96bd84d54dcd2f7e01eec
 DIST gaul-devel-0.1849-0.tar.bz2 416827 RMD160 0b492e8fa2eb76fc6fe4cdad37eebe68c3ab51a0 SHA1 a4e43d5ec62ba09f82718a19fb0e7ee1b4d8d4c1 SHA256 b29a3e7ba210701f1ee5cd1fb603cd0d474d26d0a8ae215ddc249612d72b72fc
-EBUILD gaul-devel-0.1846.ebuild 1099 RMD160 1500153967f01425695fb5dd7b14ebef14aafd42 SHA1 31824ecd2009fcc9407f5f0b3b74261593b3a01e SHA256 8853e6edffd0d702926e3919253e90a645517fd2f3003f8fddf216e8d7e0aea4
-EBUILD gaul-devel-0.1849-r1.ebuild 839 RMD160 b30eb29e2e32cd62a6fe898493ac7059a3dd28be SHA1 ed247ab39c3ef64136566ae68e66aee3d7754d3e SHA256 7aa507714aa9542a902d692cdf9f832ae11805a8958bb8e31e61632fd415f439
+EBUILD gaul-devel-0.1849-r1.ebuild 1068 RMD160 de44abb27a12758558188a3c1c5cc0055ad19f9c SHA1 90ea1ade123c2948990d54bf1bc77a671e0e8fb6 SHA256 e9c29a76e008d34a662bc1c9171bd342baedc0cb906b27185a02d17c39a94ad1
 EBUILD gaul-devel-0.1849.ebuild 891 RMD160 87a83819bcf45e4ca6e14fc4217ac74d1b216895 SHA1 e89ca2eb34a51f9e260a6eb81ed4d2e47df25560 SHA256 56ffbab4a904657c1c1b64000f0b51a7bfd4a077f8ed8aa2d924329654a3bbf5
-MISC ChangeLog 1535 RMD160 0164fc600a35151c0bf1eb75fc10c7e0ce0e3728 SHA1 c44412eacd8c46491a04c25432fee33cf26366c0 SHA256 96e956f0107ea7ae2435672dadadbccd81875ec67cf4b8351938768e0cd0b930
+MISC ChangeLog 1802 RMD160 d4ec7ee6ec84aa0a4566683b62f7ea8d79a6adea SHA1 e1d820fe2c7b180b081297b39dc6909abbf363d7 SHA256 7094df7bc1411c7ea6004c5eb7a7f8a0d97a65ddd0af102a9fc18e3d5137c193
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
diff --git a/sci-libs/gaul-devel/files/gaul-devel-0.1849-slang2-config.patch b/sci-libs/gaul-devel/files/gaul-devel-0.1849-slang2-config.patch
new file mode 100644
index 000000000000..c46bf0d1a5e8
--- /dev/null
+++ b/sci-libs/gaul-devel/files/gaul-devel-0.1849-slang2-config.patch
@@ -0,0 +1,18 @@
+diff -Naur gaul-devel-0.1849-0/configure.in gaul-devel-0.1849-0.new/configure.in
+--- gaul-devel-0.1849-0/configure.in	2005-04-20 12:09:15.000000000 -0400
++++ gaul-devel-0.1849-0.new/configure.in	2008-02-09 09:59:13.000000000 -0500
+@@ -397,10 +397,10 @@
+   AC_MSG_RESULT(yes)
+   WILL_USE_SLANG="yes"
+   HAVE_SLANG=1
+-  LIBS="$LIBS -lslang -lm"
+-  INCLUDES="$INCLUDES -I/usr/include/slang/"	# FIXME: Need to detect slang.h location properly.
+-  AC_CHECK_LIB(slang, SLang_init_slang,
+-    [LIBS="$LIBS -lslang"],
++  LIBS="$LIBS -lslang-2 -lm"
++  INCLUDES="$INCLUDES -I/usr/include/slang-2/"	# FIXME: Need to detect slang.h location properly.
++  AC_CHECK_LIB(slang-2, SLang_init_slang,
++    [LIBS="$LIBS -lslang-2"],
+     [AC_MSG_ERROR(GAUL requires the S-Lang library for full functionality.  see http://space.mit.edu/pub/davis/slang/  Or configure with '--enable-slang=no' for reduced version.)])
+   result=1
+ else
diff --git a/sci-libs/gaul-devel/files/gaul-devel-0.1849-slang2-error.patch b/sci-libs/gaul-devel/files/gaul-devel-0.1849-slang2-error.patch
new file mode 100644
index 000000000000..64b3c59a28bb
--- /dev/null
+++ b/sci-libs/gaul-devel/files/gaul-devel-0.1849-slang2-error.patch
@@ -0,0 +1,30 @@
+diff -Naur gaul-devel-0.1849-0/tests/test_slang.c gaul-devel-0.1849-0.new/tests/test_slang.c
+--- gaul-devel-0.1849-0/tests/test_slang.c	2003-08-19 17:41:20.000000000 -0400
++++ gaul-devel-0.1849-0.new/tests/test_slang.c	2008-02-09 10:42:43.000000000 -0500
+@@ -287,10 +287,11 @@
+  */
+   if (-1 == SLang_load_file(script_fname))
+     {
++    int error = SLang_get_error();
+     dief("Error %d interpreting the S-Lang script \"%s\".",
+-         SLang_Error, script_fname);
++         error, script_fname);
+     SLang_restart(1);	/* reset interpreter. */
+-    SLang_Error = 0;
++    SLang_set_error(0);
+     return FALSE;
+     }
+ 
+@@ -315,9 +316,10 @@
+  */
+   if (-1 == SLang_load_file(NULL))
+     {
+-    dief("Error %d interpreting the SLang script from stdin.", SLang_Error);
++    int error = SLang_get_error();
++    dief("Error %d interpreting the SLang script from stdin.", error);
+     SLang_restart(1);
+-    SLang_Error = 0;
++    SLang_set_error(0);
+     return FALSE;
+     }
+ 
diff --git a/sci-libs/gaul-devel/gaul-devel-0.1846.ebuild b/sci-libs/gaul-devel/gaul-devel-0.1846.ebuild
deleted file mode 100644
index 43807cee0fb1..000000000000
--- a/sci-libs/gaul-devel/gaul-devel-0.1846.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gaul-devel/gaul-devel-0.1846.ebuild,v 1.4 2007/07/20 18:45:10 je_fro Exp $
-
-DESCRIPTION="Genetic Algorithm Utility Library"
-HOMEPAGE="http://GAUL.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gaul/${P}-0.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-
-KEYWORDS=""
-
-IUSE="slang doc"
-
-DEPEND="slang? ( >=sys-libs/slang-1.4.5-r2 )
-	>=sys-apps/sed-4.0.7"
-
-RDEPEND="slang? ( >=sys-libs/slang-1.4.5-r2 )"
-
-# Will talk to Stewart about his version scheme...
-S=${WORKDIR}/${P}-0
-
-src_compile() {
-	local myconf
-	use slang || myconf="--enable-slang=no"
-
-	econf ${myconf} || die "econf failed"
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	#In order to compile anything after, this is needed!
-	#cp ${S}/config.h ${D}/${GAUL}/include/
-	#is it really? (george)
-
-	#this also is unnecesary
-	#dodir /etc/env.d/
-	#echo "LDPATH=/usr/lib/" >> ${D}/etc/env.d/25gaul
-
-	use doc && (
-		dodir /usr/share/${PN}
-		cp -pPR tests examples ${D}/usr/share/${PN}
-	)
-}
diff --git a/sci-libs/gaul-devel/gaul-devel-0.1849-r1.ebuild b/sci-libs/gaul-devel/gaul-devel-0.1849-r1.ebuild
index 62daab8e10cc..e24a1a70a1fa 100644
--- a/sci-libs/gaul-devel/gaul-devel-0.1849-r1.ebuild
+++ b/sci-libs/gaul-devel/gaul-devel-0.1849-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gaul-devel/gaul-devel-0.1849-r1.ebuild,v 1.1 2008/02/09 13:24:32 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gaul-devel/gaul-devel-0.1849-r1.ebuild,v 1.2 2008/02/09 16:06:01 markusle Exp $
+
+inherit autotools
 
 DESCRIPTION="Genetic Algorithm Utility Library"
 HOMEPAGE="http://GAUL.sourceforge.net/"
@@ -11,15 +13,25 @@ SLOT="0"
 
 KEYWORDS="~x86 ~amd64"
 
-IUSE="debug"
+IUSE="debug slang"
 
 DEPEND="virtual/libc
-	>=sys-apps/sed-4"
+	>=sys-apps/sed-4
+	slang? ( =sys-libs/slang-2* )"
 
 S="${WORKDIR}/${P}-0"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-slang2-config.patch
+	epatch "${FILESDIR}"/${P}-slang2-error.patch
+	eautoreconf
+}
+
 src_compile() {
-	local myconf="--enable-slang=no"
+	local myconf
+	use slang || myconf="--enable-slang=no"
 	if use debug ; then
 		myconf="${myconf} --enable-debug=yes --enable-memory-debug=yes"
 	else