gentoo resync : 25.03.2022

4 files changed, 23 insertions, 53 deletions

diff --git a/media-libs/lib3ds/Manifest b/media-libs/lib3ds/Manifest
index 6eca4ee865a1..f0b04216e01b 100644
--- a/media-libs/lib3ds/Manifest
+++ b/media-libs/lib3ds/Manifest
@@ -1,8 +1,7 @@
 AUX lib3ds-1.3.0-mesh.c.patch 682 BLAKE2B 01d62c09d0def3d7851550bb971b3695da887e396826bab935b3bf7fcb77e3ac3a0878daa4a0301c68edc03f7a7eb32919ecd918cf02e358ea727c276f11662e SHA512 d01466d08f0ffae7f97f510842f89d7b5b171bf5534e2348ea1e7d5e6588b4bc802d9a67fe992a00d4894a4c7194a7896740aaac85b398f191384656fcbb677e
 AUX lib3ds-1.3.0-pkgconfig.patch 2345 BLAKE2B 9d1fddb8a14ccaf5d2747c39113e809ca61e2852af3e3ab7b06c72a9aea148dd242b003ef0be7ca9eb2ee710347e86cfb22f0f1909a53651d2064ba8fcf1feb5 SHA512 4f9ef4bb9a6716822a4310441f53954b02b18266b95db1d31dce8e3a46a944fde3af39ba74409939500a61387ba2f4f9c5af5b73c58ca91b1dab75d996f85394
-AUX lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch 1453 BLAKE2B bb196782a7da408412d7a1ae5c1c006ff9b59827dfbe6bb7092ae8b6d7ca1b7eaaeba167bb3804dd24ba369b90982dc97f10443424dea39b0f3ecaac378ed2e7 SHA512 63bc93b5cdf099a33b13ad84ebbd964607fe2824f102d5e4dd37c435cb84ca82e4de16a1796de8abe9e4dd43071b3bcb6b3f176d0d2c4019534d8d08decc8570
 DIST lib3ds-1.3.0.zip 443675 BLAKE2B 7e9aa3b7d0c74013264430be24b1f8417f5ff7754bd77508fb85fee227c8675c023b6b805b3cda57a1ea3c1bbc7b0fbd37df8ed1c4d00ac295a39ffb0e3c1219 SHA512 7c866ea9721a7a124c25b4962e933a7066ec2e3c7998e5ae2ba93727f19b91bdb103699bada6d1e04b67e0a54b9f58d09382093569114a1846d86bb03821b8ac
 DIST lib3ds-20080909.zip 427233 BLAKE2B 862a4606206c59e357b0b8805998a497de140b5e80aa3f6f7dd41288ebb1ffc12475b41d5327ee3c619a22c549897b28b444bac5df58192979af5c236859d86f SHA512 ba7166dbd9fb97edc0f5cf0df56747b7e3c5aa1e62334ca995020a6ccd77284abc58e3fba80ec96ecf3765f5ce3121612c9f8c7dfedb2322f1cd2af85d567f87
-EBUILD lib3ds-1.3.0-r2.ebuild 636 BLAKE2B 256b9a06dacf3eb3a43328bc3f1721ab1c5a58bb767c4b32180831c42906542ea8657052ae1bd36a35a7746186c216f012db1427befea6d62991f214cd4d5748 SHA512 b1193d3d5dc13f0bccc66694b15cf73674582efbfbe1aa3a8afca83b9b688e3ce1f4e3cbfcf06d57e41b8b4cafda2680e758397afde0b438fe54cb8f0018e859
-EBUILD lib3ds-2.0.0_rc1-r1.ebuild 700 BLAKE2B c63dbd3f85d989c68103819b954dc1d4c2dfb00da876ba86a361150a5035f8361b25d89871811030cb90cd4b0ee900ae529b9738f50ce002df51c30aae124e07 SHA512 5588428b6a41a384c40473a396b060f9ea32c37d66e898f4d625916c3b74bc1ccc6edb8a88c1fa74a0bef2ca00a182b6ff1bb899a2830300ec5eeb799c63f209
+EBUILD lib3ds-1.3.0-r2.ebuild 750 BLAKE2B 80525700489d42266f54a88bc5d0d488d0a86b9fcb2889d1afbbc03db58357e690049c573fe857caf8121f03ce42ec5abd8b1854553bb58423f051eaa708d08a SHA512 9e2faad79da1d9ac56a3b3f581adef3ab35e31c1de0ca3956348a2bd380fd27a7af0836772be180551d90fe10719ff3d37087aa18b9780a798b53c241c021b29
+EBUILD lib3ds-2.0.0_rc1-r1.ebuild 748 BLAKE2B 66c470eff4826cb038c02de2f2ac3335b296549cdd19eae3f4b211029f0a5f669e9a4e4fbe0daaf66434d091875417f5488edd4314f73fd1049a6c7a16deffb8 SHA512 17724d8b10e38e39f7faada87c84c4b07dd9b10cba7176fd323cff09b7370763b1c34bb17f9b38231dfd81afd5ade93c3ff9f65c114dbf27a5a77f99743d4ecd
 MISC metadata.xml 597 BLAKE2B f36443b4e7047530b32949750b0b0c3e3b7163243c93e38390379bda9e5d08dd5c9da9f7a6df8c51c2c08b6206ffd15f31f63590f4a2e2b901ccad2268892298 SHA512 c91019a51555c0f26cacca2bf6f68e3d47d2d94b243127703f042219f71c60df91676f8c8a826797a003ed1d1435d64706ef19b8eb8c307102014c95f7e28dc3
