From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7B460138A1A for ; Sun, 8 Feb 2015 21:07:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1FFCBE0876; Sun, 8 Feb 2015 21:07:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 07E28E0881 for ; Sun, 8 Feb 2015 21:07:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EFC42340750 for ; Sun, 8 Feb 2015 21:07:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 64EF111597 for ; Sun, 8 Feb 2015 21:07:48 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: <1423305995.fe3895ee4ac82d1273d2214d3f9e1ccc33cb894a.ottxor@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/cgnstools/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/cgnstools/ChangeLog sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild X-VCS-Directories: sci-libs/cgnstools/ X-VCS-Committer: ottxor X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: fe3895ee4ac82d1273d2214d3f9e1ccc33cb894a X-VCS-Branch: master Date: Sun, 8 Feb 2015 21:07: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: b58e0796-ac18-4c5b-93ef-50b15cbb7cc5 X-Archives-Hash: 784b794c6d6f06904f03c6aef9598842 commit: fe3895ee4ac82d1273d2214d3f9e1ccc33cb894a Author: Marius Brehler linux sungazer de> AuthorDate: Sat Feb 7 10:45:00 2015 +0000 Commit: Christoph Junghans gentoo org> CommitDate: Sat Feb 7 10:46:35 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fe3895ee sci-libs/cgnstools: Move to EAPI=5 --- sci-libs/cgnstools/ChangeLog | 6 +++++- sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild | 17 ++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/sci-libs/cgnstools/ChangeLog b/sci-libs/cgnstools/ChangeLog index bf02371..5c85164 100644 --- a/sci-libs/cgnstools/ChangeLog +++ b/sci-libs/cgnstools/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for sci-libs/cgnstools -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 07 Feb 2015; Marius Brehler + cgnstools-2.5.4-r1.ebuild: + Move to EAPI=5 + 19 May 2010; Oliver Borm (boroli) cgnstools-2.5.4-r1.ebuild, +files/cgnstools-2.5.4_gcc4.4.patch: Fixed gcc-4.4 compile problems diff --git a/sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild b/sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild index 21c70a5..d47de5c 100644 --- a/sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild +++ b/sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="2" +EAPI=5 inherit eutils multilib versionator @@ -41,24 +41,19 @@ src_configure() { if use tcl ; then TCLVER="$(echo 'puts [info tclversion]' | $(type -P tclsh))" myconf="${myconf} $(use_with tcl tcl /usr/$(get_libdir)/tcl${TCLVER})" - sed -i -e "s|TKLIBS = |TKLIBS = -ltcl${TCLVER} |" make.defs.in + sed -i -e "s|TKLIBS = |TKLIBS = -ltcl${TCLVER} |" make.defs.in || die fi if use tk ; then # no, there's no tkversion, and type -P wish requires running X TKVER="$(echo 'puts [info tclversion]' | $(type -P tclsh))" myconf="${myconf} $(use_with tk tk /usr/$(get_libdir)/tk${TKVER})" - sed -i -e "s|TKLIBS = |TKLIBS = -ltk${TKVER} |" make.defs.in + sed -i -e "s|TKLIBS = |TKLIBS = -ltk${TKVER} |" make.defs.in || die fi econf \ $(use_with X x) \ - ${myconf} \ - || die "econf failed" + ${myconf} - sed -i -e "s|${D}||" cgconfig -} - -src_install() { - emake DESTDIR="${D}" install || die "install failed" + sed -i -e "s|${D}||" cgconfig || die }