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

(Portage version: 2.2.0_alpha99/cvs/Linux x86_64)

5 files changed, 39 insertions, 129 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/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
 }