Look for tgetent also in tinfow, fixes bug 544608.

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

4 files changed, 30 insertions, 18 deletions

diff --git a/games-emulation/atari800/ChangeLog b/games-emulation/atari800/ChangeLog
index 9355143112a8..c420d954dd38 100644
--- a/games-emulation/atari800/ChangeLog
+++ b/games-emulation/atari800/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/atari800
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/atari800/ChangeLog,v 1.40 2015/03/25 13:53:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/atari800/ChangeLog,v 1.41 2015/03/26 23:06:52 reavertm Exp $
+
+  26 Mar 2015; Maciej Mrozowski <reavertm@gentoo.org>
+  +files/atari800-3.1.0-tgetent-detection.patch, atari800-3.1.0.ebuild:
+  Look for tgetent also in tinfow, fixes bug 544608.
 
   25 Mar 2015; Agostino Sarubbo <ago@gentoo.org> atari800-3.1.0.ebuild:
   Stable for x86, wrt bug #544244
diff --git a/games-emulation/atari800/Manifest b/games-emulation/atari800/Manifest
index c3999fb8fa15..0cd1b3bb0fee 100644
--- a/games-emulation/atari800/Manifest
+++ b/games-emulation/atari800/Manifest
@@ -1,28 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX atari800-3.1.0-tgetent-detection.patch 690 SHA256 18dea42114b5a9ee787d79155eacd4a2f60fa501f52a3b6182fe52491250c43f SHA512 dc045dc72b011fe2fab1b440a5fc50c3a34dcb4cd867efa9a8276cc770f21778732adf6c59e5a3daec0cd37364a83f877c739d1120d468af9372d088895850e5 WHIRLPOOL 8747fca6976eb1a4744c079481b374ad38623680d50cc19f237dc0cf7d6b2ed3f90723005e183455ae64dd1a92ea00cce1a916c4134d5791165208d3c93e96b0
 AUX atari800.cfg 467 SHA256 562981fd5d3e1e028c3da484ca18bbe5c0a7f5a01eb8740cff14c4a18e05a3e7 SHA512 17f43f9f1b8dcf1513eefc8b89e94ecdaeb3f4e324a669e09c1f8b180e3c545b474164f73bc4c319dde27dda8effa1f2786957854ade81d161221e081c87d358 WHIRLPOOL a6a26be88faf3515a110f8396009b40448e35fdeb806f7bf213658a1d469e35981cb4838179c3a551e9878b2f29133990bd3415a8c80fc77b89ee850d018e6ff
 DIST atari800-2.2.1.tar.gz 1419198 SHA256 df17f719a3f94b5bb128c5023534552763edce41815489993b2d0326c7a2703e SHA512 1294701355f892db29144f632697335e7abcc4a162acb4db3102114e03516f9c1f6d49ce79013aa792cfa556b59d39dbad312757419286a45ddc1ec9777b472d WHIRLPOOL 4161e57d805d57b7c02369c9c25694b90be200a11a004279108a6922df844773ac8d2e64b54c211827108e39fe76d7527e9e79e064697d6c49457a4cf9713cb5
 DIST atari800-3.1.0.tar.gz 1492289 SHA256 901b02cce92ddb0b614f8034e6211f24cbfc2f8fb1c6581ba0097b1e68f91e0c SHA512 c8f035c9be000c67dd854a14a236d165e6e2d30b5138f8772c6ea5c5290b0410525570e3ed9dcb2f9bcb129f97a36e6eef5993f0a5ad3cc993c6b59b127bcabe WHIRLPOOL e635a16fc8b2af8257f6f8d0e67fd155e98aee0d2c2831ca6c847561b1131f13b75c24a6ed68f089f0e1b04eaaa9d1e2239d53608875337fffce37d16a3ae5f4
 DIST xf25.zip 188942 SHA256 98ae0ad10413dd6f35ed80f5662dba6d790def70c7829046e52012a03b574b8a SHA512 306612fc2af41ed10d76103af83e141cfd8bd3ba2ea3cbd1d0b81d4d5b0108c06948a5c626648c8a2424536757a42a3f8b9af1fb63fa3c31096447ffed0f9923 WHIRLPOOL 58a77afd803b740b2be5038223bac173dc1ccd8e062d0e8e71355c496e113d1d486b1d8fc2e06e0ee58bb8a34948fe6be41312107bd311bdd54ae173ac850f5f
 EBUILD atari800-2.2.1.ebuild 1807 SHA256 fd2302f94191c71b9e6a057dca883309dcee49359fd6f92d4ccbee19eeeebec9 SHA512 02a6ca61de11c84ac8a356e0a7ca4d8a391f121b8fedfd5e6f402a429ac13bb9d5abb809e7deb84403a1bd2d9d92a21b19cb1f739391ab8b0be3a2436b8170d5 WHIRLPOOL c16b3091a601999f26299f660950350a6f80d28c19de3fb88f76557404f0ca6a3ad182be05b64ea8ee19fc5791c9d4335df881549dbe4a6ac798c29176cc2d4d
