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

(Portage version: 2.2.0_alpha128/cvs/Linux x86_64)

3 files changed, 33 insertions, 5 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/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)
 }