reinit the tree, so we can have metadata

12 files changed, 551 insertions, 0 deletions

diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
new file mode 100644
index 000000000000..6167e2b735d1
--- /dev/null
+++ b/media-libs/opencollada/Manifest
@@ -0,0 +1,17 @@
+AUX opencollada-0_p864-expat.patch 353 SHA256 e7d7f303921b09db1b92a0299ad464d6185ac1f470e028829443785ed98bf1a2 SHA512 f407314eeed7a7caeef674e9cfd9029cb82f29b608b83e971b4662594842a1e0fe1f81e3aa6928cb537460da17e7768a7ee70af2c5464d7224eec3d14b7f1a37 WHIRLPOOL 750f698a05db378add3c13e882d57c349e671e01b71d7d200afcf4605a494681c5af4e5ef95da528a0bfd6d8498eba7aa5186181804e83b9ce1c9d61b52d932f
+AUX opencollada-1.2.2-libdir.patch 1258 SHA256 778d931d652275bd6b5425c3e75fcfa1c4330ef35238910020cb0514b7950708 SHA512 28798609b2ca3daef7fe657cd1d086953b6834612d6857696516f805977298fd2f67507d1288bfb3afef57a55828b11370d933e33e3857502c04b56b6fec5481 WHIRLPOOL 9a6a9da814848df74b7504de0f24e884c791ddf22b63ad114aebbfe09f6fc0c341613eaad0e2086a2722ecc95ca0d47320b663c020c86196bcd0f4e677fc148b
+AUX opencollada-1.2.2-no-undefined.patch 1361 SHA256 5d86f5c509518b85da59fb261fb0f1fb0cb74e6e8f5bda01c5a30f2bf6dc986d SHA512 7ca496722fb6c7734dc82c2bba9dff28753f4ecdf361f74bc5cc96c49ab1dacc7accc8e4834e1ecdbc9d7b2a8ccf236f5c606c6a7a670baed2c43cfd0afa8ea3 WHIRLPOOL 71313f93faf353e6f52f79a7a11df6dc32104a4c09a2d0c2d08cfd2b30fb5b877720ed777fc2be07d06d3d0251312135fb0542258b614fa9696f35c4ae26eb64
+AUX opencollada-1.2.2-soversion.patch 753 SHA256 c18a4867f61ea9ab386818494c9249ada4e05bd27abd899849884ab8f9d15518 SHA512 891b0c63400c65929e72a2e78b331f5b94ef319c3a533b63194f52788bbc8f087a38589442b7a13c606db6188e381d036fb3d9241006fae9298f351012060a2c WHIRLPOOL 2d78e538c42750a08a4629b2949a27a7bea6422e31a71a51e59ad4ba8d1b992cc8855b76fa2235a8b714e2328c4ba5945029c54ce512cc4cde6f105d47517933
+AUX opencollada-build-fixes-v1.patch 3454 SHA256 a2f46a72b13900f4306d9a58edc8e2c7b92a96e4c146629f76cac385290db615 SHA512 5c15d67f221400aa08f9542970730230018261af7ddfc5310ee689019f0986e1fa0385c16b58a78ea041a900e51d2e85fd70ebb857fc808499fc0cc69503285b WHIRLPOOL b30c4398f5e408ae0f3b0233dcf2814701938061b0321801b4561ad3064f93566573bb95fdd036f7482bd44fc71fc4d814bf24e0bbac8054182c4ab040a1d361
+AUX opencollada-build-fixes-v3.patch 2571 SHA256 7a1ed776cf29aaea83263d1a26f59346e43d454e0c10a3a980d8da849187184a SHA512 6c92e1d442543116fee6b0031c0330c497cf69a7bb1efd9bb9dfd6b37a07761ac6e4eca7939514fb7c96774743d215fc0f9ef678e0c3e0fea903773d7666de01 WHIRLPOOL 3650aca8a6ab0b167d1e29274982ee39a87a7bbf8751cf026d6f316d2c105a8d475f857affb4696f3d7b6080ecaf971c7a766c4ff7191d59aa80fec056c0b5f8
+DIST opencollada-1.6.25.tar.gz 11817949 SHA256 9cea5c85164758b01ac0d5c37ea10373a0d1fc7eba1e5d9dea9ba4af8aa6dca9 SHA512 48ede841d43beddbaa153899e2a1eb45d875c468536b276f6b9cb80a84b90b16ca376fb2fbc68a7f25f4908ef94a376c431ed7e94e7c6657afe60464f067a00e WHIRLPOOL e074a66424e66b98476d40f7c525a4e05e0e5537efc7c695f0e1b9099a51bd8d4645ce7a2ceae646607c7399446f22098a93dbc0bcf8c49013a49940f5737d87
+DIST opencollada-1.6.31.tar.gz 11832790 SHA256 ef338d03646da3039cf67382b19f39fe51aa638e05213ba9ad6a41f8069ad683 SHA512 6290600bed59fef72c4986a9d00683ae1bfedf6811a44fb9e05e1a46e4ceaee7585c2281918f0a491369e49b01d3dfab0eb38b3e0728f96fe8264a80ca28d8c9 WHIRLPOOL 6ad70665178e54bd93c431c6fe6c03800fc62a99e845c54a502d21e995b77dd6d1f5624aa2d70a03ba271bdfb5d60a0b9b9ac876ab8a14e14308458eea1118ab
+DIST opencollada-1.6.36.tar.gz 12275972 SHA256 774b41611ab3ebb3a6008d32bcfd326d4ac1545d5316ba383b4ae90f16335701 SHA512 bcee958d229a6d28043afd6dbe2e8536668ce57b510d2759ef68420aa9ac5b8f82ab5956fbcef7ecc6177ad5f0f20c9a7364a886236e583c85215de86f7066f8 WHIRLPOOL 2184e01d903f662afa94369445336d510bcc9a5f9e1a54677476d41cf920052f9fab5190e8f2c2ddc775ee0062e7cbb5f0a1c1b120d2476217ff78ccd9c38b8b
+DIST opencollada-1.6.58.tar.gz 12088428 SHA256 13ce6e8f6162683afba4b1c5b3dfc752db3ded382da7b88bda48982db4941c8b SHA512 122b841de28f82408bc6fe9d363894ab8f9033cfed949f8028b7a35445e3361f0df583d8b18f7198eaa9dbf3ad33b52dbe5fe6a7e652494789850effcbbf22c9 WHIRLPOOL 4b0cda528494348769c861bc166403c673d59fffc844710dffa1ab0b0aca1fd36e3ea92c7a140f3d80653f0d4d9d268e4b35f898496729cdb1bbe262f765bc3f
+EBUILD opencollada-1.6.25.ebuild 1691 SHA256 d41d410c2fa1ba7b3a8a69b69d545f9d2893f86a34d700e22b5c18872d297d8b SHA512 9bb7fc28114378b7691bb45ac6a5d8f4345509c1833f9f20e7cf7437748208133a324e02704f16fb8de97cd60d87bf4239de2f7da0bd98a7ef08324df3de4620 WHIRLPOOL 67f5b681963376ca24082780169eebf4edfa9c7d4a3a798ede6f314d49e1314cac42159c5ebc1715aeb34180547b17fa1493a22c5a398a179242834878db7507
+EBUILD opencollada-1.6.31.ebuild 1694 SHA256 065dca6311bf829cef236431cddefc58e13f2f47422163075bdf9865e078868e SHA512 50ebec5252f221d3b54b1e2799ad9ef7ee03f4eee99f3383c26a7c79f0e0aecffeef240776f02ff94f5bd5fa24008cd11569f4bcb3da851a3e55df9dc488a12c WHIRLPOOL 4fc2a73b48fffe14c1d7cd66e39c8d8fb28f176611baa1e8600c56653e15b62fc57817a3de46ebd218283df8082dadada17112072d666101561eede00e574d6e
+EBUILD opencollada-1.6.36.ebuild 1450 SHA256 d9a6c9d9d010fd4227a4d32ed64c58641b9f40e17902ec3e1b7dabb9c0920a3c SHA512 0f4357b0bf777a4a99fb42c12c79a4941c4042f04fdb5125e4267ba999b6b54c356d7a45de39058b55bff1efd101916c5689dd4491bde2c3f5c668cf6382bf0d WHIRLPOOL ffc6524a918dbdcd5ed69fa3b0bdf0c295407ec19d7469e5abffd56218e91a99703ce6e892c854be441d5499c1d1d2f022b3c0e70a75bc920c5b34df34ae8b76
+EBUILD opencollada-1.6.58.ebuild 1702 SHA256 d5859bb6a9bde9806886748c5a64ecd4a92c94dd1c3650d88526f51aae4295e6 SHA512 95eda5f2fbe7aa0106c17393568c209142aa1f53eda81f8a765a07871a808377e828a940b2978ac280cbe93566cf9fb6ba3d93602f8d6fc217bcc74e09bb2fea WHIRLPOOL de22876c0d6f775a3b375acf54f26431f059572bf1817e5b4c4350767ac33ff9033a7a62e9a07eac9a893f6bcba82f6589dcd68ddbff508aef86ee3e9d6faa4e
+MISC ChangeLog 6664 SHA256 fcf2665568528b9870e0d87f0dbdb9eff34ce22a33a8d0babe362fb14043633c SHA512 b370d1f7ae9e5d10d9a3640cd9b17dcf9811f69bbd92b6b3becca0efbdc90a38da3d550e47781978bd40ccac0a0a0b9f69b854e952fde0e150e32e9bd3a743b0 WHIRLPOOL 8255006d88dc3a0c01ddeb07d6d860e78282484aef3d2159eac6ad76ea2c5020e396aaab9c5ca1c8e07ee811912b3ef86dce06bcf84df5fc1e906148a8247070
+MISC ChangeLog-2015 2481 SHA256 728239c63aa9e1d8458b26203dc589abc2ea6815e1a8b880fb02d0b90da3d2b9 SHA512 dc8338913930a3bb45071feb37bf54fe525e2cebc652119598cc2269ad826f51052f3b36c8d38c1ecb53f078410393a90539a5587660796778682b7ed7cfed21 WHIRLPOOL 5c5aa6a7e2d75276d90de9f38d38dba45f824d4f2e1095bd778f9acc3b9a17e3cb7e7bb7ae332541eec0513b5ff1a419aabb907d5f207dbbf79c2e7430132476
+MISC metadata.xml 619 SHA256 fd6776ce5b0bb865dab13840509a381aa74a9315a7c2db82d2e7f662ded64fb2 SHA512 34b215a39874db328d26e9c03740672f701d6c9398a7cac50de7f42b9f6cc854ee4b04358d4afeab3966839f401189ad329b4376c977b80c94973838e08c0f63 WHIRLPOOL 06dbe92d55543363f363f160add16cbd898e57ee7e8370e0f9b0bde44bb99a50be92dff4e92a78bedc4aa454cfacb7ee1f099db76409e213a6f6f8453ae93edb
diff --git a/media-libs/opencollada/files/opencollada-0_p864-expat.patch b/media-libs/opencollada/files/opencollada-0_p864-expat.patch
new file mode 100644
index 000000000000..9086acf79214
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-0_p864-expat.patch
@@ -0,0 +1,12 @@
+--- 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
new file mode 100644
index 000000000000..cc413f3ededc
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-1.2.2-libdir.patch
@@ -0,0 +1,27 @@
+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
new file mode 100644
index 000000000000..e3cbf0dbead9
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-1.2.2-no-undefined.patch
@@ -0,0 +1,35 @@
+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
new file mode 100644
index 000000000000..beef35545538
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-1.2.2-soversion.patch
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 000000000000..171b45debb34
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-build-fixes-v1.patch
@@ -0,0 +1,86 @@
+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/files/opencollada-build-fixes-v3.patch b/media-libs/opencollada/files/opencollada-build-fixes-v3.patch
new file mode 100644
index 000000000000..a0e055dfc351
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-build-fixes-v3.patch
@@ -0,0 +1,58 @@
+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)
diff --git a/media-libs/opencollada/metadata.xml b/media-libs/opencollada/metadata.xml
new file mode 100644
index 000000000000..38856eeebcd5
--- /dev/null
+++ b/media-libs/opencollada/metadata.xml
@@ -0,0 +1,19 @@
+<?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">
+		<email>j.scruggs@gmail.com</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>
+	<upstream>
+		<remote-id type="github">KhronosGroup/OpenCOLLADA</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-libs/opencollada/opencollada-1.6.25.ebuild b/media-libs/opencollada/opencollada-1.6.25.ebuild
new file mode 100644
index 000000000000..251fc86c83be
--- /dev/null
+++ b/media-libs/opencollada/opencollada-1.6.25.ebuild
@@ -0,0 +1,74 @@
+# 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
new file mode 100644
index 000000000000..a79332a0edf4
--- /dev/null
+++ b/media-libs/opencollada/opencollada-1.6.31.ebuild
@@ -0,0 +1,74 @@
+# 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
new file mode 100644
index 000000000000..4646fb614e53
--- /dev/null
+++ b/media-libs/opencollada/opencollada-1.6.36.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 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"
+
+# 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() {
+	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"
+}
diff --git a/media-libs/opencollada/opencollada-1.6.58.ebuild b/media-libs/opencollada/opencollada-1.6.58.ebuild
new file mode 100644
index 000000000000..dfeb12a445ee
--- /dev/null
+++ b/media-libs/opencollada/opencollada-1.6.58.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 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"
+
+# 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-v3.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
+		-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/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"
+}