Last version suffers from some leftovers on my system

Package-Manager: portage-2.2_rc84/cvs/Linux x86_64

3 files changed, 20 insertions, 16 deletions

diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog
index 5dcfb210f15a..3927c265efb3 100644
--- a/sci-chemistry/ccpn/ChangeLog
+++ b/sci-chemistry/ccpn/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sci-chemistry/ccpn
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.33 2010/09/21 13:11:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.34 2010/09/21 13:37:00 jlec Exp $
 
 *ccpn-2.1.5_p100921 (21 Sep 2010)
 *ccpn-2.1.3.1_p100806 (21 Sep 2010)
@@ -9,7 +9,7 @@
   -ccpn-2.1.2.1_p100216.ebuild, -ccpn-2.1.3.1_p100519.ebuild,
   -ccpn-2.1.3.1_p100607.ebuild, -ccpn-2.1.3.1_p100628.ebuild,
   -ccpn-2.1.3.1_p100713.ebuild, +ccpn-2.1.3.1_p100806.ebuild,
-  +ccpn-2.1.5_p100921.ebuild, +files/depositionFileImporter,
+  +ccpn-2.1.5_p100921-r1.ebuild, +files/depositionFileImporter,
   +files/extendNmr:
   Version Bump, splitted sci-libs/ccpn-data out, removed old
 
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index 7272dd07b663..f7940ffc030e 100644
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -18,13 +18,13 @@ DIST analysis2.1.5.tar.gz 20338459 RMD160 b0706c859c1ee4da2ab80ee41534197268f73d
 DIST ccpn-update-100806.patch.bz2 187965 RMD160 3297162fe3314aa405ee58737ce45cda084834e5 SHA1 338423d9f36da3fb10dc9d9a3b8aeb932ae3bfd0 SHA256 5cea7899edb96237a6674f04a1beee6ad7b309e12964ea8b25d9ea6ff752d0d4
 DIST ccpn-update-100921.patch.bz2 17693 RMD160 a1c2de812ce524969b9148d5e0f6e0c5c24fce91 SHA1 b04c9a1af7a7de9139ef74914deab80b44f24f7f SHA256 548eebcdcadd930b5f206fb56c75d5d32d11b7ef8aa2b696c60d9f35cd45b8f4
 EBUILD ccpn-2.1.3.1_p100806.ebuild 5190 RMD160 b9572b61f8c53505b63b1c99ce9ea73cf38472fc SHA1 9d8df54514655824e09e3e65fdaf51ad32f97d91 SHA256 ca80063e4810c499416ffc8ade6b187a3df9bfb470d03f9aa26105c379476b68
-EBUILD ccpn-2.1.5_p100921.ebuild 5596 RMD160 44595e67dc3d5586a91071758c3b0abae7e4cdbb SHA1 b839a43dc31fd6fa25f47d97298820534f8e9a53 SHA256 07eeb612f65160513d436c1b3c4767896bfa70ef2eac7ed125ae023fa0d3eb50
-MISC ChangeLog 6238 RMD160 997f6a3b8c72aa155c8d11ee74d9f7831e3a8f79 SHA1 727899d2a3046ba08158d3dcff04858f53df86e9 SHA256 29ab17f86a0aed5c9b7059d0c082bc4ff7cfb0c93b3bf1e78a1d8aacc06867b3
+EBUILD ccpn-2.1.5_p100921-r1.ebuild 5743 RMD160 98973aca4c525cd45151080a288d220c2b0637df SHA1 574c89b0b57c8912eb6b9f022ec549757d839fa2 SHA256 a87ac19daf62a893564d2eb873c66f39e33ff2190588c24a514fb01df37d8931
+MISC ChangeLog 6241 RMD160 b174da14415273d1930372c95b437b722f7bc670 SHA1 ac2de517110264a2fd05fcd34939d7072f98ebb9 SHA256 93bccc73e07b03aa2f2be34552ede17cefd15a2599b73a3fc965e49ef0d573d8
 MISC metadata.xml 226 RMD160 0355d90bd8d1c106a19b136045ebdf970a0a2485 SHA1 1db0b2a470657641079d6613829df49a5c043ed6 SHA256 094a3ac740c81b9afbff3c855ba93cc20a593cad2392f6f4404715608a836fa1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyYrwgACgkQgAnW8HDreRaoUACghjBc2DToo+27PYmtspSBJa8P
-VSkAoKGxWV1q6+IHDU87XFOwdeKWMMHF
-=q2BS
+iEYEARECAAYFAkyYtQEACgkQgAnW8HDreRZjwACfciqU8f3vrl8G1tV5mBE8f1MB
+nwMAn1r2SnV/Z3Z8T+vZk2iJq73hz77i
+=MgkO
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p100921.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p100921-r1.ebuild
index 4da316a88732..162105e74a3d 100644
--- a/sci-chemistry/ccpn/ccpn-2.1.5_p100921.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.1.5_p100921-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p100921.ebuild,v 1.1 2010/09/21 13:11:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p100921-r1.ebuild,v 1.1 2010/09/21 13:37:00 jlec Exp $
 
 EAPI="3"
 
@@ -14,6 +14,7 @@ inherit eutils portability python toolchain-funcs versionator
 PATCHSET="${PV##*_p}"
 MY_PN="${PN}mr"
 MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
+MY_MAJOR="$(get_version_component_range 1-3)"
 
 DESCRIPTION="The Collaborative Computing Project for NMR"
 SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
@@ -29,7 +30,7 @@ RDEPEND="
 	dev-lang/tk[threads]
 	>=dev-python/numpy-1.4
 	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-2.1.5*
+	=sci-libs/ccpn-data-"${MY_MAJOR}"*
 	x11-libs/libXext
 	x11-libs/libX11
 	opengl? ( media-libs/freeglut )"
@@ -108,11 +109,11 @@ src_install() {
 	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
 
 	for wrapper in analysis dangle dataShifter depositionFileImporter extendNmr eci formatConverter pipe2azara; do
-		sed -e "s:gentoo_sitedir:${EPREFIX}/$(python_get_sitedir -f):g" \
-		    -e "s:gentoolibdir:${EPREFIX}/usr/${libdir}:g" \
-			-e "s:gentootk:${EPREFIX}/usr/${libdir}/tk${tkver}:g" \
-			-e "s:gentootcl:${EPREFIX}/usr/${libdir}/tclk${tkver}:g" \
-			-e "s:gentoopython:${EPREFIX}/usr/bin/python:g" \
+		sed -e "s:gentoo_sitedir:${EROOT}$(python_get_sitedir -f):g" \
+		    -e "s:gentoolibdir:${EROOT}usr/${libdir}:g" \
+			-e "s:gentootk:${EROOT}usr/${libdir}/tk${tkver}:g" \
+			-e "s:gentootcl:${EROOT}usr/${libdir}/tclk${tkver}:g" \
+			-e "s:gentoopython:${EROOT}usr/bin/python:g" \
 		    "${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
 		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
 	done
@@ -141,11 +142,14 @@ src_install() {
 			doins -r python || die "main files installation failed"
 		eend
 
-		dosym ../../../..//share/doc/ccpn-data-${PV}/html ${in_path}/doc || die
+		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
 		for i in ${pydocs}; do
-			dosym /usr/share/doc/ccpn-data-${PV}/html/${i} ${in_path}/${i}
+			dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
 		done
 
+		dosym /usr/share/ccpn/data ${in_path}/data
+		dosym /usr/share/ccpn/model ${in_path}/model
+
 		einfo "Adjusting permissions"
 
 		files="