gentoo resync : 16.06.2018

10 files changed, 2 insertions, 408 deletions

diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index 58de9c3cb6f9..780dddefc0a2 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -1,18 +1,7 @@
-AUX opencollada-0_p864-expat.patch 353 BLAKE2B 6073e228061ec7b7cac27f0fe23325a65055c78c46d59fc785ea353d8acd260a1bd6624ff193e599e3f49fec5714ebbc3b13d48c0445e25f1bfc2ed124a0d1b6 SHA512 f407314eeed7a7caeef674e9cfd9029cb82f29b608b83e971b4662594842a1e0fe1f81e3aa6928cb537460da17e7768a7ee70af2c5464d7224eec3d14b7f1a37
-AUX opencollada-1.2.2-libdir.patch 1258 BLAKE2B 4894f06c818311e907afa2ba01a02e6a02493da610bef6351a9fee7fdac47ea5943cb358bdc3966321a1b2abbe438faf5e5e76974149580833b2308ef9330bbd SHA512 28798609b2ca3daef7fe657cd1d086953b6834612d6857696516f805977298fd2f67507d1288bfb3afef57a55828b11370d933e33e3857502c04b56b6fec5481
-AUX opencollada-1.2.2-no-undefined.patch 1361 BLAKE2B 6e19994497dcd9ccc9a0ca0c800c7fd010d7fc3f0ed9b5a26dc02694476c212049062608523666a4f0b187c91719a257144711dcbf5efd130e59519717146d0b SHA512 7ca496722fb6c7734dc82c2bba9dff28753f4ecdf361f74bc5cc96c49ab1dacc7accc8e4834e1ecdbc9d7b2a8ccf236f5c606c6a7a670baed2c43cfd0afa8ea3
-AUX opencollada-1.2.2-soversion.patch 753 BLAKE2B 9a8d9ae8628834236d36c41aa207bbcc10ef3e7f4f14862657f84d7210d86d6786a61201506ec2da0d80ab7e11d64467aac4dbe257cf150009b68f50cee50d98 SHA512 891b0c63400c65929e72a2e78b331f5b94ef319c3a533b63194f52788bbc8f087a38589442b7a13c606db6188e381d036fb3d9241006fae9298f351012060a2c
 AUX opencollada-1.6.62-cmake-fixes.patch 4823 BLAKE2B 84805e591bb8212e0cfce78fa8c7b6c03684d2d54dc16644b2211768ecdf0868fa77f4836f5a24280f9bd7f0fe47b7715f70f06f48db1c6bf90efb6a23e05632 SHA512 db5c2389aa45d0924371e93b0006052d6a83f1fba2727c86c23093fa2e21194586fcaaec361828343676cf170aea30a5bfefb7126f1f19fb1c966257165743eb
-AUX opencollada-build-fixes-v1.patch 3454 BLAKE2B 56f37e81232fea00fb9255e685cd030e32f3421169c5c31d36dd6d33d571de17ea6056d6547c05e639a4f748d60982d519a431ffd8ade131a022c4533d6ad008 SHA512 5c15d67f221400aa08f9542970730230018261af7ddfc5310ee689019f0986e1fa0385c16b58a78ea041a900e51d2e85fd70ebb857fc808499fc0cc69503285b
 AUX opencollada-build-fixes-v3.patch 2571 BLAKE2B 013f45412ced572d9fbc29764942d7dac7c2320aa661b567d34e76beaa46d57386898cedcb817458da20146a72d657ae0866acf70034bf3063210d742301be5d SHA512 6c92e1d442543116fee6b0031c0330c497cf69a7bb1efd9bb9dfd6b37a07761ac6e4eca7939514fb7c96774743d215fc0f9ef678e0c3e0fea903773d7666de01
