Fix building against sys-libs/ncurses[tinfo] (bug #490972).

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

4 files changed, 33 insertions, 23 deletions

diff --git a/net-wireless/kismet/ChangeLog b/net-wireless/kismet/ChangeLog
index 4f1696a6e6bf..0fd2d7fd8bef 100644
--- a/net-wireless/kismet/ChangeLog
+++ b/net-wireless/kismet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/kismet
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.141 2013/12/06 17:55:58 swift Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.142 2014/10/30 23:00:42 jer Exp $
+
+  30 Oct 2014; Jeroen Roovers <jer@gentoo.org>
+  +files/kismet-2013.03.1-tinfo.patch, kismet-2013.03.1-r1.ebuild:
+  Fix building against sys-libs/ncurses[tinfo] (bug #490972).
 
   06 Dec 2013; Sven Vermeulen <swift@gentoo.org> kismet-2011.03.2-r3.ebuild,
   kismet-2013.03.1-r1.ebuild, kismet-9999.ebuild:
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 32cb86874927..857414bf8a9a 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX bluechanfix_r3184.patch 452 SHA256 f7c9449039c76f5a919ad8399ce49b518c01046db1566bce25fd34496482faf0 SHA512 6e9ef7a64a8b5e9fa494627b9bb818582d7b7415164a67e321460bce3d2ad88c57fc7b2a79c0384fd7346181debf5e32ca984630fc0477bf271825a16d2c5858 WHIRLPOOL 053d43042201556fec485e549dca184eb28dac77a2f4cfc69d566c5dda7da45f205e692c76cb208c97c535e4ac09edd0b6e5071c92e6d37ce9b93908af07ae7d
 AUX header_alignment_r3326.patch 2031 SHA256 0a4afdc0cb74cb0ea7012f912fb886acb3d6bd42345835a26bf44f0a1ab63556 SHA512 4807e558a72ab429ffbbd3e245338b58ef9f29940b518ca76d86345ab3302679a77212699cfb1714b593eb6dc02703155c12ae9aa9dd15d402b90e6607c8f472 WHIRLPOOL e4f87d4760d9300c9c7a56a08edc9764a16642def7df000394a83b20ab00890bb1e8106985c3aa3918fa2e6bb9372f7c4d96e0fecf71337cc7b0b6e534de5129
 AUX kismet-2011.03.2-cflags-backport.patch 3952 SHA256 8300459a7f15b00d78c20c7bcdb757bf4adf00f28790b39dfd72cb70a0242906 SHA512 0eefcf8f515c379d77206d2b423f3f72af1b22ea57f3b94491d55e1e569f3c7cca67aae77e24afa45d998292b0d23c9d6431ccb8b4842cc50225717290dfe86c WHIRLPOOL 864b142573773d10bdbb0abbfac2073389cfb6506c80cc1836dd837cd0af91d870380d4ec76b17d184237e65fa91d7661daafed4208596984d4839b9b49e8d76
+AUX kismet-2013.03.1-tinfo.patch 455 SHA256 3f0e9449dbc4012624f793583e22393fbf4f934ef6606e1d2f00ebb14cf55d17 SHA512 e888a73008262041cd3e37589dbcbf6d0d21a88b6c2635d396d5b32c5437621aafa69cea0f06ca0a13a36caec78c6217f5cba97de706955c93e0894fd774f34e WHIRLPOOL 00a6c54cd1b3e6e2025ac61c9cf59a6a04fbe63925ac16359d155da1255431fb5b39f972f92f4005a8a20d288b1b1ade6ef042e946fa92931463b5b5dcd7b617
 AUX kismet-console-scrolling-backport.patch 555 SHA256 8b3ce7113e5214ffba9dd75b6027adb9f92f6e56dc3dbfde2045c77b5c44223f SHA512 6a202bf80b20553ab00a5ff7560d2cec6fbd9c23c3a47cc0a934ea2c8bd08bff7c172644474e80cd195bf4115ed9b3b4e5680de3fe29b8697be62aa33929f07a WHIRLPOOL b03d53e761933782857821633a5f09d72899bc985e795dfa6216a06a99b44fb2fc3918633062cb4c4a4563b1d0c424c62aafef7040be6794846b617365bde18e
 AUX kismet.confd 403 SHA256 d2f5bb606e4dac45c8de27843ab460b9dac02e83979e52e1b8b3ca3af841adeb SHA512 232801f085980d464df831af8c73fa9c4274b44dd45118938cdf9048e0d54cdcc386aec6749e7a1b2c00b73739ab8bb51ff5dadf8cc1866ce2207e28c4e25b71 WHIRLPOOL 51e1ccf14cca8533525f038a6b6755233e3f4e65486952b09f80372756ac128d4359f3061fb97348673a5a7dfc595e3b63bfef2db5be4814f2b2cf76b2ee1de9
 AUX kismet.initd 742 SHA256 b4420c22264ff3604bf956b65bca5b564cbb70676c3f48d5e444f3aa6687a624 SHA512 3346b113f4370097c1638970b70a918f70b49d6db77bef627dbb5ccea8eed1e02d47f57414beaef163475ecf785d27b77a6501f4917ea9fe62a043c3f39fc3ae WHIRLPOOL 1e4de7b8012fa5f3b7d0e1ad704f4383cf5c3110d22ff9e54b292d7792b52a289e9e58fec26d6893f1a084e1501c9eaff728b435468a9f5c67b7cac6848b9e39
@@ -13,24 +14,14 @@ AUX use-hostname-by-default.patch 1156 SHA256 34b7f8280549ab6022486b5e5744a6d7ce
 DIST kismet-2011-03-R2.tar.gz 924988 SHA256 71a099fb724951cdd55c28e492432ca21657534c91a536c206f3e0a8686d2a64 SHA512 4a74edd5b74ecf2171ab20a2cec5c2d0abcb6a9f24fbac6bbcab8039c67927ffa393e27932be49625a9f15c8580ea88ae51b65e42a4de5bf6bdf65631c26bb18 WHIRLPOOL 7975cfe9c754e902fc4861540ac4c21892df39f4edfc71870ee944a09769305614360a640c27753b1770bd2b1ee82f06725afbf30afb51880536d3c38261b920
 DIST kismet-2013-03-R1.tar.gz 899372 SHA256 1c1e9f6b550de1f248363d4c9ce1d24fdc20d041ead5a53cec88eb1b07353082 SHA512 7e992f5ef3db4c5fa298bd4aabfe216668baade948b83996850c010c6c92bfa2fea37d7006a532eb6bace015624f536cc45ed8b3b3ed4a6a1cac7a137ac86d36 WHIRLPOOL 694796f7dd0f4ffd70e64d67eba30bf7b206189dadb8e773a302af9f417a8219b45e547bfcaf59db3f502e0f5ab18af6d642e66dbe8277d8af48daeb35b40843
 EBUILD kismet-2011.03.2-r3.ebuild 4446 SHA256 8ace1471086cbaf98d9049b258c274f640e6a3a805d1f6dbaca695d431296626 SHA512 cbb4e37e432a60c40cdf52f3f4935fe6efb1ba37b73accab0f2fa686f434e0d19869c1dbfee9a12d61728e17373f8eda7d10ae9880836fdaf9200ff4228a7e60 WHIRLPOOL 5c21e300111d829d6aee4adcb8bbe36f1f36ece0c93eb7b8b03f21e3df73cb56d5423704d44cbacb8933e4879b013a0a4b7f0bd747eecd4f68bbf97e5267573b
-EBUILD kismet-2013.03.1-r1.ebuild 4380 SHA256 3d982412a923f0ae84bc70d62db22ab3de457800c4d1199fe05cddb227929a6f SHA512 c2ca569a1349b8b7a8be722540af838165e1c1eea3122b2543f2ba0171063e2ec1317d460ea1d159864aff1bfd89e25537b88886a85c3d42e067bf4a7dff0a05 WHIRLPOOL 7a556c30d4c9f5dd3be0c5bef8659d72cb69cb242564fc509522fdaeb115cc91a65bf231cb628d9deded60baa902d110d10cce89bba5c9adeadd3897c8492619
+EBUILD kismet-2013.03.1-r1.ebuild 4456 SHA256 c863dca838f871d1340ab8c5cebbaf38666a192d46d735b9ecf8ea1890657e08 SHA512 29d86d15abf2f6bb69662b40f275c18cf07ed54e4095a4c4beec5b88d2b8b91d0bdbbec19dbc10110eafc4d3cd955193a103ce8079a9c644310087507444e6d7 WHIRLPOOL 5072c579c4ebae4319db68e2925c1deb67cc5c5425c8af65d941fb8c94103cd9ff1023a1b051fc14dcbd7503b15012b03816dbe5babf16ee4ec83702312fd9ce
 EBUILD kismet-9999.ebuild 4385 SHA256 a47eecfe3f7b6f97c3644aa7e0770b24a97c7d80ec94511865d8919670a54313 SHA512 10d94f7174cdfa3fb9bd1910a8b97173b4ceee15232609d62096b343d8505922107e0d5d8cde908d8f2cb7b2e05b5f14dd588243b4cc994e212f2269c44fdc5d WHIRLPOOL feee505856339835d203666e5deafd5053b99f2babbb2658776a6f9a25eed31da68bf49b1c3f41870f04c24ad5f681d27ae8fb5ea2d078bc9d5b0bda13b4baa2
-MISC ChangeLog 22894 SHA256 d253f9c97fc983028a17175e4af961579aa259314869521e216a162a6b1391a4 SHA512 0c808658c7031cfa8a7024062fb6bed16279af18033e95ce8726f9e861ea5bbc8b9c7406f8c5dfddbfc526be261a5caece9b6350e17023f1f12de0631640cf9d WHIRLPOOL 0d05a1823e19160dee82f5fddc902af02d07bd44e3924c71992ebdd8672464e6594b0740ab2eeb5f5badb5d756deb74ccd30765e474f79f61e975a0e13a77cf1
+MISC ChangeLog 23069 SHA256 4380fb878c8cae8d9107158d40f08baf40afdf286d81b760aee91f5153d743e2 SHA512 27ca1bc141be13a2d5d2cf18b943359c6a616a905ea6eb97711fd0dba38baa28b768032d32ce16752315a013d6e88f6eee5605dcf5bd22883c9f2b795e66f72a WHIRLPOOL 6329b5405a9fb9ac19bc4fdf9b33a22b57b7e6bc64c50d8d569163804afd7a38405ece8418b22a36d0fcc2a9e3ed71426881c47198aa2d49e8b2f6f317709acd
 MISC metadata.xml 1341 SHA256 36e071c984d507b1d231b37414b9e9c74183234974ff922d94969b2d33d620d6 SHA512 63654708684f7b1c408269a5cd596d3ca4786ee50fbc76e0d68a3819fb02f50f49a8b9ec42703fac54a318a87f058c304e5ad4a363beb1c41ed407810c5f23ae WHIRLPOOL 45e8cd0ff325361705e6d53059f5f14b171919fa77d24a4572104a9c401036273ba53e5f4dc49c180790495342b72c5da80a975e302de28f4dbf3e67a26b07c9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJSog9vAAoJEC7dUkA7aK9HihEQAJMoTe/o4ePRRtTUkGCx3a60
-AkCqRmmA5SCgyTfrfo8o4i/ZqgQ7gerAkfLQ5WwTV4pVoMWPdh9iXOWHyApdShZY
-PcKvcxT0ckZp8vzsmqqnkyHGRbZSu0XXxxKM8WXubInI7OvMZ1Z3eIVxXo6ywAfg
-63O/8NmM23hKYKvcmI65+AR75Lsxugmrere1Q5kjV60ntw9bQtQ+ip0JoDPw4Wjg
-ZYbhJcmSrln2tN8A042OLYW4dzTy5dUKbTLwhfkQlNjG7fMX861skDWEoxletLRG
-LkD9xOFuk8E7x8RwxNW0kvs72ogYvjDThcOB7Vm+KKquKTJQZt0H628ihxXJVmfJ
-S1bJKcEQFrNAiBSNsC6Ysc43HZOmruJ710ACEq3mGhHGHMQ/7qxwFVc3ZsNunW9U
-CUBgGRe+KffOPvbSOTyrtLi2rucXk3DB5xna6+72R+m2our/PXC6HyM1nsOeEZCs
-Elu1nKb3taiBskgFfHMpvF51DDbN3WyiYT5rl3D1cV+PlujyQR5ld1weGXVf/eAM
-KTR/ZT0mq2vskAd0vcRcWnqr0q7diDaoosIqevs6g91LpmKXtCvlBAtrq86teslO
-sSnbVJT/g1MXcAY+WZU3Pd2rRKgCOkFFUvnQpOP3mU9CiYmtWEn86hbvJm8i2ikc
-79hzyJTicNDAKusc4+jr
-=GK0R
+iEYEAREIAAYFAlRSwxsACgkQVWmRsqeSphMnlwCfQBco9fZ1r3WERsZQ2LRvS3pO
+pkMAn3oJGrMGqaIKdmnkrrdcAPvBP5tb
+=IscP
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/kismet/files/kismet-2013.03.1-tinfo.patch b/net-wireless/kismet/files/kismet-2013.03.1-tinfo.patch
new file mode 100644
index 000000000000..ac1a39004479
--- /dev/null
+++ b/net-wireless/kismet/files/kismet-2013.03.1-tinfo.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -423,6 +423,8 @@
+ 				 foundlcurses=yes curseaux="-lcurses" termcontrol="curses" )
+ 	fi
+ 
++	AC_SEARCH_LIBS([stdscr], tinfo ncurses,curseaux="$curseaux $ac_res")
++
+ 	if test "$foundlcurses" != "yes"; then
+ 		AC_MSG_ERROR(Failed to find libcurses or libncurses.  Install them or disable building the Kismet client with --disable-client.  Disabling the client is probably not something you want to do normally.)
+ 	fi
diff --git a/net-wireless/kismet/kismet-2013.03.1-r1.ebuild b/net-wireless/kismet/kismet-2013.03.1-r1.ebuild
index 1e82a0fb0964..9dd17555c96e 100644
--- a/net-wireless/kismet/kismet-2013.03.1-r1.ebuild
+++ b/net-wireless/kismet/kismet-2013.03.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2013.03.1-r1.ebuild,v 1.7 2013/12/06 17:55:58 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2013.03.1-r1.ebuild,v 1.8 2014/10/30 23:00:42 jer Exp $
 
 EAPI=5
 
-inherit eutils multilib user
+inherit autotools eutils multilib user
 
 MY_P=${P/\./-}
 MY_P=${MY_P/./-R}
@@ -48,12 +48,16 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+
 	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
-		conf/kismet.conf.in
+		conf/kismet.conf.in || die
 
 	# Don't strip and set correct mangrp
 	sed -i -e 's| -s||g' \
-		-e 's|@mangrp@|root|g' Makefile.in
+		-e 's|@mangrp@|root|g' Makefile.in || die
+
+	eautoreconf
 }
 
 src_configure() {