Bump EAPI to 5, fix building with sys-libs/ncurses[tinfo], wrt bug #503494, thanks to Stefan Huber <shuber-bgo AT sthu.org>

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

3 files changed, 35 insertions, 8 deletions

diff --git a/net-wireless/wavemon/ChangeLog b/net-wireless/wavemon/ChangeLog
index b5c1a46a4c69..24ba6b6e332d 100644
--- a/net-wireless/wavemon/ChangeLog
+++ b/net-wireless/wavemon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/wavemon
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wavemon/ChangeLog,v 1.55 2013/02/19 02:37:10 pinkbyte Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wavemon/ChangeLog,v 1.56 2014/03/06 07:12:56 pinkbyte Exp $
+
+  06 Mar 2014; Sergey Popov <pinkbyte@gentoo.org> wavemon-0.7.5.ebuild,
+  +files/wavemon-0.7.5-ncurses-tinfo.patch:
+  Bump EAPI to 5, fix building with sys-libs/ncurses[tinfo], wrt bug #503494,
+  thanks to Stefan Huber <shuber-bgo AT sthu.org>
 
   19 Feb 2013; Sergey Popov <pinkbyte@gentoo.org> wavemon-0.7.5.ebuild:
   Stable on arm, wrt bug #448406
diff --git a/net-wireless/wavemon/files/wavemon-0.7.5-ncurses-tinfo.patch b/net-wireless/wavemon/files/wavemon-0.7.5-ncurses-tinfo.patch
new file mode 100644
index 000000000000..75c0043bbe41
--- /dev/null
+++ b/net-wireless/wavemon/files/wavemon-0.7.5-ncurses-tinfo.patch
@@ -0,0 +1,18 @@
+--- a/configure.ac	2014-03-05 11:05:12.319043741 +0100
++++ b/configure.ac	2014-03-05 11:15:00.866849013 +0100
+@@ -21,6 +21,7 @@ esac
+ AC_PROG_CC
+ AC_PROG_CPP
+ AC_PROG_INSTALL
++PKG_PROG_PKG_CONFIG
+ 
+ # Checks for header files.
+ AC_HEADER_STDC
+@@ -53,6 +54,6 @@ AC_HEADER_STDBOOL
+ # Tests involving libraries
+ AC_CHECK_LIB([m], [pow])
+-AC_CHECK_LIB([ncurses], [waddstr])
++PKG_CHECK_MODULES([ncurses], [ncurses], [LIBS="$LIBS $ncurses_LIBS"], AC_MSG_ERROR([ncurses is required but was not found]))
+ AC_CHECK_LIB([cap], [cap_get_flag])
+ 
+ 
diff --git a/net-wireless/wavemon/wavemon-0.7.5.ebuild b/net-wireless/wavemon/wavemon-0.7.5.ebuild
index 2ea705cc060c..4cd0cc5726af 100644
--- a/net-wireless/wavemon/wavemon-0.7.5.ebuild
+++ b/net-wireless/wavemon/wavemon-0.7.5.ebuild
@@ -1,8 +1,8 @@
-# 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/wavemon/wavemon-0.7.5.ebuild,v 1.11 2013/02/19 02:37:10 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wavemon/wavemon-0.7.5.ebuild,v 1.12 2014/03/06 07:12:56 pinkbyte Exp $
 
-EAPI="4"
+EAPI="5"
 
 AUTOTOOLS_AUTORECONF=1
 AUTOTOOLS_IN_SOURCE_BUILD=1
@@ -18,12 +18,16 @@ SLOT="0"
 KEYWORDS="amd64 arm hppa ppc sparc x86"
 
 IUSE="caps"
-DEPEND="sys-libs/ncurses
+RDEPEND="sys-libs/ncurses
 	caps? ( sys-libs/libcap )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-PATCHES=( "${FILESDIR}/${PN}-0.6.7-dont-override-CFLAGS.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.6.7-dont-override-CFLAGS.patch"
+	"${FILESDIR}/${P}-ncurses-tinfo.patch"
+)
 
 src_prepare() {
 	# Do not install docs to /usr/share