commit: c0b7455986303d2abaed9a24c6bbe79d3887ea9a Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Jan 25 14:24:10 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Jan 25 16:43:06 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0b74559
sci-electronics/klayout: Switch to ruby23, add missing Qt5 deps Closes: https://bugs.gentoo.org/645614 Closes: https://bugs.gentoo.org/644872 Package-Manager: Portage-2.3.20, Repoman-2.3.6 .../{klayout-9999.ebuild => klayout-0.25-r1.ebuild} | 16 ++++++++++++++-- sci-electronics/klayout/klayout-9999.ebuild | 9 ++++++++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/sci-electronics/klayout/klayout-9999.ebuild b/sci-electronics/klayout/klayout-0.25-r1.ebuild similarity index 83% copy from sci-electronics/klayout/klayout-9999.ebuild copy to sci-electronics/klayout/klayout-0.25-r1.ebuild index ad17c9f8d60..5d833f38cba 100644 --- a/sci-electronics/klayout/klayout-9999.ebuild +++ b/sci-electronics/klayout/klayout-0.25-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 RUBY_OPTIONAL=no -USE_RUBY="ruby22" +USE_RUBY="ruby23" # note: define maximally ONE implementation here PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) @@ -30,13 +30,25 @@ RDEPEND=" dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 + dev-qt/qtmultimedia:5[widgets] + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsql:5 + dev-qt/qtsvg:5 dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + dev-qt/qtxmlpatterns:5 sys-libs/zlib ${PYTHON_DEPS} $(ruby_implementations_depend) " DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}/${P}-qt58.patch" + "${FILESDIR}/${P}-qt59.patch" +) + pkg_setup() { python-single-r1_pkg_setup ruby-ng_pkg_setup diff --git a/sci-electronics/klayout/klayout-9999.ebuild b/sci-electronics/klayout/klayout-9999.ebuild index ad17c9f8d60..405eec9ad3c 100644 --- a/sci-electronics/klayout/klayout-9999.ebuild +++ b/sci-electronics/klayout/klayout-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -30,7 +30,14 @@ RDEPEND=" dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsql:5 + dev-qt/qtsvg:5 dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + dev-qt/qtxmlpatterns:5 sys-libs/zlib ${PYTHON_DEPS} $(ruby_implementations_depend)
