sci-chemistry/ccpn: Todays python patches

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

8 files changed, 32 insertions, 758 deletions

diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog
index 7f52a849ce96..c0dc7ce3b597 100644
--- a/sci-chemistry/ccpn/ChangeLog
+++ b/sci-chemistry/ccpn/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-chemistry/ccpn
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.99 2012/11/25 09:16:31 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.100 2013/01/10 17:41:33 jlec Exp $
+
+*ccpn-2.2.2_p130110 (10 Jan 2013)
+
+  10 Jan 2013; Justin Lecher <jlec@gentoo.org> -ccpn-2.2.2_p120829.ebuild,
+  -ccpn-2.2.2_p120912.ebuild, -ccpn-2.2.2_p121012.ebuild,
+  -ccpn-2.2.2_p121112.ebuild, -ccpn-2.2.2_p121119.ebuild,
+  +ccpn-2.2.2_p130110.ebuild, metadata.xml:
+  Todays python patches
 
 *ccpn-2.2.2_p121125 (25 Nov 2012)
 
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index ae3f9dbae50f..4a1fcacf8953 100644
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -18,25 +18,17 @@ AUX xeasy2azara 324 SHA256 89945dae1c7bd78aefdd19c81c79571a13aaa149d6c50e12cc0ec
 DIST analysis2.1.3_1.tar.gz 18932918 SHA256 bbc1ba5434f896d38b6745c1dc9adc470a78d3be7b879160edcd635a19228b74 SHA512 ee95119a972ada7949d646e0fd634d1828bba7562d7ea3a3be1c2b17d22f194dbd1267716f21ce86fffb3eadec136b0b613705f862747ab7933cb2ad57e063b8 WHIRLPOOL 1fb19a4bc676955eca4168595fad0661054061e18fa6e25e7f4ed5026cf31faba75b7644a8e2e18ece10e9641efc81feaccf580d3c766bda1d5232a346d99133
 DIST analysis2.2.2.tar.gz 21044504 SHA256 8e46d12b8fb7763d282933e14ddfa9ce197954ed9fbfa2333e22602ac841b6e5 SHA512 efe8a82381521dbfb95b12dd553f401f200aee3763f9e739c37a9141a14bf038865b2a860b0353adc532582697b58079034386be42161aecbe231952b8abaac7 WHIRLPOOL c9d7fc936dc25b952e711e8fa439ada5a67e68497b6d4ad034586e604bcbd9d1ff7dd48d1a3baace347fc9bab5c17d2f7852906f921708a16ce8c8eb4a8659b9
 DIST ccpn-update-100806.patch.bz2 187965 SHA256 5cea7899edb96237a6674f04a1beee6ad7b309e12964ea8b25d9ea6ff752d0d4 SHA512 ab145f14137955bcb4dcc4d242eb718a806152bf3376e4cc9ff5e8186ed54812051ad07de1c9d2316ce3379c8c74db4af36f714aa3291ea7a1d11d4f432df06f WHIRLPOOL 2a0cbf62aca74e22fc0e00a0a91c3c185c10fb07277ba30791511565a2fa645b123a8c5164389eb9fb5a2d1f591e26c6416c46038acceefa2f1ecf347b631a66
