sci-libs/ccpn-data: Version Bump, cleaned old

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

6 files changed, 46 insertions, 140 deletions

diff --git a/sci-libs/ccpn-data/ChangeLog b/sci-libs/ccpn-data/ChangeLog
index 66b7fa6aa5f8..93ed6dfcbc23 100644
--- a/sci-libs/ccpn-data/ChangeLog
+++ b/sci-libs/ccpn-data/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/ccpn-data
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccpn-data/ChangeLog,v 1.6 2011/10/11 14:12:09 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccpn-data/ChangeLog,v 1.7 2012/04/03 14:44:43 jlec Exp $
+
+*ccpn-data-2.2.2 (03 Apr 2012)
+
+  03 Apr 2012; Justin Lecher <jlec@gentoo.org> -ccpn-data-2.1.5.ebuild,
+  -ccpn-data-2.1.5_p110401.ebuild, -ccpn-data-2.2.1.ebuild,
+  -ccpn-data-2.2.1_p110401.ebuild, +ccpn-data-2.2.2.ebuild:
+  Version Bump, cleaned old
 
 *ccpn-data-2.2.1_p111011 (11 Oct 2011)
 *ccpn-data-2.1.5_p111011 (11 Oct 2011)
diff --git a/sci-libs/ccpn-data/Manifest b/sci-libs/ccpn-data/Manifest
index debf07915f8a..6dc40ee8701c 100644
--- a/sci-libs/ccpn-data/Manifest
+++ b/sci-libs/ccpn-data/Manifest
@@ -3,22 +3,18 @@ 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 ccpn-update-2.1.5-110401.patch.bz2 75380 RMD160 20acef6c31a9e2252a6dcec23f965ae7d498f6b3 SHA1 084b4270142b04c02478e742e2e312c4410ecf13 SHA256 896fc00dfbe97d5ce1bbeac91a2221a79d8d112eac208202cede1a5396286ae7
+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-110401.patch.bz2 20666 RMD160 193d7f86ab75d2a862953683ec503bed947f3468 SHA1 cfab70216cd485a68234c06808abcdf51b917d98 SHA256 15468c3e1412d9d2c97ef52bcaac255d65d79dd3016d0ae3adb48f7f3d0dc46f
 DIST ccpn-update-2.2.1-111011.patch.xz 76948 RMD160 1bac8433d91adb373971a4130bb9a89cf46a4051 SHA1 a6001349d0da0bcf9f1142c5b4050ad1903fdf0d SHA256 ec7fc527d6f869f2a952e52e73a4ea17a257237e9724e4916119ba484688aeeb
-EBUILD ccpn-data-2.1.5.ebuild 1078 RMD160 4e8d604a6176a6af975eef544bd9cc01fd005181 SHA1 bc91cbc0c48465a068c827fdea9127e9b196eb93 SHA256 4309270f17c30c79ca4bf300cc7670e1d47b188bcf965901077650c414b67d3c
-EBUILD ccpn-data-2.1.5_p110401.ebuild 1385 RMD160 21dcdc3511a57b648281d7312146644bbad79daf SHA1 ba410b04d67d9aaaf24a0fd3fba6396a11b02646 SHA256 b4cdb2824b157356b62768044dc7b6582e985fc57ffe5c81a08bd36be8d2e02c
 EBUILD ccpn-data-2.1.5_p111011.ebuild 1786 RMD160 2f8b4f9fd3f52328224b6b95e3540d3fb2f2ca44 SHA1 5c08456cdc9f218e41e28ead573f6a5029247b03 SHA256 beca9c6c6b4a270559de03fb885491cfb8b7ddb821a36f1d475b145b5ef8ae9a
-EBUILD ccpn-data-2.2.1.ebuild 1079 RMD160 d04b3dde3f7da5e3559d450dfcf6356bb4957a03 SHA1 31139e54f8f7031da17a4ac4a10ef0c4b0de3411 SHA256 c2d719b7ef1298373b6ed24af1a0bacac2eb3d5fa063f659c2cf625a6db4d52d
-EBUILD ccpn-data-2.2.1_p110401.ebuild 1385 RMD160 c14532f7a1d98337a11dd6cfd3234ac6e7ace36e SHA1 013b58322bfe2d00723cae48bbf3c20c8639e979 SHA256 59a8d40e815dd8594a6128d240dd7644c6aff00b7a996a31da5b66e60123ba15
 EBUILD ccpn-data-2.2.1_p111011.ebuild 1786 RMD160 d1b2221979ce28eca3dbc682ab781b1dd5d20b57 SHA1 3e72195dba3acf6ba6400bafc9ef1ae3faa5e459 SHA256 91527af6f9ce08a589420927210cab6ca37ad0e4488c1c9d3d8f29c74ec662b8
