From c44791b7309a417521ab2abc9c9a0ab35bf7253e Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Fri, 3 Feb 2012 12:27:50 +0000 Subject: Moved to autotools-utils.eclass Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64 --- sci-libs/clipper/ChangeLog | 7 ++++-- sci-libs/clipper/Manifest | 14 +++++------ sci-libs/clipper/clipper-20100511-r1.ebuild | 38 +++++++++++++++-------------- 3 files changed, 32 insertions(+), 27 deletions(-) diff --git a/sci-libs/clipper/ChangeLog b/sci-libs/clipper/ChangeLog index 23699d626140..55181bcee4e2 100644 --- a/sci-libs/clipper/ChangeLog +++ b/sci-libs/clipper/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-libs/clipper -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/clipper/ChangeLog,v 1.14 2011/06/26 10:13:02 jlec Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/clipper/ChangeLog,v 1.15 2012/02/03 12:27:50 jlec Exp $ + + 03 Feb 2012; Justin Lecher clipper-20100511-r1.ebuild: + Moved to autotools-utils.eclass *clipper-20100511-r1 (26 Jun 2011) diff --git a/sci-libs/clipper/Manifest b/sci-libs/clipper/Manifest index 57ec207952fb..ffa97844cbd9 100644 --- a/sci-libs/clipper/Manifest +++ b/sci-libs/clipper/Manifest @@ -1,16 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 AUX 20091215-missing-var.patch 663 RMD160 ef35c47c98f599f2633f90c12bccd8691d994954 SHA1 e3d2df3b82ba359e95930c09e86a6449e885fb1f SHA256 abb3e83e3bcdfa1ba4ce8d382a8f490e70c2c761d574484a38741bba438a00d4 DIST clipper-2.1-100511-ac.tar.gz 993754 RMD160 8fc35e3c144c5e478730e25397211f99c61d411d SHA1 c147573fb53e26944862e8ebdea8fb3c632616ae SHA256 00d470af423c015022934d5a12fde36c86d5729227f41e1139d7c6513368b7aa -EBUILD clipper-20100511-r1.ebuild 1359 RMD160 f25c56361dcb3bf4c0c7453515712f37e8d00e2c SHA1 cedefc05cbeecc0fd8abcaf59bfebdc47ed75ffc SHA256 e72c78137866a06a2a6f7e647b9c87cc1f461d35538b22267eb45b8dc2a0ca1a +EBUILD clipper-20100511-r1.ebuild 1440 RMD160 7f57beeaaf6e16b54ed004a728bd65188ada1699 SHA1 75088b30f0db1f8ebcf4764e1dbfac6dbbd03b55 SHA256 bbf85fa111442a19eca15ba40f3e11a4c383bbfbdfce454f76c8615aadd20467 EBUILD clipper-20100511.ebuild 1453 RMD160 9c18db983377eff3b08c3213bb60903da7394f85 SHA1 648771942c48914209dfadac74d167115bfb1915 SHA256 1712c29c5c4315ec3f1db17c3fab0a437152f5f68963717a8b819550584e4e9a -MISC ChangeLog 2342 RMD160 45376f0a77a7cfbf6879fc4fbd7609343336624d SHA1 c30dc33a0fa34d1cbdb67273a1ad1898ccaab7c0 SHA256 bfd2f73e19352eda4f3a8858d2f9aa627a6acfb6f49c01ef16c80338953ab57b +MISC ChangeLog 2452 RMD160 602450987a3b443cf1419a19821ca5b44ba79ca3 SHA1 a81f5473bc692e168689401cbf6070ce03be3c1f SHA256 302a0088102b4d81afd0561a8678341897ecd2845a79c7f91222fc9ade7a07de MISC metadata.xml 167 RMD160 ea4003a55d6e2079381a540c441fc59cde29025a SHA1 3bc6dc4dd68f7de22828138e62aa117387b1765d SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk4HBjQACgkQgAnW8HDreRaybwCeNsjv+zPyLxr8+SiRmAfdB9Di -b9gAnAl1RwjcelIvCQf5dla4RIL7wfrn -=Gpto +iEYEAREKAAYFAk8r0ssACgkQgAnW8HDreRa3GgCgs9YzrenUusEsPl2+Js9QpgIi +QtUAni52FN4/aqvOnd6tTcRF+Hc7lzmX +=PLpW -----END PGP SIGNATURE----- diff --git a/sci-libs/clipper/clipper-20100511-r1.ebuild b/sci-libs/clipper/clipper-20100511-r1.ebuild index 77a615368bb2..e89a42fe1663 100644 --- a/sci-libs/clipper/clipper-20100511-r1.ebuild +++ b/sci-libs/clipper/clipper-20100511-r1.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/clipper/clipper-20100511-r1.ebuild,v 1.1 2011/06/26 10:13:02 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/clipper/clipper-20100511-r1.ebuild,v 1.2 2012/02/03 12:27:50 jlec Exp $ EAPI=4 -WANT_AUTOMAKE="1.11" +AUTOTOOLS_AUTORECONF=true -inherit autotools eutils flag-o-matic +inherit autotools-utils eutils flag-o-matic DESCRIPTION="Object-oriented libraries for crystallographic data and crystallographic computation" HOMEPAGE="http://www.ysbl.york.ac.uk/~cowtan/clipper/clipper.html" @@ -16,7 +16,7 @@ SRC_URI="http://www.ysbl.york.ac.uk/~cowtan/clipper/clipper-2.1-${PV:2:${#PV}}-a LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="debug" +IUSE="debug static-libs" RDEPEND=" sci-libs/ccp4-libs @@ -26,13 +26,13 @@ DEPEND="${RDEPEND}" S="${WORKDIR}"/${PN}-2.1 -src_prepare() { - epatch "${FILESDIR}"/20091215-missing-var.patch +PATCHES=( "${FILESDIR}"/20091215-missing-var.patch ) +src_prepare() { # ccp4 provides these, and more. sed -i -e "s:examples::g" "${S}"/Makefile.am - AT_M4DIR="config" eautoreconf + autotools-utils_src_prepare } src_configure() { @@ -40,20 +40,22 @@ src_configure() { # on 64-bit systems append-flags -fno-strict-aliasing - econf \ - --enable-ccp4 \ - --enable-cif \ - --enable-cns \ - --enable-contrib \ - --enable-minimol \ - --enable-mmdb \ - --enable-phs \ - --with-mmdb="${EPREFIX}"/usr \ + local myeconfargs=( + --enable-ccp4 + --enable-cif + --enable-cns + --enable-contrib + --enable-minimol + --enable-mmdb + --enable-phs + --with-mmdb="${EPREFIX}"/usr $(use_enable debug) + ) + autotools-utils_src_configure } src_test() { emake \ - -C examples \ + -C "${AUTOTOOLS_BUILD_DIR}"/examples \ check } -- cgit v1.2.3-65-gdbad