From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4AB4E1396D0 for ; Sat, 7 Oct 2017 09:25:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 884A22BC007; Sat, 7 Oct 2017 09:25:51 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5A4022BC007 for ; Sat, 7 Oct 2017 09:25:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E64B834175A for ; Sat, 7 Oct 2017 09:25:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 882369096 for ; Sat, 7 Oct 2017 09:25:48 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1507368333.1fdb0bcfc939df9627bb06171b8ca58a8d67dfdb.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/klayout/files/, sci-electronics/klayout/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-electronics/klayout/files/klayout-9999-expert.patch sci-electronics/klayout/klayout-9999.ebuild X-VCS-Directories: sci-electronics/klayout/files/ sci-electronics/klayout/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 1fdb0bcfc939df9627bb06171b8ca58a8d67dfdb X-VCS-Branch: master Date: Sat, 7 Oct 2017 09:25:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2e73459e-45bc-4a94-8fb5-8261cba392d6 X-Archives-Hash: aede0284aa19c57f579062d29d3656c5 commit: 1fdb0bcfc939df9627bb06171b8ca58a8d67dfdb Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Oct 7 09:24:27 2017 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Sat Oct 7 09:25:33 2017 +0000 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-9999-expert.patch | 104 --------------------- sci-electronics/klayout/klayout-9999.ebuild | 9 +- 2 files changed, 1 insertion(+), 112 deletions(-) diff --git a/sci-electronics/klayout/files/klayout-9999-expert.patch b/sci-electronics/klayout/files/klayout-9999-expert.patch deleted file mode 100644 index 6fb1b873430..00000000000 --- a/sci-electronics/klayout/files/klayout-9999-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-9999.ebuild b/sci-electronics/klayout/klayout-9999.ebuild index c7e32ad87f9..d6a39fafedf 100644 --- a/sci-electronics/klayout/klayout-9999.ebuild +++ b/sci-electronics/klayout/klayout-9999.ebuild @@ -37,10 +37,6 @@ RDEPEND=" " DEPEND="${RDEPEND}" -PATCHES=( - "${FILESDIR}/${PN}-9999-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() {