diff options
| -rw-r--r-- | sci-libs/gaul-devel/ChangeLog | 9 | ||||
| -rw-r--r-- | sci-libs/gaul-devel/files/gaul-devel-0.1849-slang2-config.patch | 18 | ||||
| -rw-r--r-- | sci-libs/gaul-devel/files/gaul-devel-0.1849-slang2-error.patch | 30 | ||||
| -rw-r--r-- | sci-libs/gaul-devel/gaul-devel-0.1846.ebuild | 46 | ||||
| -rw-r--r-- | sci-libs/gaul-devel/gaul-devel-0.1849-r1.ebuild | 20 |
5 files changed, 72 insertions, 51 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/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 |