Upstream changes to model added

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

5 files changed, 105 insertions, 6 deletions

diff --git a/sci-libs/ccpn-data/ChangeLog b/sci-libs/ccpn-data/ChangeLog
index 6c4ec5f673b6..cf0ae5a62299 100644
--- a/sci-libs/ccpn-data/ChangeLog
+++ b/sci-libs/ccpn-data/ChangeLog
@@ -1,6 +1,14 @@
 # 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.3 2011/02/15 16:52:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccpn-data/ChangeLog,v 1.4 2011/04/01 10:29:45 jlec Exp $
+
+*ccpn-data-2.2.1_p110401 (01 Apr 2011)
+*ccpn-data-2.1.5_p110401 (01 Apr 2011)
+
+  01 Apr 2011; 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:
+  Upstream changes to model added
 
 *ccpn-data-2.2.1 (15 Feb 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
index 3bd45f6adc64..9344a6ef4fcd 100644
--- a/sci-libs/ccpn-data/ccpn-data-2.1.5.ebuild
+++ b/sci-libs/ccpn-data/ccpn-data-2.1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.3 2010/09/21 19:23:44 jlec Exp $
+# $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"
 
@@ -14,8 +14,8 @@ 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"
-LICENSE="CCPN"
 IUSE=""
 
 RDEPEND="!<sci-chemistry/ccpn-${PV}"
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
new file mode 100644
index 000000000000..f8a9804ab183
--- /dev/null
+++ b/sci-libs/ccpn-data/ccpn-data-2.1.5_p110401.ebuild
@@ -0,0 +1,45 @@
+# 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
index b853df31767a..f2d77b1fb280 100644
--- a/sci-libs/ccpn-data/ccpn-data-2.2.1.ebuild
+++ b/sci-libs/ccpn-data/ccpn-data-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2011/02/15 16:52:06 jlec Exp $
+# $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"
 
@@ -14,8 +14,8 @@ 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"
-LICENSE="CCPN"
 IUSE=""
 
 RDEPEND="!<sci-chemistry/ccpn-${PV}"
diff --git a/sci-libs/ccpn-data/ccpn-data-2.2.1_p110401.ebuild b/sci-libs/ccpn-data/ccpn-data-2.2.1_p110401.ebuild
new file mode 100644
index 000000000000..806f82bfe1fa
--- /dev/null
+++ b/sci-libs/ccpn-data/ccpn-data-2.2.1_p110401.ebuild
@@ -0,0 +1,46 @@
+# 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_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.2
+
+
+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
+}