Fix building against =net-libs/gnet-2.0.8-r2 (bug #528378).

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

5 files changed, 58 insertions, 24 deletions

diff --git a/net-analyzer/scli/ChangeLog b/net-analyzer/scli/ChangeLog
index 38a3a0e2ce84..b28d6e4fe6ac 100644
--- a/net-analyzer/scli/ChangeLog
+++ b/net-analyzer/scli/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/scli
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scli/ChangeLog,v 1.21 2014/07/16 23:21:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scli/ChangeLog,v 1.22 2014/11/06 01:08:43 jer Exp $
+
+  06 Nov 2014; Jeroen Roovers <jer@gentoo.org> scli-0.4.0-r1.ebuild,
+  +files/scli-0.4.0-configure.patch, -files/scli-0.4.0-tinfo.patch:
+  Fix building against =net-libs/gnet-2.0.8-r2 (bug #528378).
 
   16 Jul 2014; Jeroen Roovers <jer@gentoo.org> -scli-0.4.0.ebuild,
   scli-0.4.0-r1.ebuild, +files/scli-0.4.0-tinfo.patch:
diff --git a/net-analyzer/scli/Manifest b/net-analyzer/scli/Manifest
index a10abd6c43a8..f2932372546c 100644
--- a/net-analyzer/scli/Manifest
+++ b/net-analyzer/scli/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX scli-0.4.0-tinfo.patch 416 SHA256 2c13df1eb01326819dd6c78cf6679442a84ad1c69152a5fed841f41f6c7864ed SHA512 1008358608101f2b58d34f548bf8f45bfe9ec6b07a629eaf6f8ddf90c3ea31989e77f48f64daa4caa6acaf2c123bde20fcac8bccc3e8e566297e603f20033f06 WHIRLPOOL b35cb7718adf8eb097a96b2cf61c60e2c1881a3ad66c56e8dfbfb09deb92741113525ecb09704116ca45594f97d6b05306026f24bb71ff7d0d230d611c8681f1
+AUX scli-0.4.0-configure.patch 1545 SHA256 bb5a43df531806df91f136113b740251d2270fa2bb7a39f7a9785802916e99ed SHA512 423daf0251bc65f84c430638f235ff30cd75257c221394332f4fd51b8c5deabb02fc97751b77e4571305107fe2ac66062c27cdf74a2d3d46f2f278d7983cf622 WHIRLPOOL 550ac191199b0507a66f0491b76e071422704779c5f26e4cd37eb0d1897734b5e42e9ab4fed5799530e42af1687ba2e30d9e4792ad39b9bbb4a2f4512c898100
 DIST scli-0.4.0.tar.gz 953401 SHA256 308511589260d3da9bc5817ace363180070ac83ccba9231b7b9a01e1b0c29fe1 SHA512 ceb81e51049def64cb6f2428263709802380f7f712575e327a71d8cc120d284a7d9c57679d76e22cfcaf5b160d0d46af0cefa1133c56972b43002cb94f120dcc WHIRLPOOL 29f72af56e1a934a30b147858cd3e7e5acd638546b46b275693b0241bb0006edb1e66fa8af5a7074d23125c02780f129d1c7df6356da45fce3c083a390886aeb
-EBUILD scli-0.4.0-r1.ebuild 883 SHA256 81dca082072ff81880881258084ab349415a23abd07d43f90ee483133e345b06 SHA512 c37e3653fe1bba357cec1a4681eae96a8f89f0f2dd1555e31634123699a7e80d5b6c03b14d63448345c28f0ac10fef6d942f0219c771cfad447670ddbd43e009 WHIRLPOOL d713f1fdcf3a891003af985411bb5f7e116508b014a375ff49b45acab4f0828adf8b37097b4a70805eee8dcd197c33d58ae5ee99e98aac1bf05dc36395c4f92b
-MISC ChangeLog 3155 SHA256 30e2a3476fbbde95da93ab04f8a8920f5f71d57923b1f1b0230f506f6fa9b71a SHA512 8fde0eacf0f15a27a0d1e5a35fa394280bc0ffdd977b4879d9f0a5fc483d88bb3ece8acdca4b60f368a1473feed3d14d01d48bf52991cb3ed9856982e0b50200 WHIRLPOOL 6cb435413fc6b36c22481063601752c100374ecd4dd3d8b19a9e3544f7f2ee1155dca1d3e929971270d13662a81ada9a051dd59c02f8d4e2478c0bf8e78bf03b
+EBUILD scli-0.4.0-r1.ebuild 811 SHA256 fe037925a181a2829a17a58a500e81b8e4f36fd313aaebb4a19d225bb7e1e803 SHA512 a6548647d28bca2e847b52678de7e6f8ea9eff595fedf6f3fde10c8ac21cac011b68304449fd169603b1ec826c8269282d05c1ec87ca9ce97fbddaa41f2a3cf5 WHIRLPOOL 8a1db6ed784b77af3bfb9609199f5696498a03e2e52a2d77321676146c3b05ec8ae8563b0ccf50f0be5b8321a62976ce9fdd95beeb0c3fc53a62d01662fa33c9
+MISC ChangeLog 3355 SHA256 28e600a472cd1177f880479353838f7a214e1dfc51b2a2e6be9f57af07043d45 SHA512 8337fdec6eda0ba183284fc260867764a96c60f7cc2566f2c53d034dcc334d5c0ad9fc24610ea0b585f50fd25da966bf17fed55aa86840eb34b7eb2a7f4e1502 WHIRLPOOL bac11513147320cf8a3dbaeccba361464b1c71f4d7a3469f666aba8a4e39b2fe24c509507e6b3ecc4f777a008e98afc7a399a31d089fcac7d2047c1574a584ac
 MISC metadata.xml 160 SHA256 39e232fc7ec88ca0b077cb3950cb39d15cd990842b88d5bfe14f02f34d72f37b SHA512 3ac3a74a7cdf45b14884d967b10e4752f9cb06c579f6d7baf921f9be5450cbe7536c2e5a480ac3c95156eb6abb32e68f74cecc86b9ac0dcc4e0e1b4b255c3e20 WHIRLPOOL f7504ce9e3e8a58d19bba5448305f806c2ae01d0a8d2cf09d6bc6a089a6e1c28a1b12a80bb6020584b5ed21df94e4936b1695a54548704cb8679660b6b807955
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPHCO4ACgkQVWmRsqeSphNYnwCePK4Mg8tmHt8/9leBEkM4Zur5
-BLoAn0PqnaeGqXjz0I11Arz1KLljJRTK
-=Y/ns
+iEYEAREIAAYFAlRayhwACgkQVWmRsqeSphPBrgCeK6NjAeBzG9uu8mUKr2Gv3UJ4
+QyIAn233qEM2TYvHXAQwjx0zCTCGV4H2
+=8f+4
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/scli/files/scli-0.4.0-configure.patch b/net-analyzer/scli/files/scli-0.4.0-configure.patch
new file mode 100644
index 000000000000..d942da0adcc5
--- /dev/null
+++ b/net-analyzer/scli/files/scli-0.4.0-configure.patch
@@ -0,0 +1,44 @@
+--- a/configure.in
++++ b/configure.in
+@@ -20,6 +20,8 @@
+ AC_CHECK_PROG(SMIDUMP, smidump, smidump)
+ AC_SUBST(SMIDUMP)
+ 
++PKG_PROG_PKG_CONFIG
++
+ AC_DEFINE_UNQUOTED(SCLI_PLUGIN_PATH, "${pkglibdir}")
+ 
+ AC_MSG_CHECKING([whether to enable -Wall])
+@@ -33,19 +35,24 @@
+ 
+ dnl Checks for libraries.
+ 
+-AM_PATH_GLIB_2_0(2.0.0, [], AC_MSG_ERROR(scli needs GLIB), gmodule)
+-AM_PATH_GNET_2_0(2.0.0, [], AC_MSG_ERROR(scli needs GNET))
++PKG_CHECK_MODULES(GLIB, glib-2.0 gmodule-2.0 gthread-2.0,[
++	LIBS="$LIBS $GLIB_LIBS"
++	CPPFLAGS="$CPPFLAGS $GLIB_CFLAGS"
++	], AC_MSG_ERROR(scli needs GLIB))
++PKG_CHECK_MODULES(GNET, gnet-2.0 >= 2.0.0,[
++	LIBS="$LIBS $GNET_LIBS"
++	CPPFLAGS="$CPPFLAGS $GNET_CFLAGS"
++	], AC_MSG_ERROR(scli needs GNET))
+ dnl AM_PATH_GLIB(1.2.0, [], AC_MSG_ERROR(scli needs GLIB), gmodule)
+ dnl AM_PATH_GTK(1.2.0, [], AC_MSG_ERROR(scli needs GTK))
+-AM_PATH_XML2(2.0.0, [], AC_MSG_ERROR(scli needs libxml2))
++PKG_CHECK_MODULES(XML2, libxml-2.0 >= 2.0.0,[
++	LIBS="$LIBS $XML2_LIBS"
++	CPPFLAGS="$CPPFLAGS $XML2_CFLAGS"
++	], AC_MSG_ERROR(scli needs libxml2))
+ PKG_CHECK_MODULES(GSNMP, gsnmp, have_gsnmp=true, have_gsnmp=false)
+ AC_SUBST(GSNMP_CFLAGS)
+ AC_SUBST(GSNMP_LIBS)
+-AC_CHECK_LIB(ncurses, initscr, [],
+-  AC_CHECK_LIB(curses, initscr, [],
+-    AC_MSG_ERROR([scli requires curses functions; install curses first])
+-  )
+-)
++PKG_CHECK_MODULES(ncurses,ncurses,LIBS="$LIBS $ncurses_LIBS",AC_MSG_ERROR([ncurses is required]))
+ AC_CHECK_LIB(readline, readline, [],
+   AC_MSG_ERROR([scli requires readline functions; install libreadline first])
+ )
diff --git a/net-analyzer/scli/files/scli-0.4.0-tinfo.patch b/net-analyzer/scli/files/scli-0.4.0-tinfo.patch
deleted file mode 100644
index 5a287ca5ff79..000000000000
--- a/net-analyzer/scli/files/scli-0.4.0-tinfo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -41,6 +41,7 @@
- PKG_CHECK_MODULES(GSNMP, gsnmp, have_gsnmp=true, have_gsnmp=false)
- AC_SUBST(GSNMP_CFLAGS)
- AC_SUBST(GSNMP_LIBS)
-+PKG_CHECK_MODULES(ncurses,ncurses,LIBS="$LIBS $ncurses_LIBS",AC_MSG_ERROR([ncurses is required]))
- AC_CHECK_LIB(ncurses, initscr, [],
-   AC_CHECK_LIB(curses, initscr, [],
-     AC_MSG_ERROR([scli requires curses functions; install curses first])
diff --git a/net-analyzer/scli/scli-0.4.0-r1.ebuild b/net-analyzer/scli/scli-0.4.0-r1.ebuild
index f683898dd468..deff342bb236 100644
--- a/net-analyzer/scli/scli-0.4.0-r1.ebuild
+++ b/net-analyzer/scli/scli-0.4.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scli/scli-0.4.0-r1.ebuild,v 1.5 2014/07/16 23:21:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scli/scli-0.4.0-r1.ebuild,v 1.6 2014/11/06 01:08:43 jer Exp $
 
 EAPI=5
-inherit autotools eutils flag-o-matic
+inherit autotools eutils
 
 DESCRIPTION="SNMP Command Line Interface"
 HOMEPAGE="http://cnds.eecs.jacobs-university.de/users/schoenw/articles/software/index.html"
@@ -30,11 +30,7 @@ DEPEND="
 DOCS=( AUTHORS ChangeLog NEWS PORTING README TODO )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-tinfo.patch
+	epatch "${FILESDIR}"/${P}-configure.patch
 
 	eautoreconf
 }
-
-src_configure() {
-	econf --disable-malloc --enable-warnings
-}