sci-libs/ccpn-data: Version Bump, drop broken

Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

3 files changed, 28 insertions, 23 deletions

diff --git a/sci-libs/ccpn-data/ChangeLog b/sci-libs/ccpn-data/ChangeLog
index 58267f8e0654..59bf22bd2588 100644
--- a/sci-libs/ccpn-data/ChangeLog
+++ b/sci-libs/ccpn-data/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/ccpn-data
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccpn-data/ChangeLog,v 1.16 2013/07/05 15:18:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccpn-data/ChangeLog,v 1.17 2013/08/08 06:48:11 jlec Exp $
+
+*ccpn-data-2.3.1 (08 Aug 2013)
+
+  08 Aug 2013; Justin Lecher <jlec@gentoo.org> -ccpn-data-2.3.0_p130705.ebuild,
+  +ccpn-data-2.3.1.ebuild:
+  Version Bump, drop broken
 
 *ccpn-data-2.3.0_p130705 (05 Jul 2013)
 
diff --git a/sci-libs/ccpn-data/Manifest b/sci-libs/ccpn-data/Manifest
index 4c5d78a6a662..288eb6dd42ee 100644
--- a/sci-libs/ccpn-data/Manifest
+++ b/sci-libs/ccpn-data/Manifest
@@ -3,34 +3,33 @@ Hash: SHA512
 
 DIST analysis2.1.5.tar.gz 20338459 SHA256 9f91f1bd56fb73fd24e71d396c96c0f0d31b92287664b6a2e756f6efc630b31b SHA512 8421d531391c61dcd4920299fc6d77e44f32baaf4d7656946d52d6c94bbb812d3a519c19db06b0fc1be52b5a2f5748017fce94c4ff9ed9f39b8e601651355a43 WHIRLPOOL f301b39a0b0815df292438c56474480fda95065b47fe72b60b94cc44c17de70175c1f18be44a8f0734807be205a438d9d3e7c1a4bee809ac9a49c2b8de7eb1b1
 DIST analysis2.2.2.tar.gz 21044504 SHA256 8e46d12b8fb7763d282933e14ddfa9ce197954ed9fbfa2333e22602ac841b6e5 SHA512 efe8a82381521dbfb95b12dd553f401f200aee3763f9e739c37a9141a14bf038865b2a860b0353adc532582697b58079034386be42161aecbe231952b8abaac7 WHIRLPOOL c9d7fc936dc25b952e711e8fa439ada5a67e68497b6d4ad034586e604bcbd9d1ff7dd48d1a3baace347fc9bab5c17d2f7852906f921708a16ce8c8eb4a8659b9
-DIST analysis2.3.0.tar.gz 21638757 SHA256 4dc693ed2a11bf8707477b4ef21d53c29a9f10c4540f57b2945b9249206b0b50 SHA512 b51e82329e3ee88f7040a256dd8e40121f1f7bf000b98ea8304861bb29b6f0000b61d4f81f9725df3e56641004679105bfa9b3878c447ddde5acf1fd56d010c5 WHIRLPOOL c0041b2e03d3efb8675c119217a09d4495355ad2242d2f1ccf1cacdd77f0461a5a7139d48ed33e8d72e541013513f93e1cf4742f0e9c127f3006621a987dbbbe
+DIST analysis2.3.1.tar.gz 21702376 SHA256 892df0e2d999a9cac75438c5357d8766c9aa5f7d0d575e798d92638df26165e6 SHA512 34a86020e764bed9e85870a55896f9aaafdab4b50be6fca17d35830d013a314fbdc3d1609024b1d5ce8bfa306a3e5a39af9c70a751823adc12d38a26a424ff3e WHIRLPOOL aa7b4a3fd9350c9b98fa9226547635692eaff4a311951b2e89b493b258c1dc8353b9945fde46fc0fee4990cb4caa5615326e81532c579db34807221bdcb72e20
 DIST ccpn-update-2.1.5-111011.patch.xz 103208 SHA256 6e07a122f3353522c5abf3e02739aa792538403674393192b3f0b86f68a067d3
 DIST ccpn-update-2.2.2-120511.patch.xz 16728 SHA256 01ce6f8fe051921c0b05d4e5cc47b57fd6f74cd3cbd01f9d419e899295e00363 SHA512 d7ef01158ad86acf48fb6665209f448ba2b3d7353b57cc76166812deca5e8bb3317089226698c3050cbb1b73cef07f7960b08a6bf2e5a93a62b4d1b5e17be343 WHIRLPOOL 5c19d20f1aa1781bb3c120b114ab8f6954ecb3815635a46b2688c122de4af250fed7215cb522f109427432727ed4209a4f3364b6384abf269e22ebdec87d0d35
 DIST ccpn-update-2.2.2-121012.patch.xz 155460 SHA256 7a5441049fe0f002ee84cfce853043b350ade73c0c564901964db59ec13bb5fe SHA512 86d8bd03cde0a81542cde451c9ab759971c9ea30a1ada0e2961370640d1c139fa8e050e102969d7dd59c2d4664c87da6ccaae1af803a48c0d2ff6c52fb49d295 WHIRLPOOL 7acaeeee4eda9f6d16b630c898244683d40e1809bb0457ce68f26e1ac8c8b691ef227dc873b9f60e53b6c077d2b602f682a782121aa5c9f004e35d9460181016
 DIST ccpn-update-2.2.2-121112.patch.xz 223036 SHA256 a46fd5927ff2c2e1be88d1a9ecce520a6cd551efaf98fe1c4e2b8c3d51a40a27 SHA512 68bb7b715ec76f0b83c2bcf436b6a88c2e5f554a245b509bd387926df16c5249c1fdf315a987b6e55c4a00d02382afb1c99a350907829811390d0a50e8d672df WHIRLPOOL b7863197439a917b49914a5ea7997963c1d14ca74baf77523676b653300d3d08e5eb5bbfc5abc4d05e71c94f8bb30e8446776623085aa8a7b279f1107277bd05
