From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 15 Dec 2019 18:09:03 +0000
Subject: gentoo resync : 15.12.2019

---
 media-libs/memphis/Manifest             |  2 +-
 media-libs/memphis/memphis-0.2.3.ebuild | 45 +++++++++++++++++----------------
 2 files changed, 24 insertions(+), 23 deletions(-)

(limited to 'media-libs/memphis')

diff --git a/media-libs/memphis/Manifest b/media-libs/memphis/Manifest
index 9de13a9b457a..d68e4aa57df2 100644
--- a/media-libs/memphis/Manifest
+++ b/media-libs/memphis/Manifest
@@ -1,4 +1,4 @@
 AUX memphis-0.2.3-link_gobject.patch 350 BLAKE2B f222f0febd245e835ef095b718903aec8e73fd6187324c0276679648b11eb3e8488253408272b4578dcad2383ee74e29a5da928fea2694efdb721a16433f07a6 SHA512 013790ca4124dcb070e5ffb1f398a8804c494e2cc4024ddcdcbd909108a5854223bed43acc8bc1c77f5528fe1eb25642c750d50a8b1949b82a90bfb3f2877b20
 DIST memphis-0.2.3.tar.gz 459423 BLAKE2B a2f9f1a86feb058e911051b0c0c4cc1b6a47dced6a24096e91e27e869099d1ae86e13b5e55c4639c70bc9536a266d60d07023e863675d0a9e716e2f539a331ce SHA512 effac6efbf6e8fb8c3c436013447a27f4bcbea661268e2e6b5ec69cd93b117cee6c56f78a557223c7dd45020a27e51807a4e2682d6d311b319c783e714064b01
-EBUILD memphis-0.2.3.ebuild 1140 BLAKE2B ed8daf767b0e2089be1b197ffdfc52fd3449c079069987efa70b1305d7be04d82f6cd2d7c5a3213e070e017cfe16aa32a666919715431f1d447508e2bfb9edca SHA512 761c389e2e6d417c0881469885af9ec764b4f980bb1d541c9e3b97468ff493d3401a97e50f54c31ef663d066f1701fe17e2705fb97645e1a096876e14205df6d
+EBUILD memphis-0.2.3.ebuild 1056 BLAKE2B 28a32edf0c77ef5456d096474c2b681cefc73a9b16fe1947000a11c0555ae48641d3efa2141b4a6287d1ae42afe7feaf1103be91b5d2d9524b30af9f8aec8034 SHA512 89871511ec4c683b662f910dc2790edf6e78c9e8482d1ba97b399b819a9decce7a2b783657a409144ae04f83fb9c23c84bec6132bbd700e015b8370a7acbe90d
 MISC metadata.xml 275 BLAKE2B 054c49c4cc7e0607212f55ec7e66b38585457f74ce21e0483503814df58d31dee0b784e9b0bd9cdf0c8fca04e7454bd1b515085e5aac2c0d7fd2700df08c9b26 SHA512 5877508750864819a1d129ac2406c0d11721cd0e4e64d55c9bd6a44649991fda435e7752e841cca94b348f74078226f12e90dcdd323915bce3d601e65865c225
diff --git a/media-libs/memphis/memphis-0.2.3.ebuild b/media-libs/memphis/memphis-0.2.3.ebuild
index 368aa1b04541..9063f96e9072 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
 }
-- 
cgit v1.2.3