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.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

2 files changed, 43 insertions, 16 deletions

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)
 }