public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2015-09-06 19:40 Thomas Kahle
  0 siblings, 0 replies; 61+ messages in thread
From: Thomas Kahle @ 2015-09-06 19:40 UTC (permalink / raw
  To: gentoo-commits

commit:     b3a239c41ebed8098aa5db076001b826d96945f3
Author:     Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  6 19:40:38 2015 +0000
Commit:     Thomas Kahle <tomka <AT> gentoo <DOT> org>
CommitDate: Sun Sep  6 19:40:53 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3a239c4

media-gfx/openscad: Remove old

Package-Manager: portage-2.2.20.1

 media-gfx/openscad/Manifest                |  2 --
 media-gfx/openscad/openscad-2013.06.ebuild | 37 ------------------------------
 media-gfx/openscad/openscad-2014.03.ebuild | 37 ------------------------------
 3 files changed, 76 deletions(-)

diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 427f329..4adfe12 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1,3 +1 @@
-DIST openscad-2013.06.src.tar.gz 4083085 SHA256 f277a8c3e6a548272f95279e50de6d4a6d73552775ab7a33c7f837c8e59173df SHA512 b0993c5a4517ebc13b88bc0167f9fc73d12a6a97938f0b6f6b1e5e436e1fb4704f6ff6a181c51f4cd0fb64c49493296d7172914ec5ae03c26a78da505a32edfc WHIRLPOOL 4a0366b0c6ae0aab91172af2c85a5ad785e5ad3526c3370350b813cda03fd3fb15d03a107e6d1f5e96c03fd6fbe9325f3b66c5c332d2bf0404bfde1eec8e48a1
-DIST openscad-2014.03.src.tar.gz 4417283 SHA256 865fdc637a3ceb0678d35e88995411d8e70e8a7937625d7ede147a1570a561c3 SHA512 32398f6d31109a77215972452740ac5612db34dc08613166f0c7e91ce117c0476c34a8282e9e1ba500bfbff56a60e81573605f2a7ca979b146686341c897e3f5 WHIRLPOOL 6caa2a74fb3f554b615f94576c481d9d309f74dc87a6d76e8d8d0b5577cc6b8a2b859f3ba044b191acf06228247988e43885d7344f76355f1c70264a5dc9c9e1
 DIST openscad-2015.03.src.tar.gz 12748351 SHA256 68ce08adc9e90c606ad948fe0f3405ce62b03b6bf34c45dd3dfc6b20c1846182 SHA512 dadabe86c4897e1e074f67d7a94fb4a3813dd4e89997ec9106b343a4d015b88aef17c91b7b6351ef4ae08ff1da6cbb7ae92fcf89c271746a665e3422d4a3fe23 WHIRLPOOL 83540fc42d2b57d06a49030894f407d9eb68bdeec67e1028cb0f0bbe51d7872eab15103c25290a4243457e3f570a296fcb8a51efac9f28caf7b6c2d71d22f8d3

diff --git a/media-gfx/openscad/openscad-2013.06.ebuild b/media-gfx/openscad/openscad-2013.06.ebuild
deleted file mode 100644
index d840086..0000000
--- a/media-gfx/openscad/openscad-2013.06.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit qt4-r2
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="http://www.openscad.org/"
-SRC_URI="https://openscad.googlecode.com/files/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="media-gfx/opencsg
-	sci-mathematics/cgal
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-cpp/eigen:2
-	dev-libs/gmp
-	dev-libs/mpfr
-	dev-libs/boost:=
-	sys-libs/glibc
-"
-DEPEND="${CDEPEND} sys-devel/gcc"
-RDEPEND="${CDEPEND}"
-
-src_prepare() {
-	#Use our CFLAGS (specifically don't force x86)
-	sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro
-
-	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro
-}

diff --git a/media-gfx/openscad/openscad-2014.03.ebuild b/media-gfx/openscad/openscad-2014.03.ebuild
deleted file mode 100644
index edfdc55..0000000
--- a/media-gfx/openscad/openscad-2014.03.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit qt4-r2
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="http://www.openscad.org/"
-SRC_URI="http://files.openscad.org/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="media-gfx/opencsg
-	sci-mathematics/cgal
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-cpp/eigen:3
-	dev-libs/gmp
-	dev-libs/mpfr
-	dev-libs/boost:=
-	sys-libs/glibc
-"
-DEPEND="${CDEPEND} sys-devel/gcc"
-RDEPEND="${CDEPEND}"
-
-src_prepare() {
-	#Use our CFLAGS (specifically don't force x86)
-	sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro
-
-	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro
-}


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2015-09-06 19:40 Thomas Kahle
  0 siblings, 0 replies; 61+ messages in thread
From: Thomas Kahle @ 2015-09-06 19:40 UTC (permalink / raw
  To: gentoo-commits

commit:     bfa8ac991d8a9a0a15b85df4a664263143056931
Author:     Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  6 19:40:10 2015 +0000
Commit:     Thomas Kahle <tomka <AT> gentoo <DOT> org>
CommitDate: Sun Sep  6 19:40:52 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfa8ac99

media-gfx/openscad: Bump to 2015.03 (Bug 545404)

Package-Manager: portage-2.2.20.1

 media-gfx/openscad/Manifest                |  1 +
 media-gfx/openscad/openscad-2015.03.ebuild | 37 ++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 335ddd5..427f329 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1,2 +1,3 @@
 DIST openscad-2013.06.src.tar.gz 4083085 SHA256 f277a8c3e6a548272f95279e50de6d4a6d73552775ab7a33c7f837c8e59173df SHA512 b0993c5a4517ebc13b88bc0167f9fc73d12a6a97938f0b6f6b1e5e436e1fb4704f6ff6a181c51f4cd0fb64c49493296d7172914ec5ae03c26a78da505a32edfc WHIRLPOOL 4a0366b0c6ae0aab91172af2c85a5ad785e5ad3526c3370350b813cda03fd3fb15d03a107e6d1f5e96c03fd6fbe9325f3b66c5c332d2bf0404bfde1eec8e48a1
 DIST openscad-2014.03.src.tar.gz 4417283 SHA256 865fdc637a3ceb0678d35e88995411d8e70e8a7937625d7ede147a1570a561c3 SHA512 32398f6d31109a77215972452740ac5612db34dc08613166f0c7e91ce117c0476c34a8282e9e1ba500bfbff56a60e81573605f2a7ca979b146686341c897e3f5 WHIRLPOOL 6caa2a74fb3f554b615f94576c481d9d309f74dc87a6d76e8d8d0b5577cc6b8a2b859f3ba044b191acf06228247988e43885d7344f76355f1c70264a5dc9c9e1
+DIST openscad-2015.03.src.tar.gz 12748351 SHA256 68ce08adc9e90c606ad948fe0f3405ce62b03b6bf34c45dd3dfc6b20c1846182 SHA512 dadabe86c4897e1e074f67d7a94fb4a3813dd4e89997ec9106b343a4d015b88aef17c91b7b6351ef4ae08ff1da6cbb7ae92fcf89c271746a665e3422d4a3fe23 WHIRLPOOL 83540fc42d2b57d06a49030894f407d9eb68bdeec67e1028cb0f0bbe51d7872eab15103c25290a4243457e3f570a296fcb8a51efac9f28caf7b6c2d71d22f8d3

diff --git a/media-gfx/openscad/openscad-2015.03.ebuild b/media-gfx/openscad/openscad-2015.03.ebuild
new file mode 100644
index 0000000..994c013
--- /dev/null
+++ b/media-gfx/openscad/openscad-2015.03.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qt4-r2
+
+DESCRIPTION="The Programmers Solid 3D CAD Modeller"
+HOMEPAGE="http://www.openscad.org/"
+SRC_URI="http://files.openscad.org/${P}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="media-gfx/opencsg
+	sci-mathematics/cgal
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4
+	dev-cpp/eigen:3
+	dev-libs/gmp:0
+	dev-libs/mpfr:0
+	dev-libs/boost:=
+	x11-libs/qscintilla
+"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}"
+
+src_prepare() {
+	#Use our CFLAGS (specifically don't force x86)
+	sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro
+
+	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro
+}


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2015-09-07  7:14 Thomas Kahle
  0 siblings, 0 replies; 61+ messages in thread
From: Thomas Kahle @ 2015-09-07  7:14 UTC (permalink / raw
  To: gentoo-commits

commit:     4526ec793e76d0b48fddc35d3b7680fdbcd9b1b3
Author:     Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  7 07:14:19 2015 +0000
Commit:     Thomas Kahle <tomka <AT> gentoo <DOT> org>
CommitDate: Mon Sep  7 07:14:37 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4526ec79

media-gfx/openscad: Add "|| die", fix copyright.

Package-Manager: portage-2.2.20.1

 media-gfx/openscad/openscad-2015.03.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-gfx/openscad/openscad-2015.03.ebuild b/media-gfx/openscad/openscad-2015.03.ebuild
index 994c013..3248a78 100644
--- a/media-gfx/openscad/openscad-2015.03.ebuild
+++ b/media-gfx/openscad/openscad-2015.03.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -31,7 +31,7 @@ RDEPEND="${CDEPEND}"
 
 src_prepare() {
 	#Use our CFLAGS (specifically don't force x86)
-	sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro
+	sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro  || die
 
-	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro
+	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
 }


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2016-03-30 13:39 Michael Palimaka
  0 siblings, 0 replies; 61+ messages in thread
From: Michael Palimaka @ 2016-03-30 13:39 UTC (permalink / raw
  To: gentoo-commits

commit:     0d2b3ad098e2b733b572eb6d5105aada9bf61db1
Author:     Matthew Brewer <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Fri Mar 18 22:20:05 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 13:38:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d2b3ad0

media-gfx/openscad: version bump to 2015.03_p2 & bugfix

- bump to patchlevel 2
- fix segfault when using with qt{opengl,gui}:4[egl] -> enforce USE=-egl
- update dependency list
- port to EAPI 6

Package-Manager: portage-2.2.28
RepoMan-Options: --ignore-arches

 media-gfx/openscad/Manifest                   |  1 +
 media-gfx/openscad/openscad-2015.03_p2.ebuild | 54 +++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)

diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 4adfe12..e20746e 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1 +1,2 @@
+DIST openscad-2015.03-2.src.tar.gz 13307974 SHA256 a2535bb9e27d96e10e1e19268a596155164c7129d410a0c7f96edc2d09400083 SHA512 66e93715987a5211ce15c10ea39a9fec3296b606ace0aba1cda019635d5b26021457c8e49f389daa90a0da02e41007eab662e1ed6608cb51c24de00253b9783f WHIRLPOOL 1454a22464f5dcf9726d5bb4fa5f7c080e419e44a3877a5ac43590e2b0552ecb169a9d2a9e15868c8020ffcfb894fc84f0269460f032f516ec9286f27155ca73
 DIST openscad-2015.03.src.tar.gz 12748351 SHA256 68ce08adc9e90c606ad948fe0f3405ce62b03b6bf34c45dd3dfc6b20c1846182 SHA512 dadabe86c4897e1e074f67d7a94fb4a3813dd4e89997ec9106b343a4d015b88aef17c91b7b6351ef4ae08ff1da6cbb7ae92fcf89c271746a665e3422d4a3fe23 WHIRLPOOL 83540fc42d2b57d06a49030894f407d9eb68bdeec67e1028cb0f0bbe51d7872eab15103c25290a4243457e3f570a296fcb8a51efac9f28caf7b6c2d71d22f8d3

diff --git a/media-gfx/openscad/openscad-2015.03_p2.ebuild b/media-gfx/openscad/openscad-2015.03_p2.ebuild
new file mode 100644
index 0000000..fbd76ed
--- /dev/null
+++ b/media-gfx/openscad/openscad-2015.03_p2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils qmake-utils
+
+MY_PV="2015.03-2"
+
+DESCRIPTION="The Programmers Solid 3D CAD Modeller"
+HOMEPAGE="http://www.openscad.org/"
+SRC_URI="http://files.openscad.org/${PN}-${MY_PV}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="media-gfx/opencsg
+	sci-mathematics/cgal
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4[-egl]
+	dev-qt/qtopengl:4[-egl]
+	dev-cpp/eigen:3
+	dev-libs/glib:2
+	dev-libs/gmp:0
+	dev-libs/mpfr:0
+	dev-libs/boost:=
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	media-libs/glew
+	media-libs/harfbuzz
+	x11-libs/qscintilla"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	#Use our CFLAGS (specifically don't force x86)
+	sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro  || die
+	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
+
+	eapply_user
+}
+
+src_configure() {
+	eqmake4 "${PN}.pro"
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+	einstalldocs
+}


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2016-08-06  9:16 Pacho Ramos
  0 siblings, 0 replies; 61+ messages in thread
From: Pacho Ramos @ 2016-08-06  9:16 UTC (permalink / raw
  To: gentoo-commits

commit:     ae322fb9cc89724c306ed209723a036c687e7eae
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  6 08:57:55 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Aug  6 09:16:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae322fb9

media-gfx/openscad: Cleanup per bug #66633

Package-Manager: portage-2.3.0

 media-gfx/openscad/metadata.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml
index 0da060e..91febb0 100644
--- a/media-gfx/openscad/metadata.xml
+++ b/media-gfx/openscad/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>mattm@gentoo.org</email>
-<name>Matthew Marlowe</name>
-</maintainer>
 <longdescription>
 OpenSCAD is a software for creating solid 3D CAD objects.  Unlike most free software for creating 3D models (such as the famous application Blender) it does not focus on the artistic aspects of 3D modelling but instead on the CAD aspects. Thus it might be the application you are looking for when you are planning to create 3D models of machine parts but pretty sure is not what you are looking for when you are more interested in creating computer-animated movies.  OpenSCAD is free software and available for Linux/UNIX, MS Windows and Mac OS X.
 </longdescription>


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2016-12-22 18:26 David Seifert
  0 siblings, 0 replies; 61+ messages in thread
From: David Seifert @ 2016-12-22 18:26 UTC (permalink / raw
  To: gentoo-commits

commit:     791f8f81463ba8f3c63b3d3ea4c791f73dd0869b
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 17:46:39 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 18:26:20 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=791f8f81

media-gfx/openscad: Depend on x11-libs/qscintilla[qt4]

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3188

 .../{openscad-2015.03.ebuild => openscad-2015.03-r1.ebuild}       | 4 ++--
 .../{openscad-2015.03_p2.ebuild => openscad-2015.03_p2-r1.ebuild} | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/media-gfx/openscad/openscad-2015.03.ebuild b/media-gfx/openscad/openscad-2015.03-r1.ebuild
similarity index 90%
rename from media-gfx/openscad/openscad-2015.03.ebuild
rename to media-gfx/openscad/openscad-2015.03-r1.ebuild
index 3248a78..d47be31 100644
--- a/media-gfx/openscad/openscad-2015.03.ebuild
+++ b/media-gfx/openscad/openscad-2015.03-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,7 +24,7 @@ CDEPEND="media-gfx/opencsg
 	dev-libs/gmp:0
 	dev-libs/mpfr:0
 	dev-libs/boost:=
-	x11-libs/qscintilla
+	x11-libs/qscintilla:=[qt4(-)]
 "
 DEPEND="${CDEPEND}"
 RDEPEND="${CDEPEND}"

diff --git a/media-gfx/openscad/openscad-2015.03_p2.ebuild b/media-gfx/openscad/openscad-2015.03_p2-r1.ebuild
similarity index 91%
rename from media-gfx/openscad/openscad-2015.03_p2.ebuild
rename to media-gfx/openscad/openscad-2015.03_p2-r1.ebuild
index fbd76ed..6839901 100644
--- a/media-gfx/openscad/openscad-2015.03_p2.ebuild
+++ b/media-gfx/openscad/openscad-2015.03_p2-r1.ebuild
@@ -24,14 +24,14 @@ CDEPEND="media-gfx/opencsg
 	dev-qt/qtopengl:4[-egl]
 	dev-cpp/eigen:3
 	dev-libs/glib:2
-	dev-libs/gmp:0
-	dev-libs/mpfr:0
+	dev-libs/gmp:0=
+	dev-libs/mpfr:0=
 	dev-libs/boost:=
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
-	media-libs/glew
+	media-libs/glew:*
 	media-libs/harfbuzz
-	x11-libs/qscintilla"
+	x11-libs/qscintilla:=[qt4(-)]"
 DEPEND="${CDEPEND}"
 RDEPEND="${CDEPEND}"
 S="${WORKDIR}/${PN}-${MY_PV}"


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2017-05-14 11:02 Michael Weber
  0 siblings, 0 replies; 61+ messages in thread
From: Michael Weber @ 2017-05-14 11:02 UTC (permalink / raw
  To: gentoo-commits

commit:     e5db500c4cd86e6bb43e3571886811c6367a37f4
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 10:07:36 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sun May 14 11:02:31 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5db500c

media-gfx/openscad: Add myself as maintainer.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 media-gfx/openscad/metadata.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml
index 91febb0c874..9e07fd9d783 100644
--- a/media-gfx/openscad/metadata.xml
+++ b/media-gfx/openscad/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<longdescription>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>michael weber</name>
+	</maintainer>
+	<longdescription>
 OpenSCAD is a software for creating solid 3D CAD objects.  Unlike most free software for creating 3D models (such as the famous application Blender) it does not focus on the artistic aspects of 3D modelling but instead on the CAD aspects. Thus it might be the application you are looking for when you are planning to create 3D models of machine parts but pretty sure is not what you are looking for when you are more interested in creating computer-animated movies.  OpenSCAD is free software and available for Linux/UNIX, MS Windows and Mac OS X.
-</longdescription>
-<use>
-</use>
+	</longdescription>
 </pkgmetadata>


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2017-05-14 11:02 Michael Weber
  0 siblings, 0 replies; 61+ messages in thread
From: Michael Weber @ 2017-05-14 11:02 UTC (permalink / raw
  To: gentoo-commits

commit:     82736ed12f606f664fd3df1e75cc4d2b12f9de66
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 10:08:48 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sun May 14 11:02:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82736ed1

media-gfx/openscad: Remove old version.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 media-gfx/openscad/Manifest                   |  1 -
 media-gfx/openscad/openscad-2015.03-r1.ebuild | 36 ---------------------------
 2 files changed, 37 deletions(-)

diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index e20746eab02..82ffdba7053 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1,2 +1 @@
 DIST openscad-2015.03-2.src.tar.gz 13307974 SHA256 a2535bb9e27d96e10e1e19268a596155164c7129d410a0c7f96edc2d09400083 SHA512 66e93715987a5211ce15c10ea39a9fec3296b606ace0aba1cda019635d5b26021457c8e49f389daa90a0da02e41007eab662e1ed6608cb51c24de00253b9783f WHIRLPOOL 1454a22464f5dcf9726d5bb4fa5f7c080e419e44a3877a5ac43590e2b0552ecb169a9d2a9e15868c8020ffcfb894fc84f0269460f032f516ec9286f27155ca73
-DIST openscad-2015.03.src.tar.gz 12748351 SHA256 68ce08adc9e90c606ad948fe0f3405ce62b03b6bf34c45dd3dfc6b20c1846182 SHA512 dadabe86c4897e1e074f67d7a94fb4a3813dd4e89997ec9106b343a4d015b88aef17c91b7b6351ef4ae08ff1da6cbb7ae92fcf89c271746a665e3422d4a3fe23 WHIRLPOOL 83540fc42d2b57d06a49030894f407d9eb68bdeec67e1028cb0f0bbe51d7872eab15103c25290a4243457e3f570a296fcb8a51efac9f28caf7b6c2d71d22f8d3

diff --git a/media-gfx/openscad/openscad-2015.03-r1.ebuild b/media-gfx/openscad/openscad-2015.03-r1.ebuild
deleted file mode 100644
index e0c69fafd21..00000000000
--- a/media-gfx/openscad/openscad-2015.03-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-r2
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="http://www.openscad.org/"
-SRC_URI="http://files.openscad.org/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="media-gfx/opencsg
-	sci-mathematics/cgal
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-cpp/eigen:3
-	dev-libs/gmp:0
-	dev-libs/mpfr:0
-	dev-libs/boost:=
-	x11-libs/qscintilla:=[qt4(-)]
-"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}"
-
-src_prepare() {
-	#Use our CFLAGS (specifically don't force x86)
-	sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro  || die
-
-	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
-}


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2017-05-15  8:44 Michael Weber
  0 siblings, 0 replies; 61+ messages in thread
From: Michael Weber @ 2017-05-15  8:44 UTC (permalink / raw
  To: gentoo-commits

commit:     a910dddc689ee97092a4fed5008ad453d7d77fd2
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Mon May 15 08:43:50 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon May 15 08:44:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a910dddc

media-gfx/openscad: Add live ebuild.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 media-gfx/openscad/openscad-9999.ebuild | 64 +++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
new file mode 100644
index 00000000000..95b2d243082
--- /dev/null
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp-common eutils git-r3 qmake-utils
+
+SITEFILE="50${PN}-gentoo.el"
+
+DESCRIPTION="The Programmers Solid 3D CAD Modeller"
+HOMEPAGE="http://www.openscad.org/"
+EGIT_REPO_URI="https://github.com/openscad/openscad.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="emacs"
+
+DEPEND="media-gfx/opencsg
+	sci-mathematics/cgal
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4[-egl]
+	dev-qt/qtopengl:4[-egl]
+	dev-cpp/eigen:3
+	dev-libs/glib:2
+	dev-libs/gmp:0=
+	dev-libs/mpfr:0=
+	dev-libs/boost:=
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	media-libs/glew:*
+	media-libs/harfbuzz
+	x11-libs/qscintilla:=[qt4(-)]
+	emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
+
+	default
+}
+
+src_configure() {
+	eqmake4 "${PN}.pro"
+}
+
+src_compile() {
+	default
+
+	if use emacs ; then
+		elisp-compile contrib/*.el
+	fi
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		elisp-install ${PN} contrib/*.el contrib/*.elc
+	fi
+
+	einstalldocs
+}


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2017-10-21 21:24 Andreas Sturmlechner
  0 siblings, 0 replies; 61+ messages in thread
From: Andreas Sturmlechner @ 2017-10-21 21:24 UTC (permalink / raw
  To: gentoo-commits

commit:     047b2f23eab10ac6d03bd3a0f1f97c4f70d687e0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 21 21:21:01 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 21 21:24:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=047b2f23

media-gfx/openscad: Cleanup Qt4-based

Gentoo-bug: 623610
Package-Manager: Portage-2.3.12, Repoman-2.3.3

 media-gfx/openscad/openscad-2015.03_p2-r1.ebuild | 53 ------------------
 media-gfx/openscad/openscad-2015.03_p2-r2.ebuild | 69 ------------------------
 2 files changed, 122 deletions(-)

diff --git a/media-gfx/openscad/openscad-2015.03_p2-r1.ebuild b/media-gfx/openscad/openscad-2015.03_p2-r1.ebuild
deleted file mode 100644
index 1b882516d55..00000000000
--- a/media-gfx/openscad/openscad-2015.03_p2-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils qmake-utils
-
-MY_PV="2015.03-2"
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="http://www.openscad.org/"
-SRC_URI="http://files.openscad.org/${PN}-${MY_PV}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="media-gfx/opencsg
-	sci-mathematics/cgal
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4[-egl]
-	dev-qt/qtopengl:4[-egl]
-	dev-cpp/eigen:3
-	dev-libs/glib:2
-	dev-libs/gmp:0=
-	dev-libs/mpfr:0=
-	dev-libs/boost:=
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	media-libs/glew:*
-	media-libs/harfbuzz
-	x11-libs/qscintilla:=[qt4(-)]"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	#Use our CFLAGS (specifically don't force x86)
-	sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro  || die
-	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
-
-	eapply_user
-}
-
-src_configure() {
-	eqmake4 "${PN}.pro"
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-	einstalldocs
-}

diff --git a/media-gfx/openscad/openscad-2015.03_p2-r2.ebuild b/media-gfx/openscad/openscad-2015.03_p2-r2.ebuild
deleted file mode 100644
index 67206bfa9e1..00000000000
--- a/media-gfx/openscad/openscad-2015.03_p2-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp-common eutils qmake-utils
-
-MY_PV="2015.03-2"
-SITEFILE="50${PN}-gentoo.el"
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="http://www.openscad.org/"
-SRC_URI="http://files.openscad.org/${PN}-${MY_PV}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs"
-
-DEPEND="media-gfx/opencsg
-	sci-mathematics/cgal
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4[-egl]
-	dev-qt/qtopengl:4[-egl]
-	dev-cpp/eigen:3
-	dev-libs/glib:2
-	dev-libs/gmp:0=
-	dev-libs/mpfr:0=
-	dev-libs/boost:=
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	media-libs/glew:*
-	media-libs/harfbuzz
-	x11-libs/qscintilla:=[qt4(-)]
-	emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	#Use our CFLAGS (specifically don't force x86)
-	sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro  || die
-	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
-
-	eapply_user
-}
-
-src_configure() {
-	eqmake4 "${PN}.pro"
-}
-
-src_compile() {
-	default
-
-	if use emacs ; then
-		elisp-compile contrib/*.el
-	fi
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		elisp-install ${PN} contrib/*.el contrib/*.elc
-	fi
-
-	einstalldocs
-}


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2017-10-28 16:12 Andreas Sturmlechner
  0 siblings, 0 replies; 61+ messages in thread
From: Andreas Sturmlechner @ 2017-10-28 16:12 UTC (permalink / raw
  To: gentoo-commits

commit:     b9b348edaa83b06af71b414d5dbfffce18d8fcc6
Author:     Sergey Alirzaev <zl29ah <AT> gmail <DOT> com>
AuthorDate: Sat Oct 28 16:10:34 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 16:12:47 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9b348ed

media-gfx/openscad: Needs rebuild on cgal subslot bump

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

 media-gfx/openscad/openscad-2015.03_p2-r3.ebuild | 2 +-
 media-gfx/openscad/openscad-9999.ebuild          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild b/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
index a9e86a2a047..095f06b8303 100644
--- a/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
+++ b/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
@@ -31,7 +31,7 @@ DEPEND="
 	media-libs/freetype:2
 	media-libs/glew:*
 	media-libs/harfbuzz
-	sci-mathematics/cgal
+	sci-mathematics/cgal:=
 	>=x11-libs/qscintilla-2.9.4:=[qt5(+)]
 	emacs? ( virtual/emacs )
 "

diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index 781c41bb5f0..60c55536954 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -30,7 +30,7 @@ DEPEND="
 	media-libs/freetype:2
 	media-libs/glew:*
 	media-libs/harfbuzz
-	sci-mathematics/cgal
+	sci-mathematics/cgal:=
 	>=x11-libs/qscintilla-2.9.4:=[qt5(+)]
 	emacs? ( virtual/emacs )
 "


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2017-12-09  2:19 Michael Weber
  0 siblings, 0 replies; 61+ messages in thread
From: Michael Weber @ 2017-12-09  2:19 UTC (permalink / raw
  To: gentoo-commits

commit:     f94195e5f2326bd4eb26e27e235be911c0f7674a
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  9 02:19:35 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sat Dec  9 02:19:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f94195e5

media-gfx/openscad: Version bump (big thanks to Jesper Saxtorph, bug 635062).

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 media-gfx/openscad/Manifest                   |  1 +
 media-gfx/openscad/openscad-2015.03_p3.ebuild | 83 +++++++++++++++++++++++++++
 2 files changed, 84 insertions(+)

diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 82ffdba7053..98f3831ef4b 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1 +1,2 @@
 DIST openscad-2015.03-2.src.tar.gz 13307974 SHA256 a2535bb9e27d96e10e1e19268a596155164c7129d410a0c7f96edc2d09400083 SHA512 66e93715987a5211ce15c10ea39a9fec3296b606ace0aba1cda019635d5b26021457c8e49f389daa90a0da02e41007eab662e1ed6608cb51c24de00253b9783f WHIRLPOOL 1454a22464f5dcf9726d5bb4fa5f7c080e419e44a3877a5ac43590e2b0552ecb169a9d2a9e15868c8020ffcfb894fc84f0269460f032f516ec9286f27155ca73
+DIST openscad-2015.03-3.src.tar.gz 13309147 BLAKE2B 77f4e934474882e454dad683d9da6a2c9fe699a84c86ed5ebe1755de037f6930870ffb432dedeef3bea7a76cbc98d0f0d0694e5d0f7b469830370ca3548a650c SHA512 b2cee90563bdf2cb9f7b5a0d637b2266f5fcd62add6147c9326b843a5b0975b8ec900d13a2aa86485fce4a5e7e53a08cf4171a3d1d66355e813d01ca9096faee

diff --git a/media-gfx/openscad/openscad-2015.03_p3.ebuild b/media-gfx/openscad/openscad-2015.03_p3.ebuild
new file mode 100644
index 00000000000..4b8ace270bc
--- /dev/null
+++ b/media-gfx/openscad/openscad-2015.03_p3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp-common qmake-utils xdg-utils
+
+MY_PV="2015.03-3"
+SITEFILE="50${PN}-gentoo.el"
+
+DESCRIPTION="The Programmers Solid 3D CAD Modeller"
+HOMEPAGE="http://www.openscad.org/"
+SRC_URI="http://files.openscad.org/${PN}-${MY_PV}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs"
+
+DEPEND="
+	dev-cpp/eigen:3
+	dev-libs/boost:=
+	dev-libs/glib:2
+	dev-libs/gmp:0=
+	dev-libs/mpfr:0=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	>=media-libs/glew-2.0.0:0
+	media-gfx/opencsg
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	media-libs/harfbuzz
+	sci-mathematics/cgal:=
+	>=x11-libs/qscintilla-2.9.4:=[qt5(+)]
+	emacs? ( virtual/emacs )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-2015.03_p2_uic_tr_fix.patch" )
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	default
+
+	#Use our CFLAGS (specifically don't force x86)
+	sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro  || die
+	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
+}
+
+src_configure() {
+	eqmake5 "${PN}.pro"
+}
+
+src_compile() {
+	default
+
+	if use emacs ; then
+		elisp-compile contrib/*.el
+	fi
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		elisp-install ${PN} contrib/*.el contrib/*.elc
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2017-12-09  2:25 Michael Weber
  0 siblings, 0 replies; 61+ messages in thread
From: Michael Weber @ 2017-12-09  2:25 UTC (permalink / raw
  To: gentoo-commits

commit:     ecb67c8676b4502571f22c7a20e880030f089259
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  9 02:25:38 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sat Dec  9 02:25:48 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecb67c86

media-gfx/openscad: DEPEND on dev-qt/qtconcurrent (thanks Pawel Tatera and Volker Wegert, bug 635758).

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 media-gfx/openscad/openscad-2015.03_p2-r3.ebuild | 3 ++-
 media-gfx/openscad/openscad-2015.03_p3.ebuild    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild b/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
index 095f06b8303..7568be2f9ba 100644
--- a/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
+++ b/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
@@ -23,13 +23,14 @@ DEPEND="
 	dev-libs/glib:2
 	dev-libs/gmp:0=
 	dev-libs/mpfr:0=
+	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtopengl:5
 	media-gfx/opencsg
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
-	media-libs/glew:*
+	>=media-libs/glew-2.0.0:*
 	media-libs/harfbuzz
 	sci-mathematics/cgal:=
 	>=x11-libs/qscintilla-2.9.4:=[qt5(+)]

diff --git a/media-gfx/openscad/openscad-2015.03_p3.ebuild b/media-gfx/openscad/openscad-2015.03_p3.ebuild
index 4b8ace270bc..9d5df1d42d0 100644
--- a/media-gfx/openscad/openscad-2015.03_p3.ebuild
+++ b/media-gfx/openscad/openscad-2015.03_p3.ebuild
@@ -23,13 +23,14 @@ DEPEND="
 	dev-libs/glib:2
 	dev-libs/gmp:0=
 	dev-libs/mpfr:0=
+	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtopengl:5
-	>=media-libs/glew-2.0.0:0
 	media-gfx/opencsg
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
+	>=media-libs/glew-2.0.0:*
 	media-libs/harfbuzz
 	sci-mathematics/cgal:=
 	>=x11-libs/qscintilla-2.9.4:=[qt5(+)]


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2017-12-09  2:31 Michael Weber
  0 siblings, 0 replies; 61+ messages in thread
From: Michael Weber @ 2017-12-09  2:31 UTC (permalink / raw
  To: gentoo-commits

commit:     92ac176cfe27c6d72bf25850cbf88230e41ee320
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  9 02:31:14 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sat Dec  9 02:31:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92ac176c

media-gfx/openscad: Depend on qtgui[-gles2] (thanks Jack MacNaught, bug 637074).

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 media-gfx/openscad/openscad-2015.03_p2-r3.ebuild | 2 +-
 media-gfx/openscad/openscad-2015.03_p3.ebuild    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild b/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
index 7568be2f9ba..815a2c46da7 100644
--- a/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
+++ b/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
@@ -25,7 +25,7 @@ DEPEND="
 	dev-libs/mpfr:0=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
-	dev-qt/qtgui:5
+	dev-qt/qtgui:5[-gles2]
 	dev-qt/qtopengl:5
 	media-gfx/opencsg
 	media-libs/fontconfig:1.0

diff --git a/media-gfx/openscad/openscad-2015.03_p3.ebuild b/media-gfx/openscad/openscad-2015.03_p3.ebuild
index 9d5df1d42d0..aee0a681df2 100644
--- a/media-gfx/openscad/openscad-2015.03_p3.ebuild
+++ b/media-gfx/openscad/openscad-2015.03_p3.ebuild
@@ -25,7 +25,7 @@ DEPEND="
 	dev-libs/mpfr:0=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
-	dev-qt/qtgui:5
+	dev-qt/qtgui:5[-gles2]
 	dev-qt/qtopengl:5
 	media-gfx/opencsg
 	media-libs/fontconfig:1.0


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2017-12-09  2:33 Michael Weber
  0 siblings, 0 replies; 61+ messages in thread
From: Michael Weber @ 2017-12-09  2:33 UTC (permalink / raw
  To: gentoo-commits

commit:     3423a79dd2aa6dd74d8712d49387f9b340968062
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  9 02:33:07 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sat Dec  9 02:33:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3423a79d

media-gfx/openscad: Update live ebuild.

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 media-gfx/openscad/openscad-9999.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index 60c55536954..54522344a95 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -22,13 +22,14 @@ DEPEND="
 	dev-libs/glib:2
 	dev-libs/gmp:0=
 	dev-libs/mpfr:0=
+	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
-	dev-qt/qtgui:5
+	dev-qt/qtgui:5[-gles2]
 	dev-qt/qtopengl:5
 	media-gfx/opencsg
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
-	media-libs/glew:*
+	>=media-libs/glew-2.0.0:*
 	media-libs/harfbuzz
 	sci-mathematics/cgal:=
 	>=x11-libs/qscintilla-2.9.4:=[qt5(+)]


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2018-01-06 21:31 Andreas Sturmlechner
  0 siblings, 0 replies; 61+ messages in thread
From: Andreas Sturmlechner @ 2018-01-06 21:31 UTC (permalink / raw
  To: gentoo-commits

commit:     857c2549ee5aa1eb655dcbb8a5938f231066a544
Author:     Sergey Alirzaev <zl29ah <AT> gmail <DOT> com>
AuthorDate: Mon Dec 25 16:26:10 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan  6 21:31:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=857c2549

media-gfx/openscad: don't call ccache

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

 media-gfx/openscad/openscad-9999.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index 54522344a95..4dd3247d891 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -41,6 +41,9 @@ src_prepare() {
 	default
 
 	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
+
+	# tries to call ccache even if it's not present otherwise
+	sed -i '/CONFIG += ccache/d' ${PN}.pro || die
 }
 
 src_configure() {


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2019-01-27 17:26 Pacho Ramos
  0 siblings, 0 replies; 61+ messages in thread
From: Pacho Ramos @ 2019-01-27 17:26 UTC (permalink / raw
  To: gentoo-commits

commit:     f05805e312263c77e205aa74328ef8f3343d2153
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 27 17:22:04 2019 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Jan 27 17:26:11 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f05805e3

media-gfx/openscad: Drop old

Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 media-gfx/openscad/Manifest                      |  1 -
 media-gfx/openscad/openscad-2015.03_p2-r3.ebuild | 84 ------------------------
 2 files changed, 85 deletions(-)

diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 4cc62c825fb..f40770a2108 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1,2 +1 @@
-DIST openscad-2015.03-2.src.tar.gz 13307974 BLAKE2B f3532d77db15250abba444949cbaee012bef02410b6c66cf2abfb6aa2a174f6438c2469b8db9ee043d5d77799ccb1f82c608015df14924670d843a6807eb7fe2 SHA512 66e93715987a5211ce15c10ea39a9fec3296b606ace0aba1cda019635d5b26021457c8e49f389daa90a0da02e41007eab662e1ed6608cb51c24de00253b9783f
 DIST openscad-2015.03-3.src.tar.gz 13309147 BLAKE2B 77f4e934474882e454dad683d9da6a2c9fe699a84c86ed5ebe1755de037f6930870ffb432dedeef3bea7a76cbc98d0f0d0694e5d0f7b469830370ca3548a650c SHA512 b2cee90563bdf2cb9f7b5a0d637b2266f5fcd62add6147c9326b843a5b0975b8ec900d13a2aa86485fce4a5e7e53a08cf4171a3d1d66355e813d01ca9096faee

diff --git a/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild b/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
deleted file mode 100644
index 815a2c46da7..00000000000
--- a/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp-common qmake-utils xdg-utils
-
-MY_PV="2015.03-2"
-SITEFILE="50${PN}-gentoo.el"
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="http://www.openscad.org/"
-SRC_URI="http://files.openscad.org/${PN}-${MY_PV}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs"
-
-DEPEND="
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/glib:2
-	dev-libs/gmp:0=
-	dev-libs/mpfr:0=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2]
-	dev-qt/qtopengl:5
-	media-gfx/opencsg
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>=media-libs/glew-2.0.0:*
-	media-libs/harfbuzz
-	sci-mathematics/cgal:=
-	>=x11-libs/qscintilla-2.9.4:=[qt5(+)]
-	emacs? ( virtual/emacs )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}_uic_tr_fix.patch" )
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	default
-
-	#Use our CFLAGS (specifically don't force x86)
-	sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro  || die
-	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
-}
-
-src_configure() {
-	eqmake5 "${PN}.pro"
-}
-
-src_compile() {
-	default
-
-	if use emacs ; then
-		elisp-compile contrib/*.el
-	fi
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		elisp-install ${PN} contrib/*.el contrib/*.elc
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2019-04-24 20:15 Andreas Sturmlechner
  0 siblings, 0 replies; 61+ messages in thread
From: Andreas Sturmlechner @ 2019-04-24 20:15 UTC (permalink / raw
  To: gentoo-commits

commit:     29eea93dde6411b1af700ff1d6adb92e824b23af
Author:     Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Sun Dec 23 21:12:50 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 24 20:14:38 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29eea93d

media-gfx/openscad: add missing dependencies

Update metadata.xml to add myself as maintainer (see
https://archives.gentoo.org/gentoo-dev/message/3d497dc197a35250614437572ef80e4b)

Closes: https://bugs.gentoo.org/661384
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10687
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/openscad/metadata.xml         | 26 ++++++++++++++++++++++----
 media-gfx/openscad/openscad-9999.ebuild |  5 ++++-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml
index a11c32d6c96..7b83ba14800 100644
--- a/media-gfx/openscad/metadata.xml
+++ b/media-gfx/openscad/metadata.xml
@@ -1,8 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-OpenSCAD is a software for creating solid 3D CAD objects.  Unlike most free software for creating 3D models (such as the famous application Blender) it does not focus on the artistic aspects of 3D modelling but instead on the CAD aspects. Thus it might be the application you are looking for when you are planning to create 3D models of machine parts but pretty sure is not what you are looking for when you are more interested in creating computer-animated movies.  OpenSCAD is free software and available for Linux/UNIX, MS Windows and Mac OS X.
-	</longdescription>
+<maintainer type="person">
+	<email>waebbl@gmail.com</email>
+	<name>Bernd Waibel</name>
+</maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+<longdescription>
+	OpenSCAD is a software for creating solid 3D CAD objects.  Unlike
+	most free software for creating 3D models (such as the famous
+	application Blender) it does not focus on the artistic aspects of 3D
+	modelling but instead on the CAD aspects. Thus it might be the
+	application you are looking for when you are planning to create 3D
+	models of machine parts but pretty sure is not what you are looking
+	for when you are more interested in creating computer-animated movies.
+	OpenSCAD is free software and available for Linux/UNIX, MS Windows and
+	Mac OS X.
+</longdescription>
+<upstream>
+	<remote-id type="github">openscad/openscad</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index 4dd3247d891..c6641079520 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,10 +21,13 @@ DEPEND="
 	dev-libs/boost:=
 	dev-libs/glib:2
 	dev-libs/gmp:0=
+	dev-libs/libzip:=
 	dev-libs/mpfr:0=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
 	dev-qt/qtgui:5[-gles2]
+	dev-qt/qtmultimedia:5[-gles2]
 	dev-qt/qtopengl:5
 	media-gfx/opencsg
 	media-libs/fontconfig:1.0


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2019-04-24 20:15 Andreas Sturmlechner
  0 siblings, 0 replies; 61+ messages in thread
From: Andreas Sturmlechner @ 2019-04-24 20:15 UTC (permalink / raw
  To: gentoo-commits

commit:     b97a3ee38729699006c7a6c6e7f3bb229b84f794
Author:     Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Sun Dec 23 21:30:49 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 24 20:14:38 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b97a3ee3

media-gfx/openscad: bump to EAPI 7

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...5.03_p3.ebuild => openscad-2015.03_p3-r1.ebuild} | 21 +++++++--------------
 media-gfx/openscad/openscad-9999.ebuild             | 16 +++-------------
 2 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/media-gfx/openscad/openscad-2015.03_p3.ebuild b/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild
similarity index 83%
rename from media-gfx/openscad/openscad-2015.03_p3.ebuild
rename to media-gfx/openscad/openscad-2015.03_p3-r1.ebuild
index aee0a681df2..1b34fa207c5 100644
--- a/media-gfx/openscad/openscad-2015.03_p3.ebuild
+++ b/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild
@@ -1,11 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit elisp-common qmake-utils xdg-utils
+inherit elisp-common qmake-utils xdg
 
-MY_PV="2015.03-3"
+# 2015.03-3
+MY_VER=$(ver_cut 1-2) # version component
+MY_REL=$(ver_cut 4) # release component, 'p' being the third component
+MY_PV=${MY_VER}-${MY_REL}
 SITEFILE="50${PN}-gentoo.el"
 
 DESCRIPTION="The Programmers Solid 3D CAD Modeller"
@@ -72,13 +75,3 @@ src_install() {
 
 	einstalldocs
 }
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}

diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index c6641079520..e885fba1196 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit elisp-common git-r3 qmake-utils xdg-utils
+inherit elisp-common git-r3 qmake-utils xdg
 
 SITEFILE="50${PN}-gentoo.el"
 
@@ -71,13 +71,3 @@ src_install() {
 
 	einstalldocs
 }
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2019-05-18 19:33 Andreas Sturmlechner
  0 siblings, 0 replies; 61+ messages in thread
From: Andreas Sturmlechner @ 2019-05-18 19:33 UTC (permalink / raw
  To: gentoo-commits

commit:     7ec88bd25f0efd4784d858c9ad5a77a46431b1e8
Author:     Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Wed May 15 17:54:32 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 18 19:32:25 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ec88bd2

media-gfx/openscad: bump to version 2019.05

Closes: https://bugs.gentoo.org/686044
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12005
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/openscad/Manifest                |  1 +
 media-gfx/openscad/openscad-2019.05.ebuild | 80 ++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+)

diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index f40770a2108..fa81bd25200 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1 +1,2 @@
 DIST openscad-2015.03-3.src.tar.gz 13309147 BLAKE2B 77f4e934474882e454dad683d9da6a2c9fe699a84c86ed5ebe1755de037f6930870ffb432dedeef3bea7a76cbc98d0f0d0694e5d0f7b469830370ca3548a650c SHA512 b2cee90563bdf2cb9f7b5a0d637b2266f5fcd62add6147c9326b843a5b0975b8ec900d13a2aa86485fce4a5e7e53a08cf4171a3d1d66355e813d01ca9096faee
+DIST openscad-2019.05.tar.gz 14604881 BLAKE2B ed7d6088606fab44284363da73643e556f07c0f0a7a223bdf718dcc36a82158bf23e315724ea520d63a3f1331207df0ea7b0ade817f01dd39b67ca6f36529d56 SHA512 073053f625ffa4fea6ed836396b7ff4b87b26cf7500b06c804983afc0f1dfd3d78bfb81b3fd217c3939b0ec915d85b0c7990773eaf968512a150deaa0399df13

diff --git a/media-gfx/openscad/openscad-2019.05.ebuild b/media-gfx/openscad/openscad-2019.05.ebuild
new file mode 100644
index 00000000000..6259f77f622
--- /dev/null
+++ b/media-gfx/openscad/openscad-2019.05.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp-common qmake-utils xdg
+
+SITEFILE="50${PN}-gentoo.el"
+
+DESCRIPTION="The Programmers Solid 3D CAD Modeller"
+HOMEPAGE="https://www.openscad.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs"
+
+# FIXME: add optional lib3mf hidapi spnav
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-libs/boost:=
+	dev-libs/double-conversion:=
+	dev-libs/glib:2
+	dev-libs/gmp:0=
+	dev-libs/libzip:=
+	dev-libs/mpfr:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5[-gles2]
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
+	media-gfx/opencsg
+	media-libs/fontconfig
+	media-libs/freetype
+	>=media-libs/glew-2.0.0:0=
+	media-libs/harfbuzz:=
+	sci-mathematics/cgal:=
+	>=x11-libs/qscintilla-2.10.3:=
+	emacs? ( virtual/emacs )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	# fix path prefix
+	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
+}
+
+src_configure() {
+	eqmake5 "${PN}.pro"
+}
+
+src_compile() {
+	default
+
+	if use emacs ; then
+		elisp-compile contrib/*.el
+	fi
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		elisp-install ${PN} contrib/*.el contrib/*.elc
+	fi
+
+	einstalldocs
+}


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2019-07-07 19:19 Michał Górny
  0 siblings, 0 replies; 61+ messages in thread
From: Michał Górny @ 2019-07-07 19:19 UTC (permalink / raw
  To: gentoo-commits

commit:     da982da5372c24f47a7a5b402dae6c5557473ba4
Author:     Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Wed May 22 05:52:48 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul  7 19:18:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da982da5

media-gfx/openscad: fix automagic deps

Fixes issues with automagic dependencies in upstream build system,
where it links against dev-libs/libspnav and dev-libs/hidapi if
they are present on the build host.

Thanks to Phil Stracchino (Unix Ronin) for bringing this up.

Closes: https://bugs.gentoo.org/686354
Reported-by: Phil Stracchino (Unix Ronin) <phils <AT> caerllewys.net>
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-gfx/openscad/openscad-2019.05-r1.ebuild | 82 +++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)

diff --git a/media-gfx/openscad/openscad-2019.05-r1.ebuild b/media-gfx/openscad/openscad-2019.05-r1.ebuild
new file mode 100644
index 00000000000..8991b255f4c
--- /dev/null
+++ b/media-gfx/openscad/openscad-2019.05-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp-common qmake-utils xdg
+
+SITEFILE="50${PN}-gentoo.el"
+
+DESCRIPTION="The Programmers Solid 3D CAD Modeller"
+HOMEPAGE="https://www.openscad.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs"
+
+# FIXME: add optional lib3mf
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-libs/boost:=
+	dev-libs/double-conversion:=
+	dev-libs/glib:2
+	dev-libs/gmp:0=
+	dev-libs/hidapi
+	dev-libs/libspnav
+	dev-libs/libzip:=
+	dev-libs/mpfr:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5[-gles2]
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
+	media-gfx/opencsg
+	media-libs/fontconfig
+	media-libs/freetype
+	>=media-libs/glew-2.0.0:0=
+	media-libs/harfbuzz:=
+	sci-mathematics/cgal:=
+	>=x11-libs/qscintilla-2.10.3:=
+	emacs? ( virtual/emacs )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	# fix path prefix
+	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
+}
+
+src_configure() {
+	eqmake5 "${PN}.pro"
+}
+
+src_compile() {
+	default
+
+	if use emacs ; then
+		elisp-compile contrib/*.el
+	fi
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		elisp-install ${PN} contrib/*.el contrib/*.elc
+	fi
+
+	einstalldocs
+}


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2019-07-07 19:19 Michał Górny
  0 siblings, 0 replies; 61+ messages in thread
From: Michał Górny @ 2019-07-07 19:19 UTC (permalink / raw
  To: gentoo-commits

commit:     16da019c5159b13b9bf7498f77c3642a83a5b37f
Author:     Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Sun Jul  7 08:48:22 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul  7 19:18:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16da019c

media-gfx/openscad: drop obsolete version 2019.05

Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12077
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-gfx/openscad/openscad-2019.05.ebuild | 80 ------------------------------
 1 file changed, 80 deletions(-)

diff --git a/media-gfx/openscad/openscad-2019.05.ebuild b/media-gfx/openscad/openscad-2019.05.ebuild
deleted file mode 100644
index 6259f77f622..00000000000
--- a/media-gfx/openscad/openscad-2019.05.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp-common qmake-utils xdg
-
-SITEFILE="50${PN}-gentoo.el"
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="https://www.openscad.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs"
-
-# FIXME: add optional lib3mf hidapi spnav
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/gmp:0=
-	dev-libs/libzip:=
-	dev-libs/mpfr:0=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5[-gles2]
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	media-gfx/opencsg
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/glew-2.0.0:0=
-	media-libs/harfbuzz:=
-	sci-mathematics/cgal:=
-	>=x11-libs/qscintilla-2.10.3:=
-	emacs? ( virtual/emacs )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	# fix path prefix
-	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
-}
-
-src_configure() {
-	eqmake5 "${PN}.pro"
-}
-
-src_compile() {
-	default
-
-	if use emacs ; then
-		elisp-compile contrib/*.el
-	fi
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		elisp-install ${PN} contrib/*.el contrib/*.elc
-	fi
-
-	einstalldocs
-}


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2020-04-03 20:07 Andreas Sturmlechner
  0 siblings, 0 replies; 61+ messages in thread
From: Andreas Sturmlechner @ 2020-04-03 20:07 UTC (permalink / raw
  To: gentoo-commits

commit:     cce9fd7370b4a7b952c83b92c2d338548442e7c1
Author:     Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Fri Mar 27 03:36:46 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr  3 20:06:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cce9fd73

media-gfx/openscad: dev-qt/*[-gles2 => -gles2-only]

Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/openscad/openscad-9999.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index 3af31a6a717..6ce960b60bc 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.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=7
@@ -26,8 +26,8 @@ DEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
-	dev-qt/qtgui:5[-gles2]
-	dev-qt/qtmultimedia:5[-gles2]
+	dev-qt/qtgui:5[-gles2-only]
+	dev-qt/qtmultimedia:5[-gles2-only]
 	dev-qt/qtopengl:5
 	media-gfx/opencsg
 	media-libs/fontconfig:1.0


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2020-04-03 20:07 Andreas Sturmlechner
  0 siblings, 0 replies; 61+ messages in thread
From: Andreas Sturmlechner @ 2020-04-03 20:07 UTC (permalink / raw
  To: gentoo-commits

commit:     a1661687c0a471bca16a6a3388a2be8f73750e16
Author:     Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Fri Mar 27 03:29:56 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr  3 20:06:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1661687

media-gfx/openscad: dev-qt/qtgui[-gles2 => -gles2-only]

Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../{openscad-2015.03_p3-r1.ebuild => openscad-2015.03_p3-r2.ebuild}  | 4 ++--
 .../{openscad-2019.05-r1.ebuild => openscad-2019.05-r2.ebuild}        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild b/media-gfx/openscad/openscad-2015.03_p3-r2.ebuild
similarity index 95%
rename from media-gfx/openscad/openscad-2015.03_p3-r1.ebuild
rename to media-gfx/openscad/openscad-2015.03_p3-r2.ebuild
index 7ce8b1f70da..c8c9432ff43 100644
--- a/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild
+++ b/media-gfx/openscad/openscad-2015.03_p3-r2.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=7
@@ -28,7 +28,7 @@ DEPEND="
 	dev-libs/mpfr:0=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2]
+	dev-qt/qtgui:5[-gles2-only]
 	dev-qt/qtopengl:5
 	media-gfx/opencsg
 	media-libs/fontconfig:1.0

diff --git a/media-gfx/openscad/openscad-2019.05-r1.ebuild b/media-gfx/openscad/openscad-2019.05-r2.ebuild
similarity index 95%
rename from media-gfx/openscad/openscad-2019.05-r1.ebuild
rename to media-gfx/openscad/openscad-2019.05-r2.ebuild
index dfdb27dfe66..edf383dda5e 100644
--- a/media-gfx/openscad/openscad-2019.05-r1.ebuild
+++ b/media-gfx/openscad/openscad-2019.05-r2.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=7
@@ -34,7 +34,7 @@ RDEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
-	dev-qt/qtgui:5[-gles2]
+	dev-qt/qtgui:5[-gles2-only]
 	dev-qt/qtmultimedia:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtopengl:5


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2020-04-14  7:58 Agostino Sarubbo
  0 siblings, 0 replies; 61+ messages in thread
From: Agostino Sarubbo @ 2020-04-14  7:58 UTC (permalink / raw
  To: gentoo-commits

commit:     35e03a73d2710e7c1f68cb76cd245394f9c1c762
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 14 07:58:13 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Apr 14 07:58:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35e03a73

media-gfx/openscad: amd64 stable wrt bug #716134

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

 media-gfx/openscad/openscad-2019.05-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/openscad/openscad-2019.05-r2.ebuild b/media-gfx/openscad/openscad-2019.05-r2.ebuild
index edf383dda5e..0a9a34fbdb2 100644
--- a/media-gfx/openscad/openscad-2019.05-r2.ebuild
+++ b/media-gfx/openscad/openscad-2019.05-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="emacs"
 
 PATCHES=(


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2020-04-14 12:32 Agostino Sarubbo
  0 siblings, 0 replies; 61+ messages in thread
From: Agostino Sarubbo @ 2020-04-14 12:32 UTC (permalink / raw
  To: gentoo-commits

commit:     3b4a41c346777fcb4b4ef3bfb61c5e79bfa77d7e
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 14 12:31:34 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Apr 14 12:31:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b4a41c3

media-gfx/openscad: x86 stable wrt bug #716134

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

 media-gfx/openscad/openscad-2019.05-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/openscad/openscad-2019.05-r2.ebuild b/media-gfx/openscad/openscad-2019.05-r2.ebuild
index 0a9a34fbdb2..7b1bffdcad6 100644
--- a/media-gfx/openscad/openscad-2019.05-r2.ebuild
+++ b/media-gfx/openscad/openscad-2019.05-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="emacs"
 
 PATCHES=(


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2020-07-20  9:01 Joonas Niilola
  0 siblings, 0 replies; 61+ messages in thread
From: Joonas Niilola @ 2020-07-20  9:01 UTC (permalink / raw
  To: gentoo-commits

commit:     b2cdee2afeaf743367c789d3c3fa03ea41a2b300
Author:     Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Mon Jul  6 18:29:48 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 09:01:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2cdee2a

media-gfx/openscad: remove unneeded patch

Remove a backported patch which is no longer needed for live
ebuild.

Reported-by: Michael Moon <triffid.hunter <AT> gmail.com>
Closes: https://bugs.gentoo.org/728560
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16616
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/openscad/openscad-9999.ebuild | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index 4dc6fbc2617..a718d9a9a8a 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -17,10 +17,6 @@ KEYWORDS=""
 IUSE="ccache emacs"
 RESTRICT="test"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-2019.05-0001-Fix-build-with-boost-1.73.patch"
-)
-
 RDEPEND="
 	dev-cpp/eigen:3
 	dev-libs/boost:=


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2020-08-25 10:25 Sam James
  0 siblings, 0 replies; 61+ messages in thread
From: Sam James @ 2020-08-25 10:25 UTC (permalink / raw
  To: gentoo-commits

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

media-gfx/openscad: arm64 keyworded (bug #734822)

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

 media-gfx/openscad/openscad-2019.05-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/openscad/openscad-2019.05-r3.ebuild b/media-gfx/openscad/openscad-2019.05-r3.ebuild
index 73d70652513..359b6566b45 100644
--- a/media-gfx/openscad/openscad-2019.05-r3.ebuild
+++ b/media-gfx/openscad/openscad-2019.05-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="ccache emacs"
 RESTRICT="test"
 


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

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

commit:     fc4927dd7ba029554e0a7109bad27e33b90a3d69
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 20 14:58:06 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=fc4927dd

media-gfx/openscad: stabilize 2019.05-r3 on x86

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

 media-gfx/openscad/openscad-2019.05-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/openscad/openscad-2019.05-r3.ebuild b/media-gfx/openscad/openscad-2019.05-r3.ebuild
index 359b6566b45..79e4c30d804 100644
--- a/media-gfx/openscad/openscad-2019.05-r3.ebuild
+++ b/media-gfx/openscad/openscad-2019.05-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
 IUSE="ccache emacs"
 RESTRICT="test"
 


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

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

commit:     fbb63cfc3ac9377006fbc8aee0d64b2e3ac79a19
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 20 14:58:44 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=fbb63cfc

media-gfx/openscad: stabilize 2019.05-r3 on amd64

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

 media-gfx/openscad/openscad-2019.05-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/openscad/openscad-2019.05-r3.ebuild b/media-gfx/openscad/openscad-2019.05-r3.ebuild
index 79e4c30d804..e30ebab411a 100644
--- a/media-gfx/openscad/openscad-2019.05-r3.ebuild
+++ b/media-gfx/openscad/openscad-2019.05-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="ccache emacs"
 RESTRICT="test"
 


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2020-11-20 20:40 Andreas Sturmlechner
  0 siblings, 0 replies; 61+ messages in thread
From: Andreas Sturmlechner @ 2020-11-20 20:40 UTC (permalink / raw
  To: gentoo-commits

commit:     7f3eef7d929ffd857a448226449625db83fdce71
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 20 19:16:33 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 20 20:39:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f3eef7d

media-gfx/openscad: Drop 2019.05-r2

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

 media-gfx/openscad/openscad-2019.05-r2.ebuild | 86 ---------------------------
 1 file changed, 86 deletions(-)

diff --git a/media-gfx/openscad/openscad-2019.05-r2.ebuild b/media-gfx/openscad/openscad-2019.05-r2.ebuild
deleted file mode 100644
index 7b1bffdcad6..00000000000
--- a/media-gfx/openscad/openscad-2019.05-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp-common qmake-utils xdg
-
-SITEFILE="50${PN}-gentoo.el"
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="https://www.openscad.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="emacs"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2019.05_fix-boost-1.72.0-build.patch"
-)
-
-# FIXME: add optional lib3mf
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/gmp:0=
-	dev-libs/hidapi
-	dev-libs/libspnav
-	dev-libs/libzip:=
-	dev-libs/mpfr:0=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5[-gles2-only]
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	media-gfx/opencsg
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/glew-2.0.0:0=
-	media-libs/harfbuzz:=
-	sci-mathematics/cgal:=
-	>=x11-libs/qscintilla-2.10.3:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	# fix path prefix
-	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
-}
-
-src_configure() {
-	eqmake5 "${PN}.pro"
-}
-
-src_compile() {
-	default
-
-	if use emacs ; then
-		elisp-compile contrib/*.el
-	fi
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		elisp-install ${PN} contrib/*.el contrib/*.elc
-	fi
-
-	einstalldocs
-}


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2020-11-25  7:50 Joonas Niilola
  0 siblings, 0 replies; 61+ messages in thread
From: Joonas Niilola @ 2020-11-25  7:50 UTC (permalink / raw
  To: gentoo-commits

commit:     48861bbda2a93a12a71c88aee5774e925c1f938c
Author:     Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Mon Nov 23 21:36:43 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 07:50:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48861bbd

media-gfx/openscad: fix build issue with cgal-5.1

For now use <sci-mathematics/cgal-5 due to a failure
with current cgal-5.1.
Issue reported upstream, see
https://github.com/openscad/openscad/issues/3497

Closes: https://bugs.gentoo.org/755842
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18380
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/openscad/openscad-2019.05-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/openscad/openscad-2019.05-r3.ebuild b/media-gfx/openscad/openscad-2019.05-r3.ebuild
index e30ebab411a..42738f600c3 100644
--- a/media-gfx/openscad/openscad-2019.05-r3.ebuild
+++ b/media-gfx/openscad/openscad-2019.05-r3.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 	>=media-libs/glew-2.0.0:0=
 	media-libs/harfbuzz:=
 	media-libs/lib3mf
-	sci-mathematics/cgal:=
+	<sci-mathematics/cgal-5:=
 	>=x11-libs/qscintilla-2.10.3:=
 	emacs? ( >=app-editors/emacs-23.1:* )
 "


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

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

commit:     0619e3aee23092eb4c249b9192f533c81b648b96
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sun Feb  7 16:12:59 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Feb  7 17:07:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0619e3ae

media-gfx/openscad: 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-gfx/openscad/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml
index 5ed7ed33c62..75aa20b67f1 100644
--- a/media-gfx/openscad/metadata.xml
+++ b/media-gfx/openscad/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] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2021-02-14 19:52 Sam James
  0 siblings, 0 replies; 61+ messages in thread
From: Sam James @ 2021-02-14 19:52 UTC (permalink / raw
  To: gentoo-commits

commit:     f968a1ca9aff9d0235d1828e950a20b1dac6b1f3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 19:52:53 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 19:52:53 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f968a1ca

media-gfx/openscad: Stabilize 2019.05-r4 x86, #770646

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

 media-gfx/openscad/openscad-2019.05-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/openscad/openscad-2019.05-r4.ebuild b/media-gfx/openscad/openscad-2019.05-r4.ebuild
index 2ac3f77c966..0d287ea36a2 100644
--- a/media-gfx/openscad/openscad-2019.05-r4.ebuild
+++ b/media-gfx/openscad/openscad-2019.05-r4.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
 IUSE="ccache emacs"
 RESTRICT="test"
 


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2021-02-18 17:12 Sam James
  0 siblings, 0 replies; 61+ messages in thread
From: Sam James @ 2021-02-18 17:12 UTC (permalink / raw
  To: gentoo-commits

commit:     3901b89db605f0e1659b3a05ff28811c9ad036bc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 18 17:11:42 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 17:11:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3901b89d

media-gfx/openscad: Stabilize 2019.05-r4 amd64, #770646

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

 media-gfx/openscad/openscad-2019.05-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/openscad/openscad-2019.05-r4.ebuild b/media-gfx/openscad/openscad-2019.05-r4.ebuild
index 0d287ea36a2..32ad22bf16f 100644
--- a/media-gfx/openscad/openscad-2019.05-r4.ebuild
+++ b/media-gfx/openscad/openscad-2019.05-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="ccache emacs"
 RESTRICT="test"
 


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2021-02-18 20:12 Andreas Sturmlechner
  0 siblings, 0 replies; 61+ messages in thread
From: Andreas Sturmlechner @ 2021-02-18 20:12 UTC (permalink / raw
  To: gentoo-commits

commit:     b37d33c3094f8681a4bdf6d59f1771c13a7b40a7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 18 20:04:36 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 20:12:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b37d33c3

media-gfx/openscad: Drop 2019.05-r3

Bug: https://bugs.gentoo.org/770646
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/openscad/openscad-2019.05-r3.ebuild | 108 --------------------------
 1 file changed, 108 deletions(-)

diff --git a/media-gfx/openscad/openscad-2019.05-r3.ebuild b/media-gfx/openscad/openscad-2019.05-r3.ebuild
deleted file mode 100644
index 42738f600c3..00000000000
--- a/media-gfx/openscad/openscad-2019.05-r3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp-common qmake-utils xdg
-
-SITEFILE="50${PN}-gentoo.el"
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="https://www.openscad.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="ccache emacs"
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}_fix-boost-1.72.0-build.patch"
-	"${FILESDIR}/${P}-0001-Fix-build-with-boost-1.73.patch"
-)
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/gmp:0=
-	dev-libs/hidapi
-	dev-libs/libspnav
-	dev-libs/libzip:=
-	dev-libs/mpfr:0=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5[-gles2-only]
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	media-gfx/opencsg
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/glew-2.0.0:0=
-	media-libs/harfbuzz:=
-	media-libs/lib3mf
-	<sci-mathematics/cgal-5:=
-	>=x11-libs/qscintilla-2.10.3:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/itstool
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	ccache? ( dev-util/ccache )
-"
-
-src_prepare() {
-	default
-
-	# fix path prefix
-	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
-
-	# disable ccache
-	if ! use ccache; then
-		eapply "${FILESDIR}/${P}-0002-Gentoo-specific-Disable-ccache-building.patch"
-	fi
-}
-
-src_configure() {
-	eqmake5 "${PN}.pro"
-}
-
-src_compile() {
-	default
-
-	if use emacs ; then
-		elisp-compile contrib/*.el
-	fi
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		elisp-install ${PN} contrib/*.el contrib/*.elc
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2021-03-07  9:03 Joonas Niilola
  0 siblings, 0 replies; 61+ messages in thread
From: Joonas Niilola @ 2021-03-07  9:03 UTC (permalink / raw
  To: gentoo-commits

commit:     130e722c056a63cd34df7aefe7b8c5fcb554e7da
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  7 08:42:20 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Mar  7 09:03:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=130e722c

media-gfx/openscad: revbump 2019.05 to populate the lib3mf change

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

 .../openscad/{openscad-2019.05-r4.ebuild => openscad-2019.05-r5.ebuild}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/media-gfx/openscad/openscad-2019.05-r4.ebuild b/media-gfx/openscad/openscad-2019.05-r5.ebuild
similarity index 100%
rename from media-gfx/openscad/openscad-2019.05-r4.ebuild
rename to media-gfx/openscad/openscad-2019.05-r5.ebuild


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2021-03-07  9:03 Joonas Niilola
  0 siblings, 0 replies; 61+ messages in thread
From: Joonas Niilola @ 2021-03-07  9:03 UTC (permalink / raw
  To: gentoo-commits

commit:     b950201e8458d99370f53636038c17a0acda4394
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Thu Feb 11 07:45:11 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Mar  7 09:03:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b950201e

media-gfx/openscad: restrict dependency

This package version does not build against lib3mf-2 API.

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/openscad/openscad-2019.05-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/openscad/openscad-2019.05-r4.ebuild b/media-gfx/openscad/openscad-2019.05-r4.ebuild
index 32ad22bf16f..66fb9b68a87 100644
--- a/media-gfx/openscad/openscad-2019.05-r4.ebuild
+++ b/media-gfx/openscad/openscad-2019.05-r4.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 	media-libs/freetype
 	>=media-libs/glew-2.0.0:0=
 	media-libs/harfbuzz:=
-	media-libs/lib3mf
+	<media-libs/lib3mf-2
 	sci-mathematics/cgal:=
 	>=x11-libs/qscintilla-2.10.3:=
 	emacs? ( >=app-editors/emacs-23.1:* )


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2021-04-11  0:13 Thomas Deutschmann
  0 siblings, 0 replies; 61+ messages in thread
From: Thomas Deutschmann @ 2021-04-11  0:13 UTC (permalink / raw
  To: gentoo-commits

commit:     9097879adfa8d1b8f881a4fb051938b8eef44db4
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 11 00:10:23 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Apr 11 00:13:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9097879a

media-gfx/openscad: x86 stable (bug #773217)

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 media-gfx/openscad/openscad-2021.01.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/openscad/openscad-2021.01.ebuild b/media-gfx/openscad/openscad-2021.01.ebuild
index 5a5a5f2805d..bdfcfe89c0f 100644
--- a/media-gfx/openscad/openscad-2021.01.ebuild
+++ b/media-gfx/openscad/openscad-2021.01.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
 IUSE="emacs"
 # tests are not fully working and need cmake which isn't yet
 # officially supported.


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2021-05-01 18:19 Agostino Sarubbo
  0 siblings, 0 replies; 61+ messages in thread
From: Agostino Sarubbo @ 2021-05-01 18:19 UTC (permalink / raw
  To: gentoo-commits

commit:     5ac6480a6ee2bcf45b74dc83d8b8779aa0826894
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat May  1 18:19:32 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat May  1 18:19:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ac6480a

media-gfx/openscad: amd64 stable wrt bug #773217

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

 media-gfx/openscad/openscad-2021.01.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/openscad/openscad-2021.01.ebuild b/media-gfx/openscad/openscad-2021.01.ebuild
index bdfcfe89c0f..3302af49419 100644
--- a/media-gfx/openscad/openscad-2021.01.ebuild
+++ b/media-gfx/openscad/openscad-2021.01.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="emacs"
 # tests are not fully working and need cmake which isn't yet
 # officially supported.


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

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

commit:     b6417909f81474b38743d880470aa0d326958888
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Wed Apr 28 19:37:00 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May  4 22:01:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6417909

media-gfx/openscad: adjust variables

Adjust the USE of EROOT in src_configure, due to newly
reported issues from repoman and pkgcheck.

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/20585
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/openscad/openscad-2021.01.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/openscad/openscad-2021.01.ebuild b/media-gfx/openscad/openscad-2021.01.ebuild
index 3302af49419..31831701d92 100644
--- a/media-gfx/openscad/openscad-2021.01.ebuild
+++ b/media-gfx/openscad/openscad-2021.01.ebuild
@@ -69,9 +69,9 @@ src_prepare() {
 
 src_configure() {
 	if has ccache ${FEATURES}; then
-		eqmake5 "PREFIX = ${EROOT}/usr" "CONFIG += ccache" "${PN}.pro"
+		eqmake5 "PREFIX = ${ESYSROOT}/usr" "CONFIG += ccache" "${PN}.pro"
 	else
-		eqmake5 "PREFIX = ${EROOT}/usr" "${PN}.pro"
+		eqmake5 "PREFIX = ${ESYSROOT}/usr" "${PN}.pro"
 	fi
 }
 


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

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

commit:     9b8476cb90bae957d12acfc87812ca771fa148b7
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Wed Apr 28 19:32:44 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May  4 22:01:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b8476cb

media-gfx/openscad: fix installation

Fix the removal of .git{,ignore} for the MCAD library.
Upstream no longer installs those files, so we don't
need to remove them in src_install anymore.

Reported-by: Jan Psota <jasiupsota <AT> gmail.com>
Closes: https://bugs.gentoo.org/785805
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/openscad/openscad-9999.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index 433200d96c2..c4a9b06dc70 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -113,8 +113,6 @@ src_install() {
 	mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales"
 	ln -sf ../locale "${ED}"/usr/share/openscad/locale || die
 
-	rm -r "${ED}"/usr/share/openscad/libraries/MCAD/.{git,gitignore} || die
-
 	if use emacs; then
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 		elisp-install ${PN} contrib/*.el contrib/*.elc


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2022-04-22 10:22 Joonas Niilola
  0 siblings, 0 replies; 61+ messages in thread
From: Joonas Niilola @ 2022-04-22 10:22 UTC (permalink / raw
  To: gentoo-commits

commit:     e09f11563aa7d01d19cf92e69a3b7613cc988f77
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 22 10:20:10 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Apr 22 10:22:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e09f1156

media-gfx/openscad: add subslot binder for media-gfx/opencsg to stable

 - and revbump unstable to be the later revision.

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

 .../openscad/{openscad-2021.01.ebuild => openscad-2021.01-r2.ebuild}  | 4 ++--
 .../{openscad-2021.01-r1.ebuild => openscad-2021.01-r3.ebuild}        | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/openscad/openscad-2021.01.ebuild b/media-gfx/openscad/openscad-2021.01-r2.ebuild
similarity index 97%
rename from media-gfx/openscad/openscad-2021.01.ebuild
rename to media-gfx/openscad/openscad-2021.01-r2.ebuild
index 31831701d921..2dce8f8df45c 100644
--- a/media-gfx/openscad/openscad-2021.01.ebuild
+++ b/media-gfx/openscad/openscad-2021.01-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,7 +38,7 @@ RDEPEND="
 	dev-qt/qtnetwork:5
 	dev-qt/qtopengl:5
 	dev-qt/qtwidgets:5
-	media-gfx/opencsg
+	media-gfx/opencsg:=
 	media-libs/fontconfig
 	media-libs/freetype
 	>=media-libs/glew-2.0.0:0=

diff --git a/media-gfx/openscad/openscad-2021.01-r1.ebuild b/media-gfx/openscad/openscad-2021.01-r3.ebuild
similarity index 100%
rename from media-gfx/openscad/openscad-2021.01-r1.ebuild
rename to media-gfx/openscad/openscad-2021.01-r3.ebuild


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2022-04-22 10:22 Joonas Niilola
  0 siblings, 0 replies; 61+ messages in thread
From: Joonas Niilola @ 2022-04-22 10:22 UTC (permalink / raw
  To: gentoo-commits

commit:     9e77aab3355fb474e3850a614a279d0118e9e51f
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Apr 22 06:56:22 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Apr 22 10:22:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e77aab3

media-gfx/openscad: add subslot binder for media-gfx/opencsg on live

Needed for ABI changes between 1.4.2 and 1.5.1

Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/25036
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

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

diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index 996bf04653fb..425d55c09f81 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	dev-libs/glib:2
 	dev-libs/libxml2
 	dev-libs/libzip:=
-	media-gfx/opencsg
+	media-gfx/opencsg:=
 	media-libs/fontconfig
 	media-libs/freetype
 	media-libs/glew:0=


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2022-04-22 10:22 Joonas Niilola
  0 siblings, 0 replies; 61+ messages in thread
From: Joonas Niilola @ 2022-04-22 10:22 UTC (permalink / raw
  To: gentoo-commits

commit:     bdc50365c83c8703f49d2c342228cec9f26174ab
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Apr 22 06:17:22 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Apr 22 10:22:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdc50365

media-gfx/openscad: update EAPI 7 -> 8

Use slot operator for media-gfx/opencsg due to ABI changes
from 1.4.2 -> 1.5.1.

Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/openscad/openscad-2021.01-r1.ebuild | 106 ++++++++++++++++++++++++++
 1 file changed, 106 insertions(+)

diff --git a/media-gfx/openscad/openscad-2021.01-r1.ebuild b/media-gfx/openscad/openscad-2021.01-r1.ebuild
new file mode 100644
index 000000000000..2bb8a63e134f
--- /dev/null
+++ b/media-gfx/openscad/openscad-2021.01-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common qmake-utils xdg
+
+SITEFILE="50${PN}-gentoo.el"
+
+DESCRIPTION="The Programmers Solid 3D CAD Modeller"
+HOMEPAGE="https://www.openscad.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="emacs"
+# tests are not fully working and need cmake which isn't yet
+# officially supported.
+RESTRICT="test"
+
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-libs/boost:=
+	dev-libs/double-conversion:=
+	dev-libs/glib:2
+	dev-libs/gmp:0=
+	dev-libs/hidapi
+	dev-libs/libspnav
+	dev-libs/libxml2
+	dev-libs/libzip:=
+	dev-libs/mpfr:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5[-gles2-only]
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
+	media-gfx/opencsg:=
+	media-libs/fontconfig
+	media-libs/freetype
+	>=media-libs/glew-2.0.0:0=
+	media-libs/harfbuzz:=
+	media-libs/lib3mf
+	sci-mathematics/cgal:=
+	x11-libs/cairo
+	>=x11-libs/qscintilla-2.10.3:=
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/itstool
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-0001-Gentoo-specific-Disable-ccache-building.patch
+	"${FILESDIR}"/${P}-0002-fix-to-find-lib3mf-2.patch
+)
+
+src_configure() {
+	if has ccache ${FEATURES}; then
+		eqmake5 "PREFIX = ${ESYSROOT}/usr" "CONFIG += ccache" "${PN}.pro"
+	else
+		eqmake5 "PREFIX = ${ESYSROOT}/usr" "${PN}.pro"
+	fi
+}
+
+src_compile() {
+	default
+
+	if use emacs ; then
+		elisp-compile contrib/*.el
+	fi
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		elisp-install ${PN} contrib/*.el contrib/*.elc
+	fi
+
+	mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales"
+	ln -sf ../locale "${ED}"/usr/share/openscad/locale || die
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2022-06-03  7:20 Jakov Smolić
  0 siblings, 0 replies; 61+ messages in thread
From: Jakov Smolić @ 2022-06-03  7:20 UTC (permalink / raw
  To: gentoo-commits

commit:     5069b3af658016921bcb8adfec543e0038888e90
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  3 07:20:46 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Fri Jun  3 07:20:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5069b3af

media-gfx/openscad: Stabilize 2021.01-r3 amd64, #849455

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 media-gfx/openscad/openscad-2021.01-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/openscad/openscad-2021.01-r3.ebuild b/media-gfx/openscad/openscad-2021.01-r3.ebuild
index 2bb8a63e134f..8dfe22bf117f 100644
--- a/media-gfx/openscad/openscad-2021.01-r3.ebuild
+++ b/media-gfx/openscad/openscad-2021.01-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="emacs"
 # tests are not fully working and need cmake which isn't yet
 # officially supported.


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2022-06-03  7:28 Joonas Niilola
  0 siblings, 0 replies; 61+ messages in thread
From: Joonas Niilola @ 2022-06-03  7:28 UTC (permalink / raw
  To: gentoo-commits

commit:     b5afe3db950fa6eea03ff1a76e1b9281beb051d6
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  3 07:28:00 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jun  3 07:28:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5afe3db

media-gfx/openscad: Stabilize 2021.01-r3 x86, #849455

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

 media-gfx/openscad/openscad-2021.01-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/openscad/openscad-2021.01-r3.ebuild b/media-gfx/openscad/openscad-2021.01-r3.ebuild
index 8dfe22bf117f..41f8b9baca99 100644
--- a/media-gfx/openscad/openscad-2021.01-r3.ebuild
+++ b/media-gfx/openscad/openscad-2021.01-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="emacs"
 # tests are not fully working and need cmake which isn't yet
 # officially supported.


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2022-06-22  7:03 Joonas Niilola
  0 siblings, 0 replies; 61+ messages in thread
From: Joonas Niilola @ 2022-06-22  7:03 UTC (permalink / raw
  To: gentoo-commits

commit:     4f32c550d4e0471c77426088829e92bf55ff0781
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Wed Jun 22 05:58:16 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 07:02:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f32c550

media-gfx/openscad: drop 2021.01-r2

Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/26033
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/openscad/openscad-2021.01-r2.ebuild | 110 --------------------------
 1 file changed, 110 deletions(-)

diff --git a/media-gfx/openscad/openscad-2021.01-r2.ebuild b/media-gfx/openscad/openscad-2021.01-r2.ebuild
deleted file mode 100644
index 2dce8f8df45c..000000000000
--- a/media-gfx/openscad/openscad-2021.01-r2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp-common qmake-utils xdg
-
-SITEFILE="50${PN}-gentoo.el"
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="https://www.openscad.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="emacs"
-# tests are not fully working and need cmake which isn't yet
-# officially supported.
-RESTRICT="test"
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/gmp:0=
-	dev-libs/hidapi
-	dev-libs/libspnav
-	dev-libs/libxml2
-	dev-libs/libzip:=
-	dev-libs/mpfr:0=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5[-gles2-only]
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	media-gfx/opencsg:=
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/glew-2.0.0:0=
-	media-libs/harfbuzz:=
-	media-libs/lib3mf
-	sci-mathematics/cgal:=
-	x11-libs/cairo
-	>=x11-libs/qscintilla-2.10.3:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/itstool
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${P}-0001-Gentoo-specific-Disable-ccache-building.patch )
-
-src_prepare() {
-	default
-	if has_version ">=media-libs/lib3mf-2"; then
-		eapply "${FILESDIR}/${P}-0002-fix-to-find-lib3mf-2.patch"
-	fi
-}
-
-src_configure() {
-	if has ccache ${FEATURES}; then
-		eqmake5 "PREFIX = ${ESYSROOT}/usr" "CONFIG += ccache" "${PN}.pro"
-	else
-		eqmake5 "PREFIX = ${ESYSROOT}/usr" "${PN}.pro"
-	fi
-}
-
-src_compile() {
-	default
-
-	if use emacs ; then
-		elisp-compile contrib/*.el
-	fi
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		elisp-install ${PN} contrib/*.el contrib/*.elc
-	fi
-
-	mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales"
-	ln -sf ../locale "${ED}"/usr/share/openscad/locale || die
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2022-08-31 18:47 Sam James
  0 siblings, 0 replies; 61+ messages in thread
From: Sam James @ 2022-08-31 18:47 UTC (permalink / raw
  To: gentoo-commits

commit:     bd249514fecc18fbfbe6836b7da5d3ff1a4229d9
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Wed Aug 31 18:19:39 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 18:46:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd249514

media-gfx/openscad: workaround for parallel build failures

Bug: https://github.com/openscad/openscad/issues/4344
Closes: https://bugs.gentoo.org/856430
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/27093
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/openscad/openscad-2021.01-r4.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-gfx/openscad/openscad-2021.01-r4.ebuild b/media-gfx/openscad/openscad-2021.01-r4.ebuild
index 9b67272f4c26..78199f471cd4 100644
--- a/media-gfx/openscad/openscad-2021.01-r4.ebuild
+++ b/media-gfx/openscad/openscad-2021.01-r4.ebuild
@@ -78,7 +78,8 @@ src_configure() {
 }
 
 src_compile() {
-	default
+	# We have random parallel build issues, bug #856430
+	emake -j1
 
 	if use emacs ; then
 		elisp-compile contrib/*.el


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2022-09-01  8:45 Agostino Sarubbo
  0 siblings, 0 replies; 61+ messages in thread
From: Agostino Sarubbo @ 2022-09-01  8:45 UTC (permalink / raw
  To: gentoo-commits

commit:     62b831e3972415169d762606f86b77a03cbe26e8
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 08:44:59 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 08:44:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62b831e3

media-gfx/openscad: amd64 stable wrt bug #867748

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-gfx/openscad/openscad-2021.01-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/openscad/openscad-2021.01-r4.ebuild b/media-gfx/openscad/openscad-2021.01-r4.ebuild
index 78199f471cd4..1ce925d70618 100644
--- a/media-gfx/openscad/openscad-2021.01-r4.ebuild
+++ b/media-gfx/openscad/openscad-2021.01-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="emacs"
 # tests are not fully working and need cmake which isn't yet
 # officially supported.


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2022-09-01 19:14 Sam James
  0 siblings, 0 replies; 61+ messages in thread
From: Sam James @ 2022-09-01 19:14 UTC (permalink / raw
  To: gentoo-commits

commit:     3814b48e0b5c23256630f205f8160c0c017f6f4a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 19:12:23 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 19:12:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3814b48e

media-gfx/openscad: Stabilize 2021.01-r4 x86, #867748

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

 media-gfx/openscad/openscad-2021.01-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/openscad/openscad-2021.01-r4.ebuild b/media-gfx/openscad/openscad-2021.01-r4.ebuild
index 1ce925d70618..c7456da4cd38 100644
--- a/media-gfx/openscad/openscad-2021.01-r4.ebuild
+++ b/media-gfx/openscad/openscad-2021.01-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="emacs"
 # tests are not fully working and need cmake which isn't yet
 # officially supported.


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2022-09-02 16:50 Joonas Niilola
  0 siblings, 0 replies; 61+ messages in thread
From: Joonas Niilola @ 2022-09-02 16:50 UTC (permalink / raw
  To: gentoo-commits

commit:     f9ff34202290af6646ebe66f4549ac1117df6755
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Sep  2 14:21:05 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Sep  2 16:49:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9ff3420

media-gfx/openscad: drop 2021.01-r3

Bug: https://bugs.gentoo.org/867325
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/27113
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/openscad/openscad-2021.01-r3.ebuild | 106 --------------------------
 1 file changed, 106 deletions(-)

diff --git a/media-gfx/openscad/openscad-2021.01-r3.ebuild b/media-gfx/openscad/openscad-2021.01-r3.ebuild
deleted file mode 100644
index 41f8b9baca99..000000000000
--- a/media-gfx/openscad/openscad-2021.01-r3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common qmake-utils xdg
-
-SITEFILE="50${PN}-gentoo.el"
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="https://www.openscad.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="emacs"
-# tests are not fully working and need cmake which isn't yet
-# officially supported.
-RESTRICT="test"
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/gmp:0=
-	dev-libs/hidapi
-	dev-libs/libspnav
-	dev-libs/libxml2
-	dev-libs/libzip:=
-	dev-libs/mpfr:0=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5[-gles2-only]
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	media-gfx/opencsg:=
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/glew-2.0.0:0=
-	media-libs/harfbuzz:=
-	media-libs/lib3mf
-	sci-mathematics/cgal:=
-	x11-libs/cairo
-	>=x11-libs/qscintilla-2.10.3:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/itstool
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-0001-Gentoo-specific-Disable-ccache-building.patch
-	"${FILESDIR}"/${P}-0002-fix-to-find-lib3mf-2.patch
-)
-
-src_configure() {
-	if has ccache ${FEATURES}; then
-		eqmake5 "PREFIX = ${ESYSROOT}/usr" "CONFIG += ccache" "${PN}.pro"
-	else
-		eqmake5 "PREFIX = ${ESYSROOT}/usr" "${PN}.pro"
-	fi
-}
-
-src_compile() {
-	default
-
-	if use emacs ; then
-		elisp-compile contrib/*.el
-	fi
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		elisp-install ${PN} contrib/*.el contrib/*.elc
-	fi
-
-	mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales"
-	ln -sf ../locale "${ED}"/usr/share/openscad/locale || die
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2023-04-06  6:54 Joonas Niilola
  0 siblings, 0 replies; 61+ messages in thread
From: Joonas Niilola @ 2023-04-06  6:54 UTC (permalink / raw
  To: gentoo-commits

commit:     a834e3baa2c0cad3d1f954866687d79b18682b28
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Mar 24 17:58:20 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Apr  6 06:54:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a834e3ba

media-gfx/openscad: allow experimental features

add experimental USE flag to enable newer features
update ebuild to reflect upstream changes

Thanks to Michael Moon for pointing this out.

Suggested-by: Michael Moon <triffid.hunter <AT> gmail.com>
Closes: https://bugs.gentoo.org/899658
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/30334
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/openscad/metadata.xml         | 16 ++++++++--
 media-gfx/openscad/openscad-9999.ebuild | 55 +++++++++++++++++----------------
 2 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml
index 817a36f21ccf..0b965cbf4ac8 100644
--- a/media-gfx/openscad/metadata.xml
+++ b/media-gfx/openscad/metadata.xml
@@ -21,11 +21,23 @@
 	Mac OS X.
 </longdescription>
 <use>
+	<flag name="egl">
+		Build using EGL instead of GLX
+	</flag>
+	<flag name="experimental">
+		Enable experimental features
+	</flag>
 	<flag name="gamepad">
 		Add support for gamepads through <pkg>dev-qt/qtgamepad</pkg>
 	</flag>
-	<flag name="headless">
-		Build a binary without GUI
+	<flag name="gui">
+		Enable or disable building of the GUI
+	</flag>
+	<flag name="hidapi">
+		Build in support for HID-Class devices using <pkg>dev-libs/hidapi</pkg>
+	</flag>
+	<flag name="mimalloc">
+		Build using <pkg>dev-libs/mimalloc</pkg> as memory allocator
 	</flag>
 	<flag name="spacenav">
 		Add support for space navigator devices through

diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index 425d55c09f81..94342d5766f0 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -1,11 +1,15 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+# TODO's
+# package and unbundle manifold
+# package Emacs scad-mode (and scad-dbus) and re-add emacs USE flag
+# set up proper testing
+# set up OFFLINE_DOCS and add doc USE flag
 
-inherit cmake elisp-common git-r3 xdg
+EAPI=8
 
-SITEFILE="50${PN}-gentoo.el"
+inherit cmake git-r3 xdg
 
 DESCRIPTION="The Programmers Solid 3D CAD Modeller"
 HOMEPAGE="https://www.openscad.org/"
@@ -16,11 +20,14 @@ EGIT_REPO_URI="https://github.com/openscad/openscad.git"
 LICENSE="GPL-3+ LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="cairo dbus emacs gamepad headless spacenav"
+# TODO: emacs mode files have been moved to a separate repo: github://openscad/emacs-scad-mode
+IUSE="cairo dbus egl experimental gamepad gui hidapi mimalloc spacenav"
 RESTRICT="test" # 32 out 1300+ tests fail
 
 REQUIRED_USE="
-	headless? ( !dbus !gamepad !spacenav )
+	dbus? ( gui )
+	gamepad? ( gui )
+	spacenav? ( gui )
 "
 
 RDEPEND="
@@ -39,8 +46,7 @@ RDEPEND="
 	sci-mathematics/cgal:=
 	virtual/opengl
 	cairo? ( x11-libs/cairo )
-	emacs? ( app-editors/emacs:* )
-	!headless? (
+	gui? (
 		dev-qt/qtconcurrent:5
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5[-gles2-only]
@@ -49,10 +55,13 @@ RDEPEND="
 		dev-qt/qtopengl:5
 		dev-qt/qtsvg:5
 		dev-qt/qtwidgets:5
+		x11-libs/libX11
 		x11-libs/qscintilla:=
 		dbus? ( dev-qt/qtdbus:5 )
 		gamepad? ( dev-qt/qtgamepad:5 )
 	)
+	hidapi? ( dev-libs/hidapi )
+	mimalloc? ( dev-libs/mimalloc:= )
 	spacenav? ( dev-libs/libspnav )
 "
 DEPEND="${RDEPEND}"
@@ -65,24 +74,33 @@ BDEPEND="
 "
 
 DOCS=(
+	README.md
 	RELEASE_NOTES.md
 	doc/TODO.txt
 	doc/contributor_copyright.txt
 	doc/hacking.md
 	doc/testing.txt
+	doc/translation.txt
 )
 
 src_configure() {
 	local mycmakeargs=(
 		-DCLANG_TIDY=OFF
 		-DENABLE_CAIRO=$(usex cairo)
+		-DENABLE_EGL=$(usex egl)
+		-DENABLE_HIDAPI=$(usex hidapi)
+		# needs python deps, unbundle first before enabling
+		-DENABLE_MANIFOLD=OFF
 		-DENABLE_SPNAV=$(usex spacenav)
 		-DENABLE_TESTS=OFF
-		-DHEADLESS=$(usex headless)
+		-DEXPERIMENTAL=$(usex experimental)
+		-DHEADLESS=$(usex gui OFF ON)
+		-DOFFLINE_DOCS=OFF
 		-DUSE_CCACHE=OFF
+		-DUSE_MIMALLOC=$(usex mimalloc)
 	)
 
-	if use !headless; then
+	if use gui; then
 		mycmakeargs+=(
 			-DENABLE_GAMEPAD=$(usex gamepad)
 			-DENABLE_QTDBUS=$(usex dbus)
@@ -92,36 +110,21 @@ src_configure() {
 	cmake_src_configure
 }
 
-src_compile() {
-	cmake_src_compile
-
-	if use emacs ; then
-		elisp-compile contrib/*.el
-	fi
-}
-
 src_install() {
 	DOCS+=( doc/*.pdf )
 	cmake_src_install
 
 	mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales"
-	ln -sf ../locale "${ED}"/usr/share/openscad/locale || die
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		elisp-install ${PN} contrib/*.el contrib/*.elc
-	fi
+	dosym -r /usr/share/locale /usr/share/openscad/locale
 }
 
 pkg_postinst() {
-	use emacs && elisp-site-regen
 	xdg_desktop_database_update
 	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
-	use emacs && elisp-site-regen
 	xdg_desktop_database_update
 	xdg_icon_cache_update
 	xdg_mimeinfo_database_update


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2023-05-02 13:39 Joonas Niilola
  0 siblings, 0 replies; 61+ messages in thread
From: Joonas Niilola @ 2023-05-02 13:39 UTC (permalink / raw
  To: gentoo-commits

commit:     735a5e8b07a9773f5f51ed2d7fcf838e7ad809cd
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Tue Apr 11 08:48:46 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue May  2 13:39:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=735a5e8b

media-gfx/openscad: add notice about Emacs scad-mode

fix depstring for lib3mf

Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/30570
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/openscad/openscad-9999.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index 94342d5766f0..ccf5837e0e73 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -3,13 +3,12 @@
 
 # TODO's
 # package and unbundle manifold
-# package Emacs scad-mode (and scad-dbus) and re-add emacs USE flag
 # set up proper testing
 # set up OFFLINE_DOCS and add doc USE flag
 
 EAPI=8
 
-inherit cmake git-r3 xdg
+inherit cmake git-r3 optfeature xdg
 
 DESCRIPTION="The Programmers Solid 3D CAD Modeller"
 HOMEPAGE="https://www.openscad.org/"
@@ -20,7 +19,6 @@ EGIT_REPO_URI="https://github.com/openscad/openscad.git"
 LICENSE="GPL-3+ LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-# TODO: emacs mode files have been moved to a separate repo: github://openscad/emacs-scad-mode
 IUSE="cairo dbus egl experimental gamepad gui hidapi mimalloc spacenav"
 RESTRICT="test" # 32 out 1300+ tests fail
 
@@ -42,7 +40,7 @@ RDEPEND="
 	media-libs/freetype
 	media-libs/glew:0=
 	media-libs/harfbuzz:=
-	media-libs/lib3mf
+	media-libs/lib3mf:=
 	sci-mathematics/cgal:=
 	virtual/opengl
 	cairo? ( x11-libs/cairo )
@@ -122,6 +120,8 @@ pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
+
+	optfeature "support scad major mode in GNU Emacs" app-emacs/scad-mode
 }
 
 pkg_postrm() {


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

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

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

media-gfx/openscad: Keyword 2021.01-r4 ppc64, #886101

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

 media-gfx/openscad/openscad-2021.01-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/openscad/openscad-2021.01-r4.ebuild b/media-gfx/openscad/openscad-2021.01-r4.ebuild
index 3098b9593364..fe623f9e3453 100644
--- a/media-gfx/openscad/openscad-2021.01-r4.ebuild
+++ b/media-gfx/openscad/openscad-2021.01-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE="emacs"
 # tests are not fully working and need cmake which isn't yet
 # officially supported.


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2024-04-16 16:30 Jimi Huotari
  0 siblings, 0 replies; 61+ messages in thread
From: Jimi Huotari @ 2024-04-16 16:30 UTC (permalink / raw
  To: gentoo-commits

commit:     1cfcb246010f86c0e132d02da274d9832ae3e9c3
Author:     José P. R. N. Assis <espinafre <AT> gmail <DOT> com>
AuthorDate: Thu Feb  1 12:18:41 2024 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Tue Apr 16 16:29:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cfcb246

media-gfx/openscad: fix qscintilla dep #916232

Adding [qt5(+)] to the qscintilla dependency in preparation to supporting Qt5/Qt6
QScintilla multibuild. Revision number bumped from -r4 to -r5. Keywords
kept as-is.

Bug: https://bugs.gentoo.org/916232
Signed-off-by: José P. R. N. Assis <espinafre <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35134
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 .../openscad/{openscad-2021.01-r4.ebuild => openscad-2021.01-r5.ebuild} | 2 +-
 media-gfx/openscad/openscad-9999.ebuild                                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/openscad/openscad-2021.01-r4.ebuild b/media-gfx/openscad/openscad-2021.01-r5.ebuild
similarity index 98%
rename from media-gfx/openscad/openscad-2021.01-r4.ebuild
rename to media-gfx/openscad/openscad-2021.01-r5.ebuild
index a9028e9dae22..39b12ee55322 100644
--- a/media-gfx/openscad/openscad-2021.01-r4.ebuild
+++ b/media-gfx/openscad/openscad-2021.01-r5.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 	media-libs/lib3mf
 	sci-mathematics/cgal:=
 	x11-libs/cairo
-	>=x11-libs/qscintilla-2.10.3:=
+	>=x11-libs/qscintilla-2.10.3:=[qt5(+)]
 	emacs? ( >=app-editors/emacs-23.1:* )
 "
 DEPEND="${RDEPEND}"

diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index 216d9376fd68..2322d4b21967 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -54,7 +54,7 @@ RDEPEND="
 		dev-qt/qtsvg:5
 		dev-qt/qtwidgets:5
 		x11-libs/libX11
-		x11-libs/qscintilla:=
+		x11-libs/qscintilla:=[qt5(+)]
 		dbus? ( dev-qt/qtdbus:5 )
 		gamepad? ( dev-qt/qtgamepad:5 )
 	)


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2024-07-26  5:05 Eli Schwartz
  0 siblings, 0 replies; 61+ messages in thread
From: Eli Schwartz @ 2024-07-26  5:05 UTC (permalink / raw
  To: gentoo-commits

commit:     c2e0ed6e7931931991d0526a4654105b34bff9d6
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 01:26:53 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 05:04:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2e0ed6e

media-gfx/openscad: mark as LTO-unsafe

Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 media-gfx/openscad/openscad-2021.01-r5.ebuild | 6 +++++-
 media-gfx/openscad/openscad-9999.ebuild       | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/media-gfx/openscad/openscad-2021.01-r5.ebuild b/media-gfx/openscad/openscad-2021.01-r5.ebuild
index cf272f31a4f7..ebb1462233ab 100644
--- a/media-gfx/openscad/openscad-2021.01-r5.ebuild
+++ b/media-gfx/openscad/openscad-2021.01-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit elisp-common qmake-utils xdg
+inherit elisp-common flag-o-matic qmake-utils xdg
 
 SITEFILE="50${PN}-gentoo.el"
 
@@ -71,6 +71,10 @@ PATCHES=(
 )
 
 src_configure() {
+	# -Werror=odr
+	# https://github.com/openscad/openscad/issues/5239
+	filter-lto
+
 	if has ccache ${FEATURES}; then
 		eqmake5 "PREFIX = ${ESYSROOT}/usr" "CONFIG += ccache" "${PN}.pro"
 	else

diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index 2322d4b21967..47c9d93adc5e 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -8,7 +8,7 @@
 
 EAPI=8
 
-inherit cmake git-r3 optfeature xdg
+inherit cmake flag-o-matic git-r3 optfeature xdg
 
 DESCRIPTION="The Programmers Solid 3D CAD Modeller"
 HOMEPAGE="https://www.openscad.org/"
@@ -82,6 +82,10 @@ DOCS=(
 )
 
 src_configure() {
+	# -Werror=odr
+	# https://github.com/openscad/openscad/issues/5239
+	filter-lto
+
 	local mycmakeargs=(
 		-DCLANG_TIDY=OFF
 		-DENABLE_CAIRO=$(usex cairo)


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2024-07-26  5:05 Eli Schwartz
  0 siblings, 0 replies; 61+ messages in thread
From: Eli Schwartz @ 2024-07-26  5:05 UTC (permalink / raw
  To: gentoo-commits

commit:     2486de2f5571c000ec7db726fe0575d8e23ac140
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 01:27:49 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 05:04:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2486de2f

media-gfx/openscad: update HOMEPAGE to resolve redirect

Upstream does not use a www subdomain anymore.

Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 media-gfx/openscad/openscad-2021.01-r5.ebuild | 2 +-
 media-gfx/openscad/openscad-9999.ebuild       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/openscad/openscad-2021.01-r5.ebuild b/media-gfx/openscad/openscad-2021.01-r5.ebuild
index ebb1462233ab..3e4af4844ba7 100644
--- a/media-gfx/openscad/openscad-2021.01-r5.ebuild
+++ b/media-gfx/openscad/openscad-2021.01-r5.ebuild
@@ -8,7 +8,7 @@ inherit elisp-common flag-o-matic qmake-utils xdg
 SITEFILE="50${PN}-gentoo.el"
 
 DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="https://www.openscad.org/"
+HOMEPAGE="https://openscad.org/"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"

diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index 47c9d93adc5e..4cfaae64dfac 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -11,7 +11,7 @@ EAPI=8
 inherit cmake flag-o-matic git-r3 optfeature xdg
 
 DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="https://www.openscad.org/"
+HOMEPAGE="https://openscad.org/"
 SRC_URI=""
 EGIT_REPO_URI="https://github.com/openscad/openscad.git"
 


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2024-11-16 21:39 Sam James
  0 siblings, 0 replies; 61+ messages in thread
From: Sam James @ 2024-11-16 21:39 UTC (permalink / raw
  To: gentoo-commits

commit:     c9f809ca76c43fb6c4363876c7076eb91a0368c1
Author:     Chris Mayo <aklhfex <AT> gmail <DOT> com>
AuthorDate: Mon Nov 11 19:34:19 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 16 21:39:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9f809ca

media-gfx/openscad: add 20241111

Signed-off-by: Chris Mayo <aklhfex <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/openscad/Manifest                 |   2 +
 media-gfx/openscad/openscad-20241111.ebuild | 163 ++++++++++++++++++++++++++++
 2 files changed, 165 insertions(+)

diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index ac0202896cd3..eb98c72aacdb 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1 +1,3 @@
 DIST openscad-2021.01.tar.gz 15817555 BLAKE2B 417857d704fa3c14312641ebda983eb85a1e3bc0d517a235fa3bd2523fce6f93c1ea526c330179bc35f03e6c73d3cd7c4c57cd71480088c21bfc99bb020ab7cd SHA512 8deaa26bf4c295c12da38f323d2b2e6f827851337f5bc1cc9c79afc083c9f913c19a263086e6e853bf2c8434c1ccc705ea22ddb02dc99d39bb1e5e03fc58d128
+DIST openscad-20241111.tar.gz 25288494 BLAKE2B d414e2c2bf13a436ee78d02cc4888d2c4c69e237d1b7deef808b56a6b0e1b16dd39acf939befa009da97653b3363886068e8316e7c861b384e6c9e32ad97cf62 SHA512 b42ba68842a279a48063690ad730a71e25b5a49c89551eecfe3671e3c217f493968292805831eec3efc8cbb7421d30bcdd216e4205c1b1de8989ab94a31531ae
+DIST openscad-MCAD-bd0a7ba3f042bfbced5ca1894b236cea08904e26.tar.gz 58895 BLAKE2B e154a38e1c36873a34f7c80b8fa484e4bbcb1b0c217e15b977e6cedc9a83fd2e1518791f9a58a4f0e893c2a55947d7eaddb660d8b725eca048c30f0ea41cf14a SHA512 c6208a90f6a58ebdc0477d3e1b6be2f52e4ce976ac619a87818437cb9696b7e83285564fde757d32efaf50033d5217b55f67b6ce342250de838dd09fef334f36

diff --git a/media-gfx/openscad/openscad-20241111.ebuild b/media-gfx/openscad/openscad-20241111.ebuild
new file mode 100644
index 000000000000..afb2c30366fb
--- /dev/null
+++ b/media-gfx/openscad/openscad-20241111.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic multiprocessing optfeature virtualx xdg
+
+COMMIT=6baf982dc95c91829251fab871bf66554386ece1
+MCAD_COMMIT=bd0a7ba3f042bfbced5ca1894b236cea08904e26
+
+DESCRIPTION="The Programmers Solid 3D CAD Modeller"
+HOMEPAGE="https://openscad.org/"
+SRC_URI="https://github.com/openscad/openscad/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
+	test? ( https://github.com/openscad/MCAD/archive/${MCAD_COMMIT}.tar.gz -> ${PN}-MCAD-${MCAD_COMMIT}.tar.gz )"
+# doc downloads are not versioned and found at:
+# https://files.openscad.org/documentation/
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+# Code is GPL-3+, MCAD library is LGPL-2.1
+LICENSE="GPL-3+ LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="dbus experimental gamepad +gui hidapi +manifold mimalloc pdf qt6 spacenav test"
+RESTRICT="test mirror"  # many tests fail
+
+REQUIRED_USE="
+	dbus? ( gui )
+	gamepad? ( gui )
+	spacenav? ( gui )
+	qt6? ( !gamepad )
+"
+
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-libs/boost:=
+	dev-libs/double-conversion:=
+	dev-libs/glib:2
+	dev-libs/libxml2
+	dev-libs/libzip:=
+	media-gfx/opencsg:=
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/harfbuzz:=
+	media-libs/lib3mf:=
+	sci-mathematics/cgal:=
+	virtual/opengl
+	gui? (
+		qt6? (
+			dev-qt/qt5compat:6
+			dev-qt/qtbase:6[concurrent,dbus?,-gles2-only,network,opengl,widgets]
+			dev-qt/qtmultimedia:6
+			dev-qt/qtsvg:6
+			x11-libs/qscintilla:=[qt6]
+		)
+		!qt6? (
+			dev-qt/qtconcurrent:5
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5[-gles2-only]
+			dev-qt/qtmultimedia:5
+			dev-qt/qtnetwork:5
+			dev-qt/qtopengl:5
+			dev-qt/qtsvg:5
+			dev-qt/qtwidgets:5
+			x11-libs/qscintilla:0=
+			dbus? ( dev-qt/qtdbus:5 )
+			gamepad? ( dev-qt/qtgamepad:5 )
+		)
+	)
+	hidapi? ( dev-libs/hidapi )
+	manifold? (
+		dev-cpp/tbb
+		>=sci-mathematics/manifold-3.0.0_pre2040919
+	)
+	mimalloc? ( dev-libs/mimalloc:= )
+	pdf? ( x11-libs/cairo )
+	spacenav? ( dev-libs/libspnav )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-alternatives/yacc
+	app-alternatives/lex
+	dev-util/itstool
+	dev-util/sanitizers-cmake
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOCS=(
+	README.md
+	RELEASE_NOTES.md
+	doc/TODO.txt
+	doc/contributor_copyright.txt
+	doc/hacking.md
+	doc/testing.txt
+	doc/translation.txt
+)
+
+PATCHES=( "${FILESDIR}/sanitizers-cmake.patch" )
+
+src_prepare() {
+	if use test; then
+		mv -f "${WORKDIR}/MCAD-${MCAD_COMMIT}"/* "${S}/libraries/MCAD/" || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# -Werror=odr
+	# https://github.com/openscad/openscad/issues/5239
+	filter-lto
+
+	local mycmakeargs=(
+		-DOPENSCAD_COMMIT=${COMMIT:0:9}
+		-DOPENSCAD_VERSION=${PV:0:4}.${PV:4:2}.${PV:6:2}
+		-DCLANG_TIDY=OFF
+		-DENABLE_CAIRO=$(usex pdf)
+		-DENABLE_EGL=ON
+		-DENABLE_GLX=OFF
+		-DENABLE_MANIFOLD=$(usex manifold)
+		-DENABLE_TESTS=$(usex test)
+		-DEXPERIMENTAL=$(usex experimental)
+		-DHEADLESS=$(usex gui OFF ON)
+		-DUSE_BUILTIN_MANIFOLD=OFF
+		-DUSE_CCACHE=OFF
+		-DUSE_GLAD=ON
+		-DUSE_LEGACY_RENDERERS=OFF
+		-DUSE_MIMALLOC=$(usex mimalloc)
+		-DUSE_QT6=$(usex qt6)
+	)
+
+	if use gui; then
+		mycmakeargs+=(
+			-DENABLE_GAMEPAD=$(usex gamepad)
+			-DENABLE_HIDAPI=$(usex hidapi)
+			-DENABLE_QTDBUS=$(usex dbus)
+			-DENABLE_SPNAV=$(usex spacenav)
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	DOCS+=( doc/*.pdf )
+	cmake_src_install
+
+	mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales"
+	dosym -r /usr/share/locale /usr/share/openscad/locale
+}
+
+src_test() {
+	xdg_environment_reset
+	pushd "${BUILD_DIR}" > /dev/null || die
+	virtx ctest -j "$(makeopts_jobs "${MAKEOPTS}" 999)"
+	popd > /dev/null || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "support scad major mode in GNU Emacs" app-emacs/scad-mode
+}


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2024-11-16 21:39 Sam James
  0 siblings, 0 replies; 61+ messages in thread
From: Sam James @ 2024-11-16 21:39 UTC (permalink / raw
  To: gentoo-commits

commit:     6e91f31855fc6699f7b3e577117aafa7b5008498
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Sat Nov 16 16:30:00 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 16 21:39:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e91f318

media-gfx/openscad: move 9999 -> 99999999

We have YMD snapshots, so adjust live ebuild.

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

 media-gfx/openscad/{openscad-9999.ebuild => openscad-99999999.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-99999999.ebuild
similarity index 100%
rename from media-gfx/openscad/openscad-9999.ebuild
rename to media-gfx/openscad/openscad-99999999.ebuild


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/
@ 2024-11-16 21:39 Sam James
  0 siblings, 0 replies; 61+ messages in thread
From: Sam James @ 2024-11-16 21:39 UTC (permalink / raw
  To: gentoo-commits

commit:     d5515a801258b39900cb36fe6090c9085518ef8c
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Sat Nov 16 17:21:47 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 16 21:39:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5515a80

media-gfx/openscad: 20241114 enable tests

Drop USE=gamepad as 9999 no longer supports qt5

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

 media-gfx/openscad/metadata.xml             |   3 -
 media-gfx/openscad/openscad-20241114.ebuild | 125 ++++++++++++----
 media-gfx/openscad/openscad-9999.ebuild     | 213 +++++++++++++++++++++-------
 3 files changed, 256 insertions(+), 85 deletions(-)

diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml
index ac47d0a9f5d3..65b56ea5a6ce 100644
--- a/media-gfx/openscad/metadata.xml
+++ b/media-gfx/openscad/metadata.xml
@@ -27,9 +27,6 @@
 	<flag name="experimental">
 		Enable experimental features
 	</flag>
-	<flag name="gamepad">
-		Add support for gamepads through <pkg>dev-qt/qtgamepad</pkg>
-	</flag>
 	<flag name="glx">
 		Enable GLX to interface OpenGL and X11
 	</flag>

diff --git a/media-gfx/openscad/openscad-20241114.ebuild b/media-gfx/openscad/openscad-20241114.ebuild
index ec08be8aa0b5..238288a09864 100644
--- a/media-gfx/openscad/openscad-20241114.ebuild
+++ b/media-gfx/openscad/openscad-20241114.ebuild
@@ -3,34 +3,46 @@
 
 EAPI=8
 
-inherit cmake flag-o-matic multiprocessing optfeature virtualx xdg
-
-COMMIT="bc0d078e0361d7dba66723ac31bdb3b650ecff37"
-SANITIZERS_CMAKE_COMMIT="3f0542e4e034aab417c51b2b22c94f83355dee15"
-MCAD_COMMIT="bd0a7ba3f042bfbced5ca1894b236cea08904e26"
+inherit cmake flag-o-matic optfeature virtualx xdg
 
 DESCRIPTION="The Programmers Solid 3D CAD Modeller"
 HOMEPAGE="https://openscad.org/"
-SRC_URI="
-	https://github.com/openscad/openscad/archive/${COMMIT}.tar.gz
-		-> ${P}.tar.gz
-	https://github.com/arsenm/sanitizers-cmake/archive/${SANITIZERS_CMAKE_COMMIT}.tar.gz
-		-> sanitizers-cmake-${SANITIZERS_CMAKE_COMMIT}.tar.gz
-	test? (
-		https://github.com/openscad/MCAD/archive/${MCAD_COMMIT}.tar.gz -> ${PN}-MCAD-${MCAD_COMMIT}.tar.gz
+
+if [[ ${PV} = *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openscad/openscad.git"
+	EGIT_SUBMODULES=(
+		'*'
+		'-mimalloc'
+		'-submodules/manifold'
+		'-OpenCSG'
 	)
-"
-# doc downloads are not versioned and found at:
-# https://files.openscad.org/documentation/
-S="${WORKDIR}/${PN}-${COMMIT}"
+else
+	COMMIT="bc0d078e0361d7dba66723ac31bdb3b650ecff37"
+	SANITIZERS_CMAKE_COMMIT="3f0542e4e034aab417c51b2b22c94f83355dee15"
+	MCAD_COMMIT="bd0a7ba3f042bfbced5ca1894b236cea08904e26"
+
+	SRC_URI="
+		https://github.com/openscad/openscad/archive/${COMMIT}.tar.gz
+			-> ${P}.tar.gz
+		https://github.com/arsenm/sanitizers-cmake/archive/${SANITIZERS_CMAKE_COMMIT}.tar.gz
+			-> sanitizers-cmake-${SANITIZERS_CMAKE_COMMIT}.tar.gz
+		test? (
+			https://github.com/openscad/MCAD/archive/${MCAD_COMMIT}.tar.gz -> ${PN}-MCAD-${MCAD_COMMIT}.tar.gz
+		)
+	"
+	# doc downloads are not versioned and found at:
+	# https://files.openscad.org/documentation/
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
 
 # Code is GPL-3+, MCAD library is LGPL-2.1
 LICENSE="GPL-3+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 IUSE="dbus +egl experimental glx +gui hidapi +manifold mimalloc pdf spacenav test"
-RESTRICT="test"  # many tests fail
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	dbus? ( gui )
@@ -91,7 +103,7 @@ DOCS=(
 )
 
 src_prepare() {
-	if use test; then
+	if use test && [[ ${PV} != *9999* ]] ; then
 		mv -f "${WORKDIR}/MCAD-${MCAD_COMMIT}"/* "${S}/libraries/MCAD/" || die
 	fi
 
@@ -110,11 +122,6 @@ src_configure() {
 	filter-lto
 
 	local mycmakeargs=(
-		-DCMAKE_MODULE_PATH="${WORKDIR}/sanitizers-cmake-${SANITIZERS_CMAKE_COMMIT}/cmake"
-
-		-DOPENSCAD_COMMIT="${COMMIT:0:9}"
-		-DOPENSCAD_VERSION="${PV:0:4}.${PV:4:2}.${PV:6:2}"
-
 		-DCLANG_TIDY="no"
 		-DENABLE_CAIRO="$(usex pdf)"
 		-DENABLE_CGAL="yes"
@@ -145,14 +152,76 @@ src_configure() {
 		)
 	fi
 
+	if [[ ${PV} != *9999* ]] ; then
+		mycmakeargs+=(
+			-DCMAKE_MODULE_PATH="${WORKDIR}/sanitizers-cmake-${SANITIZERS_CMAKE_COMMIT}/cmake"
+			-DOPENSCAD_COMMIT="${COMMIT:0:9}"
+			-DOPENSCAD_VERSION="${PV:0:4}.${PV:4:2}.${PV:6:2}"
+		)
+	fi
+
 	cmake_src_configure
 }
 
 src_test() {
-	xdg_environment_reset
-	pushd "${BUILD_DIR}" > /dev/null || die
-	virtx ctest -j "$(makeopts_jobs "${MAKEOPTS}" 999)"
-	popd > /dev/null || die
+	local i WRITE=()
+
+	if [[ -d "/dev/udmabuf" ]]; then
+		WRITE+=(
+			"/dev/udmabuf"
+		)
+	fi
+
+	if [[ -d /sys/module/nvidia ]]; then
+		# /dev/dri/card*
+		# /dev/dri/renderD*
+		readarray -t dri <<<"$(
+			find /sys/module/nvidia/drivers/*/*:*:*.*/drm \
+				-mindepth 1 -maxdepth 1 -type d -exec basename {} \; \
+				| sed 's:^:/dev/dri/:'
+			)"
+
+		# /dev/nvidia{0-9}
+		readarray -t cards <<<"$(find /dev -regextype sed -regex '/dev/nvidia[0-9]*')"
+
+		WRITE+=(
+			"${dri[@]}"
+			"${cards[@]}"
+			"/dev/nvidiactl"
+			"/dev/nvidia-caps/"
+			"/dev/nvidia-modeset"
+			"/dev/nvidia-uvm"
+			"/dev/nvidia-uvm-tools"
+		)
+	fi
+
+	WRITE+=(
+		# for portage
+		"/proc/self/task/"
+	)
+	for i in "${WRITE[@]}"; do
+		if [[ ! -w "$i" ]]; then
+			eqawarn "addwrite $i"
+			addwrite "$i"
+
+			if [[ ! -d "$i" ]] && [[ ! -w "$i" ]]; then
+				eqawarn "can not access $i after addwrite"
+			fi
+		fi
+	done
+
+	sed \
+		-e "s/OPENSCAD_BINARY/OPENSCADPATH/g" \
+		-i tests/test_cmdline_tool.py || die
+
+	cd "${BUILD_DIR}" || die
+
+	# NOTE link in from CMAKE_USE_DIR
+	ln -s "${CMAKE_USE_DIR}/color-schemes" . || die
+	ln -s "${CMAKE_USE_DIR}/locale" . || die
+	ln -s "${CMAKE_USE_DIR}/shaders" . || die
+
+	virtx cmake_src_test -j1
 }
 
 src_install() {

diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index 4cfaae64dfac..238288a09864 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -1,35 +1,57 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# TODO's
-# package and unbundle manifold
-# set up proper testing
-# set up OFFLINE_DOCS and add doc USE flag
-
 EAPI=8
 
-inherit cmake flag-o-matic git-r3 optfeature xdg
+inherit cmake flag-o-matic optfeature virtualx xdg
 
 DESCRIPTION="The Programmers Solid 3D CAD Modeller"
 HOMEPAGE="https://openscad.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/openscad/openscad.git"
+
+if [[ ${PV} = *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openscad/openscad.git"
+	EGIT_SUBMODULES=(
+		'*'
+		'-mimalloc'
+		'-submodules/manifold'
+		'-OpenCSG'
+	)
+else
+	COMMIT="bc0d078e0361d7dba66723ac31bdb3b650ecff37"
+	SANITIZERS_CMAKE_COMMIT="3f0542e4e034aab417c51b2b22c94f83355dee15"
+	MCAD_COMMIT="bd0a7ba3f042bfbced5ca1894b236cea08904e26"
+
+	SRC_URI="
+		https://github.com/openscad/openscad/archive/${COMMIT}.tar.gz
+			-> ${P}.tar.gz
+		https://github.com/arsenm/sanitizers-cmake/archive/${SANITIZERS_CMAKE_COMMIT}.tar.gz
+			-> sanitizers-cmake-${SANITIZERS_CMAKE_COMMIT}.tar.gz
+		test? (
+			https://github.com/openscad/MCAD/archive/${MCAD_COMMIT}.tar.gz -> ${PN}-MCAD-${MCAD_COMMIT}.tar.gz
+		)
+	"
+	# doc downloads are not versioned and found at:
+	# https://files.openscad.org/documentation/
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
 
 # Code is GPL-3+, MCAD library is LGPL-2.1
 LICENSE="GPL-3+ LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
-IUSE="cairo dbus egl experimental gamepad gui hidapi mimalloc spacenav"
-RESTRICT="test" # 32 out 1300+ tests fail
+
+IUSE="dbus +egl experimental glx +gui hidapi +manifold mimalloc pdf spacenav test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	dbus? ( gui )
-	gamepad? ( gui )
+	hidapi? ( gui )
 	spacenav? ( gui )
+	|| ( egl glx )
 "
 
 RDEPEND="
-	dev-cpp/eigen:3
 	dev-libs/boost:=
 	dev-libs/double-conversion:=
 	dev-libs/glib:2
@@ -38,35 +60,34 @@ RDEPEND="
 	media-gfx/opencsg:=
 	media-libs/fontconfig
 	media-libs/freetype
-	media-libs/glew:0=
 	media-libs/harfbuzz:=
 	media-libs/lib3mf:=
 	sci-mathematics/cgal:=
-	virtual/opengl
-	cairo? ( x11-libs/cairo )
+	media-libs/libglvnd[X]
 	gui? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5[-gles2-only]
-		dev-qt/qtmultimedia:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtopengl:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		x11-libs/libX11
-		x11-libs/qscintilla:=[qt5(+)]
-		dbus? ( dev-qt/qtdbus:5 )
-		gamepad? ( dev-qt/qtgamepad:5 )
+		dev-qt/qt5compat:6
+		dev-qt/qtbase:6[concurrent,dbus?,-gles2-only,network,opengl,widgets]
+		dev-qt/qtmultimedia:6
+		dev-qt/qtsvg:6
+		x11-libs/qscintilla:=[qt6]
 	)
 	hidapi? ( dev-libs/hidapi )
+	manifold? (
+		dev-cpp/tbb
+		sci-mathematics/manifold
+	)
 	mimalloc? ( dev-libs/mimalloc:= )
+	pdf? ( x11-libs/cairo )
 	spacenav? ( dev-libs/libspnav )
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/eigen:3
+"
 BDEPEND="
-	dev-util/itstool
 	app-alternatives/yacc
 	app-alternatives/lex
+	dev-util/itstool
 	sys-devel/gettext
 	virtual/pkgconfig
 "
@@ -81,39 +102,131 @@ DOCS=(
 	doc/translation.txt
 )
 
+src_prepare() {
+	if use test && [[ ${PV} != *9999* ]] ; then
+		mv -f "${WORKDIR}/MCAD-${MCAD_COMMIT}"/* "${S}/libraries/MCAD/" || die
+	fi
+
+	# NOTE adhere CMP0167
+	# https://cmake.org/cmake/help/latest/policy/CMP0167.html
+	sed \
+		-e '/find_package(Boost/s/)/ CONFIG)/g' \
+		-i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
 src_configure() {
 	# -Werror=odr
 	# https://github.com/openscad/openscad/issues/5239
 	filter-lto
 
 	local mycmakeargs=(
-		-DCLANG_TIDY=OFF
-		-DENABLE_CAIRO=$(usex cairo)
-		-DENABLE_EGL=$(usex egl)
-		-DENABLE_HIDAPI=$(usex hidapi)
-		# needs python deps, unbundle first before enabling
-		-DENABLE_MANIFOLD=OFF
-		-DENABLE_SPNAV=$(usex spacenav)
-		-DENABLE_TESTS=OFF
-		-DEXPERIMENTAL=$(usex experimental)
-		-DHEADLESS=$(usex gui OFF ON)
-		-DOFFLINE_DOCS=OFF
-		-DUSE_CCACHE=OFF
-		-DUSE_MIMALLOC=$(usex mimalloc)
+		-DCLANG_TIDY="no"
+		-DENABLE_CAIRO="$(usex pdf)"
+		-DENABLE_CGAL="yes"
+		-DENABLE_EGL="$(usex egl)"
+		-DENABLE_GLX="$(usex glx)"
+		-DENABLE_MANIFOLD="$(usex manifold)"
+		-DENABLE_PYTHON="no"
+		-DENABLE_TESTS="$(usex test)"
+
+		-DEXPERIMENTAL="$(usex experimental)"
+
+		-DHEADLESS="$(usex !gui)"
+		-DUSE_BUILTIN_MANIFOLD="no"
+		-DUSE_CCACHE="no"
+		-DUSE_GLAD="yes"
+		-DUSE_GLEW="no"
+		-DUSE_LEGACY_RENDERERS="no"
+		-DUSE_MIMALLOC="$(usex mimalloc)"
+		-DUSE_QT6="$(usex gui)"
+		-DOFFLINE_DOCS="no" # TODO
 	)
 
 	if use gui; then
 		mycmakeargs+=(
-			-DENABLE_GAMEPAD=$(usex gamepad)
-			-DENABLE_QTDBUS=$(usex dbus)
+			-DENABLE_HIDAPI="$(usex hidapi)"
+			-DENABLE_QTDBUS="$(usex dbus)"
+			-DENABLE_SPNAV="$(usex spacenav)"
+		)
+	fi
+
+	if [[ ${PV} != *9999* ]] ; then
+		mycmakeargs+=(
+			-DCMAKE_MODULE_PATH="${WORKDIR}/sanitizers-cmake-${SANITIZERS_CMAKE_COMMIT}/cmake"
+			-DOPENSCAD_COMMIT="${COMMIT:0:9}"
+			-DOPENSCAD_VERSION="${PV:0:4}.${PV:4:2}.${PV:6:2}"
 		)
 	fi
 
 	cmake_src_configure
 }
 
+src_test() {
+	local i WRITE=()
+
+	if [[ -d "/dev/udmabuf" ]]; then
+		WRITE+=(
+			"/dev/udmabuf"
+		)
+	fi
+
+	if [[ -d /sys/module/nvidia ]]; then
+		# /dev/dri/card*
+		# /dev/dri/renderD*
+		readarray -t dri <<<"$(
+			find /sys/module/nvidia/drivers/*/*:*:*.*/drm \
+				-mindepth 1 -maxdepth 1 -type d -exec basename {} \; \
+				| sed 's:^:/dev/dri/:'
+			)"
+
+		# /dev/nvidia{0-9}
+		readarray -t cards <<<"$(find /dev -regextype sed -regex '/dev/nvidia[0-9]*')"
+
+		WRITE+=(
+			"${dri[@]}"
+			"${cards[@]}"
+			"/dev/nvidiactl"
+			"/dev/nvidia-caps/"
+			"/dev/nvidia-modeset"
+			"/dev/nvidia-uvm"
+			"/dev/nvidia-uvm-tools"
+		)
+	fi
+
+	WRITE+=(
+		# for portage
+		"/proc/self/task/"
+	)
+	for i in "${WRITE[@]}"; do
+		if [[ ! -w "$i" ]]; then
+			eqawarn "addwrite $i"
+			addwrite "$i"
+
+			if [[ ! -d "$i" ]] && [[ ! -w "$i" ]]; then
+				eqawarn "can not access $i after addwrite"
+			fi
+		fi
+	done
+
+	sed \
+		-e "s/OPENSCAD_BINARY/OPENSCADPATH/g" \
+		-i tests/test_cmdline_tool.py || die
+
+	cd "${BUILD_DIR}" || die
+
+	# NOTE link in from CMAKE_USE_DIR
+	ln -s "${CMAKE_USE_DIR}/color-schemes" . || die
+	ln -s "${CMAKE_USE_DIR}/locale" . || die
+	ln -s "${CMAKE_USE_DIR}/shaders" . || die
+
+	virtx cmake_src_test -j1
+}
+
 src_install() {
 	DOCS+=( doc/*.pdf )
+
 	cmake_src_install
 
 	mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales"
@@ -121,15 +234,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
+	xdg_pkg_postinst
 
 	optfeature "support scad major mode in GNU Emacs" app-emacs/scad-mode
 }
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}


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

end of thread, other threads:[~2024-11-16 21:39 UTC | newest]

Thread overview: 61+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-22 10:22 [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/ Joonas Niilola
  -- strict thread matches above, loose matches on Subject: below --
2024-11-16 21:39 Sam James
2024-11-16 21:39 Sam James
2024-11-16 21:39 Sam James
2024-07-26  5:05 Eli Schwartz
2024-07-26  5:05 Eli Schwartz
2024-04-16 16:30 Jimi Huotari
2023-12-03  5:45 Arthur Zamarin
2023-05-02 13:39 Joonas Niilola
2023-04-06  6:54 Joonas Niilola
2022-09-02 16:50 Joonas Niilola
2022-09-01 19:14 Sam James
2022-09-01  8:45 Agostino Sarubbo
2022-08-31 18:47 Sam James
2022-06-22  7:03 Joonas Niilola
2022-06-03  7:28 Joonas Niilola
2022-06-03  7:20 Jakov Smolić
2022-04-22 10:22 Joonas Niilola
2022-04-22 10:22 Joonas Niilola
2021-05-04 22:02 Sam James
2021-05-04 22:02 Sam James
2021-05-01 18:19 Agostino Sarubbo
2021-04-11  0:13 Thomas Deutschmann
2021-03-07  9:03 Joonas Niilola
2021-03-07  9:03 Joonas Niilola
2021-02-18 20:12 Andreas Sturmlechner
2021-02-18 17:12 Sam James
2021-02-14 19:52 Sam James
2021-02-07 17:07 Conrad Kostecki
2020-11-25  7:50 Joonas Niilola
2020-11-20 20:40 Andreas Sturmlechner
2020-11-20 14:59 Joonas Niilola
2020-11-20 14:59 Joonas Niilola
2020-08-25 10:25 Sam James
2020-07-20  9:01 Joonas Niilola
2020-04-14 12:32 Agostino Sarubbo
2020-04-14  7:58 Agostino Sarubbo
2020-04-03 20:07 Andreas Sturmlechner
2020-04-03 20:07 Andreas Sturmlechner
2019-07-07 19:19 Michał Górny
2019-07-07 19:19 Michał Górny
2019-05-18 19:33 Andreas Sturmlechner
2019-04-24 20:15 Andreas Sturmlechner
2019-04-24 20:15 Andreas Sturmlechner
2019-01-27 17:26 Pacho Ramos
2018-01-06 21:31 Andreas Sturmlechner
2017-12-09  2:33 Michael Weber
2017-12-09  2:31 Michael Weber
2017-12-09  2:25 Michael Weber
2017-12-09  2:19 Michael Weber
2017-10-28 16:12 Andreas Sturmlechner
2017-10-21 21:24 Andreas Sturmlechner
2017-05-15  8:44 Michael Weber
2017-05-14 11:02 Michael Weber
2017-05-14 11:02 Michael Weber
2016-12-22 18:26 David Seifert
2016-08-06  9:16 Pacho Ramos
2016-03-30 13:39 Michael Palimaka
2015-09-07  7:14 Thomas Kahle
2015-09-06 19:40 Thomas Kahle
2015-09-06 19:40 Thomas Kahle

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