Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/klayout/
Date: Thu, 25 Jan 2018 20:32:39
Message-Id: 1516912330.be45ebaa856badb7488add24c5f31fdc634678e2.asturm@gentoo
1 commit: be45ebaa856badb7488add24c5f31fdc634678e2
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 25 20:32:10 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 25 20:32:10 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be45ebaa
7
8 sci-electronics/klayout: Depends on dev-qt/qtnetwork:5[ssl]
9
10 Closes: https://bugs.gentoo.org/645766
11 Package-Manager: Portage-2.3.20, Repoman-2.3.6
12
13 .../klayout/{klayout-9999.ebuild => klayout-0.25-r2.ebuild} | 9 +++++++--
14 sci-electronics/klayout/klayout-9999.ebuild | 2 +-
15 2 files changed, 8 insertions(+), 3 deletions(-)
16
17 diff --git a/sci-electronics/klayout/klayout-9999.ebuild b/sci-electronics/klayout/klayout-0.25-r2.ebuild
18 similarity index 93%
19 copy from sci-electronics/klayout/klayout-9999.ebuild
20 copy to sci-electronics/klayout/klayout-0.25-r2.ebuild
21 index 5dae5206343..7a4e27c201e 100644
22 --- a/sci-electronics/klayout/klayout-9999.ebuild
23 +++ b/sci-electronics/klayout/klayout-0.25-r2.ebuild
24 @@ -4,7 +4,7 @@
25 EAPI=6
26
27 RUBY_OPTIONAL=no
28 -USE_RUBY="ruby22"
29 +USE_RUBY="ruby23"
30 # note: define maximally ONE implementation here
31
32 PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
33 @@ -31,7 +31,7 @@ RDEPEND="
34 dev-qt/qtcore:5
35 dev-qt/qtgui:5
36 dev-qt/qtmultimedia:5[widgets]
37 - dev-qt/qtnetwork:5
38 + dev-qt/qtnetwork:5[ssl]
39 dev-qt/qtprintsupport:5
40 dev-qt/qtsql:5
41 dev-qt/qtsvg:5
42 @@ -44,6 +44,11 @@ RDEPEND="
43 "
44 DEPEND="${RDEPEND}"
45
46 +PATCHES=(
47 + "${FILESDIR}/${P}-qt58.patch"
48 + "${FILESDIR}/${P}-qt59.patch"
49 +)
50 +
51 pkg_setup() {
52 python-single-r1_pkg_setup
53 ruby-ng_pkg_setup
54
55 diff --git a/sci-electronics/klayout/klayout-9999.ebuild b/sci-electronics/klayout/klayout-9999.ebuild
56 index 5dae5206343..ccd9abcc8ee 100644
57 --- a/sci-electronics/klayout/klayout-9999.ebuild
58 +++ b/sci-electronics/klayout/klayout-9999.ebuild
59 @@ -31,7 +31,7 @@ RDEPEND="
60 dev-qt/qtcore:5
61 dev-qt/qtgui:5
62 dev-qt/qtmultimedia:5[widgets]
63 - dev-qt/qtnetwork:5
64 + dev-qt/qtnetwork:5[ssl]
65 dev-qt/qtprintsupport:5
66 dev-qt/qtsql:5
67 dev-qt/qtsvg:5