[gentoo-commits] proj/sci:master commit in: sci-libs/cgnstools/

[gentoo-commits] proj/sci:master commit in: sci-libs/cgnstools/

[Justin Lecher]

commit:     fed0d1600f5e5293629cb4a6f3dbc891174438e0
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 15:00:57 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 15:00:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fed0d160

Sort inherit and/or USE

(Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild b/sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild
index d0f57de..f1526cd 100644
--- a/sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild
+++ b/sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit eutils versionator multilib
+inherit eutils multilib versionator
 
 MY_P="${PN}-$(replace_all_version_separators '-')"
 

[gentoo-commits] proj/sci:master commit in: sci-libs/cgnstools/

[Christoph Junghans]

commit:     fe3895ee4ac82d1273d2214d3f9e1ccc33cb894a
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sat Feb  7 10:45:00 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> 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 <marbre@linux.sungazer.de>
+  cgnstools-2.5.4-r1.ebuild:
+  Move to EAPI=5
+
   19 May 2010; Oliver Borm (boroli) <oli.borm@web.de>
   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
 }

[gentoo-commits] proj/sci:master commit in: sci-libs/cgnstools/

[Justin Lecher]

commit:     d786e71e19cac05e56ed0393f287b45df4686ba8
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 17:33:18 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 17:33:18 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=d786e71e

sci-libs/cgnstools: Add subslot operators

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild b/sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild
index 7abf975..4382192 100644
--- a/sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild
+++ b/sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild
@@ -17,20 +17,25 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="hdf5 tcl tk X"
 
-DEPEND="hdf5? ( sci-libs/cgnslib[hdf5] )
+DEPEND="
+	hdf5? ( sci-libs/cgnslib[hdf5] )
 	!hdf5? ( sci-libs/cgnslib[-hdf5] )
-	tcl? ( dev-lang/tcl )
-	tk? ( dev-lang/tk )"
+	tcl? ( dev-lang/tcl:0= )
+	tk? ( dev-lang/tk:0= )"
 
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${PN}
 
+PATCHES=(
+	"${FILESDIR}"/${P}.patch
+	"${FILESDIR}"/${P}_cgns_to_vtk2D.patch
+	"${FILESDIR}"/${P}_gcc4.4.patch
+	"${FILESDIR}"/${P}_tcltk.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}.patch
-	epatch "${FILESDIR}"/${P}_cgns_to_vtk2D.patch
-	epatch "${FILESDIR}"/${P}_gcc4.4.patch
-	epatch "${FILESDIR}"/${P}_tcltk.patch
+	epatch "${PATCHES[@]}"
 }
 
 src_configure() {