Add fix for ncurses[tinfo], bug #522706

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

diff --git a/net-p2p/rtorrent/ChangeLog b/net-p2p/rtorrent/ChangeLog
index 75c3fff0828f382f7a9b49e9343474466cc4944f..5e20bba06c5261e64f30806d7e59864f14ce447c 100644 (file)
--- a/net-p2p/rtorrent/ChangeLog
+++ b/net-p2p/rtorrent/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/rtorrent
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.196 2015/04/07 14:31:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.197 2015/05/08 14:31:42 jlec Exp $
+
+  08 May 2015; Justin Lecher <jlec@gentoo.org>
+  +files/rtorrent-0.9.4-tinfo.patch, metadata.xml, rtorrent-0.9.4-r1.ebuild:
+  Add fix for ncurses[tinfo], bug #522706
 
   11 Mar 2015; Manuel Rüger <mrueg@gentoo.org> rtorrent-0.9.3.ebuild:
   Fix unquoted variable.

diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest
index fa3734ba594c52d4a89aab1c6f0f3ad1e7ede0be..4d43eb2439c47dc4ca123eae340a0888b751f92d 100644 (file)
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -6,6 +6,7 @@ AUX rtorrent-0.8.9-canvas-fix.patch 9995 SHA256 f53eca85da4800f123f1f482dd49e07d
 AUX rtorrent-0.8.9-ncurses.patch 618 SHA256 67002221b79bb5e43e8ed05ae0ebb22130c10eaf5739acbb1fb424050f2e2a05 SHA512 cc71e44cf748d6548cffc66b7a6d9f0873ef009fd028fe1f885933100eb01da80232443ba01f8968402c63c17b224f8ce8dc3cb6ad749bb4f0f7f932b8539c5c WHIRLPOOL 3ffee3947bd3c81b35b96a4063bbbab79138da1752943e7a26d3bb4d53d8cc16c332c7df33ed1714700a45c51a01474df090c2dedbf64a559c22fc2be99bb301
 AUX rtorrent-0.9.0-ncurses.patch 416 SHA256 043f85f5e77de132f5a8aeccc894f11fad961f237a5c092dd38e163620f6e40e SHA512 bc36d56880fbfb99d6e5cb19688d733d79a89c8aec88913f5962ea72503e4103b34eb2a67be76bbe80c35beda972f6fc5dbf1947f89624bf5e117774688e7cf8 WHIRLPOOL 211bff140ee9094fde6b9f21a0a853c26d79f79a9727203ee7d96b010795620d5d7eb01d683cfceee0a31c5d0c0701a85054b259f7c21c35ebac0ccd9de4fe53
 AUX rtorrent-0.9.1-ncurses.patch 416 SHA256 043f85f5e77de132f5a8aeccc894f11fad961f237a5c092dd38e163620f6e40e SHA512 bc36d56880fbfb99d6e5cb19688d733d79a89c8aec88913f5962ea72503e4103b34eb2a67be76bbe80c35beda972f6fc5dbf1947f89624bf5e117774688e7cf8 WHIRLPOOL 211bff140ee9094fde6b9f21a0a853c26d79f79a9727203ee7d96b010795620d5d7eb01d683cfceee0a31c5d0c0701a85054b259f7c21c35ebac0ccd9de4fe53