-DIST ccpn-update-2.3.0-130705.patch.xz 9344 SHA256 9f347f0ce7c040112711ace7412c4255e8cd524e39584fd82c43e97274c8edc8 SHA512 4be082b026aa3cc28b27d59162d39f2a131fd61ea8a45eeacabed8963e95b1e5e73f78904699e673588ffcd746993b36e44ac09cccedfb3aea72eae66ee30bf7 WHIRLPOOL b29ef937f3b2ea4023fbd31499ce2977a598ab2d04cedf5f982de3b790792d29c4e70707e484d7a0d1bdd0a96ba65e2ddaec5e7e8def488db0d108a6b6088930
 EBUILD ccpn-data-2.1.5_p111011.ebuild 1786 SHA256 beca9c6c6b4a270559de03fb885491cfb8b7ddb821a36f1d475b145b5ef8ae9a SHA512 991b59705cbfbb4185c36ae205c51c2999ec5c846ee10c89a9f87c8f3d586857b89dca555314da1fa7f41bc260fe1b2af0385efde273433ce4920e98f34a4a8e WHIRLPOOL f7969965f1fa9a92875dde31194b8c5eb220fb4082168428d1a2399d4f591fcceccd84a7ab3fd03b7173944c14b02e87af4431511ee6e847c93328797d4237b4
 EBUILD ccpn-data-2.2.2_p120511.ebuild 1790 SHA256 7a941ea3c2328efa768b27765a8f6dff387b58a280f2e9cd9cdbbfb0d3521abe SHA512 d534c8095c7aa445d9a248ad820b223135800f7b4d68a286bdc63556e4cee6ec45591ca5e0bfcca247922444371d013f3f8ad8c50b59dbfe5a13d204642aee77 WHIRLPOOL 5a49acc92571a21781fb89548d33eb9abb98346b1e75bcde00f37b3e884390f29e9e13d69d15bc1850497738d61428c08b9d73e966a1653e0b5211b88e464083
 EBUILD ccpn-data-2.2.2_p121012.ebuild 1790 SHA256 ba9de83242469254823a257dff90ae2b2a662d9c4f5a0c6aae5c3a7704dc9988 SHA512 c6f0dfbfb78e47fa43dc1bab1af19e35bdcee4724aed8355e9a369bd2cd3b0df9173b3244650b3b37de070468e59b7b727ed4895c26d917a3d4f2fbcbdffc5f2 WHIRLPOOL b1b2f2bd8137084992ff8f23b3ba3126790fa7a3fdbea6c98e7f48a377ac16610e89793a0e55204a1dd86a1219e1dba14d04f09fe48ccc90463eb7b2931f56fd
 EBUILD ccpn-data-2.2.2_p121112-r1.ebuild 1915 SHA256 95a8d23b4aed2ec26c9877394bc40363b3f5679ba49ba518e905e7e89e4e0431 SHA512 006bf718d792d07f1c7eb7837080677ef118519f3979834e54862e91a19094e60be6ea8b3e48332b325146a72411cfff0191afff382853a1ec05092b45ba4336 WHIRLPOOL 3fe1c1d56f648c6158c26087138fef3b585acbc45b59433e7096eac0bc86ea2e8d82bde4e23d88b16ea49b6491d2f97a7283eeb78839ce44da8bd6bff4b74fc1
 EBUILD ccpn-data-2.2.2_p121112.ebuild 1790 SHA256 5d71a50ae6c1bad448aeb0c52e3beaf94480cdcd68514777d8caae315910ef5d SHA512 24faaff343cd47da84da5e55672e101578f2f23ee83240f92a0d7ee353added1a384dc401f40e3d3b2ca788db826e93df0e052bd567fdba330df2a7c448f0844 WHIRLPOOL 64dc9fbce02a70b0427b0c24533fae5979da26d7cdae2a29cbdc63e37993dd86691fb8ba9ab4f3215a658164a1eb21ae821d81c27964d3f9cffb7b66b8357657
