gentoo resync : 15.06.2021

4 files changed, 64 insertions, 11 deletions

diff --git a/media-gfx/flam3/Manifest b/media-gfx/flam3/Manifest
index defae84b5954..86ac536fab85 100644
--- a/media-gfx/flam3/Manifest
+++ b/media-gfx/flam3/Manifest
@@ -1,3 +1,4 @@
+AUX flam3-3.1.1-slibtool.patch 1804 BLAKE2B 7c9421a8063ee8e7bf76b7197984137d4d4877c8b07ba00cbdbc95aaab6090abeed3c940176777a76ddd8c02b66f99e28ea403626b7d07cf488b1ebfc41ed8eb SHA512 02bc7901e8c868c7d841b0e752fcd9f8bf443365793846ff04da068048ade0db11f41bf80562f50e4d49fa97a4164d3ed4c7dab1c9bb43bc3bb272c9307432f4
 DIST flam3-3.1.1.tar.gz 1181954 BLAKE2B 9691647704e96052f04f79b59b55b47285940ada3486ef6828d1e95934c5741915bf0e4f11c3ff39da7b5534b5c6c9ec16a88bc0568ac65c8a4b5d4aff9c8d29 SHA512 8a84840d9cb91d63dd0ba5c8a6725f703f6315a7add0c091502c0dac5c77eb0495054bb4b601f72454dea0def99131ca679095da65eeebaae9b01dc59cf75e7e
