Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/klayout/, sci-electronics/klayout/files/
Date: Wed, 06 May 2020 21:15:59
Message-Id: 1588799704.a2f26ccbc23b6705a68b8784dfe543ba3969b794.dilfridge@gentoo
1 commit: a2f26ccbc23b6705a68b8784dfe543ba3969b794
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Wed May 6 19:56:24 2020 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Wed May 6 21:15:04 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2f26ccb
7
8 sci-electronics/klayout: Remove old
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.22
11 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
12
13 sci-electronics/klayout/Manifest | 1 -
14 .../klayout/files/klayout-0.25.6-gcc8.patch | 18 -----
15 sci-electronics/klayout/klayout-0.25.6-r1.ebuild | 88 ----------------------
16 sci-electronics/klayout/klayout-0.25.6.ebuild | 88 ----------------------
17 4 files changed, 195 deletions(-)
18
19 diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
20 index 6505c62db0f..03d3c2d61eb 100644
21 --- a/sci-electronics/klayout/Manifest
22 +++ b/sci-electronics/klayout/Manifest
23 @@ -1,2 +1 @@
24 -DIST klayout-0.25.6.tar.gz 21008915 BLAKE2B f5e06790b8eac682b61bf83dce167c4c9eb8767d6bfb040e203ed2ec43b39781e64203c8319bf58ed2f4b7b2349d958f24a7ad1957bc27befa583b00eeee650c SHA512 38d13bd6f0cef5685ef32ebf00edf07f588d445174e2a56320940a7036e65a3fbb11d1efab92af9f8abfce7e77c782df5f05460a7de4d98ade924c761396db5a
25 DIST klayout-0.26.4.tar.gz 52324714 BLAKE2B 663ab737d91a83452234f128b13f73ed8e559e6f0fb11f283bce6bfe80e8f391c7bac5ad16933b2f5bcf46fac6e07233ffc690dea5ddb1702850c52501157c36 SHA512 df91434e87d8cc6f4df837eacd756566626405fb75b0cce40c25f157d547dc1e5929746b6b276a317512c038e014bbdd1655615c93d76d9ed5bcf65280d95355
26
27 diff --git a/sci-electronics/klayout/files/klayout-0.25.6-gcc8.patch b/sci-electronics/klayout/files/klayout-0.25.6-gcc8.patch
28 deleted file mode 100644
29 index 250290f3490..00000000000
30 --- a/sci-electronics/klayout/files/klayout-0.25.6-gcc8.patch
31 +++ /dev/null
32 @@ -1,18 +0,0 @@
33 -Source: https://github.com/klayoutmatthias/klayout/issues/127
34 -
35 -diff -ruN klayout-0.25.6.orig/src/db/db/dbCellMapping.cc klayout-0.25.6/src/db/db/dbCellMapping.cc
36 ---- klayout-0.25.6.orig/src/db/db/dbCellMapping.cc 2018-11-26 18:53:43.000000000 +0100
37 -+++ klayout-0.25.6/src/db/db/dbCellMapping.cc 2018-12-12 20:05:11.210171097 +0100
38 -@@ -75,6 +75,12 @@
39 - return *this;
40 - }
41 -
42 -+ SortedCellIndexIterator &operator--()
43 -+ {
44 -+ --m_n;
45 -+ return *this;
46 -+ }
47 -+
48 - SortedCellIndexIterator &operator+=(size_t n)
49 - {
50 - m_n += n;
51
52 diff --git a/sci-electronics/klayout/klayout-0.25.6-r1.ebuild b/sci-electronics/klayout/klayout-0.25.6-r1.ebuild
53 deleted file mode 100644
54 index 8435a07aa8c..00000000000
55 --- a/sci-electronics/klayout/klayout-0.25.6-r1.ebuild
56 +++ /dev/null
57 @@ -1,88 +0,0 @@
58 -# Copyright 1999-2020 Gentoo Authors
59 -# Distributed under the terms of the GNU General Public License v2
60 -
61 -EAPI=6
62 -
63 -RUBY_OPTIONAL=no
64 -USE_RUBY="ruby25"
65 -# note: define maximally ONE implementation here
66 -
67 -PYTHON_COMPAT=( python3_6 )
68 -
69 -inherit toolchain-funcs python-single-r1 ruby-ng
70 -
71 -if [[ ${PV} = 9999* ]]; then
72 - EGIT_REPO_URI="https://github.com/klayoutmatthias/${PN}.git"
73 - inherit git-r3
74 - EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P}
75 -else
76 - SRC_URI="https://www.klayout.org/downloads/source/${P}.tar.gz"
77 - KEYWORDS="~amd64 ~x86"
78 -fi
79 -
80 -DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts"
81 -HOMEPAGE="https://www.klayout.de/"
82 -LICENSE="GPL-2"
83 -SLOT="0"
84 -IUSE=""
85 -REQUIRED_USE=${PYTHON_REQUIRED_USE}
86 -
87 -RDEPEND="
88 - dev-qt/designer:5
89 - dev-qt/qtcore:5
90 - dev-qt/qtgui:5
91 - dev-qt/qtmultimedia:5[widgets]
92 - dev-qt/qtnetwork:5[ssl]
93 - dev-qt/qtprintsupport:5
94 - dev-qt/qtsql:5
95 - dev-qt/qtsvg:5
96 - dev-qt/qtwidgets:5
97 - dev-qt/qtxml:5
98 - dev-qt/qtxmlpatterns:5
99 - sys-libs/zlib
100 - ${PYTHON_DEPS}
101 - $(ruby_implementations_depend)
102 -"
103 -DEPEND="${RDEPEND}"
104 -
105 -PATCHES=(
106 - "${FILESDIR}/${P}-gcc8.patch"
107 -)
108 -
109 -pkg_setup() {
110 - python-single-r1_pkg_setup
111 - ruby-ng_pkg_setup
112 -}
113 -
114 -each_ruby_configure() {
115 - tc-export CC CXX AR LD RANLIB
116 - export CFLAGS CXXFLAGS
117 - ./build.sh \
118 - -expert \
119 - -dry-run \
120 - -qmake "/usr/$(get_libdir)/qt5/bin/qmake" \
121 - -ruby "${RUBY}" \
122 - -python "${PYTHON}" \
123 - -build . \
124 - -bin "${T}/bin" \
125 - -rpath "/usr/$(get_libdir)/klayout" \
126 - -option "${MAKEOPTS}" \
127 - -with-qtbinding \
128 - -without-64bit-coord \
129 - -qt5 || die "Configuration failed"
130 -}
131 -
132 -each_ruby_compile() {
133 - emake all
134 -}
135 -
136 -each_ruby_install() {
137 - emake install
138 -
139 - cd "${T}/bin" || die
140 -
141 - dodir "/usr/$(get_libdir)/klayout"
142 - mv lib* "${ED}/usr/$(get_libdir)/klayout/" || die
143 -
144 - dobin *
145 -}
146
147 diff --git a/sci-electronics/klayout/klayout-0.25.6.ebuild b/sci-electronics/klayout/klayout-0.25.6.ebuild
148 deleted file mode 100644
149 index be589a0f90e..00000000000
150 --- a/sci-electronics/klayout/klayout-0.25.6.ebuild
151 +++ /dev/null
152 @@ -1,88 +0,0 @@
153 -# Copyright 1999-2020 Gentoo Authors
154 -# Distributed under the terms of the GNU General Public License v2
155 -
156 -EAPI=6
157 -
158 -RUBY_OPTIONAL=no
159 -USE_RUBY="ruby24"
160 -# note: define maximally ONE implementation here
161 -
162 -PYTHON_COMPAT=( python3_6 )
163 -
164 -inherit toolchain-funcs python-single-r1 ruby-ng
165 -
166 -if [[ ${PV} = 9999* ]]; then
167 - EGIT_REPO_URI="https://github.com/klayoutmatthias/${PN}.git"
168 - inherit git-r3
169 - EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P}
170 -else
171 - SRC_URI="https://www.klayout.org/downloads/source/${P}.tar.gz"
172 - KEYWORDS="amd64 ~x86"
173 -fi
174 -
175 -DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts"
176 -HOMEPAGE="https://www.klayout.de/"
177 -LICENSE="GPL-2"
178 -SLOT="0"
179 -IUSE=""
180 -REQUIRED_USE=${PYTHON_REQUIRED_USE}
181 -
182 -RDEPEND="
183 - dev-qt/designer:5
184 - dev-qt/qtcore:5
185 - dev-qt/qtgui:5
186 - dev-qt/qtmultimedia:5[widgets]
187 - dev-qt/qtnetwork:5[ssl]
188 - dev-qt/qtprintsupport:5
189 - dev-qt/qtsql:5
190 - dev-qt/qtsvg:5
191 - dev-qt/qtwidgets:5
192 - dev-qt/qtxml:5
193 - dev-qt/qtxmlpatterns:5
194 - sys-libs/zlib
195 - ${PYTHON_DEPS}
196 - $(ruby_implementations_depend)
197 -"
198 -DEPEND="${RDEPEND}"
199 -
200 -PATCHES=(
201 - "${FILESDIR}/${P}-gcc8.patch"
202 -)
203 -
204 -pkg_setup() {
205 - python-single-r1_pkg_setup
206 - ruby-ng_pkg_setup
207 -}
208 -
209 -each_ruby_configure() {
210 - tc-export CC CXX AR LD RANLIB
211 - export CFLAGS CXXFLAGS
212 - ./build.sh \
213 - -expert \
214 - -dry-run \
215 - -qmake "/usr/$(get_libdir)/qt5/bin/qmake" \
216 - -ruby "${RUBY}" \
217 - -python "${PYTHON}" \
218 - -build . \
219 - -bin "${T}/bin" \
220 - -rpath "/usr/$(get_libdir)/klayout" \
221 - -option "${MAKEOPTS}" \
222 - -with-qtbinding \
223 - -without-64bit-coord \
224 - -qt5 || die "Configuration failed"
225 -}
226 -
227 -each_ruby_compile() {
228 - emake all
229 -}
230 -
231 -each_ruby_install() {
232 - emake install
233 -
234 - cd "${T}/bin" || die
235 -
236 - dodir "/usr/$(get_libdir)/klayout"
237 - mv lib* "${ED}/usr/$(get_libdir)/klayout/" || die
238 -
239 - dobin *
240 -}