Upstream changes to model added

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

6 files changed, 116 insertions, 13 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/Manifest b/sci-libs/ccpn-data/Manifest
index 97b8cb851b1f..6145fd62d7ad 100644
--- a/sci-libs/ccpn-data/Manifest
+++ b/sci-libs/ccpn-data/Manifest
@@ -3,14 +3,18 @@ Hash: SHA1
 
 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
-EBUILD ccpn-data-2.1.5.ebuild 1062 RMD160 67c01ed71b2688c660ab4900302e07d55a9f0e23 SHA1 edfe732c186845bcbe0a75eddbab41aad2947c2c SHA256 c4d6007faca93d9aafd8a3d2fb319fe618909bcb402aa17ff79d70cf6ac5bf95
-EBUILD ccpn-data-2.2.1.ebuild 1063 RMD160 7c4a0c867625199973f1d17c18add903f42f4766 SHA1 cc47197751515acd01c2d1053d5529238adf1ce6 SHA256 631cb205d82b8e8c0e08b49701e061da0d79d37c48af2f87e5de2b4292e6a529
-MISC ChangeLog 581 RMD160 c5bbbea62a66e0fadb7a8c6d84ac5e17b65a5439 SHA1 9829d71bb11ae723f4ce959bc4f2996c2a187683 SHA256 3db0807d7b3dc34218305b1ee266944c31f87a14d99dd647078ee82f84f2ef70
+DIST ccpn-update-2.1.5-110401.patch.bz2 75380 RMD160 20acef6c31a9e2252a6dcec23f965ae7d498f6b3 SHA1 084b4270142b04c02478e742e2e312c4410ecf13 SHA256 896fc00dfbe97d5ce1bbeac91a2221a79d8d112eac208202cede1a5396286ae7
+DIST ccpn-update-2.2.1-110401.patch.bz2 20666 RMD160 193d7f86ab75d2a862953683ec503bed947f3468 SHA1 cfab70216cd485a68234c06808abcdf51b917d98 SHA256 15468c3e1412d9d2c97ef52bcaac255d65d79dd3016d0ae3adb48f7f3d0dc46f
+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.2.1.ebuild 1079 RMD160 d04b3dde3f7da5e3559d450dfcf6356bb4957a03 SHA1 31139e54f8f7031da17a4ac4a10ef0c4b0de3411 SHA256 c2d719b7ef1298373b6ed24af1a0bacac2eb3d5fa063f659c2cf625a6db4d52d
+EBUILD ccpn-data-2.2.1_p110401.ebuild 1386 RMD160 e8683f9eb89f173df01a87fe0bc2f8743e472f3e SHA1 141844ab285604c2dee24629e69acc4f0fd1162c SHA256 264c04547fe02b594c0e037c410820eb3d2e8caeb93817ac1d0ef9acea9ca87c
+MISC ChangeLog 860 RMD160 972852a3364ac9866ef6a6a7969de11428c886c7 SHA1 a13adb7a76b5839b874a8c7257be8da88faaa938 SHA256 825f0e8f5feaa3e612ce6eb1b329a2aa2e8f4cb7a25266f850e5b25af47f4605
 MISC metadata.xml 226 RMD160 0355d90bd8d1c106a19b136045ebdf970a0a2485 SHA1 1db0b2a470657641079d6613829df49a5c043ed6 SHA256 094a3ac740c81b9afbff3c855ba93cc20a593cad2392f6f4404715608a836fa1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1arzwACgkQgAnW8HDreRbN3QCeNAvSrO1yYL2b3Yurs/W2Qwmj
-uKgAoIQXLOpZT5wnZGx4V5c1ZCKWz/Om
-=N0Mz
+iEYEARECAAYFAk2VqR8ACgkQgAnW8HDreRa+sACgmYe1UYMz+F2u1MnmNHHgSfyw
+T1kAnAkIRAoc3hA3RzWw9y6cPPHaFGBA
+=qhK3
 -----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
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
+}