Fix my system libmpd patch in a form that is acceptable also for upstream, if I get them convinced to release one more version of this dead application.

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

3 files changed, 45 insertions, 18 deletions

diff --git a/media-sound/glurp/Manifest b/media-sound/glurp/Manifest
index 10b8e1de2333..fb007e818cb7 100644
--- a/media-sound/glurp/Manifest
+++ b/media-sound/glurp/Manifest
@@ -1,6 +1,6 @@
-AUX glurp-0.11.6-system_libmpd.patch 1344 RMD160 510abad966ef8f72ff9621649e530dc11d26cc94 SHA1 7aa902ec463ea79dc9583bd264789ec5af960d66 SHA256 49ae506bd0a40d80f0b79ac20351194037117aa6fc2524cb0af8ba949382d6dc
+AUX glurp-0.11.6-system_libmpd.patch 1831 RMD160 29e69af226fbcfbc6a6265a86f6fdb137438191d SHA1 9af4942291a615234ea171fb0bd1b47ab9b575fd SHA256 5789d2038af2f2600154e28a20006e747b6807126a84352d9f18235ed37a1da1
 AUX glurp.svg 2674 RMD160 42536346eb4f7af18ad1adb63b8f326b82f157b6 SHA1 a947a7d501aebde122aa73929e216d4bf4c15ed5 SHA256 a3cdac13a8246c7cf972b384e55597de57ead7fb6445e8cf9ecbe95ccdb2de5b
 DIST glurp-0.11.6.tar.gz 138603 RMD160 4f12249b5830374ec874e7ce28d92d317c03e142 SHA1 5ded37b3573b4f486addd60f96875e52803d5434 SHA256 a9b1b5c03067fdb29ed8c4ca8cd9c67da8f5af2a5b332878059c52e0bb4a333c
-EBUILD glurp-0.11.6-r2.ebuild 1031 RMD160 31056fe2d9ac87e558899cf8edff246587f3481c SHA1 13b1fbd9d86c8acc39fbe633a9613a43ea5cc0b8 SHA256 4f0f26aa1db0dcefcfe7789f3948dced235432de5fe6da8289c46e8c1709911b
+EBUILD glurp-0.11.6-r2.ebuild 974 RMD160 7ea3d978293c59b3f5e1ebe042dbe394d57687b2 SHA1 1d83f94c4fe60e11ce9c6533f5e80f35260c85f4 SHA256 01b1418a848869dbd4a73ed66a55bdb764baea8ebb34cea8ec1fc7ea734afbe7
 MISC ChangeLog 3368 RMD160 c442a41c7ca2537e13a5df9f15280930742620f9 SHA1 762798e8beb4e86ee930b66d8c50d9f5a891f464 SHA256 bfbf8a04de682192d2d1dbf7db274049b453206cc95df0441205b89576b84c8b
 MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369
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
index 2dc8b080debc..ea56119faf88 100644
--- a/media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch
+++ b/media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch
@@ -1,20 +1,42 @@
 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])
++++ glurp-0.11.6/configure.in	2009-06-08 17:58:20.000000000 +0300
+@@ -40,6 +40,10 @@
  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
+ 
++PKG_CHECK_MODULES([libmpd], libmpd >= 0.17.0)
++AC_SUBST(libmpd_LIBS)
++AC_SUBST(libmpd_CFLAGS)
++
+ dnl AC_SUBST(GETTEXT_PACKAGE)
+ dnl AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"glurp")
+ 
+Only in glurp-0.11.6.orig: glurp-0.11.6
+diff -ur glurp-0.11.6.orig/src/libmpdclient.c glurp-0.11.6/src/libmpdclient.c
+--- glurp-0.11.6.orig/src/libmpdclient.c	2005-04-03 04:56:08.000000000 +0300
++++ glurp-0.11.6/src/libmpdclient.c	2009-06-08 18:02:29.000000000 +0300
+@@ -31,7 +31,7 @@
+ 
+ */
+ 
+-#include "libmpdclient.h"
++#include <libmpd/libmpdclient.h>
+ 
+ #include <errno.h>
+ #include <sys/types.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
++++ glurp-0.11.6/src/Makefile.am	2009-06-08 17:59:27.000000000 +0300
+@@ -2,7 +2,7 @@
+ 
+ INCLUDES = \
+ 	-DDATADIR=\""$(datadir)/glurp/"\" \
+-	@PACKAGE_CFLAGS@ -Wall
++	@PACKAGE_CFLAGS@ @libmpd_CFLAGS@ -Wall
+ 
+ bin_PROGRAMS = glurp
+ 
 @@ -12,7 +12,6 @@
  	gui.h gui.c \
  	gui-callbacks.c \
@@ -23,15 +45,21 @@ diff -ur glurp-0.11.6.orig/src/Makefile.am glurp-0.11.6/src/Makefile.am
  	main.c \
  	player.h player.c \
  	structs.h \
+@@ -20,4 +19,4 @@
+ 
+ glurp_LDFLAGS = -export-dynamic
+ 
+-glurp_LDADD = @PACKAGE_LIBS@
++glurp_LDADD = @PACKAGE_LIBS@ @libmpd_LIBS@
 diff -ur glurp-0.11.6.orig/src/structs.h glurp-0.11.6/src/structs.h
 --- glurp-0.11.6.orig/src/structs.h	2005-04-05 04:35:39.000000000 +0300
-+++ glurp-0.11.6/src/structs.h	2009-06-01 22:45:09.000000000 +0300
++++ glurp-0.11.6/src/structs.h	2009-06-08 18:02:10.000000000 +0300
 @@ -20,7 +20,7 @@
  
  */
  
 -#include "libmpdclient.h"
-+#include <libmpdclient.h>
++#include <libmpd/libmpdclient.h>
  
  enum {
      PL_FILENAME,
diff --git a/media-sound/glurp/glurp-0.11.6-r2.ebuild b/media-sound/glurp/glurp-0.11.6-r2.ebuild
index 72700f9e2d99..3c95ae167b26 100644
--- a/media-sound/glurp/glurp-0.11.6-r2.ebuild
+++ b/media-sound/glurp/glurp-0.11.6-r2.ebuild
@@ -1,9 +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/glurp/glurp-0.11.6-r2.ebuild,v 1.4 2009/06/03 18:23:46 tcunha Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glurp/glurp-0.11.6-r2.ebuild,v 1.5 2009/06/08 15:04:37 ssuominen Exp $
 
 EAPI=2
-inherit autotools eutils flag-o-matic
+inherit autotools eutils
 
 DESCRIPTION="Glurp is a GTK2 based graphical client for the Music Player Daemon"
 HOMEPAGE="http://sourceforge.net/projects/glurp/"
@@ -27,7 +27,6 @@ src_prepare() {
 }
 
 src_configure() {
-	append-flags -I/usr/include/libmpd-1.0/libmpd
 	econf \
 		$(use_enable debug)
 }