[gentoo-commits] proj/sci:ccp4 commit in: sci-libs/clipper/, sci-libs/clipper/files/

[Justin Lecher]

commit:     aec5808d5af9a23dc710abc3e7477d0395b91648
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  1 15:01:58 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jun  1 15:01:58 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=aec5808d

sci-libs/clipper: Version Bump

Package-Manager: portage-2.2.0_alpha177

---
 sci-libs/clipper/ChangeLog                         |  7 +++++
 sci-libs/clipper/clipper-2.1_p20130528.ebuild      |  6 ++++
 ...0130528.ebuild => clipper-2.1_p20130601.ebuild} |  0
 .../clipper/files/clipper-2.1_p20130528-pc-2.patch | 36 ++++++++++++++++++++++
 .../clipper/files/clipper-2.1_p20130528-pc.patch   | 16 ++++++++++
 5 files changed, 65 insertions(+)

diff --git a/sci-libs/clipper/ChangeLog b/sci-libs/clipper/ChangeLog
index 0e970e6..d767bf3 100644
--- a/sci-libs/clipper/ChangeLog
+++ b/sci-libs/clipper/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-libs/clipper/ChangeLog,v 1.22 2013/05/28 18:15:50 jlec Exp $
 
+*clipper-2.1_p20130601 (01 Jun 2013)
+
+  01 Jun 2013; Justin Lecher <jlec@g.o> clipper-2.1_p20130528.ebuild,
+  +clipper-2.1_p20130601.ebuild, +files/clipper-2.1_p20130528-pc.patch,
+  +files/clipper-2.1_p20130528-pc-2.patch:
+  Version Bump
+
   30 May 2013; Justin Lecher <jlec@g.o> clipper-2.1_p20130528.ebuild:
   Bump EAPI to 5, clean unused code, fix slot of fftw dep
 

diff --git a/sci-libs/clipper/clipper-2.1_p20130528.ebuild b/sci-libs/clipper/clipper-2.1_p20130528.ebuild
index 5e486bc..bbe1011 100644
--- a/sci-libs/clipper/clipper-2.1_p20130528.ebuild
+++ b/sci-libs/clipper/clipper-2.1_p20130528.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=5
 
+AUTOTOOLS_AUTORECONF=true
+
 inherit autotools-utils flag-o-matic
 
 MY_PV=${PV/_p/.}
@@ -26,6 +28,10 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/${MY_P}
 
+PATCHES=(
+	"${FILESDIR}"/${P}-pc.patch
+	"${FILESDIR}"/${P}-pc-2.patch )
+
 src_configure() {
 	# Recommended on ccp4bb/coot ML to fix crashes when calculating maps
 	# on 64-bit systems

diff --git a/sci-libs/clipper/clipper-2.1_p20130528.ebuild b/sci-libs/clipper/clipper-2.1_p20130601.ebuild
similarity index 100%
copy from sci-libs/clipper/clipper-2.1_p20130528.ebuild
copy to sci-libs/clipper/clipper-2.1_p20130601.ebuild

diff --git a/sci-libs/clipper/files/clipper-2.1_p20130528-pc-2.patch b/sci-libs/clipper/files/clipper-2.1_p20130528-pc-2.patch
new file mode 100644
index 0000000..ac832d1
--- /dev/null
+++ b/sci-libs/clipper/files/clipper-2.1_p20130528-pc-2.patch
@@ -0,0 +1,36 @@
+ configure.ac | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7a56297..8173052 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -67,17 +67,17 @@ case $host_os in
+     ;;
+ esac
+ 
+-CLIPPER_LIBS="clipper-core"
+-test "x$enable_contrib" != xno && CLIPPER_LIBS="clipper-contrib $CLIPPER_LIBS"
+-test "x$enable_phs" != xno     && CLIPPER_LIBS="clipper-phs $CLIPPER_LIBS"
+-test "x$enable_cns" != xno     && CLIPPER_LIBS="clipper-cns $CLIPPER_LIBS"
+-test "x$enable_mmdb" = xyes    && CLIPPER_LIBS="clipper-mmdb $CLIPPER_LIBS"
+-test "x$enable_mmdbold" = xyes && CLIPPER_LIBS="clipper-mmdbold $CLIPPER_LIBS"
+-test "x$enable_minimol" = xyes && CLIPPER_LIBS="clipper-minimol $CLIPPER_LIBS"
+-test "x$enable_cif" = xyes     && CLIPPER_LIBS="clipper-cif $CLIPPER_LIBS"
+-test "x$enable_ccp4" = xyes    && CLIPPER_LIBS="clipper-ccp4 $CLIPPER_LIBS"
+-#test "x$enable_cctbx" = xyes   && CLIPPER_LIBS="clipper-cctbx $CLIPPER_LIBS"
+-test "x$enable_fortran" = xyes && CLIPPER_LIBS="clipper-fortran $CLIPPER_LIBS"
++CLIPPER_LIBS="-lclipper-core"
++test "x$enable_contrib" != xno && CLIPPER_LIBS="-lclipper-contrib $CLIPPER_LIBS"
++test "x$enable_phs" != xno     && CLIPPER_LIBS="-lclipper-phs $CLIPPER_LIBS"
++test "x$enable_cns" != xno     && CLIPPER_LIBS="-lclipper-cns $CLIPPER_LIBS"
++test "x$enable_mmdb" = xyes    && CLIPPER_LIBS="-lclipper-mmdb $CLIPPER_LIBS"
++test "x$enable_mmdbold" = xyes && CLIPPER_LIBS="-lclipper-mmdbold $CLIPPER_LIBS"
++test "x$enable_minimol" = xyes && CLIPPER_LIBS="-lclipper-minimol $CLIPPER_LIBS"
++test "x$enable_cif" = xyes     && CLIPPER_LIBS="-lclipper-cif $CLIPPER_LIBS"
++test "x$enable_ccp4" = xyes    && CLIPPER_LIBS="-lclipper-ccp4 $CLIPPER_LIBS"
++#test "x$enable_cctbx" = xyes   && CLIPPER_LIBS="-lclipper-cctbx $CLIPPER_LIBS"
++test "x$enable_fortran" = xyes && CLIPPER_LIBS="-lclipper-fortran $CLIPPER_LIBS"
+ 
+ if test "x$enable_mmdb" = "xyes" -o "x$enable_mmdbold" = "xyes" -o \
+         "x$enable_minimol" = "xyes" -o "x$enable_cif" = "xyes"; then

diff --git a/sci-libs/clipper/files/clipper-2.1_p20130528-pc.patch b/sci-libs/clipper/files/clipper-2.1_p20130528-pc.patch
new file mode 100644
index 0000000..086451f
--- /dev/null
+++ b/sci-libs/clipper/files/clipper-2.1_p20130528-pc.patch
@@ -0,0 +1,16 @@
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3f9096d..7a56297 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -93,7 +93,7 @@ if test "x$enable_ccp4" = "xyes"; then
+     AC_CHECK_LIB(ccp4c, ccp4_banner, :, AC_MSG_WARN(ccp4c library not found))
+     AC_CHECK_HEADER(ccp4/ccp4_general.h, :,
+                                        AC_MSG_ERROR(libccp4 headers not found))
+-    CLIPPER_REQUIRES="ccp4c $CLIPPER_REQUIRES"
++    CLIPPER_REQUIRES="libccp4c $CLIPPER_REQUIRES"
+ fi
+ 
+ if test "x$enable_cctbx" = "xyes"; then