Simplify library checks, drop virtual/pkgconfig (maybe bug #536128).

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

4 files changed, 19 insertions, 13 deletions

diff --git a/app-editors/hexcurse/ChangeLog b/app-editors/hexcurse/ChangeLog
index 1e594743ccfb..b77a58a9adfd 100644
--- a/app-editors/hexcurse/ChangeLog
+++ b/app-editors/hexcurse/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/hexcurse
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/hexcurse/ChangeLog,v 1.12 2014/10/27 23:25:27 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/hexcurse/ChangeLog,v 1.13 2015/01/09 16:39:43 jer Exp $
+
+  09 Jan 2015; Jeroen Roovers <jer@gentoo.org> hexcurse-1.55.ebuild,
+  files/1.55-tinfo.patch:
+  Simplify library checks, drop virtual/pkgconfig (maybe bug #536128).
 
   27 Oct 2014; Jeroen Roovers <jer@gentoo.org> hexcurse-1.55.ebuild,
   files/1.55-gcc.patch, +files/1.55-tinfo.patch:
diff --git a/app-editors/hexcurse/Manifest b/app-editors/hexcurse/Manifest
index 2ff559b04761..115467d94e05 100644
--- a/app-editors/hexcurse/Manifest
+++ b/app-editors/hexcurse/Manifest
@@ -2,15 +2,15 @@
 Hash: SHA256
 
 AUX 1.55-gcc.patch 261 SHA256 fb3417d16494d2ac17ef2caa3f77faf1fd1083a1637feab1059de6cf99316f9e SHA512 ff9612dcc75e2e0aeb67c5170c97e2705a1447ffeade77457924f5b7c354b4f7a69f53c237d1674c39fab5c057c27b5b7fa3e0779ce2f19e0a128f0b0228023b WHIRLPOOL 662d5b3b027f962878f5f5ee451bcb805b226232d60f920d4ce282c56c7346c9ee9be9b54b21ddb92518873094fdb68686dc3669ac11aa722fbf72a8dc560c71
-AUX 1.55-tinfo.patch 310 SHA256 2fbe1bdfcf5efb508a3668ab899af00ef6f2326eeda380ac525f2b403a580560 SHA512 b2d2171ff0836c5b4cb402c8816247569dda6616678bed7b428f2739e47ec31a9f8d84547293d3333b3d894a78985e0173c224859f196aa6a1464e615354a05a WHIRLPOOL 51c2baf9dc3efd1156214c83132338f3aab1d2131302c9524f42e79b93145424e0c5e52eeddc507ed2476112411e7baf65790b5edc0227a3796560fd72731a14
+AUX 1.55-tinfo.patch 339 SHA256 cb624f35d2142bea68ab1a3ecbb0b43fab9160d756f197e5683ad4e95e3c829d SHA512 267841535437a1e71ae94fbfbfa7e2250cba919ee8a1c7a19f861d667f9b4e2032ed1cc6ed5b6b6ad7093aa62425d16f99a56d7a3e0737a4dd9f87bf7564f5e1 WHIRLPOOL adb4a4acea418aa08f1f68a4c25421ffc00bdaac82ef2ddf40af85e0f433927d9b2d00be646c7eaa8d368c780c1f3d80235507a5fc4ce8c6aa845e6f02cbf8cf
 DIST hexcurse-1.55.tar.gz 113512 SHA256 b8d589f80acfa590fddd60d9482cf6ba38b295bf785ae4e0aff37b5ab436cb16 SHA512 39f9eae0bb891bdfb702fb871b75c53d15acf6e74b3272b616f00303f444bfddced6fbe3041eb3769fa90fbc226dd584f5d84f7427b659e63f3b74511938a4a7 WHIRLPOOL ee8a5ac7db87db654db1486872687bd8c7dcea7b5376704522a16d58cc467a6ec5409dadacd2ddcb36fd30689268dec334f59cd5885a19b78e666a5ffb7befec
-EBUILD hexcurse-1.55.ebuild 838 SHA256 04328fc739a2cfc4aee6c5bb032fb0f25ddf9d1382e1a2c2d34b2d2a4149f790 SHA512 9e07546735c815e677dd8a93fa8e7b676380f53dda014cbe2ff70ff3240a8b05a5f573b4de349e6e97e892038d9f898f365fec07155ef12bacce7291ee4d7a10 WHIRLPOOL 4e7281f8ec1830e1e598d3170271cc45961bb357a9750fc67f5b58ed1a272be5dde128f79c92272bcbc98dcc9d964d618841e9241efe9863ba4829d5a451729a
-MISC ChangeLog 1448 SHA256 4902ebfd4ee98f062f0de3372d49fdf0cb03db2239c83637e6f40e4f06bc2cfb SHA512 e9ca256ad5d831ec57f5d049c386c06cee0273a9b0387618f83bc07295d8063a8cf0a5740a7dd7dea435cea170f43397a792ca9c2be1caf114e47f9f7c75d156 WHIRLPOOL f48aff35ae99841189ba611e63a20696e5904a5aa24dba4c5705411930fbf441072e4c90dcc3ca9b0f2cc92fb6a0cba53ae67f57cbf005f0599c746e5d3e5d9c
+EBUILD hexcurse-1.55.ebuild 820 SHA256 344228a289c00cd2ef09f5184d3456093301b0447fd4410a634116b9fe02ef38 SHA512 9ccb11fd1f59a1104d2e4aa46ab72432b8effaa34391d02b378f5260af5065c43207d01a66ff10918bc0341baa16967a9b413ea287d3c7aeb07deeb631f1da58 WHIRLPOOL 8fe832c241c6ab0c1b1deefa49db1d467e8d865be9c8f0fd85d5b25fa826684710f93dd31b9794e930e68ce0638ff9fcefda16fca572afb01e9bc0fe6d16a007
+MISC ChangeLog 1615 SHA256 b3beeff2c66f5d60213e06403168a9128e9c36f1f7fd93565eb00d641e6a4e06 SHA512 d4db6d7188af12150d538583aff37ee75adadd3630b4c14f23c3fa907bc1d2f2d859f145017461f76cd8e5da4d939e62912adfc4273e4d19b2ea4d3ba373f3c6 WHIRLPOOL 0c5889350388ceff9a470ce01a451bfd1b6959efbedc1726d9c08f4596ce265406f4e5281243bfba1d70302dd48df0c15ada07aacb6a400b6b954c8d71fc39c7
 MISC metadata.xml 282 SHA256 3e008d515ccc2fd9bf67477a8526c59ae861bdeb36e52776950495b3b1a7e157 SHA512 646c0d0b195feba3fbc021e9a1c221d102ae8f7a5d38cfca216bea06c785abf8a80c740802a2f92b1d6f185b88965c429fd2094eb21804618412e61f74398e4e WHIRLPOOL 29aa772074cbac024c54a92877cfcc7588dcfe7899eb1e0199ecbad25e645e6b6b4c1a02a98150eb0bdc48579595fbf17246afb7133b5ab06545ffe728ab45b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRO1GgACgkQVWmRsqeSphNuvQCfZLh1RjrKpRzTzsyMOnuKVOfU
-v4YAn2RSqKC7UoLZ5Z8NCRCrdXQwmQ/w
-=Pyvo
+iEYEAREIAAYFAlSwBFAACgkQVWmRsqeSphPc7wCfX0MDDAlE7sQ/R0B5MeoSF7Aa
+QPwAnRJNgj/6qf1/LGUi4bj2oSGH/ihd
+=jyzZ
 -----END PGP SIGNATURE-----
diff --git a/app-editors/hexcurse/files/1.55-tinfo.patch b/app-editors/hexcurse/files/1.55-tinfo.patch
index 68d89a18e7e2..f258c06f1cf7 100644
--- a/app-editors/hexcurse/files/1.55-tinfo.patch
+++ b/app-editors/hexcurse/files/1.55-tinfo.patch
@@ -1,11 +1,13 @@
 --- a/configure.in
 +++ b/configure.in
-@@ -13,7 +13,7 @@
+@@ -13,7 +13,9 @@
  
  dnl Checks for libraries.
  dnl Replace `main' with a function in -lncurses:
 -AC_CHECK_LIB(ncurses, initscr,,AC_CHECK_LIB(curses, initscr))
-+PKG_CHECK_MODULES(ncurses,ncurses,LIBS="$LIBS $ncurses_LIBS",)
++AC_CHECK_LIB(ncurses, initscr)
++AC_SEARCH_LIBS(initscr,curses)
++AC_SEARCH_LIBS(LINES,tinfo)
  
  dnl Checks for header files.
  AC_HEADER_STDC
diff --git a/app-editors/hexcurse/hexcurse-1.55.ebuild b/app-editors/hexcurse/hexcurse-1.55.ebuild
index 8da6fd2f9ba1..6fcf8009775d 100644
--- a/app-editors/hexcurse/hexcurse-1.55.ebuild
+++ b/app-editors/hexcurse/hexcurse-1.55.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/hexcurse/hexcurse-1.55.ebuild,v 1.16 2014/10/27 23:25:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/hexcurse/hexcurse-1.55.ebuild,v 1.17 2015/01/09 16:39:43 jer Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -16,13 +16,13 @@ KEYWORDS="alpha amd64 arm hppa ppc s390 sh sparc x86 ~x86-interix ~amd64-linux ~
 RDEPEND=">=sys-libs/ncurses-5.2"
 DEPEND="
 	${RDEPEND}
-	virtual/pkgconfig
 "
 
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PV}-gcc.patch \
 		"${FILESDIR}"/${PV}-tinfo.patch
+
 	eautoreconf
 }