commit: cf18b1de40c136c26cd7923e49df5c4b2a9c511b
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 19 14:30:48 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Apr 19 14:33:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf18b1de
sci-electronics/klayout: Version bump
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
sci-electronics/klayout/Manifest | 1 +
.../klayout/{klayout-9999.ebuild => klayout-0.26.4.ebuild} | 12 +++++++++---
sci-electronics/klayout/klayout-9999.ebuild | 12 +++++++++---
3 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
index bcd2e01bdfa..6505c62db0f 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -1 +1,2 @@
DIST klayout-0.25.6.tar.gz 21008915 BLAKE2B
f5e06790b8eac682b61bf83dce167c4c9eb8767d6bfb040e203ed2ec43b39781e64203c8319bf58ed2f4b7b2349d958f24a7ad1957bc27befa583b00eeee650c
SHA512
38d13bd6f0cef5685ef32ebf00edf07f588d445174e2a56320940a7036e65a3fbb11d1efab92af9f8abfce7e77c782df5f05460a7de4d98ade924c761396db5a
+DIST klayout-0.26.4.tar.gz 52324714 BLAKE2B
663ab737d91a83452234f128b13f73ed8e559e6f0fb11f283bce6bfe80e8f391c7bac5ad16933b2f5bcf46fac6e07233ffc690dea5ddb1702850c52501157c36
SHA512
df91434e87d8cc6f4df837eacd756566626405fb75b0cce40c25f157d547dc1e5929746b6b276a317512c038e014bbdd1655615c93d76d9ed5bcf65280d95355
diff --git a/sci-electronics/klayout/klayout-9999.ebuild
b/sci-electronics/klayout/klayout-0.26.4.ebuild
similarity index 87%
copy from sci-electronics/klayout/klayout-9999.ebuild
copy to sci-electronics/klayout/klayout-0.26.4.ebuild
index 127d36ffb70..e98e242fe19 100644
--- a/sci-electronics/klayout/klayout-9999.ebuild
+++ b/sci-electronics/klayout/klayout-0.26.4.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
RUBY_OPTIONAL=no
USE_RUBY="ruby25"
# note: define maximally ONE implementation here
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit toolchain-funcs python-single-r1 ruby-ng
@@ -78,7 +78,13 @@ each_ruby_install() {
cd "${T}/bin" || die
dodir "/usr/$(get_libdir)/klayout"
- mv lib* "${ED}/usr/$(get_libdir)/klayout/" || die
+ mv lib* lay_plugins db_plugins "${ED}/usr/$(get_libdir)/klayout/" || die
+
+ dodir "$(python_get_sitedir)"
+ mv pymod/* "${ED}/$(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 127d36ffb70..e98e242fe19 100644
--- a/sci-electronics/klayout/klayout-9999.ebuild
+++ b/sci-electronics/klayout/klayout-9999.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
RUBY_OPTIONAL=no
USE_RUBY="ruby25"
# note: define maximally ONE implementation here
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit toolchain-funcs python-single-r1 ruby-ng
@@ -78,7 +78,13 @@ each_ruby_install() {
cd "${T}/bin" || die
dodir "/usr/$(get_libdir)/klayout"
- mv lib* "${ED}/usr/$(get_libdir)/klayout/" || die
+ mv lib* lay_plugins db_plugins "${ED}/usr/$(get_libdir)/klayout/" || die
+
+ dodir "$(python_get_sitedir)"
+ mv pymod/* "${ED}/$(python_get_sitedir)/" || die
+ rmdir pymod || die
dobin *
+
+ python_optimize
}
