gentoo resync : 17.02.2020

3 files changed, 4 insertions, 75 deletions

diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index ed13b25156aa..c296fbc11b85 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -1,7 +1,5 @@
 AUX opencollada-1.6.62-cmake-fixes.patch 4823 BLAKE2B 84805e591bb8212e0cfce78fa8c7b6c03684d2d54dc16644b2211768ecdf0868fa77f4836f5a24280f9bd7f0fe47b7715f70f06f48db1c6bf90efb6a23e05632 SHA512 db5c2389aa45d0924371e93b0006052d6a83f1fba2727c86c23093fa2e21194586fcaaec361828343676cf170aea30a5bfefb7126f1f19fb1c966257165743eb
 AUX opencollada-1.6.63-pcre-fix.patch 530 BLAKE2B c0f96d1f3d93570f49670d5dc63f6faa4f164a21a8e1b840a0d54c596049f29a7e94cbe6297343fa323dacebc1831ed6871d7e82ac12fe3026ab75823d07670c SHA512 8ea88344ebc345e4a996ebe39852e5d52806cba76ce433253c67f8840de6ce082515d2bec571d49bddfe3ec620912b3de0674c522c10203bbc590bd6df80fc55
-DIST opencollada-1.6.62.tar.gz 12094443 BLAKE2B 6cd0ec893fc212bf3e8f166ad9c51c894dc298a3627e65dd41ece850a5638d91b8839830d5456bf3ba072a0b23f8c01247d8c676cc79d98464cdf0c1b55fd3c5 SHA512 bd39406b9a833409303ef7cd4e93beee0675fa57c267af95a34699348a81650d50ae042dbb1837cd41c72433533a3a9b827a44e9775a5b06c7c4f1a351146574
 DIST opencollada-1.6.63.tar.gz 12094044 BLAKE2B dbe38ab2976f72d47a38bd147e05a58555acc2b70618d4d47d2beff87ace54f7fcd2f116b9ba9908cfb38b5699e547375e902128c2f378c295308f1601a18b17 SHA512 e1b92e932d0256224b026281fb5691219c5171f57b968307288b6e5481b5d6fee39825702e18017055bd0fb0e3d4c40b6ce526d3ce4defe2994138db54220d01
-EBUILD opencollada-1.6.62.ebuild 1628 BLAKE2B a29e1f0236cc8f4abc7a486b03b6e67e04e07022ea14e93e39b8835fe40da5d8b75c683264beb8b96158b114bcf33ee7ec9ee216f74e1cbed38e4e5325c4639c SHA512 0cb788227b1eb0581239463b7ce3af50c5bb4928a8377ae2bdeb37065535da5096fa35df67a3fda9f06e48d14ef232920dcdd22a758ed2cd4a7938372f036fae
-EBUILD opencollada-1.6.63-r1.ebuild 1635 BLAKE2B ff873765d294e722e5cce7752433f4f4dea1cb9eb637d9e43d7ca743bfa35ffb8aa46305fc085c5e560674b5f28cd277961a5739af416bb1a6aa70fa32e27268 SHA512 b6ce66e702225926b49c02bf287629235bd28cab42107cee59a8d767f545e0e5ff391c55951521f627b3eb700ef05ba7caf83dbb39f2fe25039238648026a033
+EBUILD opencollada-1.6.63-r1.ebuild 1640 BLAKE2B 18ac545d76b9ebc99b5f85d44503e184fa195ec691ddc6cb2453ce9cd8d095784df884a029caba88cb1a962ea40a525efe309032a4bc93b1e69cbe05580b5b69 SHA512 04c9b1453208e360d449adb678876f0d6856704222e1cfeb5de4c1448f34b73b407c00235b62848a7fd9b6e4360dfd1be419a8815acbd7bf24f719d9169fbf75
 MISC metadata.xml 256 BLAKE2B 9e83a301f9fadaeea1559fbf7774e1d353df51a19661d95134705312a6f1465807f815f733b0ba72a6e891a551891fefc05de9a37f9c8cb2c2236e6e475962c5 SHA512 4ffbc8e0ad4a1456f33e5b568166f3e6285ffd42218fbc0d9f8f04c319a341c367aec0b92a1074029cd11ededf0c110a22f3358a47e2cdce5946a6d42c82fc30
diff --git a/media-libs/opencollada/opencollada-1.6.62.ebuild b/media-libs/opencollada/opencollada-1.6.62.ebuild
deleted file mode 100644
index a0c55233ca38..000000000000
--- a/media-libs/opencollada/opencollada-1.6.62.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Stream based read/write library for COLLADA files"
-HOMEPAGE="http://www.opencollada.org/"
-SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="static-libs"
-
-# bug 651756
-RDEPEND="<dev-libs/libpcre-8.42
-	dev-libs/zziplib
-	media-libs/lib3ds
-	sys-libs/zlib
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/OpenCOLLADA-${PV}"
-
-PATCHES=( "${FILESDIR}/${P}-cmake-fixes.patch" )
-
-src_prepare() {
-	edos2unix CMakeLists.txt
-
-	cmake-utils_src_prepare
-
-	# Remove bundled depends that have portage equivalents
-	rm -rv Externals/{expat,lib3ds,LibXML,pcre,zziplib} || die
-
-	# Remove unused build systems
-	rm -v Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die
-	find "${S}" -name SConscript -delete || die
-}
-
-src_configure() {
-	# bug 619670
-	append-cxxflags -std=c++14
-
-	local mycmakeargs=(
-		-DUSE_SHARED=ON
-		-DUSE_STATIC=$(usex static-libs)
-		-DUSE_LIBXML=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	echo "LDPATH=/usr/$(get_libdir)/opencollada" > "${T}"/99${PN} || die "echo failed"
-	doenvd "${T}"/99${PN}
-
-	dobin "${BUILD_DIR}/bin/DAEValidator"
-	dobin "${BUILD_DIR}/bin/OpenCOLLADAValidator"
-	# Need to be in same directory as above binaries
-	docinto "/usr/bin"
-	dodoc "${BUILD_DIR}/bin/COLLADAPhysX3Schema.xsd"
-	dodoc "${BUILD_DIR}/bin/collada_schema_1_4_1.xsd"
-	dodoc "${BUILD_DIR}/bin/collada_schema_1_5.xsd"
-}
diff --git a/media-libs/opencollada/opencollada-1.6.63-r1.ebuild b/media-libs/opencollada/opencollada-1.6.63-r1.ebuild
index f83d0770c2fd..1ed2b159eba1 100644
--- a/media-libs/opencollada/opencollada-1.6.63-r1.ebuild
+++ b/media-libs/opencollada/opencollada-1.6.63-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils flag-o-matic
+inherit cmake-utils eutils flag-o-matic
 
 DESCRIPTION="Stream based read/write library for COLLADA files"
 HOMEPAGE="http://www.opencollada.org/"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="static-libs"
 
 RDEPEND="dev-libs/libpcre