gentoo resync : 30.12.2017

17 files changed, 362 insertions, 14 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 045a4bc79c34..58bb1b96c717 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index 166df33051b2..beeb8e4b3c19 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,6 +1,7 @@
 AUX qwt.patch 2136 BLAKE2B 3ab69581d1dac006ebd493c82bebee7df34fc00accf7957411a143ce1ba6fffebdffe3468ada7c1e51375cb55adca5d1b28c7a6d1708355d60508f85422e2494 SHA512 4a9edac8565bc7a77644d9b6adeec61187c34dcf72f309066eb6575de7baef5cb59668c70bf5b51fb22a8e5bad00da4d664d279b1d22aae5dbb8fe07f69ae91b
+AUX tinyxml6.patch 870 BLAKE2B 2edfb3b8f3a2ec715f429bb982c8f33179d713206bd427d10e4f9277fcc48712c8be2683f9d1ed54447dfde3d055a4fdd87e779bb58918ea78e19dedd3ce6109 SHA512 819b67127e97abe0dfd2b145f8d4e1aab1a11d7a8d734f085d82b3c4b814a37498e2f6b913e6c4a3a558c0420fc6f5de3dae508e76c6465352a3e6e45292eec6
 DIST gazebo-8.1.1.tar.bz2 52448136 BLAKE2B 39972762d2e5bbf81a02481d8b2f07bd6b3c6926670cf578cd26fce92060dbfa359a5d5362d6391ab051bd3f054da5a6af137a61179aeb7815a95ef4cf7329ce SHA512 bf5585e63cfb5a86b89a0e802c33ff07c5753e94b9282610d2ea1a4248af705a1c80ea52389b4a7c49f51ec1990e2c9a5e3a6a74fefebe1b20e70960ceb755e8
 DIST gazebo-8.2.0.tar.bz2 52513092 BLAKE2B d44c4ac837163331f50e266bb4880f42fff82037ccc9a7e1ac7ccea0a37415a2fc217c62b449358510308fc741e0c569e2613c70c328e323f6f018c5bc6f0b31 SHA512 d2561a6e5460ea068d9c84945e5955d986bc1f6f0d1ba16100aae53015c6e11da3a152ac6ecb906147d37261d4c680025bcc5f5587c6c09f127319dc184cf843
 EBUILD gazebo-8.1.1.ebuild 1835 BLAKE2B 6b0d5c4b30f86a8e381409140f6bfa1b500c8fb26685e10c309f18230e7aa8fd00d52d471cb33eb15a4af664b8d68174001a9b8330b749a514923b45d2408485 SHA512 f4656e7ed7fd4d0fbadb0a3cb0837149252d2c18b11cc3450dd950d5fb5eec4abd500682912bc70a16d31af727ba31f5d8c263cd37f3727b42e1a351c0c3b149
