From a021ce9109098d7848b20865bdd25e3fc2265264 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <chewi@gentoo.org>
Date: Wed, 2 Oct 2019 21:47:57 +0100
Subject: media-libs/opencollada: Drop bogus media-libs/lib3ds dep

We don't build the part of the code that uses it. The dep was wrong
anyway as it should restrict to v2.

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
---
 .../opencollada/opencollada-1.6.63-r1.ebuild       | 72 +++++++++++++++++++++
 media-libs/opencollada/opencollada-1.6.63.ebuild   | 73 ----------------------
 2 files changed, 72 insertions(+), 73 deletions(-)
 create mode 100644 media-libs/opencollada/opencollada-1.6.63-r1.ebuild
 delete mode 100644 media-libs/opencollada/opencollada-1.6.63.ebuild

(limited to 'media-libs/opencollada')

diff --git a/media-libs/opencollada/opencollada-1.6.63-r1.ebuild b/media-libs/opencollada/opencollada-1.6.63-r1.ebuild
new file mode 100644
index 000000000000..f83d0770c2fd
--- /dev/null
+++ b/media-libs/opencollada/opencollada-1.6.63-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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"
+
+RDEPEND="dev-libs/libpcre
+	dev-libs/libxml2
+	dev-libs/zziplib
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/OpenCOLLADA-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.6.62-cmake-fixes.patch"
+	"${FILESDIR}/${P}-pcre-fix.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.ebuild b/media-libs/opencollada/opencollada-1.6.63.ebuild
deleted file mode 100644
index ad9d4681dfa8..000000000000
--- a/media-libs/opencollada/opencollada-1.6.63.ebuild
+++ /dev/null
@@ -1,73 +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"
-
-RDEPEND="dev-libs/libpcre
-	dev-libs/libxml2
-	dev-libs/zziplib
-	media-libs/lib3ds
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/OpenCOLLADA-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.6.62-cmake-fixes.patch"
-	"${FILESDIR}/${P}-pcre-fix.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"
-}
-- 
cgit v1.2.3-65-gdbad