gentoo resync : 13.10.2019

7 files changed, 74 insertions, 63 deletions

diff --git a/media-libs/lib3ds/Manifest b/media-libs/lib3ds/Manifest
index a5b66753f2bf..1006f6529db8 100644
--- a/media-libs/lib3ds/Manifest
+++ b/media-libs/lib3ds/Manifest
@@ -1,9 +1,10 @@
-AUX lib3ds-1.3.0-r1-mesh.c.patch 682 BLAKE2B 01d62c09d0def3d7851550bb971b3695da887e396826bab935b3bf7fcb77e3ac3a0878daa4a0301c68edc03f7a7eb32919ecd918cf02e358ea727c276f11662e SHA512 d01466d08f0ffae7f97f510842f89d7b5b171bf5534e2348ea1e7d5e6588b4bc802d9a67fe992a00d4894a4c7194a7896740aaac85b398f191384656fcbb677e
-AUX lib3ds-1.3.0-r1-pkgconfig.patch 2345 BLAKE2B 9d1fddb8a14ccaf5d2747c39113e809ca61e2852af3e3ab7b06c72a9aea148dd242b003ef0be7ca9eb2ee710347e86cfb22f0f1909a53651d2064ba8fcf1feb5 SHA512 4f9ef4bb9a6716822a4310441f53954b02b18266b95db1d31dce8e3a46a944fde3af39ba74409939500a61387ba2f4f9c5af5b73c58ca91b1dab75d996f85394
+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
-AUX lib3ds-2.0.0_rc1-underlinking.patch 1584 BLAKE2B 9225bc7726483c6260970dfd1bc8ba9cf3de3907af4d7b0ec1b0a7d2d9be9356551ed8384b02c26a042ffdd4907c590869b8848e8164feec84c48c9af4d13b71 SHA512 be3a3470cba90beeac5f1bc161c6885c09483e197b5501208e338ef7256e66e1a27066f0f91403ae6abdeb311e2eb374a36e01c4e3c99a2e7b77422bf24b9799
 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-r1.ebuild 579 BLAKE2B 414f5dad4772b72a8956bd682011d07c160e6f940e665067125f0bd8ceeae777edf0d9566dea5e442a7ff89a714d8d056638ba8f552ea38523dc81e46fe59c93 SHA512 e20f574320af7056f26396c0cdce1f0ffc76175b82ccf34da13c18fc6ce53c1e89e4e43b3244226c7e9c29bf90ff46040ef6b01472c1f1d90a4f633d71c82c6d
+EBUILD lib3ds-1.3.0-r1.ebuild 554 BLAKE2B 606e9436fbbe9d2f2f8c7ff27a611dc411b2e52af03bfac3e897211365036b9f7b95f97171f40ade5a943a8482c6f920874e22381d67e95459bbc25c15467793 SHA512 67812bdf404fd8be46b8c11d38f5c1da89f3e36849add8843aa16e63a2569438941f770ff6bf0e680f1dee356d02f8a99e6d6c8714aa37f62165c5c84bca200c
+EBUILD lib3ds-1.3.0-r2.ebuild 644 BLAKE2B 585ea5c886cda38e0a8bfb64bcbf5e4005ab7bbab0d3718436614ee649b44c8ae3ee0cc280727b03f3e648b0b364a7ffe2cf0aab0c114ab5e7589d66cb83ac0e SHA512 17cd4cd5b27b43dda3e2b6059f288d19b4ee26d7b9ec430f7143cd7365cc262c6de95ed8f3b7a324fbc672b2c21ad701552230fd93aaafcaf48f88e74efc556f
+EBUILD lib3ds-2.0.0_rc1-r1.ebuild 703 BLAKE2B c9f519bd4a18f47c98f619a7a7582bd8395a31579ee2401642f3afd7d8e92002d727538397f5ad0820d88ef6d8544afc11dc25b898dffc844497041e2794e17d SHA512 838f040fbc069d2f0fffa8572571b20ad7d8631555e7342b8f2c9834ff045d26c044cef63ec303c9e2e055c210927ff0cdca400a071e7b277bef8f05e8e98ccd
 EBUILD lib3ds-2.0.0_rc1.ebuild 652 BLAKE2B a85855fa5d699c0e592437ba23fad789905ade2d5a3d8bc4d331c6fb0683dc451f57bd6674984324a0619a71f8bc5ee687f386dd9c569ac7ce203f21bd129594 SHA512 a1bc042ebaabe3775150cc52bda1fc5509a677057082a836b27e27181b706b1f0f00d7961df7faf2ec4e4a8d1f81be0fdecbdd4c0e4ac72d58adab07a9a256fe
 MISC metadata.xml 559 BLAKE2B ef0091ec0f5a955a4bfce1522f879e68b2fe30bfa0dd4f7d5d098b37a5b5a6c2b921f0eb7583e672e224303e9c6bd894c26ba59647349aa2d49be442ae4a1910 SHA512 ccdb9124856024ed9737a0f941c97ceece7af753358eb17897dbfc3cf1b7cc7db4fcc5e22ee2da97ee728500c602885720811d790f489cfdd776890e0c04aca5
