Version bump.

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

5 files changed, 151 insertions, 6 deletions

diff --git a/net-analyzer/pinger/ChangeLog b/net-analyzer/pinger/ChangeLog
index db3441644de0..76e398bb7d77 100644
--- a/net-analyzer/pinger/ChangeLog
+++ b/net-analyzer/pinger/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/pinger
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pinger/ChangeLog,v 1.27 2014/08/14 20:44:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pinger/ChangeLog,v 1.28 2014/10/16 09:14:52 jer Exp $
+
+*pinger-0.33 (16 Oct 2014)
+
+  16 Oct 2014; Jeroen Roovers <jer@gentoo.org> +pinger-0.33.ebuild,
+  +files/pinger-0.33-gentoo.patch, metadata.xml:
+  Version bump.
 
   14 Aug 2014; Jeroen Roovers <jer@gentoo.org> -pinger-0.32d.ebuild:
   Old.
diff --git a/net-analyzer/pinger/Manifest b/net-analyzer/pinger/Manifest
index 4c4f636adc7b..736858bcf7e1 100644
--- a/net-analyzer/pinger/Manifest
+++ b/net-analyzer/pinger/Manifest
@@ -3,14 +3,17 @@ Hash: SHA256
 
 AUX gtk-2.0.m4 7539 SHA256 a70f40690ad9fb41178131d63d3e5579baff4d15c412b1c74e2bde92b4c7dd3b SHA512 efaa503adf5653a60cd807e9ed8a4ab0bc1ef93610ff022b7fd74cbddc3940adf210c0dd419d348686b3f1761aec51c1d8ff335d1bf6b765739270b08337089e WHIRLPOOL 69656aaab982f4a515bbb9394c84f3bf6e4bf2a8c94b1e3c62b9ae51374e1b1ae73e87eb4d6540eede799354a453e346a497f3905e79d467ffccdfff00683881
 AUX pinger-0.32e-tinfo.patch 907 SHA256 ebf26e93521ed7d0d8829bb54d504a1aef10b35b3b63bf330831b9b09fb43a70 SHA512 690b3b669d225c55641fce56d91d287a2152c0546b15f728761ec869afc311a49f831b38642f63f999958e20ba6ce2855efc2a5c3aec6ab2a752349cc375904f WHIRLPOOL 3262c5569ac7a8fc688e7cd34e6750029195ff617b6e3cb0ffa813c677ca601a9620206ef6ff905335c2d78fa517b712f3513656b6085de36bef690657fa5482
+AUX pinger-0.33-gentoo.patch 2488 SHA256 30c4c9fd66e1ee7577d18930a881a15c918d2262240ddf7a500dae3a24c2b6f3 SHA512 7ebda41ab5caf068476e82f181893b688a0c211cc3e26750517e2cdd4db872bfba4b8d389708bb39fedf103d29cb5b98be3ba0064cd73453735ece3a68776730 WHIRLPOOL 3c97ffb6743d5e181d46dc9c400aabf218a32c37fc09da92403258733ad3d7817aa6fae97fc0f5a02aa88619a5ce8b1b1a8090a9edfea2cb4944dd3ea96b1d9a
 DIST pinger-0.32e.tar.gz 239002 SHA256 73edc85b1b45d6f7721e619b62e4dc7303306297a90f2ffd292d7fe9578321b2 SHA512 8a6cebe9b37399e2e84eead3b386b999212904ecffb1fc951b4165295b278690217f35d20830e1f1440b94567d9d5d3423d37ee6e9200173be9aacefb68a87f7 WHIRLPOOL 08c2549c4d8361cc5dd97fe2498769b9c40f59b574bd04d40c6d1183699fa535c23388ff3de6f41f92faa19f9a62e36a58f46acaf06d3a1e1a6d5a18f31f80d6
+DIST pinger-0.33.tar.gz 247827 SHA256 c092f972529f1038b6eac87195b87c2a308891db7f1db18b1a8cbe0df84b6569 SHA512 fff07599ef91fbdcff9be7806eca57a71e8e6fac7e9afc67c4147e6246b0bcdadf379de28f87054dbe7c409955c0e0ddeae7f529e954231bea0cfb39e4e29bc1 WHIRLPOOL e16f1eb1d7dc9f26a7eea7f6b47971388243cfee5d35557c24483c610c1292640c1068fda9ae34b575ec324ffe309ed2d4b67a696c227c3485cd0cb3d0ac7c68
 EBUILD pinger-0.32e.ebuild 1077 SHA256 38503332713ab5ec9ec82ede9ee59d649cdf5e6059d36365eee5c91368b6148f SHA512 24b4d5dafef9ed912c0a9fdb85178ee3fccbb6554765181d28f6f3c8da2e98866e6226cca9ae2c285b332a458dd35b62574a70168cd8c64958b11787fdf95b6d WHIRLPOOL 3063ae224b0e3007642498b1b128c75d0048ec5ea891d6ec4ca37d9d546462f1d9e621f2195b6d1b1e1fcf096d76a6092460488218a576578d57ee3ee4bc4546
