sci-libs/clipper: Rename for new version schema

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x8009D6F070EB7916

6 files changed, 117 insertions, 11 deletions

diff --git a/sci-libs/clipper/ChangeLog b/sci-libs/clipper/ChangeLog
index 8710558d85e7..66383ab5c22b 100644
--- a/sci-libs/clipper/ChangeLog
+++ b/sci-libs/clipper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/clipper
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/clipper/ChangeLog,v 1.21 2012/07/10 18:55:01 jlec Exp $
+# 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_p100511-r1 (28 May 2013)
+
+  28 May 2013; Justin Lecher <jlec@gentoo.org> +clipper-2.1_p100511-r1.ebuild,
+  +files/2.1_p100511-makefile.patch,
+  +files/clipper-2.1_p100511-outofsourcebuild.patch, metadata.xml:
+  Rename for new version schema
 
   10 Jul 2012; Justin Lecher <jlec@gentoo.org> -clipper-20100511.ebuild:
   Cleaned old
diff --git a/sci-libs/clipper/Manifest b/sci-libs/clipper/Manifest
index e073041672a1..e47324f1fe0f 100644
--- a/sci-libs/clipper/Manifest
+++ b/sci-libs/clipper/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
+AUX 2.1_p100511-makefile.patch 676 SHA256 11b270b3c58190a749bea9899aea3e45d0649ae49acf2b4089b77f6a39ddbfba SHA512 b30210950880555ae60c8e907376a464483bc4699b14a14c66cf78a535e0698758dc55b14c1758b24b4168129e9ed0c7d84b4f3a44e5ff328ae94d0ff900f31b WHIRLPOOL 82260685f40193c0f0ad995d5f1dcce1811bb278f8fe0cd9e5d7cb2262e3445ff23e6512469ff30b86cb97a767add06146fea8c3b5239b864546599e52d3acc6
 AUX 20091215-missing-var.patch 663 SHA256 abb3e83e3bcdfa1ba4ce8d382a8f490e70c2c761d574484a38741bba438a00d4 SHA512 17b021558572dafd79379b22fe916c5f92c424a002fc5118338e862fdba5dbd83cdf8a91c8495a10924284491cfa451da13ab2a78fe6902fc6dd904b5b4a0a99 WHIRLPOOL 0b60772b52208437e35c9d1720e50615db120b17bad2866e7ce4ec4a8c02219063f88fb180dfadd08dbc91ae34d09f8277ab552457de14bcc573bf0b22fa34e1
 AUX 20100511-makefile.patch 676 SHA256 11b270b3c58190a749bea9899aea3e45d0649ae49acf2b4089b77f6a39ddbfba SHA512 b30210950880555ae60c8e907376a464483bc4699b14a14c66cf78a535e0698758dc55b14c1758b24b4168129e9ed0c7d84b4f3a44e5ff328ae94d0ff900f31b WHIRLPOOL 82260685f40193c0f0ad995d5f1dcce1811bb278f8fe0cd9e5d7cb2262e3445ff23e6512469ff30b86cb97a767add06146fea8c3b5239b864546599e52d3acc6
+AUX clipper-2.1_p100511-outofsourcebuild.patch 594 SHA256 c4802346073aac3a1e9e3777c3ee28d08bcfe823178e4bafb40d2dc7732e4a0a SHA512 63b06be35ced8d7151d43886c2ca58d07d9bd585dff541198440304e476780faa485f483445880dbac6ca133a63c762b7dde7997267e846ab5d0ed0c1e4c65a7 WHIRLPOOL 871939ff8f1727e8f0de0485ac1fcf487a6708c731559d747c3d28783dcaaf2622696508f5b0d679eb90528826356c49eca79abc4860781c00859f31529b7c22
 AUX clipper-20100511-outofsourcebuild.patch 594 SHA256 c4802346073aac3a1e9e3777c3ee28d08bcfe823178e4bafb40d2dc7732e4a0a SHA512 63b06be35ced8d7151d43886c2ca58d07d9bd585dff541198440304e476780faa485f483445880dbac6ca133a63c762b7dde7997267e846ab5d0ed0c1e4c65a7 WHIRLPOOL 871939ff8f1727e8f0de0485ac1fcf487a6708c731559d747c3d28783dcaaf2622696508f5b0d679eb90528826356c49eca79abc4860781c00859f31529b7c22
 DIST clipper-2.1-100511-ac.tar.gz 993754 SHA256 00d470af423c015022934d5a12fde36c86d5729227f41e1139d7c6513368b7aa SHA512 a4e7d49e55a49813cf640c9384a5630352a5bbda773334681aff87a2a8f70d2eaedda5715b3546231747b49d76c58c2a3afe6010cf156c63d62b1b9500c0c802 WHIRLPOOL e0a8377702c573d39f4f62d8f5e214676f6c323f24d39c1bfdca81b574cf26f12f7444f21c92b53fad38e8cedb14a9befaf65131b5b6055ace28d8b217ed564c
