Use system libmpd #255771.

(Portage version: 2.1.6.13/cvs/Linux x86_64, RepoMan options: --force)

4 files changed, 52 insertions, 42 deletions

diff --git a/media-sound/glurp/ChangeLog b/media-sound/glurp/ChangeLog
index 9394dc424ea7..5322b23a70fd 100644
--- a/media-sound/glurp/ChangeLog
+++ b/media-sound/glurp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/glurp
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/glurp/ChangeLog,v 1.24 2008/05/30 07:01:36 phreak Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glurp/ChangeLog,v 1.25 2009/06/01 19:22:17 ssuominen Exp $
+
+*glurp-0.11.6-r2 (01 Jun 2009)
+
+  01 Jun 2009; Samuli Suominen <ssuominen@gentoo.org> +glurp-0.11.6-r2.ebuild,
+  +files/glurp-0.11.6-system_libmpd.patch:
+  Use system libmpd #255771.
 
   30 May 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing Andrej Kacian (Ticho) from metadata.xml (as per #59986).
diff --git a/media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch b/media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch
new file mode 100644
index 000000000000..080710c876fa
--- /dev/null
+++ b/media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch
@@ -0,0 +1,25 @@
+diff -ur glurp-0.11.6.orig/configure.in glurp-0.11.6/configure.in
+--- glurp-0.11.6.orig/configure.in	2005-06-05 18:23:54.000000000 +0300
++++ glurp-0.11.6/configure.in	2009-06-01 22:14:13.000000000 +0300
+@@ -35,7 +35,7 @@
+     ])
+ 
+ #pkg_modules="gtk+-2.0 libglade-2.0 libxml-2.0 glib-2.0"
+-pkg_modules="gtk+-2.0 >= 2.4 glib-2.0 >= 2.4 libglade-2.0 >= 2.3 gmodule-2.0 >= 2.6"
++pkg_modules="gtk+-2.0 >= 2.4 glib-2.0 >= 2.4 libglade-2.0 >= 2.3 gmodule-2.0 >= 2.6 libmpd >= 0.17.0"
+ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+ AC_SUBST(PACKAGE_CFLAGS)
+ AC_SUBST(PACKAGE_LIBS)
+Only in glurp-0.11.6.orig/src: libmpdclient.c
+Only in glurp-0.11.6.orig/src: libmpdclient.h
+diff -ur glurp-0.11.6.orig/src/Makefile.am glurp-0.11.6/src/Makefile.am
+--- glurp-0.11.6.orig/src/Makefile.am	2005-06-05 18:28:03.000000000 +0300
++++ glurp-0.11.6/src/Makefile.am	2009-06-01 22:13:07.000000000 +0300
+@@ -12,7 +12,6 @@
+ 	gui.h gui.c \
+ 	gui-callbacks.c \
+ 	keyboard.c \
+-	libmpdclient.h libmpdclient.c \
+ 	main.c \
+ 	player.h player.c \
+ 	structs.h \
diff --git a/media-sound/glurp/glurp-0.11.5.ebuild b/media-sound/glurp/glurp-0.11.5.ebuild
deleted file mode 100644
index d1c26186fa91..000000000000
--- a/media-sound/glurp/glurp-0.11.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/glurp/glurp-0.11.5.ebuild,v 1.4 2006/10/28 01:22:14 flameeyes Exp $
-
-IUSE="debug"
-
-DESCRIPTION="Glurp is a GTK2 based graphical client for the Music Player Daemon"
-HOMEPAGE="http://sourceforge.net/projects/glurp/"
-SRC_URI="mirror://sourceforge/glurp/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-
-RDEPEND=">=x11-libs/gtk+-2.4.0
-	>=gnome-base/libglade-2.3.6"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-	econf $(use_enable debug) || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog
-}
diff --git a/media-sound/glurp/glurp-0.11.6-r1.ebuild b/media-sound/glurp/glurp-0.11.6-r2.ebuild
index b36dc5215fef..6cd9307f4139 100644
--- a/media-sound/glurp/glurp-0.11.6-r1.ebuild
+++ b/media-sound/glurp/glurp-0.11.6-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/glurp/glurp-0.11.6-r1.ebuild,v 1.3 2008/02/29 19:59:14 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glurp/glurp-0.11.6-r2.ebuild,v 1.1 2009/06/01 19:22:17 ssuominen Exp $
 
-IUSE="debug"
+EAPI=2
+inherit autotools eutils
 
 DESCRIPTION="Glurp is a GTK2 based graphical client for the Music Player Daemon"
 HOMEPAGE="http://sourceforge.net/projects/glurp/"
@@ -10,22 +11,28 @@ SRC_URI="mirror://sourceforge/glurp/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
+IUSE="debug"
 
-RDEPEND=">=x11-libs/gtk+-2.4.0
-	>=gnome-base/libglade-2.3.6"
+RDEPEND=">=x11-libs/gtk+-2:2
+	>=gnome-base/libglade-2
+	>=media-libs/libmpd-0.17"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_compile() {
-	econf $(use_enable debug) || die
-	emake || die
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-system_libmpd.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug)
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/${PN}.svg
+	doicon "${FILESDIR}"/${PN}.svg
 	make_desktop_entry glurp Glurp glurp AudioVideo
 }