Version Bump, removed old patches

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 72 insertions, 70 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/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
-