[gentoo-commits] repo/gentoo:master commit in: media-libs/memphis/

[gentoo-commits] repo/gentoo:master commit in: media-libs/memphis/

[Michał Górny]

commit:     5cd340698ee4b511e68afce7d4d5ade96a31dedd
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 10 09:01:56 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jan 10 09:06:45 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cd34069

media-libs/memphis: Fix sci-geosciences herd ref

 media-libs/memphis/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/memphis/metadata.xml b/media-libs/memphis/metadata.xml
index 2f07ce3..71e60c6 100644
--- a/media-libs/memphis/metadata.xml
+++ b/media-libs/memphis/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-geoscience</herd>
+  <herd>sci-geosciences</herd>
   <use>
     <flag name="introspection">Use dev-libs/gobject-introspection for introspection</flag>
     <flag name="vala">Add support for Vala</flag>

[gentoo-commits] repo/gentoo:master commit in: media-libs/memphis/

[David Seifert]

commit:     7e86ece96cd3b4d01e1cee9853f0ff1be4474332
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 17:31:16 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 17:31:16 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e86ece9

media-libs/memphis: Port to EAPI 7

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 media-libs/memphis/memphis-0.2.3.ebuild | 45 +++++++++++++++++----------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/media-libs/memphis/memphis-0.2.3.ebuild b/media-libs/memphis/memphis-0.2.3.ebuild
index 368aa1b0454..9063f96e907 100644
--- a/media-libs/memphis/memphis-0.2.3.ebuild
+++ b/media-libs/memphis/memphis-0.2.3.ebuild
@@ -1,14 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 WANT_AUTOMAKE=1.11
 
-AUTOTOOLS_AUTORECONF=true
-VALA_MIN_API_VERSION=0.12
-
-inherit autotools-utils vala
+inherit autotools vala
 
 DESCRIPTION="A map-rendering application and a library for OpenStreetMap"
 HOMEPAGE="http://trac.openstreetmap.ch/trac/memphis/"
@@ -17,36 +14,40 @@ SRC_URI="http://wenner.ch/files/public/mirror/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0.2"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-IUSE="debug doc +introspection vala static-libs"
+IUSE="debug doc +introspection vala"
 
 RDEPEND="
-	dev-libs/expat
+	dev-libs/expat:=
 	dev-libs/glib:2
-	x11-libs/cairo
+	x11-libs/cairo:=
 	introspection? ( dev-libs/gobject-introspection )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	doc? ( dev-util/gtk-doc )
 	vala? ( $(vala_depend) )"
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
 PATCHES=( "${FILESDIR}"/${P}-link_gobject.patch )
 
 src_prepare() {
+	default
+	eautoreconf
+
 	unset VALAC
 	use vala && vala_src_prepare
-	autotools-utils_src_prepare
 }
 
 src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable doc gtk-doc)
-		$(use_enable introspection)
+	econf \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable introspection) \
 		$(use_enable vala)
-	)
-	CFLAGS="${CFLAGS}" \
-		autotools-utils_src_configure
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }