aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-01-09 13:05:48 +0100
committerJustin Lecher <jlec@gentoo.org>2012-01-09 13:21:50 +0100
commita40ae16549f33fcc190573ceda444c340e7ef48e (patch)
tree662a2f2e52faa7e1fd6371d06fdee0b3d3bc77e9
parentMerge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci (diff)
downloadsci-a40ae16549f33fcc190573ceda444c340e7ef48e.tar.gz
sci-a40ae16549f33fcc190573ceda444c340e7ef48e.tar.bz2
sci-a40ae16549f33fcc190573ceda444c340e7ef48e.zip
Bumped EAPI to 4 and added new eautoreconf handling of autotools-utils.eclass
(Portage version: 2.2.0_alpha84/git/Linux x86_64, signed Manifest commit with key 70EB7916)
-rw-r--r--sci-chemistry/coot/ChangeLog5
-rw-r--r--sci-chemistry/coot/Manifest16
-rw-r--r--sci-chemistry/coot/coot-9999.ebuild14
3 files changed, 23 insertions, 12 deletions
diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog
index 67820adf4..2360874cf 100644
--- a/sci-chemistry/coot/ChangeLog
+++ b/sci-chemistry/coot/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for sci-chemistry/coot
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 09 Jan 2012; Justin Lecher <jlec@gentoo.org> coot-9999.ebuild:
+ Bumped EAPI to 4 and added new eautoreconf handling of autotools-utils.eclass
+
07 Oct 2011; Justin Lecher <jlec@gentoo.org> coot-9999.ebuild:
Added dep on >=sys-devel/libtool-2.4-r2
diff --git a/sci-chemistry/coot/Manifest b/sci-chemistry/coot/Manifest
index 192e95c99..a17bc17ce 100644
--- a/sci-chemistry/coot/Manifest
+++ b/sci-chemistry/coot/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
AUX 9999-clipper-config.patch 431 RMD160 7a00939760bc4c062bbde1a65f53b9556b93c3bc SHA1 0d72c4c898fd29802c74d237b54f715444922956 SHA256 9ae9129e733d845ad2e4dd505bc5e0987147fc3a5e5dd2457b5857643809db2f
AUX 9999-gl.patch 383 RMD160 6460e87e4da57ff845f96f072dec1354ed117bee SHA1 00bc0bbfc7d4fb00ebc8477941469bef2ed6b670 SHA256 9d47a6cf2d0c7644b945f88acdc7af146df4f9a5a8f883a0e72e1bc8ccf8b380
AUX 9999-goocanvas.patch 702 RMD160 9b26975eb658f15dfd806e47be9c11bcb7f850db SHA1 37bb70847ced34b754fe7cf5fea878b93bb6ed12 SHA256 162b21a3afb2d523df315ec021faf7a6497eb3b4fe00f90f601527fe1c22621a
@@ -7,7 +10,14 @@ AUX 9999-lidia.patch 518 RMD160 bc1ac82f5d0e1c51f5cebaceb758ca306ea638d9 SHA1 7e
AUX 9999-mmdb-config.patch 479 RMD160 8026b5420940726547200e51db7ce82d7706702c SHA1 e1b1c9ea87fdb2fa5d6c7301d397986d6a9afc4a SHA256 0b7d61f9c5f9664672286e82a790d4dea1673ed1537ef62b59142ced97685d82
AUX 9999-ssm.patch 1276 RMD160 8c7eef0034efc2c57bd774fe8ebb1bd0ba9c7aa2 SHA1 8812f35fba16a45b21ecce5243fd26d6105e29e3 SHA256 42f1098b0d56f85125293ca24410061e7a9bee10c94ba6e9fd3496439368bf75
AUX 9999-test.patch 457 RMD160 1a3e0956d8b7f051fdd964524c0ba9eabf8c2aca SHA1 a8f9584be09cc58e7cb55801115e9649b05aa910 SHA256 494ef09e407c3047145c250c70b90c7679a1c5b9f84c57a680e40580bd980397
-DIST greg-data.tar.gz 8045698 RMD160 c656248cfa9393c2d112fe6f4ac4ad0f92105079 SHA1 35d66df183e062cc87a32fdfde28d62235024a24 SHA256 2d3834f9df5f5351c7836d10cc9ceb83365241606cfb5541ceffc6e3db459c9f
-EBUILD coot-9999.ebuild 4347 RMD160 2bd255b5f1e6c7a20b00f3bd60410d569597e042 SHA1 5b796cd24aa104b80c206d0052eecc4dce083ad1 SHA256 8f0dd2c6776f53fe04bc9de9abf3254ea8aa5cd4c61aaa2c39a6559e269d5210
-MISC ChangeLog 10879 RMD160 34a6f0521e721483ad1927d2b2eee79722ab6483 SHA1 392ffd3d4298a6aeb56e84da46612fb5a2c67602 SHA256 fcb5e450053ad770b5a3f5264ada856831ee8e058cd39c697449513c8b7cc95f
+DIST greg-data.tar.gz 4124740 RMD160 833665e29579927995055428c4c4644551b83d5f SHA1 36744d34fb1a961f313f43e129d4b0f2d7b245e7 SHA256 1552bea1d9d5e2d7c0edc2106d8129e315749425b20c4a376b78d835cab54f73
+EBUILD coot-9999.ebuild 4360 RMD160 4ff4253dea8d7454947fe0e139bcb8845e3c4e56 SHA1 ab1a445e42838b1f412af26e34a5259175943414 SHA256 91769c92d14d393a93d0f6152c80731e09a3d1e5a3eff9377872c0645e0eb4fc
+MISC ChangeLog 11025 RMD160 267afbc7bd43e86ed13528080649e6be73c80036 SHA1 4cab6752a899f6d51c97fef276c517662a7e0e99 SHA256 cc9402cd201c24d3fb3ba685b377618e0dcbfa17fb8a850bd85871dd3aa5c566
MISC metadata.xml 319 RMD160 80eb4c36751a2b07e69008f9d0365d6fc2f1c538 SHA1 960646b24d87ce1aeede1a5868369a210fe78fea SHA256 2d462ee4581dee63a68a0900cb183b02ad8b004601ba9e1e2e9ca60e8c12d96e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEAREKAAYFAk8K2BwACgkQgAnW8HDreRZGcQCghB1fhQq6BoKQ7ZrIJzSCjzcT
+1U4Anj/C5hP6Qy5uSt76UptAfwx52PGA
+=+/c+
+-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coot-9999.ebuild
index 7f65c3c3a..f2e7ea358 100644
--- a/sci-chemistry/coot/coot-9999.ebuild
+++ b/sci-chemistry/coot/coot-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=3
+EAPI=4
PYTHON_DEPEND="2"
+AUTOTOOLS_AUTORECONF="true"
inherit autotools-utils python subversion toolchain-funcs versionator
@@ -14,19 +15,16 @@ MY_S_P=${MY_S2_P}-${PR/r/revision-}
MY_PV=${PV}
MY_P=${PN}-${MY_PV}
-ESVN_REPO_URI="http://coot.googlecode.com/svn/trunk"
-
DESCRIPTION="Crystallographic Object-Oriented Toolkit for model building, completion and validation"
HOMEPAGE="http://www.biop.ox.ac.uk/coot/"
SRC_URI="test? ( http://www.biop.ox.ac.uk/coot/devel/greg-data.tar.gz )"
+ESVN_REPO_URI="http://coot.googlecode.com/svn/trunk"
SLOT="0"
LICENSE="GPL-3"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="+openmp static-libs test"
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
SCIDEPS="
>=sci-libs/ccp4-libs-6.1
>=sci-libs/clipper-20090520
@@ -71,6 +69,8 @@ DEPEND="${RDEPEND}
S="${WORKDIR}"
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
pkg_setup() {
if use openmp; then
tc-has-openmp || die "Please use an OPENMP capable compiler"
@@ -105,8 +105,6 @@ src_prepare() {
}
}
EOF
-
- eautoreconf
}
src_configure() {