With USE=-gtk, AM_PATH_GTK_2_0 still needs to get expanded, so add gtk-2.0.m4 (bug #494636 by broot).

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

5 files changed, 219 insertions, 28 deletions

diff --git a/net-analyzer/pinger/ChangeLog b/net-analyzer/pinger/ChangeLog
index 12b857645e0e..8932c7e47d71 100644
--- a/net-analyzer/pinger/ChangeLog
+++ b/net-analyzer/pinger/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/pinger
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pinger/ChangeLog,v 1.18 2013/08/17 16:55:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pinger/ChangeLog,v 1.19 2013/12/18 15:09:28 jer Exp $
+
+  18 Dec 2013; Jeroen Roovers <jer@gentoo.org> pinger-0.32e.ebuild,
+  +files/gtk-2.0.m4, -files/disable_gtk.patch:
+  With USE=-gtk, AM_PATH_GTK_2_0 still needs to get expanded, so add gtk-2.0.m4
+  (bug #494636 by broot).
 
 *pinger-0.32e (17 Aug 2013)
 
diff --git a/net-analyzer/pinger/Manifest b/net-analyzer/pinger/Manifest
index 36a37bcfc737..334a1556b5d0 100644
--- a/net-analyzer/pinger/Manifest
+++ b/net-analyzer/pinger/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX disable_gtk.patch 856 SHA256 34066e9061cc9a88eb7880576626532ed3e23d2eb9d5d05f581e56bf457f74f1 SHA512 21ab5a30a4a624be1b13eb4f215a3bc2a884b1330e68e3dde6cdf9e6b2266cf1d99fde1b2cb184c6226f355ab8792c99f607831c1f49b310c591bc4a239f7b57 WHIRLPOOL d276d1ac855c1600ec4256b9b5fd63e0f181742e8b7fb3abc996c4a068b0d7446b1bd055dc511cd5c8309bd56dc98c9d21d001fd2ff941d8041b2ce1a80e3f98
+AUX gtk-2.0.m4 7539 SHA256 a70f40690ad9fb41178131d63d3e5579baff4d15c412b1c74e2bde92b4c7dd3b SHA512 efaa503adf5653a60cd807e9ed8a4ab0bc1ef93610ff022b7fd74cbddc3940adf210c0dd419d348686b3f1761aec51c1d8ff335d1bf6b765739270b08337089e WHIRLPOOL 69656aaab982f4a515bbb9394c84f3bf6e4bf2a8c94b1e3c62b9ae51374e1b1ae73e87eb4d6540eede799354a453e346a497f3905e79d467ffccdfff00683881
 DIST gtk-2.0-for-pinger.m4.bz2 2508 SHA256 59152f9a4a1af5cf09f2aaa804c9071afe3eb6632162f1660d85c820db342eba SHA512 0f593b761d7a9399469f1f7bb3992133b391a2ce760ecfad96237561992802c192b810f4722763685d5f6e7a76bd2806abf08e1850bdce00e5cd3af4c810210f WHIRLPOOL 8bfa2cd70c2aba06473692cdf3e091a983aab69cdb5be3d0382b6b87c05bcc577ecb1afab26afc17ee16d07a1161fe84f17e3cc9ae0a150364f34667cfba5779
 DIST pinger-0.32d.tar.gz 240800 SHA256 4eb47ad8309a37de1d0c6604ba136e016d52c7305bcea93c510461c32a1f962e SHA512 cb30a58e3c08c3c15b0a61282fadfeb92636087f0c1bdcc69e16cb704467ce39e6d8701f57c102ec19f1d98f24220141e67b5973fdbadc3bfefc1ed377c78948 WHIRLPOOL c67ec3150945b5e89baccc3c50553fe6ec3e492f424d2312fa460578c2538b94ed82ee2f79fc949533598b3d071e762bb5e09e384adb6bf56f47749ad71b1502
 DIST pinger-0.32e.tar.gz 239002 SHA256 73edc85b1b45d6f7721e619b62e4dc7303306297a90f2ffd292d7fe9578321b2 SHA512 8a6cebe9b37399e2e84eead3b386b999212904ecffb1fc951b4165295b278690217f35d20830e1f1440b94567d9d5d3423d37ee6e9200173be9aacefb68a87f7 WHIRLPOOL 08c2549c4d8361cc5dd97fe2498769b9c40f59b574bd04d40c6d1183699fa535c23388ff3de6f41f92faa19f9a62e36a58f46acaf06d3a1e1a6d5a18f31f80d6
 EBUILD pinger-0.32d.ebuild 982 SHA256 b984b9fece65f9d0c07b2019156f5fd2b58f320dc804489cb3957f1b0dafec3d SHA512 af405847eac4084de6d2d74395b2f85ed2ffee8e8809f3a89e308d0b4443d69b22117db43f6444fdc9bed7d73785ed00450ef797cc7f2832f79d42c831d4260f WHIRLPOOL e5c8c540967430dbd7436f9ee69d41e9215a79a15b0cf3cebb8943d9f72e250f70e03f52e7316a7fdb0b78f448a834fc9e436bb9f0ee6727ad8f30e03f216b01
-EBUILD pinger-0.32e.ebuild 880 SHA256 251a78af960a911ad509cfb561c21b4a82839deec4c473ba90929947a8f2f678 SHA512 59773e390a495005a7dba6126028fa7cc8ae0f10542ac62f74dae85cc5583fa4aa9bee4d0f4eedc6fa5296e2fbaad24b1048af54237de3a169d116c61dbc3878 WHIRLPOOL 032798a778841dddde2f0119a3bb55130e55cc1428ed53d10a539948b7934010d8ab5161eb0b3ad0e02c538daf336cfca9fb2251abb257fcc932b94b83164f12
-MISC ChangeLog 2567 SHA256 5bb23da339994b4deec2356ec50f24b10f0bbbc6425c61e06560d80936421633 SHA512 47ac896edfa61a71376a4e01a736baef06e61990778f374debc83ec447df7345ee05cb761bfa9e552562a032c4e3d45ff8fd8a81a0bde7d378688ba021942cf9 WHIRLPOOL 357505dfbbe16fcec921facd242ef95daf6bbe1979f5311ed112f3483a1b11390cbf35ffd9f74baebcf7f9a2451e4be68525356f1a7886edcd0dccfa34777d48
+EBUILD pinger-0.32e.ebuild 975 SHA256 5e2ebe2bb13554c44132c5465a29d9603d6f8fa5677b41557a0f319536108a42 SHA512 05bd02513ae440df06aea2c55461456da9d3d45c00afb01848dea61eae39ba3c4c21119062a953715f1a2bf0fdd7dae3709e3688ef7e091d67020ac44da0f69e WHIRLPOOL 692055e7582d5d67319467a0eb54269e34b42aab45f2849ad21cacc80b32d3eba901a2b0c4b8b144b9704db5ab06616a81073cafeff8d0eb572eb06292e41d8d
+MISC ChangeLog 2789 SHA256 4874a5e695e075f5554417ca336d3c109b645a75cbc9ebf5bb16489981e9e728 SHA512 77194826c8ee9960db7c66599a5425efa84f541e7f59e4fff1b5e0e67f414e659b99bea26fb22694608439798b3c4ac490d25f2641591b08f7831ab6deda4258 WHIRLPOOL a2efd196038662e64bcee4165a92c033f92b49678ee419af545b878083b9206a42a35511a98420571e20fe80bcfe9ce94949590e1780d43c70066cb5abaede85
 MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlIPqvgACgkQVWmRsqeSphN5dgCfSfCDJyrraQnBigmaH1mhZvEX
-EF0An0RYc5ytYK80UhOBoS4z4HZ6FTpJ
-=NxPM
+iEYEAREIAAYFAlKxuqoACgkQVWmRsqeSphMCDgCfTJbXhZTjn7w7F/INoZuE8HSa
+IDQAn1axReF20LB3U6Er67oOMAMwRMXG
+=OYeF
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/pinger/files/disable_gtk.patch b/net-analyzer/pinger/files/disable_gtk.patch
deleted file mode 100644
index bef664bf5fac..000000000000
--- a/net-analyzer/pinger/files/disable_gtk.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- pinger-0.32c-orig/configure.in	2008-01-21 09:43:32.000000000 +0100
-+++ pinger-0.32c/configure.in	2008-01-21 09:43:35.000000000 +0100
-@@ -56,13 +56,15 @@
- 
- AC_ARG_ENABLE(gtk, [  --enable-gtk            enable GTK+ support],
-               [if test "$enableval" = no; then no_gtk=yes; fi])
--              AC_MSG_CHECKING([for GTK+ support])
-+AC_MSG_CHECKING([for GTK+ support])
- AC_MSG_RESULT($enableval)
- dnl Check for additional external libraries etc..
-+if test x$no_gtk != xyes; then
- AM_PATH_GTK_2_0(2.0.0, CFLAGS="$CFLAGS $GTK_CFLAGS"
- 					 LIBS="$LIBS $GTK_LIBS"; HAVE_GTK_2=1;
- 					 AC_DEFINE([HAVE_GTK_2], 1, Found GTK 2),
-            HAVE_GTK_2=0)
-+fi
- AC_CHECK_LIB(ncurses, initscr, HAVE_CURSES=1; LIBS="$LIBS -lncurses";
- 	AC_DEFINE([HAVE_LIBNCURSES], [1], found ncurses library))
- AC_CHECK_LIB(intl, libintl_gettext, LIBS="$LIBS -lintl")
diff --git a/net-analyzer/pinger/files/gtk-2.0.m4 b/net-analyzer/pinger/files/gtk-2.0.m4
new file mode 100644
index 000000000000..88596a969e19
--- /dev/null
+++ b/net-analyzer/pinger/files/gtk-2.0.m4
@@ -0,0 +1,196 @@
+# Configure paths for GTK+
+# Owen Taylor     1997-2001
+
+dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, 
+dnl pass to pkg-config
+dnl
+AC_DEFUN([AM_PATH_GTK_2_0],
+[dnl 
+dnl Get the cflags and libraries from pkg-config
+dnl
+AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run a test GTK+ program],
+		    , enable_gtktest=yes)
+
+  pkg_config_args=gtk+-2.0
+  for module in . $4
+  do
+      case "$module" in
+         gthread) 
+             pkg_config_args="$pkg_config_args gthread-2.0"
+         ;;
+      esac
+  done
+
+  no_gtk=""
+
+  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+  if test x$PKG_CONFIG != xno ; then
+    if pkg-config --atleast-pkgconfig-version 0.7 ; then
+      :
+    else
+      echo "*** pkg-config too old; version 0.7 or better required."
+      no_gtk=yes
+      PKG_CONFIG=no
+    fi
+  else
+    no_gtk=yes
+  fi
+
+  min_gtk_version=ifelse([$1], ,2.0.0,$1)
+  AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
+
+  if test x$PKG_CONFIG != xno ; then
+    ## don't try to run the test against uninstalled libtool libs
+    if $PKG_CONFIG --uninstalled $pkg_config_args; then
+	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
+	  enable_gtktest=no
+    fi
+
+    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
+	  :
+    else
+	  no_gtk=yes
+    fi
+  fi
+
+  if test x"$no_gtk" = x ; then
+    GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
+    GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
+    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_gtktest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GTK_CFLAGS"
+      LIBS="$GTK_LIBS $LIBS"
+dnl
+dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
+dnl checks the results of pkg-config to some extent)
+dnl
+      rm -f conf.gtktest
+      AC_TRY_RUN([
+#include <gtk/gtk.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int 
+main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  fclose (fopen ("conf.gtktest", "w"));
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_gtk_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gtk_version");
+     exit(1);
+   }
+
+  if ((gtk_major_version != $gtk_config_major_version) ||
+      (gtk_minor_version != $gtk_config_minor_version) ||
+      (gtk_micro_version != $gtk_config_micro_version))
+    {
+      printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
+             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
+             gtk_major_version, gtk_minor_version, gtk_micro_version);
+      printf ("*** was found! If pkg-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
+      printf("*** to point to the correct configuration files\n");
+    } 
+  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
+	   (gtk_minor_version != GTK_MINOR_VERSION) ||
+           (gtk_micro_version != GTK_MICRO_VERSION))
+    {
+      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
+	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+	     gtk_major_version, gtk_minor_version, gtk_micro_version);
+    }
+  else
+    {
+      if ((gtk_major_version > major) ||
+        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
+               gtk_major_version, gtk_minor_version, gtk_micro_version);
+        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
+	       major, minor, micro);
+        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
+        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_gtk" = x ; then
+     AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     if test "$PKG_CONFIG" = "no" ; then
+       echo "*** A new enough version of pkg-config was not found."
+       echo "*** See http://pkgconfig.sourceforge.net"
+     else
+       if test -f conf.gtktest ; then
+        :
+       else
+          echo "*** Could not run GTK+ test program, checking why..."
+	  ac_save_CFLAGS="$CFLAGS"
+	  ac_save_LIBS="$LIBS"
+          CFLAGS="$CFLAGS $GTK_CFLAGS"
+          LIBS="$LIBS $GTK_LIBS"
+          AC_TRY_LINK([
+#include <gtk/gtk.h>
+#include <stdio.h>
+],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
+          echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GTK_CFLAGS=""
+     GTK_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(GTK_CFLAGS)
+  AC_SUBST(GTK_LIBS)
+  rm -f conf.gtktest
+])
diff --git a/net-analyzer/pinger/pinger-0.32e.ebuild b/net-analyzer/pinger/pinger-0.32e.ebuild
index 209733f17f00..712b6fd82dee 100644
--- a/net-analyzer/pinger/pinger-0.32e.ebuild
+++ b/net-analyzer/pinger/pinger-0.32e.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pinger/pinger-0.32e.ebuild,v 1.1 2013/08/17 16:55:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pinger/pinger-0.32e.ebuild,v 1.2 2013/12/18 15:09:28 jer Exp $
 
 EAPI=5
+
 inherit autotools eutils flag-o-matic
 
 DESCRIPTION="Cyclic multi ping utility for selected adresses using GTK/ncurses."
@@ -26,7 +27,11 @@ DEPEND="
 DOCS=( AUTHORS BUGS ChangeLog NEWS README )
 
 src_prepare() {
+	# bug #494636
+	cp "${FILESDIR}"/gtk-2.0.m4 m4/ || die
+
 	sed -i -e '/Root privileges/d' src/Makefile.am || die
+
 	eautoreconf
 }
 
@@ -35,3 +40,7 @@ src_configure() {
 
 	econf $(use_enable gtk) $(use_enable nls)
 }
+
+src_install() {
+	dobin src/pinger
+}