gentoo resync : 31.01.2018

4 files changed, 192 insertions, 6 deletions

diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index 6bb37ef9e4bf..296f2aef94b6 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -2,14 +2,17 @@ AUX opencollada-0_p864-expat.patch 353 BLAKE2B 6073e228061ec7b7cac27f0fe23325a65
 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 1450 BLAKE2B 936aac1d783a849c9fdf12c119cd1d3ff1eca0f3224be95d8b7cefc40a52106ffd41ea6fd8cbab1070a07f85bca638d9950e9c539a703575cfbf4c0e3436ec67 SHA512 0f4357b0bf777a4a99fb42c12c79a4941c4042f04fdb5125e4267ba999b6b54c356d7a45de39058b55bff1efd101916c5689dd4491bde2c3f5c668cf6382bf0d
 EBUILD opencollada-1.6.58.ebuild 1700 BLAKE2B b8bb86142d4cbc23814591037a1003a8332dfb60a9848d77d260276ec29ee8cf3547e635144bcf44e79e19ad245f277f515d8ae7944855da0e9e61730023935a SHA512 16d5478d28ee418899ad076ad97687530b26277bcc6d51028f3fb92365103dc2f2d184cafc399c3c0c6070a67f1d50d87ffa35cda491758c28baf49cc15f4f88