-MISC ChangeLog 3857 SHA256 0b58c10d5b36ee3f116f2836b0788ae1fce073b9221d8c93ba33f3031896a25f SHA512 9cbed7f549ef70000f411b1f9a91ba5401ec4a75d8e8aae7ea5dc2141a5f1fb5c0cd114335600ca9f970edc1c30c7874f54bf3a9f6c6d99216f4ecec6e75dcf9 WHIRLPOOL 8d4f86f4d0c1c4e8cbdd0c29588b1cc4fab443e439a92d295af45c469a338ea272d3697718bbf7aa2f7057ce5a4df64316c3b5db293f73fb5015dd2224d48ff2
-MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
+EBUILD pinger-0.33.ebuild 1164 SHA256 d6d79f103c0d740695a005ee6a6bd81f2193699997f4dda5c0043371d2b30dd5 SHA512 1c12f8c868cd2a5cbfdb709e65474953d7903564df02142dd0d6298f04ddb34c4acad1945be546534060f32240e57e9da207107db219b65a4a3e35a4115b6a9a WHIRLPOOL 953c17248000ce15f394653f6a42d7a066d733b58b2d8aff00be35fafb7798dedf6795300ec150817dc325a985bb557ab131f1ec51ff79a74e21bbc6a8c973d4
+MISC ChangeLog 4019 SHA256 894ffb67c1bc303ddac3062d87f832312fd6be78af2fcfd8121e562d56f6de72 SHA512 b54ca5801b38eea929dbb887dae57da9bcfdd37da326aa4fd21797f055e22c66b887b78bd6adb846f83f7a01570ecfeff7f4ff495bb23c245c3d270b1f14302b WHIRLPOOL 0c93bf0af9e05a0f16200184287716204879e12f75bab213eb92137e02db1ab04a9bda8eae83b6e47fcf481fe107f0358b46a7215268de6908dbc133cf63e43e
+MISC metadata.xml 360 SHA256 0beb64da62fef05366cf48766a38f94e69e98724d43ab04117d3d48be1d6d0b6 SHA512 2adde5148ec48efac0c7c615be226ce9b95f8357b91ed41f1783678fbbeed8574745664b0b542b25907296b429fbaca5cbbde57528714bf5200601ad21dac42d WHIRLPOOL 2a0bf739a982e8965f4918d9b9f3d47973a5fb9bbda09c8fd9ffec3ad8b8c68c17525fe369106662d4528d833dbdbf3b1fb47504e251f58ee4b02516b99d9ab3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPtH5gACgkQVWmRsqeSphNn8gCeItjFbTL/TzzxoO2duqWKJaUU
-+VIAn2rYYIIh52XV3nw8QDN7zzXwfqXB
-=75mR
+iEYEAREIAAYFAlQ/jI4ACgkQVWmRsqeSphNl0ACdHB/OgLkpdeq5z17phBv42bYZ
+iWAAnRvS1aaNYQWL7tj0U94/kEAJU3Gv
+=uOMF
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/pinger/files/pinger-0.33-gentoo.patch b/net-analyzer/pinger/files/pinger-0.33-gentoo.patch
new file mode 100644
index 000000000000..76ef052a4a2d
--- /dev/null
+++ b/net-analyzer/pinger/files/pinger-0.33-gentoo.patch
@@ -0,0 +1,73 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -2,7 +2,12 @@
+ 
+ bin_PROGRAMS = pinger
+ man_MANS = pinger.1
++if HAVE_GTK_2
+ bin_SCRIPTS = gtkpinger
++endif
++if HAVE_GTK_3
++bin_SCRIPTS = gtkpinger
++endif
+ 
+   P_SOURCES = timefunc.c parse.c ping.c pinger.c dns.c log.c timefunc.h parse.h ping.h globals.h fake_gtk.h dns.h log.h
+ if HAVE_CURSES
+--- a/configure.in
++++ b/configure.in
+@@ -54,34 +54,46 @@
+ AC_HEADER_TIME
+ AM_INADDRT
+ 
++PKG_PROG_PKG_CONFIG()
++
+ dnl GTK3/GTK2 tests
+ dnl Note: PKG_CHECK_MODULES cannot be used conditionaly due to sharing the tests and depending on it
+ AC_ARG_ENABLE([gtk], AS_HELP_STRING([--enable-gtk[[[=version]]]], [Build with GTK+ interface. Supported versions are gtk2 and gtk3. Default is gtk2.]))
+-PKG_CHECK_MODULES(GTK, [ gtk+-2.0 >= 2.4 ], HAVE_GTK_2=1; )
+-AC_SUBST(GTK_CFLAGS)
+-AC_SUBST(GTK_LIBS)
+-PKG_CHECK_MODULES(GTK3, [ gtk+-3.0 >= 3.12 ], HAVE_GTK_3=1)
+-AC_SUBST(GTK3_CFLAGS)
+-AC_SUBST(GTK3_LIBS)
+ 
+ if test "x$enableval" = "x" || test "x$enableval" = "xgtk2"; then
++PKG_CHECK_MODULES(GTK, [ gtk+-2.0 >= 2.4 ], HAVE_GTK_2=1,[])
++AC_SUBST(GTK_CFLAGS)
++AC_SUBST(GTK_LIBS)
+ CFLAGS="$CFLAGS $GTK_CFLAGS"
+ LIBS="$LIBS $GTK_LIBS"
+ HAVE_GTK_3=0
+ AC_DEFINE(HAVE_GTK_2, 1, Found GTK+ 2.x support)
+ elif test "x$enableval" = "xgtk3"; then
++PKG_CHECK_MODULES(GTK3, [ gtk+-3.0 >= 3.12 ], HAVE_GTK_3=1,[])
++AC_SUBST(GTK3_CFLAGS)
++AC_SUBST(GTK3_LIBS)
+ CFLAGS="$CFLAGS $GTK3_CFLAGS"
+ LIBS="$LIBS $GTK3_LIBS"
+ HAVE_GTK_2=0
+ AC_DEFINE(HAVE_GTK_3, 1, Found GTK+ 3.x support)
+ else
+-echo "Sorry, the value $enableval is not supported as argument of --enable-gtk."
+-exit 1
++HAVE_GTK_2=0
++HAVE_GTK_3=0
+ fi
+ 
+-dnl Check for additional external libraries etc..
++AC_ARG_ENABLE(ncurses, [  --enable-ncurses        enable ncurses support],
++	[if test "$enableval" = no; then no_ncurses=yes; fi])
++if test x$no_ncurses != xyes; then
++PKG_CHECK_MODULES(ncurses, ncurses,[
++	AC_DEFINE([HAVE_LIBNCURSES], [1], found ncurses library)
++	HAVE_CURSES=1
++	LIBS="$LIBS $ncurses_LIBS"
++	CFLAGS="$CFLAGS $ncurses_CFLAGS"],
+ AC_CHECK_LIB(ncurses, initscr, HAVE_CURSES=1; LIBS="$LIBS -lncurses";
+ 	AC_DEFINE([HAVE_LIBNCURSES], [1], found ncurses library))
++	)
++fi
++dnl Check for additional external libraries etc..
+ AC_CHECK_LIB(intl, libintl_gettext, LIBS="$LIBS -lintl")
+ AC_CHECK_LIB(pthread, pthread_create, LIBS="$LIBS -lpthread", AC_MSG_ERROR(Pthread required and not found. Please check if you have libpthread in your system and specify using CFLAGS and LDFLAGS when configure))
+ 
diff --git a/net-analyzer/pinger/metadata.xml b/net-analyzer/pinger/metadata.xml
index 03aa50bab7e3..56ad93e19831 100644
--- a/net-analyzer/pinger/metadata.xml
+++ b/net-analyzer/pinger/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
+<use>
+<flag name='gtk2'>Install the gtkpinger GUI utility based on <pkg>x11-libs/gtk:2</pkg></flag>
+<flag name='gtk3'>Install the gtkpinger GUI utility based on <pkg>x11-libs/gtk:3</pkg></flag>
+</use>
 </pkgmetadata>
