net-analyzer/mtr: Add compatibility patch for ncurses[tinfo], #468670

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

5 files changed, 51 insertions, 13 deletions

diff --git a/net-analyzer/mtr/ChangeLog b/net-analyzer/mtr/ChangeLog
index 39fe3f25ae50..a2d5aa668a4a 100644
--- a/net-analyzer/mtr/ChangeLog
+++ b/net-analyzer/mtr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/mtr
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.130 2013/02/20 14:07:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.131 2013/05/05 12:57:51 jlec Exp $
+
+  05 May 2013; Justin Lecher <jlec@gentoo.org> mtr-0.82.ebuild,
+  mtr-0.83.ebuild, +files/mtr-0.82-tinfo.patch:
+  Add compatibility patch for ncurses[tinfo], #468670
 
   20 Feb 2013; Jeroen Roovers <jer@gentoo.org> +files/0.83-no_ipv6.patch,
   mtr-0.83.ebuild:
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index 97ffc7c391e7..14180b7e3174 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 0.80-impl-dec.patch 226 SHA256 55f7f19bb3718ee18b25be15e2a85e432d2c5d044571f3a08d3b117b0fed7c4c SHA512 71c53c22f4ff99b29cd71f4e910e857ea0f4f497d25dcd59295ca2b59eb7be40d021d865489a53234d5fa4395f6baf011073d117653ad82aef78562a60898b1c WHIRLPOOL b9816c9b0b78c2d71be696b40aef762eab7006ff04e0efde7f0a03dd2cd0bdd0f157d71ecb5ac143fa8e24fbda7dbe88db2bceccfbdaa2d8ab970203ff25a50a
 AUX 0.83-no_ipv6.patch 402 SHA256 5054eda3e569fd7880e07ad86f13aade477163005369230774a2cae603a3f4f0 SHA512 fdab9a23088b12f6aee2420d60dc53afa1f3f9a5f506ab0a5f1e29b76340a6852d4d8e84a5c230ec980fcdf819f7ff255779d18a7a468c38dc5213e873de1548 WHIRLPOOL 88a0f9f3898f763358fd911b7c82dd5df7d5ff704b0de5c9599a1fe176a3f26f116c0d443a5ea0416755d9d5105a275bf6b25fde27e314d3739309552b742934
+AUX mtr-0.82-tinfo.patch 990 SHA256 022d45b19e6ee8a59d6198c4c5ea9ecc3303906ad8b99a69b0d31071020f405c SHA512 9a502e251bdec96b7596aaa00429d582562f6f598e8a2a3ee59b552aa52381e88c4b83fdc9afb8202b3a8b8fbeb95a92fea6c3644594c3b67a4ef42d7a978069 WHIRLPOOL 5172afca4ca1be2cd0a42c49c0944709d2104fbd0a78c26bffca893112a5c6f0a0437d294413895fa1163a7d7c95b0e770fe7ef28ee66c132f403b6e96b7e5f9
 DIST gtk-2.0-for-mtr.m4.bz2 2508 SHA256 59152f9a4a1af5cf09f2aaa804c9071afe3eb6632162f1660d85c820db342eba SHA512 0f593b761d7a9399469f1f7bb3992133b391a2ce760ecfad96237561992802c192b810f4722763685d5f6e7a76bd2806abf08e1850bdce00e5cd3af4c810210f WHIRLPOOL 8bfa2cd70c2aba06473692cdf3e091a983aab69cdb5be3d0382b6b87c05bcc577ecb1afab26afc17ee16d07a1161fe84f17e3cc9ae0a150364f34667cfba5779
 DIST mtr-0.82.tar.gz 270245 SHA256 f3b457c9623ae03565688a7ffd49d4843a5e2505ccaf3ba8d9fbd86e3ce9b6a0 SHA512 122bc7aafe4441505046b331dcc42347e939fd974ece508dad04a7630904403eaec49ad6b2e483b5a94fc07726a14fad1405306c3729f1dc9b707ea66b529751 WHIRLPOOL da350fa3ee0a84f40a7cf84eec30eceab1583ec270748b593b2e262207147feae72f47d4df1ce1b90168d4b42d29b280c00117f0f244a22e0866f3e5d7aece80
 DIST mtr-0.83.tar.gz 319462 SHA256 4ae16b1eacc4cdf9e635e68bdbb551129223009921bd1c5cc74fc6286338136c SHA512 0a731e593256b755b2a3d8443979ac07684fb910a91f178269ce25afa3f9aa19aad0b35690cbc446e1f757cb22b40aaaba2eece472b95e86c565b3f9e15c3303 WHIRLPOOL c02675d2fa80ebeefc7bb207829c7e06d81c18df47cd83fad0693c65b5ddd3259ea58b59ffc7a9d7f97613997e9adeeeeb776d441845d3700424cd085750e125
