Version Bump, removed old patches

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 78 insertions, 76 deletions

diff --git a/sci-libs/clipper/ChangeLog b/sci-libs/clipper/ChangeLog
index 2311d745d6f2..a31c3c278cd9 100644
--- a/sci-libs/clipper/ChangeLog
+++ b/sci-libs/clipper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/clipper
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/clipper/ChangeLog,v 1.6 2010/04/05 18:05:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/clipper/ChangeLog,v 1.7 2010/04/16 21:00:08 jlec Exp $
+
+*clipper-20100416 (16 Apr 2010)
+
+  16 Apr 2010; Justin Lecher <jlec@gentoo.org>
+  -files/20070528-as-needed.patch, +clipper-20100416.ebuild,
+  -files/20070907-as-needed.patch:
+  Version Bump, removed old patches
 
   05 Apr 2010; Justin Lecher <jlec@gentoo.org> clipper-20091215.ebuild:
   Keyworded for ~x86-linux ~amd64-linux, tested by me
diff --git a/sci-libs/clipper/Manifest b/sci-libs/clipper/Manifest
index 64f72122ab92..512ddf0a776f 100644
--- a/sci-libs/clipper/Manifest
+++ b/sci-libs/clipper/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 20070528-as-needed.patch 884 RMD160 9bf79566b547f700b136c645c59b6aaf7126880f SHA1 6bbe32356d0cc6a1737dbfa8d0e68792f2b61ae7 SHA256 e6654df312419335c0e1886a23b685462f5ce08f5745e36f78f29a509fd6acbd
-AUX 20070907-as-needed.patch 1879 RMD160 fb87f61edb1e0abc09eb60d8702f3c0536dbefa5 SHA1 699ea4c3e8ada36b8f597f660e23c5bd07002796 SHA256 799740dcacb98ba2f00a9f57c909e213d5d3b620fdfd8149dbe652a27a8d6d62
 AUX 20091215-missing-var.patch 663 RMD160 ef35c47c98f599f2633f90c12bccd8691d994954 SHA1 e3d2df3b82ba359e95930c09e86a6449e885fb1f SHA256 abb3e83e3bcdfa1ba4ce8d382a8f490e70c2c761d574484a38741bba438a00d4
 DIST clipper-2.1-091215-ac.tar.gz 991480 RMD160 de1c64634ddfa33dd8877138734905518b527964 SHA1 50dc24186bc3cbe798c0e7a68e43cfb62fec4127 SHA256 395f0338ca405805fa577d19105430cc740630ab8eea37d753864722a157ed85
+DIST clipper-2.1-100416-ac.tar.gz 993387 RMD160 e1cc6c71e8f3474016b9295e8453ed8d1acde553 SHA1 fdf8c492acce71991063d02e08cbd550c53930fd SHA256 eade98d028d239e338d69f542e325df660e45a60d51eeb93e8b66a5468692da7
 EBUILD clipper-20091215.ebuild 1488 RMD160 735a9b75a842aef28560d28ea175881cfc1aa3d9 SHA1 7e1884e18ab54e6c3b2b78e52b08a39c2065c24c SHA256 e62bce6bc5058c8502683a94107481f3df3be1e165ef03569a0029950f184387
