Fix missing LDADD for -lgthread-2.0.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 39 insertions, 8 deletions

diff --git a/media-sound/mpdscribble/ChangeLog b/media-sound/mpdscribble/ChangeLog
index 6485e5257080..55c4a1899366 100644
--- a/media-sound/mpdscribble/ChangeLog
+++ b/media-sound/mpdscribble/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mpdscribble
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpdscribble/ChangeLog,v 1.28 2009/07/29 08:56:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpdscribble/ChangeLog,v 1.29 2009/07/29 09:22:30 ssuominen Exp $
+
+  29 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  mpdscribble-0.18.ebuild, +files/mpdscribble-0.18-ldadd_gthread.patch:
+  Fix missing LDADD for -lgthread-2.0.
 
 *mpdscribble-0.18 (29 Jul 2009)
 
diff --git a/media-sound/mpdscribble/Manifest b/media-sound/mpdscribble/Manifest
index 7e79e00a09bf..4eff174ba5b0 100644
--- a/media-sound/mpdscribble/Manifest
+++ b/media-sound/mpdscribble/Manifest
@@ -1,7 +1,8 @@
+AUX mpdscribble-0.18-ldadd_gthread.patch 584 RMD160 2fbe382997f5e1a9931477ad1d5ae77031311d97 SHA1 1e58b259ea3ccfad22ebbfc83d188e2512725302 SHA256 cb9e056680f6ac183e90722cc3ea09ed529afde738d20402192f6fbab5581ac5
 AUX mpdscribble.rc 474 RMD160 b64550bf36a751e95197620d5afb3f370e45e5ab SHA1 b341f6af0a10353f7e0d05b10f9f091102e103b2 SHA256 c53787e97649d65b86de9fa041a5030727cd01f3ffebd330bc63abdb2eb88a93
 DIST mpdscribble-0.17.tar.bz2 124652 RMD160 387ab2225de996f21b3cb796a15ff414551177e1 SHA1 80f428bab751f5248cbdb55fe2ac4252a7ea0bed SHA256 228a66b7544228cabef9df4cbc44f9704c26e1f4a3ed7792f81abbf6366fd416
 DIST mpdscribble-0.18.tar.bz2 126355 RMD160 9cbe7cd54edfceb06419eea82f1543112497e0ba SHA1 daa3a4279bd7a3c32d2356a76343a916ec7a072f SHA256 030727cbe149c3129b0b12d745830ce37f678fda247ddbcc093e34c1954bf508
 EBUILD mpdscribble-0.17.ebuild 894 RMD160 22193546daa3c0317c6e69ed430dc02d974e80d9 SHA1 251f1c52c91d03a912e8af726f5482c2c4e63d5a SHA256 b18fd2ae56c866d036dc209336241cafef74f612dc7bdefba65256685bc8659d
-EBUILD mpdscribble-0.18.ebuild 910 RMD160 2fb71798cb877309dd94be1a8281668d8769c0a1 SHA1 918f107768a2c21b87d27e7b96280d4380a10d7a SHA256 608bfb1f1095b56e86df429f75ab01e7f239b5774c576181b563097a1dd4debf
-MISC ChangeLog 4550 RMD160 8bac6e9a8c35a8fbb0cb9bcd8430674c54e20e2f SHA1 7156bb42b1cd7d0c0833d0b69ce52c4115657234 SHA256 5a8f5783c62952990ff0ade1e53eba9eac1d2ff6e6a2fc12b1089acc1332d048
+EBUILD mpdscribble-0.18.ebuild 1144 RMD160 374eabf15deb2fea0e795ae51aa3a8773208c1e3 SHA1 6c1a96192331fbefb569aba4e1c8a589b0061b5b SHA256 a41d839dd06db7e3dcd2d74db4ff0815e597faa921c52004c07604f840f26213
+MISC ChangeLog 4716 RMD160 6289c9fa336a34dfa22d494dd5712c4296179fb3 SHA1 99f2ddb1f512aa31b959057e421801a3ac9f9122 SHA256 95c466aa93a53dfe650151f2f0baf9e4e6d41b018a225fa72a5fb67a02554e49
 MISC metadata.xml 692 RMD160 6329e2163adbe48b0f1129bd858956aeeb7aa9d6 SHA1 8cbecb112f1a406a0013c13b150e0ce983c6283b SHA256 0f16c0804f0808cafc0787f4992f5fd8c6866b96d6f4c535a90fc8c476636230
diff --git a/media-sound/mpdscribble/files/mpdscribble-0.18-ldadd_gthread.patch b/media-sound/mpdscribble/files/mpdscribble-0.18-ldadd_gthread.patch
new file mode 100644
index 000000000000..4c92c3f68dc0
--- /dev/null
+++ b/media-sound/mpdscribble/files/mpdscribble-0.18-ldadd_gthread.patch
@@ -0,0 +1,17 @@
+diff -ur mpdscribble-0.18.orig/configure.ac mpdscribble-0.18/configure.ac
+--- mpdscribble-0.18.orig/configure.ac	2009-07-08 20:18:18.000000000 +0300
++++ mpdscribble-0.18/configure.ac	2009-07-29 12:18:40.000000000 +0300
+@@ -42,11 +42,11 @@
+ dnl
+ 
+ PKG_CHECK_MODULES([libglib],
+-	[glib-2.0 >= 2.16],
++	[glib-2.0 >= 2.16 gthread-2.0],
+ 	[glib216=yes], [glib216=no])
+ if test "x$glib216" != "xyes"; then
+ 	PKG_CHECK_MODULES([libglib],
+-		[glib-2.0 >= 2.6],,
++		[glib-2.0 >= 2.6 gthread-2.0],,
+ 		[AC_MSG_ERROR([glib 2.6 is required])])
+ 
+ 	# use libgcrypt's MD5 routines with GLib < 2.16
diff --git a/media-sound/mpdscribble/mpdscribble-0.18.ebuild b/media-sound/mpdscribble/mpdscribble-0.18.ebuild
index e5992f8df9a0..9ac2e2d6016c 100644
--- a/media-sound/mpdscribble/mpdscribble-0.18.ebuild
+++ b/media-sound/mpdscribble/mpdscribble-0.18.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpdscribble/mpdscribble-0.18.ebuild,v 1.1 2009/07/29 08:56:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpdscribble/mpdscribble-0.18.ebuild,v 1.2 2009/07/29 09:22:30 ssuominen Exp $
 
 EAPI=2
+inherit autotools eutils
 
 DESCRIPTION="An MPD client that submits information to Audioscrobbler"
 HOMEPAGE="http://mpd.wikia.com/wiki/Client:Mpdscribble"
@@ -11,17 +12,25 @@ SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE=""
+IUSE="+curl"
 
 RDEPEND=">=dev-libs/glib-2.16:2
-	net-misc/curl"
+	curl? ( net-misc/curl )
+	!curl? ( net-libs/libsoup:2.4 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ldadd_gthread.patch
+	eautoreconf
+}
+
 src_configure() {
+	local myclient=soup
+	use curl && myclient=curl
 	econf \
-		--disable-dependency-tracking
-
+		--disable-dependency-tracking \
+		--with-http-client=${myclient}
 }
 
 src_install() {