gentoo resync : 03.03.2021

4 files changed, 2 insertions, 188 deletions

diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
index 8808b9b934f9..5c6ff1be5227 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -1,8 +1,4 @@
-DIST klayout-0.26.5.tar.gz 52335763 BLAKE2B b1ab39c378ce23c28f5a58191dbf43c5b8c165e9df241b00573c8f8b72a5a7251cddd41bf62a7e37f59cad68024c52ab99f8d0f10bf1bf45dba975bf37ba80db SHA512 b80dff34a9dd538921f6863fc94eb8a2160b989468ec0493a7ecfdfccea0e4f0441aa1ee860d000b150b0a0bc0b831dcb849ab77e9eb1304e9ed6fcced94689c
-DIST klayout-0.26.8.tar.gz 54423228 BLAKE2B 5839e77a7910b0a838b6d1f436fe697ea445e968044f7102ab71d3d485ea4631194bf002d4440771e73c77359b673372662506a9cc6e2d4a3b5dc8df171783c7 SHA512 a37b324194ed523ee70a1d63034db9ba48cf55d44d3a9d1bc612803cde2425f6909fd0571ad4a66318fc2c6735e19ba11a26ab153e1200adec405c16fc05f144
 DIST klayout-0.26.9.tar.gz 54223809 BLAKE2B 3800b0f49a77a73d4310485ba8539698b72c4a8f953723f4caee43a8c189aa044f7c8e617bc67640071e81d94e9edadbba11114b6d6edd4fcd67d02df33ec7d9 SHA512 1a163a055806fb9555aaf6253cb63d6ebe9648f6e165dfd1cbaa6d199652fa98363f6ddae32843cde5f768a8c2f42c8b06fb4691ed64e40979a22a96bd73874b
-EBUILD klayout-0.26.5.ebuild 1853 BLAKE2B 7fb855d86f549d56da047a30592797f30cd488a57a9876169c9372085843b163e089554408b1c996072feaf3ba1451bdbf24b9be66c3390112f7932788e02544 SHA512 d15d68f288468e569b2eafea532c9f90dd68421e03ed4d2055b911def8f078e34179a53bdb0e1fa0c432b0e423366ce900b7dc8d96d7c5de59061e872eeff64a
-EBUILD klayout-0.26.8.ebuild 1853 BLAKE2B ab37bb70c7837205c0b9145782071d1ba47846a7fd5188e4adf869806b3070f336f6890f279f4db2b27fd2d41a73b186c6f3c5fd001db571a28d435b9ce2c7c8 SHA512 f14b7386f2a0b0db78e0ab5334509ac245e790b3f4b88f09e8b5a293976ac8ed75c41283feeea32adf99c3b98ccaa376dfb61fd5be821707728be437dc340479
-EBUILD klayout-0.26.9.ebuild 1854 BLAKE2B c7e6ef82c00408221421f53dd0dc171f4ce019611785be6b6025af3a3cdca0ea86fa18cfe1e5f23e3b24b556caf1792a08c5b5f553d7fb6dc50806893424d963 SHA512 a5868823d60bdc8135219e36bac929808a1436ca4152a6cee6145c8d7ab8201a5950213c13fcb1419a7303b59b2aca76259c019c9cb7db06627b69253f8c9083
+EBUILD klayout-0.26.9.ebuild 1853 BLAKE2B ab37bb70c7837205c0b9145782071d1ba47846a7fd5188e4adf869806b3070f336f6890f279f4db2b27fd2d41a73b186c6f3c5fd001db571a28d435b9ce2c7c8 SHA512 f14b7386f2a0b0db78e0ab5334509ac245e790b3f4b88f09e8b5a293976ac8ed75c41283feeea32adf99c3b98ccaa376dfb61fd5be821707728be437dc340479
 EBUILD klayout-9999.ebuild 1854 BLAKE2B 1fc9b5871daf08ae15e217b9b7125748d4eb4d1650ab6da8d1dccdc019399aca15d842bca70e28bbfc284e117b47db2cdfabb8e46e81b76ee41a269fc293d41e SHA512 ec8666f6dd29e5176212ccbb431c7c4b87666ddfdc871a1251878cd67a1351ca936d73fc3790ec95fafc05af7e47f604560716e28eda0d86f6b5a0fc6a2d661d
 MISC metadata.xml 380 BLAKE2B 3961dc3b4b0a6f3de5460e01e434f8ba1e4504247aac8cb40553d0752ece4f4be7e9d5fefee9d61e85681631eb200959b341c6aeda60b89c14119f95a40f4aa6 SHA512 92ee6b53a7dfed04d5a2aef510e0f2f0dcc70903258d5d4cb6ee497521cbb41214b7a45000693a0ecb66029767a48988c45b9b7fb78a09dc813710a9283d2f7d
diff --git a/sci-electronics/klayout/klayout-0.26.5.ebuild b/sci-electronics/klayout/klayout-0.26.5.ebuild
deleted file mode 100644
index 6c6d8ac25eaa..000000000000
--- a/sci-electronics/klayout/klayout-0.26.5.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-RUBY_OPTIONAL=no
-USE_RUBY="ruby25"
-# note: define maximally ONE implementation here
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-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-0.26.8.ebuild b/sci-electronics/klayout/klayout-0.26.8.ebuild
deleted file mode 100644
index 20fa38ada7f9..000000000000
--- a/sci-electronics/klayout/klayout-0.26.8.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} )
-
-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-0.26.9.ebuild b/sci-electronics/klayout/klayout-0.26.9.ebuild
index e1dc3269e5f9..20fa38ada7f9 100644
--- a/sci-electronics/klayout/klayout-0.26.9.ebuild
+++ b/sci-electronics/klayout/klayout-0.26.9.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"