From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- sci-electronics/klayout/Manifest | 8 +- .../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 --------------------- sci-electronics/klayout/klayout-0.26.4-r1.ebuild | 2 +- sci-electronics/klayout/klayout-0.26.5.ebuild | 90 ++++++++++++++++++++++ 6 files changed, 94 insertions(+), 200 deletions(-) delete mode 100644 sci-electronics/klayout/files/klayout-0.25.6-gcc8.patch delete mode 100644 sci-electronics/klayout/klayout-0.25.6-r1.ebuild delete mode 100644 sci-electronics/klayout/klayout-0.25.6.ebuild create mode 100644 sci-electronics/klayout/klayout-0.26.5.ebuild (limited to 'sci-electronics/klayout') diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest index d93f418dee9c..7c22f3e38bca 100644 --- a/sci-electronics/klayout/Manifest +++ b/sci-electronics/klayout/Manifest @@ -1,8 +1,6 @@ -AUX klayout-0.25.6-gcc8.patch 527 BLAKE2B bd9d1ebac1a4f4679f076a3bedb67b3a4fe040338e0d63a7e25e5fb523707b7525ab7a9088122c75aa0a16e34e6e262efe097f5f96ff6db72b1d5add8f7192c5 SHA512 3280052ef3d9caf78d716c8cfb6e33205bbd2c9543f52bfe28e5c23749b3bbf8ed59edf7bbc8b8a96753f0e90484dcaacaad39c4ccbc2bebe979520589589f46 -DIST klayout-0.25.6.tar.gz 21008915 BLAKE2B f5e06790b8eac682b61bf83dce167c4c9eb8767d6bfb040e203ed2ec43b39781e64203c8319bf58ed2f4b7b2349d958f24a7ad1957bc27befa583b00eeee650c SHA512 38d13bd6f0cef5685ef32ebf00edf07f588d445174e2a56320940a7036e65a3fbb11d1efab92af9f8abfce7e77c782df5f05460a7de4d98ade924c761396db5a DIST klayout-0.26.4.tar.gz 52324714 BLAKE2B 663ab737d91a83452234f128b13f73ed8e559e6f0fb11f283bce6bfe80e8f391c7bac5ad16933b2f5bcf46fac6e07233ffc690dea5ddb1702850c52501157c36 SHA512 df91434e87d8cc6f4df837eacd756566626405fb75b0cce40c25f157d547dc1e5929746b6b276a317512c038e014bbdd1655615c93d76d9ed5bcf65280d95355 -EBUILD klayout-0.25.6-r1.ebuild 1720 BLAKE2B 2fd529e3218859fbebbda2c88020ab87aa9d075c319556cbf016ad4e1b379eb8d0fc0468d60efb0bb4708521430de6303bd5bd4dd4404e2c0ee254acd87e7589 SHA512 085e8da2cba98c4493a47eae35cbe7edefd38276f875f33f777c7650a4dff110ce80423673e2194b7be01d4b6fb8624c0f7938ea4fc4af9942b19aa718740d28 -EBUILD klayout-0.25.6.ebuild 1719 BLAKE2B 08c62d695cf828e0c224cc5c8076750d9bba96e21c43f6a130c3714ff4b36cc0a4980c5928aec7a278a1a3c6e226ad550854274db6905ab892fe05d7353cd92a SHA512 ea824d3b5a719542f9042173874e8992728996f9c92d1b3d715ea4d3ad669005f1f896c3d173fa306034eb3371e9dacd7a25eb485065c5a06f98ff058a2b387f -EBUILD klayout-0.26.4-r1.ebuild 1839 BLAKE2B ebf02ff39559da3d6a4f20e7027447e88461af7f6ab34b9dda4dad3a3adda0a0227e869576c5eb34f75c1029a61df4eb690721b4985d4f82b4e4d92afceac03c SHA512 38d243703148e912550c7b1d979eb621f9c7deebb289b092cf42c88ab7403bcdba2a60c1a75f6dbf8db40b14d4cc28c545d20373799e635d10ffca1fdc8c4437 +DIST klayout-0.26.5.tar.gz 52335763 BLAKE2B b1ab39c378ce23c28f5a58191dbf43c5b8c165e9df241b00573c8f8b72a5a7251cddd41bf62a7e37f59cad68024c52ab99f8d0f10bf1bf45dba975bf37ba80db SHA512 b80dff34a9dd538921f6863fc94eb8a2160b989468ec0493a7ecfdfccea0e4f0441aa1ee860d000b150b0a0bc0b831dcb849ab77e9eb1304e9ed6fcced94689c +EBUILD klayout-0.26.4-r1.ebuild 1838 BLAKE2B bf2c3445ab7625124bed08a64ff3973340823eafad89b234737336c70d5864c2a20a966f8fc59c0cb675f375fbcda95fbd9d5f1850403c5d603cf5f629190045 SHA512 d0fa0f591028c6074347576b0747f210971fd447e429d4bc23126c12d2492a034b0506827bb765d06fcdd77fac8bae358c6f88467dd6ed55397a2cddbd954dfc +EBUILD klayout-0.26.5.ebuild 1839 BLAKE2B ebf02ff39559da3d6a4f20e7027447e88461af7f6ab34b9dda4dad3a3adda0a0227e869576c5eb34f75c1029a61df4eb690721b4985d4f82b4e4d92afceac03c SHA512 38d243703148e912550c7b1d979eb621f9c7deebb289b092cf42c88ab7403bcdba2a60c1a75f6dbf8db40b14d4cc28c545d20373799e635d10ffca1fdc8c4437 EBUILD klayout-9999.ebuild 1839 BLAKE2B ebf02ff39559da3d6a4f20e7027447e88461af7f6ab34b9dda4dad3a3adda0a0227e869576c5eb34f75c1029a61df4eb690721b4985d4f82b4e4d92afceac03c SHA512 38d243703148e912550c7b1d979eb621f9c7deebb289b092cf42c88ab7403bcdba2a60c1a75f6dbf8db40b14d4cc28c545d20373799e635d10ffca1fdc8c4437 MISC metadata.xml 380 BLAKE2B 3961dc3b4b0a6f3de5460e01e434f8ba1e4504247aac8cb40553d0752ece4f4be7e9d5fefee9d61e85681631eb200959b341c6aeda60b89c14119f95a40f4aa6 SHA512 92ee6b53a7dfed04d5a2aef510e0f2f0dcc70903258d5d4cb6ee497521cbb41214b7a45000693a0ecb66029767a48988c45b9b7fb78a09dc813710a9283d2f7d 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 250290f34901..000000000000 --- 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.000000000 +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 &operator--() -+ { -+ --m_n; -+ return *this; -+ } -+ - SortedCellIndexIterator &operator+=(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 8435a07aa8ce..000000000000 --- 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} = 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" -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 be589a0f90ec..000000000000 --- a/sci-electronics/klayout/klayout-0.25.6.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="ruby24" -# note: define maximally ONE implementation here - -PYTHON_COMPAT=( python3_6 ) - -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" -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.26.4-r1.ebuild b/sci-electronics/klayout/klayout-0.26.4-r1.ebuild index 30250478884e..d0ce619c189e 100644 --- a/sci-electronics/klayout/klayout-0.26.4-r1.ebuild +++ b/sci-electronics/klayout/klayout-0.26.4-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" diff --git a/sci-electronics/klayout/klayout-0.26.5.ebuild b/sci-electronics/klayout/klayout-0.26.5.ebuild new file mode 100644 index 000000000000..30250478884e --- /dev/null +++ b/sci-electronics/klayout/klayout-0.26.5.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +RUBY_OPTIONAL=no +USE_RUBY="ruby25" +# note: define maximally ONE implementation here + +PYTHON_COMPAT=( python3_{6,7,8} ) + +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" +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}" + +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* 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 +} -- cgit v1.2.3