Optionalize x11-libs/libnotify with USE="libnotify" and insert missing call to PKG_PROG_PKG_CONFIG for --without-libnotify to not bail out wrt #435586 by Clayton Holloway

Package-Manager: portage-2.2.0_alpha128/cvs/Linux x86_64

4 files changed, 43 insertions, 14 deletions

diff --git a/net-p2p/transmission-remote-gtk/ChangeLog b/net-p2p/transmission-remote-gtk/ChangeLog
index 0d6daedfedb7..53ae7437efdd 100644
--- a/net-p2p/transmission-remote-gtk/ChangeLog
+++ b/net-p2p/transmission-remote-gtk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/transmission-remote-gtk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission-remote-gtk/ChangeLog,v 1.13 2012/09/20 10:04:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission-remote-gtk/ChangeLog,v 1.14 2012/09/24 12:05:24 ssuominen Exp $
+
+  24 Sep 2012; Samuli Suominen <ssuominen@gentoo.org>
+  transmission-remote-gtk-1.1.ebuild,
+  +files/transmission-remote-gtk-1.1-PKG_PROG_PKG_CONFIG.patch:
+  Optionalize x11-libs/libnotify with USE="libnotify" and insert missing call
+  to PKG_PROG_PKG_CONFIG for --without-libnotify to not bail out wrt #435586 by
+  Clayton Holloway
 
 *transmission-remote-gtk-1.1 (20 Sep 2012)
 
diff --git a/net-p2p/transmission-remote-gtk/Manifest b/net-p2p/transmission-remote-gtk/Manifest
index 3644d94e8723..c76812e7141e 100644
--- a/net-p2p/transmission-remote-gtk/Manifest
+++ b/net-p2p/transmission-remote-gtk/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX transmission-remote-gtk-1.1-PKG_PROG_PKG_CONFIG.patch 369 SHA256 380c2fa99061f5a29d87f2e356e64808c2d2a45cc204cea3549ae608a035f248 SHA512 2fee7265f510ae8d1e0eb7474bec59f08f568d4836c9cebbb0fe462e6acb3bc3cee5da9a468b9c9b1fcbff3840bfb2988dccd27f5865c7d29b187922fb9e82a4 WHIRLPOOL 37e2ad1110ef623bf7a7cd1faef23589305b691dd54c040842b4712d1d6c33af32a1c109be60df7a2cd311a10268a3848b5054f3a48d728316b99b6760d0e511
 DIST transmission-remote-gtk-1.0.1.tar.gz 573582 SHA256 b1ae032dd52b2d7975656913e4fe39e7f74d29ef8138292d8b82318ff9afed6f
 DIST transmission-remote-gtk-1.0.2.tar.gz 1066705 SHA256 9f6d159dda034cc44ca03efcd4935234badb6b6422903c69e6122c746c5b1290
 DIST transmission-remote-gtk-1.0.tar.gz 570279 SHA256 dc171ed67bd7bc2d98b42d04851cefb4174181f779433049a14b107c9a4906ce
@@ -8,17 +9,17 @@ DIST transmission-remote-gtk-1.1.tar.gz 1133543 SHA256 79e57848a0a7107eff9ee93b2
 EBUILD transmission-remote-gtk-1.0.1.ebuild 1378 SHA256 20f68245dbf7b4e1f1cd541f9707d54e6cc18974d5d31929e6629d09cf94ca25 SHA512 e2a007a849a644865748700ffd7901b7e6c8d2d21ee7d4ae3c997d0b88a5f0830a84ae74910279bc05a3353385e5c132a56760819192975a1ba860a33f23c2ae WHIRLPOOL 26fc5f6a2ddf585d7db7984b9041e6ace4bf978b106126798c3c06b8ac1d01d68f81896fa75aef104874066d2a8bb37f0484365014fbf1013fcd2ac4db33f202
 EBUILD transmission-remote-gtk-1.0.2.ebuild 1297 SHA256 24d9e11f17827cc7aa68ae30aa7b35aac13f4851cf7c1c8c066f8e1563445e25 SHA512 5452d2d6ccc3bd27533acc7dbcf80cc3d6d970507999ef80d0021e947cae46e7b8e995b30af85bcace787361e0dc19ccc1e2cd7f7d5b139060e4e5d6e704f4d4 WHIRLPOOL 412cd41b30a34aacab118458c1a7120ef18b85fa59ab6c2fd4b4a0ffff4f94c03932056fef92127b955116ce9f1e0ae4e9f858833784a695e6794997f2d60ada
 EBUILD transmission-remote-gtk-1.0.ebuild 1374 SHA256 1e94e52d21b14f6e860cfab5014bf3bb5cb45f7276ae96c7c96a008fcd2eaf19 SHA512 2f84980152e99f850f694af7b821972e1619ecd002eb70054e482ca3410ca256ac7217952b4a14c91463eb0aef7d09179b8d8aa0095517b4a75bb183094b7c4b WHIRLPOOL 6ef3ccf93025e793261970e304a957624e9e723645557a5823f5c97a0ad97da236b196408dca082e758a112e0053fa515945418158dfbcde2f705713faa94a5d
