3 files changed, 98 insertions, 5 deletions
diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
index 71280b1ee5b1..8e7258f1e363 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -1,4 +1,6 @@
 DIST klayout-0.28.9.tar.gz 88388706 BLAKE2B 0997bf15aae1dd1e8356fec91ae281511751db0ae1a4bfdfde38d5a04392351a7893206806a0eb7d842f8ee2fd7819b1a86257376d3ba5af11bb81b84836e571 SHA512 dcd882ef84161f2d28195f8e0239fd122f17f9954e5cc146f71bbb6816b9fb723eb3b0299e01fbb293ef7fb7f87c25efbfe09126349ee13f89de68c5bb5f7e93
+DIST klayout-0.29.7.tar.gz 97112729 BLAKE2B 3e6d97bcbef5a1ef34ab6ac035db88dfa7f590ef7ab5d3b6312248244cbe4538407db0278b6c7dc2f0a5a4a966d21ee60d1f11200327773979852ecb835ec078 SHA512 361337d028b8266abd2c5114643a7b2074c794f5685b336658168f09df1f3e4826de2d3cb1e094bd2f08616d6f0be78c8f6b44144c74367dcaf65785476ab8ae
 EBUILD klayout-0.28.9.ebuild 1876 BLAKE2B d1f8528ff120073d818ea78add679b0cd72f6177877a39ace7b4530057032ac9b875407eb8e252fc7c233b0bfc228461724dd8025c422a253cc045701d320e8c SHA512 fd6063462fc037562b09b5f7abefaf642245e13a32d447f23752fff88a0eb55d48b9fe5fc8fdee12541462ea971757c10d8d50f05d34be986b1b5ebe2049bb36
-EBUILD klayout-9999.ebuild 1877 BLAKE2B 1859196f7db06365dfef82439f4c1130f59b3cf669b397831089885cdec3cc981c4ab794a99e0b8f5e392d680b5bf12bc15840dcc5adba2149a68a78c44a9d8a SHA512 563aa109096d10ac922ea2992c80f8443c6d7125fafe1f911b67ee5c945dce219e95a75e229bbe4bc7e179156c0d5cf216a171165465bb5f1cc9d16d9d4f2216
+EBUILD klayout-0.29.7.ebuild 1885 BLAKE2B 63eae22a94f5d1e73053b4065e1bb6f0ea459cb3be9f83510512397995753d5608902394e4934a5324f4b70d4f2bcefa69bac73d24e30a87468bd6264ee29ce2 SHA512 86c6d2d161641928ab21939d670cf9e6901f8148812c924b618625dddbcc57c8511d658e2d71eb8508f8376b070855ab9b2429a9f156b10395a3e48a57acc145
+EBUILD klayout-9999.ebuild 1885 BLAKE2B 63eae22a94f5d1e73053b4065e1bb6f0ea459cb3be9f83510512397995753d5608902394e4934a5324f4b70d4f2bcefa69bac73d24e30a87468bd6264ee29ce2 SHA512 86c6d2d161641928ab21939d670cf9e6901f8148812c924b618625dddbcc57c8511d658e2d71eb8508f8376b070855ab9b2429a9f156b10395a3e48a57acc145
 MISC metadata.xml 459 BLAKE2B 991af576cef99c2b7a659026da387777cdd94dcba1037147fd476cde48d3b150755d4da3d44815ac34e4260387d5fbd9a8c107a5a64b7a4261dcd42c04c8e828 SHA512 d8766767f4af4b83ffe2f2485d40cca3a893a270d04ac62be3188f6a74b9f426e62223acc1900784f3ac0b36f6481c9b2a2b7181c4fa37d05b87d012d9213dc2
diff --git a/sci-electronics/klayout/klayout-0.29.7.ebuild b/sci-electronics/klayout/klayout-0.29.7.ebuild
new file mode 100644
index 000000000000..c4024bf6fb48
--- /dev/null
+++ b/sci-electronics/klayout/klayout-0.29.7.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2024 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/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-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)/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-9999.ebuild b/sci-electronics/klayout/klayout-9999.ebuild
index a09175915e24..c4024bf6fb48 100644
--- a/sci-electronics/klayout/klayout-9999.ebuild
+++ b/sci-electronics/klayout/klayout-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 RUBY_OPTIONAL=no
-USE_RUBY="ruby31"
+USE_RUBY="ruby32"
 # note: define maximally ONE implementation here
 
-PYTHON_COMPAT=( python3_{9,10,11,12} )
+PYTHON_COMPAT=( python3_{11,12,13} )
 
 inherit toolchain-funcs python-single-r1 ruby-ng
 
@@ -24,7 +24,6 @@ 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="
@@ -40,6 +39,7 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	dev-qt/qtxmlpatterns:5
+	dev-libs/libgit2
 	sys-libs/zlib
 	${PYTHON_DEPS}
 	$(ruby_implementations_depend)