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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2016-06-12 18:16 Amy Winston
  0 siblings, 0 replies; 30+ messages in thread
From: Amy Winston @ 2016-06-12 18:16 UTC (permalink / raw
  To: gentoo-commits

commit:     ba69f3c530abd0647079cbbec2ba1ec565bba288
Author:     dracwyrm <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Sun Jun 12 17:28:27 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Jun 12 18:05:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba69f3c5

media-libs/opencollada: Update metadata.xml with new maintainers

Closes: #1614

 media-libs/opencollada/.metadata.xml.kate-swp | Bin 0 -> 266 bytes
 media-libs/opencollada/metadata.xml           |   5 +++++
 2 files changed, 5 insertions(+)

diff --git a/media-libs/opencollada/.metadata.xml.kate-swp b/media-libs/opencollada/.metadata.xml.kate-swp
new file mode 100644
index 0000000..f3fe4f4
Binary files /dev/null and b/media-libs/opencollada/.metadata.xml.kate-swp differ

diff --git a/media-libs/opencollada/metadata.xml b/media-libs/opencollada/metadata.xml
index e990651..25b3c8e 100644
--- a/media-libs/opencollada/metadata.xml
+++ b/media-libs/opencollada/metadata.xml
@@ -1,6 +1,11 @@
 <?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>
+		<description>Proxy maintainer</description>
+	</maintainer>
 	<maintainer type="project">
 		<email>office@gentoo.org</email>
 		<name>Gentoo Office project</name>


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2021-03-05 18:39 Sam James
  0 siblings, 0 replies; 30+ messages in thread
From: Sam James @ 2021-03-05 18:39 UTC (permalink / raw
  To: gentoo-commits

commit:     e0bfb3f56f2e3d847497db5ca3cce522f2c9194e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  5 18:38:43 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar  5 18:38:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0bfb3f5

media-libs/opencollada: Keyword 1.6.68 arm64, #556758

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/opencollada/opencollada-1.6.68.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/opencollada/opencollada-1.6.68.ebuild b/media-libs/opencollada/opencollada-1.6.68.ebuild
index ec8c164459a..c6347454a3d 100644
--- a/media-libs/opencollada/opencollada-1.6.68.ebuild
+++ b/media-libs/opencollada/opencollada-1.6.68.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="static-libs"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2021-02-28 15:39 Sam James
  0 siblings, 0 replies; 30+ messages in thread
From: Sam James @ 2021-02-28 15:39 UTC (permalink / raw
  To: gentoo-commits

commit:     11d354a3f808a413f427bbcee318aafd956285c5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 15:39:39 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 15:39:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11d354a3

media-libs/opencollada: Stabilize 1.6.68 x86, #773382

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/opencollada/opencollada-1.6.68.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/opencollada/opencollada-1.6.68.ebuild b/media-libs/opencollada/opencollada-1.6.68.ebuild
index 052b698c1e3..ec8c164459a 100644
--- a/media-libs/opencollada/opencollada-1.6.68.ebuild
+++ b/media-libs/opencollada/opencollada-1.6.68.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE="static-libs"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2021-02-22  7:12 Sam James
  0 siblings, 0 replies; 30+ messages in thread
From: Sam James @ 2021-02-22  7:12 UTC (permalink / raw
  To: gentoo-commits

commit:     adffef1868df7f8727e7ae777fda567362ce950c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 22 07:12:27 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 07:12:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adffef18

media-libs/opencollada: Keyword 1.6.68 arm, #556758

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/opencollada/opencollada-1.6.68.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/opencollada/opencollada-1.6.68.ebuild b/media-libs/opencollada/opencollada-1.6.68.ebuild
index 9be28a0a789..052b698c1e3 100644
--- a/media-libs/opencollada/opencollada-1.6.68.ebuild
+++ b/media-libs/opencollada/opencollada-1.6.68.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 ~x86"
 IUSE="static-libs"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2020-11-08 10:29 Sam James
  0 siblings, 0 replies; 30+ messages in thread
From: Sam James @ 2020-11-08 10:29 UTC (permalink / raw
  To: gentoo-commits

commit:     7daf670e695600845f67d96e8c1f602cf730887e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  8 10:28:21 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov  8 10:28:21 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7daf670e

media-libs/opencollada: Stabilize 1.6.68 amd64, #746740

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/opencollada/opencollada-1.6.68.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/opencollada/opencollada-1.6.68.ebuild b/media-libs/opencollada/opencollada-1.6.68.ebuild
index f5f42819616..9be28a0a789 100644
--- a/media-libs/opencollada/opencollada-1.6.68.ebuild
+++ b/media-libs/opencollada/opencollada-1.6.68.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 IUSE="static-libs"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2020-02-16 20:24 David Seifert
  0 siblings, 0 replies; 30+ messages in thread
From: David Seifert @ 2020-02-16 20:24 UTC (permalink / raw
  To: gentoo-commits

commit:     bf9da5af0d2b8c2fdc562d1b4e71ad60f87994a2
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 16 20:23:50 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 20:23:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf9da5af

media-libs/opencollada: [QA] inherit eutils.eclass directly

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 media-libs/opencollada/opencollada-1.6.63-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/opencollada/opencollada-1.6.63-r1.ebuild b/media-libs/opencollada/opencollada-1.6.63-r1.ebuild
index f5f83c83343..1ed2b159eba 100644
--- a/media-libs/opencollada/opencollada-1.6.63-r1.ebuild
+++ b/media-libs/opencollada/opencollada-1.6.63-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils flag-o-matic
+inherit cmake-utils eutils flag-o-matic
 
 DESCRIPTION="Stream based read/write library for COLLADA files"
 HOMEPAGE="http://www.opencollada.org/"


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2020-02-13 14:19 Lars Wendler
  0 siblings, 0 replies; 30+ messages in thread
From: Lars Wendler @ 2020-02-13 14:19 UTC (permalink / raw
  To: gentoo-commits

commit:     8e1b4316d1965cc5186d6ba5a41bc580bea4aedf
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 13 14:16:48 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 14:18:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e1b4316

media-libs/opencollada: Version 1.6.63-r1 stable for amd64 and x86

Package-Manager: Portage-2.3.88, Repoman-2.3.20
RepoMan-Options: --force
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-libs/opencollada/opencollada-1.6.63-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/opencollada/opencollada-1.6.63-r1.ebuild b/media-libs/opencollada/opencollada-1.6.63-r1.ebuild
index f83d0770c2f..f5f83c83343 100644
--- a/media-libs/opencollada/opencollada-1.6.63-r1.ebuild
+++ b/media-libs/opencollada/opencollada-1.6.63-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="static-libs"
 
 RDEPEND="dev-libs/libpcre


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2020-02-13 14:19 Lars Wendler
  0 siblings, 0 replies; 30+ messages in thread
From: Lars Wendler @ 2020-02-13 14:19 UTC (permalink / raw
  To: gentoo-commits

commit:     3c9f281f62ec52cd605f3bb1bb2e8a21bbc56c70
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 13 14:18:37 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 14:18:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c9f281f

media-libs/opencollada: Removed old

Closes: https://bugs.gentoo.org/682448
Closes: https://bugs.gentoo.org/651756
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-libs/opencollada/Manifest                  |  1 -
 media-libs/opencollada/opencollada-1.6.62.ebuild | 69 ------------------------
 2 files changed, 70 deletions(-)

diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index 1c02174cac4..36517929a02 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -1,2 +1 @@
-DIST opencollada-1.6.62.tar.gz 12094443 BLAKE2B 6cd0ec893fc212bf3e8f166ad9c51c894dc298a3627e65dd41ece850a5638d91b8839830d5456bf3ba072a0b23f8c01247d8c676cc79d98464cdf0c1b55fd3c5 SHA512 bd39406b9a833409303ef7cd4e93beee0675fa57c267af95a34699348a81650d50ae042dbb1837cd41c72433533a3a9b827a44e9775a5b06c7c4f1a351146574
 DIST opencollada-1.6.63.tar.gz 12094044 BLAKE2B dbe38ab2976f72d47a38bd147e05a58555acc2b70618d4d47d2beff87ace54f7fcd2f116b9ba9908cfb38b5699e547375e902128c2f378c295308f1601a18b17 SHA512 e1b92e932d0256224b026281fb5691219c5171f57b968307288b6e5481b5d6fee39825702e18017055bd0fb0e3d4c40b6ce526d3ce4defe2994138db54220d01

diff --git a/media-libs/opencollada/opencollada-1.6.62.ebuild b/media-libs/opencollada/opencollada-1.6.62.ebuild
deleted file mode 100644
index a0c55233ca3..00000000000
--- a/media-libs/opencollada/opencollada-1.6.62.ebuild
+++ /dev/null
@@ -1,69 +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"
-
-# bug 651756
-RDEPEND="<dev-libs/libpcre-8.42
-	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() {
-	# 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"
-}


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2019-10-02 20:48 James Le Cuirot
  0 siblings, 0 replies; 30+ messages in thread
From: James Le Cuirot @ 2019-10-02 20:48 UTC (permalink / raw
  To: gentoo-commits

commit:     a021ce9109098d7848b20865bdd25e3fc2265264
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  2 20:47:57 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Oct  2 20:47:57 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a021ce91

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 <AT> gentoo.org>

 .../{opencollada-1.6.63.ebuild => opencollada-1.6.63-r1.ebuild}        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/media-libs/opencollada/opencollada-1.6.63.ebuild b/media-libs/opencollada/opencollada-1.6.63-r1.ebuild
similarity index 96%
rename from media-libs/opencollada/opencollada-1.6.63.ebuild
rename to media-libs/opencollada/opencollada-1.6.63-r1.ebuild
index ad9d4681dfa..f83d0770c2f 100644
--- a/media-libs/opencollada/opencollada-1.6.63.ebuild
+++ b/media-libs/opencollada/opencollada-1.6.63-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,6 @@ IUSE="static-libs"
 RDEPEND="dev-libs/libpcre
 	dev-libs/libxml2
 	dev-libs/zziplib
-	media-libs/lib3ds
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2019-06-12 10:37 Andreas Sturmlechner
  0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2019-06-12 10:37 UTC (permalink / raw
  To: gentoo-commits

commit:     4dd9f4457d2f62cd4a382b8af586a4eb8851675e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 10:34:38 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 12 10:37:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dd9f445

media-libs/opencollada: Drop 1.6.58

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/opencollada/Manifest                  |  1 -
 media-libs/opencollada/opencollada-1.6.58.ebuild | 72 ------------------------
 2 files changed, 73 deletions(-)

diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index 9fa5fa9dfa6..1c02174cac4 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -1,3 +1,2 @@
-DIST opencollada-1.6.58.tar.gz 12088428 BLAKE2B ef5da3eae1c7f4ffd5abf4f93fd9ae1399d7eb3d470ebf4d3c042562d654b6dbcab3010d64250ff9701bd2b1e310178ab2430ed59b3f774a610619e723786961 SHA512 122b841de28f82408bc6fe9d363894ab8f9033cfed949f8028b7a35445e3361f0df583d8b18f7198eaa9dbf3ad33b52dbe5fe6a7e652494789850effcbbf22c9
 DIST opencollada-1.6.62.tar.gz 12094443 BLAKE2B 6cd0ec893fc212bf3e8f166ad9c51c894dc298a3627e65dd41ece850a5638d91b8839830d5456bf3ba072a0b23f8c01247d8c676cc79d98464cdf0c1b55fd3c5 SHA512 bd39406b9a833409303ef7cd4e93beee0675fa57c267af95a34699348a81650d50ae042dbb1837cd41c72433533a3a9b827a44e9775a5b06c7c4f1a351146574
 DIST opencollada-1.6.63.tar.gz 12094044 BLAKE2B dbe38ab2976f72d47a38bd147e05a58555acc2b70618d4d47d2beff87ace54f7fcd2f116b9ba9908cfb38b5699e547375e902128c2f378c295308f1601a18b17 SHA512 e1b92e932d0256224b026281fb5691219c5171f57b968307288b6e5481b5d6fee39825702e18017055bd0fb0e3d4c40b6ce526d3ce4defe2994138db54220d01

diff --git a/media-libs/opencollada/opencollada-1.6.58.ebuild b/media-libs/opencollada/opencollada-1.6.58.ebuild
deleted file mode 100644
index 77649f9a662..00000000000
--- a/media-libs/opencollada/opencollada-1.6.58.ebuild
+++ /dev/null
@@ -1,72 +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-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() {
-	# 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/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"
-}


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2018-08-07 12:03 Jonathan Scruggs
  0 siblings, 0 replies; 30+ messages in thread
From: Jonathan Scruggs @ 2018-08-07 12:03 UTC (permalink / raw
  To: gentoo-commits

commit:     453bc80613a22b535e6b9d4b2200fe3c4052c9c9
Author:     Jonathan Scruggs <dracwyrm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  7 12:03:01 2018 +0000
Commit:     Jonathan Scruggs <dracwyrm <AT> gentoo <DOT> org>
CommitDate: Tue Aug  7 12:03:01 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=453bc806

media-libs/opencollada: fix depend on libpcre

libpcre v8.42 changes struct types, which breaks compiling.
Change the depend to block 8.42 and higher versions.
Closes: https://bugs.gentoo.org/651756
Package-Manager: Portage-2.3.44, Repoman-2.3.10

 media-libs/opencollada/opencollada-1.6.62.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-libs/opencollada/opencollada-1.6.62.ebuild b/media-libs/opencollada/opencollada-1.6.62.ebuild
index 554964a4b87..a0c55233ca3 100644
--- a/media-libs/opencollada/opencollada-1.6.62.ebuild
+++ b/media-libs/opencollada/opencollada-1.6.62.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils flag-o-matic versionator
+inherit cmake-utils flag-o-matic
 
 DESCRIPTION="Stream based read/write library for COLLADA files"
 HOMEPAGE="http://www.opencollada.org/"
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc64 x86"
 IUSE="static-libs"
 
-RDEPEND="dev-libs/libpcre
+# bug 651756
+RDEPEND="<dev-libs/libpcre-8.42
 	dev-libs/zziplib
 	media-libs/lib3ds
 	sys-libs/zlib


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2018-06-10  9:19 Andreas Sturmlechner
  0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2018-06-10  9:19 UTC (permalink / raw
  To: gentoo-commits

commit:     126726f1e86673a4c263fd4f7173a2dfaccd5c37
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 10 08:50:00 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=126726f1

media-libs/opencollada: Drop office from maintainers

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-libs/opencollada/metadata.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/media-libs/opencollada/metadata.xml b/media-libs/opencollada/metadata.xml
index 74eab2d217a..48936abbe3f 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>


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2018-02-19 19:42 David Seifert
  0 siblings, 0 replies; 30+ messages in thread
From: David Seifert @ 2018-02-19 19:42 UTC (permalink / raw
  To: gentoo-commits

commit:     f33409c4dd10e9de91ddfacf032c0f8e625b986d
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 19 18:17:21 2018 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Feb 19 19:40:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f33409c4

media-libs/opencollada: Always build in C++14 mode

Closes: https://bugs.gentoo.org/619670
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-libs/opencollada/opencollada-1.6.36.ebuild | 7 +++++--
 media-libs/opencollada/opencollada-1.6.58.ebuild | 7 +++++--
 media-libs/opencollada/opencollada-1.6.62.ebuild | 5 ++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/media-libs/opencollada/opencollada-1.6.36.ebuild b/media-libs/opencollada/opencollada-1.6.36.ebuild
index 4646fb614e5..8389c5d0edd 100644
--- a/media-libs/opencollada/opencollada-1.6.36.ebuild
+++ b/media-libs/opencollada/opencollada-1.6.36.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils versionator
+inherit cmake-utils flag-o-matic versionator
 
 DESCRIPTION="Stream based read/write library for COLLADA files"
 HOMEPAGE="http://www.opencollada.org/"
@@ -45,6 +45,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# bug 619670
+	append-cxxflags -std=c++14
+
 	local mycmakeargs=(
 		-DUSE_SHARED=ON
 		-DUSE_STATIC=$(usex static-libs)

diff --git a/media-libs/opencollada/opencollada-1.6.58.ebuild b/media-libs/opencollada/opencollada-1.6.58.ebuild
index d3037374c6d..77649f9a662 100644
--- a/media-libs/opencollada/opencollada-1.6.58.ebuild
+++ b/media-libs/opencollada/opencollada-1.6.58.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils versionator
+inherit cmake-utils flag-o-matic versionator
 
 DESCRIPTION="Stream based read/write library for COLLADA files"
 HOMEPAGE="http://www.opencollada.org/"
@@ -43,6 +43,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# bug 619670
+	append-cxxflags -std=c++14
+
 	local mycmakeargs=(
 		-DUSE_SHARED=ON
 		-DUSE_STATIC=$(usex static-libs)

diff --git a/media-libs/opencollada/opencollada-1.6.62.ebuild b/media-libs/opencollada/opencollada-1.6.62.ebuild
index 4a0d0c352bd..554964a4b87 100644
--- a/media-libs/opencollada/opencollada-1.6.62.ebuild
+++ b/media-libs/opencollada/opencollada-1.6.62.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils versionator
+inherit cmake-utils flag-o-matic versionator
 
 DESCRIPTION="Stream based read/write library for COLLADA files"
 HOMEPAGE="http://www.opencollada.org/"
@@ -40,6 +40,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# bug 619670
+	append-cxxflags -std=c++14
+
 	local mycmakeargs=(
 		-DUSE_SHARED=ON
 		-DUSE_STATIC=$(usex static-libs)


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2018-01-27 17:19 Jonathan Scruggs
  0 siblings, 0 replies; 30+ messages in thread
From: Jonathan Scruggs @ 2018-01-27 17:19 UTC (permalink / raw
  To: gentoo-commits

commit:     f5cb13bb6cea958776ee9ecb8a2ddcd16c1918d4
Author:     Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Sat Jan 27 14:53:27 2018 +0000
Commit:     Jonathan Scruggs <dracwyrm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 17:19:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5cb13bb

media-libs/opencollada: update metadata information

 media-libs/opencollada/metadata.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/media-libs/opencollada/metadata.xml b/media-libs/opencollada/metadata.xml
index 38856eeebcd..74eab2d217a 100644
--- a/media-libs/opencollada/metadata.xml
+++ b/media-libs/opencollada/metadata.xml
@@ -2,13 +2,9 @@
 <!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>


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2017-12-09 10:33 Pacho Ramos
  0 siblings, 0 replies; 30+ messages in thread
From: Pacho Ramos @ 2017-12-09 10:33 UTC (permalink / raw
  To: gentoo-commits

commit:     94bd621994773ba8e17c14ffa08b1b9d88cfc2a0
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  9 10:28:32 2017 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Dec  9 10:28:32 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94bd6219

media-libs/opencollada: amd64 stable, bug #639602

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 media-libs/opencollada/Manifest                  | 2 +-
 media-libs/opencollada/opencollada-1.6.58.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index d4db147f60b..cdf5d6e6d3c 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -1,4 +1,4 @@
-DIST opencollada-1.6.25.tar.gz 11817949 SHA256 9cea5c85164758b01ac0d5c37ea10373a0d1fc7eba1e5d9dea9ba4af8aa6dca9 SHA512 48ede841d43beddbaa153899e2a1eb45d875c468536b276f6b9cb80a84b90b16ca376fb2fbc68a7f25f4908ef94a376c431ed7e94e7c6657afe60464f067a00e WHIRLPOOL e074a66424e66b98476d40f7c525a4e05e0e5537efc7c695f0e1b9099a51bd8d4645ce7a2ceae646607c7399446f22098a93dbc0bcf8c49013a49940f5737d87
+DIST opencollada-1.6.25.tar.gz 11817949 BLAKE2B 84278ae25d64ab827806c6ec588a333a7b0b70bb61c61ebfe98fa837e81e4c8737c8820b8eb555509cf6ea061dcafd1b93693a12169dd44cbe9695593f16331c SHA512 48ede841d43beddbaa153899e2a1eb45d875c468536b276f6b9cb80a84b90b16ca376fb2fbc68a7f25f4908ef94a376c431ed7e94e7c6657afe60464f067a00e
 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

diff --git a/media-libs/opencollada/opencollada-1.6.58.ebuild b/media-libs/opencollada/opencollada-1.6.58.ebuild
index 2bea5f4141a..d3037374c6d 100644
--- a/media-libs/opencollada/opencollada-1.6.58.ebuild
+++ b/media-libs/opencollada/opencollada-1.6.58.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="static-libs"
 
 # This is still needed to have so version numbers


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2017-12-08 20:39 Thomas Deutschmann
  0 siblings, 0 replies; 30+ messages in thread
From: Thomas Deutschmann @ 2017-12-08 20:39 UTC (permalink / raw
  To: gentoo-commits

commit:     497e3a5c742f0f650fe7534f66aad83db48e71cc
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  8 20:11:50 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Dec  8 20:11:50 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=497e3a5c

media-libs/opencollada: x86 stable (bug #639602)

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 media-libs/opencollada/opencollada-1.6.58.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/opencollada/opencollada-1.6.58.ebuild b/media-libs/opencollada/opencollada-1.6.58.ebuild
index dfeb12a445e..2bea5f4141a 100644
--- a/media-libs/opencollada/opencollada-1.6.58.ebuild
+++ b/media-libs/opencollada/opencollada-1.6.58.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 x86"
 IUSE="static-libs"
 
 # This is still needed to have so version numbers


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2017-08-27 15:34 Michael Palimaka
  0 siblings, 0 replies; 30+ messages in thread
From: Michael Palimaka @ 2017-08-27 15:34 UTC (permalink / raw
  To: gentoo-commits

commit:     d27efe1590aabc367845d401449463595f4d9293
Author:     Roy Bamford <neddyseagoon <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 18:48:29 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 15:34:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d27efe15

media-libs/opencollada: added ~arm64 keyword

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 media-libs/opencollada/opencollada-1.6.36.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/opencollada/opencollada-1.6.36.ebuild b/media-libs/opencollada/opencollada-1.6.36.ebuild
index 47acb9e3639..edd63b6b898 100644
--- a/media-libs/opencollada/opencollada-1.6.36.ebuild
+++ b/media-libs/opencollada/opencollada-1.6.36.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${
 LICENSE="MIT"
 SLOT="0"
 
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 IUSE="static-libs"
 


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2017-02-03  8:00 David Seifert
  0 siblings, 0 replies; 30+ messages in thread
From: David Seifert @ 2017-02-03  8:00 UTC (permalink / raw
  To: gentoo-commits

commit:     49a708d7aecf33712d85229f1906a3205bbb77cc
Author:     Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Tue Jan 31 14:36:22 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Feb  3 08:00:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49a708d7

media-libs/opencollada: Remove expat support.

DAEValidator is set to replace COLLADAValidator. However, it only
supports libxml2 and not expat like COLLADAValidator did.

No need for revision bump as expat did not compile forcing users to
unset it.

Also, from upstream:
USE_EXPAT (OFF) - Use expat parser. Unsupported currently. Do not use.

Signed-off by: Jonathan Scruggs (j.scruggs <AT> gmail.com)
Closes: https://github.com/gentoo/gentoo/pull/3735

 media-libs/opencollada/opencollada-1.6.36.ebuild | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/media-libs/opencollada/opencollada-1.6.36.ebuild b/media-libs/opencollada/opencollada-1.6.36.ebuild
index 34c4aa6..319304d 100644
--- a/media-libs/opencollada/opencollada-1.6.36.ebuild
+++ b/media-libs/opencollada/opencollada-1.6.36.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 
 KEYWORDS="~amd64 ~ppc64 ~x86"
 
-IUSE="expat static-libs"
+IUSE="static-libs"
 
 # This is still needed to have so version numbers
 MY_SOVERSION="$(get_version_component_range 1-2)"
@@ -24,8 +24,7 @@ RDEPEND="dev-libs/libpcre
 	dev-libs/zziplib
 	media-libs/lib3ds
 	sys-libs/zlib
-	expat? ( dev-libs/expat )
-	!expat? ( dev-libs/libxml2 )"
+	dev-libs/libxml2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
@@ -50,8 +49,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DUSE_SHARED=ON
 		-DUSE_STATIC=$(usex static-libs)
-		-DUSE_EXPAT=$(usex expat)
-		-DUSE_LIBXML=$(usex !expat)
+		-DUSE_LIBXML=ON
 		-Dsoversion=${MY_SOVERSION}
 	)
 


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2017-01-15 11:14 David Seifert
  0 siblings, 0 replies; 30+ messages in thread
From: David Seifert @ 2017-01-15 11:14 UTC (permalink / raw
  To: gentoo-commits

commit:     9a2f667e42c2aa37a6ffcce4cde39f75104309f9
Author:     Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Sat Jan  7 15:42:45 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 11:14:19 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a2f667e

media-libs/opencollada: Remove 1.2.2_p20150207

This version has several security vulnerabilities which are fixed in
newer versions.
Closes: https://github.com/gentoo/gentoo/pull/3361

 media-libs/opencollada/Manifest                    |  1 -
 .../opencollada/opencollada-1.2.2_p20150207.ebuild | 92 ----------------------
 2 files changed, 93 deletions(-)

diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index 5849227..27cb178 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -1,3 +1,2 @@
-DIST opencollada-1.2.2_p20150207.tar.gz 11715849 SHA256 b6a4362c559d790a04dfef4606cb0a0ffe01e34708f898bf3453e69318bc5cc1 SHA512 0780e4401f130832d9802ddd6183ac11294ed84f43e0b497673c66fa2c1ae47ebc853484f8e68871887a1e99ab1f1df786cfc6ebd5868f039d9101ab82646f09 WHIRLPOOL 4cf7c7f03caf37e4c9342e139ed036b3c43984917ac4a3876e464f2065e2c515e2e85e5408d32901572d6b56a94d82963f5a2e6d3bb17dec04ecf35ee8be2d98
 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

diff --git a/media-libs/opencollada/opencollada-1.2.2_p20150207.ebuild b/media-libs/opencollada/opencollada-1.2.2_p20150207.ebuild
deleted file mode 100644
index a04318b..00000000
--- a/media-libs/opencollada/opencollada-1.2.2_p20150207.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]] ; then
-	SCM_ECLASS="git-r3"
-else
-	SCM_ECLASS="vcs-snapshot"
-fi
-
-inherit versionator eutils multilib cmake-utils ${SCM_ECLASS}
-
-DESCRIPTION="Stream based read/write library for COLLADA files"
-HOMEPAGE="http://www.opencollada.org/"
-LICENSE="MIT"
-IUSE="expat"
-
-# seems like the Khronos Group hasnt invented the SOVERSION yet
-MY_SOVERSION="1.2"
-
-SLOT="0"
-
-if [[ ${PV} != *9999* ]]; then
-	#
-	# UPDATE THE COMMIT WHEN BUMPING!
-	COMMIT="ceb409cabdccda3000aa2e5c065850b8fde60b0f"
-	#
-	SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/tarball/${COMMIT} -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc64 x86"
-else
-	EGIT_REPO_URI="https://github.com/KhronosGroup/OpenCOLLADA.git"
-fi
-
-RDEPEND="dev-libs/libpcre
-	dev-libs/zziplib
-	media-libs/lib3ds
-	sys-libs/zlib
-	>=sys-devel/gcc-4.7
-	expat? ( dev-libs/expat )
-	!expat? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	sys-apps/sed"
-
-BUILD_DIR="${S}"/build
-
-src_prepare() {
-
-	# Remove some bundled dependencies
-	edos2unix CMakeLists.txt || die
-
-	epatch "${FILESDIR}"/${PN}-0_p864-expat.patch
-
-	epatch "${FILESDIR}"/${PN}-1.2.2-soversion.patch
-	epatch "${FILESDIR}"/${PN}-1.2.2-no-undefined.patch
-	epatch "${FILESDIR}"/${PN}-1.2.2-libdir.patch
-
-	rm -R Externals/{expat,lib3ds,LibXML,pcre,zlib,zziplib} || die
-	ewarn "$(echo "Remaining bundled dependencies:";
-		find Externals -mindepth 1 -maxdepth 1 -type d | sed 's|^|- |')"
-
-	# Remove unused build systems
-	rm Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die
-	find "${S}" -name SConscript -delete || die
-}
-
-src_configure() {
-	local mycmakeargs=" -DUSE_SHARED=ON -DUSE_STATIC=OFF"
-
-	# Master CMakeLists.txt says "EXPAT support not implemented"
-	# Something like "set(LIBEXPAT_LIBRARIES expat)" is missing to make it build
-	use expat \
-		&& mycmakeargs+=' -DUSE_EXPAT=ON -DUSE_LIBXML=OFF' \
-		|| mycmakeargs+=' -DUSE_EXPAT=OFF -DUSE_LIBXML=ON'
-
-	# Seems like the Khronos Group hasnt invented the SOVERSION yet.
-	mycmakeargs+=" -Dsoversion=${MY_SOVERSION}"
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	dodir /etc/env.d || die
-	echo "LDPATH=/usr/$(get_libdir)/opencollada" \
-			> "${D}"/etc/env.d/99opencollada || die
-
-	dobin build/bin/OpenCOLLADAValidator || die
-}


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2016-12-04  0:07 Andreas Hüttel
  0 siblings, 0 replies; 30+ messages in thread
From: Andreas Hüttel @ 2016-12-04  0:07 UTC (permalink / raw
  To: gentoo-commits

commit:     c6275df7b2cf325737f2a0c51505834e747a80ee
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  4 00:07:34 2016 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Dec  4 00:07:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6275df7

media-libs/opencollada: Remove old

Package-Manager: portage-2.3.2

 media-libs/opencollada/Manifest                    |  1 -
 .../opencollada/opencollada-1.6.18-r1.ebuild       | 79 ----------------------
 2 files changed, 80 deletions(-)

diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index 98cdb0b..5849227 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -1,4 +1,3 @@
 DIST opencollada-1.2.2_p20150207.tar.gz 11715849 SHA256 b6a4362c559d790a04dfef4606cb0a0ffe01e34708f898bf3453e69318bc5cc1 SHA512 0780e4401f130832d9802ddd6183ac11294ed84f43e0b497673c66fa2c1ae47ebc853484f8e68871887a1e99ab1f1df786cfc6ebd5868f039d9101ab82646f09 WHIRLPOOL 4cf7c7f03caf37e4c9342e139ed036b3c43984917ac4a3876e464f2065e2c515e2e85e5408d32901572d6b56a94d82963f5a2e6d3bb17dec04ecf35ee8be2d98
-DIST opencollada-1.6.18.tar.gz 11807970 SHA256 9835aa0b6efdb6602e58a84ee245a443002dc7196af3b7660e6888680d5d5990 SHA512 e4f72c41c8c619bbfb842517fb1217f616ebe6d9576ef0b7fd8bcb26443b66245107e8d04475c32946b7b73bf093977d1911d486f2d2ae92a165cfde55f67baa WHIRLPOOL 7d35758667c7a1293c376712d47cae0f87ea243e04de9fc526297805fa59f405510584ac6d79c13f77f80f1ef0e6cbea05692b3c65a09d88031dd220b4132ead
 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

diff --git a/media-libs/opencollada/opencollada-1.6.18-r1.ebuild b/media-libs/opencollada/opencollada-1.6.18-r1.ebuild
deleted file mode 100644
index 028f631..00000000
--- a/media-libs/opencollada/opencollada-1.6.18-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 -R Externals/{expat,lib3ds,LibXML,pcre,zlib,zziplib} || die
-
-	# Remove unused build systems
-	rm Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die
-	find "${S}" -name SConscript -delete || die
-
-	# Fix insecure RUNPATHS vulnerability
-	sed '/link_directories/i SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)' \
-		-i COLLADAValidator/CMakeLists.txt || die "sed failed"
-}
-
-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
-}


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2016-09-05 21:29 Patrice Clement
  0 siblings, 0 replies; 30+ messages in thread
From: Patrice Clement @ 2016-09-05 21:29 UTC (permalink / raw
  To: gentoo-commits

commit:     43598878275d89bd6e3d8e397dc31984f8212b2a
Author:     Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Mon Sep  5 11:20:23 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Sep  5 21:28:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43598878

media-libs/opencollada: version bump to 1.6.31.

Closes: https://github.com/gentoo/gentoo/pull/2245

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 media-libs/opencollada/Manifest                  |  1 +
 media-libs/opencollada/opencollada-1.6.31.ebuild | 75 ++++++++++++++++++++++++
 2 files changed, 76 insertions(+)

diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index 23cfa80..98cdb0b 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -1,3 +1,4 @@
 DIST opencollada-1.2.2_p20150207.tar.gz 11715849 SHA256 b6a4362c559d790a04dfef4606cb0a0ffe01e34708f898bf3453e69318bc5cc1 SHA512 0780e4401f130832d9802ddd6183ac11294ed84f43e0b497673c66fa2c1ae47ebc853484f8e68871887a1e99ab1f1df786cfc6ebd5868f039d9101ab82646f09 WHIRLPOOL 4cf7c7f03caf37e4c9342e139ed036b3c43984917ac4a3876e464f2065e2c515e2e85e5408d32901572d6b56a94d82963f5a2e6d3bb17dec04ecf35ee8be2d98
 DIST opencollada-1.6.18.tar.gz 11807970 SHA256 9835aa0b6efdb6602e58a84ee245a443002dc7196af3b7660e6888680d5d5990 SHA512 e4f72c41c8c619bbfb842517fb1217f616ebe6d9576ef0b7fd8bcb26443b66245107e8d04475c32946b7b73bf093977d1911d486f2d2ae92a165cfde55f67baa WHIRLPOOL 7d35758667c7a1293c376712d47cae0f87ea243e04de9fc526297805fa59f405510584ac6d79c13f77f80f1ef0e6cbea05692b3c65a09d88031dd220b4132ead
 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

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 00000000..2978d51
--- /dev/null
+++ b/media-libs/opencollada/opencollada-1.6.31.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+}


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2016-07-16  7:56 Patrice Clement
  0 siblings, 0 replies; 30+ messages in thread
From: Patrice Clement @ 2016-07-16  7:56 UTC (permalink / raw
  To: gentoo-commits

commit:     8763943933bfff52b9c9a6918aa7da74936ca158
Author:     Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Fri Jul 15 13:20:14 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Jul 16 07:54:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87639439

media-libs/opencollada: version bump to 1.6.25.

Closes: https://github.com/gentoo/gentoo/pull/1890

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 media-libs/opencollada/Manifest                                   | 2 +-
 .../{opencollada-1.6.23.ebuild => opencollada-1.6.25.ebuild}      | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index e4a9b10..23cfa80 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -1,3 +1,3 @@
 DIST opencollada-1.2.2_p20150207.tar.gz 11715849 SHA256 b6a4362c559d790a04dfef4606cb0a0ffe01e34708f898bf3453e69318bc5cc1 SHA512 0780e4401f130832d9802ddd6183ac11294ed84f43e0b497673c66fa2c1ae47ebc853484f8e68871887a1e99ab1f1df786cfc6ebd5868f039d9101ab82646f09 WHIRLPOOL 4cf7c7f03caf37e4c9342e139ed036b3c43984917ac4a3876e464f2065e2c515e2e85e5408d32901572d6b56a94d82963f5a2e6d3bb17dec04ecf35ee8be2d98
 DIST opencollada-1.6.18.tar.gz 11807970 SHA256 9835aa0b6efdb6602e58a84ee245a443002dc7196af3b7660e6888680d5d5990 SHA512 e4f72c41c8c619bbfb842517fb1217f616ebe6d9576ef0b7fd8bcb26443b66245107e8d04475c32946b7b73bf093977d1911d486f2d2ae92a165cfde55f67baa WHIRLPOOL 7d35758667c7a1293c376712d47cae0f87ea243e04de9fc526297805fa59f405510584ac6d79c13f77f80f1ef0e6cbea05692b3c65a09d88031dd220b4132ead
-DIST opencollada-1.6.23.tar.gz 11816731 SHA256 ca242cbf4f25931df95c5a5d7f0af17452d72c73783e74c5735118e37bb093ce SHA512 6296f44a33bf80f23789276977119b37fbdc32e8fad583d1d80902311ad6f37982e5e04a527ac84ac61650bf300354bd61195bbf26f8e05b6981d47ef82e3b10 WHIRLPOOL 1f133a5513b3a1c78e78ef29ba997094867481507c1409e38190ea541375979eaabc8ffc2091880fd359695f0b11869257064db26ce5b90b284134d7325ca47b
+DIST opencollada-1.6.25.tar.gz 11817949 SHA256 9cea5c85164758b01ac0d5c37ea10373a0d1fc7eba1e5d9dea9ba4af8aa6dca9 SHA512 48ede841d43beddbaa153899e2a1eb45d875c468536b276f6b9cb80a84b90b16ca376fb2fbc68a7f25f4908ef94a376c431ed7e94e7c6657afe60464f067a00e WHIRLPOOL e074a66424e66b98476d40f7c525a4e05e0e5537efc7c695f0e1b9099a51bd8d4645ce7a2ceae646607c7399446f22098a93dbc0bcf8c49013a49940f5737d87

diff --git a/media-libs/opencollada/opencollada-1.6.23.ebuild b/media-libs/opencollada/opencollada-1.6.25.ebuild
similarity index 84%
rename from media-libs/opencollada/opencollada-1.6.23.ebuild
rename to media-libs/opencollada/opencollada-1.6.25.ebuild
index 028f631..2978d51 100644
--- a/media-libs/opencollada/opencollada-1.6.23.ebuild
+++ b/media-libs/opencollada/opencollada-1.6.25.ebuild
@@ -46,15 +46,11 @@ src_prepare() {
 	default
 
 	# Remove bundled depends that have portage equivalents
-	rm -R Externals/{expat,lib3ds,LibXML,pcre,zlib,zziplib} || die
+	rm -rv Externals/{expat,lib3ds,LibXML,pcre,zlib,zziplib} || die
 
 	# Remove unused build systems
-	rm Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die
+	rm -v Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die
 	find "${S}" -name SConscript -delete || die
-
-	# Fix insecure RUNPATHS vulnerability
-	sed '/link_directories/i SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)' \
-		-i COLLADAValidator/CMakeLists.txt || die "sed failed"
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2016-07-09  1:58 Göktürk Yüksek
  0 siblings, 0 replies; 30+ messages in thread
From: Göktürk Yüksek @ 2016-07-09  1:58 UTC (permalink / raw
  To: gentoo-commits

commit:     6085a6136f2e158defab62ecd86782b9913b57b4
Author:     Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Fri Jul  8 18:04:31 2016 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Sat Jul  9 01:57:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6085a613

media-libs/opencollada: Update metadata.xml file

 media-libs/opencollada/metadata.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-libs/opencollada/metadata.xml b/media-libs/opencollada/metadata.xml
index 25b3c8e..38856ee 100644
--- a/media-libs/opencollada/metadata.xml
+++ b/media-libs/opencollada/metadata.xml
@@ -4,7 +4,10 @@
 	<maintainer restrict="&gt;=media-libs/opencollada-1.6.18" type="person">
 		<email>j.scruggs@gmail.com</email>
 		<name>Jonathan Scruggs</name>
-		<description>Proxy maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>office@gentoo.org</email>


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2016-07-09  1:58 Göktürk Yüksek
  0 siblings, 0 replies; 30+ messages in thread
From: Göktürk Yüksek @ 2016-07-09  1:58 UTC (permalink / raw
  To: gentoo-commits

commit:     2906664f97991195c9b476a0b5be7b673226d46a
Author:     Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Fri Jul  8 18:05:28 2016 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Sat Jul  9 01:57:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2906664f

media-libs/opencollada: Remove live ebuild as it's no longer needed

 media-libs/opencollada/opencollada-9999.ebuild | 77 --------------------------
 1 file changed, 77 deletions(-)

diff --git a/media-libs/opencollada/opencollada-9999.ebuild b/media-libs/opencollada/opencollada-9999.ebuild
deleted file mode 100644
index 53164b4..0000000
--- a/media-libs/opencollada/opencollada-9999.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-EGIT_REPO_URI="https://github.com/KhronosGroup/OpenCOLLADA.git"
-inherit multilib cmake-utils
-[[ ${PV} == "9999" ]] && inherit git-r3
-
-DESCRIPTION="Stream based read/write library for COLLADA files"
-HOMEPAGE="http://www.opencollada.org/"
-[[ ${PV} == "9999" ]] || \
-	SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-[[ ${PV} == "9999" ]] || \
-	KEYWORDS="~amd64 ~ppc64 ~x86" \
-	S="${WORKDIR}"/OpenCOLLADA-${PV}
-
-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}"
-
-# 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 -R Externals/{expat,lib3ds,LibXML,pcre,zlib,zziplib} || die
-
-	# Remove unused build systems
-	rm 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}; \
-		doenvd "${T}"/99${PN}
-
-	dobin build/bin/OpenCOLLADAValidator
-}


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2016-07-09  1:58 Göktürk Yüksek
  0 siblings, 0 replies; 30+ messages in thread
From: Göktürk Yüksek @ 2016-07-09  1:58 UTC (permalink / raw
  To: gentoo-commits

commit:     04d723efb22e209a20a44395ae688edbcdd442ee
Author:     Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Fri Jul  8 18:22:52 2016 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Sat Jul  9 01:57:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04d723ef

media-libs/opencollada: Rev bump to fix insecure runpath vulnerability

Closes Gentoo Bug 439530
Also, remove live ebuild logic

 ...-1.6.18.ebuild => opencollada-1.6.18-r1.ebuild} | 24 ++++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/media-libs/opencollada/opencollada-1.6.18.ebuild b/media-libs/opencollada/opencollada-1.6.18-r1.ebuild
similarity index 73%
rename from media-libs/opencollada/opencollada-1.6.18.ebuild
rename to media-libs/opencollada/opencollada-1.6.18-r1.ebuild
index 53164b4..028f631 100644
--- a/media-libs/opencollada/opencollada-1.6.18.ebuild
+++ b/media-libs/opencollada/opencollada-1.6.18-r1.ebuild
@@ -4,20 +4,16 @@
 
 EAPI=6
 
-EGIT_REPO_URI="https://github.com/KhronosGroup/OpenCOLLADA.git"
-inherit multilib cmake-utils
-[[ ${PV} == "9999" ]] && inherit git-r3
+inherit eutils cmake-utils
 
 DESCRIPTION="Stream based read/write library for COLLADA files"
 HOMEPAGE="http://www.opencollada.org/"
-[[ ${PV} == "9999" ]] || \
-	SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-[[ ${PV} == "9999" ]] || \
-	KEYWORDS="~amd64 ~ppc64 ~x86" \
-	S="${WORKDIR}"/OpenCOLLADA-${PV}
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 IUSE="expat static-libs"
 
@@ -30,8 +26,10 @@ RDEPEND="dev-libs/libpcre
 	sys-libs/zlib
 	expat? ( dev-libs/expat )
 	!expat? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
+S="${WORKDIR}"/OpenCOLLADA-${PV}
 # This is needed or you get an error on install
 BUILD_DIR="${S}"/build
 
@@ -53,6 +51,10 @@ src_prepare() {
 	# Remove unused build systems
 	rm Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die
 	find "${S}" -name SConscript -delete || die
+
+	# Fix insecure RUNPATHS vulnerability
+	sed '/link_directories/i SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)' \
+		-i COLLADAValidator/CMakeLists.txt || die "sed failed"
 }
 
 src_configure() {
@@ -70,8 +72,8 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 
-	echo "LDPATH=/usr/$(get_libdir)/opencollada" > "${T}"/99${PN}; \
-		doenvd "${T}"/99${PN}
+	echo "LDPATH=/usr/$(get_libdir)/opencollada" > "${T}"/99${PN} || die "echo failed"
+	doenvd "${T}"/99${PN}
 
 	dobin build/bin/OpenCOLLADAValidator
 }


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2016-07-09  1:58 Göktürk Yüksek
  0 siblings, 0 replies; 30+ messages in thread
From: Göktürk Yüksek @ 2016-07-09  1:58 UTC (permalink / raw
  To: gentoo-commits

commit:     b80027a2aee81e898c67d3483f80c0710769a4c4
Author:     Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Fri Jul  8 18:45:04 2016 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Sat Jul  9 01:57:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b80027a2

media-libs/opencollada: Version bump to 1.6.23

 media-libs/opencollada/Manifest                  |  1 +
 media-libs/opencollada/opencollada-1.6.23.ebuild | 79 ++++++++++++++++++++++++
 2 files changed, 80 insertions(+)

diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index 312c011..e4a9b10 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -1,2 +1,3 @@
 DIST opencollada-1.2.2_p20150207.tar.gz 11715849 SHA256 b6a4362c559d790a04dfef4606cb0a0ffe01e34708f898bf3453e69318bc5cc1 SHA512 0780e4401f130832d9802ddd6183ac11294ed84f43e0b497673c66fa2c1ae47ebc853484f8e68871887a1e99ab1f1df786cfc6ebd5868f039d9101ab82646f09 WHIRLPOOL 4cf7c7f03caf37e4c9342e139ed036b3c43984917ac4a3876e464f2065e2c515e2e85e5408d32901572d6b56a94d82963f5a2e6d3bb17dec04ecf35ee8be2d98
 DIST opencollada-1.6.18.tar.gz 11807970 SHA256 9835aa0b6efdb6602e58a84ee245a443002dc7196af3b7660e6888680d5d5990 SHA512 e4f72c41c8c619bbfb842517fb1217f616ebe6d9576ef0b7fd8bcb26443b66245107e8d04475c32946b7b73bf093977d1911d486f2d2ae92a165cfde55f67baa WHIRLPOOL 7d35758667c7a1293c376712d47cae0f87ea243e04de9fc526297805fa59f405510584ac6d79c13f77f80f1ef0e6cbea05692b3c65a09d88031dd220b4132ead
+DIST opencollada-1.6.23.tar.gz 11816731 SHA256 ca242cbf4f25931df95c5a5d7f0af17452d72c73783e74c5735118e37bb093ce SHA512 6296f44a33bf80f23789276977119b37fbdc32e8fad583d1d80902311ad6f37982e5e04a527ac84ac61650bf300354bd61195bbf26f8e05b6981d47ef82e3b10 WHIRLPOOL 1f133a5513b3a1c78e78ef29ba997094867481507c1409e38190ea541375979eaabc8ffc2091880fd359695f0b11869257064db26ce5b90b284134d7325ca47b

diff --git a/media-libs/opencollada/opencollada-1.6.23.ebuild b/media-libs/opencollada/opencollada-1.6.23.ebuild
new file mode 100644
index 0000000..028f631
--- /dev/null
+++ b/media-libs/opencollada/opencollada-1.6.23.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 -R Externals/{expat,lib3ds,LibXML,pcre,zlib,zziplib} || die
+
+	# Remove unused build systems
+	rm Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die
+	find "${S}" -name SConscript -delete || die
+
+	# Fix insecure RUNPATHS vulnerability
+	sed '/link_directories/i SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)' \
+		-i COLLADAValidator/CMakeLists.txt || die "sed failed"
+}
+
+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
+}


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2016-06-13  5:59 Amy Winston
  0 siblings, 0 replies; 30+ messages in thread
From: Amy Winston @ 2016-06-13  5:59 UTC (permalink / raw
  To: gentoo-commits

commit:     d0fdda9a32b2227375fa0ad58b63de62985e287a
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 05:57:07 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 05:57:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0fdda9a

media-libs/opencollada: cleaning after github pr

 media-libs/opencollada/.metadata.xml.kate-swp | Bin 266 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/media-libs/opencollada/.metadata.xml.kate-swp b/media-libs/opencollada/.metadata.xml.kate-swp
deleted file mode 100644
index f3fe4f4..0000000
Binary files a/media-libs/opencollada/.metadata.xml.kate-swp and /dev/null differ


^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2016-06-12 18:16 Amy Winston
  0 siblings, 0 replies; 30+ messages in thread
From: Amy Winston @ 2016-06-12 18:16 UTC (permalink / raw
  To: gentoo-commits

commit:     cac421555fb2e9112905a35ca1da2987df864d80
Author:     Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Sun Jun  5 07:06:23 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Jun 12 17:52:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cac42155

media-libs/opencollada: Version bump to 1.6.18 and update to EAPI 6

-Version bump to v1.6.18: Upstream releasing proper versions now
-Using full EAPI compliance for new and live ebuild
-Delete old patches not in use anymore
-Closes Gentoo Bug: 584670
-Fixes based on help from gentoo-proxy-maint
-Changed comments to explain that certain things are needed

 media-libs/opencollada/Manifest                  |  1 +
 media-libs/opencollada/opencollada-1.6.18.ebuild | 77 ++++++++++++++++++++
 media-libs/opencollada/opencollada-9999.ebuild   | 89 ++++++++++--------------
 3 files changed, 115 insertions(+), 52 deletions(-)

diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index a7fa6d3..312c011 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -1 +1,2 @@
 DIST opencollada-1.2.2_p20150207.tar.gz 11715849 SHA256 b6a4362c559d790a04dfef4606cb0a0ffe01e34708f898bf3453e69318bc5cc1 SHA512 0780e4401f130832d9802ddd6183ac11294ed84f43e0b497673c66fa2c1ae47ebc853484f8e68871887a1e99ab1f1df786cfc6ebd5868f039d9101ab82646f09 WHIRLPOOL 4cf7c7f03caf37e4c9342e139ed036b3c43984917ac4a3876e464f2065e2c515e2e85e5408d32901572d6b56a94d82963f5a2e6d3bb17dec04ecf35ee8be2d98
+DIST opencollada-1.6.18.tar.gz 11807970 SHA256 9835aa0b6efdb6602e58a84ee245a443002dc7196af3b7660e6888680d5d5990 SHA512 e4f72c41c8c619bbfb842517fb1217f616ebe6d9576ef0b7fd8bcb26443b66245107e8d04475c32946b7b73bf093977d1911d486f2d2ae92a165cfde55f67baa WHIRLPOOL 7d35758667c7a1293c376712d47cae0f87ea243e04de9fc526297805fa59f405510584ac6d79c13f77f80f1ef0e6cbea05692b3c65a09d88031dd220b4132ead

diff --git a/media-libs/opencollada/opencollada-1.6.18.ebuild b/media-libs/opencollada/opencollada-1.6.18.ebuild
new file mode 100644
index 0000000..53164b4
--- /dev/null
+++ b/media-libs/opencollada/opencollada-1.6.18.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/KhronosGroup/OpenCOLLADA.git"
+inherit multilib cmake-utils
+[[ ${PV} == "9999" ]] && inherit git-r3
+
+DESCRIPTION="Stream based read/write library for COLLADA files"
+HOMEPAGE="http://www.opencollada.org/"
+[[ ${PV} == "9999" ]] || \
+	SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+[[ ${PV} == "9999" ]] || \
+	KEYWORDS="~amd64 ~ppc64 ~x86" \
+	S="${WORKDIR}"/OpenCOLLADA-${PV}
+
+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}"
+
+# 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 -R Externals/{expat,lib3ds,LibXML,pcre,zlib,zziplib} || die
+
+	# Remove unused build systems
+	rm 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}; \
+		doenvd "${T}"/99${PN}
+
+	dobin build/bin/OpenCOLLADAValidator
+}

diff --git a/media-libs/opencollada/opencollada-9999.ebuild b/media-libs/opencollada/opencollada-9999.ebuild
index 821ee69..53164b4 100644
--- a/media-libs/opencollada/opencollada-9999.ebuild
+++ b/media-libs/opencollada/opencollada-9999.ebuild
@@ -1,65 +1,54 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-if [[ ${PV} == *9999* ]] ; then
-	SCM_ECLASS="git-r3"
-else
-	SCM_ECLASS="vcs-snapshot"
-fi
-
-inherit versionator eutils multilib cmake-utils ${SCM_ECLASS}
+EGIT_REPO_URI="https://github.com/KhronosGroup/OpenCOLLADA.git"
+inherit multilib cmake-utils
+[[ ${PV} == "9999" ]] && inherit git-r3
 
 DESCRIPTION="Stream based read/write library for COLLADA files"
 HOMEPAGE="http://www.opencollada.org/"
-LICENSE="MIT"
-IUSE="expat"
-
-# seems like the Khronos Group hasnt invented the SOVERSION yet
-MY_SOVERSION="1.2"
+[[ ${PV} == "9999" ]] || \
+	SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
+LICENSE="MIT"
 SLOT="0"
+[[ ${PV} == "9999" ]] || \
+	KEYWORDS="~amd64 ~ppc64 ~x86" \
+	S="${WORKDIR}"/OpenCOLLADA-${PV}
+
+IUSE="expat static-libs"
 
-if [[ ${PV} != *9999* ]]; then
-	#
-	# UPDATE THE COMMIT WHEN BUMPING!
-	COMMIT="ceb409cabdccda3000aa2e5c065850b8fde60b0f"
-	#
-	SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/tarball/${COMMIT} -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-else
-	EGIT_REPO_URI="https://github.com/KhronosGroup/OpenCOLLADA.git"
-fi
+# 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
-	>=sys-devel/gcc-4.7
 	expat? ( dev-libs/expat )
 	!expat? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	sys-apps/sed"
+DEPEND="${RDEPEND}"
 
+# This is needed or you get an error on install
 BUILD_DIR="${S}"/build
 
-src_prepare() {
-
-	# Remove some bundled dependencies
-	edos2unix CMakeLists.txt || die
+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
+)
 
-	epatch "${FILESDIR}"/${PN}-0_p864-expat.patch
+src_prepare() {
+	edos2unix CMakeLists.txt
 
-	epatch "${FILESDIR}"/${PN}-1.2.2-soversion.patch
-	epatch "${FILESDIR}"/${PN}-1.2.2-no-undefined.patch
-	epatch "${FILESDIR}"/${PN}-1.2.2-libdir.patch
+	default
 
+	# Remove bundled depends that have portage equivalents
 	rm -R Externals/{expat,lib3ds,LibXML,pcre,zlib,zziplib} || die
-	ewarn "$(echo "Remaining bundled dependencies:";
-		find Externals -mindepth 1 -maxdepth 1 -type d | sed 's|^|- |')"
 
 	# Remove unused build systems
 	rm Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die
@@ -67,16 +56,13 @@ src_prepare() {
 }
 
 src_configure() {
-	local mycmakeargs=" -DUSE_SHARED=ON -DUSE_STATIC=OFF"
-
-	# Master CMakeLists.txt says "EXPAT support not implemented"
-	# Something like "set(LIBEXPAT_LIBRARIES expat)" is missing to make it build
-	use expat \
-		&& mycmakeargs+=' -DUSE_EXPAT=ON -DUSE_LIBXML=OFF' \
-		|| mycmakeargs+=' -DUSE_EXPAT=OFF -DUSE_LIBXML=ON'
-
-	# Seems like the Khronos Group hasnt invented the SOVERSION yet.
-	mycmakeargs+=" -Dsoversion=${MY_SOVERSION}"
+	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
 }
@@ -84,9 +70,8 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 
-	dodir /etc/env.d || die
-	echo "LDPATH=/usr/$(get_libdir)/opencollada" \
-			> "${D}"/etc/env.d/99opencollada || die
+	echo "LDPATH=/usr/$(get_libdir)/opencollada" > "${T}"/99${PN}; \
+		doenvd "${T}"/99${PN}
 
-	dobin build/bin/OpenCOLLADAValidator || die
+	dobin build/bin/OpenCOLLADAValidator
 }


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2016-06-05 12:16 Sebastian Pipping
  0 siblings, 0 replies; 30+ messages in thread
From: Sebastian Pipping @ 2016-06-05 12:16 UTC (permalink / raw
  To: gentoo-commits

commit:     5cb8e271d774864858a27bb3056f23b1e7ba04e2
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  5 12:16:22 2016 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jun  5 12:16:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cb8e271

media-libs/opencollada: Drop myself as a maintainer

Package-Manager: portage-2.2.28

 media-libs/opencollada/metadata.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/media-libs/opencollada/metadata.xml b/media-libs/opencollada/metadata.xml
index 8a01fa0..e990651 100644
--- a/media-libs/opencollada/metadata.xml
+++ b/media-libs/opencollada/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>sping@gentoo.org</email>
-		<name>Sebastian Pipping</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>office@gentoo.org</email>
 		<name>Gentoo Office project</name>


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/
@ 2015-08-31 20:49 Andreas Hüttel
  0 siblings, 0 replies; 30+ messages in thread
From: Andreas Hüttel @ 2015-08-31 20:49 UTC (permalink / raw
  To: gentoo-commits

commit:     0dd512857756a86b11899e68f3a78e68c3b21634
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 20:39:07 2015 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 20:48:46 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dd51285

media-libs/opencollada: use http uri

Package-Manager: portage-2.2.20.1

 media-libs/opencollada/opencollada-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/opencollada/opencollada-9999.ebuild b/media-libs/opencollada/opencollada-9999.ebuild
index 821ee69..4be2a8f 100644
--- a/media-libs/opencollada/opencollada-9999.ebuild
+++ b/media-libs/opencollada/opencollada-9999.ebuild
@@ -30,7 +30,7 @@ if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/tarball/${COMMIT} -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc64 ~x86"
 else
-	EGIT_REPO_URI="https://github.com/KhronosGroup/OpenCOLLADA.git"
+	EGIT_REPO_URI="http://github.com/KhronosGroup/OpenCOLLADA.git"
 fi
 
 RDEPEND="dev-libs/libpcre


^ permalink raw reply related	[flat|nested] 30+ messages in thread

end of thread, other threads:[~2021-03-05 18:39 UTC | newest]

Thread overview: 30+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-12 18:16 [gentoo-commits] repo/gentoo:master commit in: media-libs/opencollada/ Amy Winston
  -- strict thread matches above, loose matches on Subject: below --
2021-03-05 18:39 Sam James
2021-02-28 15:39 Sam James
2021-02-22  7:12 Sam James
2020-11-08 10:29 Sam James
2020-02-16 20:24 David Seifert
2020-02-13 14:19 Lars Wendler
2020-02-13 14:19 Lars Wendler
2019-10-02 20:48 James Le Cuirot
2019-06-12 10:37 Andreas Sturmlechner
2018-08-07 12:03 Jonathan Scruggs
2018-06-10  9:19 Andreas Sturmlechner
2018-02-19 19:42 David Seifert
2018-01-27 17:19 Jonathan Scruggs
2017-12-09 10:33 Pacho Ramos
2017-12-08 20:39 Thomas Deutschmann
2017-08-27 15:34 Michael Palimaka
2017-02-03  8:00 David Seifert
2017-01-15 11:14 David Seifert
2016-12-04  0:07 Andreas Hüttel
2016-09-05 21:29 Patrice Clement
2016-07-16  7:56 Patrice Clement
2016-07-09  1:58 Göktürk Yüksek
2016-07-09  1:58 Göktürk Yüksek
2016-07-09  1:58 Göktürk Yüksek
2016-07-09  1:58 Göktürk Yüksek
2016-06-13  5:59 Amy Winston
2016-06-12 18:16 Amy Winston
2016-06-05 12:16 Sebastian Pipping
2015-08-31 20:49 Andreas Hüttel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox