Version Bump

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

3 files changed, 93 insertions, 17 deletions

diff --git a/sci-libs/ccpn-data/ChangeLog b/sci-libs/ccpn-data/ChangeLog
index e355af1d848c..4a4891bb1037 100644
--- a/sci-libs/ccpn-data/ChangeLog
+++ b/sci-libs/ccpn-data/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/ccpn-data
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccpn-data/ChangeLog,v 1.25 2014/10/06 07:21:08 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccpn-data/ChangeLog,v 1.26 2015/03/11 15:17:14 jlec Exp $
+
+*ccpn-data-2.4.2 (11 Mar 2015)
+
+  11 Mar 2015; Justin Lecher <jlec@gentoo.org> +ccpn-data-2.4.2.ebuild:
+  Version Bump
 
 *ccpn-data-2.4.1 (06 Oct 2014)
 
diff --git a/sci-libs/ccpn-data/Manifest b/sci-libs/ccpn-data/Manifest
index 4f17c78f2d1d..f7d8416264b9 100644
--- a/sci-libs/ccpn-data/Manifest
+++ b/sci-libs/ccpn-data/Manifest
@@ -5,29 +5,31 @@ AUX 312+ccpn_rhf22_2013-10-02-16-17-30-923_00001.xml 6672 SHA256 31230ff89f2a44d
 DIST analysis2.3.1r2.tar.gz 21683215 SHA256 a9e47a24d84f7b8261c6c23a8607af5a6ba2f2db9e161a7f873794c1ba8663ef SHA512 96bf75d1e958340d83836348f5a3045e5b2632913c66d9d74272140085800ea096f1ae53eadfb5bc0eba76804f1864553e82a517d637bdc3bace71b0c1c785ee WHIRLPOOL 2d1e55a4d8e62decc649a885d767dc5a2bdec701447a97ef8bc5e15ddde8c6add5fb0606c0cdd5871bbb9af74c163a13a28207b3e254fb41ba56293c88d6bc85
 DIST analysis2.4.0.tar.gz 36047222 SHA256 efde9f398bb62cb79e32cfe3118fe2af4ff6c56e5a9068bee654b3aa00f20ae1 SHA512 2f9c5abd401675796d64c620f6142b484084c54af98e0a4800b2bea81de447d711d594ccf773f86ef6631f0482fe0a0ad2881da713d6e022e0704f8dea8d65d9 WHIRLPOOL 922aaf0b464966d91286e1e96757cdf66238373f5c358623657f552012473cea4196622274dbbc8455b60df3580132497c6e9de2f3d9c2f539fb4ad8684dbf96
 DIST analysis2.4.1.tar.gz 36088236 SHA256 1cb089dcc739e8536d938a68536f556094f5d728907b251fe337758ba5bef106 SHA512 db44468c360d51815614fe0055505001c0a7a722f980c2c049c00524672bdfd4a507134ce1d68b29ebf622ffe94e0c9bb9685fea5b3441790b997a64f78c0dc1 WHIRLPOOL b53fc0438a878a8f8ce0244f5c1ce9edb616665149a699364e3bcd38c5db548c22b80ef67b4183ad5321b71b69a3b85aecc7d912893bba947700003a411651ac