+AUX rtorrent-0.9.4-tinfo.patch 1125 SHA256 bb32f2be4d4a82259637ff5feac16f614a18263c42bb0a9f7c2b590552960633 SHA512 8281b6e1e26adc0a23cc0f593803c1e6d61b1b7f4c0ba4b5a72c3e323209b51ef03ff9982170f8bcdfd976c74825cb2996f07f88c6cddc2a41d6cc267921ebd3 WHIRLPOOL 26a2c9cd1f56f6e1e8cb09be71383826b3e11144bf2b25a33e17de80a33788515eeed0b333967903c39a3a94745a5f3f4a91ba70cff3cf1f2b20fde0e0e358b8
 AUX rtorrent.1 18204 SHA256 bac10215777c9a22826f56f6218b21734306e30e179deeab47164a845b01dae9 SHA512 f2d3fb87fd7c321822ce9e61cc334682f9692e3f86b42cb3d7d5826dec53d56e631e20455e0ea1e53448c11386988a6e7a70a91ed2923f90852956ad3fdafcfe WHIRLPOOL 6e98f2ce7660cf00fd8a7fb8d9cfcb2f44867a18d3376c6434aef0cf61703c5939743f7194ee76de3bb7b1dccf5fd8a4461047f96c210c5b13afee58048ee76e
 AUX rtorrentd.conf 13 SHA256 6725e7a3ed74f1432bd6b317f2aec7f9609bc20dd81dbbfcc632342c9f99177b SHA512 f241452b812a1837660f9ad52881feacc02825e82ea7ac19acc662b4219dd58997ea908275b8c9ee78ed791babf79c1a91069dc6d5b5fb3c461e3026cdeab73f WHIRLPOOL 11f799ee54cc3f4ae535fca30d4f41748149c6869a2217f7c67e03ffab87792e5d5679d6fcc69697b8ffab60690e7187262e57bc68afea0a3244a24095db2235
 AUX rtorrentd.init 815 SHA256 f05e05330276de79ddb8e37effd3acd6060c10a30d8fb3e6bb1e6768ed942d56 SHA512 71a49feaf80348d27f4854976f1cceab07081c11a332c636399dc42a0d7665b26f3a2d6f5799f09b25b151ec44b8f01dbbae4c9d1a8335496de68047ce16f77c WHIRLPOOL 4cc76dbb45691b7282908cdf445701b62f8f082279981d312b6f47c474d3c2c7122ac19bee05e7d12a5775521e833d137bd0ade5967442810daafa97f37a3175
@@ -15,26 +16,26 @@ DIST rtorrent-0.9.3.tar.gz 583311 SHA256 9e93ca41beb1afe74ad7ad8013e0d53ae3586c9
 DIST rtorrent-0.9.4.tar.gz 601913 SHA256 bc0a2c1ee613b68f37021beaf4e64a9252f91ed06f998c1e897897c354ce7e84 SHA512 ae243d0336acff50e91e4ed9d306beb4705559775518e6dc122ec18a1530e59e2c531cf54f4b79899a1569ca18d343fce255071b45c41df1357bddfe926692aa WHIRLPOOL 03eb3cff0f7d490ada2199310fd2ba7576de8e20557e532df49be17f84aa2afb9cb8137b2eb317bc0fb4ce8ce035e900c65c32e81dc5d5d215923d91e8c0612a
 EBUILD rtorrent-0.8.9.ebuild 1875 SHA256 92b53a9cee44f872a3f2b076c2d295472d487caf62c60c031a57fc2b507592df SHA512 634fcdbe0ce29e4777fb4ce1609a28ad2f04f4c420318f7825aed55b5b51287c6a28b445b4a213c9d0c7f65024b7fb8b07fa6bdab7049356413ba159eb6447cb WHIRLPOOL bd781524617c339217c28cec34b749510d91461eb54d2e85e7986085a5455c67f7376d886e58af701f1f0ff5caaad4ce969951d3f56ace1c3b6928f33b4f5564
 EBUILD rtorrent-0.9.3.ebuild 1557 SHA256 58de765bb896d6a2d566d8201d8708b9892bbb43a15a5bda3d2af103198e2248 SHA512 0c24d469d72e709f951ab2d867090eb7c862d0d7b0d671ae15b9d3c55eae93acbe1363c56715131dcf69a97d61085157b5678a0622f6160f57266ddfbd77fa40 WHIRLPOOL 7ceda36e1d2850bd88adbeedb9ae543b1ba21f055c5ee30dd1604048725357e2e4712657dfe7ecdce7d28cb7bfec35ec637d6ce94836770e8ef268007c8ff802
