gentoo resync : 28.12.2017

3 files changed, 119 insertions, 0 deletions

diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
index b8a036c6c162..cfdf83a5c2c9 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -1,6 +1,9 @@
 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
 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-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-qt58.patch b/sci-electronics/klayout/files/klayout-0.25-qt58.patch
new file mode 100644
index 000000000000..544bf2992c6a
--- /dev/null
+++ b/sci-electronics/klayout/files/klayout-0.25-qt58.patch
@@ -0,0 +1,38 @@
+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/klayout-0.25.ebuild b/sci-electronics/klayout/klayout-0.25.ebuild
new file mode 100644
index 000000000000..e3b40dead5b8
--- /dev/null
+++ b/sci-electronics/klayout/klayout-0.25.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+RUBY_OPTIONAL=no
+USE_RUBY="ruby22"
+# note: define maximally ONE implementation here
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit eutils multilib toolchain-funcs python-single-r1 ruby-ng
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/klayoutmatthias/${PN}.git"
+	inherit git-r3
+	EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P}
+else
+	SRC_URI="http://www.klayout.org/downloads/source/${P}.tar.gz"
+#	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts"
+HOMEPAGE="http://www.klayout.de/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+	${PYTHON_DEPS}
+	$(ruby_implementations_depend)
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-qt58.patch" )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ruby-ng_pkg_setup
+}
+
+each_ruby_configure() {
+	tc-export CC CXX AR LD RANLIB
+	export CFLAGS CXXFLAGS
+	./build.sh \
+		-expert \
+		-dry-run \
+		-qmake "/usr/$(get_libdir)/qt5/bin/qmake" \
+		-ruby "${RUBY}" \
+		-python "${PYTHON}" \
+		-build . \
+		-bin "${T}/bin" \
+		-rpath "/usr/$(get_libdir)/klayout" \
+		-option "${MAKEOPTS}" \
+		-with-qtbinding \
+		-without-64bit-coord \
+		-qt5 || die "Configuration failed"
+}
+
+each_ruby_compile() {
+	emake all
+}
+
+each_ruby_install() {
+	emake install
+
+	cd "${T}/bin" || die
+
+	dodir "/usr/$(get_libdir)/klayout"
+	mv lib* "${ED}/usr/$(get_libdir)/klayout/" || die
+
+	dobin *
+}