+DIST analysis2.4.2.tar.gz 36390919 SHA256 14941131033cbd4b0b13d6d4fe3f9253360a7c2ace8ece9194be00c1fe4b2903 SHA512 694faefd3c085b559b6bb4729141a9ab885334f578bfbb0ebf260366dbca38c31738d5f5af50b5c7ea16b304b27adf80411082859796a5afeec630c36d56bd8b WHIRLPOOL 4499dcb074d445bfc972f9dea43e6f3e3c28722d513dce0fec4e1b2b5dab8be098f53f82565d86a4e7935f0595ef303465668230aa61021cf88e13cce8606214
 DIST ccpn-update-2.3.1-140425.patch.xz 19020 SHA256 38cc7100d46966cb07fbb8c032248064191da3e015de4332878e8992f6acc9e6 SHA512 071e1a0c4f589a76a6878cb5636516304c3eb9d929924ed1d03c1838cb1d894cc330cc5c6c0b222a71e24513e212f469a69fc3e746ea82e34eb669292d7ce52e WHIRLPOOL 72d6850734e0e4f64fb63b1790ecd942b03b03c3e4682c1bc6248b3ee1f12bf014534a2f37ca31914b4a1be87ad8ef8a160364aa5dd0e1b3e5bfe47f3a83b8f3
 DIST ccpn-update-2.4.0-140425.patch.xz 1096 SHA256 ea1325b4b4ce6e03f004686f0b75243c0b354c72b7431f3611c59f8b288afd8d SHA512 8c1d3df4210f02e8fbb07caabab740c115769457296ae62903f5401ca875b006e355b99dcda32f9606c93c84b0e0cee07acff53fc953bc77918597b58f826e0f WHIRLPOOL 594ed27fc74ef56473af76de164a2c3e30f63ffd677ebcd17d3c36f724961afbb2952212a1140cd1aaf7ba6bd5d9ba960c70ec95808f97a5b94a641b51cc8653
 EBUILD ccpn-data-2.3.1_p140425.ebuild 2020 SHA256 d9a46173ace9787a7d797352b2a7a108659bd3f979de95ea8e25c40151c91288 SHA512 71a1d7bcbe8ca990f9b5bb337bfc8e171eb57362bdef707d6f76c887fefb5222a5942338f461965b9b6b353d9a3988f237be557fae95fdb43e7b4654d50a9f97 WHIRLPOOL c6a01f9535780198ca9f89133d62c67ec7e2bc1a4decb59abad227387436a1e06ba8e62f61a0dbfb82a8d5e71cd09c8dba68ce13e2c6f837bcb5722ceffe1859
 EBUILD ccpn-data-2.4.0_p140425.ebuild 2018 SHA256 ff42a43e45ec70c8186c5dc0abac665f1baaf7feb6fe093634ec8b4664646c53 SHA512 0362212bd6e540f97225a09340847efdeb7a432cf348864ed9e38ab05f85c40bf2279f1a5d9f9a5d5565d0dcbee2ff0c25515e64216be77177621db8c5bd307f WHIRLPOOL b70a21a2b9e0da0c48e1dc0ab73290a300365541ccd8e6f4e62b07779a5422f68feee2cffca190f228fbb77c00d5701b4f28a1b00710069ccff57b9b9b245844
 EBUILD ccpn-data-2.4.1.ebuild 2005 SHA256 70469772a87d55d96d29862761af3dbea1c0777bcbfb56ca2e785d32919de488 SHA512 1c4ed7b55fb98118a31b1e7a0a1bf7f693275cd4db22e41316f813125d25d9d02080325a6fcdd021b9f18df43dbbb897a2c5712ec1ee0418f99fa0a358d1319e WHIRLPOOL a6743f2e9654657f0b1073b71e0caf0f1ce7b54227549e69fff323128773bd9697eca384b4e8d2e42a66b43796d65e17dfc0b94635a4d4380ac69f4537e97cbf