-EBUILD rtorrent-0.9.4-r1.ebuild 1647 SHA256 4fd50f347216be571ac6f3861223062e313259616c5ed29fd18722d7dc163e3f SHA512 0f1043533ba9987f138bbec1e3914121a51754d30ec6f8edad8b774395dbec7792451929b24c30cdc5652c1960187a8fb921d7e8e4efe5f664c6b257cdf6ce06 WHIRLPOOL 1d51422ad33be90764db90d5940f820fae3f8d21940a004f07d92fca79872920b683c806bac1b978856cf971f62f1d318928dce1f27903a1355b4ae48972b882
+EBUILD rtorrent-0.9.4-r1.ebuild 1709 SHA256 e10bb5c7ab162f72af8cc2afaaaef3ecf97ce2fc90cb083e0f48fdf0e8b1fa09 SHA512 890300bdb64e5d2d0ae58ed25ce70c46a5e348c72b622e79caee029f1f7e5b64b73afc1b7a6233fbe5dc753cd3982189232c27b597e83b870282ea79e40cdc53 WHIRLPOOL e2965d80a4361736f1f9f877239b8b293de2cd75ce967d3dee418b98741cf269fda4dabe54d3d1b10366d84085908c5fa6283dfa1422d108dd707242e67fbe53
 EBUILD rtorrent-0.9.4.ebuild 1562 SHA256 859401cc0e4c1d7546811f69b2959f00d33349e37c37b0587e3295bdbf09a5a0 SHA512 2a3639ca26265ed5de9b6a4051e0b688f5a3ce3dbf656a80fbb4f49619dbb4fee916d63e75133807f66608c73d52534c8b5f77437bedc86f0e088d0d75aa6b7a WHIRLPOOL 46158fff46355159afefd1329dea49ebcd01fd0ac12d345bb88d9498f70cdd9696d1be08a877f8902b9000c4657bbe5ce914d15cd0ba79fc7c7026b4e27ff835