-MISC metadata.xml 619 BLAKE2B 5ed900b5400230826b5fbb833312b656eaae9f0c3a5376091ded5db6d90e3d8e5d12d8336b3d2229fb8b298f4c6cc1db717ce5281c749e5c77043609cf09ece9 SHA512 34b215a39874db328d26e9c03740672f701d6c9398a7cac50de7f42b9f6cc854ee4b04358d4afeab3966839f401189ad329b4376c977b80c94973838e08c0f63
+EBUILD opencollada-1.6.62.ebuild 1565 BLAKE2B bf2b5f041bb828ba4ebfb94b5fd402bb805b9da0d84826f2f67c982dfb6b6084293bf334e405ef51144a568509aa541cd8db7cbca294a6dc18c1150e5c55a958 SHA512 23c2e7b1524a501757082168c02b7f3db25e97fe8226f6aa6830ef5f6d67ac1047b0c6a9b8352b0d5001ce274990d59f8448425df523c3379202a61f4fc855bc
+MISC metadata.xml 502 BLAKE2B e90b34a1114955b06cb241d4b749d2e21e865fb09f25234a8618e23d704abe05b1aec7b3e2845db2c339c901315610f7e2062be08e2bb65ceaa3f0f8b12b0edb SHA512 a3ce2d18f67d4762f6081d523c619cc3e46b0c4a882cbca1d5d90b809f73a80896fb7b1759a2e4aaf20bef958d08a57977840d6452819c4e2966aefe698dca49
diff --git a/media-libs/opencollada/files/opencollada-1.6.62-cmake-fixes.patch b/media-libs/opencollada/files/opencollada-1.6.62-cmake-fixes.patch
new file mode 100644
index 000000000000..8fc32784daa7
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-1.6.62-cmake-fixes.patch
@@ -0,0 +1,122 @@
+From c3ed65c2c60b8744163b3a57cf24469e688536dd Mon Sep 17 00:00:00 2001
+From: Jonathan Scruggs <j.scruggs@gmail.com>
+Date: Sat, 13 Jan 2018 11:54:44 +0000
+Subject: [PATCH] OpenCOLLADA/CMakeLists.txt
+
+Use CMAKE_BUILD_TYPE which can be overrided with custom distro types
+
+Adhere to GNU filesystem layout conventions. Not all distros and OSes
+have directories in the same locations and they define the
+GNUInstallDirs variables, so use those variables. Also, this enables
+multi lib installations.
+
+Define the version variables to enable SONAME versioning on the
+library files in case there is ABI changes in the future.
+---
+ CMakeLists.txt | 58 ++++++++++++++++++++++++++++++++++++----------------------
+ 1 file changed, 36 insertions(+), 22 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 95abbe21..00ad8d6a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -37,14 +37,41 @@ 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 Release type for builds where CMAKE_BUILD_TYPE is unset
++# This is usually a good default as this implictly enables
++#
++#   CXXFLAGS = -O3 -DNDEBUG
++#
++if( NOT CMAKE_BUILD_TYPE )
++	set( CMAKE_BUILD_TYPE "Release" )
++endif()
+ 
+ SET(CMAKE_DEBUG_POSTFIX ""  CACHE STRING "Add this string to as suffix to Debug libraries, e.g.: xml2_d.lib " )
+ 
++# Adhere to GNU filesystem layout conventions
++include( GNUInstallDirs )
++
++
++# #-----------------------------------------------------------------------------
++# Initialize project.
++
++project(OPENCOLLADA)  # must be after setting cmake_configuration_types
++
++set(EXTERNAL_LIBRARIES        	   ${OPENCOLLADA_SOURCE_DIR}/Externals)  # external libraries
++set(CMAKE_MODULE_PATH "${EXTERNAL_LIBRARIES}/cmake-modules")
++
++set(OPENCOLLADA_VERSION_MAJOR 1)
++set(OPENCOLLADA_VERSION_MINOR 6)
++set(OPENCOLLADA_VERSION_PATCH 62)
++set(OPENCOLLADA_VERSION ${OPENCOLLADA_VERSION_MAJOR}.${OPENCOLLADA_VERSION_MINOR}.${OPENCOLLADA_VERSION_PATCH})
++
++if(NOT SOVERSION)
++	set(SOVERSION ${OPENCOLLADA_VERSION_MAJOR}.${OPENCOLLADA_VERSION_MINOR}
++		CACHE STRING "Set the SO version in the SO name of the output library")
++endif()
++
++
+ #-----------------------------------------------------------------------------
+ # Macro's
+ 
+@@ -58,7 +85,7 @@ macro(opencollada_add_lib
+ 
+ 	if (USE_STATIC)
+ 		add_library(${name}_static STATIC ${sources})
+-		set_target_properties(${name}_static PROPERTIES OUTPUT_NAME ${name})
++		set_target_properties(${name}_static PROPERTIES OUTPUT_NAME ${name} SOVERSION ${SOVERSION})
+ 		foreach(target_lib ${target_libs})
+ 			if(TARGET ${target_lib}_static)
+ 				target_link_libraries(${name}_static ${target_lib}_static)
+@@ -84,7 +111,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)
+@@ -145,19 +172,6 @@ endmacro()
+ # end copy
+ # --------
+ 
+-#-----------------------------------------------------------------------------
+-# Initialize project.
+-
+-project(OPENCOLLADA)  # must be after setting cmake_configuration_types
+-
+-set(EXTERNAL_LIBRARIES        	   ${OPENCOLLADA_SOURCE_DIR}/Externals)  # external libraries
+-set(CMAKE_MODULE_PATH "${EXTERNAL_LIBRARIES}/cmake-modules")
+-
+-set(OPENCOLLADA_VERSION_MAJOR 0)
+-set(OPENCOLLADA_VERSION_MINOR 1)
+-set(OPENCOLLADA_VERSION_PATCH 0)
+-set(OPENCOLLADA_VERSION ${OPENCOLLADA_VERSION_MAJOR}.${OPENCOLLADA_VERSION_MINOR}.${OPENCOLLADA_VERSION_PATCH})
+-
+ 
+ #-----------------------------------------------------------------------------
+ # Compiler warnings.
+@@ -190,9 +204,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}/cmake/OpenCOLLADA)
+ 
+ 
+ #-----------------------------------------------------------------------------
+-- 
+2.15.1
+
diff --git a/media-libs/opencollada/metadata.xml b/media-libs/opencollada/metadata.xml
index 38856eeebcd5..74eab2d217a9 100644
--- a/media-libs/opencollada/metadata.xml
+++ b/media-libs/opencollada/metadata.xml
@@ -2,14 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer restrict="&gt;=media-libs/opencollada-1.6.18" type="person">
-		<email>j.scruggs@gmail.com</email>
+		<email>dracwyrm@gentoo.org</email>
 		<name>Jonathan Scruggs</name>
 	</maintainer>
 	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="project">
 		<email>office@gentoo.org</email>
 		<name>Gentoo Office project</name>
 	</maintainer>
diff --git a/media-libs/opencollada/opencollada-1.6.62.ebuild b/media-libs/opencollada/opencollada-1.6.62.ebuild
new file mode 100644
index 000000000000..4a0d0c352bd3
--- /dev/null
+++ b/media-libs/opencollada/opencollada-1.6.62.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils 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"
+
+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}/${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() {
+	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"
+}