gentoo auto-resync : 16:02:2025 - 00:13:18

4 files changed, 91 insertions, 17 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 45ed6abb6772..08f757359eaa 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
index bc462d76434b..7e81a1b99fde 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -1,6 +1,7 @@
 DIST klayout-0.29.11.tar.gz 97526183 BLAKE2B 6da5c4590ae14c46f677b0e87fd001c89731db15abcbce42c3a22844a2277be7998c80cf8e39f0df8d3bdcc00ac39290fab87973ec3cf6aa21d4967f047ef143 SHA512 a03bc5e3ca612e0dab894a193e7f942ef4fb8860364fcdda2128b55fd81c82eb2c8122a1e340c03097a9def7942d151ba115def8322e3c103fcec09d4849f6dd
 DIST klayout-0.29.7.tar.gz 97112729 BLAKE2B 3e6d97bcbef5a1ef34ab6ac035db88dfa7f590ef7ab5d3b6312248244cbe4538407db0278b6c7dc2f0a5a4a966d21ee60d1f11200327773979852ecb835ec078 SHA512 361337d028b8266abd2c5114643a7b2074c794f5685b336658168f09df1f3e4826de2d3cb1e094bd2f08616d6f0be78c8f6b44144c74367dcaf65785476ab8ae
+EBUILD klayout-0.29.11-r1.ebuild 1753 BLAKE2B b3f8c815c2c6e3e09fad598fc6946a878125e302a41acf9b32e9277f74e6a92e91d83558a000722d91a19a502521d0ea4910c3dc1eb54896d515c85d5e37d4f2 SHA512 8c37476a0e3e398645358c2ced5d76b2e489ae7b49afb54ccd7a4e26af7cb04ad6dabfc469e7bd10b8f61f10ccf5d07199b952e25018091359b8db706adb61b6
 EBUILD klayout-0.29.11.ebuild 1887 BLAKE2B 40fd7976287300ae713ec8e41cd532c61453a4da7bd2849a9c3464756bd3fc173516bd755f3d6c049217032d34b5d6c0e80396a047c83cdb4b0ee911730ca8a2 SHA512 f2a7f7069930cb6c5741d1f77188e20d1f51d7d43b7408812577f4540760d7a5152be211ced5c264c00934be491ff1ae6a8c71ee8cd484bca3f531e83bcec7ed
 EBUILD klayout-0.29.7.ebuild 1886 BLAKE2B 76794a15afcd103679f39188833d3690c13c59994d400a2dfd05baa1b11b96209b1dc4a5245bd6bb215a270bf5b4cb00af9a1a272d4c7d80b0dab5a3a7eb50a7 SHA512 c075756b8ecd7d9378c45ffa57be1489f961e852204eccc48b05b1376d4efe2b7d5e8ae501929b16058be4ee59f515dbd990b869698290a99aeb172db3686a4c
-EBUILD klayout-9999.ebuild 1887 BLAKE2B 40fd7976287300ae713ec8e41cd532c61453a4da7bd2849a9c3464756bd3fc173516bd755f3d6c049217032d34b5d6c0e80396a047c83cdb4b0ee911730ca8a2 SHA512 f2a7f7069930cb6c5741d1f77188e20d1f51d7d43b7408812577f4540760d7a5152be211ced5c264c00934be491ff1ae6a8c71ee8cd484bca3f531e83bcec7ed
+EBUILD klayout-9999.ebuild 1753 BLAKE2B b3f8c815c2c6e3e09fad598fc6946a878125e302a41acf9b32e9277f74e6a92e91d83558a000722d91a19a502521d0ea4910c3dc1eb54896d515c85d5e37d4f2 SHA512 8c37476a0e3e398645358c2ced5d76b2e489ae7b49afb54ccd7a4e26af7cb04ad6dabfc469e7bd10b8f61f10ccf5d07199b952e25018091359b8db706adb61b6
 MISC metadata.xml 459 BLAKE2B 991af576cef99c2b7a659026da387777cdd94dcba1037147fd476cde48d3b150755d4da3d44815ac34e4260387d5fbd9a8c107a5a64b7a4261dcd42c04c8e828 SHA512 d8766767f4af4b83ffe2f2485d40cca3a893a270d04ac62be3188f6a74b9f426e62223acc1900784f3ac0b36f6481c9b2a2b7181c4fa37d05b87d012d9213dc2
diff --git a/sci-electronics/klayout/klayout-0.29.11-r1.ebuild b/sci-electronics/klayout/klayout-0.29.11-r1.ebuild
new file mode 100644
index 000000000000..b83d5613e22f
--- /dev/null
+++ b/sci-electronics/klayout/klayout-0.29.11-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+RUBY_OPTIONAL=no
+USE_RUBY="ruby32"
+# note: define maximally ONE implementation here
+
+PYTHON_COMPAT=( python3_{11,12,13} )
+
+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"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+	dev-qt/qtbase:6[gui,network,sql,ssl,widgets,xml]
+	dev-qt/qtmultimedia:6
+	dev-qt/qtsvg:6
+	dev-qt/qttools:6[designer]
+	dev-libs/libgit2:=
+	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)/qt6/bin/qmake" \
+		-ruby "${RUBY}" \
+		-python "${PYTHON}" \
+		-build . \
+		-bin "${T}/bin" \
+		-rpath "$EPREFIX/usr/$(get_libdir)/klayout" \
+		-option "${MAKEOPTS}" \
+		-with-qtbinding \
+		-without-64bit-coord || 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 7dd60f77e437..b83d5613e22f 100644
--- a/sci-electronics/klayout/klayout-9999.ebuild
+++ b/sci-electronics/klayout/klayout-9999.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"
@@ -27,18 +27,10 @@ SLOT="0"
 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
+	dev-qt/qtbase:6[gui,network,sql,ssl,widgets,xml]
+	dev-qt/qtmultimedia:6
+	dev-qt/qtsvg:6
+	dev-qt/qttools:6[designer]
 	dev-libs/libgit2:=
 	sys-libs/zlib
 	${PYTHON_DEPS}
@@ -57,7 +49,7 @@ each_ruby_configure() {
 	./build.sh \
 		-expert \
 		-dry-run \
-		-qmake "$EPREFIX/usr/$(get_libdir)/qt5/bin/qmake" \
+		-qmake "$EPREFIX/usr/$(get_libdir)/qt6/bin/qmake" \
 		-ruby "${RUBY}" \
 		-python "${PYTHON}" \
 		-build . \
@@ -65,8 +57,7 @@ each_ruby_configure() {
 		-rpath "$EPREFIX/usr/$(get_libdir)/klayout" \
 		-option "${MAKEOPTS}" \
 		-with-qtbinding \
-		-without-64bit-coord \
-		-qt5 || die "Configuration failed"
+		-without-64bit-coord || die "Configuration failed"
 }
 
 each_ruby_compile() {