commit: 865539e57322ccc2f516dd7e1faf31b8cd985cd7 Author: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Fri Dec 14 17:11:58 2018 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Fri Dec 14 17:11:58 2018 +0000 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 <dilfridge <AT> 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 f5e06790b8eac682b61bf83dce167c4c9eb8767d6bfb040e203ed2ec43b39781e64203c8319bf58ed2f4b7b2349d958f24a7ad1957bc27befa583b00eeee650c 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..00000000000 --- 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 <[email protected]> -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<QIconEngine> : public type_traits<void> { - class QIconEngine_Adaptor; - namespace tl { - template <> struct type_traits<QIconEngine_Adaptor> : public type_traits<void> { -+ 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..00000000000 --- 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 <[email protected]> -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 - 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/src/gsiqt4/gsiDeclQt_3.cc b/src/gsiqt4/gsiDeclQt_3.cc -index 0055145..4f74bb9 100644 ---- a/src/gsiqt4/gsiDeclQt_3.cc -+++ b/src/gsiqt4/gsiDeclQt_3.cc -@@ -453,9 +453,7 @@ static gsi::Enum<Qt::WindowType> decl_Qt_WindowType_Enum ("Qt_WindowType", - gsi::enum_const ("WindowStaysOnBottomHint", Qt::WindowStaysOnBottomHint, "@brief Enum constant Qt::WindowStaysOnBottomHint") + - gsi::enum_const ("WindowCloseButtonHint", Qt::WindowCloseButtonHint, "@brief Enum constant Qt::WindowCloseButtonHint") + - gsi::enum_const ("MacWindowToolBarButtonHint", Qt::MacWindowToolBarButtonHint, "@brief Enum constant Qt::MacWindowToolBarButtonHint") + -- gsi::enum_const ("BypassGraphicsProxyWidget", Qt::BypassGraphicsProxyWidget, "@brief Enum constant Qt::BypassGraphicsProxyWidget") + -- gsi::enum_const ("WindowOkButtonHint", Qt::WindowOkButtonHint, "@brief Enum constant Qt::WindowOkButtonHint") + -- gsi::enum_const ("WindowCancelButtonHint", Qt::WindowCancelButtonHint, "@brief Enum constant Qt::WindowCancelButtonHint"), -+ gsi::enum_const ("BypassGraphicsProxyWidget", Qt::BypassGraphicsProxyWidget, "@brief Enum constant Qt::BypassGraphicsProxyWidget"), - "@qt\n@brief This class represents the Qt::WindowType enum"); - - static gsi::QFlagsClass<Qt::WindowType > decl_Qt_WindowType_Enums ("Qt_QFlags_WindowType", -diff --git a/src/gsiqt5/gsiDeclQt_4.cc b/src/gsiqt5/gsiDeclQt_4.cc -index b768649..6c7fb4b 100644 ---- a/src/gsiqt5/gsiDeclQt_4.cc -+++ b/src/gsiqt5/gsiDeclQt_4.cc -@@ -153,9 +153,7 @@ static gsi::Enum<Qt::WindowType> decl_Qt_WindowType_Enum ("Qt_WindowType", - gsi::enum_const ("MacWindowToolBarButtonHint", Qt::MacWindowToolBarButtonHint, "@brief Enum constant Qt::MacWindowToolBarButtonHint") + - gsi::enum_const ("BypassGraphicsProxyWidget", Qt::BypassGraphicsProxyWidget, "@brief Enum constant Qt::BypassGraphicsProxyWidget") + - gsi::enum_const ("NoDropShadowWindowHint", Qt::NoDropShadowWindowHint, "@brief Enum constant Qt::NoDropShadowWindowHint") + -- gsi::enum_const ("WindowFullscreenButtonHint", Qt::WindowFullscreenButtonHint, "@brief Enum constant Qt::WindowFullscreenButtonHint") + -- gsi::enum_const ("WindowOkButtonHint", Qt::WindowOkButtonHint, "@brief Enum constant Qt::WindowOkButtonHint") + -- gsi::enum_const ("WindowCancelButtonHint", Qt::WindowCancelButtonHint, "@brief Enum constant Qt::WindowCancelButtonHint"), -+ gsi::enum_const ("WindowFullscreenButtonHint", Qt::WindowFullscreenButtonHint, "@brief Enum constant Qt::WindowFullscreenButtonHint"), - "@qt\n@brief This class represents the Qt::WindowType enum"); - - static gsi::QFlagsClass<Qt::WindowType > decl_Qt_WindowType_Enums ("Qt_QFlags_WindowType", --- -2.15.1 - diff --git a/sci-electronics/klayout/klayout-0.25-r2.ebuild b/sci-electronics/klayout/klayout-0.25-r2.ebuild deleted file mode 100644 index 416e30fc6c7..00000000000 --- a/sci-electronics/klayout/klayout-0.25-r2.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# 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 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="" - -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}-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 * -}