-DIST ccpn-update-2.2.2-120829.patch.xz 47500 SHA256 0ec4cd5103f4cd5d6dcddbfd1ee904ac443f0af99c6083ebdaf1a18377f139b3 SHA512 4c59299ad240c58c576634c47b777fb58c0c762d987415c1a919ff7d8634b6602a55abafd600396faab5e6669c45a47ee5a05f0e2c90b87c4787330055fb734a WHIRLPOOL 5ada41db62bece7a05f304c55f742aad0003be486900b040f16cf6dd36bc2d08595296c05a058cab3f505132dfe17fa7c2a80db3f396a3b1526055d169d8bcde
-DIST ccpn-update-2.2.2-120912.patch.xz 48644 SHA256 96d0287900a586439b49cc8f763864e0cb9765a0823b343a3345af3a46d35b99 SHA512 ad7f3f943c94352d2618dda1ccf483507690225c66fc41cdebd5185dfadc776e7dbd1978cae4c31e8fd6bfc7023ab8154fa733be47b3a44f414cba2e636577d3 WHIRLPOOL 6e87d9c090b2ea58a6e011bb8dda8d5728ad4b9edd0e7544111cea539c9fba3909b8e244d50312f28989c7ef895c4b816f3d9fb57acd6880a020c601454cccc6
-DIST ccpn-update-2.2.2-121012.patch.xz 155460 SHA256 7a5441049fe0f002ee84cfce853043b350ade73c0c564901964db59ec13bb5fe SHA512 86d8bd03cde0a81542cde451c9ab759971c9ea30a1ada0e2961370640d1c139fa8e050e102969d7dd59c2d4664c87da6ccaae1af803a48c0d2ff6c52fb49d295 WHIRLPOOL 7acaeeee4eda9f6d16b630c898244683d40e1809bb0457ce68f26e1ac8c8b691ef227dc873b9f60e53b6c077d2b602f682a782121aa5c9f004e35d9460181016
-DIST ccpn-update-2.2.2-121112.patch.xz 223036 SHA256 a46fd5927ff2c2e1be88d1a9ecce520a6cd551efaf98fe1c4e2b8c3d51a40a27 SHA512 68bb7b715ec76f0b83c2bcf436b6a88c2e5f554a245b509bd387926df16c5249c1fdf315a987b6e55c4a00d02382afb1c99a350907829811390d0a50e8d672df WHIRLPOOL b7863197439a917b49914a5ea7997963c1d14ca74baf77523676b653300d3d08e5eb5bbfc5abc4d05e71c94f8bb30e8446776623085aa8a7b279f1107277bd05
-DIST ccpn-update-2.2.2-121119.patch.xz 223500 SHA256 9c419940b6c86347ad1d1cbe3f04c03e0331c79b9eca5c79acd972cf5e72d7d3 SHA512 24802c38f18d9ffe88d67212cfcee7b07312b7758d761b90ff1cf50a093926bfbf50b27f4a5b2bf85c9b5650fd9aa0ce29b621fe71b4c92327ba5d0ddd94289a WHIRLPOOL f43b19c2fcc61ae58a56b4e9465743068815da37c5469487364112e53c3ab64ac3319f180f06433cd53b1ebc4040e50a562168a3e5b87e68785fa42f9962efb2
 DIST ccpn-update-2.2.2-121125.patch.xz 223556 SHA256 996f453d7d6a143715a94b1201bd7b8b9c037f6d0baa342f5c0645d500aa5c79 SHA512 d213e072a63110ec478c3ee64792b01c818d3c9052ae6d7dac903508536f78c432c72d5a4756665045579d72f4f54ef5ac9db1fb02eb5ea3111eaa47e72866b0 WHIRLPOOL c268761e4d9cf4c845964c7c865e20439a9cacd00bc56d89d8558e0f601fc9840d4288307c4a4f47ba6d478eb9da9dacd1e149c657d2e6506ef5e32d6b0b75d1
+DIST ccpn-update-2.2.2-130110.patch.xz 226800 SHA256 6c0f4d71322e45ef24a15f1e26eb5d4104499fc2391660e575158dc08ae0380a SHA512 2fa7e782ca30402c91793032dc0d4555d9e866ba11b03f8f4b06891c8c80d256f5598bccfc99e9a97ae9b3618b1c24307814de4656087e2c0b40d378df743e47 WHIRLPOOL 5a49c0480328e7b03691a1e63fea339e2a9a29afd845babcce70e57b6e8d6ce21a5cb612d856c22bd3a9033a9ab565b0149e61435bc31ffdf02e247051e29d6d
 EBUILD ccpn-2.1.3.1_p100806.ebuild 5181 SHA256 c3ba268461da63ea23ee7f621a8e4837a368eb3e4c85bcc5245250fb6b377b58 SHA512 701ea90a13dc44e5bf1ea17c0f69adea56b1c14788ab79c67fa4b9726cae532998717515568045aec9bb4e1dd4c352227130115d90c50bf07e7fd132cdee385d WHIRLPOOL 898a618f95b254785739e6fab20af333cb3a44bff12cd6840d1b111f1588a60e48055e8af7ca88457173452f6acba86ebd3bada96390211bc4cd063fe4160fd5
