summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-07-29 09:22:30 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-07-29 09:22:30 +0000
commit2c0ca88660ebe0f392a5df3bb43b40e275d19b70 (patch)
tree847195db422153065e4afee878d2691e9e714804 /media-sound/mpdscribble
parentVersion bump. Change libsoup dep. to curl since it's apparently preferred by ... (diff)
downloadgentoo-2-2c0ca88660ebe0f392a5df3bb43b40e275d19b70.tar.gz
gentoo-2-2c0ca88660ebe0f392a5df3bb43b40e275d19b70.tar.bz2
gentoo-2-2c0ca88660ebe0f392a5df3bb43b40e275d19b70.zip
Fix missing LDADD for -lgthread-2.0.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/mpdscribble')
-rw-r--r--media-sound/mpdscribble/ChangeLog6
-rw-r--r--media-sound/mpdscribble/files/mpdscribble-0.18-ldadd_gthread.patch17
-rw-r--r--media-sound/mpdscribble/mpdscribble-0.18.ebuild19
3 files changed, 36 insertions, 6 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/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() {