-MISC ChangeLog 1413 RMD160 3099bcf1b84357ade3b6a573bc8312938c507f02 SHA1 b0e1b2b436cd888872b512a25521998484c63a1f SHA256 e177feb74696c0d6434a785b488a2e6db87859124f8c4bb5a4f22b9a73102fe4
+EBUILD ccpn-data-2.2.2.ebuild 1790 RMD160 24858dc98f4097c316e1b0e8747b6d0ec0066947 SHA1 0825d5d42ef1516d494fde9ab370f5012ed73c6f SHA256 fac0c127a15590be537da7a3b72f389e4666e8f5c6510dc19b136a677ed974a6
+MISC ChangeLog 1666 RMD160 ba20b8f6135d8fea2efc49022eb05f08d3674e92 SHA1 47e667c9096f65e2f2a665fe99c6d6cf1ddc4c9b SHA256 41e4f2856f5d8988b7a29148449fcefdea90af4186b85877b9334b3c9b34001b
 MISC metadata.xml 229 RMD160 e5d681054ef371ecfe4d6828e8b722b716968b37 SHA1 e91b223d4c687993ccca1be424e4feedad208570 SHA256 0f110645272f37341c3729c03cf88dbb871ed82db98c8b0dbda8734343b88567
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk6UTr8ACgkQgAnW8HDreRYZxACdHLkQdUUInteHHtJ4WzA94Wfc
-TmwAn2zjRBJojEuBpjra/PGj7Uq+54fp
-=tLru
+iEYEAREKAAYFAk97DOEACgkQgAnW8HDreRaGkwCghEtUTBdsq/Bbd2JhpNzhz7UR
+nqIAnj91+nCdEjuj9OItRyMpOp3j/Tj2
+=XWRR
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/ccpn-data/ccpn-data-2.1.5.ebuild b/sci-libs/ccpn-data/ccpn-data-2.1.5.ebuild
deleted file mode 100644
index 9344a6ef4fcd..000000000000
--- a/sci-libs/ccpn-data/ccpn-data-2.1.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 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.1.5.ebuild,v 1.4 2011/04/01 10:29:45 jlec Exp $
-
-EAPI="3"
-
-inherit portability versionator
-
-MY_PN="${PN/-data}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-
-DESCRIPTION="The Collaborative Computing Project for NMR - Data"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="!<sci-chemistry/ccpn-${PV}"
-DEPEND=""
-
-RESTRICT="binchecks strip"
-S="${WORKDIR}"/ccpnmr/ccpnmr2.1
-
-src_install() {
-	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/
-	dohtml -r doc/* || die
-	insinto /usr/share/ccpn
-	doins -r data model || die
-}
diff --git a/sci-libs/ccpn-data/ccpn-data-2.1.5_p110401.ebuild b/sci-libs/ccpn-data/ccpn-data-2.1.5_p110401.ebuild
deleted file mode 100644
index f8a9804ab183..000000000000
--- a/sci-libs/ccpn-data/ccpn-data-2.1.5_p110401.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 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.1.5_p110401.ebuild,v 1.1 2011/04/01 10:29:45 jlec Exp $
-
-EAPI="3"
-
-inherit portability 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://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="!<sci-chemistry/ccpn-${PV}"
-DEPEND=""
-
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}"/ccpnmr/ccpnmr2.1
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-}
-
-src_install() {
-	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/
-	dohtml -r doc/* || die
-	insinto /usr/share/ccpn
-	doins -r data model || die
-}
diff --git a/sci-libs/ccpn-data/ccpn-data-2.2.1.ebuild b/sci-libs/ccpn-data/ccpn-data-2.2.1.ebuild
deleted file mode 100644
index f2d77b1fb280..000000000000
--- a/sci-libs/ccpn-data/ccpn-data-2.2.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 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.1.ebuild,v 1.2 2011/04/01 10:29:45 jlec Exp $
-
-EAPI="3"
-
-inherit portability versionator
-
-MY_PN="${PN/-data}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-
-DESCRIPTION="The Collaborative Computing Project for NMR - Data"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="!<sci-chemistry/ccpn-${PV}"
-DEPEND=""
-
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}"/ccpnmr/ccpnmr2.2
-
-src_install() {
-	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/
-	dohtml -r doc/* || die
-	insinto /usr/share/ccpn
-	doins -r data model || die
-}
diff --git a/sci-libs/ccpn-data/ccpn-data-2.2.1_p110401.ebuild b/sci-libs/ccpn-data/ccpn-data-2.2.2.ebuild
index 129bcf2f529d..48e1e1aa3090 100644
--- a/sci-libs/ccpn-data/ccpn-data-2.2.1_p110401.ebuild
+++ b/sci-libs/ccpn-data/ccpn-data-2.2.2.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.1_p110401.ebuild,v 1.2 2011/04/01 10:30:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccpn-data/ccpn-data-2.2.2.ebuild,v 1.1 2012/04/03 14:44:43 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
-inherit portability versionator
+PYTHON_DEPEND="2"
 
-PATCHSET="${PV##*_p}"
+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)"
@@ -14,32 +16,51 @@ 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://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
+[[ -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-${PV}"
+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/
-	dohtml -r doc/* || die
+
+	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 || die
+	doins -r data model
 }