gentoo resync : 24.12.2018

6 files changed, 27 insertions, 127 deletions

diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
index aa8e61be8002..872eba9331f8 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -1,6 +1,5 @@
-AUX klayout-0.25-qt58.patch 1343 BLAKE2B 6bc9deab4f4afa48944628bcbc80f6d5e62ea3f17695fff788650b42771fde8ddddc63a4fe67359795060f63eb6e771c979b081b99e4ea35fe0653234f711162 SHA512 67027d740badea3b603b1813c005074e1fba3253dea28876d9f15b57fe5c8683c7cb2df507d9e93059d52e8da6160edb76fcf702d1b48e43dab0202c94369596
-AUX klayout-0.25-qt59.patch 4596 BLAKE2B a9b4f0b0da71aaea7af9c09c73ae854a784ff4b269f5b999ecc39168b308645bbc67c4b214e430cee1dd8d8999469c39007f036df25eb79bb1e4ab30c4855098 SHA512 b0969a5eafe650b0190d6a9807acf8c2bbe2669dcf080f898dbd8c6851d3cae5a9a9c1a7175ac14542de7c91a0fa08960390daa196cdf282f36c122cd2289c5f
-DIST klayout-0.25.tar.gz 16461165 BLAKE2B 321d5c03b49b922b051407767f72135d0ff7e3fb0fe5dd237e27ce6c42d2b847f0bc4d96ae551c51b6581c0d39eb71f7053c8814dcb7afdfd027a24af9d553fd SHA512 0c05b0786e7e1dbf8035cbb3888eff776c0b96a4fcf2ebbc3065fe43340ae020b6713c2e1d2e7ab5caaf64d7ec84bea9d691ba6c0aea88e93c957530d3d4d114
-EBUILD klayout-0.25-r2.ebuild 1729 BLAKE2B 14b91f4a183857cb61a19b52ed4d708756a955143d09b6b0ef4aad9b8c8182c05f2c39f8c2ac4c62e8287941539b5ec14b647a795117a79a561d89683f0928e1 SHA512 9135076b66721c80187615e116c5b54bffc8136acc2cd5ef4f4cf7d0547b9e75a82ee35a36d2e6380a4e3f364b49c7125e767715317532a9faa467e32b823473
-EBUILD klayout-9999.ebuild 1655 BLAKE2B 10e47513b600a72d3ac18951142fbc8389de6ee16dc7bfb9ce5d139415210961319dd5197cd1282710bf5af74e0703ad558b59c1933e2a8d96bf24feb5585ce9 SHA512 9e37873ffbf577effb49c94b4b9ebf16a10e0a99919d9ab2e37aba3d13de7b8f63a09cd8bc0cd9f197bf35e04bb99cfa3f84439524642e1f392be7b78d1bfeb7
+AUX klayout-0.25.6-gcc8.patch 527 BLAKE2B bd9d1ebac1a4f4679f076a3bedb67b3a4fe040338e0d63a7e25e5fb523707b7525ab7a9088122c75aa0a16e34e6e262efe097f5f96ff6db72b1d5add8f7192c5 SHA512 3280052ef3d9caf78d716c8cfb6e33205bbd2c9543f52bfe28e5c23749b3bbf8ed59edf7bbc8b8a96753f0e90484dcaacaad39c4ccbc2bebe979520589589f46
+DIST klayout-0.25.6.tar.gz 21008915 BLAKE2B f5e06790b8eac682b61bf83dce167c4c9eb8767d6bfb040e203ed2ec43b39781e64203c8319bf58ed2f4b7b2349d958f24a7ad1957bc27befa583b00eeee650c SHA512 38d13bd6f0cef5685ef32ebf00edf07f588d445174e2a56320940a7036e65a3fbb11d1efab92af9f8abfce7e77c782df5f05460a7de4d98ade924c761396db5a
+EBUILD klayout-0.25.6.ebuild 1695 BLAKE2B 2c317b261848775631f3384604ac4043d411fdd173552a9e4ef0517d0e140ccbc61bf5ffa92d5379c28c7767a5ce73cdd0d997216eb471139e0cb6412cb3170f SHA512 3f90517bb498965169654747a8d67d43d14079b1f43f3e8aef06cbb348ce5b3bff5a9149cd97a4f4a1b7e638a147d3720d19b70406c4cf6bd0d0e6b05cc432a1
+EBUILD klayout-9999.ebuild 1652 BLAKE2B 592c90c1a9ad0831e420c50c068dfb62194b38a3dbd4d13652739e00c1792d1c816fd3e55d533eedaa2be1648b3222bc137742819ea814fd416ac85d0dd9bf30 SHA512 8da9084e633ceb0b028fc35821afb823b50e56806fad31a55c4b09fbb89de0ac40934f888a24c61d403f4ced8e0a5477ef2c29a500012ef2deadb33bbe90f59b
 MISC metadata.xml 380 BLAKE2B 3961dc3b4b0a6f3de5460e01e434f8ba1e4504247aac8cb40553d0752ece4f4be7e9d5fefee9d61e85681631eb200959b341c6aeda60b89c14119f95a40f4aa6 SHA512 92ee6b53a7dfed04d5a2aef510e0f2f0dcc70903258d5d4cb6ee497521cbb41214b7a45000693a0ecb66029767a48988c45b9b7fb78a09dc813710a9283d2f7d