-EBUILD ccpn-2.2.2_p120829.ebuild 4799 SHA256 6930082cd40aad6f0503c4e02e21b377f4e3411264007a5b72b77ad107616843 SHA512 4b1e894a6650fa0ecbd9c6acc8811fd9317cffb1eebe40e8364394bd8d979c55956fafd1c67a8bc2349bd1b78b8dd3f3539f112b8de29cb6bcebdfe13887a699 WHIRLPOOL dae24e4ba14c8846c8413236b88261ecc2cd3ab00dae680bc5cc8cee6a1f1333a7bb40cdc069c9a2bf1687dca284f8a68e66aef58e237be5fdb86328f2dd0125
-EBUILD ccpn-2.2.2_p120912.ebuild 4799 SHA256 e2d429881107e93973f2dd87982cbf2aff65bfc4d7def242931854f4d8199a74 SHA512 dc0e6b64d01164a68896701a9f9880206dccf067752865bfbd01afb6f5ceb3cb2603f41b96f275a65a6249f31af1306bcba77890cb773e15c6cb0000a967ce69 WHIRLPOOL fab86d5cc8e204ede0d3af451d736bce90fbfb52ce384ceb6c925fc97f41938590ea2b82f260ea3a07d6636b4e507528b9fa4de0a2ff9fdbefac763c42bf0f9e
-EBUILD ccpn-2.2.2_p121012.ebuild 4799 SHA256 8d50143deb47c2fe91a82d373f5d9f17ce16f12aa5ba1fa9ad616cfee2510a52 SHA512 865d37b28ec93eabf7cac2a9f61bd3561bec3df194b1f87850477891853f17f1dfeec8c95cbea3a2a8b8fea43d46b70d286583c2543c44f89c7c368123b1164f WHIRLPOOL dc8794af8523f643a333169bd3f349c44cc1ff001c71d61e75fca18394a16f279aef035aeb50ac0ce6de2f9f72bc2b2087c4c346524e95bbaa90552e2a5f6683
-EBUILD ccpn-2.2.2_p121112.ebuild 4799 SHA256 0260a618fb47fc405fabf7f981148a56a5dbdb1cf4890ac1d42001be6dc257b3 SHA512 f20ab472bda522f174c64986b75c09985a919ec6803e31465806f719a96ca303152859fd874c56019d2ded4228838f3d1eae8917219273d4ee186ef8d035e7ea WHIRLPOOL 368e614428d659d6e85b708fb085fb5eb529c710d6f8975439ffa2955e1a4588014379fec20821be4f65a09fb13d2391cd9ad05a75891ce6bf388a5e23cdd349
-EBUILD ccpn-2.2.2_p121119.ebuild 4799 SHA256 77f149b7f45de457685d6cc5b26eafcd963085286d6f5bd920959d8106f89090 SHA512 655d562b7e3e45fe4971b0c928b91c69ec954eff5634bb344716e68a8d97196f57316f91735969231c6b6279550345e6dfef9962e44e25a8c7da9253a25856ca WHIRLPOOL 211bf422c91cef62eef97e4ecfb5f75a03dfe83b428837c18766e2e059bfb0d68d816dd649e892d87e80bc536c90e0cc17672b2e93cfc46a5c226f60f795bad0
 EBUILD ccpn-2.2.2_p121125.ebuild 4612 SHA256 08a4b0682c049a6301138ea6f24d665edb0a8d8d709ed2c2f2529aa0a5e648a1 SHA512 f8c45f0b19a721775dab3147cced933e8db969e8443c15cd2bd2a31ffc3fcd0eda95acc75a93df5d0dd51dabd80fde8311a7b02bf3f6a051bc0855cb156755a5 WHIRLPOOL 427cacc0c080197cc79a867f1cf1d5bed45cbfbb0f8c5dc6456548218895ff25023ea30090e751af78b77fffd47f87f7aac3869a8ed13aa3727f2f12bac743b1