-MISC ChangeLog 29437 SHA256 511b41bc0dd52ccb98fd8aa779c8c57a6efbfed65e50c7250b47ad7cf73103e3 SHA512 2f6aa12b8575ff93d32477ed41c26029dec9b0ba554b9b87973705b38e7a033f6d14157e0d78766769df894b75afec2c10d5d130c7b33288598cf97ad642b989 WHIRLPOOL b4ec68e3b384be91d437e97cdf632416d78e1f7d1ce817f8effb33c08bfd6913878bfa9d4a810dbcde33b598ba319b9f23b77c78557255cd0cbc5392054cfea2
-MISC metadata.xml 461 SHA256 db7942b39f614d72ff07b2ca64acbddd975cc016761d0037eb9edf786a4b295d SHA512 3d458e127eec25eeeb9798411adb32add57a13b908d66ecf6b2c414df3cef9d65322c46a103616ed423554b052e52701af7a34a5157438661d88f85fce52f6f0 WHIRLPOOL 395cc9fe276a67aa7d0d7e0a04f27c85d9e16c17d872e85bd240fd149c8f36497eb14958a810c461f8e94056e44817c1d169f37c1964fa91bb0000ac54038139
+MISC ChangeLog 29604 SHA256 bf85500e6e69b04cabf12c112da186dc57fd98eee1a78ad05af1cbbf8df53cff SHA512 b7947cc7ae68a86c626af61ce0e710f9ce0cd233b15e8a1876d76176a671194b64f5dfb9ba609ea485e41971462fc9603f14b031dfb8b6ed2cb3f68f3c21b419 WHIRLPOOL a8333b21e21716634c72bca22dd2043cc34f8f3bd1260059f4471e4de945dc278c14e197e303d0ecaee66da87b7f9a2f6940360d6d6e888e2d51a17a79ede8cb
+MISC metadata.xml 474 SHA256 19b1e0475ddad1f9eb202436b710674f7c05d0b50fa392e23a9b625aab29e2a2 SHA512 49d70b5c0064fdd7c12d33b3ec2cfceddb80128d15cde1d9c6a9a165ec95a757f4e2e1c8a4bbabdb5ed300ca67d08bd3ceecc7b3f414f2f2d6cb49046847b6d8 WHIRLPOOL 707104aae777631fb37b8f316d4fb9f547ba4af1d9681d1c4bf56b6ef25a3e3da78899c77f6452c9f4b8cea18aeafd896b78e406217228d93d04ceffe0e46aa8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVI+pWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FViru7EP/2n3xUcf2i2O8qLnQkuVXHzl
-tjbOeu4fn4cSevcBmRpL5pee4Huuc7NW0Q/KvhBE90Y5m3i7fOjTCau0+R9OE2Vq
-Sh38dlBx7OlAR2UzA4ee3e0dOkeuySONMSKKBkjzigRjFNYuW7ClApF5ztl6fWVS
-u253+zFzLuNkyIWXxsc7omUwENQyrc6KsmGaXRnMvwrQRajUhMb2vz4KITYy3Gue
-XR778nLnyRRbMHqwtstJ/rLZOXx1L2oze0xz/Yp+egajfxevy3ufFIWAtU4LA0Va
-ysauBISRv/Th14Btti6nDS6DGhc2kCnGlIuTUMKweNE9RmANNQYqSiAZLbbUCz5/
-//zJWZfdUqqKgPfCIxQAhN/PXoAaoLQ4OFn4YoS8rA1LMU2pe1QIDKpaDMRXkO3H
-Lp+tOYbSsKuSUhiIueLdih7lO6ZmqvBWJDTVyiMpSB0UIo90XSNpQFHjzae6AGd1
-PsFLHdEwv7dpgHhhIIqTS/OklZ8uEjogE7myW29mejN+9mHdmer5RqDhQ+qw4Q1D
-6XG9q2Vnvl07Lki1mNmbp6pWlY++vcuEv4DcwaQDsYbKfduugNMPVPPhag4HRsGM
-0wz3AV+DmMLH7ZWHiiqAaKUCwcHoH4nZXBdVZNs4LvsMqfgM0A8VCHFZaRFbnXcG
-Aw3Rr0l4hlMoBTAT3w/j
-=xOex
+iQJ8BAEBCgBmBQJVTMjPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiIcgP/0q1MRhp6vTFlm44LFrES015
+wlIfKhy52grkL+FvQpTabw8hr4oXByBWY4S5MKylEXPTZk1/n/9Vsn4CBQOB8/LC
+fLUXIKijgaZhv+LaQy8h7P1wBd89ykVDvE/PMJ45+TVn7OLD6+8Ks2SLwWykz1qc
+hQpE5UbqSWn0Gg3uomoE9FUsQAWs53V+RvYdOR1oZ/NUSyAmT9HSkh5Ph1M6thYz
+v0UsJotUvlMPlxqcEyvj5ZMe4XTBjFrX+km5QZZ3OPy08y2yUNzRYv1AzeeeVXrl
+CjQRp9HfKXnnTT9MOSjAUl6TJXlhaYIzoOJutroo3j+W8EdeWIKnPOScuisx+nWh
+1z7iXy8O7O2/og6yzUaDCBjdc8Sw7O2S8RKjj+S1XHM37um5lzByFdgNZaoyd+Rc
+S0ueyibCKWal652I3xc1jdwaSb8SMg9tgvqKTmK/6udBXHKa9CRUBNlPi3DPETG8
++ZFNQoxpFtLK6z9qX5mA5KAWW2N09K2geaQ2+q/wCSRyofP2c2MxYAw3A5l/wiRW
+hm0lRZ3fRhh/HAjkch7yZjDrwsCQ42QIhVB5pBUWy3mVqnmsqlh/P8tC8Z/v89of
+TLRJhODvAGj8RJDWWxuwedNYAySpSVm2gkWQVjEognTZ+3cVIYzzbCMv6mJ6X34t
+MahyfQ2t9/4wZqqi00dk
+=zzJr
 -----END PGP SIGNATURE-----