diff --git a/sci-electronics/klayout/files/klayout-0.25-qt58.patch b/sci-electronics/klayout/files/klayout-0.25-qt58.patch
deleted file mode 100644
index 544bf2992c6a..000000000000
--- a/sci-electronics/klayout/files/klayout-0.25-qt58.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 11cb5eb99836e043d71b556af010b29624c3f569 Mon Sep 17 00:00:00 2001
-From: Matthias Koefferlein <matthias@koefferlein.de>
-Date: Sun, 26 Nov 2017 22:51:36 +0100
-Subject: [PATCH] Qt 5.8.0 compatibility
-
----
- scripts/mkqtdecl5/mkqtdecl.conf  | 2 ++
- src/gsiqt5/gsiDeclQtTypeTraits.h | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/scripts/mkqtdecl5/mkqtdecl.conf b/scripts/mkqtdecl5/mkqtdecl.conf
-index a704ebc..ee58b82 100644
---- a/scripts/mkqtdecl5/mkqtdecl.conf
-+++ b/scripts/mkqtdecl5/mkqtdecl.conf
-@@ -1484,6 +1484,8 @@ final_class "QAccessibleObject"  # because navigate cannot be implemented
- # final_class "QAccessiblePlugin"  # because navigate cannot be implemented
- final_class "QAccessibleWidget"  # because navigate cannot be implemented
- 
-+no_copy_ctor "QIconEngine"
-+
- # --------------------------------------------------------------
- # QtXml
- 
-diff --git a/src/gsiqt5/gsiDeclQtTypeTraits.h b/src/gsiqt5/gsiDeclQtTypeTraits.h
-index eba0986..dd68128 100644
---- a/src/gsiqt5/gsiDeclQtTypeTraits.h
-+++ b/src/gsiqt5/gsiDeclQtTypeTraits.h
-@@ -3418,6 +3418,7 @@ template <> struct type_traits<QIconEngine> : public type_traits<void> {
- class QIconEngine_Adaptor;
- namespace tl {
- template <> struct type_traits<QIconEngine_Adaptor> : public type_traits<void> {
-+  typedef tl::false_tag has_copy_constructor;
- };
- }
- 
--- 
-2.15.1
-
diff --git a/sci-electronics/klayout/files/klayout-0.25-qt59.patch b/sci-electronics/klayout/files/klayout-0.25-qt59.patch
deleted file mode 100644
index 31f25055ca19..000000000000
--- a/sci-electronics/klayout/files/klayout-0.25-qt59.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From cde03b075031efaa6e3f6d69356f077daa6da0dd Mon Sep 17 00:00:00 2001
-From: Matthias Koefferlein <matthias@koefferlein.de>
-Date: Sun, 17 Dec 2017 15:30:37 +0100
-Subject: [PATCH] Replace WindowOkButtonHint, WindowCancelButtonHint
-
-This commit removes symbols which are not available on MacOS
-by a code-generation solution.
-
-These symbols are only required for WindowsCE so their
-unavailability on other systems is not a big loss.
-
-(cherry picked from commit 28ff493de71cbafa38e214b75dd6874b0226813f)
----
- scripts/mkqtdecl4/mkqtdecl.conf | 2 ++
- scripts/mkqtdecl5/mkqtdecl.conf | 2 ++
- src/gsiqt4/gsiDeclQt_3.cc       | 4 +---
- src/gsiqt5/gsiDeclQt_4.cc       | 4 +---
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/scripts/mkqtdecl4/mkqtdecl.conf b/scripts/mkqtdecl4/mkqtdecl.conf
-index 9e87acc..edf48ae 100644
---- a/scripts/mkqtdecl4/mkqtdecl.conf
-+++ b/scripts/mkqtdecl4/mkqtdecl.conf
-@@ -10,6 +10,8 @@
- # drops enum members
- drop_enum_const "Qt", /WindowType::WindowSoftkeysVisibleHint/
- drop_enum_const "Qt", /WindowType::WindowSoftkeysRespondHint/
-+drop_enum_const "Qt", /WindowType::WindowOkButtonHint/ # only available on CE
-+drop_enum_const "Qt", /WindowType::WindowCancelButtonHint/ # only available on CE
- 
- # --------------------------------------------------------------
- # QtCore
-diff --git a/scripts/mkqtdecl5/mkqtdecl.conf b/scripts/mkqtdecl5/mkqtdecl.conf
-index 311f08a..d2fd2e5 100644
---- a/scripts/mkqtdecl5/mkqtdecl.conf
-+++ b/scripts/mkqtdecl5/mkqtdecl.conf
-@@ -10,6 +10,8 @@
- # drops enum members
- drop_enum_const "Qt", /WindowType::WindowSoftkeysVisibleHint/
- drop_enum_const "Qt", /WindowType::WindowSoftkeysRespondHint/
-+drop_enum_const "Qt", /WindowType::WindowOkButtonHint/ # only available on CE
-+drop_enum_const "Qt", /WindowType::WindowCancelButtonHint/ # only available on CE
- 
- # --------------------------------------------------------------
- # QtCore
-diff --git a/src/gsiqt4/gsiDeclQt_3.cc b/src/gsiqt4/gsiDeclQt_3.cc
-index 0055145..4f74bb9 100644
---- a/src/gsiqt4/gsiDeclQt_3.cc
-+++ b/src/gsiqt4/gsiDeclQt_3.cc
-@@ -453,9 +453,7 @@ static gsi::Enum<Qt::WindowType> decl_Qt_WindowType_Enum ("Qt_WindowType",
-     gsi::enum_const ("WindowStaysOnBottomHint", Qt::WindowStaysOnBottomHint, "@brief Enum constant Qt::WindowStaysOnBottomHint") +
-     gsi::enum_const ("WindowCloseButtonHint", Qt::WindowCloseButtonHint, "@brief Enum constant Qt::WindowCloseButtonHint") +
-     gsi::enum_const ("MacWindowToolBarButtonHint", Qt::MacWindowToolBarButtonHint, "@brief Enum constant Qt::MacWindowToolBarButtonHint") +
--    gsi::enum_const ("BypassGraphicsProxyWidget", Qt::BypassGraphicsProxyWidget, "@brief Enum constant Qt::BypassGraphicsProxyWidget") +
--    gsi::enum_const ("WindowOkButtonHint", Qt::WindowOkButtonHint, "@brief Enum constant Qt::WindowOkButtonHint") +
--    gsi::enum_const ("WindowCancelButtonHint", Qt::WindowCancelButtonHint, "@brief Enum constant Qt::WindowCancelButtonHint"),
-+    gsi::enum_const ("BypassGraphicsProxyWidget", Qt::BypassGraphicsProxyWidget, "@brief Enum constant Qt::BypassGraphicsProxyWidget"),
-   "@qt\n@brief This class represents the Qt::WindowType enum");
- 
- static gsi::QFlagsClass<Qt::WindowType > decl_Qt_WindowType_Enums ("Qt_QFlags_WindowType",
-diff --git a/src/gsiqt5/gsiDeclQt_4.cc b/src/gsiqt5/gsiDeclQt_4.cc
-index b768649..6c7fb4b 100644
---- a/src/gsiqt5/gsiDeclQt_4.cc
-+++ b/src/gsiqt5/gsiDeclQt_4.cc
-@@ -153,9 +153,7 @@ static gsi::Enum<Qt::WindowType> decl_Qt_WindowType_Enum ("Qt_WindowType",
-     gsi::enum_const ("MacWindowToolBarButtonHint", Qt::MacWindowToolBarButtonHint, "@brief Enum constant Qt::MacWindowToolBarButtonHint") +
-     gsi::enum_const ("BypassGraphicsProxyWidget", Qt::BypassGraphicsProxyWidget, "@brief Enum constant Qt::BypassGraphicsProxyWidget") +
-     gsi::enum_const ("NoDropShadowWindowHint", Qt::NoDropShadowWindowHint, "@brief Enum constant Qt::NoDropShadowWindowHint") +
--    gsi::enum_const ("WindowFullscreenButtonHint", Qt::WindowFullscreenButtonHint, "@brief Enum constant Qt::WindowFullscreenButtonHint") +
--    gsi::enum_const ("WindowOkButtonHint", Qt::WindowOkButtonHint, "@brief Enum constant Qt::WindowOkButtonHint") +
--    gsi::enum_const ("WindowCancelButtonHint", Qt::WindowCancelButtonHint, "@brief Enum constant Qt::WindowCancelButtonHint"),
-+    gsi::enum_const ("WindowFullscreenButtonHint", Qt::WindowFullscreenButtonHint, "@brief Enum constant Qt::WindowFullscreenButtonHint"),
-   "@qt\n@brief This class represents the Qt::WindowType enum");
- 
- static gsi::QFlagsClass<Qt::WindowType > decl_Qt_WindowType_Enums ("Qt_QFlags_WindowType",
--- 
-2.15.1
-
diff --git a/sci-electronics/klayout/files/klayout-0.25.6-gcc8.patch b/sci-electronics/klayout/files/klayout-0.25.6-gcc8.patch
new file mode 100644
index 000000000000..250290f34901
--- /dev/null
+++ b/sci-electronics/klayout/files/klayout-0.25.6-gcc8.patch
@@ -0,0 +1,18 @@
+Source: https://github.com/klayoutmatthias/klayout/issues/127
+
+diff -ruN klayout-0.25.6.orig/src/db/db/dbCellMapping.cc klayout-0.25.6/src/db/db/dbCellMapping.cc
+--- klayout-0.25.6.orig/src/db/db/dbCellMapping.cc	2018-11-26 18:53:43.000000000 +0100
++++ klayout-0.25.6/src/db/db/dbCellMapping.cc	2018-12-12 20:05:11.210171097 +0100
+@@ -75,6 +75,12 @@
+ 	return *this;
+   }
+ 
++  SortedCellIndexIterator &operator--()
++  {
++    --m_n;
++    return *this;
++  }
++
+   SortedCellIndexIterator &operator+=(size_t n) 
+   {
+     m_n += n;
diff --git a/sci-electronics/klayout/klayout-0.25-r2.ebuild b/sci-electronics/klayout/klayout-0.25.6.ebuild
index 416e30fc6c73..f8331693555c 100644
--- a/sci-electronics/klayout/klayout-0.25-r2.ebuild
+++ b/sci-electronics/klayout/klayout-0.25.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 RUBY_OPTIONAL=no
-USE_RUBY="ruby23"
+USE_RUBY="ruby24"
 # note: define maximally ONE implementation here
 
 PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
@@ -45,8 +45,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-qt58.patch"
-	"${FILESDIR}/${P}-qt59.patch"
+	"${FILESDIR}/${P}-gcc8.patch"
 )
 
 pkg_setup() {
diff --git a/sci-electronics/klayout/klayout-9999.ebuild b/sci-electronics/klayout/klayout-9999.ebuild
index 98b5a4200edd..941995116f57 100644
--- a/sci-electronics/klayout/klayout-9999.ebuild
+++ b/sci-electronics/klayout/klayout-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 RUBY_OPTIONAL=no
-USE_RUBY="ruby23"
+USE_RUBY="ruby24"
 # note: define maximally ONE implementation here
 
 PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )