Patch used was for 2.1.2, but 2.1.3 installs -lslang so revert -config.patch.

Package-Manager: portage-2.1.4.1

4 files changed, 10 insertions, 27 deletions

diff --git a/sci-libs/gaul-devel/ChangeLog b/sci-libs/gaul-devel/ChangeLog
index 36cd9a04e437..f4ea7cc23445 100644
--- a/sci-libs/gaul-devel/ChangeLog
+++ b/sci-libs/gaul-devel/ChangeLog
@@ -1,6 +1,10 @@
 # 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.7 2008/02/09 16:06:01 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gaul-devel/ChangeLog,v 1.8 2008/02/09 16:29:09 drac Exp $
+
+  09 Feb 2008; Samuli Suominen <drac@gentoo.org>
+  -files/gaul-devel-0.1849-slang2-config.patch, gaul-devel-0.1849-r1.ebuild:
+  Patch used was for 2.1.2, but 2.1.3 installs -lslang so revert -config.patch.
 
   09 Feb 2008; Markus Dittrich <markusle@gentoo.org>
   +files/gaul-devel-0.1849-slang2-config.patch, 
diff --git a/sci-libs/gaul-devel/Manifest b/sci-libs/gaul-devel/Manifest
index 57141791c914..cd05e5e5b217 100644
--- a/sci-libs/gaul-devel/Manifest
+++ b/sci-libs/gaul-devel/Manifest
@@ -1,7 +1,6 @@
-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.1849-r1.ebuild 1068 RMD160 de44abb27a12758558188a3c1c5cc0055ad19f9c SHA1 90ea1ade123c2948990d54bf1bc77a671e0e8fb6 SHA256 e9c29a76e008d34a662bc1c9171bd342baedc0cb906b27185a02d17c39a94ad1
+EBUILD gaul-devel-0.1849-r1.ebuild 1006 RMD160 c6290466f3dd158ca87c1bf1bc5d0097f01b5257 SHA1 491431027584053436da9c558dae137a34aed3a7 SHA256 ad82b8170be507a919384439a84e8d74990fed16702174c8ea65e78ba33bfa83
 EBUILD gaul-devel-0.1849.ebuild 891 RMD160 87a83819bcf45e4ca6e14fc4217ac74d1b216895 SHA1 e89ca2eb34a51f9e260a6eb81ed4d2e47df25560 SHA256 56ffbab4a904657c1c1b64000f0b51a7bfd4a077f8ed8aa2d924329654a3bbf5
-MISC ChangeLog 1802 RMD160 d4ec7ee6ec84aa0a4566683b62f7ea8d79a6adea SHA1 e1d820fe2c7b180b081297b39dc6909abbf363d7 SHA256 7094df7bc1411c7ea6004c5eb7a7f8a0d97a65ddd0af102a9fc18e3d5137c193
+MISC ChangeLog 2005 RMD160 3726e0db4f564c2ccb0c66e9267a26d7c9244267 SHA1 dcb8cfb4df73c405f0dbe7650297679d55264337 SHA256 2b72af32f8364f4441d95069f295beccca6dae18eb3c8a2652464397dbc6d12e
 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
deleted file mode 100644
index c46bf0d1a5e8..000000000000
--- a/sci-libs/gaul-devel/files/gaul-devel-0.1849-slang2-config.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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/gaul-devel-0.1849-r1.ebuild b/sci-libs/gaul-devel/gaul-devel-0.1849-r1.ebuild
index e24a1a70a1fa..fb1f6887c840 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,6 @@
 # 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.2 2008/02/09 16:06:01 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gaul-devel/gaul-devel-0.1849-r1.ebuild,v 1.3 2008/02/09 16:29:09 drac Exp $
 
 inherit autotools
 
@@ -17,16 +17,14 @@ IUSE="debug slang"
 
 DEPEND="virtual/libc
 	>=sys-apps/sed-4
-	slang? ( =sys-libs/slang-2* )"
+	slang? ( >=sys-libs/slang-2.1.3 )"
 
-S="${WORKDIR}/${P}-0"
+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() {