-EBUILD transmission-remote-gtk-1.1.ebuild 1295 SHA256 48c1ce94592b507f1393890d49d788929a294dcf6737206a1654a3e178a65d45 SHA512 e20bbce95e891d175144e6afee3d3f9fc62eeab2ac22c79dc27190299949fd20cb2930e05be864b38843ad3bd5cb91913e3b84425b1b56ad3c1d8f7c377ffd9e WHIRLPOOL 38212d8345d817df5b4de6d7fb58990a4017ef8b24b9eff33dd5f135040d3602ba16a2a8a541363e1e527ca9a3d8e642f80fd5e6fa62eb155d18528963b545b0
-MISC ChangeLog 2460 SHA256 347f138fc57f90f0eb10e540e627d440833d676ebccf1587b3a316ee9145aa80 SHA512 7bd99707f0a37a029c4816a298f7f2a594e8fac3e10cafc2ff46005ab41adbe8a751ad517070d11266b46b239fa701c3620f5c3530bca3f947306664f1a1191c WHIRLPOOL f4e541be7106eeb1ca4d7848cdfe2f6d88500ab800a3b0df28e531121670497dc7f5831682de5fdd8f06b86a34a3e2e8df91099afe950ae914487af58cef75c0
+EBUILD transmission-remote-gtk-1.1.ebuild 1448 SHA256 367b288df89c16db28ceceb6d2c349e9da382a30edd528f4fb1b4131d0b01d78 SHA512 0dcdd4d412115ecf1802d0edefd032db82fc2f165233aecb80cc2e3872270f08f808a3b4cc801da6a66f3b99776998d80448272deaebe35c96379af62eb23ecc WHIRLPOOL dd4af54929d9309704700f06114a1783dadda57142899ff383edf8de68689fd3094622e097e49d1f81f78f3eabce77e749e41dd39519e5cbc6f30e2ad4b5a85d
+MISC ChangeLog 2794 SHA256 a43e7de5bcede0f82c5cc2c915230842e24fbde8899955dc8bb465b3ac7ab5eb SHA512 26bacd1a6e6bb1107ffaf94a7d2d192d30b88ac01ba71feab66447891ec27ccb9c592209290cc4887a846170c391f1053dda0fe7565022ee21465bda0a9dd966 WHIRLPOOL 9f25eae61a3a7cbe3dea82e226a01a20461a08de7ebabb18665b31637a00da8360e96c8b2b6e5f1a6cd962c526eb7de504a6a008c51aa5313c5435dc6f8e73f1
 MISC metadata.xml 466 SHA256 26eab67ec947d34c0b6ae62af3a082724d14db9496ba4632efc1a0dc7d2f87ae SHA512 d58a032943a630d443d286d29505340313713f5f65641e668eab9e1a90a3cda7378c6702a29192069e40c3963743df82c3e9831b5a86c3c8e799f179532307cb WHIRLPOOL 11e31b2270e31c73f981550e4e5776ac0f5aa84e749db4d34d4ca0ff883ecc3995fc6299f771e1797d9d57383e9ea9ea0af43b47ea349168b22891cdbfa870cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQWum6AAoJEEdUh39IaPFNqUYIAIvr5hFPFZul464cgG+9n/Md