diff --git a/net-p2p/rtorrent/files/rtorrent-0.9.4-tinfo.patch b/net-p2p/rtorrent/files/rtorrent-0.9.4-tinfo.patch
new file mode 100644 (file)
index 0000000..19e8d04
--- /dev/null
+++ b/net-p2p/rtorrent/files/rtorrent-0.9.4-tinfo.patch
@@ -0,0 +1,35 @@
+ configure.ac | 18 ++++++++++++------
+ 1 file changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 430c15d..50ce687 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,15 +31,21 @@ TORRENT_WITHOUT_STATVFS()
+ TORRENT_WITHOUT_STATFS()
+ 
+ AX_PTHREAD([], AC_MSG_ERROR([requires pthread]))
+-AX_WITH_CURSES()
+-
+-if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then
+-   AC_MSG_ERROR([requires either NcursesW or Ncurses library])
+-fi
++PKG_CHECK_MODULES([CURSES],[ncursesw],[
++      AC_DEFINE(HAVE_NCURSESW_CURSES_H, 1)
++      ],
++      [PKG_CHECK_MODULES([CURSES],[ncurses],[
++              AC_DEFINE(HAVE_NCURSES_H, 1)
++              ],
++              [AX_WITH_CURSES()
++              if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then
++                      AC_MSG_ERROR([requires either NcursesW or Ncurses library])
++              fi])
++      ])
+ 
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS"
+-LIBS="$PTHREAD_LIBS $CURSES_LIB $LIBS"
++LIBS="$PTHREAD_LIBS $CURSES_LIB $CURSES_LIBS $LIBS"
+ 
+ PKG_CHECK_MODULES([libcurl], libcurl >= 7.15.4,
+                 CXXFLAGS="$CXXFLAGS $libcurl_CFLAGS";

diff --git a/net-p2p/rtorrent/metadata.xml b/net-p2p/rtorrent/metadata.xml
index dd9423df796b0f24f5db83d3bc894dd53bb9ff6f..678efcd7885ef2c9ee7a7209ec82e0adc2a72bb6 100644 (file)
--- a/net-p2p/rtorrent/metadata.xml
+++ b/net-p2p/rtorrent/metadata.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-p2p</herd>
-<longdescription lang="en">
+  <herd>net-p2p</herd>
+  <longdescription lang="en">
        Console BitTorrent client using ncurses based on libtorrent written in C++.
 </longdescription>
-<use>
-       <flag name='daemon'>Uses <pkg>app-misc/screen</pkg> to daemonize this
+  <use>
+    <flag name="daemon">Uses <pkg>app-misc/screen</pkg> to daemonize this
                application
        </flag>
-       <flag name='color'>Add custom color support for torrent list</flag>
-</use>
-
+    <flag name="color">Add custom color support for torrent list</flag>
+  </use>
 </pkgmetadata>

diff --git a/net-p2p/rtorrent/rtorrent-0.9.4-r1.ebuild b/net-p2p/rtorrent/rtorrent-0.9.4-r1.ebuild
index 696e58b9c9682e765b591cad63feffcf0640760b..ede17bab3fb02a565d575a1434013c2a18855975 100644 (file)
--- a/net-p2p/rtorrent/rtorrent-0.9.4-r1.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.9.4-r1.ebuild
@@ -1,10 +1,10 @@
-# 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/net-p2p/rtorrent/rtorrent-0.9.4-r1.ebuild,v 1.2 2014/11/02 09:28:15 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.9.4-r1.ebuild,v 1.3 2015/05/08 14:31:42 jlec Exp $
 
 EAPI=5
 
-inherit eutils systemd
+inherit autotools eutils systemd
 
 DESCRIPTION="BitTorrent Client using libtorrent"
 HOMEPAGE="http://libtorrent.rakshasa.no/"
@@ -32,10 +32,14 @@ DOCS=( doc/rtorrent.rc )
 
 src_prepare() {
        # bug #358271
-       epatch "${FILESDIR}"/${PN}-0.9.1-ncurses.patch
+       epatch \
+               "${FILESDIR}"/${PN}-0.9.1-ncurses.patch \
+               "${FILESDIR}"/${P}-tinfo.patch
 
        # upstream forgot to include
        cp "${FILESDIR}"/rtorrent.1 "${S}"/doc/ || die
+
+       eautoreconf
 }
 
 src_configure() {