summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <drac@gentoo.org>2008-02-09 16:29:10 +0000
committerSamuli Suominen <drac@gentoo.org>2008-02-09 16:29:10 +0000
commit2a9eef2f29efd24119b7a57ae92f258eee2f72df (patch)
tree9d0ed9b46b12ed18093e947e6e82a07e51adb81f /sci-libs/gaul-devel
parentVersion bump, fix bug#209055 (diff)
downloadgentoo-2-2a9eef2f29efd24119b7a57ae92f258eee2f72df.tar.gz
gentoo-2-2a9eef2f29efd24119b7a57ae92f258eee2f72df.tar.bz2
gentoo-2-2a9eef2f29efd24119b7a57ae92f258eee2f72df.zip
Patch used was for 2.1.2, but 2.1.3 installs -lslang so revert -config.patch.
(Portage version: 2.1.4.1)
Diffstat (limited to 'sci-libs/gaul-devel')
-rw-r--r--sci-libs/gaul-devel/ChangeLog6
-rw-r--r--sci-libs/gaul-devel/files/gaul-devel-0.1849-slang2-config.patch18
-rw-r--r--sci-libs/gaul-devel/gaul-devel-0.1849-r1.ebuild8
3 files changed, 8 insertions, 24 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/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() {