| 1 |
commit: 70b98edc7ceb825ac3b52ec0efac213b5d8cae1d |
| 2 |
Author: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 12 21:27:01 2018 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 12 21:27:36 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70b98edc |
| 7 |
|
| 8 |
sci-electronics/klayout: Version bump, for ruby 2.4 and gcc 8 |
| 9 |
|
| 10 |
See https://github.com/klayoutmatthias/klayout/issues/127 for |
| 11 |
the source of the patch. |
| 12 |
|
| 13 |
Bug: https://bugs.gentoo.org/672986 |
| 14 |
Closes: https://bugs.gentoo.org/672990 |
| 15 |
Closes: https://bugs.gentoo.org/669340 |
| 16 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 17 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 18 |
|
| 19 |
sci-electronics/klayout/Manifest | 1 + |
| 20 |
.../klayout/files/klayout-0.25.6-gcc8.patch | 18 ++++++++++++++++++ |
| 21 |
.../{klayout-9999.ebuild => klayout-0.25.6.ebuild} | 8 ++++++-- |
| 22 |
sci-electronics/klayout/klayout-9999.ebuild | 4 ++-- |
| 23 |
4 files changed, 27 insertions(+), 4 deletions(-) |
| 24 |
|
| 25 |
diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest |
| 26 |
index 9a6ef10503a..34d25dd2f01 100644 |
| 27 |
--- a/sci-electronics/klayout/Manifest |
| 28 |
+++ b/sci-electronics/klayout/Manifest |
| 29 |
@@ -1 +1,2 @@ |
| 30 |
+DIST klayout-0.25.6.tar.gz 21008915 BLAKE2B f5e06790b8eac682b61bf83dce167c4c9eb8767d6bfb040e203ed2ec43b39781e64203c8319bf58ed2f4b7b2349d958f24a7ad1957bc27befa583b00eeee650c SHA512 38d13bd6f0cef5685ef32ebf00edf07f588d445174e2a56320940a7036e65a3fbb11d1efab92af9f8abfce7e77c782df5f05460a7de4d98ade924c761396db5a |
| 31 |
DIST klayout-0.25.tar.gz 16461165 BLAKE2B 321d5c03b49b922b051407767f72135d0ff7e3fb0fe5dd237e27ce6c42d2b847f0bc4d96ae551c51b6581c0d39eb71f7053c8814dcb7afdfd027a24af9d553fd SHA512 0c05b0786e7e1dbf8035cbb3888eff776c0b96a4fcf2ebbc3065fe43340ae020b6713c2e1d2e7ab5caaf64d7ec84bea9d691ba6c0aea88e93c957530d3d4d114 |
| 32 |
|
| 33 |
diff --git a/sci-electronics/klayout/files/klayout-0.25.6-gcc8.patch b/sci-electronics/klayout/files/klayout-0.25.6-gcc8.patch |
| 34 |
new file mode 100644 |
| 35 |
index 00000000000..250290f3490 |
| 36 |
--- /dev/null |
| 37 |
+++ b/sci-electronics/klayout/files/klayout-0.25.6-gcc8.patch |
| 38 |
@@ -0,0 +1,18 @@ |
| 39 |
+Source: https://github.com/klayoutmatthias/klayout/issues/127 |
| 40 |
+ |
| 41 |
+diff -ruN klayout-0.25.6.orig/src/db/db/dbCellMapping.cc klayout-0.25.6/src/db/db/dbCellMapping.cc |
| 42 |
+--- klayout-0.25.6.orig/src/db/db/dbCellMapping.cc 2018-11-26 18:53:43.000000000 +0100 |
| 43 |
++++ klayout-0.25.6/src/db/db/dbCellMapping.cc 2018-12-12 20:05:11.210171097 +0100 |
| 44 |
+@@ -75,6 +75,12 @@ |
| 45 |
+ return *this; |
| 46 |
+ } |
| 47 |
+ |
| 48 |
++ SortedCellIndexIterator &operator--() |
| 49 |
++ { |
| 50 |
++ --m_n; |
| 51 |
++ return *this; |
| 52 |
++ } |
| 53 |
++ |
| 54 |
+ SortedCellIndexIterator &operator+=(size_t n) |
| 55 |
+ { |
| 56 |
+ m_n += n; |
| 57 |
|
| 58 |
diff --git a/sci-electronics/klayout/klayout-9999.ebuild b/sci-electronics/klayout/klayout-0.25.6.ebuild |
| 59 |
similarity index 94% |
| 60 |
copy from sci-electronics/klayout/klayout-9999.ebuild |
| 61 |
copy to sci-electronics/klayout/klayout-0.25.6.ebuild |
| 62 |
index 98b5a4200ed..d5a9f0b3aaf 100644 |
| 63 |
--- a/sci-electronics/klayout/klayout-9999.ebuild |
| 64 |
+++ b/sci-electronics/klayout/klayout-0.25.6.ebuild |
| 65 |
@@ -1,10 +1,10 @@ |
| 66 |
-# Copyright 1999-2018 Gentoo Foundation |
| 67 |
+# Copyright 1999-2018 Gentoo Authors |
| 68 |
# Distributed under the terms of the GNU General Public License v2 |
| 69 |
|
| 70 |
EAPI=6 |
| 71 |
|
| 72 |
RUBY_OPTIONAL=no |
| 73 |
-USE_RUBY="ruby23" |
| 74 |
+USE_RUBY="ruby24" |
| 75 |
# note: define maximally ONE implementation here |
| 76 |
|
| 77 |
PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) |
| 78 |
@@ -44,6 +44,10 @@ RDEPEND=" |
| 79 |
" |
| 80 |
DEPEND="${RDEPEND}" |
| 81 |
|
| 82 |
+PATCHES=( |
| 83 |
+ "${FILESDIR}/${P}-gcc8.patch" |
| 84 |
+) |
| 85 |
+ |
| 86 |
pkg_setup() { |
| 87 |
python-single-r1_pkg_setup |
| 88 |
ruby-ng_pkg_setup |
| 89 |
|
| 90 |
diff --git a/sci-electronics/klayout/klayout-9999.ebuild b/sci-electronics/klayout/klayout-9999.ebuild |
| 91 |
index 98b5a4200ed..941995116f5 100644 |
| 92 |
--- a/sci-electronics/klayout/klayout-9999.ebuild |
| 93 |
+++ b/sci-electronics/klayout/klayout-9999.ebuild |
| 94 |
@@ -1,10 +1,10 @@ |
| 95 |
-# Copyright 1999-2018 Gentoo Foundation |
| 96 |
+# Copyright 1999-2018 Gentoo Authors |
| 97 |
# Distributed under the terms of the GNU General Public License v2 |
| 98 |
|
| 99 |
EAPI=6 |
| 100 |
|
| 101 |
RUBY_OPTIONAL=no |
| 102 |
-USE_RUBY="ruby23" |
| 103 |
+USE_RUBY="ruby24" |
| 104 |
# note: define maximally ONE implementation here |
| 105 |
|
| 106 |
PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) |
Archives