Fix building against sys-libs/ncurses[-tinfo] (bug #529884).

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 31 insertions, 24 deletions

diff --git a/media-gfx/aewan/ChangeLog b/media-gfx/aewan/ChangeLog
index fe44efccfec6..811952f52241 100644
--- a/media-gfx/aewan/ChangeLog
+++ b/media-gfx/aewan/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/aewan
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/aewan/ChangeLog,v 1.10 2014/11/03 09:58:28 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aewan/ChangeLog,v 1.11 2014/11/20 00:25:03 jer Exp $
+
+  20 Nov 2014; Jeroen Roovers <jer@gentoo.org> aewan-1.0.01-r1.ebuild,
+  files/aewan-1.0.01-tinfo.patch:
+  Fix building against sys-libs/ncurses[-tinfo] (bug #529884).
 
   03 Nov 2014; Mikle Kolyada <zlogene@gentoo.org>
   +files/aewan-1.0.01-tinfo.patch, aewan-1.0.01-r1.ebuild:
diff --git a/media-gfx/aewan/Manifest b/media-gfx/aewan/Manifest
index aa516a2568e9..dda4d92cf73e 100644
--- a/media-gfx/aewan/Manifest
+++ b/media-gfx/aewan/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA256
 
 AUX aewan-1.0.01-debug_aewl-warnings.patch 195 SHA256 2aff2930e714a7fe3108fa55c4534828a3f9f5401e3c6694fec02a7ea11bb7a6 SHA512 2693a0a64f458ae93b6edaaa0c930ac8a09e3af8d193e4d84577eb0ef542c01e376ea6972e411f45e1599581d225952db7f02a4ff787018f9df1bab42bf9462e WHIRLPOOL b546a227afa188f204943179554ed2547e1b4631dce8643be3673503236b1de663f4fefd5b4f5c1357ef9bdb888ac6a92c66a7be763e8f577a4a55ca2a3f3d78
-AUX aewan-1.0.01-tinfo.patch 279 SHA256 3640320d88c366db6e9fbceda8804ec2cc1e82146f1aeaf31f122d6e22cccfc4 SHA512 361b9d8077976743bb8e9f387efca43b321cebbb99ba601dc66dda7504a48f237fc813a82f2fee1d5acf1232494d680da2c8277f688fe74c9e8688db4d1ba5c3 WHIRLPOOL 5f3688180f3b166392dd6e75580c16ee0d4a39df7d0e4295e7c0080ffae969ac32b4af19cfca5dbb97b6603b576a92821c6bb3058819619beaf22c1016c40388
+AUX aewan-1.0.01-tinfo.patch 546 SHA256 326ef14befa17e8717b5805ac3623a76b3d76eb0f821a1ef126e010c7c11b5f1 SHA512 226780e4176490798f82e8f8184c0d8a44df8958c793925bbd7ccc87a4640e8ea1a09f47a7bdb90f7b94ef6abdda55d8ec4ad2623da26c4ac6cab11838e93277 WHIRLPOOL f1be2da7f316a3345abdf3c80d75853c95d49cded5d48e18e4c8dda3dcf20d101cbf62df175bd91c763c2de1f7f619913e1b23d5636d5d0fc35d07d152e97f2f
 DIST aewan-1.0.01.tar.gz 122880 SHA256 5266dec5e185e530b792522821c97dfa5f9e3892d0dca5e881d0c30ceac21817 SHA512 8c7e81ed3e2c4d0848e36ed60922c920471c7bc46a7127f529be3f5a9c3c66a6e0dff06bca7b5cb21eb0a93d03ba31fd4ef07fc48e2e39f2224956801fe322f3 WHIRLPOOL d432ad982507324a2467bc88b6158d1365e6d2abd50eacf52814ed9d16c5569f1e59cf08c9cd2f14ed80381c1e9fa71c1451145daf8f92677e9af235d3e12880
-EBUILD aewan-1.0.01-r1.ebuild 651 SHA256 df3c9d82614ba579d9d6a857a7b68565ea8942640f15de8e84bef18b73ea3bfa SHA512 d0208c7f86da4b42f21e73a02680c27c5f25ebab9f15197d88a3021798167417dda82c3960ed99578725d561eeadcce6c0e7a2e51729fdb190a68dfbb2a6de5e WHIRLPOOL c2cb60627bb77c152953cf561d8a5e455a3615cefee02e47637dbdcecf1a60b6e25049c8175c5d40434a422994d9975089ff9ab8cdbb0c7a996c2237499e2f2c
-MISC ChangeLog 1632 SHA256 e992a128c307a5253854726aea3a69f48776ff61751efe9024187d841e8d2f46 SHA512 68f06b684a9649a6f738f95508382ddc822f3930a0323eef14bcb760e67a1a51f6e85b00e2c7b90e2d2252c0beea76414d68257c3f0289ab2c36b0abf39f4467 WHIRLPOOL 76041b1f8fccf2eb67019c3b764caa7fe490473a1ad34331202fc94b23841a90254357bf0c5903b5eea80771e4c4d2d7c572c148b90682b2475023f10bef078f
+EBUILD aewan-1.0.01-r1.ebuild 660 SHA256 2e38d50ca8786be4d030436779bf0449d4f8832311316431420ee0f13c67fb9f SHA512 9e08d565de62cc47063f239bd3c4d76c117ac4da50a28af237e48c8aae8ca1b1a9c945fb19e3841b721e278c138ac015109f4a0714d1315504ec52fbf6f2dc62 WHIRLPOOL 3f62e36e13553594718d4cf30f66b8db2e4c10b7c4e394493506e4e0efa9d902d9d914b08afc4e77a2645cb82e1d95d6b57237eadfd578c7309569fbd62a60e8
+MISC ChangeLog 1797 SHA256 4d45eb37f64e8c748a7cd852e15c220b0cf3e75465c340bb827eee0f14565369 SHA512 1d3327f4e306b0116763b8032b2b2486dbbb75c9605d25dbe6cb0c7d6b4abf390d61fe2de2c12d72c3294c14477c8b73ed614ca507ccae0cef9871507850b148 WHIRLPOOL 26414e600db83197a90e2c06d31a5e5807a3bfb3d8e533e273c18b2c6d3a5d0f0acc86e4dc635ea939e062e2240c9b28dbc1ab590d85f4fe3a11067a4537c58d
 MISC metadata.xml 552 SHA256 7b233e864688867c67128bc20245c7f5f6770510a1f42a5da3647f8c3810d05a SHA512 d0f0d93df868cabc5ec8a9effcfcc4ec9ec2da1cee302b6b8fc90845a89f6daed86aeb89d3d20cc52bce6df1fb548495b11bc3cf80a69172640b1d302ef80d3f WHIRLPOOL 35ec5144c19c172ead91529c5197b2d6188ee538744188789720cf0d269ef185c67061ff6e5b04d76dc8ed00b5595e58d4977e0d4c9d0be2a2e7dd1f445318bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlRXUXEACgkQG9wOWsQutdbYPQP/biAS/YyNF0l3rCGAAJzoIdYW
-Po8/GEpHCSj/ItszwvBP0wqkGxnV55H+XeAbUZtLBUXyw/WPfLw4kZL6Y2jtYfe/
-l/M68M9z/NhoHoqBzEEgGwjQe/suZwHmUEhI5gCPZHFyGhkrd3OqnfiO3CLEE9RT
-3PoMV4h/y+SzLx9XBig=
-=dMiR
+iEYEAREIAAYFAlRtNOEACgkQVWmRsqeSphPvugCdGx2/Kifz/eHByPfZdoK14k4G
+bUsAn25xc/3Nm9VMCnEgaZXcxFNqMUv3
+=DYqN
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/aewan/aewan-1.0.01-r1.ebuild b/media-gfx/aewan/aewan-1.0.01-r1.ebuild
index 94c577c79fbb..5ea69d36a711 100644
--- a/media-gfx/aewan/aewan-1.0.01-r1.ebuild
+++ b/media-gfx/aewan/aewan-1.0.01-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/aewan/aewan-1.0.01-r1.ebuild,v 1.4 2014/11/03 09:58:28 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aewan/aewan-1.0.01-r1.ebuild,v 1.5 2014/11/20 00:25:03 jer Exp $
 
 EAPI=5
 
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="A curses-based ascii-art editor"
 HOMEPAGE="http://aewan.sourceforge.net/"
@@ -13,7 +13,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 DOCS=( CHANGELOG README TODO )
 
@@ -23,6 +22,8 @@ DEPEND="sys-libs/zlib
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-debug_aewl-warnings.patch" \
-	       "${FILESDIR}/${P}-tinfo.patch"
+	epatch \
+		"${FILESDIR}/${P}-debug_aewl-warnings.patch" \
+		"${FILESDIR}/${P}-tinfo.patch"
+	eautoreconf
 }
diff --git a/media-gfx/aewan/files/aewan-1.0.01-tinfo.patch b/media-gfx/aewan/files/aewan-1.0.01-tinfo.patch
index a998f16f5611..b4edfd1b990c 100644
--- a/media-gfx/aewan/files/aewan-1.0.01-tinfo.patch
+++ b/media-gfx/aewan/files/aewan-1.0.01-tinfo.patch
@@ -1,11 +1,15 @@
---- Makefile.in.orig	2014-11-02 23:19:58.714707465 +0300
-+++ Makefile.in	2014-11-02 23:20:20.482706904 +0300
-@@ -37,7 +37,7 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,9 +13,10 @@
  
- CC=@CC@
- CFLAGS=@CFLAGS@ -fno-strict-aliasing -Wall
--LIBS=@LIBS@
-+LIBS=@LIBS@ -ltinfo
- LDFLAGS=@LDFLAGS@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
+ # Checks for libraries.
+ AC_CHECK_LIB([ncurses], [initscr], [],
+-             AC_MSG_ERROR([Can't find ncurses library. Install it first.]))
++             AC_MSG_ERROR([Cannot find ncurses library. Install it first.]))
++AC_SEARCH_LIBS([define_key], [tinfo])
+ AC_CHECK_LIB([z], [gzopen], [],
+-             AC_MSG_ERROR([Can't find zlib library. Install it first.]))
++             AC_MSG_ERROR([Cannot find zlib library. Install it first.]))
+ 
+ # Checks for header files.
+ AC_HEADER_STDC