sci-libs/ccpn-data: Added upstream fix to datamodel

Package-Manager: portage-2.2.0_alpha103/cvs/Linux x86_64

3 files changed, 85 insertions, 2 deletions

diff --git a/sci-libs/ccpn-data/ChangeLog b/sci-libs/ccpn-data/ChangeLog
index e921cd533042..ec431bc01837 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccpn-data/ChangeLog,v 1.8 2012/04/10 01:40:06 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccpn-data/ChangeLog,v 1.9 2012/05/11 09:36:26 jlec Exp $
+
+*ccpn-data-2.2.2_p120511 (11 May 2012)
+
+  11 May 2012; Justin Lecher <jlec@gentoo.org> +ccpn-data-2.2.2_p120511.ebuild:
+  Added upstream fix to datamodel
 
   10 Apr 2012; Jeff Gardner <je_fro@gentoo.org> ccpn-data-2.2.2.ebuild:
   Fixed SRC_URI - must have recently changed, thanks to David Kredbq #411067
diff --git a/sci-libs/ccpn-data/Manifest b/sci-libs/ccpn-data/Manifest
index 49178fd518ce..5de6e7e74ad6 100644
--- a/sci-libs/ccpn-data/Manifest
+++ b/sci-libs/ccpn-data/Manifest
@@ -1,10 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST analysis2.1.5.tar.gz 20338459 RMD160 b0706c859c1ee4da2ab80ee41534197268f73d44 SHA1 70dc5e6b2752d6b7d5c8673fc992ebd0a88e6ad0 SHA256 9f91f1bd56fb73fd24e71d396c96c0f0d31b92287664b6a2e756f6efc630b31b
 DIST analysis2.2.1.tar.gz 20974926 RMD160 5905f43fc1399a656f018808c4a2f8dd3d247ca9 SHA1 eed30da55a719ef6c29431e3b3c5a76f521010dc SHA256 d1252811b3db3a30d96a73368bae8abcb05de02fcd2f1f9c502d71dff5e00d13
 DIST analysis2.2.2.tar.gz 21044504 RMD160 cbf3c0d320747b0057afeac0e3ca9a2d889136ba SHA1 825ad7487ef6191baac0e5aa3d0ec6a6ed94a04f SHA256 8e46d12b8fb7763d282933e14ddfa9ce197954ed9fbfa2333e22602ac841b6e5
 DIST ccpn-update-2.1.5-111011.patch.xz 103208 RMD160 475d1f1bba8e72c2e30340d3ab33969206a7e22b SHA1 b05f14ba39d14f67b879b1c190eac024278d9c27 SHA256 6e07a122f3353522c5abf3e02739aa792538403674393192b3f0b86f68a067d3
 DIST ccpn-update-2.2.1-111011.patch.xz 76948 RMD160 1bac8433d91adb373971a4130bb9a89cf46a4051 SHA1 a6001349d0da0bcf9f1142c5b4050ad1903fdf0d SHA256 ec7fc527d6f869f2a952e52e73a4ea17a257237e9724e4916119ba484688aeeb
+DIST ccpn-update-2.2.2-120511.patch.xz 16728 RMD160 7fe1f2104830364e959de9c8f886ee02f9004792 SHA1 cb4e55ea21ee13e2a25c5fd4b8c53a2b087486e2 SHA256 01ce6f8fe051921c0b05d4e5cc47b57fd6f74cd3cbd01f9d419e899295e00363
 EBUILD ccpn-data-2.1.5_p111011.ebuild 1786 RMD160 2f8b4f9fd3f52328224b6b95e3540d3fb2f2ca44 SHA1 5c08456cdc9f218e41e28ead573f6a5029247b03 SHA256 beca9c6c6b4a270559de03fb885491cfb8b7ddb821a36f1d475b145b5ef8ae9a
 EBUILD ccpn-data-2.2.1_p111011.ebuild 1786 RMD160 d1b2221979ce28eca3dbc682ab781b1dd5d20b57 SHA1 3e72195dba3acf6ba6400bafc9ef1ae3faa5e459 SHA256 91527af6f9ce08a589420927210cab6ca37ad0e4488c1c9d3d8f29c74ec662b8
 EBUILD ccpn-data-2.2.2.ebuild 1785 RMD160 87ae762f99c9f309af2e8130291b825576a65ba1 SHA1 373250c44e77f19585613250e6d6d5dcb629137f SHA256 01e5148b051d468e7e0b96ca55e6abf9be7da3faa0c0b3d34f83fdcbe6dfd1b8
-MISC ChangeLog 1818 RMD160 f58c111f9a6f4a8bf7cb2ec1c868f703fe354681 SHA1 6685d03d2046f0867c9ee6fbdff2ed9136f597fb SHA256 41f86d5102b6205ce7f16770831aa24cf8273bd4f40a8398cfb22fc9dbf64abf
+EBUILD ccpn-data-2.2.2_p120511.ebuild 1790 RMD160 f728e3768e1de4bf66555ac8fb0f4820dcea7ab7 SHA1 ac31125ef62e7fc204d18a1d4a607ee11b25e3e1 SHA256 7a941ea3c2328efa768b27765a8f6dff387b58a280f2e9cd9cdbbfb0d3521abe
+MISC ChangeLog 1971 RMD160 4794295e2efddcfe1ddfdcaa0de1e0fb4f198710 SHA1 d88962cd389a97a49c5a03d29b273660c80d5027 SHA256 a606ab5b07448ac7d5968885ed09367388a2fad898c8625587ff6e0b9dccec5b
 MISC metadata.xml 229 RMD160 e5d681054ef371ecfe4d6828e8b722b716968b37 SHA1 e91b223d4c687993ccca1be424e4feedad208570 SHA256 0f110645272f37341c3729c03cf88dbb871ed82db98c8b0dbda8734343b88567
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREKAAYFAk+s3Z8ACgkQgAnW8HDreRbw2wCfYV31MLX0AOKZuWkH/x3cUSGT
+cZsAniGLuUYKuBwN1rT+gdmExiYkTcDs
+=/duz
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/ccpn-data/ccpn-data-2.2.2_p120511.ebuild b/sci-libs/ccpn-data/ccpn-data-2.2.2_p120511.ebuild
new file mode 100644
index 000000000000..ddced7e130a7
--- /dev/null
+++ b/sci-libs/ccpn-data/ccpn-data-2.2.2_p120511.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2012 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.2.2_p120511.ebuild,v 1.1 2012/05/11 09:36:26 jlec Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+
+inherit portability python 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=""
+
+RDEPEND="!<sci-chemistry/ccpn-${PVR}"
+DEPEND=""
+
+RESTRICT="binchecks strip"
+
+S="${WORKDIR}"/ccpnmr/ccpnmr2.2
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	[[ -n ${PATCHSET} ]] && \
+		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
+}
+
+src_install() {
+	local i pydocs in_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)"
+	in_path=$(python_get_sitedir)/ccpn
+
+	dosym ../../../../share/doc/${PF}/html ${in_path}/doc
+	for i in ${pydocs}; do
+		dosym /usr/share/doc/${PF}/html/${i} ${in_path}/${i}
+	done
+
+	dosym /usr/share/ccpn/data ${in_path}/data
+	dosym /usr/share/ccpn/model ${in_path}/model
+
+	dohtml -r doc/*
+	insinto /usr/share/ccpn
+	doins -r data model
+}