gentoo resync : 09.07.2022

5 files changed, 10 insertions, 103 deletions

diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
index 36d061e51d7c..b210544ef1fd 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -1,8 +1,6 @@
-DIST klayout-0.27.3.tar.gz 57274694 BLAKE2B 131791f7e978a5ffd344d1dab15d0d245d971855d34c995b4f86173f31853f71ec79d089cc2f80a10d318b108cb0f624c9610c9bf51f0bd88f2265e2d8871c97 SHA512 5f3a83cbbdc171acf200a90e4758942e7c3dd4ec66666576c6ecb041326e52a99222992e844d63f939650374a7493f542b1412ada714b6c0271103facb5acaa9
+DIST klayout-0.27.10.tar.gz 57428098 BLAKE2B 3f64ed6a65ec7d2732691594f50d02f160725a3306cd0d0593f8c2b5978d5cf76e004ed3347bb6e9d9473b8e0974bc04de101ec3bf168faf147e6c64c5f0bdcb SHA512 a637b0a0bd1eaa3c858c333791c5592bc8a4dc1db7413b83432d7bedce9ba7e1210c76086a4f39504bc23a11778a45370b86262c88daa579517e1dee940ecda7
 DIST klayout-0.27.7.tar.gz 57348398 BLAKE2B c717d1041e2b2f1ec4835db3861a8c7ff15d2cd703d3424d9219cb0fab06471a6838503c882b841be45c9e1b9280d1f7a099f9824c6e286940d3b44713927974 SHA512 f4b4f3f2216307df5dca3b9c9c4eee5b45e5811a3307f36d3ad759d33beb8cd83880485284492583b891ee8bbf2866cae0ce87b5c5971478d8ad8daad315bb09
-DIST klayout-0.27.tar.gz 56917189 BLAKE2B 41a66939d6d7a058f9dc1772ba152ff1c311b146f7e2b37da52447cbd7eacc35a26a5fec1516384619ab0680a145f82a120ee7ee2739a5c8e9648836afa07d13 SHA512 475e2d905bc75a13c924f6cd1d08b566ecde92a28ed6a32b1995452e0446d4c75f7856ce3af4430a3b39a3876a3817923a51f3675c5afb33f4ec749acf15e0b4
-EBUILD klayout-0.27.3.ebuild 1871 BLAKE2B 2a905fc85ec4e5a63d46cf2f484f72797d54f2fc8095777bed11104e1b9cbd8a174173451c8afcea60d4e806ac80986cc69b2767b2d897fadceffc36126f3872 SHA512 a7040076ab94067fbf063eece75cab5a0cb5fd0ea7d935d1baf10392063d3cfa4fdb1b2ba8c8b1852a4b155819f8da527b7a746bf9b2b3a946a1a90e1997b216
-EBUILD klayout-0.27.7.ebuild 1872 BLAKE2B 23ab8a4900c1e1354e9f26f0909a6729710ce43327752773bab1406f48e4f7b0383ed3ca0b5203b8f143e600a146e0dc9bb1bd7165e0f875caad8399ee1ba744 SHA512 cf8c25472ce557b9a20421efc551325c44f4ba6d8e778f8716bcdc7738d7a72fa591c4ca4313eca74f7914bac5330a71bd97185c68c2db220fb53cf1beead999
-EBUILD klayout-0.27.ebuild 1855 BLAKE2B 653a28ceb51d5f422bebab200dd39fab0c3fe345697a6ebce3e6035b6a96d1e75622f73ed4e8562bdfa341fd0467309d3efeeceb3d9617c8b601eea1bbbbbe6c SHA512 4eb5bd656bceb1e6684e73e9b2cba0cc6085866423b055a0bbebbb1d7ec4e69488a87a8d6dde7f97b9e4043bec283b1f1ddff5493fbb514344c7ccd04b43d491
-EBUILD klayout-9999.ebuild 1872 BLAKE2B 90aa3094b6c349087d8b8d1ee02131955101ebd8640ddf3bfe64b1209505a344a10ddaf8b2d61300aba1406da9a544e69dc7ea5967c6735a8d72b4062858122e SHA512 2e424b127004f6bc142848b53575c6730d362835eed27efc74109f7664d1115c562c11aa0c48c0e2cc804cda2f24dff3cbb6c3d822ddb198a674f829eebb1a2e
+EBUILD klayout-0.27.10.ebuild 1876 BLAKE2B 848742adea32c7a357a1b01845e3c2a7e1ea1737c921f45889f81993f76818990f0d7b1e52afd858e5eedb91e4051b16a23c37861c42ac466372c546e1861945 SHA512 4ab2ccebe82a09fed9ca3998026c4a371531e7a17bcc6ab66ea149a0f79bfe3719349ec992d4f62203b705889148222752247de85f68eb9f58db5eedcd8abeff
+EBUILD klayout-0.27.7.ebuild 1875 BLAKE2B e3c2fbae2a925f39f4f4b629ae4a8505e00700be028f061bff4e94cdd7341812228a7b6682a42722e3f8bbc5325e9f12da9ed4809c68dfa2e8980df54d6eef92 SHA512 e91ddeb38d6da9db86d33214b3853e8d5f791e32900d455f3a4288c98de9be35d6e8641d8124b1edf644971cf83a836691f01155f9b9ce4ee7894b45843a46e2
+EBUILD klayout-9999.ebuild 1876 BLAKE2B 848742adea32c7a357a1b01845e3c2a7e1ea1737c921f45889f81993f76818990f0d7b1e52afd858e5eedb91e4051b16a23c37861c42ac466372c546e1861945 SHA512 4ab2ccebe82a09fed9ca3998026c4a371531e7a17bcc6ab66ea149a0f79bfe3719349ec992d4f62203b705889148222752247de85f68eb9f58db5eedcd8abeff
 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.10.ebuild
index 01355f2e03c4..75368510a1f8 100644
--- a/sci-electronics/klayout/klayout-0.27.3.ebuild
+++ b/sci-electronics/klayout/klayout-0.27.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ RUBY_OPTIONAL=no
 USE_RUBY="ruby27"
 # note: define maximally ONE implementation here
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10,11} )
 
 inherit toolchain-funcs python-single-r1 ruby-ng
 
@@ -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-0.27.7.ebuild b/sci-electronics/klayout/klayout-0.27.7.ebuild
index 40bfbeb1351d..36a5f7cd2663 100644
--- a/sci-electronics/klayout/klayout-0.27.7.ebuild
+++ b/sci-electronics/klayout/klayout-0.27.7.ebuild
@@ -7,7 +7,7 @@ RUBY_OPTIONAL=no
 USE_RUBY="ruby27"
 # note: define maximally ONE implementation here
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10,11} )
 
 inherit toolchain-funcs python-single-r1 ruby-ng
 
@@ -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-0.27.ebuild b/sci-electronics/klayout/klayout-0.27.ebuild
deleted file mode 100644
index 6eb043c6d1be..000000000000
--- a/sci-electronics/klayout/klayout-0.27.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-RUBY_OPTIONAL=no
-USE_RUBY="ruby26"
-# 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 "/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* 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-9999.ebuild b/sci-electronics/klayout/klayout-9999.ebuild
index fa9d57d2fc67..75368510a1f8 100644
--- a/sci-electronics/klayout/klayout-9999.ebuild
+++ b/sci-electronics/klayout/klayout-9999.ebuild
@@ -7,7 +7,7 @@ RUBY_OPTIONAL=no
 USE_RUBY="ruby27"
 # note: define maximally ONE implementation here
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10,11} )
 
 inherit toolchain-funcs python-single-r1 ruby-ng