-EBUILD atari800-3.1.0.ebuild 2035 SHA256 579670ca90451a7a17dd0ae81b0ef7aa0a951d298c6459a48cd393c77431e69a SHA512 221318579b57bc47c228edf7e737ce1ec7adafd8c5035b4af1eaeee931e11abc24fe0629e2bfa798374455c3bb4f035b27239fe0e6b949e550de03c02abb7c7f WHIRLPOOL c96200ff36fbbc600d539fb3f847fca2fc7fee0fbeaff94785afde58dd960a524c4d411c76594ee4298101154c2e0358d76e7412bdda83bf48d66f3f2626916d
-MISC ChangeLog 5962 SHA256 8b5df6ae97b8b213c860c086f9da350b7da1be263e4f68512c34a2ad73705fa4 SHA512 c3d63ebae1b393b5bc0dfae11a250fc9134a4342212fc265dbf86b1d76177bfec544ccb13c42aff67a5b5fcc7e00062ece21ee0e088a76fe66b4aede1667e282 WHIRLPOOL 885a6fad4b4d02947d5a477a6cb12cf8045abe234c6dcf6c57b507aae69896375b160b008c3709dff5aa19ecd8950882a4cd242526e580dcf4e369d827b16de9
+EBUILD atari800-3.1.0.ebuild 2179 SHA256 df2df8fbb0412f174bcf2e752e27cba0b4c68e6a5c80167ee8bc76e9e3925e75 SHA512 87621444168c9cf5ad933e52d8d4d84f5da9036dab6d26514449661a0574abdae355fa4d6c0e80eadeba2125cc0f719c02234b138e2404f9d53ce4a0983f6fb0 WHIRLPOOL 99a72fb64921ccc9338926395f236c66d980459bb7293e59989041685c869a9001e95968525bcda5ec56598a2acd3fe4edfa39108ecc31c0bd72d12fa0704804
+MISC ChangeLog 6147 SHA256 1e6446a960ac0f15bf5ca6d7d26e4ca33019f1fee86d939a7770fd457697f986 SHA512 84c6b723f055090706af0787b8ea457350bfd4ff656c660758dc3f2eabcae9dd8ea0cc1792bf5d0bc5e0c5fe33782e2391d416170ec6d315eee94aa791f0b518 WHIRLPOOL 116771b07872611fcfe9e89d03ba3fdd2cac769aefa8ab63be599c69570fd2cc3a8a7b48b3e09af5ce34fd78d2733167c07307ff489de4524b415553fcfae39f
 MISC metadata.xml 776 SHA256 220ac4874a800bf3105d0c8c715b3f105d257d9e3b55a909cd602537ee96e9bf SHA512 7500af02e1cd416c2f519d2f38fd3ffe5ba0e60a4f7fafa13d862d3058d02abff7deed8beffc5484838ac1e4ff10aad6c7160e34028470fcbf0c3301f24d1c0a WHIRLPOOL 640ea3ebaca8d06432a1dbb542ef26a428bfc9cfebf24380ad02d4b66c172f1b5e1f9bd0c99f95725cc3914187effa3a117acf77fa6e8a078cfe412b3a57ee28
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVEr3aAAoJELp701BxlEWfYTkP/2mLN6wfGfJpV2nk+CKXl4nz
-scFzZsi7fl0m1dI4Gc1e2OCnzyGKcHhZYgzE5JbJ9VyQebcm+HSqr2eo9ivzjXnK
-VoM3t6F8ngtVmfI1WQP1ooxoRw331/970TkusAEHDNj6fQLirU8amgfQDB9XwV/9
-2BI8SMd+Hd82w6mvP97aJmdNlKoZZbpJzcBz69ieGaGt0HWRhV1Cx8A5dGi+MGYD
-0FaairTbay6ySX73I3uH+AvEJScUVK++1LuKSFsx2pLi2vImVmFGGlx7PevM+zo+
-X91ukSMsDtWuhVnEzDbPAphxISKPs3dI5r9jRF33RIMbIDj4jyBUe+VZyk0355T7
-DkC4hW8bUKCmEIZHQLEpg7wainUVmGomAgneTEcBGXxJ+ngzOYkTPGG+3RtSk/W7
-lS1NClxFTMNJaLNJhLGG1IlHlCr2VVEXh+KrncYd0kB+WH/UwPApns26nRVMsnHK
-YK72AzVaYp8xN3fnE6bGRobwi+LUXb5lg0mluxJlNQ7RnSEo7r/c26KFC/3U9BrG
-vJN8zeeprw/m6yQ0Fwnp2ye+hkTxo4Xp084YRCWdBaFB3Ow3Rdj+bk27DVNHKr4Q
-c08yB/Y87BtKQ36Gqaj4GemaP686JInMkS02/8i2WWLHsLPQasU2Zhj4zM2eBAEC
-qoB2GgRvIZTwz6vwSFve
-=t2Ej
+iEYEAREIAAYFAlUUkSgACgkQFuHa/bHpVdvRHACeL+UKlyJYq1KeARcKOLjvE/tC
+XmkAoKvdTMXWU0hkrNaak/OpN+ZWFgZq
+=384o
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/atari800/atari800-3.1.0.ebuild b/games-emulation/atari800/atari800-3.1.0.ebuild
index 2d4262914089..900dc0310795 100644
--- a/games-emulation/atari800/atari800-3.1.0.ebuild
+++ b/games-emulation/atari800/atari800-3.1.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/atari800/atari800-3.1.0.ebuild,v 1.3 2015/03/25 13:53:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/atari800/atari800-3.1.0.ebuild,v 1.4 2015/03/26 23:06:52 reavertm Exp $
 
 EAPI=5
