1 |
commit: fe3895ee4ac82d1273d2214d3f9e1ccc33cb894a |
2 |
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de> |
3 |
AuthorDate: Sat Feb 7 10:45:00 2015 +0000 |
4 |
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 7 10:46:35 2015 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fe3895ee |
7 |
|
8 |
sci-libs/cgnstools: Move to EAPI=5 |
9 |
|
10 |
--- |
11 |
sci-libs/cgnstools/ChangeLog | 6 +++++- |
12 |
sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild | 17 ++++++----------- |
13 |
2 files changed, 11 insertions(+), 12 deletions(-) |
14 |
|
15 |
diff --git a/sci-libs/cgnstools/ChangeLog b/sci-libs/cgnstools/ChangeLog |
16 |
index bf02371..5c85164 100644 |
17 |
--- a/sci-libs/cgnstools/ChangeLog |
18 |
+++ b/sci-libs/cgnstools/ChangeLog |
19 |
@@ -1,7 +1,11 @@ |
20 |
# ChangeLog for sci-libs/cgnstools |
21 |
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
22 |
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
23 |
# $Header: $ |
24 |
|
25 |
+ 07 Feb 2015; Marius Brehler <marbre@××××××××××××××.de> |
26 |
+ cgnstools-2.5.4-r1.ebuild: |
27 |
+ Move to EAPI=5 |
28 |
+ |
29 |
19 May 2010; Oliver Borm (boroli) <oli.borm@×××.de> |
30 |
cgnstools-2.5.4-r1.ebuild, +files/cgnstools-2.5.4_gcc4.4.patch: |
31 |
Fixed gcc-4.4 compile problems |
32 |
|
33 |
diff --git a/sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild b/sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild |
34 |
index 21c70a5..d47de5c 100644 |
35 |
--- a/sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild |
36 |
+++ b/sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild |
37 |
@@ -1,8 +1,8 @@ |
38 |
-# Copyright 1999-2014 Gentoo Foundation |
39 |
+# Copyright 1999-2015 Gentoo Foundation |
40 |
# Distributed under the terms of the GNU General Public License v2 |
41 |
# $Header: $ |
42 |
|
43 |
-EAPI="2" |
44 |
+EAPI=5 |
45 |
|
46 |
inherit eutils multilib versionator |
47 |
|
48 |
@@ -41,24 +41,19 @@ src_configure() { |
49 |
if use tcl ; then |
50 |
TCLVER="$(echo 'puts [info tclversion]' | $(type -P tclsh))" |
51 |
myconf="${myconf} $(use_with tcl tcl /usr/$(get_libdir)/tcl${TCLVER})" |
52 |
- sed -i -e "s|TKLIBS = |TKLIBS = -ltcl${TCLVER} |" make.defs.in |
53 |
+ sed -i -e "s|TKLIBS = |TKLIBS = -ltcl${TCLVER} |" make.defs.in || die |
54 |
fi |
55 |
|
56 |
if use tk ; then |
57 |
# no, there's no tkversion, and type -P wish requires running X |
58 |
TKVER="$(echo 'puts [info tclversion]' | $(type -P tclsh))" |
59 |
myconf="${myconf} $(use_with tk tk /usr/$(get_libdir)/tk${TKVER})" |
60 |
- sed -i -e "s|TKLIBS = |TKLIBS = -ltk${TKVER} |" make.defs.in |
61 |
+ sed -i -e "s|TKLIBS = |TKLIBS = -ltk${TKVER} |" make.defs.in || die |
62 |
fi |
63 |
|
64 |
econf \ |
65 |
$(use_with X x) \ |
66 |
- ${myconf} \ |
67 |
- || die "econf failed" |
68 |
+ ${myconf} |
69 |
|
70 |
- sed -i -e "s|${D}||" cgconfig |
71 |
-} |
72 |
- |
73 |
-src_install() { |
74 |
- emake DESTDIR="${D}" install || die "install failed" |
75 |
+ sed -i -e "s|${D}||" cgconfig || die |
76 |
} |