Add patch for correct linking with USE=vala, thanks Attila Tóth finding the patch, #394945; moved to autotools-utils.eclass in order to handle .a/.la files correctly

(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)

3 files changed, 43 insertions, 13 deletions

diff --git a/media-libs/memphis/ChangeLog b/media-libs/memphis/ChangeLog
index ff1c41a69ca6..a91507d0d6fc 100644
--- a/media-libs/memphis/ChangeLog
+++ b/media-libs/memphis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/memphis
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/memphis/ChangeLog,v 1.9 2011/07/14 11:02:33 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/memphis/ChangeLog,v 1.10 2011/12/17 14:13:39 jlec Exp $
+
+  17 Dec 2011; Justin Lecher <jlec@gentoo.org> memphis-0.2.3.ebuild,
+  +files/memphis-0.2.3-link_gobject.patch:
+  Add patch for correct linking with USE=vala, thanks Attila Tóth finding the
+  patch, #394945; moved to autotools-utils.eclass in order to handle .a/.la
+  files correctly
 
   14 Jul 2011; Thomas Kahle <tomka@gentoo.org> memphis-0.2.3.ebuild:
   x86 stable per bug 369909
diff --git a/media-libs/memphis/files/memphis-0.2.3-link_gobject.patch b/media-libs/memphis/files/memphis-0.2.3-link_gobject.patch
new file mode 100644
index 000000000000..231c834b82c9
--- /dev/null
+++ b/media-libs/memphis/files/memphis-0.2.3-link_gobject.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -89,7 +89,7 @@
+     exit 0;
+   fi
+   VALA_EXAMPLE_PACKAGES="--pkg cairo --pkg memphis-0.2"
+-  PKG_CHECK_MODULES(VALA_EXAMPLE, [glib-2.0, cairo])
++  PKG_CHECK_MODULES(VALA_EXAMPLE, [glib-2.0 gobject-2.0 cairo])
+   AC_SUBST(VALA_EXAMPLE_CFLAGS)
+   AC_SUBST(VALA_EXAMPLE_LIBS)
+   AC_SUBST(VALA_EXAMPLE_PACKAGES)
diff --git a/media-libs/memphis/memphis-0.2.3.ebuild b/media-libs/memphis/memphis-0.2.3.ebuild
index 5e91df609c2a..5473c650cd81 100644
--- a/media-libs/memphis/memphis-0.2.3.ebuild
+++ b/media-libs/memphis/memphis-0.2.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/memphis/memphis-0.2.3.ebuild,v 1.6 2011/07/14 11:02:33 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/memphis/memphis-0.2.3.ebuild,v 1.7 2011/12/17 14:13:39 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
 WANT_AUTOMAKE=1.11
 
-inherit autotools base
+inherit autotools-utils
 
 DESCRIPTION="A map-rendering application and a library for OpenStreetMap"
 HOMEPAGE="http://trac.openstreetmap.ch/trac/memphis/"
@@ -15,27 +15,40 @@ SRC_URI="http://wenner.ch/files/public/mirror/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0.2"
 KEYWORDS="amd64 x86"
-IUSE="debug doc +introspection vala"
+IUSE="debug doc +introspection vala static-libs"
 
 RDEPEND="
-	>=dev-libs/expat-2.0.1
+	dev-libs/expat
 	dev-libs/glib:2
-	>=x11-libs/cairo-1.8.8
+	x11-libs/cairo
 	introspection? ( dev-libs/gobject-introspection )
 	vala? ( dev-lang/vala:0.12 )"
 DEPEND="${RDEPEND}
-		doc? ( >=dev-util/gtk-doc-1.12 )"
+	doc? ( >=dev-util/gtk-doc-1.12 )"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
 
 DOCS=(AUTHORS ChangeLog NEWS README)
 
+PATCHES=(
+	"${FILESDIR}"/${P}-link_gobject.patch
+	)
+
+src_prepare() {
+	autotools-utils_src_prepare
+	eautoreconf
+}
+
 src_configure() {
 	unset VALAC
 	use vala && export VALAC=$(type -p valac-0.12)
 
-	CFLAGS="${CFLAGS}" \
-	econf \
-		$(use_enable debug) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable introspection) \
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable doc gtk-doc)
+		$(use_enable introspection)
 		$(use_enable vala)
+	)
+	CFLAGS="${CFLAGS}" \
+		autotools-utils_src_configure
 }