Fix missing dep on tinfo (bug #529776). Thanks Diego

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

4 files changed, 36 insertions, 13 deletions

diff --git a/media-radio/ax25-apps/ChangeLog b/media-radio/ax25-apps/ChangeLog
index e2da9c80f534..71edae103162 100644
--- a/media-radio/ax25-apps/ChangeLog
+++ b/media-radio/ax25-apps/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-radio/ax25-apps
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/ax25-apps/ChangeLog,v 1.26 2013/12/25 13:33:32 tomjbe Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-radio/ax25-apps/ChangeLog,v 1.27 2014/11/23 14:34:28 tomjbe Exp $
+
+  23 Nov 2014; Thomas Beierlein <tomjbe@gentoo.org> ax25-apps-0.0.8_rc4.ebuild,
+  +files/ax25-apps-0.8.4-tinfo.patch:
+  Fix missing dep on tinfo (bug #529776). Thanks Diego
 
   25 Dec 2013; Thomas Beierlein <tomjbe@gentoo.org> -ax25-apps-0.0.6-r1.ebuild,
   -ax25-apps-0.0.8_rc2.ebuild, -ax25-apps-0.0.8_rc3.ebuild,
diff --git a/media-radio/ax25-apps/Manifest b/media-radio/ax25-apps/Manifest
index d0f3be9779b3..e5f9825d818a 100644
--- a/media-radio/ax25-apps/Manifest
+++ b/media-radio/ax25-apps/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX ax25-apps-0.8.4-tinfo.patch 654 SHA256 c88c940c5b16e1b8ba91ed7688c88578e808c773cd486406f9d57c7f81ccac97 SHA512 aff3eda08bcf53102095c6d5cc53e591c8dd55296b01512053b1612a72e8cef6a4931d44745e955fd21510f7277e092e1853fbfbbeabc8fd9d1f2ee7b6aea544 WHIRLPOOL 38c159c5aecb0f64cedabafadfa47c04859f9faea11d3960e05c4afb529a976adc674fdd8aac65c7a77a5421b4706dd8bc5b8b87e7e89a5918f8756e7152f7ad
 AUX ax25ipd.rc 493 SHA256 f3fcc66e2620575651fc6b39dbc0e2247839b79713bb94fcc0b4b2cae75d40e8 SHA512 091190ac2941af588668919f85d3673e17fd0158e98162e31bf8682a5be9e883653c42c01458eaecf802f5b3e530687a78cf6bc7dada2172c9f58b1cbcda2511 WHIRLPOOL fd66516ab97074b1868982ca970811a05f3c650bea2a090feda6c2d49c3da09c111d8ee19ce48cb171d537094873e5cb823e28df902dcf688cc3e7d3a383d328
 AUX ax25mond.rc 498 SHA256 9d6704bbc6bbe255fe6bacd825369e354b6766172cb73a6e12829999cd4dbe2d SHA512 e14a077dd76e05cbbf5338bb68b8d81268aec2c4538e0dc55896e77e0ff9b6001e311d22650c94f50cb319a6e446b6a89253b29b38e458bb2371391d52a75ebe WHIRLPOOL fb3411465759ab54d284969b11ae055b931a294ce85efad48a46a0aa27e7347856e9d3cbd2dccab5a4f52060c9c3b87184a8d8eff1205a63c0a397eb36b61131
 AUX ax25rtd.rc 493 SHA256 f4cb31093a70bdef47abe4d4ba891ec2eedaae39982a3e6bbdd6020615d95204 SHA512 0e3f2b435851e8a6238fb4a1727c1ee3666099a2d5ce9768929c8bd8ffd006249cdd0ad6be795a5aa16f260a15c43d03ac999c0c6325ed1c251e43de2b97e9ca WHIRLPOOL 6ec4456700a8b7d2822f0a774512af78f405ac9df7dc35dfaa65cf304910b7f1c072d85defb39e89f522e427d42d759ac46495750b4df0c3fbdbbee39d8cb1b4
 DIST ax25-apps-0.0.8-rc4.tar.gz 442172 SHA256 0e031721a440cc169768080f1d6bea32ef1d2a9c80a754ae5239738f9ab8fe0a SHA512 c99b553c5cadb0e389c1cb35e79fea61b628c76f5ef35c35876e492afc7ab796f8781c3ab5987a096f0816389e9772274fe54e88c16fca0fd30013da3d74d38b WHIRLPOOL 0402f5d149642ed479a260a64c091bcd4a797a53e5ac2df239fd3e5d38821c5fe0cbacffe7c2d7ebeb614bc455805269eb415fb73315fd830da9c05310152d8f
-EBUILD ax25-apps-0.0.8_rc4.ebuild 1056 SHA256 c6b966f9503d6dcce5e30271954e12076358758638a8b619a498faa7b4d08154 SHA512 e42d4ce044d8a9b10023db2233820faa921ee480bb9412ff1d11eaf51071edfa47fca0d6c3ddae524f12e4577907d419d16f1b0d6f70c49484c09b57aae02d17 WHIRLPOOL b8cfa52b1b2d3fb6bf6621270a4b89ab23a055c3908d5d08c4775937d7db792b22c256b704771594e74a438f01d69d6ec91ed2d738bc9014a6fb0146156b4bbb
-MISC ChangeLog 3496 SHA256 90d56edb562a047c8522cc8f80ec8d8a3c5273ea06701008f557db29b09c0f9f SHA512 cec1a412fda781ab01f736c024de0130b5dd41c4360effa0763011063c8d1a63ec79cdc70eb3f91392e6263a80f986af3cfc873f17273f464f3dc752bc7b4725 WHIRLPOOL 3a302416faac5b484a3d3eed78b3a9e1e5afb7250c6ff20fa3cec6934eb91d88b6ae0011b03e71b08254697e72a2aef2869425b4a9d42b9b8074f9f56e2354f9
+EBUILD ax25-apps-0.0.8_rc4.ebuild 1157 SHA256 cd8f61b342e969ba87f10b07ede5aa31524917581376bd7e520f953bbc3a5411 SHA512 50dfe78681aed5a83ca03e26303fa63586a78ce5ba179a7e7b7675df7fa48f66eff5f5d8952603ed699f640b89017e075419817e772fac2ecb460110ddc7c872 WHIRLPOOL df3ab8ebde3f67936390421f22cd653f6ad1e5c065a734f7a3e33d20f9627ee006a5e1f36d70a1ad8e043918aa795e8e70a90bcb306f6a2a1fba5ea5d72243e1
+MISC ChangeLog 3670 SHA256 4e0f69cb8a6c5f1c429e405cd3dceb8d86f6ea4047f5b64c54704197c7845cb2 SHA512 6b1bab8dba3f2fd2ce2cca2dbf7d1043e67b0184ef4563aa98c0494d86ef9956aa6bc14f1222eb643d47573793920e319c545402f78a550d52db898f2840a3f0 WHIRLPOOL 32521d885b0b54c7ee325f6ceaf2dfa90fcd031920d42cf9981f581d3608f69544bc820cf779d062205d9f7f996c0c1a85619d72aa41ff40b814ad904bd17cf1
 MISC metadata.xml 241 SHA256 865a729cb9a1d82ea72849efc0d66c4c499e1c87b59757996f3d45bae77df6cc SHA512 eff33b80d9c4469f6f71c50b6cd7d173d7670c28f7e4162c3be23fdd5b4adacf3f0365ebe0827cd1721f24cc5a40440ae1edd78f59e606648e951bbb10378f2d WHIRLPOOL c248807b5f958ae6b54ed780eef3c255eff1c65f5afdf77fa64c4fd0a51cbeeeeef25e1d5ad550c748ba75bd2f1523d0f8d2d71bcf966306d010751c5ace5e4f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlK63q4ACgkQQe4uqXYgU9VkiwCgrv4veZRYs5E1YJk/KYd/AEPn
-z5gAoN7ykLVFuZcfHrxXbrAq2qBwx2CC
-=XiR0
+iEYEAREIAAYFAlRx8HsACgkQQe4uqXYgU9Ur3gCgqOOXv117pycjHNBEkM2GLiKy
+93UAniPyfQg5AV8WCgB0sRF1vGiGd9ah
+=uIHl
 -----END PGP SIGNATURE-----
diff --git a/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild b/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild
index 3714b7ecc8ae..a9e89ff9a01d 100644
--- a/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild
+++ b/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild
@@ -1,8 +1,9 @@
-# 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/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild,v 1.4 2013/08/28 11:15:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild,v 1.5 2014/11/23 14:34:28 tomjbe Exp $
 
 EAPI=5
+inherit eutils
 
 MY_P=${P/_/-}
 
@@ -15,13 +16,18 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND=">=dev-libs/libax25-0.0.12_rc2
-	sys-libs/ncurses
+RDEPEND=">=dev-libs/libax25-0.0.12_rc2
+	sys-libs/ncurses"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
 	!media-sound/listen"
-RDEPEND=${DEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	epatch "$FILESDIR"/$PN-0.8.4-tinfo.patch
+}
+
 src_install() {
 	default
 
diff --git a/media-radio/ax25-apps/files/ax25-apps-0.8.4-tinfo.patch b/media-radio/ax25-apps/files/ax25-apps-0.8.4-tinfo.patch
new file mode 100644
index 000000000000..2b64c4130224
--- /dev/null
+++ b/media-radio/ax25-apps/files/ax25-apps-0.8.4-tinfo.patch
@@ -0,0 +1,12 @@
+# fix tinof handling (bug 529776)
+--- configure.ac.old	2014-11-23 15:05:03.000000000 +0100
++++ configure.ac	2014-11-23 15:07:42.000000000 +0100
+@@ -17,7 +17,7 @@
+ AC_SUBST(AX25_LIB)
+ AC_SUBST(NCURSES_LIB)
+ AC_CHECK_LIB(ax25, ax25_config_load_ports, AX25_LIB="-lax25", AC_MSG_ERROR(Could not find the libax25 libraries; aborting))
+-AC_CHECK_LIB(ncurses, initscr,NCURSES_LIB="-lncurses", AC_MSG_ERROR(Could not find the ncurses library; aborting))
++PKG_CHECK_MODULES(ncurses, ncurses, [NCURSES_LIB="$ncurses_LIBS"], AC_MSG_ERROR(Could not find the ncurses library))
+ 
+ dnl Checks for working glibc 2.1 headers
+ AC_CHECK_TYPES([struct ax25_fwd_struct], [],