diff --git a/media-libs/lib3ds/files/lib3ds-1.3.0-r1-mesh.c.patch b/media-libs/lib3ds/files/lib3ds-1.3.0-mesh.c.patch
index 1455660596bf..1455660596bf 100644
--- a/media-libs/lib3ds/files/lib3ds-1.3.0-r1-mesh.c.patch
+++ b/media-libs/lib3ds/files/lib3ds-1.3.0-mesh.c.patch
diff --git a/media-libs/lib3ds/files/lib3ds-1.3.0-r1-pkgconfig.patch b/media-libs/lib3ds/files/lib3ds-1.3.0-pkgconfig.patch
index 41f658e5311b..41f658e5311b 100644
--- a/media-libs/lib3ds/files/lib3ds-1.3.0-r1-pkgconfig.patch
+++ b/media-libs/lib3ds/files/lib3ds-1.3.0-pkgconfig.patch
diff --git a/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking.patch b/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking.patch
deleted file mode 100644
index b9001af2993a..000000000000
--- a/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-commit 158cf6f8deaac69eba0c5941f809469cc3eefb43
-Author: hasufell <hasufell@gentoo.org>
-Date:   Thu Sep 26 20:49:01 2013 +0200
-
-    fix underlinking
-
-diff --git a/configure.in b/configure.in
-index 7bf17c2..fa5bd3f 100644
---- a/configure.in
-+++ b/configure.in
-@@ -16,6 +16,8 @@ AM_INIT_AUTOMAKE(lib3ds, $LIB3DS_VERSION)
- AC_PROG_CC
- AC_PROG_LIBTOOL
- 
-+AC_CHECK_LIBM
-+
- AC_OUTPUT([ \
-   lib3ds-config \
-   Makefile \
-diff --git a/examples/3ds2obj/Makefile.am b/examples/3ds2obj/Makefile.am
-index 8213225..4214675 100644
---- a/examples/3ds2obj/Makefile.am
-+++ b/examples/3ds2obj/Makefile.am
-@@ -3,6 +3,6 @@ INCLUDES = -I$(top_srcdir)/src
- bin_PROGRAMS = 3ds2obj
- 3ds2obj_SOURCES = 3ds2obj.c
-  
--LDADD = $(top_builddir)/src/lib3ds.la 
-+LDADD = $(top_builddir)/src/lib3ds.la $(LIBM)
- 
- EXTRA_DIST = 3ds2obj.vcproj
-diff --git a/examples/3dsdump/Makefile.am b/examples/3dsdump/Makefile.am
-index 98ec5d1..ef19b04 100644
---- a/examples/3dsdump/Makefile.am
-+++ b/examples/3dsdump/Makefile.am
-@@ -3,6 +3,6 @@ INCLUDES = -I$(top_srcdir)/src
- bin_PROGRAMS = 3dsdump
- 3dsdump_SOURCES = 3dsdump.c
-  
--LDADD = $(top_builddir)/src/lib3ds.la 
-+LDADD = $(top_builddir)/src/lib3ds.la $(LIBM)
- 
- EXTRA_DIST = 3dsdump.vcproj
-diff --git a/examples/cube/Makefile.am b/examples/cube/Makefile.am
-index c79c0ee..539813d 100644
---- a/examples/cube/Makefile.am
-+++ b/examples/cube/Makefile.am
-@@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/src
- bin_PROGRAMS = cube
- cube_SOURCES = cube.c
-  
--LDADD = $(top_builddir)/src/lib3ds.la 
-+LDADD = $(top_builddir)/src/lib3ds.la $(LIBM)
- 
- EXTRA_DIST = cube.vcproj cube.tga 
- 
diff --git a/media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild b/media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild
index 6bdace88421a..a15221ea080b 100644
--- a/media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild
+++ b/media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -19,6 +19,6 @@ RDEPEND="media-libs/freeglut
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 PATCHES=(
-	"${FILESDIR}/lib3ds-1.3.0-r1-pkgconfig.patch"
-	"${FILESDIR}/lib3ds-1.3.0-r1-mesh.c.patch"
+	"${FILESDIR}"/${P}-pkgconfig.patch
+	"${FILESDIR}"/${P}-mesh.c.patch
 )
diff --git a/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild b/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
new file mode 100644
index 000000000000..a6db6a0139e8
--- /dev/null
+++ b/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+IUSE="static-libs"
+
+BDEPEND="app-arch/unzip"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pkgconfig.patch
+	"${FILESDIR}"/${P}-mesh.c.patch
+)
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		rm "${ED}/usr/$(get_libdir)/${PN}.la" || die
+	fi
+}
diff --git a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
new file mode 100644
index 000000000000..b663c12a29cf
--- /dev/null
+++ b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="static-libs"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-underlinking-no-autoreconf.patch
+)
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		rm "${ED}/usr/$(get_libdir)/${PN}.la" || die
+	fi
+}