-MISC ChangeLog 19519 SHA256 a3fa301ba3d5aeabc4e241ce7cf31bb44c6c08702702ea72a0ddd85f89d10a77 SHA512 5b03e4b73d1644cf28cae47e5c2211c94422c22c373bbabeb6b079a93a119cdbe342a46f605f29104b7141524f5c4672a323e52121cec40b6e40fd7fdd98dd10 WHIRLPOOL dea7670053096817e5ca1490c173f3ed0e117e06d2f398c6849ef491ad9c5a2cb6b24db17d95f2f4fde378d974e7663eb875db5966c9a133896da40f50452ce0
-MISC metadata.xml 322 SHA256 7468ba4c27b879e7ed5f82274f5837e51f1f389673a33b9e26e1756a6b0783df SHA512 01933ddaa7b2ab20fd0c07ba6725c162dc9e0512275c91ff657732a69135f1ca7cb3ce39002b4e386aedf27fca26c086f80d31bd8a0821b696c9b99f59c140a4 WHIRLPOOL 1bd202323ff47b3fb34ca4cc6c89567b69a480d38abbcf1a140cbf8f316ebad8b7f95b4525ac261174e1b94555644cdb791dc532398b8f2fbf3cce74283d8ef8
+EBUILD ccpn-2.2.2_p130110.ebuild 4658 SHA256 395ccae5b36353eea07585cff86ced8d52a44705694459e8ceac33d986f9fa9e SHA512 7729cf7d61a9b725775ec34ec3186f4bf9297ee10d3b76d889a9014d0b64b8c7b6dad434d09a20b554c7c336f54732ce83b50a38feb443816a805fd2e56df2a7 WHIRLPOOL 536b13159432085336e2079cadc4a382272e2963856972c4b2759580871026b8ba601de177c645bf21cfe0de540965ee7aad0b9bcd6bdaf4c81c3871d8b49ada
+MISC ChangeLog 19815 SHA256 91a36a46f04a07ee6a72a3b48fd95fa168a1d57dd508e7403e7ec53f04b11389 SHA512 8a7d6535eade4d5f7fd3c3c90022500c5aae825cc56582d8965b657897c59e288dd66cd4f15b64457a23d0e8c4edcea3f44139bbdb01c11a115f5599419704a6 WHIRLPOOL cbee84a842eabe82e1255dec25e4bc380aacac10426da72ad587225c769df254d627fd4a7a9eb85dfbb6ab8a41a784462c616ab1b570696a9472f04901674354
+MISC metadata.xml 331 SHA256 94d753ba1d3240defd1d9b5f6a60545874c498f65fc33a0bf8dbbb5690cd5f96 SHA512 353f8d2445a091abf398a4c6087d76d709880cc4f6f1b535bf2c59c433669a4f6c43283ec55e6ed137e7019559db1cd82a95e4451c0016c384356c128d5b8d59 WHIRLPOOL adf01cbf6b28a72f29abb737edfde82f90365ddb97a04cdb977e401bfde172c5f800d8cae3199c114bc3063bb47798dc6a2c356915277452b0d8d22d6803f1c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCx4fYACgkQgAnW8HDreRZ8gQCfTFwrhu2dZb3l1UFtknt4tioF
-Yk0AoKYFf8oLZfcnts4F+E+Rs9eidiT9
-=qTu/
+iEYEAREIAAYFAlDu/U4ACgkQgAnW8HDreRarpQCdHkh4AEbhrRXIkawReOk9i7Md
+XaAAn37/DLdcCzuJf4pZtBxYQwAI2qS5
+=IZea
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ccpn/ccpn-2.2.2_p120912.ebuild b/sci-chemistry/ccpn/ccpn-2.2.2_p120912.ebuild
deleted file mode 100644
index 95938b6ad10a..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.2.2_p120912.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.2_p120912.ebuild,v 1.1 2012/09/12 11:26:07 jlec Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-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-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	dev-python/numpy
-	dev-tcltk/tix
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	sci-biology/psipred
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		>=sci-chemistry/aria-2.3.2-r1
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	sed \
-		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
-		-e "s:weights_s:weights:g" \
-		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
-		-e "s|^\(OPT_FLAG =\).*|\1 ${CFLAGS}|g" \
-		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
-		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
-		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
-		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
-		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
-		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
-		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
-		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
-		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
-		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I${EPREFIX}/$(python_get_includedir)|g" \
-		-e "s|^\(PYTHON_LIB =\).*|\1 $(python_get_library -l)|g" \
-		c/environment_default.txt > c/environment.txt || die
-
-	sed \
-		-e 's:ln -s:cp -f:g' \
-		-i $(find python -name linkSharedObjs) || die
-}
-
-src_compile() {
-	emake -C c all
-	emake -C c links
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type f -delete
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s|gentoo_sitedir|${EPREFIX}$(python_get_sitedir)|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|$(PYTHON -a)|g" \
-			-e "s|gentoousr|${EPREFIX}/usr|g" \
-			-e "s|//|/|g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper}
-	done
-
-	local in_path=$(python_get_sitedir)/${PN}
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's|#from __future__|from __future__|g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python
-	eend
-
-	ebegin "Adjusting permissions"
-
-	for _file in $(find "${ED}" -type f -name "*so"); do
-		chmod 755 ${_file}
-	done
-	eend
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.2.2_p121012.ebuild b/sci-chemistry/ccpn/ccpn-2.2.2_p121012.ebuild
deleted file mode 100644
index cd38f77e1eb1..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.2.2_p121012.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.2_p121012.ebuild,v 1.1 2012/10/12 16:24:44 jlec Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-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-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	dev-python/numpy
-	dev-tcltk/tix
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	sci-biology/psipred
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		>=sci-chemistry/aria-2.3.2-r1
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	sed \
-		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
-		-e "s:weights_s:weights:g" \
-		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
-		-e "s|^\(OPT_FLAG =\).*|\1 ${CFLAGS}|g" \
-		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
-		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
-		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
-		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
-		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
-		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
-		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
-		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
-		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
-		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I${EPREFIX}/$(python_get_includedir)|g" \
-		-e "s|^\(PYTHON_LIB =\).*|\1 $(python_get_library -l)|g" \
-		c/environment_default.txt > c/environment.txt || die
-
-	sed \
-		-e 's:ln -s:cp -f:g' \
-		-i $(find python -name linkSharedObjs) || die
-}
-
-src_compile() {
-	emake -C c all
-	emake -C c links
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type f -delete
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s|gentoo_sitedir|${EPREFIX}$(python_get_sitedir)|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|$(PYTHON -a)|g" \
-			-e "s|gentoousr|${EPREFIX}/usr|g" \
-			-e "s|//|/|g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper}
-	done
-
-	local in_path=$(python_get_sitedir)/${PN}
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's|#from __future__|from __future__|g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python
-	eend
-
-	ebegin "Adjusting permissions"
-
-	for _file in $(find "${ED}" -type f -name "*so"); do
-		chmod 755 ${_file}
-	done
-	eend
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.2.2_p121112.ebuild b/sci-chemistry/ccpn/ccpn-2.2.2_p121112.ebuild
deleted file mode 100644
index 86faca1b84bd..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.2.2_p121112.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.2_p121112.ebuild,v 1.1 2012/11/12 08:00:21 jlec Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-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-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	dev-python/numpy
-	dev-tcltk/tix
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	sci-biology/psipred
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		>=sci-chemistry/aria-2.3.2-r1
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	sed \
-		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
-		-e "s:weights_s:weights:g" \
-		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
-		-e "s|^\(OPT_FLAG =\).*|\1 ${CFLAGS}|g" \
-		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
-		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
-		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
-		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
-		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
-		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
-		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
-		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
-		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
-		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I${EPREFIX}/$(python_get_includedir)|g" \
-		-e "s|^\(PYTHON_LIB =\).*|\1 $(python_get_library -l)|g" \
-		c/environment_default.txt > c/environment.txt || die
-
-	sed \
-		-e 's:ln -s:cp -f:g' \
-		-i $(find python -name linkSharedObjs) || die
-}
-
-src_compile() {
-	emake -C c all
-	emake -C c links
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type f -delete
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s|gentoo_sitedir|${EPREFIX}$(python_get_sitedir)|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|$(PYTHON -a)|g" \
-			-e "s|gentoousr|${EPREFIX}/usr|g" \
-			-e "s|//|/|g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper}
-	done
-
-	local in_path=$(python_get_sitedir)/${PN}
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's|#from __future__|from __future__|g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python
-	eend
-
-	ebegin "Adjusting permissions"
-
-	for _file in $(find "${ED}" -type f -name "*so"); do
-		chmod 755 ${_file}
-	done
-	eend
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.2.2_p121119.ebuild b/sci-chemistry/ccpn/ccpn-2.2.2_p121119.ebuild
deleted file mode 100644
index 3cff7cc2486f..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.2.2_p121119.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.2_p121119.ebuild,v 1.1 2012/11/19 09:47:21 jlec Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-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-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	dev-python/numpy
-	dev-tcltk/tix
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	sci-biology/psipred
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		>=sci-chemistry/aria-2.3.2-r1
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	sed \
-		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
-		-e "s:weights_s:weights:g" \
-		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
-		-e "s|^\(OPT_FLAG =\).*|\1 ${CFLAGS}|g" \
-		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
-		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
-		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
-		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
-		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
-		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
-		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
-		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
-		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
-		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I${EPREFIX}/$(python_get_includedir)|g" \
-		-e "s|^\(PYTHON_LIB =\).*|\1 $(python_get_library -l)|g" \
-		c/environment_default.txt > c/environment.txt || die
-
-	sed \
-		-e 's:ln -s:cp -f:g' \
-		-i $(find python -name linkSharedObjs) || die
-}
-
-src_compile() {
-	emake -C c all
-	emake -C c links
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type f -delete
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s|gentoo_sitedir|${EPREFIX}$(python_get_sitedir)|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|$(PYTHON -a)|g" \
-			-e "s|gentoousr|${EPREFIX}/usr|g" \
-			-e "s|//|/|g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper}
-	done
-
-	local in_path=$(python_get_sitedir)/${PN}
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's|#from __future__|from __future__|g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python
-	eend
-
-	ebegin "Adjusting permissions"
-
-	for _file in $(find "${ED}" -type f -name "*so"); do
-		chmod 755 ${_file}
-	done
-	eend
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.2.2_p120829.ebuild b/sci-chemistry/ccpn/ccpn-2.2.2_p130110.ebuild
index bf86ba66284f..71c969df6198 100644
--- a/sci-chemistry/ccpn/ccpn-2.2.2_p120829.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.2.2_p130110.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.2_p120829.ebuild,v 1.1 2012/08/29 06:24:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.2_p130110.ebuild,v 1.1 2013/01/10 17:41:33 jlec Exp $
 
 EAPI=4
 
@@ -15,14 +15,15 @@ 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-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
 HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
+SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
+[[ -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="extendnmr +opengl"
+IUSE="+opengl"
 
 RDEPEND="
 	dev-lang/tk[threads]
@@ -35,13 +36,7 @@ RDEPEND="
 	opengl? (
 		media-libs/freeglut
 		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
 DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		>=sci-chemistry/aria-2.3.2-r1
-		sci-chemistry/prodecomp )"
 
 RESTRICT="mirror"
 
@@ -102,6 +97,7 @@ src_prepare() {
 		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
 		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
 		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+		-e "s|^\(TK_LIB =\).*|\1 -ltk${tk_ver}|g" \
 		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
 		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I${EPREFIX}/$(python_get_includedir)|g" \
 		-e "s|^\(PYTHON_LIB =\).*|\1 $(python_get_library -l)|g" \
@@ -127,8 +123,7 @@ src_install() {
 	libdir=$(get_libdir)
 	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
 
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
+	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara extendNmr"
 	for wrapper in ${_wrapper}; do
 		sed \
 			-e "s|gentoo_sitedir|${EPREFIX}$(python_get_sitedir)|g" \
@@ -164,7 +159,6 @@ src_install() {
 	eend
 
 	ebegin "Adjusting permissions"
-
 	for _file in $(find "${ED}" -type f -name "*so"); do
 		chmod 755 ${_file}
 	done
diff --git a/sci-chemistry/ccpn/metadata.xml b/sci-chemistry/ccpn/metadata.xml
index d65c846daad4..8a82c7657734 100644
--- a/sci-chemistry/ccpn/metadata.xml
+++ b/sci-chemistry/ccpn/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
-	<maintainer>
-		<email>jlec@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="extendnmr">Install needed packages for extendNMR support</flag>
-	</use>
+  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="extendnmr">Install needed packages for extendNMR support</flag>
+  </use>
 </pkgmetadata>