Respect $PKG_CONFIG, and fix linking with gthread.

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

4 files changed, 54 insertions, 13 deletions

diff --git a/media-sound/gmtp/ChangeLog b/media-sound/gmtp/ChangeLog
index 513782a5fefc..413434c54d62 100644
--- a/media-sound/gmtp/ChangeLog
+++ b/media-sound/gmtp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/gmtp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gmtp/ChangeLog,v 1.9 2012/05/25 07:53:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmtp/ChangeLog,v 1.10 2012/06/01 18:11:19 vapier Exp $
+
+  01 Jun 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/gmtp-1.3.1-pkg-config.patch, gmtp-1.3.1-r300.ebuild:
+  Respect $PKG_CONFIG, and fix linking with gthread.
 
   25 May 2012; Samuli Suominen <ssuominen@gentoo.org> -gmtp-1.2.0.ebuild,
   -files/gmtp-1.2.0-makefile-gentoo.patch, -gmtp-1.3.0.ebuild,
diff --git a/media-sound/gmtp/Manifest b/media-sound/gmtp/Manifest
index 221fa5f17898..9cf4566affa9 100644
--- a/media-sound/gmtp/Manifest
+++ b/media-sound/gmtp/Manifest
@@ -1,18 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gmtp-1.3.1-pkg-config.patch 1063 RMD160 ea2103d17ab1c9ed042d519de5f0b8f5ac9d3fbe SHA1 df95cb757491cd5afcfe5cf9b62820e4dae7caf3 SHA256 a1b5693fc54ff723494319d549721d9274d042002a88a3de9f077b5db39a12d9
 DIST gmtp-1.3.1-i386.tar.gz 904085 RMD160 1e68790b34bea2135857863e0d5b80dbd151494a SHA1 3d44452380244091335271535004f6c77209eb10 SHA256 b1109576fccf2ba6680d7e0575fea6e767edca23cb8d7c4d2d96c0cba7405e93
-EBUILD gmtp-1.3.1-r300.ebuild 1162 RMD160 9f7610f5f7eb3ae82e6350be374178b1ca468c1e SHA1 4a1a814fa4674175008cc46c1efdb85e38addccb SHA256 fa9b4bd9bbd33a099e4274322467a66a80b7087a0b38b9c6610b570a21dae441
-MISC ChangeLog 1796 RMD160 b5bae0a0ff1a7fd211048c33853156b1f7a7e6e8 SHA1 6b92c71814439897561b6fdf1f924dbae288a8df SHA256 3bafaa5e760cd7c743d51d01b5d4423803d35d0dbd0408ba3a07eca7a05640e2
+EBUILD gmtp-1.3.1-r300.ebuild 1243 RMD160 db76f99ed47405f06c65488cbd8a212f9a728929 SHA1 626c66c43506235be252f1d025f4d9aeca20695f SHA256 2c3fec71d82d8880edfe386d1c10cf6be45b65bc48158fb31eb063fb9067ef04
+MISC ChangeLog 1960 RMD160 89f5d6638a0bc3ecfb336207686a8d9935ea91c1 SHA1 a309c60ce4bc9b77e9c05308f9131cad834ace92 SHA256 27b68a35c0e76e0644b5f34946f913052a698542e01b24891d9e81274640d5db
 MISC metadata.xml 414 RMD160 2f3986b664d5f403d82db23590d23e38f5c0f3fd SHA1 0de4eb43465994bd44c4d003fffbddd29d193ab0 SHA256 5f6a7fa7c74baddbc3ec313b1356694e8eab5ed7e654dc59a0c532c3752386f7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPvzqQAAoJEEdUh39IaPFNdKIH/RnLEtJef9xMJFfYme2sRSeH