+EBUILD clipper-2.1_p100511-r1.ebuild 1368 SHA256 c661f2f9af239a29cef8454273b9203fd6a64e4b24cfde2572e1eec912e201ac SHA512 a9fa2950a13acfbc9423580fb16826833855323d0ec5b6b9ba947036b7c13a7e9a3fa4a9c4b8580b0047491df62e55ff7134d262b7e82482ae72399927d02479 WHIRLPOOL 72f12a6a8e2ff6d0c1f09798f9447ca75c9799fd452e4e6a7f9254ac2f539050c580b14c9ea4b27d9b5f9f5bf155ba073de76d19bf57394bd4e301fabac609af
 EBUILD clipper-20100511-r1.ebuild 1383 SHA256 b01a7d77b712179d82d3ba4e90306c7afe61d38111cba237e6e3f95c0e764c49 SHA512 54905cf4672d4cae40aed61d8a65220be54b16bd0756c39e3295010a07f538d0e868d97db9b3c99af6b552b0bb866d2e49ecc630d829ff809a5532a11abb2549 WHIRLPOOL 4d25dd086d33dfe034afbf9ea224b5a7af21fd6fe9f9ec0391d02f7f2ed355abea991ebb63f7bf7e86ab31ba1408dbf319d2cefede939dc3161aea7481f7bece
