Fix underlinking, convert to vala eclass

(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key 84F20B43)

4 files changed, 33 insertions, 54 deletions

diff --git a/media-sound/gmpc/ChangeLog b/media-sound/gmpc/ChangeLog
index 5275ddb3c6fe..23864d3d067d 100644
--- a/media-sound/gmpc/ChangeLog
+++ b/media-sound/gmpc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/gmpc
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gmpc/ChangeLog,v 1.88 2012/05/27 08:59:47 angelos Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmpc/ChangeLog,v 1.89 2013/03/29 20:46:57 angelos Exp $
+
+  29 Mar 2013; Christoph Mende <angelos@gentoo.org>
+  +files/gmpc-11.8.16-underlinking.patch, -files/gmpc-0.20.0-underlinking.patch,
+  gmpc-11.8.16.ebuild:
+  Fix underlinking, convert to vala eclass
 
   27 May 2012; Christoph Mende <angelos@gentoo.org> -gmpc-0.20.0.ebuild:
   Remove old
@@ -339,4 +344,3 @@
 
   23 Jul 2004; Thomas Matthijs <axxo@gentoo.org> :
   ebuild submitted by Bert Geens <theblackdragon@linux.be>
-
diff --git a/media-sound/gmpc/files/gmpc-0.20.0-underlinking.patch b/media-sound/gmpc/files/gmpc-0.20.0-underlinking.patch
deleted file mode 100644
index d6b027eb6580..000000000000
--- a/media-sound/gmpc/files/gmpc-0.20.0-underlinking.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index ebec29f..0311cc1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -227,6 +227,11 @@ PKG_CHECK_MODULES([sqlite3], sqlite3)
- AC_SUBST(sqlite3_LIBS)
- AC_SUBST(sqlite3_CFLAGS)
- 
-+#libx11
-+PKG_CHECK_MODULES([x11], x11)
-+AC_SUBST(x11_LIBS)
-+AC_SUBST(x11_CFLAGS)
-+
- # libsexy 
- AC_ARG_ENABLE([system-libsexy],
-               [--enable-system-libsexy Use system libsexy instead of bundles.], 
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 6ef60fd..d63cca7 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -118,7 +118,8 @@ LIBS= \
- 	@libgio_LIBS@\
- 	@SPIFF_LIBS@\
- 	@libxspf_LIBS@\
--    @sqlite3_LIBS@
-+	@sqlite3_LIBS@\
-+	@x11_LIBS@
- 
- if USE_SYSTEM_LIBSEXY
- LIBS += @libsexy_LIBS@
-@@ -142,12 +143,13 @@ AM_CFLAGS = @CFLAGS@\
- 	@gobject_CFLAGS@\
- 	@gtk_CFLAGS@\
- 	@gmodule_CFLAGS@\
--    @libxspf_CFLAGS@\
-+	@libxspf_CFLAGS@\
- 	@libglade_CFLAGS@\
- 	@gthread_CFLAGS@\
- 	@libsoup_CFLAGS@\
- 	@libgio_CFLAGS@\
--    @sqlite3_CFLAGS@\
-+	@sqlite3_CFLAGS@\
-+	@x11_CFLAGS@\
- 	@EXTRA_CFLAGS@\
- 	-DPACKAGE_LIB_DIR=\""$(pkglibdir)"\"\
- 	-DPACKAGE_DATA_DIR=\""$(datarootdir)"\"
diff --git a/media-sound/gmpc/files/gmpc-11.8.16-underlinking.patch b/media-sound/gmpc/files/gmpc-11.8.16-underlinking.patch
new file mode 100644
index 000000000000..e6cf1ef9f05d
--- /dev/null
+++ b/media-sound/gmpc/files/gmpc-11.8.16-underlinking.patch
@@ -0,0 +1,14 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 497194b..84c31f0 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -174,7 +174,8 @@ LIBS= \
+ 	@libxml2_LIBS@\
+ 	@libx11_LIBS@\
+ 	@sqlite3_LIBS@\
+-	-lz
++	-lz\
++	-lm
+ 
+ 
+ if HAVE_UNIQUE
diff --git a/media-sound/gmpc/gmpc-11.8.16.ebuild b/media-sound/gmpc/gmpc-11.8.16.ebuild
index b91a7725c747..9e00a3020558 100644
--- a/media-sound/gmpc/gmpc-11.8.16.ebuild
+++ b/media-sound/gmpc/gmpc-11.8.16.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gmpc/gmpc-11.8.16.ebuild,v 1.8 2012/05/27 07:51:26 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmpc/gmpc-11.8.16.ebuild,v 1.9 2013/03/29 20:46:57 angelos Exp $
 
 EAPI=4
-inherit gnome2-utils
+VALA_MIN_API_VERSION=0.12
+
+inherit autotools eutils gnome2-utils vala
 
 DESCRIPTION="A GTK+2 client for the Music Player Daemon"
 HOMEPAGE="http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client"
@@ -25,7 +27,7 @@ RDEPEND="dev-db/sqlite:3
 	unique? ( dev-libs/libunique:1 )
 	xspf? ( >=media-libs/libxspf-1.2 )"
 DEPEND="${RDEPEND}
-	dev-lang/vala:0.12
+	$(vala_depend)
 	>=dev-util/gob-2.0.17
 	virtual/pkgconfig
 	nls? ( dev-util/intltool
@@ -33,8 +35,13 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS README )
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-underlinking.patch
+	eautoreconf
+	vala_src_prepare
+}
+
 src_configure() {
-	VALAC=$(type -p valac-0.12) \
 	econf \
 		--disable-static \
 		--disable-libspiff \