commit: 557ed6ce8e012128ba8f5f364f9db66b7e2afef4 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Sat Feb 15 16:18:11 2025 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Sat Feb 15 16:19:17 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=557ed6ce
sci-electronics/klayout: Switch to Qt6 (does not build yet) Bug: https://github.com/KLayout/klayout/issues/1987 Bug: https://bugs.gentoo.org/947393 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> ...ayout-9999.ebuild => klayout-0.29.11-r1.ebuild} | 23 +++++++--------------- sci-electronics/klayout/klayout-9999.ebuild | 23 +++++++--------------- 2 files changed, 14 insertions(+), 32 deletions(-) diff --git a/sci-electronics/klayout/klayout-9999.ebuild b/sci-electronics/klayout/klayout-0.29.11-r1.ebuild similarity index 79% copy from sci-electronics/klayout/klayout-9999.ebuild copy to sci-electronics/klayout/klayout-0.29.11-r1.ebuild index 7dd60f77e437..b83d5613e22f 100644 --- a/sci-electronics/klayout/klayout-9999.ebuild +++ b/sci-electronics/klayout/klayout-0.29.11-r1.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() { 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() {