-EBUILD ccpn-data-2.3.0_p130705.ebuild 1941 SHA256 39850a9273658dd82033a67cd9d7433ac64c143bab86de5aca3a0f03ead23786 SHA512 0ef84ef1a44bafda020a4743a1ecb2dddf905816d3c0b84ae1a757bcc95aec59d575e37662c2e5b8683f858c0c913c621a6a0d3f01abf019770426e9be607096 WHIRLPOOL 7bd5827751300daf5529251fbb81afd1f800c7a855a86825ee7b4ecb67a6a8890215d3bbc1f5c8a6339e6b816a489dc61ffc82c9dc380b04e572752f27dc86a9
-MISC ChangeLog 2943 SHA256 361cbb09c4f931fd7fdf558b49e9e31e6c6ba65a16583cd8d844212fefaa1321 SHA512 d907648cdc81eb2a7b166802cfaac0469a3bfa8968059a0a279f4e961333224a486ceb6bb2493316d834d98536bec5af99b794389a8efc9ad4dd0c0c83938e94 WHIRLPOOL 120b9d96da26ce06315af5d2734ad4c4ed37053ab4df3a3397a30cef9b3f4667ff7f08d6fc7860af6acdd5d249ef7f09216a83e7a6c28f621a7a872c10e62df4
+EBUILD ccpn-data-2.3.1.ebuild 1911 SHA256 ae9faa834e94551f410c3b3a109ceb8219eb78a5fcb830be9ab6cc31a1e87007 SHA512 c303527419527476a70cba6ef60922daa020839bdcfefa07b3d8cff29653394dfb558f0d112e85131766f46121c4d360a248152332c86dde13ae50a5c515d60c WHIRLPOOL 89b268b6dfc267e4c7ca07893118fbcdb41dfe33509974f4caa67b3facc7eca37ada8d23fed648acb4dc40c13cadb2d4d936ceefefba5a68c205ad67da989d11
+MISC ChangeLog 3111 SHA256 4df5e892343c456e734ac89dd8977934c20101a6cec90ee9dbc76babf8bfbc97 SHA512 d9f7f69bcb280ddb92883b2b76afcb327b80386a392d389d05ea62a3004ea4d68331ec6ea7c6ec2edc3f5743c3369d6a844724a86b40296b1bf269006cc69b53 WHIRLPOOL 9a5e010abb9efc7d052bc055ce59577521276cf6b9d4c5bcacc4fb6c03cd68bcd2fcc743b8b840620c224a1e4a5a2e091d96b2bf85020d691bda2cf8ac524fa1
 MISC metadata.xml 234 SHA256 8297e76ecd2cb828f604e9f138b263179eb84beb640215a0f60d7613eb46bb7f SHA512 0e94c0e6570a9267a39968d81c3b80680ccbc6eebb62199e4830b021a114c94a0de17ef2103cef62b7e27da1f51f225a30abb802aff82140ae6dc43366113d31 WHIRLPOOL fa6d4d90b092953b88ed3ad03e1e8c189296d268b39d13a4b4dcb78f0c4456341e3f1b44eea0860054fee43079179cb7cf7a912acf1fbe693ecdca6d9a65f081
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR1uPVAAoJELnU8jG9FVirwAcP/Ah1HTjFOTGsbKcyyzBRx9o8
-WTZx+AV2F5tBfF4C+kNp9a9JD9R0vcYyzIOT8CcW1/U85kY/I8wdSLLzQFCQbRN5
-GCQb7pTafef1z23o/QfSDukjHLhbpcwDkC56yy0Ck5Yi+6MFvy+92NtieOoZ5b4n
-uhIAq9KfEcagcHjmdf0p89VrELfa5sexLTKZFocXDRyFpASznHStTheCGF1/d8El
-8UOLvbgd3Z/5lq5DsLIPBQwvCJRbMYf1V8LdztsauhiK319c/x9qiPEE+FPuCnrB
-nocCOLX0fD8ApsSdQgbFZPa59pVz4p67H0PofIqonxHrmU/mLuDSaEtZQygCwqXv
-Vis7SI4mSmltydnFkHf32Hi6DL7U2/q7YQQQ+yOx63dzv3OXLrdPdtbVd8IwBA70
-THqLP0oAz5iU7fJ090lCygpwizJxUV62GEfkeOX+afpsxOlkqOTB/Ds68RUv2LQy
-VKw1waJNDsemXowICALa+g56Nnn41LAR6H9dMWKyu3Bvit+ctjHj2yQnW+gKCrGk
-SrD/QD2ej31LOTFZx5aHfYxDhjualLcIPBhB50KQ7rwGnEn8p/KMuHchYsY3OJNZ
-dymd1iRoCKs8FZhSvNhxzleGfSjQ71ZSDRvtTUpQjnDk6j3jq0y7yBMG50Kk4ciO
-hnKTxxIl2ZQirtomNQss
-=Zko7
+iQIcBAEBCgAGBQJSAz8gAAoJELnU8jG9FVirqmkP/R+1CnWQNWkaper+JAr7/l8z
+PdYda+yZvgTNa262Sr8TFZj0YxQt3rH16Co/zjhmfdJoHigWN+ra7LO6pHYIMuvF
+0hSyiq0iM/elIgYOcpSxSlZV1+W5Ixns7yop5kQAeAmZWLQwqeG+ZmxW+OhJtxcL
+mqKToR/3ZXzDjtOGWARd1jDy2ODs6xcpGtC+2ptwrvgRWjrVLTiouPR/VQL+kzJL
+bZyo10g03GxxGJmTqNh5oBcZeu2jAMC8yayky/DPAtB2kDYnJMp3vFTciOzzpEVd
+lwyNgUValNZ+AxbnyKMVvQlRxpQBYjXv2DvdzzvmfCIf/dRKcfui1P4njd6emkMA
+MXteno+3taYkkqHXIRHKXDDXVdAAcn9YU+Ut6gy+0yEvYDDrPpmA73xLoFJwiu/m
+6VdMB8vtZp2UMbB7hNENVN27OrrlvhRrs1a0wXBV/F7PqfO/Oih/7ViEDKBKAkxR
+JA8uLdzuNF1psma4lcWt5yw59jR/hf9VCPWqcnMxipunQbXtA4qROhDH0sW/weTy
+sMHlYMl9LySpWRzPNBqFevrjgPFmT1j6J45b3rrGfspNOjeKoMNdN21ObH5Btw6v
+c1e/+cuxXFVFcpsR6bWwvpLUDR44WZiGV4DVhKirK4GBHuwO9auX7CL/EHyj8f+m
+rOnzhXbRPF7NSvBCeMwH
+=FYTr
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/ccpn-data/ccpn-data-2.3.0_p130705.ebuild b/sci-libs/ccpn-data/ccpn-data-2.3.1.ebuild
index 75b43bbd46d7..72762285bccc 100644
--- a/sci-libs/ccpn-data/ccpn-data-2.3.0_p130705.ebuild
+++ b/sci-libs/ccpn-data/ccpn-data-2.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccpn-data/ccpn-data-2.3.0_p130705.ebuild,v 1.1 2013/07/05 15:18:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccpn-data/ccpn-data-2.3.1.ebuild,v 1.1 2013/08/08 06:48:11 jlec Exp $
 
 EAPI=5
 
