Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/coot/
Date: Tue, 10 Jan 2012 09:30:19
Message-Id: a40ae16549f33fcc190573ceda444c340e7ef48e.jlec@gentoo
1 commit: a40ae16549f33fcc190573ceda444c340e7ef48e
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 9 12:05:48 2012 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 9 12:21:50 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a40ae165
7
8 Bumped EAPI to 4 and added new eautoreconf handling of autotools-utils.eclass
9
10 (Portage version: 2.2.0_alpha84/git/Linux x86_64, signed Manifest commit with key 70EB7916)
11
12 ---
13 sci-chemistry/coot/ChangeLog | 5 ++++-
14 sci-chemistry/coot/coot-9999.ebuild | 14 ++++++--------
15 2 files changed, 10 insertions(+), 9 deletions(-)
16
17 diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog
18 index 67820ad..2360874 100644
19 --- a/sci-chemistry/coot/ChangeLog
20 +++ b/sci-chemistry/coot/ChangeLog
21 @@ -1,7 +1,10 @@
22 # ChangeLog for sci-chemistry/coot
23 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
24 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
25 # $Header: $
26
27 + 09 Jan 2012; Justin Lecher <jlec@g.o> coot-9999.ebuild:
28 + Bumped EAPI to 4 and added new eautoreconf handling of autotools-utils.eclass
29 +
30 07 Oct 2011; Justin Lecher <jlec@g.o> coot-9999.ebuild:
31 Added dep on >=sys-devel/libtool-2.4-r2
32
33
34 diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coot-9999.ebuild
35 index 7f65c3c..f2e7ea3 100644
36 --- a/sci-chemistry/coot/coot-9999.ebuild
37 +++ b/sci-chemistry/coot/coot-9999.ebuild
38 @@ -1,10 +1,11 @@
39 -# Copyright 1999-2011 Gentoo Foundation
40 +# Copyright 1999-2012 Gentoo Foundation
41 # Distributed under the terms of the GNU General Public License v2
42 # $Header: $
43
44 -EAPI=3
45 +EAPI=4
46
47 PYTHON_DEPEND="2"
48 +AUTOTOOLS_AUTORECONF="true"
49
50 inherit autotools-utils python subversion toolchain-funcs versionator
51
52 @@ -14,19 +15,16 @@ MY_S_P=${MY_S2_P}-${PR/r/revision-}
53 MY_PV=${PV}
54 MY_P=${PN}-${MY_PV}
55
56 -ESVN_REPO_URI="http://coot.googlecode.com/svn/trunk"
57 -
58 DESCRIPTION="Crystallographic Object-Oriented Toolkit for model building, completion and validation"
59 HOMEPAGE="http://www.biop.ox.ac.uk/coot/"
60 SRC_URI="test? ( http://www.biop.ox.ac.uk/coot/devel/greg-data.tar.gz )"
61 +ESVN_REPO_URI="http://coot.googlecode.com/svn/trunk"
62
63 SLOT="0"
64 LICENSE="GPL-3"
65 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
66 IUSE="+openmp static-libs test"
67
68 -AUTOTOOLS_IN_SOURCE_BUILD=1
69 -
70 SCIDEPS="
71 >=sci-libs/ccp4-libs-6.1
72 >=sci-libs/clipper-20090520
73 @@ -71,6 +69,8 @@ DEPEND="${RDEPEND}
74
75 S="${WORKDIR}"
76
77 +AUTOTOOLS_IN_SOURCE_BUILD=1
78 +
79 pkg_setup() {
80 if use openmp; then
81 tc-has-openmp || die "Please use an OPENMP capable compiler"
82 @@ -105,8 +105,6 @@ src_prepare() {
83 }
84 }
85 EOF
86 -
87 - eautoreconf
88 }
89
90 src_configure() {