subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: media\-gfx\/openscad\/"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2024-07-25 Thread Eli Schwartz

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

media-gfx/openscad: mark as LTO-unsafe

Signed-off-by: Eli Schwartz  gentoo.org>

 media-gfx/openscad/openscad-2021.01-r5.ebuild | 6 +-
 media-gfx/openscad/openscad-.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-.ebuild 
b/media-gfx/openscad/openscad-.ebuild
index 2322d4b21967..47c9d93adc5e 100644
--- a/media-gfx/openscad/openscad-.ebuild
+++ b/media-gfx/openscad/openscad-.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)

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2024-07-25 Thread Eli Schwartz

commit: 2486de2f5571c000ec7db726fe0575d8e23ac140
Author: Eli Schwartz  gentoo  org>
AuthorDate: Thu Jul 25 01:27:49 2024 +
Commit: Eli Schwartz  gentoo  org>
CommitDate: Fri Jul 26 05:04:39 2024 +
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  gentoo.org>

 media-gfx/openscad/openscad-2021.01-r5.ebuild | 2 +-
 media-gfx/openscad/openscad-.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-.ebuild 
b/media-gfx/openscad/openscad-.ebuild
index 47c9d93adc5e..4cfaae64dfac 100644
--- a/media-gfx/openscad/openscad-.ebuild
+++ b/media-gfx/openscad/openscad-.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";

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/files/, media-gfx/openscad/

2024-05-21 Thread Miroslav Šulc

commit: 766980c469c39f7f9604601a9d143a60ff860cc8
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue May 21 17:31:28 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue May 21 17:31:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=766980c4

media-gfx/openscad: fixed compilation with boost 1.85

Closes: https://bugs.gentoo.org/932293
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/openscad/files/openscad-2021.01-boost-1.85.patch | 12 
 media-gfx/openscad/openscad-2021.01-r5.ebuild  |  1 +
 2 files changed, 13 insertions(+)

diff --git a/media-gfx/openscad/files/openscad-2021.01-boost-1.85.patch 
b/media-gfx/openscad/files/openscad-2021.01-boost-1.85.patch
new file mode 100644
index ..e3370f32fc38
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2021.01-boost-1.85.patch
@@ -0,0 +1,12 @@
+diff '--color=auto' -ur openscad-2021.01-orig/src/FileModule.cc 
openscad-2021.01/src/FileModule.cc
+--- openscad-2021.01-orig/src/FileModule.cc2021-01-31 21:17:41.0 
+0100
 openscad-2021.01/src/FileModule.cc 2024-05-20 07:50:31.746487490 +0200
