Fix building against sys-libs/ncurses[tinfo] (bug #536164 by Reuben Martin).

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

3 files changed, 23 insertions, 11 deletions

diff --git a/dev-db/pg_top/ChangeLog b/dev-db/pg_top/ChangeLog
index c216e0b3ec99..df4d30c46521 100644
--- a/dev-db/pg_top/ChangeLog
+++ b/dev-db/pg_top/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/pg_top
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pg_top/ChangeLog,v 1.11 2014/12/28 15:07:21 titanofold Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pg_top/ChangeLog,v 1.12 2015/01/11 11:36:17 jer Exp $
+
+  11 Jan 2015; Jeroen Roovers <jer@gentoo.org> files/pg_top-3.7.0.patch:
+  Fix building against sys-libs/ncurses[tinfo] (bug #536164 by Reuben Martin).
 
   28 Dec 2014; Aaron W. Swenson <titanofold@gentoo.org> pg_top-3.6.2-r1.ebuild,
   pg_top-3.7.0.ebuild:
diff --git a/dev-db/pg_top/Manifest b/dev-db/pg_top/Manifest
index 4ba1ccdd6316..715a37abe4ec 100644
--- a/dev-db/pg_top/Manifest
+++ b/dev-db/pg_top/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 AUX pg_top-3.6.2.patch 724 SHA256 f9f8b25ed8fe8471cf71af79acd8751b61731a8e7009da2f8f379d0374c2554b SHA512 d5384e611b71d919d9d02dcb759fa47fb66030430aba8b200c436ddde464ceae629440a82046af4ef29abf9428555f9df0f1f6d452dd698248512af052fff04f WHIRLPOOL 442d746f7ca07c6737f9080989be63b0c14711bdd4ab1b0d1bf124cace68e9c2785330c102237ead4bf9c5d36330603fc294e76675451f8a5f1aa3bf99a32506
-AUX pg_top-3.7.0.patch 554 SHA256 13bc90ccdc031f9002dd602eafd06837540f0ccb51d2e7055436c387d0636556 SHA512 316387b97f229d4202bd508d5413952607fd240d2a782bba45af151d050eb73a1ac77243f9dc9aa543edd8d801f7a2d5d3fa41b5f047d3cb35263e2f08ee1f4c WHIRLPOOL 31785ab105690a5905b4faaee0675a5c85526fb638b9b30290724d87c0d498ca6265f6149a84489265089ded907da1dc5cba62ca923f24dd929cd11cc0de53d7
+AUX pg_top-3.7.0.patch 749 SHA256 abeea9acc7eaa494c0ec6165643f171911b893579161d6fac66f6d0860fba596 SHA512 e94b14318f22f35fb28de3e0d53e6ff785a36e1eed37fe0f8066a0e0e4adb5c2c280de5c577ba7969715bee594ed2686b41fde0ce2930990064ab80132c760e4 WHIRLPOOL d53340c825055355583a58ba4140531f859929afd8148875f1764cb9f441dc04c15d870909c3ef8029591ef9169b89ad0dfd977121b581baa965df15eca45888
 DIST pg_top-3.6.2.tar.bz2 220985 SHA256 8a749f6aec44625d834e477982c67ba0a76262a6a8c87b20e20df9ea07ce714d SHA512 0e7f33cccd7a1debce4965a11ff3d5d6868aace53651ca1c486f061728034f0ab3901ddfbded022c9297d3393eaea32585ca779334954c87fd0c13c8fa523074 WHIRLPOOL c92e62a1765a734da290b2df78fc6770819f8a566baf8c69929bbace89aa46b0cf4399e25e594947e57cf74f46a22a35a25d5db0d407fd28738343eab0f74558
 DIST pg_top-3.7.0.tar.bz2 236076 SHA256 c48d726e8cd778712e712373a428086d95e2b29932e545ff2a948d043de5a6a2 SHA512 509cd3ce65a9b549097eaab5ae27106fa469cdeb4f37950564654f3df01390e1a771c8fa4f5858c3e4c1e76470b6c0fd9b07e8268564f59285e30bf824d7c4ec WHIRLPOOL 29c8f326f08e31a13b7f903d025b4608107524de5b65c8567788e6855df6b01a2991b95312e8b3da88a3df0d946834929cab681599340a647e93d8401114ed83
 EBUILD pg_top-3.6.2-r1.ebuild 738 SHA256 b3161db6dbb7a385fc0166834e35c7536541a15086d3a8257971b5828dc57de4 SHA512 41741edc08f70cfd6b6dba39be883b948a024d4af475b3fb239f48c7ccf1296710bf9a9d89f60f24e28e83bfdb956246c7b60f35d23c50d8e6ce674a5280df3b WHIRLPOOL 4b47d6058cfc2e7ff601f07de340f6ce72523259a7d32ea68fa78cd515dc7c2b7961a8b9943ba367d8a7b83f0defe2a48f7229e1e4e2708ed668f9704991b13c
 EBUILD pg_top-3.7.0.ebuild 735 SHA256 d55bee48c1be43bd8da1fbfe30602e6ca7599aa107ed75034d228639dea7fbaf SHA512 98935b989652b68ad7aea42be817ae77981f4d33447a100323ff4f3ad7e001dbea40db04bfd3c1e39cdbc091ed4a9b4f460a97a2a6f4487f4e09deae79c463e2 WHIRLPOOL 8cf09a317067dcfecf4f5c23a716efdefedd7d2576b6c78912d3631bc7f9d3a7a7c42fb572eebafc0046258c0c96c8d1d088f06fcb43dfa745304e4e43fb9f14
-MISC ChangeLog 1918 SHA256 c2c45d10f29d4d7ed015ed53b2ecb81148326ddd9b041e7fc0bced13bb47ffb8 SHA512 41471eb4fa386ae9989cf69a987cb10a876b35ff24c69464dfa50ed4f55bab521b19134b4922da99f791114ca4589e234bee055902f9105757b3cb6c9c77d2c4 WHIRLPOOL 43c55fe1e50c011ac1cf6400a076640ba6307661c330edde2126d55a9dfecf698f096273b3cc86d05f83d7e8602e7e04f13dff803ceee9d746448c5276617317
+MISC ChangeLog 2064 SHA256 eff2ee9d9f0e7309fa214f48b4a234eaa5c18a2fd2bc1875f706e933a28bd1a4 SHA512 da90c013e5b6c51f5daa64ed4c7a09ac4be3aa9bd5094805a914287819a7964bde34fe35b31e26de889ddb1cfc697a03fffe81b600137a5d0cf65af79d71f20e WHIRLPOOL 45fd903abbe1bbb1cbcdd5129a137f9c391f710becc1fc5d4bc9d9691679aa976570f19c7c738d72dfde33bb9a31ed6981e3327c4b16a8c9b30d9d817794ee02
 MISC metadata.xml 346 SHA256 48c090aae0c5910718d02b84ae33c9a22c182e62287bb8e9cfec070ae0b5d845 SHA512 593f1329e3ec864125a7b9b4f02b9d5e0440ed3d6b19a95517672785c5c8e49bb54e9320a5a701247ff093c7e645d5cc9f13fdfa724abd3326a916205c50807e WHIRLPOOL 0ccc1e0598751b9e6e738ff50254856eb0e0e7334a18e1ef24c0d4ff65b60db9d097feddccefcab5733896f06bc3363ed05b7c3ddd683e53b39cc86ebae01ef9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSgHKoACgkQVxOqA9G7/aD+xAD/Ro2Bv+zExtXV4bgcjl4NQsCO
-rI5jNEcrtqtQmW5jsd8A/jtRDKn2CAoRBnZ80te7s+u3u86Uk7wYYx6h0plZTAGn
-=xFBp
+iEYEAREIAAYFAlSyYDIACgkQVWmRsqeSphONhgCfVw0BSiJLsKEPhorEJmG3+XOL
+lNcAn0uwn7eB/SwWPon4FHxG8kcD4UoH
+=MgiL
 -----END PGP SIGNATURE-----
diff --git a/dev-db/pg_top/files/pg_top-3.7.0.patch b/dev-db/pg_top/files/pg_top-3.7.0.patch
index 6a6c21618d2e..6367a1dc03dc 100644
--- a/dev-db/pg_top/files/pg_top-3.7.0.patch
+++ b/dev-db/pg_top/files/pg_top-3.7.0.patch
@@ -1,6 +1,15 @@
---- configure.ac.orig	2013-09-20 10:11:20.256444684 +0400
-+++ configure.ac	2013-09-20 10:16:30.262459612 +0400
-@@ -109,6 +109,8 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -103,7 +103,7 @@
+ AC_SEARCH_LIBS(elf32_getphdr, elf)
+ # -lmld -lmach
+ AC_SEARCH_LIBS(vm_statistics, mach)
+-AC_SEARCH_LIBS(tgetent, termcap curses ncurses)
++AC_SEARCH_LIBS(tgetent, termcap tinfo curses ncurses)
+ AC_SEARCH_LIBS(exp, m)
+ 
+ AC_SEARCH_LIBS(dlerror, dl)
+@@ -111,6 +111,8 @@
  AC_SEARCH_LIBS(inet_aton, resolv, AC_DEFINE(HAVE_INET_ATON, 1,
          [inet_aton is already defined]))
  
@@ -9,7 +18,7 @@
  # check for libraries required by extension
  extlibs=""
  if test -n "$with_ext" -a -f "${srcdir}/ext/$with_ext.libs"; then
-@@ -216,8 +218,6 @@
+@@ -217,8 +219,6 @@
  AC_SUBST(SRC)
  AC_SUBST(OBJ)