-7c7jNY4sACwzwzO9ZnzFLNxK/Dlypy9eYEEcBR2JPUy5kQxP4Qdj7IkhUTYFBLF1
-iobxGUjS+LVeUTv2Z56gqcXkc2lvuYITZQZpSG6nxWjKww6htRHdIQMYaSN5awR9
-MuhtQh5rp4JZNhhI4MPaDcx0w+O2dAEgHUMChmQcyCD9OaA4RbPEbkC0X34QbQtK
-xTPhAZQGoceh8g9nIaTVXztZWOnoUfQgHX6JHdnireO9It5uSXJOUL2z56GqZPR0
-Q1TanQuBGa0kan81ZQsf2TuZoWI97wUeUxY37ZUoSTTnYLQUOlBPNj1pccgNyg0=
-=g0fr
+iQIcBAEBAgAGBQJPyQXNAAoJELEHsLL7fEFWCiwP/2OjPApnt1buKckaFLIFVGG2
+J8Cp1/UUfOiHPcoPEthBqYyyAo3Cxi+bzZCo94+tDjwdCqY37+2x9pNz0ssjFSrj
+1GWvnIPkQTTsi8t9xdtB5x/1xFnlk+SZI34zvIpM+K6Uny26V9j/jjSeRBg2Q3C6
+rZdsE2ZhBGdn230339FfllFIup7FnOfWrBltSkAgVfF61rv8eVFYVnYWlo0vMVgs
+wB25fXTVZGQgCtv5+Ysbnp4vmGuqz2nP8ZNAA1yDmk+ypWY1wTtjB6YkD5l2u5mQ
+rd154XXkOOTG0nkzN45j4gj/24pQA3Bpmyw3nwGHbg5OLNyMM5bD3Fe6ehLCMRVO
+Jyixkd363IfX4nslEhAjDndgLCQJTVlZ1hzjYW1MThl+LwsAv64KtDNGENvwY3TJ
+23gpYNwgsI2gbTHWq6KKLRM1RvYw3AObyBIEBjUDD7EcHAFPQ+3c+32qlkj6SK7N
+6KZHksbf1Tja8RYuc1OhBSJ/r3RPShhyUJQrEu/ZeAEpzSg+Sl0cuDvQ4UByhMF0
+RIZ46zQA2sX0wEvep90yi1wCn0ZmK39iVjl1NS+vaxNLN+dJ94eIK5HidPWPRL2Z
+bunQ7sF0f/WaxRyx4vGQwLeMnaWaCsRQnp339G66bNg29ZTOiakRuRDlI8U403uC
+uUpaTVX2+DPq2LTwutfT
+=Qgqj
 -----END PGP SIGNATURE-----
diff --git a/media-sound/gmtp/files/gmtp-1.3.1-pkg-config.patch b/media-sound/gmtp/files/gmtp-1.3.1-pkg-config.patch
new file mode 100644
index 000000000000..20290c067f2c
--- /dev/null
+++ b/media-sound/gmtp/files/gmtp-1.3.1-pkg-config.patch
@@ -0,0 +1,29 @@
+https://sourceforge.net/p/gmtp/discussion/requests/thread/ce4152cc/
+
+respect $(PKG_CONFIG), and add missing gthread-2.0
+
+--- a/Makefile
++++ b/Makefile
+@@ -42,14 +42,18 @@ LIBS +=
+ 
+ .SUFFIXES: .c .o .po .mo
+ 
+-GTK_CFLAGS = `pkg-config --cflags gtk+-2.0 gconf-2.0 libmtp id3tag flac vorbisfile`
+-GTK_LDFLAGS = `pkg-config --libs gtk+-2.0 gconf-2.0 libmtp id3tag flac vorbisfile`
++PKG_CONFIG ?= pkg-config
+ 
+ ifeq ($(MAKECMDGOALS),gtk3)
+-GTK_CFLAGS = `pkg-config --cflags gtk+-3.0 gio-2.0 libmtp id3tag flac vorbisfile`
+-GTK_LDFLAGS = `pkg-config --libs gtk+-3.0 gio-2.0 libmtp id3tag flac vorbisfile`
++PKGS = gtk+-3.0 gio-2.0
+ CFLAGS += -DGMTP_USE_GTK3
++else
++PKGS = gtk+-2.0 gconf-2.0
+ endif
++PKGS += gthread-2.0 libmtp id3tag flac vorbisfile
++
++GTK_CFLAGS = `$(PKG_CONFIG) --cflags $(PKGS)`
++GTK_LDFLAGS = `$(PKG_CONFIG) --libs $(PKGS)`
+ 
+ objects = src/main.o src/mtp.o src/interface.o src/callbacks.o src/prefs.o src/dnd.o src/metatag_info.o
+ headers = src/main.h src/mtp.h src/interface.h src/callbacks.h src/prefs.h src/dnd.h src/metatag_info.h src/config.h
diff --git a/media-sound/gmtp/gmtp-1.3.1-r300.ebuild b/media-sound/gmtp/gmtp-1.3.1-r300.ebuild
index 9119e5babb20..bbf355ae6637 100644
--- a/media-sound/gmtp/gmtp-1.3.1-r300.ebuild
+++ b/media-sound/gmtp/gmtp-1.3.1-r300.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/media-sound/gmtp/gmtp-1.3.1-r300.ebuild,v 1.1 2012/05/25 07:52:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmtp/gmtp-1.3.1-r300.ebuild,v 1.2 2012/06/01 18:11:19 vapier Exp $
 
 EAPI=4
-inherit gnome2-utils toolchain-funcs
+inherit gnome2-utils toolchain-funcs eutils
 
 DESCRIPTION="A simple MTP client for MP3 players"
 HOMEPAGE="http://gmtp.sourceforge.net/"
@@ -27,6 +27,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/gMTP
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-pkg-config.patch
 	sed -i \
 		-e '/CFLAGS/s:-g::' \
 		-e '/glib-compile-schemas/d' \
@@ -34,7 +35,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake gtk3 CC="$(tc-getCC)"
+	emake gtk3 CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)"
 }
 
 src_install() {