-MISC ChangeLog 4612 SHA256 987980357704528d9db0e57bb97a260d6fdce7e0dd05fe8f45f707ea5ff98b4a SHA512 0b8f3f8aef1e7e5d55c842900bed3c3a2d98df0feba9ec1634dca693fc3b7f4621f37f23f18e80aadbe159f1167454d33c5732d99ef2b6eefd6a524a85c3200d WHIRLPOOL b877cef112edc4e2c70270c4b8b77cfc805ac15ca7fe6dec8c6ba41886b75132d9d3a59f699d2d22c9d37fbb4c4708236c3dc27a39a8f3bbfb6f590a7d58987c
+EBUILD ccpn-data-2.4.2.ebuild 2005 SHA256 785be47570b4b6ef1154b0f2ddbd6d6ce6f70e258f9cb2ddcb3e56da51d92876 SHA512 5d2b6b0a614975dfa6addb6b2f076cf0d967e43ace1a1dcbd654e4cb36fb03d1b18a7d59458e134d71b51527d991cdd53c0ec941f0538af4b4fc3b2a75530233 WHIRLPOOL a7b2b235eee12c787b25f9c168d1ae41f2da4b3f9d6265e956c484c55d5dd65dd0d0fa70662edfdd173988d1c38cab9a7a4aeaa6549924c5ece41fcabd70e093
+MISC ChangeLog 4732 SHA256 97f302825a01cab4d6d63e52c1a3880f0729c623c67f5885f3ea752decceaf77 SHA512 f43ba6e48a62e603630c27a302f1c3d557e8bb7cacdd6a79710785bf837c418d2b308cd9118bd8b90123597f1af643ae425c78983a7a6b8f83686b1484be7977 WHIRLPOOL 01d1da85cdef3132f09430422844bc09c20f32633a41b6892d8ed2ba6c963ef1c9054ed1bb1a16c84403222f8ad713db1f0a4e60b4a7c4949869b0f823f1a984
 MISC metadata.xml 234 SHA256 8297e76ecd2cb828f604e9f138b263179eb84beb640215a0f60d7613eb46bb7f SHA512 0e94c0e6570a9267a39968d81c3b80680ccbc6eebb62199e4830b021a114c94a0de17ef2103cef62b7e27da1f51f225a30abb802aff82140ae6dc43366113d31 WHIRLPOOL fa6d4d90b092953b88ed3ad03e1e8c189296d268b39d13a4b4dcb78f0c4456341e3f1b44eea0860054fee43079179cb7cf7a912acf1fbe693ecdca6d9a65f081
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUMkLhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVAFx7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirEiYP/1c06Iqf0slhazqRXhbiAuR2
-r3Cyf+gC4ueUEjgLXwzQeKfvFlGaV9UULktl6zjpPtLGiDulQp4oE2sQORfDu+pg
-ehF/rw3qlWnT07edoUQIaX+P4LB2/1ucLJth+WrSPvB8Q1LY/k22sPLO/K0ujUDM
-qGMXE7NElyh8X/dsoHEgji13naj6yK7Mu2+j2eT+fNvHxQK92Hq9aaDGr9V51HGT
-ly2YM7O3ddlSLeYKFeUDSnCaWE9lvYofk7LbiburchuRscrKxCZm+ftQ16CQS1eC
-2H0aFwZQpoOfTOTfp1dWIK2eGeefzp8lfC/0hlMDdS/wgwScyKmZVU1X4imtgWqM
-dFeh2Oy0UhbAvD5109cPFkWbA+dwNx9//SiBKP0glX9rhAW0uc9jrCqk6ys2+XqE
-wGi5jyr5g1MAL2ryGQiIzNXH5+Ul4YxA4yUnqIRO2iwlYAeZdQ3ZTXAt8KLwfhit
-IUjU6C7/Orlinh3QfIeesxCf44Q7W1n5hkVpoQhW4frorNnrc1xQXHTMN9bNKDMR
-VJavVwtJVWQOVq21DPmrMacw0ZtG6c42OyYyODKlaG+WG7pFDKgnrEXl4B6KrGcS
-URXHed4PFskkFqnj9hYLJ4ytVfFx0ed5oePwEAxVbNgjQyJ6AnqZIZM+DeeP7p0I
-cfns/jmWVbcaXzNluPbt
-=SGhA
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirUWEP/jaE7/6IN6PZcEqDb6rdukv9
+DKUUr0rjXJoAgoSA1pUAgwaLSvTXgEoXIBZB8PqrsRhK1z4Wpq0CmvUaKjYatm0B
+oJQQWPOwIpblM+g0fyTbzERJDgd/6cOo5/dnnsv7mB/oydmY7dBbXT5unlJ3Sj4K
+b2QSF8UYpfSUKr08cRszabi0hr6XOT6fSuF1nSP5cX3vbTpNVu4h+sHJQdO3vnvk
+DKCm9D514jzIHCPb4utW7bA9F28JEMlz/4qzWzuYwOxlGk3hs6Zl7XNLz/rpeBq7
+vEiJWCFSr0i9kWygEDMEydZSGy1pQz4QjcrLmlFJaNpnFkXZ8AFJUeVpdqa2XuNZ
+ZA3kvC87v+a1sIHkYgU3LQDvaPZ45H6d+f4FQWgRBrkiARwyTgxiIXFXCXmupH3q
+FjIuBa4uXcj6Xcina1zR6FGd42gy2iI4LGF8cJLQBVrccuKJ/LcLkabxoNs45SKc
+IqkTi+qUtQKjpQQU34IANsgvjOTdWo6W91SY4sUUm6Rp2wS/nLRRirYYmb9bsJFl
+c+ClNmA874BxyHlJ/WPv882TxybY7DFZfRDtnnS4+dcbOSJDpnsTkGSpMaWAu5n5
+LJzUP8A54BjOvEltxafTZmsWeVQPLDEprbHjP6yMNiucWdft/N5BB8Jc9EyoUhD1
+bslyhQ8vCT+MlQAPABCa
+=gx5A
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/ccpn-data/ccpn-data-2.4.2.ebuild b/sci-libs/ccpn-data/ccpn-data-2.4.2.ebuild
new file mode 100644
index 000000000000..60645ba02f26
--- /dev/null
+++ b/sci-libs/ccpn-data/ccpn-data-2.4.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 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.4.2.ebuild,v 1.1 2015/03/11 15:17:14 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils portability python-r1 versionator
+
+#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}.tar.gz"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
+
+SLOT="0"
+LICENSE="|| ( CCPN LGPL-2.1 )"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	!<sci-chemistry/ccpn-${PVR}"
+DEPEND=""
+
+RESTRICT="binchecks strip"
+
+S="${WORKDIR}"/ccpnmr/ccpnmr2.4
+
+src_prepare() {
+	[[ -n ${PATCHSET} ]] && \
+		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
+	cp "${FILESDIR}"/312+ccpn_rhf22_2013-10-02-16-17-30-923_00001.xml data/ccp/nmr/NmrExpPrototype/ || die
+}
+
+src_install() {
+	local i pydocs in_path ein_path
+
+	dodir /usr/share/doc/${PF}/html
+	sed \
+		-e "s:../ccpnmr2.1:${EPREFIX}/usr/share/doc/${PF}/html:g" \
+		../doc/index.html > "${ED}"/usr/share/doc/${PF}/html/index.html || die
+	treecopy $(find python/ -name doc -type d) "${ED}"/usr/share/doc/${PF}/html/
+
+	pydocs="$(find python -name doc -type d)"
+
+	symlinking() {
+		in_path=$(python_get_sitedir)/ccpn
+		ein_path="${in_path#${EPREFIX}}"
+		dosym ../../../../share/doc/${PF}/html ${ein_path}/doc
+		for i in ${pydocs}; do
+			dosym /usr/share/doc/${PF}/html/${i} ${ein_path}/${i}
+		done
+		dosym /usr/share/ccpn/data ${ein_path}/data
+		dosym /usr/share/ccpn/model ${ein_path}/model
+	}
+	python_foreach_impl symlinking
+
+	dohtml -r doc/*
+	insinto /usr/share/ccpn
+	doins -r data model
+}