public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3mf/
@ 2020-08-25 10:25 Sam James
  0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2020-08-25 10:25 UTC (permalink / raw
  To: gentoo-commits

commit:     b5a8e8c7282ce59b49abf73924fdc5ee66756011
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 10:23:28 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 10:23:28 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5a8e8c7

media-libs/lib3mf: arm64 keyworded (bug #734822)

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>

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

diff --git a/media-libs/lib3mf/lib3mf-1.8.1.ebuild b/media-libs/lib3mf/lib3mf-1.8.1.ebuild
index a53ea513ef4..c703e74d4fa 100644
--- a/media-libs/lib3mf/lib3mf-1.8.1.ebuild
+++ b/media-libs/lib3mf/lib3mf-1.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/3MFConsortium/$PN/archive/v$PV.tar.gz -> $P.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 


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

* [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3mf/
@ 2020-11-20 14:59 Joonas Niilola
  0 siblings, 0 replies; 16+ messages in thread
From: Joonas Niilola @ 2020-11-20 14:59 UTC (permalink / raw
  To: gentoo-commits

commit:     fdfff5d446da408d0ad733ab13cdc464fb6aea53
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 20 14:34:01 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Nov 20 14:59:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdfff5d4

media-libs/lib3mf: stabilize 1.8.1 on x86

Bug: https://bugs.gentoo.org/755716
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

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

diff --git a/media-libs/lib3mf/lib3mf-1.8.1.ebuild b/media-libs/lib3mf/lib3mf-1.8.1.ebuild
index a4c13948eb4..6a9e8bdc83a 100644
--- a/media-libs/lib3mf/lib3mf-1.8.1.ebuild
+++ b/media-libs/lib3mf/lib3mf-1.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/3MFConsortium/$PN/archive/v$PV.tar.gz -> $P.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 


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

* [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3mf/
@ 2020-11-20 14:59 Joonas Niilola
  0 siblings, 0 replies; 16+ messages in thread
From: Joonas Niilola @ 2020-11-20 14:59 UTC (permalink / raw
  To: gentoo-commits

commit:     5bc5cb6051834e81189b09353459498cd3b3eb64
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 20 14:33:37 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Nov 20 14:59:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bc5cb60

media-libs/lib3mf: stabilize 1.8.1 on amd64

Bug: https://bugs.gentoo.org/755716
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

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

diff --git a/media-libs/lib3mf/lib3mf-1.8.1.ebuild b/media-libs/lib3mf/lib3mf-1.8.1.ebuild
index c703e74d4fa..a4c13948eb4 100644
--- a/media-libs/lib3mf/lib3mf-1.8.1.ebuild
+++ b/media-libs/lib3mf/lib3mf-1.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/3MFConsortium/$PN/archive/v$PV.tar.gz -> $P.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 


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

* [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3mf/
@ 2020-12-28  2:21 Jonas Stein
  0 siblings, 0 replies; 16+ messages in thread
From: Jonas Stein @ 2020-12-28  2:21 UTC (permalink / raw
  To: gentoo-commits

commit:     715ea809cfd359a3180930ac84d72b0eaec1ff6c
Author:     Jonas Stein <jstein <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 02:21:35 2020 +0000
Commit:     Jonas Stein <jstein <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 02:21:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=715ea809

media-libs/lib3mf: metadata QA Fix

Correct tag.

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Jonas Stein <jstein <AT> gentoo.org>

 media-libs/lib3mf/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/lib3mf/metadata.xml b/media-libs/lib3mf/metadata.xml
index ca7507f06ed..8d7147cc063 100644
--- a/media-libs/lib3mf/metadata.xml
+++ b/media-libs/lib3mf/metadata.xml
@@ -7,7 +7,7 @@
 </maintainer>
 <maintainer type="project">
 	<email>proxy-maint@gentoo.org</email>
-	<description>Gentoo Proxy Maintainer Team</description>
+	<name>Proxy Maintainers</name>
 </maintainer>
 <longdescription>
 	Implementation of the 3MF manufacturing file standard from the 3MF


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

* [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3mf/
@ 2021-02-07 17:07 Conrad Kostecki
  0 siblings, 0 replies; 16+ messages in thread
From: Conrad Kostecki @ 2021-02-07 17:07 UTC (permalink / raw
  To: gentoo-commits

commit:     cac03184d63b6755190f7894167d0cdb0d46dbc4
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sun Feb  7 16:00:55 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Feb  7 17:07:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cac03184

media-libs/lib3mf: fix metadata email

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 media-libs/lib3mf/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/lib3mf/metadata.xml b/media-libs/lib3mf/metadata.xml
index 8d7147cc063..0e6ade406c8 100644
--- a/media-libs/lib3mf/metadata.xml
+++ b/media-libs/lib3mf/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-	<email>waebbl@gmail.com</email>
+	<email>waebbl-gentoo@posteo.net</email>
 	<name>Bernd Waibel</name>
 </maintainer>
 <maintainer type="project">


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

* [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3mf/
@ 2021-03-14  8:41 Joonas Niilola
  0 siblings, 0 replies; 16+ messages in thread
From: Joonas Niilola @ 2021-03-14  8:41 UTC (permalink / raw
  To: gentoo-commits

commit:     be84f53c5c124e709f59d9a0f38b12239157ce1e
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 14 08:16:19 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Mar 14 08:41:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be84f53c

media-libs/lib3mf: match default DOCS installation array

 - also add Github page as 2ndary HOMEPAGE.

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-libs/lib3mf/lib3mf-2.1.1.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/media-libs/lib3mf/lib3mf-2.1.1.ebuild b/media-libs/lib3mf/lib3mf-2.1.1.ebuild
index e6fa7ddca77..35900c26454 100644
--- a/media-libs/lib3mf/lib3mf-2.1.1.ebuild
+++ b/media-libs/lib3mf/lib3mf-2.1.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake eapi8-dosym
 
 DESCRIPTION="Implementation of the 3D Manufacturing Format file standard"
-HOMEPAGE="https://3mf.io/"
+HOMEPAGE="https://3mf.io/ https://github.com/3MFConsortium/lib3mf"
 SRC_URI="https://github.com/3MFConsortium/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
@@ -58,7 +58,6 @@ src_configure() {
 }
 
 src_install() {
-	local DOCS=( CONTRIBUTING.md README.md )
 	cmake_src_install
 
 	for suf in abi types implicit; do


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

* [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3mf/
@ 2021-03-14  8:41 Joonas Niilola
  0 siblings, 0 replies; 16+ messages in thread
From: Joonas Niilola @ 2021-03-14  8:41 UTC (permalink / raw
  To: gentoo-commits

commit:     912dfd38e9a2a55f289804a23b083c5b03577064
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Mar 12 21:37:58 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Mar 14 08:41:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=912dfd38

media-libs/lib3mf: bump to 2.1.1

Vulnerability fix (CVE-2021-21772)

Bug: https://bugs.gentoo.org/775362
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-libs/lib3mf/Manifest            |  1 +
 media-libs/lib3mf/lib3mf-2.1.1.ebuild | 67 +++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)

diff --git a/media-libs/lib3mf/Manifest b/media-libs/lib3mf/Manifest
index af5345d038a..8c637f54738 100644
--- a/media-libs/lib3mf/Manifest
+++ b/media-libs/lib3mf/Manifest
@@ -1,2 +1,3 @@
 DIST lib3mf-1.8.1.tar.gz 8415939 BLAKE2B 45652aab8c84eb5d500455db211eb911c6e74decf4fbbb652976847e1b3ea16db9c626bd37cd9669aefc8dea29c424e6518e0517e8f96fa6282771e34f840290 SHA512 f7fd75bcb6472de1595a018e5add516d0d78ab0aee92462b686b77f8d2bef05270e7b737cb7e1d31fc5850815056e753874c2f9ec456a455e8461c4010fe914a
 DIST lib3mf-2.1.0.tar.gz 15882048 BLAKE2B 9466e1fd30d82600dcc52f61709c1430ae3c129358225162a343ec0d7f489e14572882a9c5239ccd63ea66ee7faec1563fa5aa0e788f28d18ad96db0ae7b9f36 SHA512 05f92da9cbbac279baf33fe3a7ce43ff7faad987c4ba08120094406e1a8f9bab2330b47822fa0a84d1558be9c829f3e805782a46ed85b706e7f85cb861d0d4f5
+DIST lib3mf-2.1.1.tar.gz 15917671 BLAKE2B eacf066147d5c4e15f79d374a377b5ef3b4bc8b4db20ca29e95df5cded11420874ab2df8b5bc48d4a47bbbb6bcb28390e72dae422ad43d5df4d1fd0cd4ed4878 SHA512 43b1091721e994adfa8390ed6542dc207b62dee278d8747fcca044692a72123c3445d4e7795d5476d15bb535fd1a3ce1da2c2796ab8edb28eb66528778fec846

diff --git a/media-libs/lib3mf/lib3mf-2.1.1.ebuild b/media-libs/lib3mf/lib3mf-2.1.1.ebuild
new file mode 100644
index 00000000000..e6fa7ddca77
--- /dev/null
+++ b/media-libs/lib3mf/lib3mf-2.1.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake eapi8-dosym
+
+DESCRIPTION="Implementation of the 3D Manufacturing Format file standard"
+HOMEPAGE="https://3mf.io/"
+SRC_URI="https://github.com/3MFConsortium/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/2"
+# the included ACT binary is a statically x86_64 built one
+# see https://github.com/3MFConsortium/lib3mf/issues/199
+# no package available for ACT yet in Gentoo.
+# Keywords x86 and arm64 can be re-added after we have a package
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libzip:=
+	sys-apps/util-linux
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-cpp/gtest
+		dev-libs/openssl
+		dev-util/valgrind
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-0001-Gentoo-specific-avoid-pre-stripping-library.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_INCLUDEDIR="include/${PN}"
+		-DLIB3MF_TESTS=$(usex test)
+		-DUSE_INCLUDED_LIBZIP=OFF
+		-DUSE_INCLUDED_ZLIB=OFF
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DUSE_INCLUDED_GTEST=OFF
+			# code says it uses libressl, but works with openssl too
+			-DUSE_INCLUDED_SSL=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	local DOCS=( CONTRIBUTING.md README.md )
+	cmake_src_install
+
+	for suf in abi types implicit; do
+		dosym8 -r /usr/include/${PN}/Bindings/Cpp/${PN}_${suf}.hpp /usr/include/${PN}/${PN}_${suf}.hpp
+	done
+}


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

* [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3mf/
@ 2021-03-14  8:41 Joonas Niilola
  0 siblings, 0 replies; 16+ messages in thread
From: Joonas Niilola @ 2021-03-14  8:41 UTC (permalink / raw
  To: gentoo-commits

commit:     ffa8a6df6713135af0ed9c29c036d2ec5633e539
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Mar 12 21:40:45 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Mar 14 08:41:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffa8a6df

media-libs/lib3mf: drop 2.1.0

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/19903
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-libs/lib3mf/Manifest            |  1 -
 media-libs/lib3mf/lib3mf-2.1.0.ebuild | 66 -----------------------------------
 2 files changed, 67 deletions(-)

diff --git a/media-libs/lib3mf/Manifest b/media-libs/lib3mf/Manifest
index 8c637f54738..de9e1b85980 100644
--- a/media-libs/lib3mf/Manifest
+++ b/media-libs/lib3mf/Manifest
@@ -1,3 +1,2 @@
 DIST lib3mf-1.8.1.tar.gz 8415939 BLAKE2B 45652aab8c84eb5d500455db211eb911c6e74decf4fbbb652976847e1b3ea16db9c626bd37cd9669aefc8dea29c424e6518e0517e8f96fa6282771e34f840290 SHA512 f7fd75bcb6472de1595a018e5add516d0d78ab0aee92462b686b77f8d2bef05270e7b737cb7e1d31fc5850815056e753874c2f9ec456a455e8461c4010fe914a
-DIST lib3mf-2.1.0.tar.gz 15882048 BLAKE2B 9466e1fd30d82600dcc52f61709c1430ae3c129358225162a343ec0d7f489e14572882a9c5239ccd63ea66ee7faec1563fa5aa0e788f28d18ad96db0ae7b9f36 SHA512 05f92da9cbbac279baf33fe3a7ce43ff7faad987c4ba08120094406e1a8f9bab2330b47822fa0a84d1558be9c829f3e805782a46ed85b706e7f85cb861d0d4f5
 DIST lib3mf-2.1.1.tar.gz 15917671 BLAKE2B eacf066147d5c4e15f79d374a377b5ef3b4bc8b4db20ca29e95df5cded11420874ab2df8b5bc48d4a47bbbb6bcb28390e72dae422ad43d5df4d1fd0cd4ed4878 SHA512 43b1091721e994adfa8390ed6542dc207b62dee278d8747fcca044692a72123c3445d4e7795d5476d15bb535fd1a3ce1da2c2796ab8edb28eb66528778fec846

diff --git a/media-libs/lib3mf/lib3mf-2.1.0.ebuild b/media-libs/lib3mf/lib3mf-2.1.0.ebuild
deleted file mode 100644
index 39ab6d0de47..00000000000
--- a/media-libs/lib3mf/lib3mf-2.1.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Implementation of the 3D Manufacturing Format file standard"
-HOMEPAGE="https://3mf.io/"
-SRC_URI="https://github.com/3MFConsortium/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/2"
-# the included ACT binary is a statically x86_64 built one
-# see https://github.com/3MFConsortium/lib3mf/issues/199
-# no package available for ACT yet in Gentoo.
-# Keywords x86 and arm64 can be re-added after we have a package
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libzip:=
-	sys-apps/util-linux
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-cpp/gtest
-		dev-libs/openssl
-		dev-util/valgrind
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-0001-Gentoo-specific-avoid-pre-stripping-library.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_INCLUDEDIR="include/${PN}"
-		-DLIB3MF_TESTS=$(usex test)
-		-DUSE_INCLUDED_LIBZIP=OFF
-		-DUSE_INCLUDED_ZLIB=OFF
-	)
-
-	if use test; then
-		mycmakeargs+=(
-			-DUSE_INCLUDED_GTEST=OFF
-			# code says it uses libressl, but works with openssl too
-			-DUSE_INCLUDED_SSL=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	local DOCS=( CONTRIBUTING.md README.md )
-	cmake_src_install
-
-	cd "${ED}/usr/include/${PN}" || die
-	ln -sf Bindings/Cpp/${PN}_{abi,types,implicit}.hpp . || die
-}


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

* [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3mf/
@ 2021-04-10  4:24 Sam James
  0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2021-04-10  4:24 UTC (permalink / raw
  To: gentoo-commits

commit:     c420d144852628898e1959f2bf8ffea1bb28c5f9
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Tue Apr  6 18:37:37 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 10 04:24:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c420d144

media-libs/lib3mf: drop 2.1.1

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/20280
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/lib3mf/lib3mf-2.1.1.ebuild | 66 -----------------------------------
 1 file changed, 66 deletions(-)

diff --git a/media-libs/lib3mf/lib3mf-2.1.1.ebuild b/media-libs/lib3mf/lib3mf-2.1.1.ebuild
deleted file mode 100644
index 35900c26454..00000000000
--- a/media-libs/lib3mf/lib3mf-2.1.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake eapi8-dosym
-
-DESCRIPTION="Implementation of the 3D Manufacturing Format file standard"
-HOMEPAGE="https://3mf.io/ https://github.com/3MFConsortium/lib3mf"
-SRC_URI="https://github.com/3MFConsortium/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/2"
-# the included ACT binary is a statically x86_64 built one
-# see https://github.com/3MFConsortium/lib3mf/issues/199
-# no package available for ACT yet in Gentoo.
-# Keywords x86 and arm64 can be re-added after we have a package
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libzip:=
-	sys-apps/util-linux
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-cpp/gtest
-		dev-libs/openssl
-		dev-util/valgrind
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-0001-Gentoo-specific-avoid-pre-stripping-library.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_INCLUDEDIR="include/${PN}"
-		-DLIB3MF_TESTS=$(usex test)
-		-DUSE_INCLUDED_LIBZIP=OFF
-		-DUSE_INCLUDED_ZLIB=OFF
-	)
-
-	if use test; then
-		mycmakeargs+=(
-			-DUSE_INCLUDED_GTEST=OFF
-			# code says it uses libressl, but works with openssl too
-			-DUSE_INCLUDED_SSL=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	for suf in abi types implicit; do
-		dosym8 -r /usr/include/${PN}/Bindings/Cpp/${PN}_${suf}.hpp /usr/include/${PN}/${PN}_${suf}.hpp
-	done
-}


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

* [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3mf/
@ 2021-04-27 18:01 Sam James
  0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2021-04-27 18:01 UTC (permalink / raw
  To: gentoo-commits

commit:     ea882d68ed1268f4d5e352b19453b23b7e81aee7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 27 18:01:03 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 27 18:01:03 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea882d68

media-libs/lib3mf: Stabilize 2.1.1-r1 amd64, #775362

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

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

diff --git a/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild b/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild
index fb5acbc060c..01c62bfb3c5 100644
--- a/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild
+++ b/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0/2"
 # see https://github.com/3MFConsortium/lib3mf/issues/199
 # Keyword arm64 can be re-added after we have dev-go/act
 # package keyworded
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+system-act test"
 RESTRICT="!test? ( test )"
 


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

* [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3mf/
@ 2021-04-27 18:02 Sam James
  0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2021-04-27 18:02 UTC (permalink / raw
  To: gentoo-commits

commit:     9161dd98357f6ece4278333253e651ff0550cff1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 27 18:02:04 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 27 18:02:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9161dd98

media-libs/lib3mf: Stabilize 2.1.1-r1 x86, #775362

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

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

diff --git a/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild b/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild
index 01c62bfb3c5..8c78f7e2ecd 100644
--- a/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild
+++ b/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0/2"
 # see https://github.com/3MFConsortium/lib3mf/issues/199
 # Keyword arm64 can be re-added after we have dev-go/act
 # package keyworded
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+system-act test"
 RESTRICT="!test? ( test )"
 


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

* [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3mf/
@ 2021-04-27 23:53 Sam James
  0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2021-04-27 23:53 UTC (permalink / raw
  To: gentoo-commits

commit:     a544edc9ed5e1cb599f3995aa3c725c293d89e22
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 27 23:52:59 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 27 23:53:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a544edc9

media-libs/lib3mf: Keyword 2.1.1-r1 arm64, #785880

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

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

diff --git a/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild b/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild
index 8c78f7e2ecd..f2853dab0b2 100644
--- a/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild
+++ b/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0/2"
 # see https://github.com/3MFConsortium/lib3mf/issues/199
 # Keyword arm64 can be re-added after we have dev-go/act
 # package keyworded
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+system-act test"
 RESTRICT="!test? ( test )"
 


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

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

commit:     7cef58d59b8a6be2793192b42c47128a497de04a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  5 22:04:07 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec  5 22:04:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cef58d5

media-libs/lib3mf: Stabilize 2.2.0 amd64, #828363

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

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

diff --git a/media-libs/lib3mf/lib3mf-2.2.0.ebuild b/media-libs/lib3mf/lib3mf-2.2.0.ebuild
index d37a2212018b..b610255ab76b 100644
--- a/media-libs/lib3mf/lib3mf-2.2.0.ebuild
+++ b/media-libs/lib3mf/lib3mf-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/3MFConsortium/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0/2"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="+system-act test"
 RESTRICT="!test? ( test )"
 


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

* [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3mf/
@ 2021-12-06 11:31 Agostino Sarubbo
  0 siblings, 0 replies; 16+ messages in thread
From: Agostino Sarubbo @ 2021-12-06 11:31 UTC (permalink / raw
  To: gentoo-commits

commit:     06a3e8445181e87efd4f6088bb14a8d2430807ee
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  6 11:30:38 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Dec  6 11:30:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06a3e844

media-libs/lib3mf: x86 stable wrt bug #828363

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

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

diff --git a/media-libs/lib3mf/lib3mf-2.2.0.ebuild b/media-libs/lib3mf/lib3mf-2.2.0.ebuild
index b610255ab76b..65a29e035e5e 100644
--- a/media-libs/lib3mf/lib3mf-2.2.0.ebuild
+++ b/media-libs/lib3mf/lib3mf-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/3MFConsortium/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0/2"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+system-act test"
 RESTRICT="!test? ( test )"
 


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

* [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3mf/
@ 2023-12-03  5:45 Arthur Zamarin
  0 siblings, 0 replies; 16+ messages in thread
From: Arthur Zamarin @ 2023-12-03  5:45 UTC (permalink / raw
  To: gentoo-commits

commit:     62b7d0c77c66a6a6511abf81b91871bd2ff67b85
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  3 05:44:48 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 05:44:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62b7d0c7

media-libs/lib3mf: Keyword 2.2.0 ppc64, #886101

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

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

diff --git a/media-libs/lib3mf/lib3mf-2.2.0.ebuild b/media-libs/lib3mf/lib3mf-2.2.0.ebuild
index a9fa3aeee64c..6362853ae580 100644
--- a/media-libs/lib3mf/lib3mf-2.2.0.ebuild
+++ b/media-libs/lib3mf/lib3mf-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/3MFConsortium/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0/2"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="+system-act test"
 RESTRICT="!test? ( test )"
 


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

* [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3mf/
@ 2024-11-25 15:44 Sam James
  0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2024-11-25 15:44 UTC (permalink / raw
  To: gentoo-commits

commit:     c93f43e52ce643fb120a663cd51545e48cf6aaf6
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Nov 25 15:37:49 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 15:43:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c93f43e5

media-libs/lib3mf: don't use bundled headers

The includes are hardcoded. This is fixed in newer releases, so instead of
patching we just link the system includes to the place where they are expected.

Closes: https://bugs.gentoo.org/944790
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/lib3mf/{lib3mf-2.2.0.ebuild => lib3mf-2.2.0-r1.ebuild} | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/media-libs/lib3mf/lib3mf-2.2.0.ebuild b/media-libs/lib3mf/lib3mf-2.2.0-r1.ebuild
similarity index 88%
rename from media-libs/lib3mf/lib3mf-2.2.0.ebuild
rename to media-libs/lib3mf/lib3mf-2.2.0-r1.ebuild
index d5d470010791..c980abe83fef 100644
--- a/media-libs/lib3mf/lib3mf-2.2.0.ebuild
+++ b/media-libs/lib3mf/lib3mf-2.2.0-r1.ebuild
@@ -39,6 +39,14 @@ PATCHES=(
 	"${FILESDIR}"/${P}-include-cstdint.patch
 )
 
+src_prepare() {
+	cmake_src_prepare
+
+	rm -r Include/Libraries/{libzip,zlib} || die
+	ln -s "${EPREFIX}/usr/include" Include/Libraries/zlib || die
+	ln -s "${EPREFIX}/usr/include" Include/Libraries/libzip || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_INCLUDEDIR="include/${PN}"


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

end of thread, other threads:[~2024-11-25 15:44 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-14  8:41 [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3mf/ Joonas Niilola
  -- strict thread matches above, loose matches on Subject: below --
2024-11-25 15:44 Sam James
2023-12-03  5:45 Arthur Zamarin
2021-12-06 11:31 Agostino Sarubbo
2021-12-05 22:04 Sam James
2021-04-27 23:53 Sam James
2021-04-27 18:02 Sam James
2021-04-27 18:01 Sam James
2021-04-10  4:24 Sam James
2021-03-14  8:41 Joonas Niilola
2021-03-14  8:41 Joonas Niilola
2021-02-07 17:07 Conrad Kostecki
2020-12-28  2:21 Jonas Stein
2020-11-20 14:59 Joonas Niilola
2020-11-20 14:59 Joonas Niilola
2020-08-25 10:25 Sam James

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