From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0958E138332 for ; Thu, 25 Jan 2018 16:44:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E99FAE09F8; Thu, 25 Jan 2018 16:44:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BA1D0E09F8 for ; Thu, 25 Jan 2018 16:44:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 51AB2335C31 for ; Thu, 25 Jan 2018 16:43:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0945C1C0 for ; Thu, 25 Jan 2018 16:43:57 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1516898586.c0b7455986303d2abaed9a24c6bbe79d3887ea9a.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/klayout/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-electronics/klayout/klayout-0.25-r1.ebuild sci-electronics/klayout/klayout-9999.ebuild X-VCS-Directories: sci-electronics/klayout/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c0b7455986303d2abaed9a24c6bbe79d3887ea9a X-VCS-Branch: master Date: Thu, 25 Jan 2018 16:43:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8fd9cb49-b2f8-47a8-9bd6-a59f6dc87175 X-Archives-Hash: 96aabaa35c1f201be09e5de45ca9f120 commit: c0b7455986303d2abaed9a24c6bbe79d3887ea9a Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jan 25 14:24:10 2018 +0000 Commit: Andreas Sturmlechner gentoo 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)