-EBUILD mtr-0.82.ebuild 1516 SHA256 979fa88c80572f85149cedeb2d10469de44e64305877d7fb9d2ae795cb01f947 SHA512 a00dc6b2961e82ab15504810282a16a5010e80541fcbe4ad299e0653e93c2147327e112ebf7f9db67185ab17704850c692e565097861a87d2c8556b6c5eade18 WHIRLPOOL 468030ffac6b7e4a8acf76736c50283a5a9252c6d949b6e78938f6487d7f709099f70e1e448bc9a95e24ef35ca5905b202281f7aca0e74357592d4309613f724
-EBUILD mtr-0.83.ebuild 1643 SHA256 86a9e2e3e9beb99be751586f105d57da5507401144657d81ed88d2a146a7fbb1 SHA512 0078a1d331310140f1ae08112f362e419b057edd1bb06631c84b33bc1256280bc7714109d41e38ecb3d41c72efcb3824338f7b1fbb361ae2d9f4e960dd3f1dcf WHIRLPOOL 66e71f513cccb0feca0d18183510fa3cf78db488a239a7206558de91c868045c8b9e697d5663121673b5abd38d4b68946085c3908596cc9029289130f18dcc9a
-MISC ChangeLog 15190 SHA256 543d05fcf4ffd65a2a048f8ab9f9c0d1a646fd3ec37ceebc8ebedc5ff9fac22f SHA512 f57d3a7abd140398e6f7aea5b73f5b805aa57d42a28256e9432e968d98d02b7d902466d1e6aedb948e5b54d3e19dbee9d68c40f0f49a6a43c856a45dda476744 WHIRLPOOL 185c00f3e295c5207bb471fb0d5564cafcb640fb543a76a8eb4477a61da51381f48d9363957c6bb0f44424f7398599d11146436669e77c93e8de4776e9fc6447
+EBUILD mtr-0.82.ebuild 1550 SHA256 c4e15cb31fc7196fda02876c9537b66e8bd75ba8d0ae11060f1ae0e111ee90f8 SHA512 af64d206de383025266f09b4111c8d4df16c77f36005d4c229b40d111266335d2a64bfa8b64729fe938fc514f4e092b0327048af6ecb60795ed84e6ba910c92f WHIRLPOOL fd23a66845dfa4178443ddaed121c60105ff4c9c36ae5534eb55b6e55532e7392755b3da6ac2768a4721a89e46665851eb83ac051c01d41f157b8ead21a92b5f
+EBUILD mtr-0.83.ebuild 1685 SHA256 f6534142bbcb20acc1949363431c30cad51eb01c52d5582abc13be5fbe72cae4 SHA512 63b0860c2399428b764d92e0234b5b64d157852b88876d0a5a23330ae9fcc984ef2f86af0197e49ffd88aeda002f034302f259d0160e646bf229884ac1df1e5e WHIRLPOOL c4e4dc589c7d87bc78427278a9374ec7868aa7aed40e556ae6e78d96f52f6fff56ad8c07120e2fe52315210bda90a42ee30b4cdf9cebd86046f1b125c2261311
+MISC ChangeLog 15358 SHA256 83cf5ba93cfb715a4e6655b35d06f6174a0a3b4254094ad83975b0f4601bb36f SHA512 0250a61bd5b5fcbd38c0ad11beb530fce92c1166d37688bd0dd401c0031d7dda92032f23d4457d1b12bae269b7ea74990d3b471d705a0c250f45297f4f79878b WHIRLPOOL 1bdee870f6c2666c3943451ca72c7405be569c99f587c6f8753e5035696f62a53d6b434659fbe51203546b7691f7950b17186a37c982ca09794629ecb69277d9
 MISC metadata.xml 244 SHA256 4b90774b23e03ba5cfff56d639ba013394dccf7597849fc010e54f69042b47d9 SHA512 1e6d38f1ed92a6771bc35aa6b0c9dd9d6b58308947c2e2ffe06a827cf1ae41c7c570b7e806112e21b14d4a549eeab9f63b8891de0a25f3f5f5c9d42199b025f9 WHIRLPOOL 758fb22a0c339694f8fee0784423405fc3b250ad2d76e37fb6bb0af1376ba6c1b4b55a2956c3b3beac378965c422a159278293f36042267c771785158a09c540
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEk2JIACgkQVWmRsqeSphM3BwCfVarVdgxLjXjK8ANXwhu0L/zf
-eLkAn1fH9sb6YDtzzSX7QRkg9VVnc9YJ
-=CNqd
+iEYEAREKAAYFAlGGV1AACgkQgAnW8HDreRbOXACfcHFNpWIM/+Q8fgA+3dvl3gXw
+HUEAnRn14w6P4MzHQR0vW2z5JhygcC5O
+=6Twj
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/mtr/files/mtr-0.82-tinfo.patch b/net-analyzer/mtr/files/mtr-0.82-tinfo.patch
new file mode 100644
index 000000000000..2f367d214c6a
--- /dev/null
+++ b/net-analyzer/mtr/files/mtr-0.82-tinfo.patch
@@ -0,0 +1,30 @@
+From b87e312cba8cd1ea8b08fd33fba86cc19fcafb1b Mon Sep 17 00:00:00 2001
+Message-Id: <b87e312cba8cd1ea8b08fd33fba86cc19fcafb1b.1367758397.git.jlec@gentoo.org>
+From: Justin Lecher <jlec@gentoo.org>
+Date: Sun, 5 May 2013 14:51:01 +0200
+Subject: [PATCH] Detect tgetent in libtinfo
+
+For linux when build ncurses with --with-termlib you get libtinfo.so by
+default.
+This patch extends detection of tgetent to libtinfo
+
+Signed-off-by: Justin Lecher <jlec@gentoo.org>
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index ebcb993..5bcc545 100644
+--- a/configure.in
++++ b/configure.in
+@@ -24,6 +24,7 @@ AC_CHECK_HEADERS(socket.h sys/socket.h sys/xti.h arpa/nameser_compat.h)
+ # We have to trust the linker not to mess things up... (It should not
+ # pull in anything if we don't refer to anything in the lib). 
+ AC_CHECK_LIB(termcap, tgetent)
++AC_CHECK_LIB(tinfo, tgetent)
+ 
+ AC_CHECK_FUNC(initscr, , 
+   AC_CHECK_LIB(ncurses, initscr, , 
+-- 
+1.8.2.1
+
diff --git a/net-analyzer/mtr/mtr-0.82.ebuild b/net-analyzer/mtr/mtr-0.82.ebuild
index 581100bbbb97..9982bbf92d36 100644
--- a/net-analyzer/mtr/mtr-0.82.ebuild
+++ b/net-analyzer/mtr/mtr-0.82.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.82.ebuild,v 1.11 2012/05/06 17:44:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.82.ebuild,v 1.12 2013/05/05 12:57:51 jlec Exp $
 
 EAPI="4"
 
@@ -23,7 +23,9 @@ DEPEND="${RDEPEND}
 	gtk? ( virtual/pkgconfig )"
 
 src_prepare() {
-	epatch "${FILESDIR}"/0.80-impl-dec.patch
+	epatch \
+	"${FILESDIR}"/0.80-impl-dec.patch \
+	"${FILESDIR}"/${P}-tinfo.patch
 
 	# Keep this comment and following mv, even in case ebuild does not need
 	# it: kept gtk-2.0.m4 in SRC_URI but you'll have to mv it before autoreconf
diff --git a/net-analyzer/mtr/mtr-0.83.ebuild b/net-analyzer/mtr/mtr-0.83.ebuild
index acf80e8e204b..01f36ddc942b 100644
--- a/net-analyzer/mtr/mtr-0.83.ebuild
+++ b/net-analyzer/mtr/mtr-0.83.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.83.ebuild,v 1.3 2013/02/20 14:07:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.83.ebuild,v 1.4 2013/05/05 12:57:51 jlec Exp $
 
 EAPI=5
 inherit eutils autotools flag-o-matic
@@ -27,7 +27,8 @@ DOCS=( AUTHORS FORMATS NEWS README SECURITY TODO )
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/0.80-impl-dec.patch \
-		"${FILESDIR}"/0.83-no_ipv6.patch
+		"${FILESDIR}"/0.83-no_ipv6.patch \
+		"${FILESDIR}"/${PN}-0.82-tinfo.patch
 
 	# Keep this comment and following mv, even in case ebuild does not need
 	# it: kept gtk-2.0.m4 in SRC_URI but you'll have to mv it before autoreconf