diff --git a/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch b/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch
deleted file mode 100644
index af9040883c10..000000000000
--- a/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit 562d1412a705b6667bc9fa594133366fb7e787ab
-Author: hasufell <hasufell@gentoo.org>
-Date:   Thu Sep 26 20:49:44 2013 +0200
-
-    avoid autoreconf
-
-diff --git a/examples/3ds2obj/Makefile.in b/examples/3ds2obj/Makefile.in
-index 1b5b1fe..d2fda8a 100644
---- a/examples/3ds2obj/Makefile.in
-+++ b/examples/3ds2obj/Makefile.in
-@@ -180,7 +180,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = -I$(top_srcdir)/src
- 3ds2obj_SOURCES = 3ds2obj.c
--LDADD = $(top_builddir)/src/lib3ds.la 
-+LDADD = $(top_builddir)/src/lib3ds.la -lm
- EXTRA_DIST = 3ds2obj.vcproj
- all: all-am
- 
-diff --git a/examples/3dsdump/Makefile.in b/examples/3dsdump/Makefile.in
-index 4c915cc..f9f7bba 100644
---- a/examples/3dsdump/Makefile.in
-+++ b/examples/3dsdump/Makefile.in
-@@ -180,7 +180,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = -I$(top_srcdir)/src
- 3dsdump_SOURCES = 3dsdump.c
--LDADD = $(top_builddir)/src/lib3ds.la 
-+LDADD = $(top_builddir)/src/lib3ds.la -lm
- EXTRA_DIST = 3dsdump.vcproj
- all: all-am
- 
-diff --git a/examples/cube/Makefile.in b/examples/cube/Makefile.in
-index 76b7946..1c4b5b6 100644
---- a/examples/cube/Makefile.in
-+++ b/examples/cube/Makefile.in
-@@ -180,7 +180,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = -I$(top_srcdir)/src 
- cube_SOURCES = cube.c
--LDADD = $(top_builddir)/src/lib3ds.la 
-+LDADD = $(top_builddir)/src/lib3ds.la -lm
- EXTRA_DIST = cube.vcproj cube.tga 
- all: all-am
- 
diff --git a/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild b/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
index 22bfc9ac8e31..a2a9fdb2ba6c 100644
--- a/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
+++ b/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
@@ -1,11 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit autotools
+
 DESCRIPTION="library for managing 3D-Studio Release 3 and 4 .3DS files"
 HOMEPAGE="https://code.google.com/p/lib3ds/"
 SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
+
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
@@ -18,6 +21,13 @@ PATCHES=(
 	"${FILESDIR}"/${P}-mesh.c.patch
 )
 
+src_prepare() {
+	default
+
+	# Always eautoreconf to renew libtool (e.g. Clang)
+	eautoreconf
+}
+
 src_configure() {
 	econf $(use_enable static-libs static)
 }
diff --git a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
index b7da0c9e8a8c..54f706d22467 100644
--- a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
+++ b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
@@ -1,14 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit autotools
+
 MY_PV="20080909"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="library for managing 3D-Studio Release 3 and 4 .3DS files"
 HOMEPAGE="https://code.google.com/p/lib3ds/"
 SRC_URI="https://lib3ds.googlecode.com/files/${MY_P}.zip"
+
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
@@ -18,9 +21,12 @@ BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-underlinking-no-autoreconf.patch
-)
+src_prepare() {
+	default
+
+	# Always eautoreconf to renew libtool (e.g. Clang)
+	eautoreconf
+}
 
 src_configure() {
 	econf $(use_enable static-libs static)