Use system libmpd #255771.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
RepoMan-Options: --force

5 files changed, 55 insertions, 56 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/Manifest b/media-sound/glurp/Manifest
index 091655a04c70..9099c6a10aa7 100644
--- a/media-sound/glurp/Manifest
+++ b/media-sound/glurp/Manifest
@@ -1,18 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX glurp-0.11.6-system_libmpd.patch 1029 RMD160 fed3a6172312f6d0e72e35bfd047e6d2df933da8 SHA1 bd5dcf33d4cfd3e018c94e646b0ec892be935bd6 SHA256 b9957e685e1697a7cb424ef83e712f75a7c0f4486f9617958bad9146cf95b98c
 AUX glurp.svg 2674 RMD160 42536346eb4f7af18ad1adb63b8f326b82f157b6 SHA1 a947a7d501aebde122aa73929e216d4bf4c15ed5 SHA256 a3cdac13a8246c7cf972b384e55597de57ead7fb6445e8cf9ecbe95ccdb2de5b
-DIST glurp-0.11.5.tar.gz 136564 RMD160 e9c06bb6885ea6b4277c8161cadb1b6798c0e531 SHA1 bc40bf3536586dbc47c806db511ef80df7cd959c SHA256 961ed90c38b7e10ef56b4bfac22c463cf74621f3e240c0adc1283b08b533c525
 DIST glurp-0.11.6.tar.gz 138603 RMD160 4f12249b5830374ec874e7ce28d92d317c03e142 SHA1 5ded37b3573b4f486addd60f96875e52803d5434 SHA256 a9b1b5c03067fdb29ed8c4ca8cd9c67da8f5af2a5b332878059c52e0bb4a333c
-EBUILD glurp-0.11.5.ebuild 725 RMD160 bcedf91ee6dd23dac0408a2e51a699ccbdcda4c8 SHA1 3dbc0edf4a56317c357d1b823d7c165948f958f2 SHA256 ab455716310194c95dbddf815b4a061d8458f207478546d89ad34f65815822e3
-EBUILD glurp-0.11.6-r1.ebuild 832 RMD160 9be10c8c2dbfde7cf36c60834f6ba9ed6c1217e6 SHA1 02bce919196d9e37efb5dd4c1cbec06609d27e85 SHA256 c7351e35f542781618a4bb6809c4066f0cb5a462c9f900bc75df23b3f8760344
+EBUILD glurp-0.11.6-r2.ebuild 950 RMD160 495bf8f0f28c741f4b021d98baf817cdc2aa0900 SHA1 c09196fa9e1fbf7e9532787d0c8a99a011f2242f SHA256 d1464ddca75a5e8fdd8f1a04cde46b4206b2f0153307e62dd4f3cfae06fe2df8
 EBUILD glurp-0.11.6.ebuild 724 RMD160 38cced024f72978f59eff766ab81d8af52fa3afb SHA1 75c1285dd6471f9b4bdadd2beaf7f11747ea5930 SHA256 a9a4f809bb6b12742ec97664d2f86af547c6a99e0fdc4f9f2df5c3c1a07e3c8c
-MISC ChangeLog 2978 RMD160 e771855f81ee4d4224c861156e7cd7446ebb7025 SHA1 8ce5e5e9eeda0b04158259ae868b98a1c6a9e874 SHA256 5fd638e9c83e497170a9ecfce20cb9080d98ea46af9b72869990fabfe23ec9cb
+MISC ChangeLog 3165 RMD160 009b960cfb10aba0ae67148e87f4838e9cbbad97 SHA1 5594946da76a08cf2f5b3204db5b8fa89eb9231a SHA256 978d2c346dbec18ed148f22c3784f7f649b2d2dc48f2f3aa3efa7c9bd807dea2
 MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkg/plUACgkQyuNVb5qfaOag+ACgunyvKT5aQRo2exT3jDK7NHeH
-mQUAnjG4KF51f44LOIwki7KV+eJQjJS8
-=MM9H
------END PGP SIGNATURE-----
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
 }