-DIST opencollada-1.6.25.tar.gz 11817949 BLAKE2B 84278ae25d64ab827806c6ec588a333a7b0b70bb61c61ebfe98fa837e81e4c8737c8820b8eb555509cf6ea061dcafd1b93693a12169dd44cbe9695593f16331c SHA512 48ede841d43beddbaa153899e2a1eb45d875c468536b276f6b9cb80a84b90b16ca376fb2fbc68a7f25f4908ef94a376c431ed7e94e7c6657afe60464f067a00e
-DIST opencollada-1.6.31.tar.gz 11832790 BLAKE2B 297130a8f844f4f80f4394db85098eaeaf42da125f34f20b4b6285c2bd0afc20c7066e3c54f73012c188b5b3c79f43be351fdc3b612b1e5c67ecc0ae19acb0f3 SHA512 6290600bed59fef72c4986a9d00683ae1bfedf6811a44fb9e05e1a46e4ceaee7585c2281918f0a491369e49b01d3dfab0eb38b3e0728f96fe8264a80ca28d8c9
-DIST opencollada-1.6.36.tar.gz 12275972 BLAKE2B 3f7afb81767e92d1f6efeaf114caf0fa426d075ccd0fcd9f5c8e3951d7706329c545643cab8d18c05542d26933f3e016f96ca9931554b2929d8f815661917529 SHA512 bcee958d229a6d28043afd6dbe2e8536668ce57b510d2759ef68420aa9ac5b8f82ab5956fbcef7ecc6177ad5f0f20c9a7364a886236e583c85215de86f7066f8
 DIST opencollada-1.6.58.tar.gz 12088428 BLAKE2B ef5da3eae1c7f4ffd5abf4f93fd9ae1399d7eb3d470ebf4d3c042562d654b6dbcab3010d64250ff9701bd2b1e310178ab2430ed59b3f774a610619e723786961 SHA512 122b841de28f82408bc6fe9d363894ab8f9033cfed949f8028b7a35445e3361f0df583d8b18f7198eaa9dbf3ad33b52dbe5fe6a7e652494789850effcbbf22c9
 DIST opencollada-1.6.62.tar.gz 12094443 BLAKE2B 6cd0ec893fc212bf3e8f166ad9c51c894dc298a3627e65dd41ece850a5638d91b8839830d5456bf3ba072a0b23f8c01247d8c676cc79d98464cdf0c1b55fd3c5 SHA512 bd39406b9a833409303ef7cd4e93beee0675fa57c267af95a34699348a81650d50ae042dbb1837cd41c72433533a3a9b827a44e9775a5b06c7c4f1a351146574
-EBUILD opencollada-1.6.25.ebuild 1691 BLAKE2B d01cdf9536a3d07409fa95b7da589ce5dd4184d6ac23ed3e0ed4bae07afdefb868c5f5c5c3077ffb2fc210f2d7edf9bb23d8df1a499eda25f4e483f04740a655 SHA512 9bb7fc28114378b7691bb45ac6a5d8f4345509c1833f9f20e7cf7437748208133a324e02704f16fb8de97cd60d87bf4239de2f7da0bd98a7ef08324df3de4620
-EBUILD opencollada-1.6.31.ebuild 1694 BLAKE2B 9bb917a9cd85160a31016d88dd0da513ef2ce79b741ef1ae38fe73808e28022d7e7009e291a44b5256d9bc37164cf2bcb090a90edce73bac87867f265b0aa472 SHA512 50ebec5252f221d3b54b1e2799ad9ef7ee03f4eee99f3383c26a7c79f0e0aecffeef240776f02ff94f5bd5fa24008cd11569f4bcb3da851a3e55df9dc488a12c
-EBUILD opencollada-1.6.36.ebuild 1506 BLAKE2B 33b705591e1968195c5d5dad6f1ae6b396f5704f7a0155117adb06eebdf22e5b36a2423fa406133e213567d563a9712c436a7de152b1fd0fa41bf498d5843a99 SHA512 d02ee07ad5ede1919ab433843ee75a5e8bebd6a5d46be03c6ecf350ddbf3ff979d0cd462b5b44750a309e272c71624318565e5a66978bc6735e005bcc52e2b61
 EBUILD opencollada-1.6.58.ebuild 1756 BLAKE2B dd0eb47c8da3470ab5f7c7f4eaf94cb2f2405e587ba32e00f096c09138a8e15a31d0f5ddd45d5037a01fa6a972cf2ce7aa4e6dd2b63ad9113fca7cbbed7a0a1f SHA512 facbf116dfd17a324f4add1c008d5f48b677c0cd7a29a44831a283d0a44d982fa8b9aae53588ef352394b90611486fb66edd7d2c27c74a658e0334c587a39358
 EBUILD opencollada-1.6.62.ebuild 1621 BLAKE2B 74c22f0325db9fee95d8960af7eae538f3272df294229aef5d77e8d5d86a5cd859640acfea6358ce4478a36e6daacf0b178703cd4027d7c9d14b1a063bbc10ce SHA512 383cd3e0591d9e616a1666a9e61a76818c65ebb97ec82459190dc50007feea63f8adc611ef45e415fe77b3d5d87150ccbc3e8073ad9de039bd2b43b7ce88c5af
