sci-electronics/klayout: Switch to ruby23, add missing Qt5 deps

Closes: https://bugs.gentoo.org/645614
Closes: https://bugs.gentoo.org/644872
Package-Manager: Portage-2.3.20, Repoman-2.3.6

diff --git a/sci-electronics/klayout/klayout-0.25-r1.ebuild b/sci-electronics/klayout/klayout-0.25-r1.ebuild
new file mode 100644 (file)
index 0000000..5d833f3
--- /dev/null
+++ b/sci-electronics/klayout/klayout-0.25-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+RUBY_OPTIONAL=no
+USE_RUBY="ruby23"
+# note: define maximally ONE implementation here
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit eutils multilib 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="http://www.klayout.org/downloads/source/${P}.tar.gz"
+       KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts"
+HOMEPAGE="http://www.klayout.de/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+       dev-qt/designer:5
+       dev-qt/qtcore:5
+       dev-qt/qtgui:5
+       dev-qt/qtmultimedia:5[widgets]
+       dev-qt/qtnetwork:5
+       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}-qt58.patch"
+       "${FILESDIR}/${P}-qt59.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-9999.ebuild b/sci-electronics/klayout/klayout-9999.ebuild
index ad17c9f8d6080b3d615249fff21355e09f3f8725..405eec9ad3cff1d7c94f1df1a2c862c6a1a42644 100644 (file)
--- a/sci-electronics/klayout/klayout-9999.ebuild
+++ b/sci-electronics/klayout/klayout-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,7 +30,14 @@ RDEPEND="
        dev-qt/designer:5
        dev-qt/qtcore:5
        dev-qt/qtgui:5
+       dev-qt/qtmultimedia:5
+       dev-qt/qtnetwork:5
+       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)