-EBUILD flam3-3.1.1.ebuild 748 BLAKE2B 330660b6924e4d97a2ed818b3b8dff66ed3cd6dc870cebda13fa936a237be0574d18b2650c5036d7d3f01174cc32254e361ed579683263e7127b5a647c208b45 SHA512 5e3f6fca43473f0736ffb16a1362a2f50f77052385cd17eb0b6a9cd599dd032f5c2f56a81fcb736596988df6dd457d35cda4af52526cf74f0bb5b7d1d6e3470f
-MISC metadata.xml 322 BLAKE2B 8fa31c5e84e310169a863d1d66a77d73cff819cf595acfd7fc8f23c90a2271348899e8a5a5a5a184ea7de9428aebf7d841ab0a035fdc28f0ecd312396dcf3def SHA512 98b61c299f8cfa8c42a5f4b5b51b9eecbdffe3632ef8fd687afab26454fa8fccb71348a42cca69fbae7d154f69814feac61c4109ba671dd2fa413bf75e0445ca
+EBUILD flam3-3.1.1.ebuild 765 BLAKE2B e9afce974f203769c9de05ac6b502d98f7ade4b8f2cc9c3e99420d38426e17717bb02d95e9626f644b3b899426e37e03e6f1e625e0ba3dc0fffaf2fee48e1a8e SHA512 c2f87079bf816f024f81cd9e05a4c3356f8d7385bbd32a2197982897e967671fe7f3883df7098490c4c68226151f7f9a4a19dc4d4e1881197336d371bd97687e
+MISC metadata.xml 242 BLAKE2B eae02329c90bdfb86358eb8b99074e5a12f49a247ceb4c033fc776045fa6bb8a7b5f9ef34e7afb9b379a4707c01f31d5a66a7331189d8c9d4d2641fbc82d2a41 SHA512 154d0e4e1799cb085f2794d8edba2d8a174a7b8cd65b4ce4cb5debf6a3df379a3d91dea4f85649df189c2d3f91f205f9025476cc4a53de605f91ce291ea1975e
diff --git a/media-gfx/flam3/files/flam3-3.1.1-slibtool.patch b/media-gfx/flam3/files/flam3-3.1.1-slibtool.patch
new file mode 100644
index 000000000000..084c1ba77827
--- /dev/null
+++ b/media-gfx/flam3/files/flam3-3.1.1-slibtool.patch
@@ -0,0 +1,53 @@
+From 78ea170715b57bbde0275447dbcc8b20a926b05d Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sun, 28 Mar 2021 13:15:53 -0700
+Subject: [PATCH] build: Fix undefined libm references.
+
+---
+ Makefile.am  | 11 ++++++-----
+ configure.ac |  2 ++
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index c3d0f42..78954e8 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -11,19 +11,20 @@ lib_LTLIBRARIES = libflam3.la
+ include_HEADERS = flam3.h isaac.h isaacs.h rect.c
+ 
+ libflam3_la_SOURCES = flam3.c filters.c parser.c variations.c interpolation.c palettes.c jpeg.c png.c isaac.c
+-libflam3_la_LDFLAGS = -no-undefined -ljpeg -lpng -lz -lpthread
++libflam3_la_LDFLAGS = -no-undefined
++libflam3_la_LIBADD = -ljpeg -lpng -lz -lpthread $(LIBM)
+ 
+ flam3_genome_SOURCES = flam3-genome.c docstring.c
+-flam3_genome_LDADD = libflam3.la -lm
++flam3_genome_LDADD = libflam3.la
+ 
+ flam3_animate_SOURCES = flam3-animate.c docstring.c
+-flam3_animate_LDADD = libflam3.la -lm
++flam3_animate_LDADD = libflam3.la
+ 
+ flam3_render_SOURCES = flam3-render.c docstring.c
+-flam3_render_LDADD = libflam3.la -lm
++flam3_render_LDADD = libflam3.la
+ 
+ flam3_convert_SOURCES = flam3-convert.c docstring.c
+-flam3_convert_LDADD = libflam3.la -lm
++flam3_convert_LDADD = libflam3.la
+ 
+ pkgdata_DATA = flam3-palettes.xml
+ 
+diff --git a/configure.ac b/configure.ac
+index c427bb5..f7f4839 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -28,6 +28,8 @@ AC_CHECK_LIB([z],[deflateInit_],,[AC_MSG_ERROR([zlib is required.])])
+ AC_CHECK_LIB([png],[png_write_image],,[AC_MSG_ERROR([The png library is required.])])
+ AC_CHECK_LIB([xml2],[xmlParseFile],,[AC_MSG_ERROR([The xml2 library is required.])])
+ 
++AC_CHECK_LIBM
++AC_SUBST([LIBM])
+ 
+ if test "${enable_atomic_ops}" = "" ; then
+   enable_atomic_ops=yes
diff --git a/media-gfx/flam3/flam3-3.1.1.ebuild b/media-gfx/flam3/flam3-3.1.1.ebuild
index 6a111b72cfe3..0b7b9d363042 100644
--- a/media-gfx/flam3/flam3-3.1.1.ebuild
+++ b/media-gfx/flam3/flam3-3.1.1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools
 
 DESCRIPTION="Tools and a library for creating flame fractal images"
@@ -11,7 +12,6 @@ SRC_URI="https://github.com/scottdraves/flam3/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="static-libs"
 
 RDEPEND="dev-libs/libxml2
 	media-libs/libpng:=
@@ -21,21 +21,23 @@ DEPEND="${RDEPEND}"
 
 DOCS=( README.txt )
 
+PATCHES=( "${FILESDIR}"/${P}-slibtool.patch )
+
 src_prepare() {
+	default
 	eautoreconf
-	eapply_user
 }
 
 src_configure() {
 	econf \
 		--enable-shared \
-		$(use_enable static-libs static)
+		--disable-static
 }
 
 src_install() {
 	default
 
-	rm -f "${D}"usr/lib*/libflam3.la
+	find "${ED}" -name '*.la' -delete || die
 
 	docinto examples
 	dodoc *.flam3
diff --git a/media-gfx/flam3/metadata.xml b/media-gfx/flam3/metadata.xml
index 6cefa895a658..a10e023a1ca9 100644
--- a/media-gfx/flam3/metadata.xml
+++ b/media-gfx/flam3/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">flam3</remote-id>
 	</upstream>