+@@ -65,7 +65,7 @@
+   auto ext = fs::path(path).extension().generic_string();
+ 
+   if (boost::iequals(ext, ".otf") || boost::iequals(ext, ".ttf")) {
+-  if (fs::is_regular(path)) {
++  if (fs::is_regular_file(path)) {
+   FontCache::instance()->register_font_file(path);
+   } else {
+   LOG(message_group::Error,Location::NONE,"","Can't read 
font with path '%1$s'",path);

diff --git a/media-gfx/openscad/openscad-2021.01-r5.ebuild 
b/media-gfx/openscad/openscad-2021.01-r5.ebuild
index 39b12ee55322..cf272f31a4f7 100644
--- a/media-gfx/openscad/openscad-2021.01-r5.ebuild
+++ b/media-gfx/openscad/openscad-2021.01-r5.ebuild
@@ -67,6 +67,7 @@ PATCHES=(

"${FILESDIR}"/${P}-CGAL-build-fix-v5.4-renames-projection-traits-header.patch
"${FILESDIR}"/${P}-Fix-build-issue-with-overloaded-join.patch

"${FILESDIR}"/${P}-Remove-double-quoting-of-the-output-file-parameter-f.patch
+   "${FILESDIR}"/${P}-boost-1.85.patch
 )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2024-04-16 Thread Jimi Huotari

commit: 1cfcb246010f86c0e132d02da274d9832ae3e9c3
Author: José P. R. N. Assis  gmail  com>
AuthorDate: Thu Feb  1 12:18:41 2024 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Tue Apr 16 16:29:11 2024 +
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  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35134
Signed-off-by: Jimi Huotari  gentoo.org>

 .../openscad/{openscad-2021.01-r4.ebuild => openscad-2021.01-r5.ebuild} | 2 +-
 media-gfx/openscad/openscad-.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-.ebuild 
b/media-gfx/openscad/openscad-.ebuild
index 216d9376fd68..2322d4b21967 100644
--- a/media-gfx/openscad/openscad-.ebuild
+++ b/media-gfx/openscad/openscad-.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 )
)

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2023-12-02 Thread Arthur Zamarin

commit: 683649e0fa9c75561560558be1b350c6dfc87e1c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec  3 05:44:49 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec  3 05:44:49 2023 +
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  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.

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2023-05-02 Thread Joonas Niilola

commit: 735a5e8b07a9773f5f51ed2d7fcf838e7ad809cd
Author: Bernd Waibel  posteo  net>
AuthorDate: Tue Apr 11 08:48:46 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue May  2 13:39:04 2023 +
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  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/30570
Signed-off-by: Joonas Niilola  gentoo.org>

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

diff --git a/media-gfx/openscad/openscad-.ebuild 
b/media-gfx/openscad/openscad-.ebuild
index 94342d5766f0..ccf5837e0e73 100644
--- a/media-gfx/openscad/openscad-.ebuild
+++ b/media-gfx/openscad/openscad-.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() {

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2023-04-05 Thread Joonas Niilola

commit: a834e3baa2c0cad3d1f954866687d79b18682b28
Author: Bernd Waibel  posteo  net>
AuthorDate: Fri Mar 24 17:58:20 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Apr  6 06:54:22 2023 +
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  gmail.com>
Closes: https://bugs.gentoo.org/899658
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/30334
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/openscad/metadata.xml | 16 --
 media-gfx/openscad/openscad-.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.
 
 
+   
+   Build using EGL instead of GLX
+   
+   
+   Enable experimental features
+   

Add support for gamepads through dev-qt/qtgamepad

-   
-   Build a binary without GUI
+   
+   Enable or disable building of the GUI
+   
+   
+   Build in support for HID-Class devices using 
dev-libs/hidapi
+   
+   
+   Build using dev-libs/mimalloc as memory allocator


Add support for space navigator devices through

diff --git a/media-gfx/openscad/openscad-.ebuild 
b/media-gfx/openscad/openscad-.ebuild
index 425d55c09f81..94342d5766f0 100644
--- a/media-gfx/openscad/openscad-.ebuild
+++ b/media-gfx/openscad/openscad-.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

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2022-09-02 Thread Joonas Niilola

commit: f9ff34202290af6646ebe66f4549ac1117df6755
Author: Bernd Waibel  posteo  net>
AuthorDate: Fri Sep  2 14:21:05 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Sep  2 16:49:02 2022 +
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  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/27113
Signed-off-by: Joonas Niilola  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..
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2022-09-01 Thread Sam James

commit: 3814b48e0b5c23256630f205f8160c0c017f6f4a
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep  1 19:12:23 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep  1 19:12:23 2022 +
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  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.

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2022-09-01 Thread Agostino Sarubbo

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

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

Signed-off-by: Agostino Sarubbo  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.

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2022-08-31 Thread Sam James

commit: bd249514fecc18fbfbe6836b7da5d3ff1a4229d9
Author: Bernd Waibel  posteo  net>
AuthorDate: Wed Aug 31 18:19:39 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 31 18:46:53 2022 +
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  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/27093
Signed-off-by: Sam James  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

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/, media-gfx/openscad/files/

2022-07-03 Thread Joonas Niilola

commit: e89baa8837fb77c1b0bcabb611e1cd7a03468af9
Author: Bernd Waibel  posteo  net>
AuthorDate: Mon Jun 13 06:06:49 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Jul  3 11:51:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e89baa88

media-gfx/openscad: fix build against >=cgal-5.4.1

Also address two CVE issues, CVE-2022-0496 and CVE-2022-0497
Fix double quoting of output file parameter for ghostscript

Closes: https://bugs.gentoo.org/851189
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/25870
Signed-off-by: Joonas Niilola  gentoo.org>

 ...fix-v5.4-renames-projection-traits-header.patch |  36 +++
 ...96-Out-of-bounds-memory-access-in-DXF-loa.patch |  74 ++
 ...97-Out-of-bounds-memory-access-in-comment.patch |  25 +
 ...ailure-with-generic_print_polyhedron-on-C.patch |  42 
 ...1.01-Fix-build-issue-with-overloaded-join.patch |  60 +++
 ...le-quoting-of-the-output-file-parameter-f.patch |  20 
 media-gfx/openscad/openscad-2021.01-r4.ebuild  | 112 +
 7 files changed, 369 insertions(+)

diff --git 
a/media-gfx/openscad/files/openscad-2021.01-CGAL-build-fix-v5.4-renames-projection-traits-header.patch
 
b/media-gfx/openscad/files/openscad-2021.01-CGAL-build-fix-v5.4-renames-projection-traits-header.patch
new file mode 100644
index ..5fea4998683d
--- /dev/null
+++ 
b/media-gfx/openscad/files/openscad-2021.01-CGAL-build-fix-v5.4-renames-projection-traits-header.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/851189
+From 
https://github.com/openscad/openscad/commit/abfebc651343909b534ef337aacc7604c99cf0ea
 Mon Sep 17 00:00:00 2001
+From: Torsten Paul 
+Date: Wed, 2 Feb 2022 02:30:59 +0100
+Subject: [PATCH 09/11] CGAL build fix, v5.4 renames projection traits header
+ files and classes.
+
+--- a/src/cgalutils-tess.cc
 b/src/cgalutils-tess.cc
+@@ -6,10 +6,12 @@
+ #pragma push_macro("NDEBUG")
+ #undef NDEBUG
+ #include 
+-#if CGAL_VERSION_NR >= CGAL_VERSION_NUMBER(4,11,0)
+-  #include 
++#if CGAL_VERSION_NR < 1050401000
++#include 
++typedef CGAL::Triangulation_2_filtered_projection_traits_3 Projection;
+ #else
+-  #include 
++#include 
++typedef CGAL::Filtered_projection_traits_3 Projection;
+ #endif
+ #include 
+ #pragma pop_macro("NDEBUG")
+@@ -19,7 +21,6 @@ struct FaceInfo {
+   bool in_domain() { return nesting_level%2 == 1; }
+ };
+ 
+-typedef CGAL::Triangulation_2_filtered_projection_traits_3 Projection;
+ typedef CGAL::Triangulation_face_base_with_info_2 Fbb;
+ typedef CGAL::Triangulation_data_structure_2<
+   CGAL::Triangulation_vertex_base_2,
+-- 
+2.35.1
+

diff --git 
a/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0496-Out-of-bounds-memory-access-in-DXF-loa.patch
 
b/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0496-Out-of-bounds-memory-access-in-DXF-loa.patch
new file mode 100644
index ..6c0a9558e3fb
--- /dev/null
+++ 
b/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0496-Out-of-bounds-memory-access-in-DXF-loa.patch
@@ -0,0 +1,74 @@
+From 
https://github.com/openscad/openscad/commit/00a4692989c4e2f191525f73f24ad8727bacdf41
 Mon Sep 17 00:00:00 2001
+From: Torsten Paul 
+Date: Sat, 5 Feb 2022 18:38:31 +0100
+Subject: [PATCH 01/11] CVE-2022-0496 Out-of-bounds memory access in DXF
+ loader.
+
+Public issue:
+https://github.com/openscad/openscad/issues/4037
+
+Fix in master branch:
+https://github.com/openscad/openscad/pull/4090
+--- a/src/dxfdata.cc
 b/src/dxfdata.cc
+@@ -441,6 +441,11 @@ DxfData::DxfData(double fn, double fs, double fa,
+   auto lv = 
grid.data(this->points[lines[idx].idx[j]][0], 
this->points[lines[idx].idx[j]][1]);
+   for (size_t ki = 0; ki < lv.size(); ++ki) {
+   int k = lv.at(ki);
++if (k < 0 || k >= lines.size()) {
++LOG(message_group::Warning,Location::NONE,"",
++"Bad DXF line index in 
%1$s.",QuotedString(boostfs_uncomplete(filename, 
fs::current_path()).generic_string()));
++continue;
++}
+   if (k == idx || lines[k].disabled) 
continue;
+   goto next_open_path_j;
+   }
+@@ -466,13 +471,20 @@ DxfData::DxfData(double fn, double fs, double fa,
+   auto lv = grid.data(ref_point[0], ref_point[1]);
+   for (size_t ki = 0; ki < lv.size(); ++ki) {
+   int k = lv.at(ki);
++if (k < 0 || k >= lines.size()) {
++LOG(message_group::Warning,Location::NONE,"",
++"Bad DXF line index in 
%1$s.",QuotedString(boostfs_uncomplete(filename, 
fs::current_path()).generic_string()));
++continue;
++}
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2022-06-22 Thread Joonas Niilola

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

media-gfx/openscad: drop 2021.01-r2

Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/26033
Signed-off-by: Joonas Niilola  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..
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2022-06-03 Thread Joonas Niilola

commit: b5afe3db950fa6eea03ff1a76e1b9281beb051d6
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Jun  3 07:28:00 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jun  3 07:28:26 2022 +
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  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.

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2022-06-03 Thread Jakov Smolić

commit: 5069b3af658016921bcb8adfec543e003e90
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Jun  3 07:20:46 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Jun  3 07:20:46 2022 +
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ć  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.

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2022-04-22 Thread Joonas Niilola

commit: bdc50365c83c8703f49d2c342228cec9f26174ab
Author: Bernd Waibel  posteo  net>
AuthorDate: Fri Apr 22 06:17:22 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Apr 22 10:22:33 2022 +
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  posteo.net>
Signed-off-by: Joonas Niilola  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 ..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
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2022-04-22 Thread Joonas Niilola

commit: e09f11563aa7d01d19cf92e69a3b7613cc988f77
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Apr 22 10:20:10 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Apr 22 10:22:33 2022 +
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  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

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2022-04-22 Thread Joonas Niilola

commit: 9e77aab3355fb474e3850a614a279d0118e9e51f
Author: Bernd Waibel  posteo  net>
AuthorDate: Fri Apr 22 06:56:22 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Apr 22 10:22:33 2022 +
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  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/25036
Signed-off-by: Joonas Niilola  gentoo.org>

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

diff --git a/media-gfx/openscad/openscad-.ebuild 
b/media-gfx/openscad/openscad-.ebuild
index 996bf04653fb..425d55c09f81 100644
--- a/media-gfx/openscad/openscad-.ebuild
+++ b/media-gfx/openscad/openscad-.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=

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/, media-gfx/openscad/files/

2022-04-14 Thread Joonas Niilola

commit: 0d52105b62053748216dc2975f55d6764ae08013
Author: Bernd Waibel  posteo  net>
AuthorDate: Thu Mar 24 17:02:30 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Apr 15 06:18:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d52105b

media-gfx/openscad: drop outdated patch for 

Closes: https://bugs.gentoo.org/832944
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/24929
Signed-off-by: Joonas Niilola  gentoo.org>

 ...-config-name-and-include-directory-search.patch | 31 --
 media-gfx/openscad/openscad-.ebuild|  5 ++--
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git 
a/media-gfx/openscad/files/openscad--fix-pkg-config-name-and-include-directory-search.patch
 
b/media-gfx/openscad/files/openscad--fix-pkg-config-name-and-include-directory-search.patch
deleted file mode 100644
index a448deec37da..
--- 
a/media-gfx/openscad/files/openscad--fix-pkg-config-name-and-include-directory-search.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2483ee56960c99c35036273fc9fc2877eac772fc Mon Sep 17 00:00:00 2001
-From: Bernd Waibel 
-Date: Wed, 20 Oct 2021 19:46:08 +0200
-Subject: [PATCH] fix pkg-config name and include directory search
-
-Signed-off-by: Bernd Waibel 

- cmake/Modules/FindLib3MF.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/Modules/FindLib3MF.cmake b/cmake/Modules/FindLib3MF.cmake
-index 44858364..ad2f01ca 100644
 a/cmake/Modules/FindLib3MF.cmake
-+++ b/cmake/Modules/FindLib3MF.cmake
-@@ -14,11 +14,11 @@
- # Travis CI Ubuntu Trusty environment has some issue with pkg-config
- # not finding the version.
- find_package(PkgConfig REQUIRED QUIET)
--pkg_check_modules(PC_LIB3MF lib3MF)
-+pkg_check_modules(PC_LIB3MF lib3mf)
- set(LIB3MF_VERSION ${PC_LIB3MF_VERSION})
- 
- find_path(LIB3MF_INCLUDE_DIRS
--NAMES Model/COM/NMR_DLLInterfaces.h
-+NAMES lib3mf_implicit.hpp
- HINTS $ENV{LIB3MF_INCLUDEDIR}
-   ${PC_LIB3MF_INCLUDEDIR}
-   ${PC_LIB3MF_INCLUDE_DIRS}
--- 
-2.33.1
-

diff --git a/media-gfx/openscad/openscad-.ebuild 
b/media-gfx/openscad/openscad-.ebuild
index f7e74169b9ec..996bf04653fb 100644
--- a/media-gfx/openscad/openscad-.ebuild
+++ b/media-gfx/openscad/openscad-.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=8
@@ -47,6 +47,7 @@ RDEPEND="
dev-qt/qtmultimedia:5
dev-qt/qtnetwork:5
dev-qt/qtopengl:5
+   dev-qt/qtsvg:5
dev-qt/qtwidgets:5
x11-libs/qscintilla:=
dbus? ( dev-qt/qtdbus:5 )
@@ -71,8 +72,6 @@ DOCS=(
doc/testing.txt
 )
 
-PATCHES=( 
"${FILESDIR}"/${P}-fix-pkg-config-name-and-include-directory-search.patch )
-
 src_configure() {
local mycmakeargs=(
-DCLANG_TIDY=OFF

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/files/, media-gfx/openscad/

2021-10-23 Thread Sam James

commit: 627f06a62019f29f43fb5f542865b2274cdfc210
Author: Bernd Waibel  posteo  net>
AuthorDate: Thu Oct 21 05:12:46 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 24 04:06:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=627f06a6

media-gfx/openscad: fix search for lib3mf

Reported-by: Jan Psota  belsznica.pl>
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/22650
Signed-off-by: Sam James  gentoo.org>

 .../openscad--0001-fix-to-find-lib3mf-2.patch  | 36 --
 ...-config-name-and-include-directory-search.patch | 31 +++
 media-gfx/openscad/openscad-.ebuild|  9 ++
 3 files changed, 33 insertions(+), 43 deletions(-)

diff --git 
a/media-gfx/openscad/files/openscad--0001-fix-to-find-lib3mf-2.patch 
b/media-gfx/openscad/files/openscad--0001-fix-to-find-lib3mf-2.patch
deleted file mode 100644
index 0ca19d33646..000
--- a/media-gfx/openscad/files/openscad--0001-fix-to-find-lib3mf-2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 15bf93ab04e6fd61507f138bcfc6f9c770d9479b Mon Sep 17 00:00:00 2001
-From: Bernd Waibel 
-Date: Thu, 11 Feb 2021 23:14:31 +0100
-Subject: [PATCH] fix to find lib3mf-2
-
-Lib3mf-2 uses lowercase name for it's pkg-config file.
-
-Signed-off-by: Bernd Waibel 

- cmake/Modules/FindLib3MF.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/Modules/FindLib3MF.cmake b/cmake/Modules/FindLib3MF.cmake
-index 7a1ee285..b062c09c 100644
 a/cmake/Modules/FindLib3MF.cmake
-+++ b/cmake/Modules/FindLib3MF.cmake
-@@ -15,14 +15,14 @@ message(STATUS "Searching for lib3mf.")
- # We still fall back to the rest of detection code here.
- # Travis CI Ubuntu Trusty environment has some issue with pkg-config
- # not finding the version.
--pkg_check_modules(LIB3MF lib3MF)
-+pkg_check_modules(LIB3MF lib3mf)
- 
- # default to uppercase for 1.0 library name
- set(LIB3MF_LIB "3MF")
- 
- # some distribution packages are missing version information for 2.0
- if (LIB3MF_VERSION STREQUAL "" AND LIB3MF_FOUND)
--  if (EXISTS "/usr/include/lib3mf" AND EXISTS 
"/usr/include/lib3mf/lib3mf_implicit.hpp")
-+  if (EXISTS "/usr/include/lib3mf" AND EXISTS 
"/usr/include/lib3mf/Bindings/Cpp/lib3mf_implicit.hpp")
- set(LIB3MF_VERSION "2.0.0")
-   endif()
- endif()
--- 
-2.30.1
-

diff --git 
a/media-gfx/openscad/files/openscad--fix-pkg-config-name-and-include-directory-search.patch
 
b/media-gfx/openscad/files/openscad--fix-pkg-config-name-and-include-directory-search.patch
new file mode 100644
index 000..a448deec37d
--- /dev/null
+++ 
b/media-gfx/openscad/files/openscad--fix-pkg-config-name-and-include-directory-search.patch
@@ -0,0 +1,31 @@
+From 2483ee56960c99c35036273fc9fc2877eac772fc Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Wed, 20 Oct 2021 19:46:08 +0200
+Subject: [PATCH] fix pkg-config name and include directory search
+
+Signed-off-by: Bernd Waibel 
+---
+ cmake/Modules/FindLib3MF.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/Modules/FindLib3MF.cmake b/cmake/Modules/FindLib3MF.cmake
+index 44858364..ad2f01ca 100644
+--- a/cmake/Modules/FindLib3MF.cmake
 b/cmake/Modules/FindLib3MF.cmake
+@@ -14,11 +14,11 @@
+ # Travis CI Ubuntu Trusty environment has some issue with pkg-config
+ # not finding the version.
+ find_package(PkgConfig REQUIRED QUIET)
+-pkg_check_modules(PC_LIB3MF lib3MF)
++pkg_check_modules(PC_LIB3MF lib3mf)
+ set(LIB3MF_VERSION ${PC_LIB3MF_VERSION})
+ 
+ find_path(LIB3MF_INCLUDE_DIRS
+-NAMES Model/COM/NMR_DLLInterfaces.h
++NAMES lib3mf_implicit.hpp
+ HINTS $ENV{LIB3MF_INCLUDEDIR}
+   ${PC_LIB3MF_INCLUDEDIR}
+   ${PC_LIB3MF_INCLUDE_DIRS}
+-- 
+2.33.1
+

diff --git a/media-gfx/openscad/openscad-.ebuild 
b/media-gfx/openscad/openscad-.ebuild
index c4a9b06dc70..f7e74169b9e 100644
--- a/media-gfx/openscad/openscad-.ebuild
+++ b/media-gfx/openscad/openscad-.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake elisp-common git-r3 xdg
 
@@ -71,12 +71,7 @@ DOCS=(
doc/testing.txt
 )
 
-src_prepare() {
-   if has_version ">=media-libs/lib3mf-2"; then
-   eapply "${FILESDIR}/${P}-0001-fix-to-find-lib3mf-2.patch"
-   fi
-   cmake_src_prepare
-}
+PATCHES=( 
"${FILESDIR}"/${P}-fix-pkg-config-name-and-include-directory-search.patch )
 
 src_configure() {
local mycmakeargs=(

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/, media-gfx/openscad/files/

2021-05-04 Thread Sam James

commit: 4c017ffe1777b31221ca4243c3cf4ed729ccc6ea
Author: Bernd Waibel  posteo  net>
AuthorDate: Sun May  2 12:21:32 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  4 22:00:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c017ffe

media-gfx/openscad: drop 2019.05

Security cleanup (CVE-2020-28599)

Bug: https://bugs.gentoo.org/773217
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/20657
Signed-off-by: Sam James  gentoo.org>

 media-gfx/openscad/Manifest|   1 -
 ...ad-2019.05-0001-Fix-build-with-boost-1.73.patch |  28 -
 ...2-Gentoo-specific-Disable-ccache-building.patch |  35 ---
 ...ad-2019.05-0003-change-C-standard-to-c-14.patch |  76 --
 .../openscad-2019.05_fix-boost-1.72.0-build.patch  |  27 -
 media-gfx/openscad/metadata.xml|   3 -
 media-gfx/openscad/openscad-2019.05-r5.ebuild  | 115 -
 7 files changed, 285 deletions(-)

diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 31cd206a20c..ac0202896cd 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1,2 +1 @@
-DIST openscad-2019.05.tar.gz 14604881 BLAKE2B 
ed7d6088606fab44284363da73643e556f07c0f0a7a223bdf718dcc36a82158bf23e315724ea520d63a3f1331207df0ea7b0ade817f01dd39b67ca6f36529d56
 SHA512 
073053f625ffa4fea6ed836396b7ff4b87b26cf7500b06c804983afc0f1dfd3d78bfb81b3fd217c3939b0ec915d85b0c7990773eaf968512a150deaa0399df13
 DIST openscad-2021.01.tar.gz 15817555 BLAKE2B 
417857d704fa3c14312641ebda983eb85a1e3bc0d517a235fa3bd2523fce6f93c1ea526c330179bc35f03e6c73d3cd7c4c57cd71480088c21bfc99bb020ab7cd
 SHA512 
8deaa26bf4c295c12da38f323d2b2e6f827851337f5bc1cc9c79afc083c9f913c19a263086e6e853bf2c8434c1ccc705ea22ddb02dc99d39bb1e5e03fc58d128

diff --git 
a/media-gfx/openscad/files/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch
 
b/media-gfx/openscad/files/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch
deleted file mode 100644
index 74f48b4c1ae..000
--- 
a/media-gfx/openscad/files/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 47275a3d92969709e7605f23a408c5ed5aa483c9 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel 
-Date: Fri, 15 May 2020 19:09:10 +0200
-Subject: [PATCH] Fix build with boost-1.73
-
-Thanks to William T Wilson for reporting and providing the patch.
-
-Signed-off-by: Bernd Waibel 

- src/import.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/import.cc b/src/import.cc
-index eef1323..08e46ff 100644
 a/src/import.cc
-+++ b/src/import.cc
-@@ -50,7 +50,7 @@ namespace fs = boost::filesystem;
- #include 
- using namespace boost::assign; // bring 'operator+=()' into scope
- 
--#include 
-+#include 
- #include 
- 
- extern PolySet * import_amf(std::string, const Location &loc);
--- 
-2.26.2
-

diff --git 
a/media-gfx/openscad/files/openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch
 
b/media-gfx/openscad/files/openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch
deleted file mode 100644
index 1a4903828e8..000
--- 
a/media-gfx/openscad/files/openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 2940d8e5c74faa5dcd5279c8166064ade3da5695 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel 
-Date: Sun, 17 May 2020 21:13:44 +0200
-Subject: [PATCH] [Gentoo-specific] Disable ccache building
-
-On Gentoo we use a USE flag to determine whether to use
-ccache for building or not.
-
-Signed-off-by: Bernd Waibel 

- openscad.pro | 8 
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/openscad.pro b/openscad.pro
-index 2d190dd..9c4e67b 100755
 a/openscad.pro
-+++ b/openscad.pro
-@@ -214,10 +214,10 @@ mdi {
-   DEFINES += ENABLE_MDI
- }
- 
--system("ccache -V >/dev/null 2>/dev/null") {
--  CONFIG += ccache
--  message("Using ccache")
--}
-+#system("ccache -V >/dev/null 2>/dev/null") {
-+#  CONFIG += ccache
-+#  message("Using ccache")
-+#}
- 
- include(common.pri)
- 
--- 
-2.26.2
-

diff --git 
a/media-gfx/openscad/files/openscad-2019.05-0003-change-C-standard-to-c-14.patch
 
b/media-gfx/openscad/files/openscad-2019.05-0003-change-C-standard-to-c-14.patch
deleted file mode 100644
index 3863d5631b9..000
--- 
a/media-gfx/openscad/files/openscad-2019.05-0003-change-C-standard-to-c-14.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 02f9a4eca87d7713a8345b8513423d9d4a5127e0 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel 
-Date: Fri, 27 Nov 2020 18:49:09 +0100
-Subject: [PATCH] change C++ standard to c++14
-
-Signed-off-by: Bernd Waibel 

- c++11.pri => c++std.pri | 21 -
- common.pri  |  2 +-
- 2 files changed, 9 insertions(+), 14 deletions(-)
- rename c++11.pri => c++std.pri (74%)
-
-diff --git a/c++11.pri b/c++std.pri
-similarity index 74%
-rename f

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2021-05-04 Thread Sam James

commit: 9b8476cb90bae957d12acfc87812ca771fa148b7
Author: Bernd Waibel  posteo  net>
AuthorDate: Wed Apr 28 19:32:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  4 22:01:11 2021 +
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  gmail.com>
Closes: https://bugs.gentoo.org/785805
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Sam James  gentoo.org>

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

diff --git a/media-gfx/openscad/openscad-.ebuild 
b/media-gfx/openscad/openscad-.ebuild
index 433200d96c2..c4a9b06dc70 100644
--- a/media-gfx/openscad/openscad-.ebuild
+++ b/media-gfx/openscad/openscad-.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

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2021-05-04 Thread Sam James

commit: b6417909f81474b38743d880470aa0d32695
Author: Bernd Waibel  posteo  net>
AuthorDate: Wed Apr 28 19:37:00 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  4 22:01:12 2021 +
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  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/20585
Signed-off-by: Sam James  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
 }

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2021-05-01 Thread Agostino Sarubbo

commit: 5ac6480a6ee2bcf45b74dc83d8b8779aa0826894
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat May  1 18:19:32 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat May  1 18:19:49 2021 +
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  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.

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2021-04-10 Thread Thomas Deutschmann

commit: 9097879adfa8d1b8f881a4fb051938b8eef44db4
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Apr 11 00:10:23 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Apr 11 00:13:24 2021 +
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  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.

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2021-03-07 Thread Joonas Niilola

commit: b950201e8458d99370f53636038c17a0acda4394
Author: Bernd Waibel  posteo  net>
AuthorDate: Thu Feb 11 07:45:11 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Mar  7 09:03:06 2021 +
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  posteo.net>
Signed-off-by: Joonas Niilola  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
+   =x11-libs/qscintilla-2.10.3:=
emacs? ( >=app-editors/emacs-23.1:* )

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2021-03-07 Thread Joonas Niilola

commit: 130e722c056a63cd34df7aefe7b8c5fcb554e7da
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Mar  7 08:42:20 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Mar  7 09:03:07 2021 +
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  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

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/files/, media-gfx/openscad/

2021-03-07 Thread Joonas Niilola

commit: 764dd0f081d723d9593097055614cff5fb2b265a
Author: Bernd Waibel  posteo  net>
AuthorDate: Sat Mar  6 22:59:37 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Mar  7 09:03:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=764dd0f0

media-gfx/openscad: bump to 2021.01

Bug: https://bugs.gentoo.org/773217
Closes: https://bugs.gentoo.org/769278
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/19412
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/openscad/Manifest|   1 +
 ...1-Gentoo-specific-Disable-ccache-building.patch |  32 ++
 ...penscad-2021.01-0002-fix-to-find-lib3mf-2.patch |  43 
 media-gfx/openscad/openscad-2021.01.ebuild | 110 +
 4 files changed, 186 insertions(+)

diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index fd29bf8f45b..31cd206a20c 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1 +1,2 @@
 DIST openscad-2019.05.tar.gz 14604881 BLAKE2B 
ed7d6088606fab44284363da73643e556f07c0f0a7a223bdf718dcc36a82158bf23e315724ea520d63a3f1331207df0ea7b0ade817f01dd39b67ca6f36529d56
 SHA512 
073053f625ffa4fea6ed836396b7ff4b87b26cf7500b06c804983afc0f1dfd3d78bfb81b3fd217c3939b0ec915d85b0c7990773eaf968512a150deaa0399df13
+DIST openscad-2021.01.tar.gz 15817555 BLAKE2B 
417857d704fa3c14312641ebda983eb85a1e3bc0d517a235fa3bd2523fce6f93c1ea526c330179bc35f03e6c73d3cd7c4c57cd71480088c21bfc99bb020ab7cd
 SHA512 
8deaa26bf4c295c12da38f323d2b2e6f827851337f5bc1cc9c79afc083c9f913c19a263086e6e853bf2c8434c1ccc705ea22ddb02dc99d39bb1e5e03fc58d128

diff --git 
a/media-gfx/openscad/files/openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch
 
b/media-gfx/openscad/files/openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch
new file mode 100644
index 000..6de581078d2
--- /dev/null
+++ 
b/media-gfx/openscad/files/openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch
@@ -0,0 +1,32 @@
+From c138881767262b9f5c64a465a0e1e46ffcfc5899 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Sun, 28 Feb 2021 16:51:30 +0100
+Subject: [PATCH] [Gentoo specific] Disable ccache building
+
+On Gentoo, we use a USE flag to determine whether ccache
+should be used for building.
+
+Signed-off-by: Bernd Waibel 
+---
+ openscad.pro | 5 -
+ 1 file changed, 5 deletions(-)
+
+diff --git a/openscad.pro b/openscad.pro
+index b76ca76..678e08d 100755
+--- a/openscad.pro
 b/openscad.pro
+@@ -211,11 +211,6 @@ mdi {
+   DEFINES += ENABLE_MDI
+ }
+ 
+-system("ccache -V >/dev/null 2>/dev/null") {
+-  CONFIG += ccache
+-  message("Using ccache")
+-}
+-
+ include(common.pri)
+ 
+ # mingw has to come after other items so OBJECT_DIRS will work properly
+-- 
+2.30.1
+

diff --git 
a/media-gfx/openscad/files/openscad-2021.01-0002-fix-to-find-lib3mf-2.patch 
b/media-gfx/openscad/files/openscad-2021.01-0002-fix-to-find-lib3mf-2.patch
new file mode 100644
index 000..1995bd6e0ac
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2021.01-0002-fix-to-find-lib3mf-2.patch
@@ -0,0 +1,43 @@
+From 16847a70cf05484a668d8f79aba4ccec7e16c025 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Sat, 6 Mar 2021 22:59:17 +0100
+Subject: [PATCH] fix to find lib3mf-2
+
+The pkgconfig file for lib3mf has been renamed in case
+for lib3mf-2 versions.
+This patch uses the news names.
+
+Signed-off-by: Bernd Waibel 
+---
+ features/lib3mf.prf | 8 
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/features/lib3mf.prf b/features/lib3mf.prf
+index 2c512da..47be364 100644
+--- a/features/lib3mf.prf
 b/features/lib3mf.prf
+@@ -15,8 +15,8 @@ isEmpty(LIB3MF_LIBPATH) {
+ }
+ 
+ isEmpty(LIB3MF_INCLUDEPATH) {
+-  LIB3MF_CFLAGS = $$system("$$PKG_CONFIG --cflags lib3MF")
+-  LIB3MF_INCLUDEPATH = $$system("$$PKG_CONFIG --variable=includedir lib3MF")
++  LIB3MF_CFLAGS = $$system("$$PKG_CONFIG --cflags lib3mf")
++  LIB3MF_INCLUDEPATH = $$system("$$PKG_CONFIG --variable=includedir lib3mf")
+   !isEmpty(LIB3MF_CFLAGS) {
+ ENABLE_LIB3MF=yes
+   }
+@@ -25,8 +25,8 @@ isEmpty(LIB3MF_INCLUDEPATH) {
+ }
+ 
+ isEmpty(LIB3MF_LIBPATH) {
+-  LIB3MF_LIBS = $$system("$$PKG_CONFIG --libs lib3MF")
+-  LIB3MF_LIBPATH = $$system("$$PKG_CONFIG --variable=libdir lib3MF")
++  LIB3MF_LIBS = $$system("$$PKG_CONFIG --libs lib3mf")
++  LIB3MF_LIBPATH = $$system("$$PKG_CONFIG --variable=libdir lib3mf")
+   !isEmpty(LIB3MF_LIBS) {
+ ENABLE_LIB3MF=yes
+   }
+-- 
+2.30.1
+

diff --git a/media-gfx/openscad/openscad-2021.01.ebuild 
b/media-gfx/openscad/openscad-2021.01.ebuild
new file mode 100644
index 000..5a5a5f2805d
--- /dev/null
+++ b/media-gfx/openscad/openscad-2021.01.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp-common qmake-utils xdg
+
+SITEFILE="

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/, media-gfx/openscad/files/

2021-03-07 Thread Joonas Niilola

commit: 61ae68b49a1af31cd54436180e5116a2a5055e63
Author: Bernd Waibel  posteo  net>
AuthorDate: Fri Feb 12 22:43:30 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Mar  7 09:03:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61ae68b4

media-gfx/openscad: adapt to work with lib3mf-2

Now uses cmake instead of qmake.

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

 .../openscad--0001-fix-to-find-lib3mf-2.patch  |  36 
 ...2-Gentoo-specific-Disable-ccache-building.patch |  35 ---
 media-gfx/openscad/metadata.xml|  10 ++
 media-gfx/openscad/openscad-.ebuild| 101 ++---
 4 files changed, 113 insertions(+), 69 deletions(-)

diff --git 
a/media-gfx/openscad/files/openscad--0001-fix-to-find-lib3mf-2.patch 
b/media-gfx/openscad/files/openscad--0001-fix-to-find-lib3mf-2.patch
new file mode 100644
index 000..0ca19d33646
--- /dev/null
+++ b/media-gfx/openscad/files/openscad--0001-fix-to-find-lib3mf-2.patch
@@ -0,0 +1,36 @@
+From 15bf93ab04e6fd61507f138bcfc6f9c770d9479b Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Thu, 11 Feb 2021 23:14:31 +0100
+Subject: [PATCH] fix to find lib3mf-2
+
+Lib3mf-2 uses lowercase name for it's pkg-config file.
+
+Signed-off-by: Bernd Waibel 
+---
+ cmake/Modules/FindLib3MF.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/Modules/FindLib3MF.cmake b/cmake/Modules/FindLib3MF.cmake
+index 7a1ee285..b062c09c 100644
+--- a/cmake/Modules/FindLib3MF.cmake
 b/cmake/Modules/FindLib3MF.cmake
+@@ -15,14 +15,14 @@ message(STATUS "Searching for lib3mf.")
+ # We still fall back to the rest of detection code here.
+ # Travis CI Ubuntu Trusty environment has some issue with pkg-config
+ # not finding the version.
+-pkg_check_modules(LIB3MF lib3MF)
++pkg_check_modules(LIB3MF lib3mf)
+ 
+ # default to uppercase for 1.0 library name
+ set(LIB3MF_LIB "3MF")
+ 
+ # some distribution packages are missing version information for 2.0
+ if (LIB3MF_VERSION STREQUAL "" AND LIB3MF_FOUND)
+-  if (EXISTS "/usr/include/lib3mf" AND EXISTS 
"/usr/include/lib3mf/lib3mf_implicit.hpp")
++  if (EXISTS "/usr/include/lib3mf" AND EXISTS 
"/usr/include/lib3mf/Bindings/Cpp/lib3mf_implicit.hpp")
+ set(LIB3MF_VERSION "2.0.0")
+   endif()
+ endif()
+-- 
+2.30.1
+

diff --git 
a/media-gfx/openscad/files/openscad--0002-Gentoo-specific-Disable-ccache-building.patch
 
b/media-gfx/openscad/files/openscad--0002-Gentoo-specific-Disable-ccache-building.patch
deleted file mode 100644
index ca21b9322e8..000
--- 
a/media-gfx/openscad/files/openscad--0002-Gentoo-specific-Disable-ccache-building.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 8d6fd9c0896e513eec2da3c97cfd33a5ec09c148 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel 
-Date: Sun, 17 May 2020 21:38:45 +0200
-Subject: [PATCH] [Gentoo-specific] Disable ccache building
-
-On Gentoo we use a USE flag to determine whether to use
-ccache for building or not.
-
-Signed-off-by: Bernd Waibel 

- openscad.pro | 8 
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/openscad.pro b/openscad.pro
-index cc7f3569..8fbd3a5b 100755
 a/openscad.pro
-+++ b/openscad.pro
-@@ -208,10 +208,10 @@ mdi {
-   DEFINES += ENABLE_MDI
- }
- 
--system("ccache -V >/dev/null 2>/dev/null") {
--  CONFIG += ccache
--  message("Using ccache")
--}
-+#system("ccache -V >/dev/null 2>/dev/null") {
-+#  CONFIG += ccache
-+#  message("Using ccache")
-+#}
- 
- include(common.pri)
- 
--- 
-2.26.2
-

diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml
index 75aa20b67f1..3ccb815587c 100644
--- a/media-gfx/openscad/metadata.xml
+++ b/media-gfx/openscad/metadata.xml
@@ -24,6 +24,16 @@

Use dev-util/ccache to speed up rebuilds

+   
+   Add support for gamepads through dev-qt/qtgamepad
+   
+   
+   Build a binary without GUI
+   
+   
+   Add support for space navigator devices through
+   dev-libs/libspnav
+   
 
 
openscad/openscad

diff --git a/media-gfx/openscad/openscad-.ebuild 
b/media-gfx/openscad/openscad-.ebuild
index a718d9a9a8a..433200d96c2 100644
--- a/media-gfx/openscad/openscad-.ebuild
+++ b/media-gfx/openscad/openscad-.ebuild
@@ -1,49 +1,58 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit elisp-common git-r3 qmake-utils xdg
+inherit cmake elisp-common git-r3 xdg
 
 SITEFILE="50${PN}-gentoo.el"
 
 DESCRIPTION="The Programmers Solid 3D CAD Modeller"
 HOMEPAGE="https://www.openscad.org/";
+SRC_URI=""
 EGIT_REPO_URI="https://github.com/openscad/openscad.git";
 
-LICENSE="GPL-2"
+# Code is GPL-3+, MCAD library is LGPL-2.1
+LICENSE="GP

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2021-02-18 Thread Andreas Sturmlechner

commit: b37d33c3094f8681a4bdf6d59f1771c13a7b40a7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Feb 18 20:04:36 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 18 20:12:16 2021 +
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  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..000
--- 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
-   =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
-}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2021-02-18 Thread Sam James

commit: 3901b89db605f0e1659b3a05ff28811c9ad036bc
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 18 17:11:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 18 17:11:42 2021 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2021-02-14 Thread Sam James

commit: f968a1ca9aff9d0235d1828e950a20b1dac6b1f3
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 14 19:52:53 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 14 19:52:53 2021 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2021-02-07 Thread Conrad Kostecki

commit: 0619e3aee23092eb4c249b9192f533c81b648b96
Author: Bernd Waibel  posteo  net>
AuthorDate: Sun Feb  7 16:12:59 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Feb  7 17:07:40 2021 +
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  posteo.net>
Signed-off-by: Conrad Kostecki  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 @@
 http://www.gentoo.org/dtd/metadata.dtd";>
 
 
-   wae...@gmail.com
+   waebbl-gen...@posteo.net
Bernd Waibel

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/, media-gfx/openscad/files/

2020-12-07 Thread Joonas Niilola

commit: 2ca77f3783cb66686e621382fe9f49a6798159f9
Author: Bernd Waibel  gmail  com>
AuthorDate: Fri Nov 27 23:56:21 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Dec  7 08:56:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ca77f37

media-gfx/openscad: fix issue with cgal

Fixes the issue of not building against cgal-5.1.
Also installs locales into correct dir.

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

 ...ad-2019.05-0003-change-C-standard-to-c-14.patch |  76 ++
 media-gfx/openscad/openscad-2019.05-r4.ebuild  | 115 +
 2 files changed, 191 insertions(+)

diff --git 
a/media-gfx/openscad/files/openscad-2019.05-0003-change-C-standard-to-c-14.patch
 
b/media-gfx/openscad/files/openscad-2019.05-0003-change-C-standard-to-c-14.patch
new file mode 100644
index 000..3863d5631b9
--- /dev/null
+++ 
b/media-gfx/openscad/files/openscad-2019.05-0003-change-C-standard-to-c-14.patch
@@ -0,0 +1,76 @@
+From 02f9a4eca87d7713a8345b8513423d9d4a5127e0 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Fri, 27 Nov 2020 18:49:09 +0100
+Subject: [PATCH] change C++ standard to c++14
+
+Signed-off-by: Bernd Waibel 
+---
+ c++11.pri => c++std.pri | 21 -
+ common.pri  |  2 +-
+ 2 files changed, 9 insertions(+), 14 deletions(-)
+ rename c++11.pri => c++std.pri (74%)
+
+diff --git a/c++11.pri b/c++std.pri
+similarity index 74%
+rename from c++11.pri
+rename to c++std.pri
+index 0a2c3b6..aac656d 100644
+--- a/c++11.pri
 b/c++std.pri
+@@ -4,16 +4,16 @@ macx {
+   dirs = $${BOOSTDIR} $${QMAKE_LIBDIR}
+   for(dir, dirs) {
+ system(otool -L $${dir}/libboost_thread*  | grep libc++ >& /dev/null ) {
+-  message("Using libc++11")
++  message("Using libc++")
+   CONFIG += libc++
+ }
+ else {
+   message("Using libstdc++")
+   CONFIG += libstdc++
+-  c++11 {
+-# libc++ is a requirement for using C++11 
+-warning("Disabling C++11 since libstdc++ dependencies were found")
+-CONFIG -= c++11
++  c++std {
++# libc++ is a requirement for using C++14 
++warning("Disabling C++14 since libstdc++ dependencies were found")
++CONFIG -= c++std
+   }
+ }
+   }
+@@ -25,9 +25,9 @@ macx {
+   }
+ }
+ 
+-c++11 {
+-  QMAKE_CXXFLAGS += -std=c++11
+-  message("Using C++11")
++c++std {
++  QMAKE_CXXFLAGS += -std=c++14
++  message("Using C++14")
+ 
+   *clang*: {
+   # 3rd party libraries will probably violate this for a long time
+@@ -41,8 +41,3 @@ c++11 {
+ QMAKE_OBJECTIVE_CFLAGS_WARN_ON += $$CXX11_SUPPRESS_WARNINGS
+   }
+ }
+-else {
+-  *clang* {
+-QMAKE_CXXFLAGS_WARN_ON += -Wno-c++11-extensions
+-  }
+-}
+diff --git a/common.pri b/common.pri
+index 1110757..d1d5edc 100644
+--- a/common.pri
 b/common.pri
+@@ -30,4 +30,4 @@ include(win.pri)
+ include(flex.pri)
+ include(bison.pri)
+ include(opengl.pri)
+-include(c++11.pri)
++include(c++std.pri)
+-- 
+2.29.2
+

diff --git a/media-gfx/openscad/openscad-2019.05-r4.ebuild 
b/media-gfx/openscad/openscad-2019.05-r4.ebuild
new file mode 100644
index 000..2ac3f77c966
--- /dev/null
+++ b/media-gfx/openscad/openscad-2019.05-r4.ebuild
@@ -0,0 +1,115 @@
+# 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"
+   "${FILESDIR}/${P}-0003-change-C-standard-to-c-14.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:=
+   >=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
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2020-11-24 Thread Joonas Niilola

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

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

For now use 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  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18380
Signed-off-by: Joonas Niilola  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:=
+   =x11-libs/qscintilla-2.10.3:=
emacs? ( >=app-editors/emacs-23.1:* )
 "

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2020-11-20 Thread Andreas Sturmlechner

commit: 7f3eef7d929ffd857a448226449625db83fdce71
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Nov 20 19:16:33 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Nov 20 20:39:47 2020 +
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  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..000
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2020-11-20 Thread Joonas Niilola

commit: fbb63cfc3ac9377006fbc8aee0d64b2e3ac79a19
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Nov 20 14:58:44 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Nov 20 14:59:05 2020 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2020-11-20 Thread Joonas Niilola

commit: fc4927dd7ba029554e0a7109bad27e33b90a3d69
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Nov 20 14:58:06 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Nov 20 14:59:05 2020 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2020-08-25 Thread Sam James

commit: 07a08a3479d27801cbb38ec60f71547f121e8b3c
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug 25 10:25:47 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug 25 10:25:47 2020 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2020-07-20 Thread Joonas Niilola

commit: b2cdee2afeaf743367c789d3c3fa03ea41a2b300
Author: Bernd Waibel  gmail  com>
AuthorDate: Mon Jul  6 18:29:48 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jul 20 09:01:20 2020 +
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  gmail.com>
Closes: https://bugs.gentoo.org/728560
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Bernd Waibel  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16616
Signed-off-by: Joonas Niilola  gentoo.org>

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

diff --git a/media-gfx/openscad/openscad-.ebuild 
b/media-gfx/openscad/openscad-.ebuild
index 4dc6fbc2617..a718d9a9a8a 100644
--- a/media-gfx/openscad/openscad-.ebuild
+++ b/media-gfx/openscad/openscad-.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:=

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/files/, media-gfx/openscad/

2020-06-12 Thread Joonas Niilola

commit: 90798b37d1f8189d7130769f7936067740535721
Author: Bernd Waibel  gmail  com>
AuthorDate: Sun May 17 20:10:51 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jun 12 06:59:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90798b37

media-gfx/openscad: backport r3 changes

Backport the changes from 2019.05-r3 to live ebuild.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Bernd Waibel  gmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 ...2-Gentoo-specific-Disable-ccache-building.patch | 35 +
 media-gfx/openscad/openscad-.ebuild| 58 +-
 2 files changed, 81 insertions(+), 12 deletions(-)

diff --git 
a/media-gfx/openscad/files/openscad--0002-Gentoo-specific-Disable-ccache-building.patch
 
b/media-gfx/openscad/files/openscad--0002-Gentoo-specific-Disable-ccache-building.patch
new file mode 100644
index 000..ca21b9322e8
--- /dev/null
+++ 
b/media-gfx/openscad/files/openscad--0002-Gentoo-specific-Disable-ccache-building.patch
@@ -0,0 +1,35 @@
+From 8d6fd9c0896e513eec2da3c97cfd33a5ec09c148 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Sun, 17 May 2020 21:38:45 +0200
+Subject: [PATCH] [Gentoo-specific] Disable ccache building
+
+On Gentoo we use a USE flag to determine whether to use
+ccache for building or not.
+
+Signed-off-by: Bernd Waibel 
+---
+ openscad.pro | 8 
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/openscad.pro b/openscad.pro
+index cc7f3569..8fbd3a5b 100755
+--- a/openscad.pro
 b/openscad.pro
+@@ -208,10 +208,10 @@ mdi {
+   DEFINES += ENABLE_MDI
+ }
+ 
+-system("ccache -V >/dev/null 2>/dev/null") {
+-  CONFIG += ccache
+-  message("Using ccache")
+-}
++#system("ccache -V >/dev/null 2>/dev/null") {
++#  CONFIG += ccache
++#  message("Using ccache")
++#}
+ 
+ include(common.pri)
+ 
+-- 
+2.26.2
+

diff --git a/media-gfx/openscad/openscad-.ebuild 
b/media-gfx/openscad/openscad-.ebuild
index 6ce960b60bc..4dc6fbc2617 100644
--- a/media-gfx/openscad/openscad-.ebuild
+++ b/media-gfx/openscad/openscad-.ebuild
@@ -8,45 +8,67 @@ inherit elisp-common git-r3 qmake-utils xdg
 SITEFILE="50${PN}-gentoo.el"
 
 DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="http://www.openscad.org/";
+HOMEPAGE="https://www.openscad.org/";
 EGIT_REPO_URI="https://github.com/openscad/openscad.git";
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="emacs"
+IUSE="ccache emacs"
+RESTRICT="test"
 
-DEPEND="
+PATCHES=(
+   "${FILESDIR}/${PN}-2019.05-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[-gles2-only]
+   dev-qt/qtmultimedia:5
+   dev-qt/qtnetwork:5
dev-qt/qtopengl:5
+   dev-qt/qtwidgets:5
media-gfx/opencsg
-   media-libs/fontconfig:1.0
-   media-libs/freetype:2
-   >=media-libs/glew-2.0.0:*
-   media-libs/harfbuzz
+   media-libs/fontconfig
+   media-libs/freetype
+   >=media-libs/glew-2.0.0:0=
+   media-libs/harfbuzz:=
+   media-libs/lib3mf
sci-mathematics/cgal:=
-   >=x11-libs/qscintilla-2.9.4:=[qt5(+)]
+   >=x11-libs/qscintilla-2.10.3:=
emacs? ( >=app-editors/emacs-23.1:* )
 "
-RDEPEND="${DEPEND}"
+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
 
-   # tries to call ccache even if it's not present otherwise
-   sed -i '/CONFIG += ccache/d' ${PN}.pro || die
+   # disable ccache
+   if ! use ccache; then
+   eapply 
"${FILESDIR}/${P}-0002-Gentoo-specific-Disable-ccache-building.patch"
+   fi
 }
 
 src_configure() {
@@ -71,3 +93,15 @@ src_install() {
 
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
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/, media-gfx/openscad/files/

2020-06-12 Thread Joonas Niilola

commit: 2dda35d4d5803026c5c36095d5416289c383b988
Author: Bernd Waibel  gmail  com>
AuthorDate: Fri May 15 18:36:41 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jun 12 06:59:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dda35d4

media-gfx/openscad: drop old

Drop obsolete 2015.03 version.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Bernd Waibel  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15809
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/openscad/Manifest|  1 -
 .../files/openscad-2015.03_p2_uic_tr_fix.patch | 14 
 ...penscad-2015.03_p3_fix-boost-1.70.0-build.patch | 13 
 media-gfx/openscad/openscad-2015.03_p3-r2.ebuild   | 80 --
 4 files changed, 108 deletions(-)

diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index fa81bd25200..fd29bf8f45b 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1,2 +1 @@
-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/files/openscad-2015.03_p2_uic_tr_fix.patch 
b/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch
deleted file mode 100644
index ef0bcc421eb..000
--- a/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
 a/src/qtgettext.h  2017-03-22 00:17:29.808058905 -0400
-+++ b/src/qtgettext.h  2017-03-22 00:18:55.251184835 -0400
-@@ -22,5 +22,10 @@
-   return QString::fromUtf8( _( msgid ) );
- }
- 
--#endif
-+inline QString _( const char *msgid, const char *disambiguation )
-+{
-+  Q_UNUSED( disambiguation );
-+  return QString::fromUtf8( _( msgid ) );
-+}
- 
-+#endif

diff --git 
a/media-gfx/openscad/files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch 
b/media-gfx/openscad/files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch
deleted file mode 100644
index 7684eba92e8..000
--- a/media-gfx/openscad/files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/CSGTermEvaluator.cc b/src/CSGTermEvaluator.cc
-index 6416f29..b3753cf 100644
 a/src/CSGTermEvaluator.cc
-+++ b/src/CSGTermEvaluator.cc
-@@ -109,7 +109,7 @@ static shared_ptr 
evaluate_csg_term_from_geometry(const State &state,
-   shared_ptr ps = 
dynamic_pointer_cast(geom);
-   // Since is_convex() doesn't handle non-planar faces, 
we need to tessellate
-   // also in the indeterminate state so we cannot just 
use a boolean comparison. See #1061
--  bool convex = ps->convexValue();
-+  bool convex{ps->convexValue()};
-   if (ps && !convex) {
-   assert(ps->getDimension() == 3);
-   PolySet *ps_tri = new PolySet(3, 
ps->convexValue());

diff --git a/media-gfx/openscad/openscad-2015.03_p3-r2.ebuild 
b/media-gfx/openscad/openscad-2015.03_p3-r2.ebuild
deleted file mode 100644
index c8c9432ff43..000
--- a/media-gfx/openscad/openscad-2015.03_p3-r2.ebuild
+++ /dev/null
@@ -1,80 +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
-
-# 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"
-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-only]
-   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? ( >=app-editors/emacs-23.1:* )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2015.03_p2_uic_tr_fix.patch"
-   "${FILESDIR}/${PN}-2015.03_p3_fix-boo

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/, media-gfx/openscad/files/

2020-06-12 Thread Joonas Niilola

commit: 8dfc7b2d0c0cc3d01d08ec9dc7885be394334a50
Author: Bernd Waibel  gmail  com>
AuthorDate: Sun Apr 19 18:44:54 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jun 12 06:59:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dfc7b2d

media-gfx/openscad: Fix build with boost-1.73.0

Thanks to William T Wilson for reporting and providing patch.

Additionally OpenSCAD has an optional, but automagic dependency on
media-libs/lib3mf.

Add ccache USE flag, as it's automagically enabled whenever the ccache
binary is found in PATH.

Reported-by: William T Wilson  gmail.com>
Closes: https://bugs.gentoo.org/722302
Package-Manager: Portage-2.3.99-r2, Repoman-2.3.22
Signed-off-by: Bernd Waibel  gmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 ...ad-2019.05-0001-Fix-build-with-boost-1.73.patch |  28 ++
 ...2-Gentoo-specific-Disable-ccache-building.patch |  35 +++
 media-gfx/openscad/metadata.xml|   5 +
 media-gfx/openscad/openscad-2019.05-r3.ebuild  | 108 +
 4 files changed, 176 insertions(+)

diff --git 
a/media-gfx/openscad/files/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch
 
b/media-gfx/openscad/files/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch
new file mode 100644
index 000..74f48b4c1ae
--- /dev/null
+++ 
b/media-gfx/openscad/files/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch
@@ -0,0 +1,28 @@
+From 47275a3d92969709e7605f23a408c5ed5aa483c9 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Fri, 15 May 2020 19:09:10 +0200
+Subject: [PATCH] Fix build with boost-1.73
+
+Thanks to William T Wilson for reporting and providing the patch.
+
+Signed-off-by: Bernd Waibel 
+---
+ src/import.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/import.cc b/src/import.cc
+index eef1323..08e46ff 100644
+--- a/src/import.cc
 b/src/import.cc
+@@ -50,7 +50,7 @@ namespace fs = boost::filesystem;
+ #include 
+ using namespace boost::assign; // bring 'operator+=()' into scope
+ 
+-#include 
++#include 
+ #include 
+ 
+ extern PolySet * import_amf(std::string, const Location &loc);
+-- 
+2.26.2
+

diff --git 
a/media-gfx/openscad/files/openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch
 
b/media-gfx/openscad/files/openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch
new file mode 100644
index 000..1a4903828e8
--- /dev/null
+++ 
b/media-gfx/openscad/files/openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch
@@ -0,0 +1,35 @@
+From 2940d8e5c74faa5dcd5279c8166064ade3da5695 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Sun, 17 May 2020 21:13:44 +0200
+Subject: [PATCH] [Gentoo-specific] Disable ccache building
+
+On Gentoo we use a USE flag to determine whether to use
+ccache for building or not.
+
+Signed-off-by: Bernd Waibel 
+---
+ openscad.pro | 8 
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/openscad.pro b/openscad.pro
+index 2d190dd..9c4e67b 100755
+--- a/openscad.pro
 b/openscad.pro
+@@ -214,10 +214,10 @@ mdi {
+   DEFINES += ENABLE_MDI
+ }
+ 
+-system("ccache -V >/dev/null 2>/dev/null") {
+-  CONFIG += ccache
+-  message("Using ccache")
+-}
++#system("ccache -V >/dev/null 2>/dev/null") {
++#  CONFIG += ccache
++#  message("Using ccache")
++#}
+ 
+ include(common.pri)
+ 
+-- 
+2.26.2
+

diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml
index 7b83ba14800..5ed7ed33c62 100644
--- a/media-gfx/openscad/metadata.xml
+++ b/media-gfx/openscad/metadata.xml
@@ -20,6 +20,11 @@
OpenSCAD is free software and available for Linux/UNIX, MS Windows and
Mac OS X.
 
+
+   
+   Use dev-util/ccache to speed up rebuilds
+   
+
 
openscad/openscad
 

diff --git a/media-gfx/openscad/openscad-2019.05-r3.ebuild 
b/media-gfx/openscad/openscad-2019.05-r3.ebuild
new file mode 100644
index 000..73d70652513
--- /dev/null
+++ b/media-gfx/openscad/openscad-2019.05-r3.ebuild
@@ -0,0 +1,108 @@
+# 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="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
+   d

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2020-04-14 Thread Agostino Sarubbo

commit: 3b4a41c346777fcb4b4ef3bfb61c5e79bfa77d7e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Apr 14 12:31:34 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Apr 14 12:31:34 2020 +
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  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=(

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2020-04-14 Thread Agostino Sarubbo

commit: 35e03a73d2710e7c1f68cb76cd245394f9c1c762
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Apr 14 07:58:13 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Apr 14 07:58:50 2020 +
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  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=(

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2020-04-03 Thread Andreas Sturmlechner

commit: cce9fd7370b4a7b952c83b92c2d338548442e7c1
Author: Haelwenn (lanodan) Monnier  hacktivis  me>
AuthorDate: Fri Mar 27 03:36:46 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr  3 20:06:26 2020 +
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  hacktivis.me>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

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

diff --git a/media-gfx/openscad/openscad-.ebuild 
b/media-gfx/openscad/openscad-.ebuild
index 3af31a6a717..6ce960b60bc 100644
--- a/media-gfx/openscad/openscad-.ebuild
+++ b/media-gfx/openscad/openscad-.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

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2020-04-03 Thread Andreas Sturmlechner

commit: a1661687c0a471bca16a6a3388a2be8f73750e16
Author: Haelwenn (lanodan) Monnier  hacktivis  me>
AuthorDate: Fri Mar 27 03:29:56 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr  3 20:06:19 2020 +
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  hacktivis.me>
Signed-off-by: Andreas Sturmlechner  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

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/files/, media-gfx/openscad/

2019-12-19 Thread Joonas Niilola

commit: bca5d279dd1a2ceff9b672d81793aacb614adbf9
Author: Christophe Lermytte  lermytte  be>
AuthorDate: Tue Dec 17 17:39:22 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Dec 20 05:34:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bca5d279

media-gfx/openscad: fix compilation with boost-1.72

Patch originates from upstream commit which is staged for release
https://github.com/openscad/openscad/pull/3105

Closes: https://bugs.gentoo.org/703022
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Christophe Lermytte  lermytte.be>
Closes: https://github.com/gentoo/gentoo/pull/14028
Signed-off-by: Joonas Niilola  gentoo.org>

 .../openscad-2019.05_fix-boost-1.72.0-build.patch  | 27 ++
 media-gfx/openscad/openscad-2019.05-r1.ebuild  |  4 
 2 files changed, 31 insertions(+)

diff --git 
a/media-gfx/openscad/files/openscad-2019.05_fix-boost-1.72.0-build.patch 
b/media-gfx/openscad/files/openscad-2019.05_fix-boost-1.72.0-build.patch
new file mode 100644
index 000..28d3285a737
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2019.05_fix-boost-1.72.0-build.patch
@@ -0,0 +1,27 @@
+From b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0 Mon Sep 17 00:00:00 2001
+From: Jan Beich 
+Date: Fri, 25 Oct 2019 15:10:26 +
+Subject: [PATCH] Add missing header bootlegged by Boost < 1.72
+
+src/parser.y:76:6: error: no template named 'stack' in namespace 'std'
+std::stack scope_stack;
+~^
+---
+ src/parser.y | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/parser.y b/src/parser.y
+index 7f4fd56c..4c77c989 100644
+--- a/src/parser.y
 b/src/parser.y
+@@ -46,6 +46,7 @@
+ #include "printutils.h"
+ #include "memory.h"
+ #include 
++#include 
+ #include 
+ #include "boost-utils.h"
+ #include "feature.h"
+-- 
+2.24.1
+

diff --git a/media-gfx/openscad/openscad-2019.05-r1.ebuild 
b/media-gfx/openscad/openscad-2019.05-r1.ebuild
index 8991b255f4c..11211477d2d 100644
--- a/media-gfx/openscad/openscad-2019.05-r1.ebuild
+++ b/media-gfx/openscad/openscad-2019.05-r1.ebuild
@@ -16,6 +16,10 @@ 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

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2019-07-07 Thread Michał Górny

commit: 16da019c5159b13b9bf7498f77c3642a83a5b37f
Author: Bernd Waibel  gmail  com>
AuthorDate: Sun Jul  7 08:48:22 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jul  7 19:18:04 2019 +
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  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12077
Signed-off-by: Michał Górny  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..000
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2019-07-07 Thread Michał Górny

commit: da982da5372c24f47a7a5b402dae6c5557473ba4
Author: Bernd Waibel  gmail  com>
AuthorDate: Wed May 22 05:52:48 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jul  7 19:18:02 2019 +
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)  caerllewys.net>
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Bernd Waibel  gmail.com>
Signed-off-by: Michał Górny  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 000..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
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2019-05-18 Thread Andreas Sturmlechner

commit: 7ec88bd25f0efd4784d858c9ad5a77a46431b1e8
Author: Bernd Waibel  gmail  com>
AuthorDate: Wed May 15 17:54:32 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat May 18 19:32:25 2019 +
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  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12005
Signed-off-by: Andreas Sturmlechner  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 000..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
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/, media-gfx/openscad/files/

2019-05-15 Thread Andreas Sturmlechner

commit: 2f39ea71ddb4d2008a1ab414493196d3c94e05b7
Author: Bernd Waibel  gmail  com>
AuthorDate: Wed May 15 16:01:55 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed May 15 18:27:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f39ea71

media-gfx/openscad: fix boost-1.70.0 build

Fixes a build issue with >=boost-1.69

Closes: https://bugs.gentoo.org/684038
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Bernd Waibel  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12003
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch  | 13 +
 media-gfx/openscad/openscad-2015.03_p3-r1.ebuild|  5 -
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git 
a/media-gfx/openscad/files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch 
b/media-gfx/openscad/files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch
new file mode 100644
index 000..7684eba92e8
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch
@@ -0,0 +1,13 @@
+diff --git a/src/CSGTermEvaluator.cc b/src/CSGTermEvaluator.cc
+index 6416f29..b3753cf 100644
+--- a/src/CSGTermEvaluator.cc
 b/src/CSGTermEvaluator.cc
+@@ -109,7 +109,7 @@ static shared_ptr 
evaluate_csg_term_from_geometry(const State &state,
+   shared_ptr ps = 
dynamic_pointer_cast(geom);
+   // Since is_convex() doesn't handle non-planar faces, 
we need to tessellate
+   // also in the indeterminate state so we cannot just 
use a boolean comparison. See #1061
+-  bool convex = ps->convexValue();
++  bool convex{ps->convexValue()};
+   if (ps && !convex) {
+   assert(ps->getDimension() == 3);
+   PolySet *ps_tri = new PolySet(3, 
ps->convexValue());

diff --git a/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild 
b/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild
index 1b34fa207c5..043c1d22a21 100644
--- a/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild
+++ b/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild
@@ -41,7 +41,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-2015.03_p2_uic_tr_fix.patch" )
+PATCHES=(
+   "${FILESDIR}/${PN}-2015.03_p2_uic_tr_fix.patch"
+   "${FILESDIR}/${PN}-2015.03_p3_fix-boost-1.70.0-build.patch"
+)
 
 S="${WORKDIR}/${PN}-${MY_PV}"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2019-04-24 Thread Andreas Sturmlechner

commit: b97a3ee38729699006c7a6c6e7f3bb229b84f794
Author: Bernd Waibel  gmail  com>
AuthorDate: Sun Dec 23 21:30:49 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Apr 24 20:14:38 2019 +
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  gmail.com>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...5.03_p3.ebuild => openscad-2015.03_p3-r1.ebuild} | 21 +++--
 media-gfx/openscad/openscad-.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-.ebuild 
b/media-gfx/openscad/openscad-.ebuild
index c6641079520..e885fba1196 100644
--- a/media-gfx/openscad/openscad-.ebuild
+++ b/media-gfx/openscad/openscad-.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
-}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2019-04-24 Thread Andreas Sturmlechner

commit: 29eea93dde6411b1af700ff1d6adb92e824b23af
Author: Bernd Waibel  gmail  com>
AuthorDate: Sun Dec 23 21:12:50 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Apr 24 20:14:38 2019 +
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  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10687
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/openscad/metadata.xml | 26 ++
 media-gfx/openscad/openscad-.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 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-   
-   
-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.
-   
+
+   wae...@gmail.com
+   Bernd Waibel
+
+
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+
+
+   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.
+
+
+   openscad/openscad
+
 

diff --git a/media-gfx/openscad/openscad-.ebuild 
b/media-gfx/openscad/openscad-.ebuild
index 4dd3247d891..c6641079520 100644
--- a/media-gfx/openscad/openscad-.ebuild
+++ b/media-gfx/openscad/openscad-.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

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2019-01-27 Thread Pacho Ramos

commit: f05805e312263c77e205aa74328ef8f3343d2153
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Jan 27 17:22:04 2019 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Jan 27 17:26:11 2019 +
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  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..000
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2018-01-06 Thread Andreas Sturmlechner

commit: 857c2549ee5aa1eb655dcbb8a5938f231066a544
Author: Sergey Alirzaev  gmail  com>
AuthorDate: Mon Dec 25 16:26:10 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan  6 21:31:41 2018 +
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-.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media-gfx/openscad/openscad-.ebuild 
b/media-gfx/openscad/openscad-.ebuild
index 54522344a95..4dd3247d891 100644
--- a/media-gfx/openscad/openscad-.ebuild
+++ b/media-gfx/openscad/openscad-.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() {

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2017-12-08 Thread Michael Weber

commit: 3423a79dd2aa6dd74d8712d49387f9b340968062
Author: Michael Weber  gentoo  org>
AuthorDate: Sat Dec  9 02:33:07 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Sat Dec  9 02:33:07 2017 +
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-.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-gfx/openscad/openscad-.ebuild 
b/media-gfx/openscad/openscad-.ebuild
index 60c55536954..54522344a95 100644
--- a/media-gfx/openscad/openscad-.ebuild
+++ b/media-gfx/openscad/openscad-.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(+)]

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2017-12-08 Thread Michael Weber

commit: 92ac176cfe27c6d72bf25850cbf88230e41ee320
Author: Michael Weber  gentoo  org>
AuthorDate: Sat Dec  9 02:31:14 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Sat Dec  9 02:31:14 2017 +
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

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2017-12-08 Thread Michael Weber

commit: ecb67c8676b4502571f22c7a20e880030f089259
Author: Michael Weber  gentoo  org>
AuthorDate: Sat Dec  9 02:25:38 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Sat Dec  9 02:25:48 2017 +
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(+)]

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2017-12-08 Thread Michael Weber

commit: f94195e5f2326bd4eb26e27e235be911c0f7674a
Author: Michael Weber  gentoo  org>
AuthorDate: Sat Dec  9 02:19:35 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Sat Dec  9 02:19:35 2017 +
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 000..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
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2017-10-28 Thread Andreas Sturmlechner

commit: b9b348edaa83b06af71b414d5dbfffce18d8fcc6
Author: Sergey Alirzaev  gmail  com>
AuthorDate: Sat Oct 28 16:10:34 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Oct 28 16:12:47 2017 +
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-.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-.ebuild 
b/media-gfx/openscad/openscad-.ebuild
index 781c41bb5f0..60c55536954 100644
--- a/media-gfx/openscad/openscad-.ebuild
+++ b/media-gfx/openscad/openscad-.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 )
 "

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2017-10-21 Thread Andreas Sturmlechner

commit: 047b2f23eab10ac6d03bd3a0f1f97c4f70d687e0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Oct 21 21:21:01 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Oct 21 21:24:09 2017 +
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..000
--- 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..000
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/, media-gfx/openscad/files/

2017-10-21 Thread Andreas Sturmlechner

commit: 82b27387e7847268227a680fe402f63fd4b97113
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Oct 21 21:14:15 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Oct 21 21:24:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82b27387

media-gfx/openscad: Switch to Qt5, add xdg-utils

Drop unused eutils.eclass.

Thanks-to: maurerpe  yahoo.com>
Gentoo-bug: 623610
Package-Manager: Portage-2.3.12, Repoman-2.3.3

 .../files/openscad-2015.03_p2_uic_tr_fix.patch | 14 +++
 ...d-.ebuild => openscad-2015.03_p2-r3.ebuild} | 47 +++---
 media-gfx/openscad/openscad-.ebuild| 36 +++--
 3 files changed, 71 insertions(+), 26 deletions(-)

diff --git a/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch 
b/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch
new file mode 100644
index 000..ef0bcc421eb
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch
@@ -0,0 +1,14 @@
+--- a/src/qtgettext.h  2017-03-22 00:17:29.808058905 -0400
 b/src/qtgettext.h  2017-03-22 00:18:55.251184835 -0400
+@@ -22,5 +22,10 @@
+   return QString::fromUtf8( _( msgid ) );
+ }
+ 
+-#endif
++inline QString _( const char *msgid, const char *disambiguation )
++{
++  Q_UNUSED( disambiguation );
++  return QString::fromUtf8( _( msgid ) );
++}
+ 
++#endif

diff --git a/media-gfx/openscad/openscad-.ebuild 
b/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
similarity index 56%
copy from media-gfx/openscad/openscad-.ebuild
copy to media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
index 95b2d243082..a9e86a2a047 100644
--- a/media-gfx/openscad/openscad-.ebuild
+++ b/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
@@ -3,45 +3,54 @@
 
 EAPI=6
 
-inherit elisp-common eutils git-r3 qmake-utils
+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/";
-EGIT_REPO_URI="https://github.com/openscad/openscad.git";
+SRC_URI="http://files.openscad.org/${PN}-${MY_PV}.src.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+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]
+DEPEND="
dev-cpp/eigen:3
+   dev-libs/boost:=
dev-libs/glib:2
dev-libs/gmp:0=
dev-libs/mpfr:0=
-   dev-libs/boost:=
+   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/harfbuzz
-   x11-libs/qscintilla:=[qt4(-)]
-   emacs? ( virtual/emacs )"
+   sci-mathematics/cgal
+   >=x11-libs/qscintilla-2.9.4:=[qt5(+)]
+   emacs? ( virtual/emacs )
+"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-   sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
+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() {
-   eqmake4 "${PN}.pro"
+   eqmake5 "${PN}.pro"
 }
 
 src_compile() {
@@ -62,3 +71,13 @@ 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-.ebuild 
b/media-gfx/openscad/openscad-.ebuild
index 95b2d243082..781c41bb5f0 100644
--- a/media-gfx/openscad/openscad-.ebuild
+++ b/media-gfx/openscad/openscad-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit elisp-common eutils git-r3 qmake-utils
+inherit elisp-common git-r3 qmake-utils xdg-utils
 
 SITEFILE="50${PN}-gentoo.el"
 
@@ -16,32 +16,34 @@ 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]
+DEPEND="
dev-cpp/eigen:3
+   dev-libs/boost:=
dev-libs/glib:2
dev-libs/gmp:0=
dev-libs/mpfr:0=
-   dev-libs/boost:=
+   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/harfbuzz
-   x11-libs/qscintilla:=[qt4(-)]
-   emacs? ( virtual/emacs )"
+   sci-mathematics/cgal
+   >=x11-libs/qscintilla-2.9.4:=[qt5(+)]
+   emacs? ( virtual/emacs )
+"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-   sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
-
default
+
+   sed -i "s/\/us

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2017-05-15 Thread Michael Weber

commit: a910dddc689ee97092a4fed5008ad453d7d77fd2
Author: Michael Weber  gentoo  org>
AuthorDate: Mon May 15 08:43:50 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Mon May 15 08:44:06 2017 +
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-.ebuild | 64 +
 1 file changed, 64 insertions(+)

diff --git a/media-gfx/openscad/openscad-.ebuild 
b/media-gfx/openscad/openscad-.ebuild
new file mode 100644
index 000..95b2d243082
--- /dev/null
+++ b/media-gfx/openscad/openscad-.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
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/, media-gfx/openscad/files/

2017-05-14 Thread Michael Weber

commit: cac892e538e86aae4fac4c601bfda015c5a93494
Author: Michael Weber  gentoo  org>
AuthorDate: Sun May 14 12:49:30 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Sun May 14 12:49:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cac892e5

media-gfx/openscad: Add emacs mode, thanks Emery Hemingway for the ebuild (bug 
492220).

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 media-gfx/openscad/files/50openscad-gentoo.el|  3 ++
 media-gfx/openscad/openscad-2015.03_p2-r2.ebuild | 69 
 2 files changed, 72 insertions(+)

diff --git a/media-gfx/openscad/files/50openscad-gentoo.el 
b/media-gfx/openscad/files/50openscad-gentoo.el
new file mode 100644
index 000..3cc7c1a7c46
--- /dev/null
+++ b/media-gfx/openscad/files/50openscad-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'scad-mode "scad-mode" "Major mode for editing SCAD code." t)
+(add-to-list 'auto-mode-alist '("\\.scad$" . scad-mode))

diff --git a/media-gfx/openscad/openscad-2015.03_p2-r2.ebuild 
b/media-gfx/openscad/openscad-2015.03_p2-r2.ebuild
new file mode 100644
index 000..67206bfa9e1
--- /dev/null
+++ b/media-gfx/openscad/openscad-2015.03_p2-r2.ebuild
@@ -0,0 +1,69 @@
+# 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
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2017-05-14 Thread Michael Weber

commit: e5db500c4cd86e6bb43e3571886811c6367a37f4
Author: Michael Weber  gentoo  org>
AuthorDate: Sun May 14 10:07:36 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Sun May 14 11:02:31 2017 +
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 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-
+   
+   x...@gentoo.org
+   michael weber
+   
+   
 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.
-
-
-
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2017-05-14 Thread Michael Weber

commit: 82736ed12f606f664fd3df1e75cc4d2b12f9de66
Author: Michael Weber  gentoo  org>
AuthorDate: Sun May 14 10:08:48 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Sun May 14 11:02:34 2017 +
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..000
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2016-12-22 Thread David Seifert

commit: 791f8f81463ba8f3c63b3d3ea4c791f73dd0869b
Author: David Seifert  gentoo  org>
AuthorDate: Thu Dec 22 17:46:39 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Dec 22 18:26:20 2016 +
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}"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2016-08-06 Thread Pacho Ramos

commit: ae322fb9cc89724c306ed209723a036c687e7eae
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Aug  6 08:57:55 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Aug  6 09:16:22 2016 +
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 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-
-ma...@gentoo.org
-Matthew Marlowe
-
 
 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.

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2016-03-30 Thread Michael Palimaka

commit: 0d2b3ad098e2b733b572eb6d5105aada9bf61db1
Author: Matthew Brewer  sina  cn>
AuthorDate: Fri Mar 18 22:20:05 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Mar 30 13:38:59 2016 +
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 000..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
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2015-09-07 Thread Thomas Kahle

commit: 4526ec793e76d0b48fddc35d3b7680fdbcd9b1b3
Author: Thomas Kahle  gentoo  org>
AuthorDate: Mon Sep  7 07:14:19 2015 +
Commit: Thomas Kahle  gentoo  org>
CommitDate: Mon Sep  7 07:14:37 2015 +
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
 }

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2015-09-06 Thread Thomas Kahle

commit: bfa8ac991d8a9a0a15b85df4a664263143056931
Author: Thomas Kahle  gentoo  org>
AuthorDate: Sun Sep  6 19:40:10 2015 +
Commit: Thomas Kahle  gentoo  org>
CommitDate: Sun Sep  6 19:40:52 2015 +
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 000..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
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/

2015-09-06 Thread Thomas Kahle

commit: b3a239c41ebed8098aa5db076001b826d96945f3
Author: Thomas Kahle  gentoo  org>
AuthorDate: Sun Sep  6 19:40:38 2015 +
Commit: Thomas Kahle  gentoo  org>
CommitDate: Sun Sep  6 19:40:53 2015 +
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..000
--- 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..000
--- 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
-}

73 matches

Mail list logo