-MISC metadata.xml 502 BLAKE2B e90b34a1114955b06cb241d4b749d2e21e865fb09f25234a8618e23d704abe05b1aec7b3e2845db2c339c901315610f7e2062be08e2bb65ceaa3f0f8b12b0edb SHA512 a3ce2d18f67d4762f6081d523c619cc3e46b0c4a882cbca1d5d90b809f73a80896fb7b1759a2e4aaf20bef958d08a57977840d6452819c4e2966aefe698dca49
+MISC metadata.xml 340 BLAKE2B c4ce9d18d941b1c878c35600ec1323b21ee1d929210a9fa4c3121bac8b191a7c648933c5d7e50e4b5bfa88c99f73ffb7f43d5d47972de9f19402f68ee7e984eb SHA512 3e362593a8e284c0eb7ac86a3d7e8b2ba6ddc4a3c88478815517b1d12f1f03f05da4e8929ecad8f78bb7b8c40bc29020124f1ef1539302e3866fb7effe60fb75
diff --git a/media-libs/opencollada/files/opencollada-0_p864-expat.patch b/media-libs/opencollada/files/opencollada-0_p864-expat.patch
deleted file mode 100644
index 9086acf79214..000000000000
--- a/media-libs/opencollada/files/opencollada-0_p864-expat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/CMakeLists.txt	2012-01-15 23:14:49.478520648 +0100

-+++ b/CMakeLists.txt	2012-01-15 23:15:06.947302261 +0100

-@@ -208,8 +208,7 @@

- 

- if (USE_EXPAT)

- 	add_definitions(-DGENERATEDSAXPARSER_XMLPARSER_EXPAT)

--	message("FATAL: EXPAT support not implemented")

--	# TODO:: use externals

-+	set(LIBEXPAT_LIBRARIES expat)

- endif ()

- 

- #adding PCRE

