commit: 90798b37d1f8189d7130769f7936067740535721 Author: Bernd Waibel <waebbl <AT> gmail <DOT> com> AuthorDate: Sun May 17 20:10:51 2020 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Fri Jun 12 06:59:45 2020 +0000 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 <waebbl <AT> gmail.com> Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> ...2-Gentoo-specific-Disable-ccache-building.patch | 35 +++++++++++++ media-gfx/openscad/openscad-9999.ebuild | 58 +++++++++++++++++----- 2 files changed, 81 insertions(+), 12 deletions(-) diff --git a/media-gfx/openscad/files/openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch b/media-gfx/openscad/files/openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch new file mode 100644 index 00000000000..ca21b9322e8 --- /dev/null +++ b/media-gfx/openscad/files/openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch @@ -0,0 +1,35 @@ +From 8d6fd9c0896e513eec2da3c97cfd33a5ec09c148 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <[email protected]> +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 <[email protected]> +--- + 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-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild index 6ce960b60bc..4dc6fbc2617 100644 --- a/media-gfx/openscad/openscad-9999.ebuild +++ b/media-gfx/openscad/openscad-9999.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 +}
