From a1661687c0a471bca16a6a3388a2be8f73750e16 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Fri, 27 Mar 2020 04:29:56 +0100 Subject: media-gfx/openscad: dev-qt/qtgui[-gles2 => -gles2-only] Signed-off-by: Haelwenn (lanodan) Monnier Signed-off-by: Andreas Sturmlechner --- media-gfx/openscad/openscad-2015.03_p3-r1.ebuild | 80 ---------------------- media-gfx/openscad/openscad-2015.03_p3-r2.ebuild | 80 ++++++++++++++++++++++ media-gfx/openscad/openscad-2019.05-r1.ebuild | 86 ------------------------ media-gfx/openscad/openscad-2019.05-r2.ebuild | 86 ++++++++++++++++++++++++ 4 files changed, 166 insertions(+), 166 deletions(-) delete mode 100644 media-gfx/openscad/openscad-2015.03_p3-r1.ebuild create mode 100644 media-gfx/openscad/openscad-2015.03_p3-r2.ebuild delete mode 100644 media-gfx/openscad/openscad-2019.05-r1.ebuild create mode 100644 media-gfx/openscad/openscad-2019.05-r2.ebuild diff --git a/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild b/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild deleted file mode 100644 index 7ce8b1f70da2..000000000000 --- a/media-gfx/openscad/openscad-2015.03_p3-r1.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 - -# 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] - 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-boost-1.70.0-build.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 -} diff --git a/media-gfx/openscad/openscad-2015.03_p3-r2.ebuild b/media-gfx/openscad/openscad-2015.03_p3-r2.ebuild new file mode 100644 index 000000000000..c8c9432ff43a --- /dev/null +++ b/media-gfx/openscad/openscad-2015.03_p3-r2.ebuild @@ -0,0 +1,80 @@ +# 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-boost-1.70.0-build.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 +} diff --git a/media-gfx/openscad/openscad-2019.05-r1.ebuild b/media-gfx/openscad/openscad-2019.05-r1.ebuild deleted file mode 100644 index dfdb27dfe668..000000000000 --- a/media-gfx/openscad/openscad-2019.05-r1.ebuild +++ /dev/null @@ -1,86 +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" - -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] - 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 -} diff --git a/media-gfx/openscad/openscad-2019.05-r2.ebuild b/media-gfx/openscad/openscad-2019.05-r2.ebuild new file mode 100644 index 000000000000..edf383dda5e4 --- /dev/null +++ b/media-gfx/openscad/openscad-2019.05-r2.ebuild @@ -0,0 +1,86 @@ +# 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 +} -- cgit v1.2.3-65-gdbad