[gentoo-commits] repo/gentoo:master commit in: sci-electronics/klayout/files/, sci-electronics/klayout/
commit: 70b98edc7ceb825ac3b52ec0efac213b5d8cae1d Author: Andreas K. Huettel gentoo org> AuthorDate: Wed Dec 12 21:27:01 2018 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Wed Dec 12 21:27:36 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70b98edc sci-electronics/klayout: Version bump, for ruby 2.4 and gcc 8 See https://github.com/klayoutmatthias/klayout/issues/127 for the source of the patch. Bug: https://bugs.gentoo.org/672986 Closes: https://bugs.gentoo.org/672990 Closes: https://bugs.gentoo.org/669340 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.6-gcc8.patch| 18 ++ .../{klayout-.ebuild => klayout-0.25.6.ebuild} | 8 ++-- sci-electronics/klayout/klayout-.ebuild| 4 ++-- 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest index 9a6ef10503a..34d25dd2f01 100644 --- a/sci-electronics/klayout/Manifest +++ b/sci-electronics/klayout/Manifest @@ -1 +1,2 @@ +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.6-gcc8.patch b/sci-electronics/klayout/files/klayout-0.25.6-gcc8.patch new file mode 100644 index 000..250290f3490 --- /dev/null +++ b/sci-electronics/klayout/files/klayout-0.25.6-gcc8.patch @@ -0,0 +1,18 @@ +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-.ebuild b/sci-electronics/klayout/klayout-0.25.6.ebuild similarity index 94% copy from sci-electronics/klayout/klayout-.ebuild copy to sci-electronics/klayout/klayout-0.25.6.ebuild index 98b5a4200ed..d5a9f0b3aaf 100644 --- a/sci-electronics/klayout/klayout-.ebuild +++ b/sci-electronics/klayout/klayout-0.25.6.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 RUBY_OPTIONAL=no -USE_RUBY="ruby23" +USE_RUBY="ruby24" # note: define maximally ONE implementation here PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) @@ -44,6 +44,10 @@ RDEPEND=" " DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}/${P}-gcc8.patch" +) + pkg_setup() { python-single-r1_pkg_setup ruby-ng_pkg_setup diff --git a/sci-electronics/klayout/klayout-.ebuild b/sci-electronics/klayout/klayout-.ebuild index 98b5a4200ed..941995116f5 100644 --- a/sci-electronics/klayout/klayout-.ebuild +++ b/sci-electronics/klayout/klayout-.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 RUBY_OPTIONAL=no -USE_RUBY="ruby23" +USE_RUBY="ruby24" # note: define maximally ONE implementation here PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/klayout/files/, sci-electronics/klayout/
commit: 20efdba7b39f8f8c6cc136bd314e2c5beb09cac3 Author: Andreas K. Hüttel gentoo org> AuthorDate: Thu Dec 28 11:42:29 2017 + Commit: Andreas Hüttel gentoo org> CommitDate: Thu Dec 28 11:42:50 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20efdba7 sci-electronics/klayout: Add one more patch, restore keywords. See also: https://github.com/klayoutmatthias/klayout/issues/47 https://github.com/klayoutmatthias/klayout/commit/28ff493de71cbafa38e214b75dd6874b0226813f Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../klayout/files/klayout-0.25-qt59.patch | 78 ++ sci-electronics/klayout/klayout-0.25.ebuild| 7 +- 2 files changed, 83 insertions(+), 2 deletions(-) diff --git a/sci-electronics/klayout/files/klayout-0.25-qt59.patch b/sci-electronics/klayout/files/klayout-0.25-qt59.patch new file mode 100644 index 000..31f25055ca1 --- /dev/null +++ b/sci-electronics/klayout/files/klayout-0.25-qt59.patch @@ -0,0 +1,78 @@ +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 + 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 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 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 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
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/klayout/files/, sci-electronics/klayout/
commit: 924de845e09c14313584dbd75f87ee82bd01b989 Author: Andreas K. Hüttel gentoo org> AuthorDate: Wed Dec 27 23:29:07 2017 + Commit: Andreas Hüttel gentoo org> CommitDate: Wed Dec 27 23:29:43 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=924de845 sci-electronics/klayout: Add backported patch. Build still fails. See also https://github.com/klayoutmatthias/klayout/issues/47 https://github.com/klayoutmatthias/klayout/issues/34 https://github.com/klayoutmatthias/klayout/commit/11cb5eb99836e043d71b556af010b29624c3f569 Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../klayout/files/klayout-0.25-qt58.patch | 38 ++ sci-electronics/klayout/klayout-0.25.ebuild| 2 ++ 2 files changed, 40 insertions(+) diff --git a/sci-electronics/klayout/files/klayout-0.25-qt58.patch b/sci-electronics/klayout/files/klayout-0.25-qt58.patch new file mode 100644 index 000..544bf2992c6 --- /dev/null +++ b/sci-electronics/klayout/files/klayout-0.25-qt58.patch @@ -0,0 +1,38 @@ +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/klayout-0.25.ebuild b/sci-electronics/klayout/klayout-0.25.ebuild index 157da060047..e3b40dead5b 100644 --- a/sci-electronics/klayout/klayout-0.25.ebuild +++ b/sci-electronics/klayout/klayout-0.25.ebuild @@ -37,6 +37,8 @@ RDEPEND=" " DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/${P}-qt58.patch" ) + pkg_setup() { python-single-r1_pkg_setup ruby-ng_pkg_setup
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/klayout/files/, sci-electronics/klayout/
commit: 1fdb0bcfc939df9627bb06171b8ca58a8d67dfdb Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Oct 7 09:24:27 2017 + Commit: Andreas Hüttel gentoo org> CommitDate: Sat Oct 7 09:25:33 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fdb0bcf sci-electronics/klayout: Simplify; remove upstreamed patch Package-Manager: Portage-2.3.11, Repoman-2.3.3 .../klayout/files/klayout--expert.patch| 104 - sci-electronics/klayout/klayout-.ebuild| 9 +- 2 files changed, 1 insertion(+), 112 deletions(-) diff --git a/sci-electronics/klayout/files/klayout--expert.patch b/sci-electronics/klayout/files/klayout--expert.patch deleted file mode 100644 index 6fb1b873430..000 --- a/sci-electronics/klayout/files/klayout--expert.patch +++ /dev/null @@ -1,104 +0,0 @@ -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 c7e32ad87f9..d6a39fafedf 100644 --- a/sci-electronics/klayout/klayout-.ebuild +++ b/sci-electronics/klayout/klayout-.ebuild @@ -37,10 +37,6 @@ RDEPEND=" " DEPEND="${RDEPEND}" -PATCHES=( - "${FILESDIR}/${PN}--expert.patch" -) - pkg_setup() { python-single-r1_pkg_setup ruby-ng_pkg_setup @@ -61,10 +57,7 @@ each_ruby_configure() { -option "${MAKEOPTS}" \ -with-qtbinding \ -without-64bit-coord \ - -qt5 \ - -qtbin /usr/lib64/qt5/bin \ - -qtinc /usr/include/qt5 \ - -qtlib "/usr/$(get_libdir)/qt5" || die "Configuration failed" + -qt5 || die "Configuration failed" } each_ruby_compile() {
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/klayout/files/, sci-electronics/klayout/
commit: 7ad2c402e2e1a7998ea1724f7675d126b8b5b6bc Author: Peter Levine gmail com> AuthorDate: Tue Mar 21 00:05:31 2017 + Commit: David Seifert gentoo org> CommitDate: Sun Apr 16 18:57:14 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ad2c402 sci-electronics/klayout: Fix "error: throw will always call terminate()" (bug #612978) Package-Manager: Portage-2.3.5, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/4267 ...layout-0.24.9-c++11-no-throw-in-destuctor.patch | 34 ++ sci-electronics/klayout/klayout-0.24.9.ebuild | 4 ++- 2 files changed, 37 insertions(+), 1 deletion(-) 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 new file mode 100644 index 000..4cb6473d58c --- /dev/null +++ b/sci-electronics/klayout/files/klayout-0.24.9-c++11-no-throw-in-destuctor.patch @@ -0,0 +1,34 @@ +# 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.9.ebuild b/sci-electronics/klayout/klayout-0.24.9.ebuild index ff57ef39774..8c7ca923bbd 100644 --- a/sci-electronics/klayout/klayout-0.24.9.ebuild +++ b/sci-electronics/klayout/klayout-0.24.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -27,6 +27,8 @@ RDEPEND=" DEPEND="${RDEPEND}" all_ruby_prepare() { + epatch "${FILESDIR}"/${P}-c++11-no-throw-in-destuctor.patch + # now we generate the stub build configuration file for the home-brew build system cp "${FILESDIR}/${PN}-0.23.10-Makefile.conf.linux-gentoo" "${S}/config/Makefile.conf.linux-gentoo" || die }
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/klayout/files/
commit: 83c998928d5743cb0a4c2a15d279bcc086588bd9 Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Tue Jan 31 17:44:17 2017 + Commit: David Seifert gentoo org> CommitDate: Wed Feb 1 22:40:43 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83c99892 sci-electronics/klayout: remove unused patch/file Closes: https://github.com/gentoo/gentoo/pull/3740 .../klayout-0.21.7-Makefile.conf.linux-gentoo | 43 -- .../klayout/files/klayout-0.22.8-noautoruby.patch | 18 - 2 files changed, 61 deletions(-) diff --git a/sci-electronics/klayout/files/klayout-0.21.7-Makefile.conf.linux-gentoo b/sci-electronics/klayout/files/klayout-0.21.7-Makefile.conf.linux-gentoo deleted file mode 100644 index 32d75df.. --- a/sci-electronics/klayout/files/klayout-0.21.7-Makefile.conf.linux-gentoo +++ /dev/null @@ -1,43 +0,0 @@ - -# Configuration file for gentoo-linux -# Compiler options - -# Compiler general -INC=-I$(TOP_SOURCE) -I$(SOURCE) -I. -I$(QTINCLUDE) -DEFS=-DQT_THREAD_SUPPORT -DQT3_SUPPORT - -# 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) -o - -LIBS=-L$(QTLIB) -lQtGui -lQtCore -lQtXml -lrt -lstdc++ -lcrypt -ldl -lz - -.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.22.8-noautoruby.patch b/sci-electronics/klayout/files/klayout-0.22.8-noautoruby.patch deleted file mode 100644 index fe96fb9.. --- a/sci-electronics/klayout/files/klayout-0.22.8-noautoruby.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ruN klayout-0.22.8.orig/build.sh klayout-0.22.8/build.sh klayout-0.22.8.orig/build.sh 2013-06-22 00:43:11.0 +0200 -+++ klayout-0.22.8/build.sh2013-10-13 20:13:36.493108910 +0200 -@@ -62,10 +62,10 @@ - RUBYINCLUDE2="not-used" - RUBYLIBFILE="" - --RUBY="" --if [ "`ruby1.9 -v`" != "" ]; then RUBY="ruby1.9"; fi --if [ "`ruby1.8 -v`" != "" ]; then RUBY="ruby1.8"; fi --if [ "`ruby -v`" != "" ]; then RUBY="ruby"; fi -+#RUBY="" -+#if [ "`ruby1.9 -v`" != "" ]; then RUBY="ruby1.9"; fi -+#if [ "`ruby1.8 -v`" != "" ]; then RUBY="ruby1.8"; fi -+#if [ "`ruby -v`" != "" ]; then RUBY="ruby"; fi - if [ "$RUBY" != "" ]; then - - echo "Found ruby interpreter: $RUBY"