-MISC ChangeLog 3190 SHA256 ede4c3f44f70f576eaa3f64b3ce1ccc26ac2529578ea06916d7209b31c944b4c SHA512 317a548dc8a3505ae8d686f183b03d088d647634273f936c4303a60d8d0e79383028294903c18a71bcb70e9ff52fad268e52fd16836e091e2e6ed48a97075c20 WHIRLPOOL f48cc979f63535473751a2e7bc902fc42b680f3d9f1fa2b31eb789c5295887d430dcf9243d5f0c4182c365ddf1919dd17a3611438378e30813271e20378745f7
-MISC metadata.xml 167 SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8 SHA512 0f65f650c91edb15011884892b3e2447ec2342f207b6b71541ec25939fed33cd219b1fcd85dd06008b56a50622973febeb63c9c6158f62435c63c4fbd3ab93bd WHIRLPOOL 0823fd1d22e4aea50bcf78c359303d804128475e21e39514505ee6528c9c46376ceafc1f13bb1cc4e1143d434397fb4ef65dc028e924fdc831521947534fd93f
+MISC ChangeLog 3445 SHA256 8dfe673ee5b16301003f15ec0e6bfd1bcb04553a78ac7f2d524faf3d6d39526f SHA512 10c3ff549c756248e04aa6391d2f46f50728eccdff9cc7b61f8dfaeb4cf1548de8c9a1bd14514abeb5316a0b2d281d6fc1e1cba76d8eafd5cb895b406f971239 WHIRLPOOL f8825224a314fa5935e717b57ff6250cb7a65bdac3a6aab79b5a64aef6a058cc9d1139f562385cd7c7c6dcd9e875ac0be91b420b951eed6b150a86a99e004b1c
+MISC metadata.xml 168 SHA256 705462092174cd3e2e3ec1557a28108a746b7351f803d8ca6d1b925b3111c3ff SHA512 f0073fb277e20adb7781aa6ea7f8237bc2d350f0aa43f0f0cca33e02cf52b8fc117bd984c11721ac519a2637ea145976148ac1aba7335dc74c42f7b9531cbed3 WHIRLPOOL 07dd7a302e695440f5033889e5b20cada57beedf17ad33f95d45fb5c39da98bf206eaff13334c20c1c08140a9c5e6041341d29c58efc5ca59b112b60e1662318
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAk/8eooACgkQgAnW8HDreRZWOQCeJE6+Dq+8pY6zx+i0Q1YP9qm6
-kEMAoLTa3x7p4kcPdpiBCRUPWgJsobhi
-=Zrq9
+iEYEAREKAAYFAlGk9FcACgkQgAnW8HDreRZungCfUNgXHNAcgbmbh92wAWiXIaVU
+szAAn2CQxo1XPgN8PSFxNHgt1H4nC5Oy
+=NKMR
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/clipper/clipper-2.1_p100511-r1.ebuild b/sci-libs/clipper/clipper-2.1_p100511-r1.ebuild
new file mode 100644
index 000000000000..90689594bf8a
--- /dev/null
+++ b/sci-libs/clipper/clipper-2.1_p100511-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/clipper/clipper-2.1_p100511-r1.ebuild,v 1.1 2013/05/28 18:15:50 jlec Exp $
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils eutils flag-o-matic
+
+MY_PV=${PV/_p/-}
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Object-oriented libraries for crystallographic data and crystallographic computation"
+HOMEPAGE="http://www.ysbl.york.ac.uk/~cowtan/clipper/clipper.html"
+SRC_URI="http://www.ysbl.york.ac.uk/~cowtan/clipper/${MY_P}-ac.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE="debug static-libs"
+
+RDEPEND="
+	sci-libs/ccp4-libs
+	sci-libs/fftw
+	sci-libs/mmdb"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${PN}-2.1
+
+PATCHES=(
+	"${FILESDIR}"/20091215-missing-var.patch
+	"${FILESDIR}"/${PV}-makefile.patch
+	"${FILESDIR}"/${P}-outofsourcebuild.patch
+	)
+
+src_configure() {
+	# Recommended on ccp4bb/coot ML to fix crashes when calculating maps
+	# on 64-bit systems
+	append-flags -fno-strict-aliasing
+
+	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 "${AUTOTOOLS_BUILD_DIR}"/examples check
+}
diff --git a/sci-libs/clipper/files/2.1_p100511-makefile.patch b/sci-libs/clipper/files/2.1_p100511-makefile.patch
new file mode 100644
index 000000000000..d933e88f7c7e
--- /dev/null
+++ b/sci-libs/clipper/files/2.1_p100511-makefile.patch
@@ -0,0 +1,23 @@
+ Makefile.am |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 745824d..0da0ddd 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,12 +1,12 @@
+ # -*- mode: Makefile; mode: font-lock -*-
+ AUTOMAKE_OPTIONS = foreign
+-SUBDIRS = config clipper examples dox
+-DIST_SUBDIRS = config clipper examples dox
++SUBDIRS = config clipper  dox
++DIST_SUBDIRS = config clipper  dox
+ EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL NEWS README
+ bin_SCRIPTS = clipper-config
+ # pkgconfigdir = $(libdir)/pkgconfig
+ # pkgconfig_DATA = clipper.pc
+ if DEBUG
+-AM_CXXFLAGS = -g -DDEBUG
++AM_CXXFLAGS = -DDEBUG
+ endif
+ ACLOCAL_AMFLAGS = -I config
diff --git a/sci-libs/clipper/files/clipper-2.1_p100511-outofsourcebuild.patch b/sci-libs/clipper/files/clipper-2.1_p100511-outofsourcebuild.patch
new file mode 100644
index 000000000000..2db566b7b799
--- /dev/null
+++ b/sci-libs/clipper/files/clipper-2.1_p100511-outofsourcebuild.patch
@@ -0,0 +1,16 @@
+ examples/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/examples/Makefile.am b/examples/Makefile.am
+index 203ce96..2b65f1c 100644
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -27,7 +27,7 @@ maketestdata_SOURCES = maketestdata.cpp
+ 
+ TESTS = maketestdata
+ 
+-INCLUDES = -I.. $(FFTW_CXXFLAGS) $(MMDB_CXXFLAGS)  $(CCP4_CXXFLAGS) $(CCTBX_CXXFLAGS) $(BOOST_CXXFLAGS)
++INCLUDES = -I$(top_srcdir) $(FFTW_CXXFLAGS) $(MMDB_CXXFLAGS)  $(CCP4_CXXFLAGS) $(CCTBX_CXXFLAGS) $(BOOST_CXXFLAGS)
+ 
+ LIBS = $(FFTW_LIBS) $(CCP4_LIBS) $(MMDB_LIBS) $(CCTBX_LIBS)
+ 
diff --git a/sci-libs/clipper/metadata.xml b/sci-libs/clipper/metadata.xml
index e42d0af60f42..51fdedab1b38 100644
--- a/sci-libs/clipper/metadata.xml
+++ b/sci-libs/clipper/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
+  <herd>sci-chemistry</herd>
 </pkgmetadata>