From: David Seifert Date: Thu, 22 Dec 2016 17:46:39 +0000 (+0100) Subject: media-gfx/openscad: Depend on x11-libs/qscintilla[qt4] X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=791f8f81463ba8f3c63b3d3ea4c791f73dd0869b;p=gentoo.git 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 --- 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 3248a7800708..d47be31a4d46 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 fbd76edc8eba..6839901815bc 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}"