-MISC ChangeLog 1406 RMD160 c7537ab02d4b124e8f0f94f77594bf9478a3d670 SHA1 c11837b8b46797149c7e5442c13d2d922537797e SHA256 46c3713516596a8b1a05f70ea7e5073a4f6d52757909e15b9ffe2fd8a857ed50
+EBUILD clipper-20100416.ebuild 1491 RMD160 2919b88205dc3ea6e54c36afafb0ebfe289ff667 SHA1 0dfff94fd6058bf1bef68d7b2d9578a0f576f0fa SHA256 5011242ef09006087084cb5d23b48b67003b8c6cb05da62d368a742dc1f6277c
+MISC ChangeLog 1619 RMD160 044e91cd20cba6b7e30f5ebb9b25e5d768235efd SHA1 b752e59c28f8f7b81aae9b1b6bfe4b2e81a62f0d SHA256 bdc3f8513a439df502081e7730e24d9ceeda81e65cd36bde73073233aafb9dde
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAku6JnsACgkQgAnW8HDreRY/JgCfVNb7mSwYicWTdO1vjz4dfZH0
-ELcAoIu0Jb1X4SNm/E/f+cZPtXnd8JQL
-=aAfh
+iEYEARECAAYFAkvIz98ACgkQgAnW8HDreRZJegCgrZZcDcLZPlx+cJC/N/jX3270
+8eQAoKivKf9N6to+W/Zf1VSgl/jkv3rq
+=yXFr
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/clipper/clipper-20100416.ebuild b/sci-libs/clipper/clipper-20100416.ebuild
new file mode 100644
index 000000000000..072aee836eb4
--- /dev/null
+++ b/sci-libs/clipper/clipper-20100416.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/clipper/clipper-20100416.ebuild,v 1.1 2010/04/16 21:00:08 jlec Exp $
+
+EAPI="3"
+
+WANT_AUTOMAKE="1.11"
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="Object-oriented libraries for the organisation of crystallographic data and the performance of crystallographic computation"
+HOMEPAGE="http://www.ysbl.york.ac.uk/~cowtan/clipper/clipper.html"
+# Transform 4-digit year to 2 digits
+SRC_URI="http://www.ysbl.york.ac.uk/~cowtan/clipper/clipper-2.1-${PV:2:${#PV}}-ac.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	sci-libs/ccp4-libs
+	sci-libs/fftw
+	sci-libs/mmdb"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${PN}-2.1
+
+src_prepare() {
+	epatch "${FILESDIR}"/20091215-missing-var.patch
+
+	# ccp4 provides these, and more.
+	sed -i -e "s:examples::g" "${S}"/Makefile.am
+
+	AT_M4DIR="config" eautoreconf
+}
+
+src_configure() {
+	# Recommended on ccp4bb/coot ML to fix crashes when calculating maps
+	# 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 \
+		$(use_enable debug)
+}
+
+src_test() {
+	emake \
+		-C examples \
+		check || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README ChangeLog NEWS || die
+}
diff --git a/sci-libs/clipper/files/20070528-as-needed.patch b/sci-libs/clipper/files/20070528-as-needed.patch
deleted file mode 100644
index c8be326da998..000000000000
--- a/sci-libs/clipper/files/20070528-as-needed.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urN clipper.orig/clipper/ccp4/Makefile.am clipper/clipper/ccp4/Makefile.am
---- clipper.orig/clipper/ccp4/Makefile.am	2007-05-28 16:38:56.000000000 -0700
-+++ clipper/clipper/ccp4/Makefile.am	2007-05-28 16:41:35.000000000 -0700
-@@ -12,6 +12,6 @@
- 
- library_includedir = $(pkgincludedir)/ccp4
- 
--libclipper_ccp4_la_LDFLAGS = -version-info $(PACKAGE_VERSION)
-+libclipper_ccp4_la_LDFLAGS = -version-info $(PACKAGE_VERSION) $(CCP4_LIBS)
- 
- ####
-diff -urN clipper.orig/clipper/core/Makefile.am clipper/clipper/core/Makefile.am
---- clipper.orig/clipper/core/Makefile.am	2007-05-28 16:38:56.000000000 -0700
-+++ clipper/clipper/core/Makefile.am	2007-05-28 16:40:33.000000000 -0700
-@@ -29,6 +29,6 @@
- 
- lib_LTLIBRARIES = libclipper-core.la
- 
--libclipper_core_la_LDFLAGS = -version-info $(PACKAGE_VERSION)
-+libclipper_core_la_LDFLAGS = -version-info $(PACKAGE_VERSION) $(FFTW_LIBS)
- 
- ####
diff --git a/sci-libs/clipper/files/20070907-as-needed.patch b/sci-libs/clipper/files/20070907-as-needed.patch
deleted file mode 100644
index b8c7103bdf12..000000000000
--- a/sci-libs/clipper/files/20070907-as-needed.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -urN clipper.orig/clipper/ccp4/Makefile.am clipper/clipper/ccp4/Makefile.am
---- clipper.orig/clipper/ccp4/Makefile.am	2007-11-13 15:16:40.000000000 -0800
-+++ clipper/clipper/ccp4/Makefile.am	2007-11-13 17:30:00.000000000 -0800
-@@ -12,6 +12,6 @@
- 
- library_includedir = $(pkgincludedir)/ccp4
- 
--libclipper_ccp4_la_LDFLAGS = -version-info @CLIPPER_LT_VERSION@
-+libclipper_ccp4_la_LDFLAGS = -version-info @CLIPPER_LT_VERSION@ $(CCP4_LIBS)
- 
- ####
-diff -urN clipper.orig/clipper/core/Makefile.am clipper/clipper/core/Makefile.am
---- clipper.orig/clipper/core/Makefile.am	2007-11-13 15:16:40.000000000 -0800
-+++ clipper/clipper/core/Makefile.am	2007-11-13 17:30:00.000000000 -0800
-@@ -29,6 +29,6 @@
- 
- lib_LTLIBRARIES = libclipper-core.la
- 
--libclipper_core_la_LDFLAGS = -version-info @CLIPPER_LT_VERSION@
-+libclipper_core_la_LDFLAGS = -version-info @CLIPPER_LT_VERSION@ $(FFTW_LIBS)
- 
- ####
-diff -urN clipper.orig/clipper/minimol/Makefile.am clipper/clipper/minimol/Makefile.am
---- clipper.orig/clipper/minimol/Makefile.am	2007-11-13 15:16:40.000000000 -0800
-+++ clipper/clipper/minimol/Makefile.am	2007-11-13 19:22:44.000000000 -0800
-@@ -24,6 +24,7 @@
- 
- library_includedir = $(pkgincludedir)/minimol
- 
--libclipper_minimol_la_LDFLAGS = -version-info @CLIPPER_LT_VERSION@
-+libclipper_minimol_la_LDFLAGS = -version-info @CLIPPER_LT_VERSION@ \
-+	$(top_builddir)/clipper/mmdb/libclipper-mmdb.la
- 
- ####
-diff -urN clipper.orig/clipper/mmdb/Makefile.am clipper/clipper/mmdb/Makefile.am
---- clipper.orig/clipper/mmdb/Makefile.am	2007-11-13 15:16:40.000000000 -0800
-+++ clipper/clipper/mmdb/Makefile.am	2007-11-13 19:22:15.000000000 -0800
-@@ -9,7 +9,8 @@
- 
- library_includedir = $(pkgincludedir)/mmdb
- 
--libclipper_mmdb_la_LDFLAGS = -version-info @CLIPPER_LT_VERSION@
-+libclipper_mmdb_la_LDFLAGS = -version-info @CLIPPER_LT_VERSION@ \
-+	$(MMDB_LIBS)
- 
- EXTRA_DIST = clipper_mmdb_dox
-