[gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/, media-libs/opencollada/files/

[Andreas Sturmlechner]

commit:     c116b96ca9e52ac260c8d9975e6f90c68065062c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 10 08:49:08 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 10 08:58:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c116b96c

media-libs/opencollada: Drop old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-libs/opencollada/Manifest                    |  3 -
 .../files/opencollada-0_p864-expat.patch           | 12 ---
 .../files/opencollada-1.2.2-libdir.patch           | 27 -------
 .../files/opencollada-1.2.2-no-undefined.patch     | 35 ---------
 .../files/opencollada-1.2.2-soversion.patch        | 15 ----
 .../files/opencollada-build-fixes-v1.patch         | 86 ----------------------
 media-libs/opencollada/opencollada-1.6.25.ebuild   | 74 -------------------
 media-libs/opencollada/opencollada-1.6.31.ebuild   | 74 -------------------
 media-libs/opencollada/opencollada-1.6.36.ebuild   | 68 -----------------
 9 files changed, 394 deletions(-)

diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index 536be7f94eb..9bf5a7379e3 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -1,5 +1,2 @@
-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

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 9086acf7921..00000000000
--- 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 cc413f3eded..00000000000
--- 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 e3cbf0dbead..00000000000
--- 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 beef3554553..00000000000
--- 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 171b45debb3..00000000000
--- 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/opencollada-1.6.25.ebuild b/media-libs/opencollada/opencollada-1.6.25.ebuild
deleted file mode 100644
index 251fc86c83b..00000000000
--- 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 a79332a0edf..00000000000
--- 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 8389c5d0edd..00000000000
--- 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"
-}