@@ -8,14 +8,14 @@ PYTHON_COMPAT=( python{2_5,2_6,2_7} )
 
 inherit eutils portability python-r1 versionator
 
-PATCHSET="${PV##*_p}"
+#PATCHSET="${PV##*_p}"
 MY_PN="${PN/-data}mr"
 MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
 MY_MAJOR="$(get_version_component_range 1-3)"
 
 DESCRIPTION="The Collaborative Computing Project for NMR - Data"
 HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www2.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}r2.tar.gz -> analysis${MY_PV}.tar.gz"
+SRC_URI="http://www2.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
 [[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
 
 SLOT="0"
@@ -50,7 +50,7 @@ src_install() {
 
 	pydocs="$(find python -name doc -type d)"
 
-	linking() {
+	symlinking() {
 		in_path=$(python_get_sitedir)/ccpn
 		ein_path="${in_path#${EPREFIX}}"
 		dosym ../../../../share/doc/${PF}/html ${ein_path}/doc
@@ -60,7 +60,7 @@ src_install() {
 		dosym /usr/share/ccpn/data ${ein_path}/data
 		dosym /usr/share/ccpn/model ${ein_path}/model
 	}
-	python_foreach_impl linking
+	python_foreach_impl symlinking
 
 	dohtml -r doc/*
 	insinto /usr/share/ccpn