diff --git a/net-analyzer/pinger/pinger-0.33.ebuild b/net-analyzer/pinger/pinger-0.33.ebuild
new file mode 100644
index 000000000000..699f5b6c77bc
--- /dev/null
+++ b/net-analyzer/pinger/pinger-0.33.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pinger/pinger-0.33.ebuild,v 1.1 2014/10/16 09:14:52 jer Exp $
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="Cyclic multi ping utility for selected adresses using GTK/ncurses"
+HOMEPAGE="http://aa.vslib.cz/silk/projekty/pinger/"
+SRC_URI="${HOMEPAGE}download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gtk2 gtk3 ncurses nls"
+
+REQUIRED_USE="
+	|| ( gtk2 gtk3 ncurses )
+	?? ( gtk2 gtk3 )
+"
+GTK_DEPEND="
+	dev-libs/glib:2
+"
+RDEPEND="
+	gtk2? (
+		${GTK_DEPEND}
+		>=x11-libs/gtk+-2.4:2
+	)
+	gtk3? (
+		${GTK_DEPEND}
+		>=x11-libs/gtk+-3.12:3
+	)
+	ncurses? ( sys-libs/ncurses )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS BUGS ChangeLog NEWS README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+
+	sed -i -e '/Root privileges/d' src/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -D_GNU_SOURCE
+
+	econf \
+		$(usex gtk2 --enable-gtk=gtk2 '') \
+		$(usex gtk3 --enable-gtk=gtk3 '') \
+		$(use_enable ncurses) \
+		$(use_enable nls)
+}