[gentoo-commits] gentoo-x86 commit in media-libs/memphis: memphis-0.2.3.ebuild ChangeLog

["Justin Lecher (jlec)" <jlec@gentoo.org>]

jlec        11/12/17 14:13:39

  Modified:             memphis-0.2.3.ebuild ChangeLog
  Log:
  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)

Revision  Changes    Path
1.7                  media-libs/memphis/memphis-0.2.3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/memphis/memphis-0.2.3.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/memphis/memphis-0.2.3.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/memphis/memphis-0.2.3.ebuild?r1=1.6&r2=1.7

Index: memphis-0.2.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/memphis/memphis-0.2.3.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- memphis-0.2.3.ebuild	14 Jul 2011 11:02:33 -0000	1.6
+++ memphis-0.2.3.ebuild	17 Dec 2011 14:13:39 -0000	1.7
@@ -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 @@
 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
 }



1.10                 media-libs/memphis/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/memphis/ChangeLog?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/memphis/ChangeLog?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/memphis/ChangeLog?r1=1.9&r2=1.10

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/memphis/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ChangeLog	14 Jul 2011 11:02:33 -0000	1.9
+++ ChangeLog	17 Dec 2011 14:13:39 -0000	1.10
@@ -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