-EBUILD gazebo-8.2.0.ebuild 1837 BLAKE2B acfcaed2540ef8cbf0925d524cb568ad2a20645708554233c26e3f261d0d99f51ccd82ebbbd1c19ae2bcdbd55944d01defa39c783356fad31e6cd39e8279e655 SHA512 d03cb408fd244d8ee1b06e2c87ab69df20432a58f4761eea95f6d4aea8df6e04473394db1905730efa4dd969b12af98fa58c88acfa4361918cb6c16dffc382eb
+EBUILD gazebo-8.2.0.ebuild 1870 BLAKE2B 5c1f2c703c85389ff2fdf94433112c1c659a09a50b61d1605512f1e3bc7fbfc6f4cc997f72c920a678469412257159475a28d35fc58e3c3be172d24ea4773b18 SHA512 b5fd31c98243d41aae94f75ed7ed037a25330a56481d316417330dfd7ec8501abe9258c80afbce28b449499b2e5e197e131d2c8189ad9202f2f2326143d6ac2d
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/sci-electronics/gazebo/files/tinyxml6.patch b/sci-electronics/gazebo/files/tinyxml6.patch
new file mode 100644
index 000000000000..16a3862fc78f
--- /dev/null
+++ b/sci-electronics/gazebo/files/tinyxml6.patch
@@ -0,0 +1,20 @@
+Index: gazebo-8.2.0/gazebo/util/LogPlay.cc
+===================================================================
+--- gazebo-8.2.0.orig/gazebo/util/LogPlay.cc
++++ gazebo-8.2.0/gazebo/util/LogPlay.cc
+@@ -125,12 +125,9 @@ void LogPlay::Open(const std::string &_l
+   {
+     gzerr << "Unable to load file[" << _logFile << "]. "
+       << "Check the Gazebo server log file for more information.\n";
+-    const char *errorStr1 = this->dataPtr->xmlDoc.GetErrorStr1();
+-    const char *errorStr2 = this->dataPtr->xmlDoc.GetErrorStr2();
+-    if (errorStr1)
+-      gzlog << "Log Error 1:\n" << errorStr1 << std::endl;
+-    if (errorStr2)
+-      gzlog << "Log Error 2:\n" << errorStr2 << std::endl;
++    const char *errorStr = this->dataPtr->xmlDoc.ErrorStr();
++    if (errorStr)
++      gzlog << "Log Error:\n" << errorStr << std::endl;
+     gzthrow("Error parsing log file");
+   }
+ 
diff --git a/sci-electronics/gazebo/gazebo-8.2.0.ebuild b/sci-electronics/gazebo/gazebo-8.2.0.ebuild
index 923dd8c7c2f2..04696aa2fb5f 100644
--- a/sci-electronics/gazebo/gazebo-8.2.0.ebuild
+++ b/sci-electronics/gazebo/gazebo-8.2.0.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	media-libs/openal
 	net-misc/curl
 	dev-libs/tinyxml
-	dev-libs/tinyxml2:=
+	>=dev-libs/tinyxml2-6:=
 	dev-libs/libtar
 	dev-cpp/tbb
 	>=dev-games/ogre-1.7.4[freeimage]
@@ -57,7 +57,7 @@ DEPEND="${RDEPEND}
 	test? ( dev-libs/libxslt )
 "
 CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=( "${FILESDIR}/qwt.patch" )
+PATCHES=( "${FILESDIR}/qwt.patch" "${FILESDIR}/tinyxml6.patch" )
 
 src_configure() {
 	# doesnt build without it
diff --git a/sci-electronics/gerbv/Manifest b/sci-electronics/gerbv/Manifest
index 719760b0f186..334cbb11f5c5 100644
--- a/sci-electronics/gerbv/Manifest
+++ b/sci-electronics/gerbv/Manifest
@@ -2,5 +2,5 @@ AUX gerbv-2.6.1-ru.patch 341 BLAKE2B 87714542a7262bd61d3895a270df6cf54985a7708e4
 DIST gerbv-2.6.0.tar.gz 2346299 BLAKE2B 2b7a4293289e460f5b06f802d9ad779021a519d6ec702ea4b27df1e6a06d6779ae41fbd9aae6f0c83f9ea61fc9369dbc6aaa8d29326a9d5d139ab89a40f050f0 SHA512 a2d7601b44c8ed16a89d18713f451c0298bee65e2ea76b87e3d9d573af63d3b57758cb7cfcfb2177a22aecc7d9fdaaca3d369ea051446651af4dc542065a4377
 DIST gerbv-2.6.1.tar.gz 4432481 BLAKE2B 022214846077a4fea56848fbc63096857a8a782b3469c2293567e4927b904cf59a36d5d2b2adc0be7bc395a17c615af58a231f68a8f1dbedcb77cafc55ceb849 SHA512 cbf4ce4fd2b401d65ffc6bb5a7f9da0e6fa31cb3f754ea12092c86f197c72c833805eb395562b286f6d03c2eb38e363b649f8aa1040a6207baf975fa15e48b29
 EBUILD gerbv-2.6.0.ebuild 1066 BLAKE2B 2511dac6ffaa1802a9d5e2b68c3e62c0f5d51e06340f575dca4f78c6cddeef0f631306bd97325343f96e9292764f0dcca149ce07dc1efaf0b462bb3e8ecfe3ca SHA512 76a62c8201c33c26bcba495d7ab38f317e1f2f29d696b466a188d22a21a3973c758738540a18daa8a236ee0879bbaac086c4245d6e0dccfd14f9059e447a832f
-EBUILD gerbv-2.6.1.ebuild 1229 BLAKE2B 102d0f724a2874b91318851d411ea358dd34e07f401c92e87392b0a221cae927e1cf99bc2de313fce103935f5a4ec33966081bb5160229e1dcca6ed15d989817 SHA512 ba40e1e2b5df7e6d866c8a46e30acafc669bb8f3e4d3019aa17c2dfc188635b1aa474233c2690bf2574ceec36514a19cb52dfb22f6c08e355b81ff90350990f9
+EBUILD gerbv-2.6.1.ebuild 1285 BLAKE2B 0db7241c736242863204876b0117d5f4ac7e02412b60cf960d3c4224f454c4d4b7b9e42c28dc3a3e4c2a1f4391ba8b32decd30a90c9ac231018f0944148a5169 SHA512 decefc9c39ed6f078f334bbeb9c66dfd947a7c7e1aa0da4301ffed24371be56c31c907174b61ed22e1c6109a36ca15360773cdb4caec8cd8a23c7dd3ac95eb56
 MISC metadata.xml 802 BLAKE2B c6db09de31370176bf6d1717c38b955f03037e24e322e20cfaac08747e403d146fc036358e4faeb81135b3e2dc3945da6a7d029a1256d0e26d3cd69c2afa0afc SHA512 cd322dbcdba34e76f450b4368e2a3eb63885726c09f8b8baad3137cc8e5e8e8537776fd776b86112b2fb71ae5720490dda586ca805e0ba8662744703eed25982
diff --git a/sci-electronics/gerbv/gerbv-2.6.1.ebuild b/sci-electronics/gerbv/gerbv-2.6.1.ebuild
index 533305d55d40..87f4879d8345 100644
--- a/sci-electronics/gerbv/gerbv-2.6.1.ebuild
+++ b/sci-electronics/gerbv/gerbv-2.6.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-inherit autotools eutils fdo-mime
+inherit autotools eutils gnome2-utils xdg-utils
 
 DESCRIPTION="A RS-274X (Gerber) and NC drill (Excellon) file viewer"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -57,9 +57,11 @@ src_install () {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
 }
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
diff --git a/sci-electronics/ngspice/Manifest b/sci-electronics/ngspice/Manifest
index bc3fda5f8355..2b54fe7111ac 100644
--- a/sci-electronics/ngspice/Manifest
+++ b/sci-electronics/ngspice/Manifest
@@ -1,10 +1,13 @@
 AUX ngspice-26-respect-ldflags.patch 728 BLAKE2B 7646de91df0a49ab6f5dc6fe58ed5f4044d80a8e5730dddc249dd5c4fb45aff5bf6b8c9bd249edf6bf9bcd16d501334c5116fceea6d181befc846c084d0521aa SHA512 8183ec06e05d9fc22322e8ddef96b72f83681344abf1d9d150fc2058bf906b0eebb83e97c7f39cd74afe316a49ad7a779a3f61f6cd3a79ca967ce037c84bcb98
 AUX ngspice-27-autoconf_fftw3.patch 959 BLAKE2B bfc7e1eefd9ea591fee57e8e06dae4eddd5e677a6ffe493a274ad1c1ef9a580f05eda805252b837ce95df8bdf083e43beecb864118eee383d70a79fbaec8c0e7 SHA512 880269c6d3f5b1cb8fe7518df4763b5202923cc216481380ff3f4f3e519c181e3027d6310061df58ffac644aaf7255b768e184960c01fe1dd6afbd9ea7c31eec
+AUX ngspice-27-blt_linkage_workaround.patch 305 BLAKE2B d31977f4acbaf9d0f015cb34adf3b27733307ea98dc3c5a0206605546d62b4b207f19f277131bb6f351842e36de3e4df583c6c450d70d9ffee87e160a818ee8d SHA512 2eab1af989d1729d900f75505be0ddad9302705eb10a2aec6966a3abf9446cca66f42972770e2e24a085702bab49976fefa2868f06ffb5651c9197d13dc0bf2a
+AUX ngspice-27-fix_parsing_tcl_commands.patch 448 BLAKE2B d5d3532bca4301aa4c281173cbdf23d33ea61869ea6731d1ebf782e2bca5945a407ae1e566258564d1ab899330b5b7a85fa8c1b2fc79b2214dbf29a2a2c1e5b2 SHA512 ba82cf454d14fbfeb38a4b0942d1e947ca76a54976aec8fcac08913f8a08f12878593bb067ba469ea9a6c818ea6ea372119c500be1841058b840d9928dcf54ad
 AUX ngspice-27-split_terminfo.patch 1081 BLAKE2B 8e44c6fe8447b419986206cc658a255e3c574d81cbbb3079d00f08046978f7a08c8c3e9697fdbf009aa1840df60d0045bd6712351280977cf8e66e3d2d505ab2 SHA512 2e5b7f83045304fbc5b35a9c7aeff3ed343b27d830e4d69bf5b30c631f59965241116afc5d062f3fb16b20710e42897605fc614fecb01997a92c595c47510f66
 DIST ngspice-26-manual.pdf 2141771 BLAKE2B 16956c46640de4696f7197997b170a2b1aad9b2f9fbe299b801de100d8aaca949b5be6f259e353a168ae90d992d91ff65e8a819b49fdf509fae98ec7dfa610d7 SHA512 1c160aeef61d8091a6d788677bcf7ea682393cc886d5d535f87bb800cdae4f095cbf1e833babadea481956b904b4bdb688cc18b80d9d6a29cab33a54275abab1
 DIST ngspice-26.tar.gz 6925987 BLAKE2B 8f8e54000234ea3896a55863df99b6ce83ad322e3049845e0a817635ebfebdc8398e6fa4831727c4798a8d9dce1b1c2a01354505e48dc0b2db9e9036aa2ae5aa SHA512 eb6a81df90de803c9f7544e8d0de7cc413aac169f69d1dec5cc6d2e667b66d42aede7f14c75bcdd10288be0c2ac07863fd4028b9fe59f2f515d680c2ffa41cab
 DIST ngspice-27-manual.pdf 3117788 BLAKE2B 6e271abc50b0139c4776844ea31176d231e68c70ce34d0daec48aefc5ef5a9eac90a77f3141081f38c6ac8d42bb95ec061bf1d43bfd3a4fb13e4822c2eff4f57 SHA512 ed87764715917e2cd832c49e911a2908dba9907f9f01c933cb7f97a92c7f9ff345bc26a2f0561dd34b2eede6874b6a67b4864abf3dcff127bd0306e778e997b5
 DIST ngspice-27.tar.gz 7372998 BLAKE2B ce8590518fa4eb4292c73c4eaefdd9d0da19bca8120b51daae954a5b9d86f51912d2dccb5a827480caadce8321373d96f045226db4986a78bcc9170f2e46f9a5 SHA512 1714f95ab5716c228a0b39395a742e8b9a823e0e6f7e08625d089541ea786df5fd7b9d2982bcec8431e27ac6ba7603ecc507f9cfcb0a6aacd53f5633f52bd2ea
 EBUILD ngspice-26.ebuild 2548 BLAKE2B 533c7db0e236b11332e1f2b572d14b745daa5ce655ad000ad5ef2b5c7cb1248b46f8ad929c8de29de04b5891e4ce15f1361add1f0ff340a8b8db826e1d2b46cd SHA512 89d650f33921f5eba3faede8ae79c5f914e7b1e4d3c192e0bd824ee32ca54c6a0a587a30937bb3c56f1e369fbd8a387f61d381f9fb7e1b3fb9ac05e2ae67f18b
+EBUILD ngspice-27-r1.ebuild 4283 BLAKE2B 67439d2b41e5feee5df3a403c3272770369f071ee119f14a55b3e933ec9c56330f5b7f56bacf41adf831bebfa0b29c9cc07168a95b9c122e66cc00922b5850d0 SHA512 9c7827ef53f3334ebc531bf2163f060b8c9c9ec7ac5661e1b4864523ed6995f5a611c39906482d9c706edba780290f9135dc737ebf53953825413f71c40cda45
 EBUILD ngspice-27.ebuild 1828 BLAKE2B f7e886b443f1d58cce69434a5dd9dd87cbd67cd0d6432b99a7efd857f4f7feb36cec3f56502550227785cbffd51f11b819394d247fd4b45c7ed0862f1e5739c1 SHA512 e2fc30a6ce6ef0ecc83444f4e3a305826bdb7c3591984382e0f1cfd9469d5caf0771d4aacd8c8e0e35fff6eb06e3577c13e655692cf610c30586e02558b2292f
-MISC metadata.xml 535 BLAKE2B 53be75db949e7b32e1ab6eed9ed8ff23acecab02d3018ce2f7e13933fbc2d2a48b085722b52dd9188fa98541c4efdebfdfa111f97bbda5abcf8f9b799c2ee83f SHA512 000662a5b7881c4e2aef407bc63730edfa24360fd49ba8fc4811bbf6a643503d782c36de292084131231600de8a707833952a032c885a0df02985bcb99df8444
+MISC metadata.xml 613 BLAKE2B 658a1ccd1c1149c4b3626b482b1c80845502b80d0cd9316117f433edc4d2e5106ac92b97c3bebc23c43a82247592cc85068b08eea3caa859f976548f2a890a73 SHA512 791dc0311699db360c5e013f33786fb546119010cb8bbc36fc91ac6a522f1642f4297d8ffb945291ee20ce337647777d06e463083ac6ca0888d36ff0e1a71dcc
diff --git a/sci-electronics/ngspice/files/ngspice-27-blt_linkage_workaround.patch b/sci-electronics/ngspice/files/ngspice-27-blt_linkage_workaround.patch
new file mode 100644
index 000000000000..53415c748d6d
--- /dev/null
+++ b/sci-electronics/ngspice/files/ngspice-27-blt_linkage_workaround.patch
@@ -0,0 +1,12 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -461,6 +461,9 @@
+         AC_MSG_ERROR([Couldn't find BLT])
+     fi
+     rm -f conftest.tcl
++
++    AC_SEARCH_LIBS([Blt_GetVector], [BLT BLT24 BLT25],,
++        [AC_MSG_ERROR([Couldnt find BLT library.])])
+     
+     AC_CHECK_LIB([pthread], [pthread_create])
+     
diff --git a/sci-electronics/ngspice/files/ngspice-27-fix_parsing_tcl_commands.patch b/sci-electronics/ngspice/files/ngspice-27-fix_parsing_tcl_commands.patch
new file mode 100644
index 000000000000..bad336590dfa
--- /dev/null
+++ b/sci-electronics/ngspice/files/ngspice-27-fix_parsing_tcl_commands.patch
@@ -0,0 +1,16 @@
+--- a/src/tclspice.c
++++ b/src/tclspice.c
+@@ -828,10 +828,9 @@
+     int i;
+     NG_IGNORE(clientData);
+     save_interp();
+-    /* Looks backwards through the first command and strips the :: part */
+-    for (i = strlen(argv[0])-1; i > 0; i--)
+-        if (argv[0][i] == *":")
+-            argv[0] += i + 1;
++    char *prefix = strstr(argv[0], "spice::");
++    if (prefix)
++        argv[0] = prefix + 7;
+     return _run(argc, (char **)argv);
+ }
+ 
diff --git a/sci-electronics/ngspice/metadata.xml b/sci-electronics/ngspice/metadata.xml
index 54267123c561..ed47ec5f1705 100644
--- a/sci-electronics/ngspice/metadata.xml
+++ b/sci-electronics/ngspice/metadata.xml
@@ -9,6 +9,9 @@
 		Ngspice is a mixed-level/mixed-signal circuit simulator. Its code is based on
 		three open source software packages: Spice3f5, Cider1b1 and Xspice.
 	</longdescription>
+	<use>
+		<flag name="shared">Build ngspice as a shared library</flag>
+	</use>
 	<upstream>
 		<remote-id type="sourceforge">ngspice</remote-id>
 	</upstream>
diff --git a/sci-electronics/ngspice/ngspice-27-r1.ebuild b/sci-electronics/ngspice/ngspice-27-r1.ebuild
new file mode 100644
index 000000000000..849d3e48a217
--- /dev/null
+++ b/sci-electronics/ngspice/ngspice-27-r1.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multibuild toolchain-funcs
+
+DESCRIPTION="The Next Generation Spice (Electronic Circuit Simulator)"
+SRC_URI="mirror://sourceforge/ngspice/${P}.tar.gz
+	doc? ( mirror://sourceforge/ngspice/${P}-manual.pdf )"
+HOMEPAGE="http://ngspice.sourceforge.net"
+LICENSE="BSD GPL-2"
+
+SLOT="0"
+IUSE="X debug doc examples fftw openmp readline shared tcl"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x64-macos"
+
+DEPEND="sys-libs/ncurses:0=
+	X? ( x11-libs/libXaw
+		x11-libs/libXt
+		x11-libs/libX11 )
+	fftw? ( sci-libs/fftw:3.0 )
+	readline? ( sys-libs/readline:0= )
+	tcl? ( dev-lang/tcl:0
+		dev-tcltk/blt )"
+RDEPEND="${DEPEND}
+	X? ( sci-visualization/xgraph )"
+
+DOCS=(
+	ANALYSES
+	AUTHORS
+	BUGS
+	ChangeLog
+	DEVICES
+	NEWS
+	README
+	Stuarts_Poly_Notes
+)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-autoconf_fftw3.patch
+	"${FILESDIR}"/${P}-blt_linkage_workaround.patch
+	"${FILESDIR}"/${P}-fix_parsing_tcl_commands.patch
+	"${FILESDIR}"/${P}-split_terminfo.patch
+)
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( "binaries" )
+	use shared && MULTIBUILD_VARIANTS+=( "shared" )
+	use tcl && MULTIBUILD_VARIANTS+=( "tcl" )
+	use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	if use tcl; then
+		if use examples; then
+			find examples/tclspice -type f -iname \*tcl |
+			while read s
+			do
+				sed -i -e 's@../../../src/.libs/libspice.so@libspice.so@g' \
+					-e 's@package require BLT@package require Tk\npackage require BLT@g' \
+					-e "s@spice::codemodel \(.*\)/\(.*\).cm@spice::codemodel /usr/$(get_libdir)/ngspice/\2.cm@g" \
+					"${s}" || die "sed failed"
+			done
+		fi
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	multibuild_copy_sources
+	multibuild_foreach_variant ngspice_configure
+}
+
+ngspice_configure() {
+	pushd "${BUILD_DIR}"
+
+	local myconf
+	if use debug; then
+		myconf="--enable-debug \
+			--enable-ftedebug \
+			--enable-cpdebug \
+			--enable-sensdebug \
+			--enable-asdebug \
+			--enable-stepdebug \
+			--enable-pzdebug"
+	else
+		myconf="--disable-debug \
+			--disable-ftedebug \
+			--disable-cpdebug \
+			--disable-sensdebug \
+			--disable-asdebug \
+			--disable-stepdebug \
+			--disable-pzdebug"
+	fi
+	# As of December 2017, these do not compile
+	myconf="${myconf} \
+		--disable-blktmsdebug \
+		--disable-smltmsdebug"
+
+	myconf="${myconf} \
+		--enable-xspice \
+		--enable-cider \
+		--disable-xgraph \
+		--disable-dependency-tracking \
+		--disable-rpath \
+		$(use_enable openmp) \
+		$(use_with fftw fftw3) \
+		$(use_with readline)"
+
+	if [ "${MULTIBUILD_VARIANT}" == "shared" ]; then
+		myconf="${myconf} \
+			--with-ngshared"
+	elif [ "${MULTIBUILD_VARIANT}" == "tcl" ]; then
+		myconf="${myconf} \
+			--with-tcl"
+	else
+		myconf="${myconf} \
+			$(use_with X x)"
+	fi
+
+	econf ${myconf}
+}
+
+src_compile() {
+	multibuild_foreach_variant ngspice_compile
+}
+
+ngspice_compile() {
+	pushd "${BUILD_DIR}"
+	default
+}
+
+src_install() {
+	multibuild_foreach_variant ngspice_install
+
+	# merge the installations of all variants
+	for v in "${MULTIBUILD_VARIANTS[@]}" ; do
+		cp -a "${D}_${v}"/* "${D}" || die "Failed to combine multibuild installations"
+		rm -rf "${D}_${v}"
+	done
+
+	use tcl && DOCS+=( README.tcl )
+	use doc && DOCS+=( "${DISTDIR}"/${P}-manual.pdf )
+
+	default
+
+	# We don't need ngmakeidx to be installed
+	rm -f "${D}"/usr/bin/ngmakeidx
+	rm -f "${D}"/usr/share/man/man1/ngmakeidx.1
+
+	if use examples; then
+		use tcl || rm -rf examples/tclspice
+
+		insinto /usr/share/${PN}
+		doins -r examples
+	fi
+}
+
+ngspice_install() {
+	pushd "${BUILD_DIR}"
+
+	emake DESTDIR="${D}_${MULTIBUILD_VARIANT}" install
+
+	# Strip shared-library and Tcl-module builds to the bare minimum;
+	# all the support files will have been handled by the 'binaries' build.
+	if [ "${MULTIBUILD_VARIANT}" != "binaries" ]; then
+		rm -rf "${D}_${MULTIBUILD_VARIANT}"/usr/bin{,.debug}
+		rm -rf "${D}_${MULTIBUILD_VARIANT}"/usr/share
+		rm -rf "${D}_${MULTIBUILD_VARIANT}"/usr/$(get_libdir)/*.la
+		rm -rf "${D}_${MULTIBUILD_VARIANT}"/usr/$(get_libdir)/ngspice/*.cm{,.debug}
+	fi
+}
+
+src_test() {
+	if ! use debug; then
+		multibuild_foreach_variant ngspice_test
+	else
+		# https://sourceforge.net/p/ngspice/bugs/353/
+		ewarn
+		ewarn "Skipping tests because they are known to fail in debug mode"
+		ewarn
+	fi
+}
+
+ngspice_test() {
+	pushd "${BUILD_DIR}"
+	default
+}
diff --git a/sci-electronics/pcb/Manifest b/sci-electronics/pcb/Manifest
index 796e69940d00..6d4908a4cc66 100644
--- a/sci-electronics/pcb/Manifest
+++ b/sci-electronics/pcb/Manifest
@@ -1,7 +1,8 @@
 AUX pcb-20110918-fix-config.diff 466 BLAKE2B e9dfc32fee936846c1e91a52b4fb2ae07e16b0d592eef80756d49f72500f04e89fcc8d7b3163308c41385117f66d765fec4de2fcd13246842b11ca4909587c60 SHA512 9bfb0cd28e3c87eba91ee2a226a75128e4a0df37f79ebb10e4f34880d1f32d3cee17fc9f3ba6f553b6ed018a521efcecc583e75d82e8549d91cbab2a1280aa0c
 AUX pcb-4.0.2-doc.diff 368 BLAKE2B b45d661583ef68b3a40cc203fbfaf91f275a29a8374cce4bb7870e05addfa34bb5b5e3db9bb4b8ffaa6d1b107f9029782f3e44dbb2a9011876c49f5425ad1154 SHA512 8a6f68e8e4799244ed12a11ae4092aa3ce02786481adc02abf1622f08f5e5406cbc05a172da9ebbb646a20cf77a722536f31da7c1fe95579dc0cb0c19e7c496b
+AUX pcb-4.0.2-tests.diff 386 BLAKE2B 12f6d3e190d49549569e99f6e421c9492b0fe1a55c02f206388dd6eb4208e481a7b865fa46e67e25cecb8bcc51a2b3070e17cf28f9f0e25d2484a9c9285b0db3 SHA512 a589c1f01b55d48a1fa2af4a764103a8dbb146c4dcb409ba88298ce011ecc26160a5275fd69e58b29b3dbc2773c80ef9ed86570ac53cc649bc969cb6a0262f55
 DIST pcb-20140316.tar.gz 4210077 BLAKE2B a0a676bc0eaedd269644d7f7e6d6d443c4ca1a66aba4db18a0aea33edef2dbd84d7a027a25c310bce9d309c46b63ac4f1b807587f5064ce81aadaea2f675521b SHA512 5b9a2704b4d3c95f03afad0fe8fb5414b2aa9d680e40bf77ad9b46a9d4e14ba740858092794a9ff6788f31ac19063b126d8ceed6316c0d9eaaaa574e6678c071
 DIST pcb-4.0.2.tar.gz 4762521 BLAKE2B 3bae7983c84a79edc882b822b91e94adc00ec4e9b329719a0a15599bb12a6771318844ffbd6163b3c646be8410af1964d59b523fffaebd690af2cce9b4f0f98e SHA512 8bca9bdbdd640174e82e9cf1a457f9ef3f9b7c3f1d957a21c3bb07e50134b83504d85f312e429bed90bfc58f786b4319ffb69c5637ed4fd69a0312e11c6ad30b
 EBUILD pcb-0_p20140316.ebuild 4120 BLAKE2B 7f574c2dea3a65bdf429d8fe435ffca19a491dd35ecc89e42fa1c37d0ee2d8fb008ced198047edbcc426bdafc9b62c801d2175145d38a3a49e01a4fad01eac13 SHA512 4270d3fadc72d7403411b27b0db072f0fde49f7db8d177ca65b0d840c8c1633a17499678956ecccff355803915ebd0891aa39b08b577aed20666facca991a62c
-EBUILD pcb-4.0.2.ebuild 3851 BLAKE2B e27f719a5907edb50ac94467638946f5b72277e0477218f6e59a61f7ce96edd75c45f9e3260d8fa87eb9af046a8d6e8dad3de4ee1b9abd7ae3a88ca6f669abe3 SHA512 b4604472fb0baa51fea8af58ad07d43e1572556e32277659babf24170af46b1e5c5796cc846ca3a389033ba97d7179204ea0d91698b10bbd6320365eaa3f813b
+EBUILD pcb-4.0.2.ebuild 3951 BLAKE2B 37e3072124c842406fa5af0577892f23cbeee1594f678ca863eb929cde52590cfe2bbf9d494ae876aa0a6027076024f40235865165d51210541fefc56b28f12a SHA512 61b2b0e0264570ad2c1f6740e353ebe14756040f947ac3f907b031f4159e89c8190b5fd02f1c4b3ff2550d3cd83c3f2715c942f9202082d99dfa775a69660650
 MISC metadata.xml 1029 BLAKE2B 4c3792765c1ddb9daa35eea1a4e9eef977d083a360b216f0284c74148619a7b45c339ce305abbdabe4d5596ad206bb7eb7a3bb76197136170f175b7d3c09ff8e SHA512 14df20e3c253e65f444f67fd0a69facbd02027578c2ef9cbbd1ad10cef0e8c2b0eefd56889b871714410c116173fec815ec6bee1c84d541ed95970e4dabfbc3e
diff --git a/sci-electronics/pcb/files/pcb-4.0.2-tests.diff b/sci-electronics/pcb/files/pcb-4.0.2-tests.diff
new file mode 100644
index 000000000000..9c6052ee7d73
--- /dev/null
+++ b/sci-electronics/pcb/files/pcb-4.0.2-tests.diff
@@ -0,0 +1,14 @@
+# Do not count skipped tests as failed (bug #642366)
+--- tests/run_tests.sh.orig	2017-12-28 16:40:57.657366187 +0100
++++ tests/run_tests.sh	2017-12-28 16:42:57.183392063 +0100
+@@ -842,8 +842,9 @@
+ show_sep
+ echo "Passed $pass, failed $fail, skipped $skip out of $tot tests."
+ 
++sum=`expr $skip + $pass`
+ rc=0
+-if test $pass -ne $tot ; then
++if test $sum -ne $tot ; then
+     rc=1
+ fi
+ 
diff --git a/sci-electronics/pcb/pcb-4.0.2.ebuild b/sci-electronics/pcb/pcb-4.0.2.ebuild
index 752d71d5b4ce..9c72f3e67b0d 100644
--- a/sci-electronics/pcb/pcb-4.0.2.ebuild
+++ b/sci-electronics/pcb/pcb-4.0.2.ebuild
@@ -77,6 +77,8 @@ src_prepare() {
 		if ! use gcode; then
 			sed -i '/^hid_gcode/d' tests/tests.list || die
 		fi
+		# fix wrong accounting of skipped and passed tests
+		epatch "${FILESDIR}"/${P}-tests.diff
 	fi
 
 	# fix bad syntax in Makefile.am and configure.ac before running eautoreconf
@@ -97,7 +99,7 @@ src_configure() {
 		myconf="--with-gui=batch --disable-xrender --disable-dbus"
 	fi
 
-	local exporters="bom gerber ps"
+	local exporters="bom gerber ps ipcd356"
 	if (use png || use jpeg || use gif) ; then
 		exporters="${exporters} png"
 	fi