gentoo resync : 25.09.2021

5 files changed, 99 insertions, 6 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 24396b7f5d61..bd0403ea9a39 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
index d901ab25d8f4..6a014d5be2e4 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -1,6 +1,8 @@
 DIST klayout-0.26.11.tar.gz 54455860 BLAKE2B f2e988ef1a68a0d8e612199d1a930a55c9175bebb8ca4cbbedef425d6367ddd3e56999502e0fb4c38043e2f7bf2c75c3acb18c498124c5850379bbfe283cb218 SHA512 c868830494a7181bbc68f543930aaf87a189b5063d212191305a3d2e119921175ff66aa2f87f9a89e8e9e5d8bf2c47ed32b5cd1fb43b85619ee35d8a3ddc063b
+DIST klayout-0.27.3.tar.gz 57274694 BLAKE2B 131791f7e978a5ffd344d1dab15d0d245d971855d34c995b4f86173f31853f71ec79d089cc2f80a10d318b108cb0f624c9610c9bf51f0bd88f2265e2d8871c97 SHA512 5f3a83cbbdc171acf200a90e4758942e7c3dd4ec66666576c6ecb041326e52a99222992e844d63f939650374a7493f542b1412ada714b6c0271103facb5acaa9
 DIST klayout-0.27.tar.gz 56917189 BLAKE2B 41a66939d6d7a058f9dc1772ba152ff1c311b146f7e2b37da52447cbd7eacc35a26a5fec1516384619ab0680a145f82a120ee7ee2739a5c8e9648836afa07d13 SHA512 475e2d905bc75a13c924f6cd1d08b566ecde92a28ed6a32b1995452e0446d4c75f7856ce3af4430a3b39a3876a3817923a51f3675c5afb33f4ec749acf15e0b4
 EBUILD klayout-0.26.11.ebuild 1855 BLAKE2B 653a28ceb51d5f422bebab200dd39fab0c3fe345697a6ebce3e6035b6a96d1e75622f73ed4e8562bdfa341fd0467309d3efeeceb3d9617c8b601eea1bbbbbe6c SHA512 4eb5bd656bceb1e6684e73e9b2cba0cc6085866423b055a0bbebbb1d7ec4e69488a87a8d6dde7f97b9e4043bec283b1f1ddff5493fbb514344c7ccd04b43d491
-EBUILD klayout-0.27.ebuild 1856 BLAKE2B 33192b35c2ee433accb4206927092831210f49797237fc22975dea585475aaca52010824b60efcf2562f26d3c32264f2533634d4780bbb6d497e028a540b11f9 SHA512 d17f5201618750a2c38c84717fbc013f6b81cbd60a61adb33baeb8e143d609768594113d458bb77ee5ef44262beae8d1a63bae57c963f2ded01fec5c9ae48261
-EBUILD klayout-9999.ebuild 1856 BLAKE2B 33192b35c2ee433accb4206927092831210f49797237fc22975dea585475aaca52010824b60efcf2562f26d3c32264f2533634d4780bbb6d497e028a540b11f9 SHA512 d17f5201618750a2c38c84717fbc013f6b81cbd60a61adb33baeb8e143d609768594113d458bb77ee5ef44262beae8d1a63bae57c963f2ded01fec5c9ae48261
+EBUILD klayout-0.27.3.ebuild 1872 BLAKE2B 90aa3094b6c349087d8b8d1ee02131955101ebd8640ddf3bfe64b1209505a344a10ddaf8b2d61300aba1406da9a544e69dc7ea5967c6735a8d72b4062858122e SHA512 2e424b127004f6bc142848b53575c6730d362835eed27efc74109f7664d1115c562c11aa0c48c0e2cc804cda2f24dff3cbb6c3d822ddb198a674f829eebb1a2e
+EBUILD klayout-0.27.ebuild 1855 BLAKE2B 653a28ceb51d5f422bebab200dd39fab0c3fe345697a6ebce3e6035b6a96d1e75622f73ed4e8562bdfa341fd0467309d3efeeceb3d9617c8b601eea1bbbbbe6c SHA512 4eb5bd656bceb1e6684e73e9b2cba0cc6085866423b055a0bbebbb1d7ec4e69488a87a8d6dde7f97b9e4043bec283b1f1ddff5493fbb514344c7ccd04b43d491
+EBUILD klayout-9999.ebuild 1872 BLAKE2B 90aa3094b6c349087d8b8d1ee02131955101ebd8640ddf3bfe64b1209505a344a10ddaf8b2d61300aba1406da9a544e69dc7ea5967c6735a8d72b4062858122e SHA512 2e424b127004f6bc142848b53575c6730d362835eed27efc74109f7664d1115c562c11aa0c48c0e2cc804cda2f24dff3cbb6c3d822ddb198a674f829eebb1a2e
 MISC metadata.xml 381 BLAKE2B 604883a849553c3794ea564abbbe12b612ca34e78859c29a7ed0845c103673f4a9c70f92ba8e980d9197a80fe12c065c6b4244bad0ca49070e81432b73cd61d6 SHA512 aef6fefcb173057d5a1db629aa0ab736c1e3cb64f14c1bfe05e90af76c04e44503d1ec621c86ca0de55467ed73a7077fdabf69601ca7a6ab26d4718e309876d7
