[gentoo-commits] repo/gentoo:master commit in: sci-electronics/klayout/, sci-electronics/klayout/files/
commit: a2f26ccbc23b6705a68b8784dfe543ba3969b794
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Wed May 6 19:56:24 2020 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Wed May 6 21:15:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2f26ccb
sci-electronics/klayout: Remove old
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas K. Hüttel gentoo.org>
sci-electronics/klayout/Manifest | 1 -
.../klayout/files/klayout-0.25.6-gcc8.patch| 18 -
sci-electronics/klayout/klayout-0.25.6-r1.ebuild | 88 --
sci-electronics/klayout/klayout-0.25.6.ebuild | 88 --
4 files changed, 195 deletions(-)
diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
index 6505c62db0f..03d3c2d61eb 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -1,2 +1 @@
-DIST klayout-0.25.6.tar.gz 21008915 BLAKE2B
f5e06790b8eac682b61bf83dce167c4c9eb8767d6bfb040e203ed2ec43b39781e64203c8319bf58ed2f4b7b2349d958f24a7ad1957bc27befa583b00650c
SHA512
38d13bd6f0cef5685ef32ebf00edf07f588d445174e2a56320940a7036e65a3fbb11d1efab92af9f8abfce7e77c782df5f05460a7de4d98ade924c761396db5a
DIST klayout-0.26.4.tar.gz 52324714 BLAKE2B
663ab737d91a83452234f128b13f73ed8e559e6f0fb11f283bce6bfe80e8f391c7bac5ad16933b2f5bcf46fac6e07233ffc690dea5ddb1702850c52501157c36
SHA512
df91434e87d8cc6f4df837eacd756566626405fb75b0cce40c25f157d547dc1e5929746b6b276a317512c038e014bbdd1655615c93d76d9ed5bcf65280d95355
diff --git a/sci-electronics/klayout/files/klayout-0.25.6-gcc8.patch
b/sci-electronics/klayout/files/klayout-0.25.6-gcc8.patch
deleted file mode 100644
index 250290f3490..000
--- a/sci-electronics/klayout/files/klayout-0.25.6-gcc8.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Source: https://github.com/klayoutmatthias/klayout/issues/127
-
-diff -ruN klayout-0.25.6.orig/src/db/db/dbCellMapping.cc
klayout-0.25.6/src/db/db/dbCellMapping.cc
klayout-0.25.6.orig/src/db/db/dbCellMapping.cc 2018-11-26
18:53:43.0 +0100
-+++ klayout-0.25.6/src/db/db/dbCellMapping.cc 2018-12-12 20:05:11.210171097
+0100
-@@ -75,6 +75,12 @@
- return *this;
- }
-
-+ SortedCellIndexIterator ()
-+ {
-+--m_n;
-+return *this;
-+ }
-+
- SortedCellIndexIterator +=(size_t n)
- {
- m_n += n;
diff --git a/sci-electronics/klayout/klayout-0.25.6-r1.ebuild
b/sci-electronics/klayout/klayout-0.25.6-r1.ebuild
deleted file mode 100644
index 8435a07aa8c..000
--- a/sci-electronics/klayout/klayout-0.25.6-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-RUBY_OPTIONAL=no
-USE_RUBY="ruby25"
-# note: define maximally ONE implementation here
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit toolchain-funcs python-single-r1 ruby-ng
-
-if [[ ${PV} = * ]]; 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/qtwidgets:5
- dev-qt/qtxml:5
- dev-qt/qtxmlpatterns:5
- sys-libs/zlib
- ${PYTHON_DEPS}
- $(ruby_implementations_depend)
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-gcc8.patch"
-)
-
-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* "${ED}/usr/$(get_libdir)/klayout/" || die
-
- dobin *
-}
diff --git a/sci-electronics/klayout/klayout-0.25.6.ebuild
b/sci-electronics/klayout/klayout-0.25.6.ebuild
deleted file mode 100644
index be589a0f90e..000
---
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/klayout/, sci-electronics/klayout/files/
commit: 865539e57322ccc2f516dd7e1faf31b8cd985cd7
Author: Andreas K. Huettel gentoo org>
AuthorDate: Fri Dec 14 17:11:58 2018 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Fri Dec 14 17:11:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=865539e5
sci-electronics/klayout: Remove old
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel gentoo.org>
sci-electronics/klayout/Manifest | 1 -
.../klayout/files/klayout-0.25-qt58.patch | 38 --
.../klayout/files/klayout-0.25-qt59.patch | 78 ---
sci-electronics/klayout/klayout-0.25-r2.ebuild | 88 --
4 files changed, 205 deletions(-)
diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
index 34d25dd2f01..bcd2e01bdfa 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -1,2 +1 @@
DIST klayout-0.25.6.tar.gz 21008915 BLAKE2B
f5e06790b8eac682b61bf83dce167c4c9eb8767d6bfb040e203ed2ec43b39781e64203c8319bf58ed2f4b7b2349d958f24a7ad1957bc27befa583b00650c
SHA512
38d13bd6f0cef5685ef32ebf00edf07f588d445174e2a56320940a7036e65a3fbb11d1efab92af9f8abfce7e77c782df5f05460a7de4d98ade924c761396db5a
-DIST klayout-0.25.tar.gz 16461165 BLAKE2B
321d5c03b49b922b051407767f72135d0ff7e3fb0fe5dd237e27ce6c42d2b847f0bc4d96ae551c51b6581c0d39eb71f7053c8814dcb7afdfd027a24af9d553fd
SHA512
0c05b0786e7e1dbf8035cbb3888eff776c0b96a4fcf2ebbc3065fe43340ae020b6713c2e1d2e7ab5caaf64d7ec84bea9d691ba6c0aea88e93c957530d3d4d114
diff --git a/sci-electronics/klayout/files/klayout-0.25-qt58.patch
b/sci-electronics/klayout/files/klayout-0.25-qt58.patch
deleted file mode 100644
index 544bf2992c6..000
--- a/sci-electronics/klayout/files/klayout-0.25-qt58.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 11cb5eb99836e043d71b556af010b29624c3f569 Mon Sep 17 00:00:00 2001
-From: Matthias Koefferlein
-Date: Sun, 26 Nov 2017 22:51:36 +0100
-Subject: [PATCH] Qt 5.8.0 compatibility
-
- scripts/mkqtdecl5/mkqtdecl.conf | 2 ++
- src/gsiqt5/gsiDeclQtTypeTraits.h | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/scripts/mkqtdecl5/mkqtdecl.conf b/scripts/mkqtdecl5/mkqtdecl.conf
-index a704ebc..ee58b82 100644
a/scripts/mkqtdecl5/mkqtdecl.conf
-+++ b/scripts/mkqtdecl5/mkqtdecl.conf
-@@ -1484,6 +1484,8 @@ final_class "QAccessibleObject" # because navigate
cannot be implemented
- # final_class "QAccessiblePlugin" # because navigate cannot be implemented
- final_class "QAccessibleWidget" # because navigate cannot be implemented
-
-+no_copy_ctor "QIconEngine"
-+
- # --
- # QtXml
-
-diff --git a/src/gsiqt5/gsiDeclQtTypeTraits.h
b/src/gsiqt5/gsiDeclQtTypeTraits.h
-index eba0986..dd68128 100644
a/src/gsiqt5/gsiDeclQtTypeTraits.h
-+++ b/src/gsiqt5/gsiDeclQtTypeTraits.h
-@@ -3418,6 +3418,7 @@ template <> struct type_traits : public
type_traits {
- class QIconEngine_Adaptor;
- namespace tl {
- template <> struct type_traits : public
type_traits {
-+ typedef tl::false_tag has_copy_constructor;
- };
- }
-
---
-2.15.1
-
diff --git a/sci-electronics/klayout/files/klayout-0.25-qt59.patch
b/sci-electronics/klayout/files/klayout-0.25-qt59.patch
deleted file mode 100644
index 31f25055ca1..000
--- a/sci-electronics/klayout/files/klayout-0.25-qt59.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From cde03b075031efaa6e3f6d69356f077daa6da0dd Mon Sep 17 00:00:00 2001
-From: Matthias Koefferlein
-Date: Sun, 17 Dec 2017 15:30:37 +0100
-Subject: [PATCH] Replace WindowOkButtonHint, WindowCancelButtonHint
-
-This commit removes symbols which are not available on MacOS
-by a code-generation solution.
-
-These symbols are only required for WindowsCE so their
-unavailability on other systems is not a big loss.
-
-(cherry picked from commit 28ff493de71cbafa38e214b75dd6874b0226813f)
- scripts/mkqtdecl4/mkqtdecl.conf | 2 ++
- scripts/mkqtdecl5/mkqtdecl.conf | 2 ++
- src/gsiqt4/gsiDeclQt_3.cc | 4 +---
- src/gsiqt5/gsiDeclQt_4.cc | 4 +---
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/scripts/mkqtdecl4/mkqtdecl.conf b/scripts/mkqtdecl4/mkqtdecl.conf
-index 9e87acc..edf48ae 100644
a/scripts/mkqtdecl4/mkqtdecl.conf
-+++ b/scripts/mkqtdecl4/mkqtdecl.conf
-@@ -10,6 +10,8 @@
- # drops enum members
- drop_enum_const "Qt", /WindowType::WindowSoftkeysVisibleHint/
- drop_enum_const "Qt", /WindowType::WindowSoftkeysRespondHint/
-+drop_enum_const "Qt", /WindowType::WindowOkButtonHint/ # only available on CE
-+drop_enum_const "Qt", /WindowType::WindowCancelButtonHint/ # only available
on CE
-
- # --
- # QtCore
-diff --git a/scripts/mkqtdecl5/mkqtdecl.conf b/scripts/mkqtdecl5/mkqtdecl.conf
-index 311f08a..d2fd2e5 100644
a/scripts/mkqtdecl5/mkqtdecl.conf
-+++ b/scripts/mkqtdecl5/mkqtdecl.conf
-@@ -10,6 +10,8 @@
- # drops enum members
-
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/klayout/, sci-electronics/klayout/files/
commit: 521a210dd23dfcf3c969461dba1547d73b83f2d3
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sun Mar 18 14:59:12 2018 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Mon Mar 19 00:54:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=521a210d
sci-electronics/klayout: Remove old
Package-Manager: Portage-2.3.24, Repoman-2.3.6
sci-electronics/klayout/Manifest | 1 -
.../klayout-0.23.10-Makefile.conf.linux-gentoo | 45 --
...layout-0.24.9-c++11-no-throw-in-destuctor.patch | 34 ---
sci-electronics/klayout/klayout-0.24.10.ebuild | 70 --
4 files changed, 150 deletions(-)
diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
index 8a5e5634f5b..9a6ef10503a 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -1,2 +1 @@
-DIST klayout-0.24.10.tar.gz 11262007 BLAKE2B
85e8d325a56672e6ba328f5ebf793f3c977542ed857621e504983a77e7762d795bbde0f572fb0017328bdb5c11e453f0cd9decedf3629f8ff0f2a6a25daf28c2
SHA512
0043b91e2dae9321299c217697c93af27bc7d795209bdf95248eee3690b97728854f9f82cc95f77f05a2cfbcae6a716ae594fe2485e04ed0a3f5d950abc0a31b
DIST klayout-0.25.tar.gz 16461165 BLAKE2B
321d5c03b49b922b051407767f72135d0ff7e3fb0fe5dd237e27ce6c42d2b847f0bc4d96ae551c51b6581c0d39eb71f7053c8814dcb7afdfd027a24af9d553fd
SHA512
0c05b0786e7e1dbf8035cbb3888eff776c0b96a4fcf2ebbc3065fe43340ae020b6713c2e1d2e7ab5caaf64d7ec84bea9d691ba6c0aea88e93c957530d3d4d114
diff --git
a/sci-electronics/klayout/files/klayout-0.23.10-Makefile.conf.linux-gentoo
b/sci-electronics/klayout/files/klayout-0.23.10-Makefile.conf.linux-gentoo
deleted file mode 100644
index d51b60a31db..000
--- a/sci-electronics/klayout/files/klayout-0.23.10-Makefile.conf.linux-gentoo
+++ /dev/null
@@ -1,45 +0,0 @@
-
-# Configuration file for
-# gcc, Linux, 64bit
-# release build
-
-# Compiler options
-
-# Compiler general
-INC=-I$(TOP_SOURCE) -I$(SOURCE) -I. -I$(QTINCLUDE)
-DEFS=-DQT_THREAD_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII
-
-# C++
-CXXOPT_DEP=-MM -MG
-CXXWARN=-Wall -pedantic -Wno-deprecated -Woverloaded-virtual \
- -Wsign-promo -Wsynth -Wno-long-long -Wno-strict-aliasing
-CXXOPT=-c $(CXXFLAGS) -o
-CXXOPT_SO=-fPIC $(CXXOPT)
-
-# C
-CCOPT_DEP=-MM -MG
-CCWARN=
-CCOPT=-c $(CFLAGS) -o
-CCOPT_SO=-fPIC $(CCOPT)
-
-# Linker
-LINK=$(CXX)
-LOPT=-Wl,-E ${LDFLAGS} -o
-LOPT_SO=-shared -fPIC $(LOPT)
-
-LIBS=-L$(QTLIB) -lQtGui -lQtCore -lQtXml -lQtNetwork -lQtSql -lQtDesigner -lrt
-lstdc++ -lcrypt -ldl -lz -lpthread
-
-.PHONY: install
-install:
- mkdir -p $(INSTALL_BINDIR)
- cp main/$(EXEC_NAME) $(INSTALL_BINDIR)
- for bin in $(OTHER_BIN) ; \
- do \
- cp main/$$bin $(INSTALL_BINDIR) ; \
- done
- for plugin in $(PLUGINS) ; \
- do \
- cp $$plugin/*.so $(INSTALL_BINDIR) ; \
- done
- chmod 755 $(INSTALL_BINDIR) $(INSTALL_BINDIR)/*
-
diff --git
a/sci-electronics/klayout/files/klayout-0.24.9-c++11-no-throw-in-destuctor.patch
b/sci-electronics/klayout/files/klayout-0.24.9-c++11-no-throw-in-destuctor.patch
deleted file mode 100644
index 4cb6473d58c..000
---
a/sci-electronics/klayout/files/klayout-0.24.9-c++11-no-throw-in-destuctor.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-# Fixes "error: throw will always call terminate() [-Werror=terminate]".
Gentoo bug 612978.
-
a/src/tlAssert.h.old
-+++ b/src/tlAssert.h
-@@ -27,6 +27,16 @@
-
- #include "config.h"
-
-+// For >=C++11, mark assertion_failed() with attribute [[noreturn]] and call
std::terminate().
-+// Or else, throw int(0) to tell the compiler that the assertion will not
return.
-+#if __cplusplus < 201103L
-+#define ATTRIB_ASSERT KLAYOUT_DLL
-+#define END_ASSERT throw int(0)
-+#else
-+#define ATTRIB_ASSERT [[noreturn]] KLAYOUT_DLL
-+#define END_ASSERT std::terminate()
-+#endif
-+
- namespace tl
- {
-
-@@ -34,10 +44,10 @@
- * @brief The corresponding assert macro
- */
-
--KLAYOUT_DLL void assertion_failed (const char *filename, unsigned int line,
const char *condition);
-+ATTRIB_ASSERT void assertion_failed (const char *filename, unsigned int line,
const char *condition);
-
- // the throw int(0) instruction will tell the compiler that the assertion
will not return
--#define tl_assert(COND) if (!(COND)) { tl::assertion_failed (__FILE__,
__LINE__, #COND); throw int(0); }
-+#define tl_assert(COND) if (!(COND)) { tl::assertion_failed (__FILE__,
__LINE__, #COND); END_ASSERT; }
-
- } // namespace tl
-
diff --git a/sci-electronics/klayout/klayout-0.24.10.ebuild
b/sci-electronics/klayout/klayout-0.24.10.ebuild
deleted file mode 100644
index f4dfd05c1ec..000
--- a/sci-electronics/klayout/klayout-0.24.10.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22"
-# note: define maximally ONE
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/klayout/, sci-electronics/klayout/files/
commit: 770e5d6fdf74b2312b2049fe471c7c9c031486b4
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Sep 30 16:51:16 2017 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Sat Sep 30 16:51:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=770e5d6f
sci-electronics/klayout: Use CFLAGS etc
Package-Manager: Portage-2.3.10, Repoman-2.3.3
.../klayout/files/klayout--expert.patch| 104 +
sci-electronics/klayout/klayout-.ebuild| 7 +-
2 files changed, 108 insertions(+), 3 deletions(-)
diff --git a/sci-electronics/klayout/files/klayout--expert.patch
b/sci-electronics/klayout/files/klayout--expert.patch
new file mode 100644
index 000..6fb1b873430
--- /dev/null
+++ b/sci-electronics/klayout/files/klayout--expert.patch
@@ -0,0 +1,104 @@
+diff --git a/build.sh b/build.sh
+index ad9ac30..6a61904 100755
+--- a/build.sh
b/build.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ #
+ # KLayout Layout Viewer
+@@ -44,6 +44,7 @@ RPATH=""
+ MAKE_OPT=""
+
+ CONFIG="release"
++BUILD_EXPERT=0
+
+ # Check, whether build.sh is run from the top level folder
+ if ! [ -e src ] || ! [ -e src/klayout.pro ]; then
+@@ -75,6 +76,9 @@ while [ "$*" != "" ]; do
+ -debug)
+ CONFIG="debug"
+ ;;
++ -expert)
++BUILD_EXPERT=1
++;;
+ -python)
+ PYTHON="$1"
+ shift
+@@ -500,28 +504,53 @@ $QMAKE -v
+ # Force a minimum rebuild because of version info
+ touch $CURR_DIR/src/version/version.h
+
+-qmake_cmd="$QMAKE $CURR_DIR/src/klayout.pro -recursive \
+- CONFIG+=$CONFIG \
+- RUBYLIBFILE=$RUBYLIBFILE \
+- RUBYINCLUDE=$RUBYINCLUDE \
+- RUBYINCLUDE2=$RUBYINCLUDE2 \
+- RUBYVERSIONCODE=$RUBYVERSIONCODE \
+- HAVE_RUBY=$HAVE_RUBY \
+- PYTHONLIBFILE=$PYTHONLIBFILE \
+- PYTHONINCLUDE=$PYTHONINCLUDE \
+- HAVE_PYTHON=$HAVE_PYTHON \
+- HAVE_QTBINDINGS=$HAVE_QTBINDINGS \
+- HAVE_64BIT_COORD=$HAVE_64BIT_COORD \
+- HAVE_QT5=$HAVE_QT5 \
+- PREFIX='$BIN' \
+- RPATH='$RPATH' \
+- KLAYOUT_VERSION=$KLAYOUT_VERSION \
+- KLAYOUT_VERSION_DATE=$KLAYOUT_VERSION_DATE \
+- KLAYOUT_VERSION_REV=$KLAYOUT_VERSION_REV \
+-"
+-
+-echo $qmake_cmd
+-$qmake_cmd
++qmake_options=(
++ -recursive
++ CONFIG+="$CONFIG"
++ RUBYLIBFILE="$RUBYLIBFILE"
++ RUBYINCLUDE="$RUBYINCLUDE"
++ RUBYINCLUDE2="$RUBYINCLUDE2"
++ RUBYVERSIONCODE="$RUBYVERSIONCODE"
++ HAVE_RUBY="$HAVE_RUBY"
++ PYTHONLIBFILE="$PYTHONLIBFILE"
++ PYTHONINCLUDE="$PYTHONINCLUDE"
++ HAVE_PYTHON="$HAVE_PYTHON"
++ HAVE_QTBINDINGS="$HAVE_QTBINDINGS"
++ HAVE_64BIT_COORD="$HAVE_64BIT_COORD"
++ HAVE_QT5="$HAVE_QT5"
++ PREFIX="$BIN"
++ RPATH="$RPATH"
++ KLAYOUT_VERSION="$KLAYOUT_VERSION"
++ KLAYOUT_VERSION_DATE="$KLAYOUT_VERSION_DATE"
++ KLAYOUT_VERSION_REV="$KLAYOUT_VERSION_REV"
++)
++
++if [ $BUILD_EXPERT = 1 ]; then
++ qmake_options+=(
++QMAKE_AR="$AR cqs"
++QMAKE_LINK_C="$CC"
++QMAKE_LINK_C_SHLIB="$CC"
++QMAKE_LINK="$CXX"
++QMAKE_LINK_SHLIB="$CXX"
++QMAKE_OBJCOPY="$OBJCOPY"
++QMAKE_RANLIB=
++QMAKE_STRIP=
++QMAKE_CC="$CC"
++QMAKE_CXX="$CXX"
++QMAKE_CFLAGS="$CFLAGS"
++QMAKE_CFLAGS_RELEASE=
++QMAKE_CFLAGS_DEBUG=
++QMAKE_CXXFLAGS="$CXXFLAGS"
++QMAKE_CXXFLAGS_RELEASE=
++QMAKE_CXXFLAGS_DEBUG=
++QMAKE_LFLAGS="$LDFLAGS"
++QMAKE_LFLAGS_RELEASE=
++QMAKE_LFLAGS_DEBUG=
++ )
++fi
++
++echo $QMAKE "$CURR_DIR/src/klayout.pro" "${qmake_options[@]}"
++$QMAKE "$CURR_DIR/src/klayout.pro" "${qmake_options[@]}"
+
+ cd $CURR_DIR
+ echo ""
diff --git a/sci-electronics/klayout/klayout-.ebuild
b/sci-electronics/klayout/klayout-.ebuild
index 8b43bc444d3..a23a11d67fb 100644
--- a/sci-electronics/klayout/klayout-.ebuild
+++ b/sci-electronics/klayout/klayout-.ebuild
@@ -35,14 +35,15 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
-all_ruby_prepare() {
- default
-}
+PATCHES=(
+ "${FILESDIR}/${PN}--expert.patch"
+)
each_ruby_configure() {
tc-export CC CXX AR LD RANLIB
export CFLAGS CXXFLAGS
./build.sh \
+ -expert \
-dry-run \
-qmake /usr/lib64/qt5/bin/qmake \
-ruby "${RUBY}" \
