summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Beierlein <tomjbe@gentoo.org>2014-11-23 14:34:28 +0000
committerThomas Beierlein <tomjbe@gentoo.org>2014-11-23 14:34:28 +0000
commit164a2659e5818807e00604587135722724bd3b40 (patch)
treee81f67964ea16fac0c3dc0d9052772f0b6ad36ed /media-radio
parentx86 stable wrt bug #528754 (diff)
downloadgentoo-2-164a2659e5818807e00604587135722724bd3b40.tar.gz
gentoo-2-164a2659e5818807e00604587135722724bd3b40.tar.bz2
gentoo-2-164a2659e5818807e00604587135722724bd3b40.zip
Fix missing dep on tinfo (bug #529776). Thanks Diego
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x762053D5)
Diffstat (limited to 'media-radio')
-rw-r--r--media-radio/ax25-apps/ChangeLog8
-rw-r--r--media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild16
-rw-r--r--media-radio/ax25-apps/files/ax25-apps-0.8.4-tinfo.patch12
3 files changed, 29 insertions, 7 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/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], [],