-qvYriSpKaK7BY41Fz+2Kfi+NPvbTmolW8DHuWal9oTKUAQZ2XTFCbZEPqtwpG8n6
-zl1pBBCxuQFg5JcKKUjNg3pOux4mJngOSRd1OPwIaom8m3PPCMENaJ2/EiNd+pdR
-kVeiay+TVDTuI4w4jvHQ2nbQn2SG7O9Dz7XA6tymFy1FBQAp7JpBw1bSvk8nPsMl
-KJIxoTBan34NdQpjJo3jnaAcigJXB5EX+Vn+s5evzmy3T4RFfoNiWmy2x3qmGuK6
-xfsRxsuTx/DidOntwbSpJQ9w4Xw4cZ1B7QI6wWYjZPkDR5pbt0/MmAqR/gmeZFs=
-=t3hY
+iQEcBAEBCAAGBQJQYEvtAAoJEEdUh39IaPFNBNAIAKNauCMVAQYrJiY+UNgGNfmz
+ifPz0zh0NNVGobJ31SlRLSDTgS3lVtbdc/KaVb4+GTkUcpqeiqU7jH6LE77uQo5/
+ckgpTIrvy7rS5E6icaGuYgZ0KukJi/TfzUsrnCfQK/LwmXItyL+3ZTkXQS3qNRlF
+rHn5iDfj0bO45i50SsOlfaqACPue2w1T8G5EEupQTmBtcxCfwQcvxacf1UiG67v8
+pi6ENCTL+cGAMnJ9T2utqJN9BX7X0anlmSU/DWQ4pjwvEnKxyVSanbnBvHvioFKa
+303/i0EX5dfpIgzDhgIaswjNA4QvsduowcwWE3LIak/hsPp6MZzhl2bKRbJOiXI=
+=bw9u
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/transmission-remote-gtk/files/transmission-remote-gtk-1.1-PKG_PROG_PKG_CONFIG.patch b/net-p2p/transmission-remote-gtk/files/transmission-remote-gtk-1.1-PKG_PROG_PKG_CONFIG.patch
new file mode 100644
index 000000000000..e18b6af45f52
--- /dev/null
+++ b/net-p2p/transmission-remote-gtk/files/transmission-remote-gtk-1.1-PKG_PROG_PKG_CONFIG.patch
@@ -0,0 +1,15 @@
+This is required when passing --without-libnotify because otherwise the first call to
+PKG_CHECK_MODULES is not called and the ./configure will bail out.
+
+http://bugs.gentoo.org/435586
+
+--- configure.ac
++++ configure.ac
+@@ -34,6 +34,7 @@
+ AC_PROG_INSTALL
+ LT_INIT
+ IT_PROG_INTLTOOL([0.35.0])
++PKG_PROG_PKG_CONFIG
+ 
+ AC_CHECK_HEADERS([stdlib.h string.h])
+ AC_TYPE_SIZE_T
diff --git a/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.1.ebuild b/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.1.ebuild
index 58baaf4ff88a..52d1cf3b481b 100644
--- a/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.1.ebuild
+++ b/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.1.ebuild,v 1.1 2012/09/20 10:04:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.1.ebuild,v 1.2 2012/09/24 12:05:24 ssuominen Exp $
 
 EAPI=4
-inherit fdo-mime gnome2-utils
+inherit autotools eutils fdo-mime gnome2-utils
 
 DESCRIPTION="GTK+ client for management of the Transmission BitTorrent client, over HTTP RPC"
 HOMEPAGE="http://code.google.com/p/transmission-remote-gtk"
@@ -12,7 +12,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ayatana debug geoip libproxy"
+IUSE="ayatana debug geoip libnotify libproxy"
 
 RESTRICT="test"
 
@@ -20,9 +20,9 @@ RDEPEND=">=dev-libs/glib-2.30
 	>=dev-libs/json-glib-0.12.6
 	net-misc/curl
 	x11-libs/gtk+:3
-	>=x11-libs/libnotify-0.7
 	ayatana? ( dev-libs/libappindicator:3 )
 	geoip? ( dev-libs/geoip )
+	libnotify? ( >=x11-libs/libnotify-0.7 )
 	libproxy? ( net-libs/libproxy )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
@@ -31,11 +31,17 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog README"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-PKG_PROG_PKG_CONFIG.patch
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		$(use_enable debug) \
 		--enable-gtk3 \
 		$(use_with geoip libgeoip) \
+		$(use_with libnotify) \
 		$(use_with libproxy) \
 		$(use_with ayatana libappindicator)
 }