Patch to build against latest libmpd by Christoph Mende wrt #254959.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 56 insertions, 10 deletions

diff --git a/app-misc/g15mpd/ChangeLog b/app-misc/g15mpd/ChangeLog
index 5cd565288238..262febb86831 100644
--- a/app-misc/g15mpd/ChangeLog
+++ b/app-misc/g15mpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/g15mpd
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15mpd/ChangeLog,v 1.1 2007/11/30 00:39:16 jokey Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15mpd/ChangeLog,v 1.2 2009/05/20 17:17:51 ssuominen Exp $
+
+  20 May 2009; Samuli Suominen <ssuominen@gentoo.org> g15mpd-1.0.0.ebuild,
+  +files/g15mpd-1.0.0-libmpd.patch:
+  Patch to build against latest libmpd by Christoph Mende wrt #254959.
 
 *g15mpd-1.0.0 (30 Nov 2007)
 
diff --git a/app-misc/g15mpd/Manifest b/app-misc/g15mpd/Manifest
index bc5621d4bb4f..277bd628fc88 100644
--- a/app-misc/g15mpd/Manifest
+++ b/app-misc/g15mpd/Manifest
@@ -1,4 +1,5 @@
+AUX g15mpd-1.0.0-libmpd.patch 1460 RMD160 f401a4884f72fdc5a522ce3df20e909112961a91 SHA1 d17f9e41706528a437b0941bf1f6d0ac14e52278 SHA256 4f169ae1184aad8208f5f5a97567f9f3ed6b5f1e38a891839b7cb66454d844bd
 DIST g15mpd-1.0.0.tar.bz2 220482 RMD160 abda391dd67d3aebd8ca26d949cd3d54d96d3af0 SHA1 82d56e4aa7c1601bc978105592510ffcd4f8007d SHA256 c7792951f1168144108f8eb66ae6d41b63ac2cb4448827d7e3f755ccfdc72afe
-EBUILD g15mpd-1.0.0.ebuild 790 RMD160 c13fc8be9ba1437ae9a82bff9c54f80faccada73 SHA1 56a900ee3810da4b2ce8a0cb8a27af1f01ad0255 SHA256 ae43af6916b3400e7c634f50ca83ef06e6b5d7b0ceba29dcac5e1e4917a5dfa7
-MISC ChangeLog 354 RMD160 f5463d1ec78a51faf89d89256c2c3a844033cab8 SHA1 f2b0a2877fde751963521b660cd6805c927c24b5 SHA256 7c75ae0f58d48165ece44d94906489c84011e43e7821ea79c79aaca81ee69577
+EBUILD g15mpd-1.0.0.ebuild 895 RMD160 2240e929185095f3b6227e8c1ff4bc698daf00e8 SHA1 9c3d3acb9f870bce30f468c80686139f9f8a0d8d SHA256 b6652e8b859f0551916a29542a3f985b6bc80127a99fca968d3e1573001b2aab
+MISC ChangeLog 541 RMD160 14de7be39f66a90bb0f7f04bb2b5ac4c2a702541 SHA1 6e381595d6757e959d2bff38c9f1a4b57e74b72c SHA256 a1078db75fd972a5e8da9b82b699574c560696c6c8b4ad425b7bbdaf842a3e71
 MISC metadata.xml 157 RMD160 e5cd56d383b6eb43713966ab5215a2e69d59abd7 SHA1 7e7895f5a9733298a33b7d7f5324c82523926b1b SHA256 64f66841884087f013ebf9bd830904ed01e5a4bbfa8530156364be91e5580a38
diff --git a/app-misc/g15mpd/files/g15mpd-1.0.0-libmpd.patch b/app-misc/g15mpd/files/g15mpd-1.0.0-libmpd.patch
new file mode 100644
index 000000000000..57d2fb8a1ef6
--- /dev/null
+++ b/app-misc/g15mpd/files/g15mpd-1.0.0-libmpd.patch
@@ -0,0 +1,34 @@
+diff --git a/Makefile.am b/Makefile.am
+index e407dab..6404618 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-
++AM_CPPFLAGS = @libmpd_CFLAGS@
+ AM_CFLAGS = -O3 -Wall @CFLAGS@ -I$(top_builddir) -I$(top_srcdir) 
+ METASOURCES = AUTO
+ bin_PROGRAMS = g15mpd
+@@ -6,7 +6,7 @@ bin_PROGRAMS = g15mpd
+ docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
+ doc_DATA = README ChangeLog AUTHORS NEWS COPYING
+ 
+-LIBS = -lg15daemon_client -lg15render -lX11 -lXtst -lmpd 
++LIBS = -lg15daemon_client -lg15render -lX11 -lXtst @libmpd_LIBS@
+ IMCLUDES = -I
+ g15mpd_LDFLAGS = -avoid-version
+ g15mpd_SOURCES =  g15mpd.c
+diff --git a/configure.in b/configure.in
+index aaa361c..83281d0 100644
+--- a/configure.in
++++ b/configure.in
+@@ -18,7 +18,9 @@ AC_HEADER_SYS_WAIT
+ AC_CHECK_HEADERS(g15daemon_client.h libg15render.h,,AC_MSG_ERROR(["libg15daemon_client (or its devel package) could not be found.  please install it"]))
+ AC_CHECK_HEADERS(X11/Xlib.h X11/XF86keysym.h,,AC_MSG_ERROR(["Xorg development files could not be found.  please install the devel package"]))
+ AC_CHECK_HEADERS(X11/extensions/XTest.h,,AC_MSG_ERROR(["Xorg XTEST Extension devel headers could not be found. please install the devel package"]))
+-AC_CHECK_HEADERS(libmpd/libmpd.h,,AC_MSG_ERROR(["libmpd development files could not be found.  please install the libmpd devel package"]))
++PKG_CHECK_MODULES([libmpd], [libmpd])
++AC_SUBST(libmpd_LIBS)
++AC_SUBST(libmpd_CFLAGS)
+ AC_PATH_X
+ 
+ AC_OUTPUT(Makefile)
diff --git a/app-misc/g15mpd/g15mpd-1.0.0.ebuild b/app-misc/g15mpd/g15mpd-1.0.0.ebuild
index ce9e83d72645..4ca029385503 100644
--- a/app-misc/g15mpd/g15mpd-1.0.0.ebuild
+++ b/app-misc/g15mpd/g15mpd-1.0.0.ebuild
@@ -1,6 +1,9 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15mpd/g15mpd-1.0.0.ebuild,v 1.1 2007/11/30 00:39:16 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15mpd/g15mpd-1.0.0.ebuild,v 1.2 2009/05/20 17:17:51 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils
 
 DESCRIPTION="MPD (music player daemon) plugin to G15daemon"
 HOMEPAGE="http://g15daemon.sourceforge.net/"
@@ -11,10 +14,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND=">=app-misc/g15daemon-1.9.0
+RDEPEND=">=app-misc/g15daemon-1.9
 	dev-libs/libg15
 	dev-libs/libg15render
-	>=media-libs/libmpd-0.13.0
+	>=media-libs/libmpd-0.17
 	sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXtst"
@@ -22,9 +25,13 @@ DEPEND="${RDEPEND}
 	x11-proto/xproto
 	x11-proto/xextproto"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libmpd.patch
+	eautoreconf
+}
+
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	rm "${D}"/usr/share/doc/${P}/{COPYING,NEWS}
-
 	prepalldocs
 }