gentoo resync : 30.12.2017

3 files changed, 85 insertions, 3 deletions

diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
index cfdf83a5c2c9..c9c971378cc8 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -1,9 +1,10 @@
 AUX klayout-0.23.10-Makefile.conf.linux-gentoo 1014 BLAKE2B 821c690599cfd94310579cbea50dca466dc07e2e91e390284dd5390cb10a0c3fb61c7b01d30db7bc32dcbfaa522bed99287d803b8c2b86ab26b18b21a39d6ee2 SHA512 4317565d0da30a8e0a0fe4573cfce68bb2ffb45cc92b63ce98361ec73d4e350a807700f0d3ed0f600a609e975e7b0c840dd32c2e7194e8cf44a0f0d1a5276faa
 AUX klayout-0.24.9-c++11-no-throw-in-destuctor.patch 1180 BLAKE2B 5a417027e1f480fd686525670e82c7b23bbc6dae4427cc3e90940ead8ecbb627aea9d9dc265c7ddc3cb1f6f3364e3a2338a68363da095465509f2cf08d26cf34 SHA512 cc18dc64109f770e930c9ed65b8429cef21796f8ba4389be4facda8aba284709cc41281b7bf3de7f8422d3480454ef08f08ae20a1b07697bdf4f201f12ef723e
 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.24.10.tar.gz 11262007 BLAKE2B 85e8d325a56672e6ba328f5ebf793f3c977542ed857621e504983a77e7762d795bbde0f572fb0017328bdb5c11e453f0cd9decedf3629f8ff0f2a6a25daf28c2 SHA512 0043b91e2dae9321299c217697c93af27bc7d795209bdf95248eee3690b97728854f9f82cc95f77f05a2cfbcae6a716ae594fe2485e04ed0a3f5d950abc0a31b
 DIST klayout-0.25.tar.gz 16461165 BLAKE2B 321d5c03b49b922b051407767f72135d0ff7e3fb0fe5dd237e27ce6c42d2b847f0bc4d96ae551c51b6581c0d39eb71f7053c8814dcb7afdfd027a24af9d553fd SHA512 0c05b0786e7e1dbf8035cbb3888eff776c0b96a4fcf2ebbc3065fe43340ae020b6713c2e1d2e7ab5caaf64d7ec84bea9d691ba6c0aea88e93c957530d3d4d114
 EBUILD klayout-0.24.10.ebuild 1548 BLAKE2B cdee87248344f2405b9d3679765857758b0ceabde12a143f6aaf39049575b90615e23915188f2ccad463633eb7527351378c5a485488202ba5d08070f6e6e358 SHA512 f22b8010cf6ff28217fa218ab24c6e44dd41e1828eb098fa8522e28e0d492528234cfd40468d1355b5c29af41962ac692c09a8b3393b99b3c0f667480914194f
-EBUILD klayout-0.25.ebuild 1559 BLAKE2B ed029c9050445ca0784cbbc23dfd94fd92a426f073df6a48c6b2d3eb28f2cfc91f0a418d9ed5654bc7f4115f121da3ac04e8750fc5d144ce457183a583a7a785 SHA512 a987581b3c8bf02dbbcfd7147ab62aa6ab2611cfd6ca0e34ad1ee6f364d5ec245dc0a8ed958f6d4eab4853aeb6fdf854e1f24038fc59cabe6832fec78f9a49e6
+EBUILD klayout-0.25.ebuild 1590 BLAKE2B 54283a7ab2b7234331a6f3afbcee3a2fe79ac8b0533aa5748da693186740b5f00519df4340166a92bce407e683f0ae82ac13ef95eb4f5af9b4dece8323bfdd3e SHA512 8ae34b3b512346a845dfd2f81268fcfc2be97ccfdc87dbfcb5be4fdc51773cbd029ce5c3c444c3c7a968c428ffffca871660168f481bbe7356b9911808a8209e
 EBUILD klayout-9999.ebuild 1515 BLAKE2B 5cb8f131cc90ba87e2f4e02a65e27682fc82b659c3e0ba2c5d4504c2ea9de49ab4f829a66c3b52ef81474d4ddd9b04087d0685f7ff13de690fcf561fc2f9b01c SHA512 1b1279dfb06f8e0c01d13c6d050023339ef6de6ed4872f8f306d2bfc7794a040440f4d905f0e88ac62afd210933d57646bc705129a977b3d768d2db3defd67c4
 MISC metadata.xml 380 BLAKE2B 3961dc3b4b0a6f3de5460e01e434f8ba1e4504247aac8cb40553d0752ece4f4be7e9d5fefee9d61e85681631eb200959b341c6aeda60b89c14119f95a40f4aa6 SHA512 92ee6b53a7dfed04d5a2aef510e0f2f0dcc70903258d5d4cb6ee497521cbb41214b7a45000693a0ecb66029767a48988c45b9b7fb78a09dc813710a9283d2f7d
diff --git a/sci-electronics/klayout/files/klayout-0.25-qt59.patch b/sci-electronics/klayout/files/klayout-0.25-qt59.patch
new file mode 100644
index 000000000000..31f25055ca19
--- /dev/null
+++ b/sci-electronics/klayout/files/klayout-0.25-qt59.patch
@@ -0,0 +1,78 @@
+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/klayout-0.25.ebuild b/sci-electronics/klayout/klayout-0.25.ebuild
index e3b40dead5b8..a819784c86aa 100644
--- a/sci-electronics/klayout/klayout-0.25.ebuild
+++ b/sci-electronics/klayout/klayout-0.25.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P}
 else
 	SRC_URI="http://www.klayout.org/downloads/source/${P}.tar.gz"
-#	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts"
@@ -37,7 +37,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-qt58.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-qt58.patch"
+	"${FILESDIR}/${P}-qt59.patch"
+)
 
 pkg_setup() {
 	python-single-r1_pkg_setup