diff --git a/sci-electronics/klayout/klayout-0.27.3.ebuild b/sci-electronics/klayout/klayout-0.27.3.ebuild
new file mode 100644
index 000000000000..fa9d57d2fc67
--- /dev/null
+++ b/sci-electronics/klayout/klayout-0.27.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+RUBY_OPTIONAL=no
+USE_RUBY="ruby27"
+# note: define maximally ONE implementation here
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit 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="https://www.klayout.org/downloads/source/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts"
+HOMEPAGE="https://www.klayout.de/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5[widgets]
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	sys-libs/zlib
+	${PYTHON_DEPS}
+	$(ruby_implementations_depend)
+"
+DEPEND="${RDEPEND}"
+
+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 "$EPREFIX/usr/$(get_libdir)/qt5/bin/qmake" \
+		-ruby "${RUBY}" \
+		-python "${PYTHON}" \
+		-build . \
+		-bin "${T}/bin" \
+		-rpath "$EPREFIX/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* lay_plugins db_plugins "${ED}/usr/$(get_libdir)/klayout/" || die
+
+	mkdir -p "${D}/$(python_get_sitedir)" || die
+	mv pymod/* "${D}/$(python_get_sitedir)/" || die
+	rmdir pymod || die
+
+	dobin *
+
+	python_optimize
+}
diff --git a/sci-electronics/klayout/klayout-0.27.ebuild b/sci-electronics/klayout/klayout-0.27.ebuild
index 046760b5f1c2..6eb043c6d1be 100644
--- a/sci-electronics/klayout/klayout-0.27.ebuild
+++ b/sci-electronics/klayout/klayout-0.27.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P}
 else
 	SRC_URI="https://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"
diff --git a/sci-electronics/klayout/klayout-9999.ebuild b/sci-electronics/klayout/klayout-9999.ebuild
index 046760b5f1c2..fa9d57d2fc67 100644
--- a/sci-electronics/klayout/klayout-9999.ebuild
+++ b/sci-electronics/klayout/klayout-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 RUBY_OPTIONAL=no
-USE_RUBY="ruby26"
+USE_RUBY="ruby27"
 # note: define maximally ONE implementation here
 
 PYTHON_COMPAT=( python3_{7,8,9} )
@@ -57,12 +57,12 @@ each_ruby_configure() {
 	./build.sh \
 		-expert \
 		-dry-run \
-		-qmake "/usr/$(get_libdir)/qt5/bin/qmake" \
+		-qmake "$EPREFIX/usr/$(get_libdir)/qt5/bin/qmake" \
 		-ruby "${RUBY}" \
 		-python "${PYTHON}" \
 		-build . \
 		-bin "${T}/bin" \
-		-rpath "/usr/$(get_libdir)/klayout" \
+		-rpath "$EPREFIX/usr/$(get_libdir)/klayout" \
 		-option "${MAKEOPTS}" \
 		-with-qtbinding \
 		-without-64bit-coord \