Making gtk+ optional dependency, bug #195926, reported by Davide Cendron.

Package-Manager: portage-2.1.4.4

diff --git a/net-analyzer/pinger/ChangeLog b/net-analyzer/pinger/ChangeLog
index 44b6ddc871f7fc2f6f92d3194b95ea2e89b82be2..4bccd6bfd83577114a7bb65c1af85b1789f289bd 100644 (file)
--- a/net-analyzer/pinger/ChangeLog
+++ b/net-analyzer/pinger/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/pinger
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pinger/ChangeLog,v 1.9 2008/01/21 12:53:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pinger/ChangeLog,v 1.10 2008/02/25 18:59:28 pva Exp $
+
+  25 Feb 2008; <pva@gentoo.org> pinger-0.32c.ebuild:
+  Making gtk+ optional dependency, bug #195926, reported by Davide Cendron.
 
   21 Jan 2008; Raúl Porcel <armin76@gentoo.org> +files/disable_gtk.patch,
   pinger-0.32c.ebuild:

diff --git a/net-analyzer/pinger/Manifest b/net-analyzer/pinger/Manifest
index 0ceecd1532d970bf10aac99084cfbbcf3aaf2e61..277b61c6704ffb7e4e6a6350e78eb19bf40b196c 100644 (file)
--- a/net-analyzer/pinger/Manifest
+++ b/net-analyzer/pinger/Manifest
@@ -1,7 +1,8 @@
 AUX disable_gtk.patch 856 RMD160 01e673401c9aec3786b32707829dcff72ff4d8fc SHA1 04c3bd9ae87aa3a17775b2e9fe049976cc6059fb SHA256 34066e9061cc9a88eb7880576626532ed3e23d2eb9d5d05f581e56bf457f74f1
+DIST gtk-2.0-for-pinger.m4.bz2 2508 RMD160 f5fc7a3a3c4fcfe03356170371113a1b0f18eda6 SHA1 c72993fdb224ffba6afeca43a60303ed0350c56f SHA256 59152f9a4a1af5cf09f2aaa804c9071afe3eb6632162f1660d85c820db342eba
 DIST pinger-0.32.tar.gz 225609 RMD160 aac7f236dcad63a58071650f3342f39fadcefab3 SHA1 3f31c8b4f0f0727fa9c3ce23b15d4f25af9b54b6 SHA256 f69735accf2329c7cd7c32b0857ad1567e71a3384b122aeeaf105e71744d4e8c
 DIST pinger-0.32c.tar.gz 227288 RMD160 a64219a5a7abf7b0e304eda9c28c03725487ec34 SHA1 e466708261860e385cffce5a720970fd8d9a91d7 SHA256 955b7057e3e963074298cdcf3b86930bc3f0a3e3465f62df1d36fecfbe097bfd
 EBUILD pinger-0.32.ebuild 663 RMD160 5f569c6e555d63b4a309375bc44473b98ea58ead SHA1 236a412fcb8302d8b935fc9dab69d8dda531c1ac SHA256 c5a62223f1b463a4f141a14ec63d431eb2643ba6087028ffe70648505acae8ce
-EBUILD pinger-0.32c.ebuild 1045 RMD160 0925a4084151ec358cf25b67158fe8000618780a SHA1 3a0070322704c73f6fca81aa33508075a253af60 SHA256 e3afe5d29e833c9b289df10fce70b22e543a1ccd0e88567e108199c503a389c8
-MISC ChangeLog 1403 RMD160 a5e284f0f8b514eca095b3fade872267eab37831 SHA1 9d3c01d88474482b00876bdd8341334b51887ddb SHA256 6ef6492d84565a6400aac6abc76f3ccdb163f7ecf0bd3e65e52392973ab65c60
+EBUILD pinger-0.32c.ebuild 1135 RMD160 90f8b36dc10375c1941cab0fede047ae6a3c1bd4 SHA1 8117b57847ce42662ea83f27863b9cd2c03a4e8c SHA256 b223f2b87135d36d618ceef2377daa9dbb6c74aee44420bcf1b058fefc7d9b7a
+MISC ChangeLog 1530 RMD160 f3f2fe968201ab770cd1148cb71edf5ff1171f16 SHA1 e513e3b62a71e607ae8d41d7383e1520429c779e SHA256 92e075d30c8af6adff8a8cbdc161a344a748fd1fef78fa937b5eee38834184de
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6

diff --git a/net-analyzer/pinger/pinger-0.32c.ebuild b/net-analyzer/pinger/pinger-0.32c.ebuild
index a02c482e5197a7bd581e02aa8ddb82243fff2483..bf64b42bd2a5325a1bdf9188acca975dc5687a2a 100644 (file)
--- a/net-analyzer/pinger/pinger-0.32c.ebuild
+++ b/net-analyzer/pinger/pinger-0.32c.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pinger/pinger-0.32c.ebuild,v 1.2 2008/01/21 12:53:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pinger/pinger-0.32c.ebuild,v 1.3 2008/02/25 18:59:28 pva Exp $
 
 inherit eutils autotools
 
 DESCRIPTION="Cyclic multi ping utility for selected adresses using GTK/ncurses."
 HOMEPAGE="http://aa.vslib.cz/silk/projekty/pinger/index.php"
-SRC_URI="http://aa.vslib.cz/silk/projekty/pinger/download/${P}.tar.gz"
+SRC_URI="http://aa.vslib.cz/silk/projekty/pinger/download/${P}.tar.gz
+               mirror://gentoo/gtk-2.0-for-pinger.m4.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -14,7 +15,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="gtk nls"
 
 DEPEND=">=dev-util/pkgconfig-0.12
-       >=x11-libs/gtk+-2.4.0
+       gtk? ( >=x11-libs/gtk+-2.4.0 )
        sys-libs/ncurses"
 
 src_unpack() {
@@ -22,6 +23,7 @@ src_unpack() {
        cd "${S}"
 
        epatch "${FILESDIR}"/disable_gtk.patch
+       cp "${WORKDIR}"/gtk-2.0-for-pinger.m4 m4/
 
        AT_M4DIR="m4" eautoreconf
 }
@@ -40,5 +42,5 @@ src_install() {
        emake DESTDIR="${D}" install || die "emake install failed"
        dodoc AUTHORS BUGS ChangeLog NEWS README
 
-       ! use gtk && rm "${D}"/usr/bin/gtkpinger
+       use gtk || rm "${D}"/usr/bin/gtkpinger
 }