From 088961ae42da30160b648eab78c13d4535894d39 Mon Sep 17 00:00:00 2001 From: layman Date: Sat, 28 Oct 2017 21:37:23 +0200 Subject: [PATCH] Updated openscad ebuild to use Qt5 --- media-gfx/openscad/Manifest | 2 +- media-gfx/openscad/openscad-9999.ebuild | 25 +++++++++++++++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest index 7beb902..0dabf1c 100644 --- a/media-gfx/openscad/Manifest +++ b/media-gfx/openscad/Manifest @@ -1,2 +1,2 @@ -EBUILD openscad-9999.ebuild 892 SHA256 397276db22760a383c5ea9c32a6b1da1d2d43c40a0eaa04ed0f8ef5e866b2ddf SHA512 8b11b0b8895f20e2f46d3c690ea946df0dcc7816955d88086bd6a3fbae290412c6a4b903237bbb707bca2231765c37819f7b70e561624bcf7f701f60823f5022 WHIRLPOOL 8dd3814525844a1d4e664a7fbd3c52b5ff930da07d1e1f04ca812e78152583fa25b9432bd6d2b821d2baf472ef4f40a0641e92360803b5ba3580d7f3ddbe0fa6 +EBUILD openscad-9999.ebuild 1057 SHA256 86e786debb60ec7cae29824629a3a98a6cd9e63307e42bf68bd87660f405e8c7 SHA512 93316d8db5e527b6e41c187e451000b15d77f92c3fd5470476c1cc856e2b4c0651231a119d636083eb5cfaa2d18b5864475391c332e021a840c7c2f374db11dd WHIRLPOOL 7efc610474d350f76f3350a470437d3f45f2a88b678517aa6e480d0757216257eedb7246b1a9664748b869dc656a40d4713d6dfefbca4be5e4f691528dd44e61 MISC metadata.xml 839 SHA256 e92ca10a725c36e711270e747abbd22584b0baba005ae1d65e45c89755f40a84 SHA512 f13910d4339e820344e1c70edc384c4522ad506c50ffc80e843358199b0d2e27f9eafe99e4613f258a62abc4683b462d001fe71e19d849845f6f4cf75324ffd3 WHIRLPOOL ca3494c5d2314193a80315008ef44b08f48fa624922340e33402c8fc87729ab27fcbf491b0c802d7052e1e63df00948835d657d8214c76376cf8e61fd2813935 diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild index 655466f..cb47e98 100644 --- a/media-gfx/openscad/openscad-9999.ebuild +++ b/media-gfx/openscad/openscad-9999.ebuild @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -inherit qt4-r2 +inherit eutils qmake-utils if [[ ${PV} == "9999" ]] ; then inherit git-r3 @@ -23,14 +23,14 @@ IUSE="" CDEPEND="media-gfx/opencsg sci-mathematics/cgal - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qtopengl:4 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-libs/gmp:0 dev-libs/mpfr:0 dev-libs/boost:= - x11-libs/qscintilla[qt4] + x11-libs/qscintilla[qt5] " DEPEND="${CDEPEND}" RDEPEND="${CDEPEND}" @@ -40,4 +40,17 @@ src_prepare() { sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro || die sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die + + default +} + +src_configure() { + local myqmakeargs=( + openscad.pro + ) + eqmake5 "${myqmakeargs[@]}" +} + +src_install() { + emake INSTALL_ROOT="${D}" install }