summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2013-12-18 16:16:57 +0000
committerJeroen Roovers <jer@gentoo.org>2013-12-18 16:16:57 +0000
commit220d0d68d090ec9c8fd2384978a568b37f43ef3a (patch)
tree7c008631c964076263c21f03903e76a855745c51 /net-analyzer/pinger
parentfix access violations, bug 420623 (diff)
downloadhistorical-220d0d68d090ec9c8fd2384978a568b37f43ef3a.tar.gz
historical-220d0d68d090ec9c8fd2384978a568b37f43ef3a.tar.bz2
historical-220d0d68d090ec9c8fd2384978a568b37f43ef3a.zip
Fix building against sys-libs/ncurses[tinfo].
Package-Manager: portage-2.2.7/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'net-analyzer/pinger')
-rw-r--r--net-analyzer/pinger/ChangeLog6
-rw-r--r--net-analyzer/pinger/Manifest11
-rw-r--r--net-analyzer/pinger/files/pinger-0.32e-tinfo.patch15
-rw-r--r--net-analyzer/pinger/pinger-0.32e.ebuild4
4 files changed, 29 insertions, 7 deletions
diff --git a/net-analyzer/pinger/ChangeLog b/net-analyzer/pinger/ChangeLog
index 8932c7e47d71..7650b4d78ff9 100644
--- a/net-analyzer/pinger/ChangeLog
+++ b/net-analyzer/pinger/ChangeLog
@@ -1,6 +1,10 @@
# 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.19 2013/12/18 15:09:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pinger/ChangeLog,v 1.20 2013/12/18 16:16:55 jer Exp $
+
+ 18 Dec 2013; Jeroen Roovers <jer@gentoo.org> pinger-0.32e.ebuild,
+ +files/pinger-0.32e-tinfo.patch:
+ Fix building against sys-libs/ncurses[tinfo].
18 Dec 2013; Jeroen Roovers <jer@gentoo.org> pinger-0.32e.ebuild,
+files/gtk-2.0.m4, -files/disable_gtk.patch:
diff --git a/net-analyzer/pinger/Manifest b/net-analyzer/pinger/Manifest
index 334a1556b5d0..15fa723a4b06 100644
--- a/net-analyzer/pinger/Manifest
+++ b/net-analyzer/pinger/Manifest
@@ -2,17 +2,18 @@
Hash: SHA256
AUX gtk-2.0.m4 7539 SHA256 a70f40690ad9fb41178131d63d3e5579baff4d15c412b1c74e2bde92b4c7dd3b SHA512 efaa503adf5653a60cd807e9ed8a4ab0bc1ef93610ff022b7fd74cbddc3940adf210c0dd419d348686b3f1761aec51c1d8ff335d1bf6b765739270b08337089e WHIRLPOOL 69656aaab982f4a515bbb9394c84f3bf6e4bf2a8c94b1e3c62b9ae51374e1b1ae73e87eb4d6540eede799354a453e346a497f3905e79d467ffccdfff00683881
+AUX pinger-0.32e-tinfo.patch 647 SHA256 5d8406f3ba39ddd93b0cd963eb1f116d84c81d4dff31e74908a6652f14cae60b SHA512 b494bb09e7165d77bdbbb65dca167dc1cecc5e4073999d5744515e4c6cfce70ec7102740fd6a52b61dcd8ae4b65eefd66aab51dd590bd8074a7d07ad48c42421 WHIRLPOOL f45788c2f86fe38c900e1736ff5248eec372e3cdd6d98e076554083802a38b9883f0568ef7a3be119fcb831bf1fc69d8159212c909b74c7941e5906969a5f671
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 975 SHA256 5e2ebe2bb13554c44132c5465a29d9603d6f8fa5677b41557a0f319536108a42 SHA512 05bd02513ae440df06aea2c55461456da9d3d45c00afb01848dea61eae39ba3c4c21119062a953715f1a2bf0fdd7dae3709e3688ef7e091d67020ac44da0f69e WHIRLPOOL 692055e7582d5d67319467a0eb54269e34b42aab45f2849ad21cacc80b32d3eba901a2b0c4b8b144b9704db5ab06616a81073cafeff8d0eb572eb06292e41d8d
-MISC ChangeLog 2789 SHA256 4874a5e695e075f5554417ca336d3c109b645a75cbc9ebf5bb16489981e9e728 SHA512 77194826c8ee9960db7c66599a5425efa84f541e7f59e4fff1b5e0e67f414e659b99bea26fb22694608439798b3c4ac490d25f2641591b08f7831ab6deda4258 WHIRLPOOL a2efd196038662e64bcee4165a92c033f92b49678ee419af545b878083b9206a42a35511a98420571e20fe80bcfe9ce94949590e1780d43c70066cb5abaede85
+EBUILD pinger-0.32e.ebuild 1015 SHA256 626a0f3580a314a5f6cb18a793bbffcad2904fa32f39f7ac6832cf470daa4580 SHA512 ddabde49802b9015ab37992150d75b82c4e2cf2ac19d8cd2f4a066c5caf412b8ea38c99d544b478e2e1700fb8c1ed5028983d6f4b8000bfff59435156c4f9a1a WHIRLPOOL b71f40350174654e539e5e019d1c443708e726416d95f21a0639b5f9e99270033607adac9c3707e0fc90e8ebfd3c8f0916e967278f9118c96a31f3996df566a8
+MISC ChangeLog 2941 SHA256 776b00973bb2cd5b589806373ab80c811b9927fac1e98b97630210870c13d042 SHA512 6f2b950af9cab1976317fe5740bb2689e82515b3bbf1ffe0f516039fe3d5f43a8d34897508b5e6936dd507e398d9c9b7e8cdd99ca03446ff6072ad04b5767afc WHIRLPOOL 8c6884d289f0e92d0e7283bf6e9716ddcc5a25345a0cc1f6639f49221027158bba5b8633a67f022fd6fecdc9911aa3c47b29e3f377e03084da4e1931743a10ed
MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iEYEAREIAAYFAlKxuqoACgkQVWmRsqeSphMCDgCfTJbXhZTjn7w7F/INoZuE8HSa
-IDQAn1axReF20LB3U6Er67oOMAMwRMXG
-=OYeF
+iEYEAREIAAYFAlKxynkACgkQVWmRsqeSphOYNwCggFrlHP8kYYPAYB11LOT9XI4F
+Z0oAnivc5/haBosib77X9x9KM0t3vW4V
+=sd/a
-----END PGP SIGNATURE-----
diff --git a/net-analyzer/pinger/files/pinger-0.32e-tinfo.patch b/net-analyzer/pinger/files/pinger-0.32e-tinfo.patch
new file mode 100644
index 000000000000..f30d8a7fa03e
--- /dev/null
+++ b/net-analyzer/pinger/files/pinger-0.32e-tinfo.patch
@@ -0,0 +1,15 @@
+--- a/configure.in
++++ b/configure.in
+@@ -65,8 +65,12 @@
+ AC_DEFINE([HAVE_GTK_2], 1, Found GTK 2),
+ HAVE_GTK_2=0)
+ fi
++PKG_CHECK_MODULES(ncurses, ncurses,[
++ 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))
++ )
+ 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/pinger-0.32e.ebuild b/net-analyzer/pinger/pinger-0.32e.ebuild
index 712b6fd82dee..ac1193bbb6ef 100644
--- a/net-analyzer/pinger/pinger-0.32e.ebuild
+++ b/net-analyzer/pinger/pinger-0.32e.ebuild
@@ -1,6 +1,6 @@
# 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.2 2013/12/18 15:09:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pinger/pinger-0.32e.ebuild,v 1.3 2013/12/18 16:16:55 jer Exp $
EAPI=5
@@ -30,6 +30,8 @@ src_prepare() {
# bug #494636
cp "${FILESDIR}"/gtk-2.0.m4 m4/ || die
+ epatch "${FILESDIR}"/${P}-tinfo.patch
+
sed -i -e '/Root privileges/d' src/Makefile.am || die
eautoreconf