diff --git a/media-libs/opencollada/files/opencollada-1.2.2-libdir.patch b/media-libs/opencollada/files/opencollada-1.2.2-libdir.patch
deleted file mode 100644
index cc413f3ededc..000000000000
--- a/media-libs/opencollada/files/opencollada-1.2.2-libdir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 96ccb32..c2673f0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -146,6 +146,9 @@ set(OPENCOLLADA_VERSION_MINOR 1)
- set(OPENCOLLADA_VERSION_PATCH 0)
- set(OPENCOLLADA_VERSION ${OPENCOLLADA_VERSION_MAJOR}.${OPENCOLLADA_VERSION_MINOR}.${OPENCOLLADA_VERSION_PATCH})
- 
-+#-----------------------------------------------------------------------------
-+# Generic install paths
-+include(GNUInstallDirs)
- 
- #-----------------------------------------------------------------------------
- # Compiler warnings.
-@@ -178,9 +181,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_WARNINGS}")
- #-----------------------------------------------------------------------------
- # Install vars
- 
--set(OPENCOLLADA_INST_INCLUDE ${CMAKE_INSTALL_PREFIX}/include/opencollada)
--set(OPENCOLLADA_INST_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/opencollada)
--set(OPENCOLLADA_INST_CMAKECONFIG ${OPENCOLLADA_INST_LIBRARY}/cmake)
-+set(OPENCOLLADA_INST_INCLUDE ${CMAKE_INSTALL_FULL_INCLUDEDIR}/opencollada)
-+set(OPENCOLLADA_INST_LIBRARY ${CMAKE_INSTALL_FULL_LIBDIR}/opencollada)
-+set(OPENCOLLADA_INST_CMAKECONFIG ${CMAKE_INSTALL_FULL_LIBDIR}/opencollada/cmake)
- 
- 
- #-----------------------------------------------------------------------------
diff --git a/media-libs/opencollada/files/opencollada-1.2.2-no-undefined.patch b/media-libs/opencollada/files/opencollada-1.2.2-no-undefined.patch
deleted file mode 100644
index e3cbf0dbead9..000000000000
--- a/media-libs/opencollada/files/opencollada-1.2.2-no-undefined.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Source: https://build.opensuse.org/package/show/graphics/openCOLLADA
-
-Index: OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c/common/libBuffer/CMakeLists.txt
-===================================================================
---- OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c.orig/common/libBuffer/CMakeLists.txt
-+++ OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c/common/libBuffer/CMakeLists.txt
-@@ -28,7 +28,10 @@ set(SRC
- 	include/performanceTest/performanceTest.h
- )
- 
--set(TARGET_LIBS ftoa)
-+set(TARGET_LIBS
-+	ftoa
-+	UTF
-+)
- 
- include_directories(
- 	${libBuffer_include_dirs}
-Index: OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c/CMakeLists.txt
-===================================================================
---- OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c.orig/CMakeLists.txt
-+++ OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c/CMakeLists.txt
-@@ -244,10 +244,10 @@ else ()  # if pcre not found building it
- endif ()
- 
- # building required libs
-+add_subdirectory(${EXTERNAL_LIBRARIES}/UTF)                                    
-+add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver)
- add_subdirectory(common/libftoa)
- add_subdirectory(common/libBuffer)
--add_subdirectory(${EXTERNAL_LIBRARIES}/UTF)
--add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver)
- 
- # building OpenCOLLADA libs
- add_subdirectory(COLLADABaseUtils)
diff --git a/media-libs/opencollada/files/opencollada-1.2.2-soversion.patch b/media-libs/opencollada/files/opencollada-1.2.2-soversion.patch
deleted file mode 100644
index beef35545538..000000000000
--- a/media-libs/opencollada/files/opencollada-1.2.2-soversion.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source:
-https://build.opensuse.org/package/show/graphics/openCOLLADA
-
-diff -Naur OpenCOLLADA.orig/CMakeLists.txt OpenCOLLADA/CMakeLists.txt
---- OpenCOLLADA.orig/CMakeLists.txt	2013-08-10 02:00:51.000000000 -0500
-+++ OpenCOLLADA/CMakeLists.txt	2013-08-28 10:34:50.122102989 -0500
-@@ -77,7 +77,7 @@
- 			message(${name} " WARNING: Shared library support implemented for UNIX-like OS only")
- 		endif ()
- 		add_library(${name}_shared SHARED ${sources})
--		set_target_properties(${name}_shared PROPERTIES OUTPUT_NAME ${name})
-+		set_target_properties(${name}_shared PROPERTIES OUTPUT_NAME ${name} SOVERSION ${soversion})
- 		foreach(target_lib ${target_libs})
- 			if(TARGET ${target_lib}_shared)
- 				target_link_libraries(${name}_shared ${target_lib}_shared)
diff --git a/media-libs/opencollada/files/opencollada-build-fixes-v1.patch b/media-libs/opencollada/files/opencollada-build-fixes-v1.patch
deleted file mode 100644
index 171b45debb34..000000000000
--- a/media-libs/opencollada/files/opencollada-build-fixes-v1.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -purN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2017-01-07 18:10:57.214728093 +0000
-+++ b/CMakeLists.txt	2017-01-07 18:11:06.322736320 +0000
-@@ -37,12 +37,6 @@ cmake_policy(SET CMP0010 NEW)
- # Input directories must have CMakeLists.txt
- cmake_policy(SET CMP0014 NEW)
- 
--# avoid having empty buildtype
--set(CMAKE_BUILD_TYPE_INIT "Release")
--
--set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Only do Release and Debug" FORCE )
--mark_as_advanced(CMAKE_CONFIGURATION_TYPES)
--
- SET(CMAKE_DEBUG_POSTFIX ""  CACHE STRING "Add this string to as suffix to Debug libraries, e.g.: xml2_d.lib " )
- 
- #-----------------------------------------------------------------------------
-@@ -84,7 +78,7 @@ macro(opencollada_add_lib
- 			message(${name} " WARNING: Shared library support implemented for UNIX-like OS only")
- 		endif ()
- 		add_library(${name}_shared SHARED ${sources})
--		set_target_properties(${name}_shared PROPERTIES OUTPUT_NAME ${name})
-+		set_target_properties(${name}_shared PROPERTIES OUTPUT_NAME ${name} SOVERSION ${soversion})
- 		foreach(target_lib ${target_libs})
- 			if(TARGET ${target_lib}_shared)
- 				target_link_libraries(${name}_shared ${target_lib}_shared)
-@@ -158,6 +152,9 @@ set(OPENCOLLADA_VERSION_MINOR 1)
- set(OPENCOLLADA_VERSION_PATCH 0)
- set(OPENCOLLADA_VERSION ${OPENCOLLADA_VERSION_MAJOR}.${OPENCOLLADA_VERSION_MINOR}.${OPENCOLLADA_VERSION_PATCH})
- 
-+#-----------------------------------------------------------------------------
-+# Generic install paths
-+include(GNUInstallDirs)
- 
- #-----------------------------------------------------------------------------
- # Compiler warnings.
-@@ -190,9 +187,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
- #-----------------------------------------------------------------------------
- # Install vars
- 
--set(OPENCOLLADA_INST_INCLUDE ${CMAKE_INSTALL_PREFIX}/include/opencollada)
--set(OPENCOLLADA_INST_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/opencollada)
--set(OPENCOLLADA_INST_CMAKECONFIG ${OPENCOLLADA_INST_LIBRARY}/cmake)
-+set(OPENCOLLADA_INST_INCLUDE ${CMAKE_INSTALL_FULL_INCLUDEDIR}/opencollada)
-+set(OPENCOLLADA_INST_LIBRARY ${CMAKE_INSTALL_FULL_LIBDIR}/opencollada)
-+set(OPENCOLLADA_INST_CMAKECONFIG ${CMAKE_INSTALL_FULL_LIBDIR}/opencollada/cmake)
- 
- 
- #-----------------------------------------------------------------------------
-@@ -236,8 +233,7 @@ endif ()
- 
- if (USE_EXPAT)
- 	add_definitions(-DGENERATEDSAXPARSER_XMLPARSER_EXPAT)
--	message("FATAL: EXPAT support not implemented")
--	# TODO:: use externals
-+	set(LIBEXPAT_LIBRARIES expat)
- endif ()
- 
- if(USE_STATIC_MSVC_RUNTIME)
-@@ -270,10 +266,10 @@ else ()  # if pcre not found building it
- endif ()
- 
- # building required libs
-+add_subdirectory(${EXTERNAL_LIBRARIES}/UTF)                                    
-+add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver)
- add_subdirectory(common/libftoa)
- add_subdirectory(common/libBuffer)
--add_subdirectory(${EXTERNAL_LIBRARIES}/UTF)
--add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver)
- 
- # building OpenCOLLADA libs
- add_subdirectory(COLLADABaseUtils)
-diff -purN a/common/libBuffer/CMakeLists.txt b/common/libBuffer/CMakeLists.txt
---- a/common/libBuffer/CMakeLists.txt	2016-11-30 17:19:38.000000000 +0000
-+++ b/common/libBuffer/CMakeLists.txt	2017-01-07 18:05:50.306440325 +0000
-@@ -28,7 +28,10 @@ set(SRC
- 	include/performanceTest/performanceTest.h
- )
- 
--set(TARGET_LIBS ftoa)
-+set(TARGET_LIBS
-+	ftoa
-+	UTF
-+)
- 
- include_directories(
- 	${libBuffer_include_dirs}
diff --git a/media-libs/opencollada/metadata.xml b/media-libs/opencollada/metadata.xml
index 74eab2d217a9..48936abbe3fb 100644
--- a/media-libs/opencollada/metadata.xml
+++ b/media-libs/opencollada/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer restrict="&gt;=media-libs/opencollada-1.6.18" type="person">
+	<maintainer type="person">
 		<email>dracwyrm@gentoo.org</email>
 		<name>Jonathan Scruggs</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>office@gentoo.org</email>
-		<name>Gentoo Office project</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">KhronosGroup/OpenCOLLADA</remote-id>
 	</upstream>
diff --git a/media-libs/opencollada/opencollada-1.6.25.ebuild b/media-libs/opencollada/opencollada-1.6.25.ebuild
deleted file mode 100644
index 251fc86c83be..000000000000
--- a/media-libs/opencollada/opencollada-1.6.25.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils cmake-utils
-
-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="expat static-libs"
-
-# This is still needed to have so version numbers
-MY_SOVERSION="1.6"
-
-RDEPEND="dev-libs/libpcre
-	dev-libs/zziplib
-	media-libs/lib3ds
-	sys-libs/zlib
-	expat? ( dev-libs/expat )
-	!expat? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/OpenCOLLADA-${PV}
-# This is needed or you get an error on install
-BUILD_DIR="${S}"/build
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0_p864-expat.patch
-	"${FILESDIR}"/${PN}-1.2.2-soversion.patch
-	"${FILESDIR}"/${PN}-1.2.2-no-undefined.patch
-	"${FILESDIR}"/${PN}-1.2.2-libdir.patch
-)
-
-src_prepare() {
-	edos2unix CMakeLists.txt
-
-	default
-
-	# Remove bundled depends that have portage equivalents
-	rm -rv Externals/{expat,lib3ds,LibXML,pcre,zlib,zziplib} || die
-
-	# Remove unused build systems
-	rm -v Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die
-	find "${S}" -name SConscript -delete || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SHARED=ON
-		-DUSE_STATIC=$(usex static-libs ON OFF)
-		-DUSE_EXPAT=$(usex expat ON OFF)
-		-DUSE_LIBXML=$(usex !expat ON OFF)
-		-Dsoversion=${MY_SOVERSION}
-	)
-
-	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/bin/OpenCOLLADAValidator
-}
diff --git a/media-libs/opencollada/opencollada-1.6.31.ebuild b/media-libs/opencollada/opencollada-1.6.31.ebuild
deleted file mode 100644
index a79332a0edf4..000000000000
--- a/media-libs/opencollada/opencollada-1.6.31.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils cmake-utils
-
-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="expat static-libs"
-
-# This is still needed to have so version numbers
-MY_SOVERSION="1.6"
-
-RDEPEND="dev-libs/libpcre
-	dev-libs/zziplib
-	media-libs/lib3ds
-	sys-libs/zlib
-	expat? ( dev-libs/expat )
-	!expat? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/OpenCOLLADA-${PV}
-# This is needed or you get an error on install
-BUILD_DIR="${S}"/build
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0_p864-expat.patch
-	"${FILESDIR}"/${PN}-1.2.2-soversion.patch
-	"${FILESDIR}"/${PN}-1.2.2-no-undefined.patch
-	"${FILESDIR}"/${PN}-1.2.2-libdir.patch
-)
-
-src_prepare() {
-	edos2unix CMakeLists.txt
-
-	default
-
-	# Remove bundled depends that have portage equivalents
-	rm -rv Externals/{expat,lib3ds,LibXML,pcre,zlib,zziplib} || die
-
-	# Remove unused build systems
-	rm -v Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die
-	find "${S}" -name SConscript -delete || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SHARED=ON
-		-DUSE_STATIC=$(usex static-libs ON OFF)
-		-DUSE_EXPAT=$(usex expat ON OFF)
-		-DUSE_LIBXML=$(usex !expat ON OFF)
-		-Dsoversion=${MY_SOVERSION}
-	)
-
-	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/bin/OpenCOLLADAValidator
-}
diff --git a/media-libs/opencollada/opencollada-1.6.36.ebuild b/media-libs/opencollada/opencollada-1.6.36.ebuild
deleted file mode 100644
index 8389c5d0edd2..000000000000
--- a/media-libs/opencollada/opencollada-1.6.36.ebuild
+++ /dev/null
@@ -1,68 +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 versionator
-
-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"
-
-# This is still needed to have so version numbers
-MY_SOVERSION="$(get_version_component_range 1-2)"
-
-RDEPEND="dev-libs/libpcre
-	dev-libs/zziplib
-	media-libs/lib3ds
-	sys-libs/zlib
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/OpenCOLLADA-${PV}
-
-PATCHES=( "${FILESDIR}"/${PN}-build-fixes-v1.patch )
-
-src_prepare() {
-	edos2unix CMakeLists.txt
-
-	cmake-utils_src_prepare
-
-	# Remove bundled depends that have portage equivalents
-	rm -rv Externals/{expat,lib3ds,LibXML,pcre,zlib,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
-		-Dsoversion=${MY_SOVERSION}
-	)
-
-	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/OpenCOLLADAValidator"
-}