-inherit games
+inherit games autotools eutils
 
 DESCRIPTION="Atari 800 emulator"
 HOMEPAGE="http://atari800.sourceforge.net/"
@@ -44,6 +44,11 @@ src_prepare() {
 		src/atari.c || die
 	sed "s:/usr/share/games:${GAMES_DATADIR}:" \
 		"${FILESDIR}"/atari800.cfg > "${T}"/atari800.cfg || die
+
+	# Bug 544608
+	epatch "${FILESDIR}/${P}-tgetent-detection.patch"
+	pushd src > /dev/null && eautoreconf
+	popd > /dev/null
 }
 
 src_configure() {
diff --git a/games-emulation/atari800/files/atari800-3.1.0-tgetent-detection.patch b/games-emulation/atari800/files/atari800-3.1.0-tgetent-detection.patch
new file mode 100644
index 000000000000..018e423af6b4
--- /dev/null
+++ b/games-emulation/atari800/files/atari800-3.1.0-tgetent-detection.patch
@@ -0,0 +1,12 @@
+diff -ruN atari800-3.1.0/src/configure.ac new/src/configure.ac
+--- atari800-3.1.0/src/configure.ac	2014-04-12 15:58:16.000000000 +0200
++++ new/src/configure.ac	2015-03-26 23:36:24.419178078 +0100
+@@ -982,7 +982,7 @@
+ dnl existence of the tgetent symbol in readline. If not, we search for tgetent
+ dnl in a few other libraries. All done with a single AC_SEARCH_LIBS statement.
+     have_readline=no
+-    AC_SEARCH_LIBS(tgetent, [readline termcap ncursesw ncurses curses], [
++    AC_SEARCH_LIBS(tgetent, [readline termcap tinfow ncursesw ncurses curses], [
+         AC_SEARCH_LIBS(readline, readline, [
+             AC_CHECK_HEADER([readline/readline.h], [
+                 have_readline=yes