sci-chemistry/ccp4: Drop old

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

6 files changed, 11 insertions, 1417 deletions

diff --git a/sci-chemistry/ccp4/ChangeLog b/sci-chemistry/ccp4/ChangeLog
index 6bf443a3a523..861302dcb905 100644
--- a/sci-chemistry/ccp4/ChangeLog
+++ b/sci-chemistry/ccp4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/ccp4
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ChangeLog,v 1.33 2012/04/14 09:59:34 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ChangeLog,v 1.34 2012/04/26 15:51:26 jlec Exp $
+
+  26 Apr 2012; Justin Lecher <jlec@gentoo.org> -ccp4-6.0.1-r1.ebuild,
+  -ccp4-6.0.2.ebuild, -ccp4-6.0.2-r1.ebuild, -ccp4-6.1.3.ebuild:
+  Drop old
 
   14 Apr 2012; Andreas Schuerch <nativemad@gentoo.org> ccp4-6.1.3-r1.ebuild:
   x86 stable, see bug 376463
diff --git a/sci-chemistry/ccp4/Manifest b/sci-chemistry/ccp4/Manifest
index 874389fca470..cd1ce4ff91bb 100644
--- a/sci-chemistry/ccp4/Manifest
+++ b/sci-chemistry/ccp4/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 6.0.1-dont-make-dirs-in-configure.patch 2790 RMD160 904e37ab1ea20dda50f50ce8780268eb5fa52480 SHA1 f8989cb867c92def86ccd88b4d67f38578d5d80b SHA256 2dbf78513ef94d88e446042e969644ad8a8462a22e80105e7481af93003a18bf
 AUX 6.0.1-ppc-double-define-gerror.patch 424 RMD160 4f012233446fffa61e8d775a19a0dacea4ae2234 SHA1 209fa1bdf1e59b4055177e343b69e487d9183fb3 SHA256 09c2c1e0176bee94673b21609b2b00118b2bb4f5942f3feb35c64c61c99ebc61
@@ -16,41 +16,13 @@ AUX make-mosflm-cbf-libdir.patch 415 RMD160 19e275563cbd7c3d6b91630f8c554494a75d
 AUX make-mosflm-index-libdir.patch 358 RMD160 772bad5d83385adce5858f43ac9302c94cd6a6b8 SHA1 b889d238b0f3e2385ad8259ea4ea85b29d05e0d1 SHA256 5549d5208548168c0f246606802c143bd34b87ca3eb25640c6b777d9d9e4b902
 AUX make-mosflm-libdir.patch 371 RMD160 2ff9ddcc064b2621d241850d9774961b140d28b8 SHA1 0a4aba167b530544f6e602dab622e51fae1c7b68 SHA256 55c2978125acb3f1ba55039d171b09b6dbd13ee1dd1e4c1e48edc48e89d5c717
 AUX pass-clipper-enablevals.patch 501 RMD160 23466922268a91570b0f64cf79809b988e32689b SHA1 c254d31fe88ed1716a53bd549cf7aee537ca5204 SHA256 d476c9f231fb6cdfb5e57004b393644a88016318cdeed9c33c32de25e0d91b79
-DIST act.f-6July2006.diff 16544 RMD160 24f48e95ec3363a2409da122bd0eb7ef5a91da36 SHA1 97ddeead440ce5b7d59fcb8e564f3907e6462c93 SHA256 ba807b19b834d68ff121e34bbfbb113ae528db1aeebfeb7e98cbb90c64c2c3c4
-DIST amore.f-r1.115-r1.116.diff 3289 RMD160 2ebc8e996f4e31edc107b4736f8bd923ecec96e5 SHA1 f0ce5a7884b51fddba690b20c55f8c2d3d64a8e2 SHA256 82c1120704b4bc0aad42dd1e34fdf0bc2843d16a7c7bca985417f08e56e0bc83
-DIST amore_utils.tcl-r1.14-r1.15.diff 1748 RMD160 4080873c346d49c79498010bbe70f3aefe0c8d4f SHA1 93994b124f63c17842fe32844270f86975537d02 SHA256 0b824158b6a470d74915dc396c5c2bb64e89f5a6e65225c60c09f594ee541b17
-DIST anisoanl.f-r1.22-r1.24.diff 9452 RMD160 02f9561362892cbbeed24592b5ed4e3eb51ace2c SHA1 76691ac9097a4132f3618e13d41d913d92e45b9a SHA256 1308ef91c63efd1c11287f68f386a62678d1ab48ddfe6e94cefdef1c92173940
-DIST cad.f-r1.70-r1.72.diff 12196 RMD160 a18c339223c8a6a66fda4cb210f2e533fea0d240 SHA1 30da509c9b51506541b0b49adbf7836c8fc5f7d4 SHA256 ba10591643f93fb310d451aacce286d8ec9386f2e781d631f794076d1021539f
-DIST ccp4-6.0.1-core-src.tar.gz 59311291 RMD160 0f514fe30f22a4f6eb2e05c8bab567d2132e8fae SHA1 e8f5fb325a13375793f7610160337090af8fb9b5 SHA256 26a5704d707c3bc2fbe4c1d0804abccc1c50255005d26a8ec3a03fcba63335f2
-DIST ccp4-6.0.2-core-src.tar.gz 62286123 RMD160 159c71c5079422d6e540e4678fb8e4f9f83fc99d SHA1 279da65beb9c2e64a80abdeb693a78879a062cf0 SHA256 b8716198b4d5c1ad3aea190180a5c56e0e80eda0386e5c99542d169da6960875
-DIST chainsaw.cpp-11May2006.diff 4720 RMD160 62c3b3a3da0d36aa8f0c67a55c068508858eeb17 SHA1 f6a4e0cd22438a8855796e82b5492bd8870aa49c SHA256 de2d2ccd365f2992e1ba9a385f1a2fcd9e52da5ff96bcbc4fa7b4404cf0bac6e
-DIST configure-r1.372.2.18-r1.372.2.19.diff 4711 RMD160 a25d57dcadc46fb37a54236d6a1f5ecbc856dd8a SHA1 bb1af7f781e2b1eae6a0997248de0aca9998f383 SHA256 0ac43d66d8377719b24e984bc4d9d3bf1baf6783d20d09592d8c65e5fc615d82
-DIST contact.f-12June2006.diff 43051 RMD160 577b454ed229be8c9b79e8c4622c870d589e2cca SHA1 aff0071b1130a3cc62b419fed5909f94a87ff9e1 SHA256 1336ea01da83aad21669b82cd3895f724db6db8d17d78acfec53154ea7ce690e
-DIST crystal.C-r1.5-r1.6.diff 1740 RMD160 cc8f66ec37b92450c470fd672b9fb099f6c7fee0 SHA1 8707ff096d7346c2b25974084d4f2fe65ccc2882 SHA256 4cd45893c74e490b5a3298a097d1b844dabcbcee4cf78f8e79d3400fd8a530b7
-DIST molrep.f-r1.28-r1.28.2.1.diff 755 RMD160 96a37ea54606583647ff9cdc9da728ce05d30849 SHA1 7fa0302e9e4309a86aad3bebde5359af740cecd8 SHA256 0bb22cb2f8e1486ec5cc6037427e9ec66189684d74b5939757b4ebe771a61084
-DIST mtz2various.f-r1.124.2.3-r1.124.2.4.diff 1198 RMD160 83aa8f46d67205ee0482c60a73da7d9b3a294c1d SHA1 536a8914483a7958de12d3716dbf26aa3139ad6e SHA256 33a0ddc2f5efa11aadf8c6cad8cbd7f5d754ea17894cf1ab1b034b62d9f3b87c
-DIST mtztona4.f-r1.23-r1.24.diff 882 RMD160 1b34c6caaf5356574f65f2d092196cdd788cb720 SHA1 c6bfd2c3784fb385f0455f2638cd2d8ab11aaea7 SHA256 d7cf1b6ab2015b18c6b4b310e25b706a1f420d623383c17d0b51acfb00ae679a
-DIST omit.f-r1.12-r1.13.diff 2303 RMD160 5dda121b69fdc3b4e138e0b88012df1d46398d3a SHA1 0836a9fe21bf2acd87d4f87115bb1dc0645e6bb9 SHA256 14a8128809f78d2d08b81cde5f91b51a694d99b56215477a62571344024a6748
-DIST refmac5.tcl-r1.39.2.3-r1.42.diff 2464 RMD160 fca236184597ab86fc9ac7333834e68eab641dac SHA1 eecf37e89e200dcbea7544f320cd16160ab5615a SHA256 8418181bae8799d2fa5a004e84cb1c66391d0cb768df5d40b34e053aced6fd4c
-DIST rharvest.fh-r1.13-r1.14.diff 705 RMD160 9b41a14d1a43909f8861a861d2d9e363153cc14c SHA1 3886d018e5ccb59045970b2ae033da96c0112416 SHA256 835d21e507433300fa52eb3673c06a67efe8a238d3c8a39e0a59bc769e289e43
-DIST rotmat.f-17July2006.diff 1002 RMD160 59cc822edbdc73b24e51cff013c71e4d68927979 SHA1 31fed5d06e8c8afc719f74d50acb0e833b893202 SHA256 1ee4f3288dba6404d59f51b9f9e1b4475413f7e40991204ab39474ee559605b1
-DIST rstats.f-r1.39-r1.40.diff 2560 RMD160 d14fb167c3083f9e811cc2f8243d364b64e1067f SHA1 65f53c00f103a0dcd388c8a2b08a3b63fcee8ee1 SHA256 6709c00807798a2045e4ffc22252c765be378a0f04e1d049f85940db7d5b24a9
-DIST sc.f-r1.9-r1.9.2.1.diff 8783 RMD160 815d25cff0fa76f73dc43da9757ad753ec392f9c SHA1 f55e2e8c84ec8cd3b94cb703b50abff625e3a7fb SHA256 418feea2ccf0014c3c2c83ab9460873114057480fd2a1dcabe305a1b956ad86b
-DIST scala.f-r1.101.2.3-r1.101.2.4.diff 932 RMD160 a0f03c0cdd3591001d1b87041a804189b3b6c937 SHA1 2ba568fe62fbafe97afa2754c94ccbf1e59e46b0 SHA256 78a1192a5e674301a4d4a71bb7f9539d7ed1e3bd25f9403e636259d2d147b2fc
-DIST setup.fh-r1.5-r1.5.2.1.diff 1317 RMD160 45a16b00792706553e7bf23a2f54415cd5ee1b43 SHA1 2a7417cf998b5e9fcac3b3b8a2deb05627d29d1a SHA256 637564c5723fb7de04d3a06817eec704ac708b74264716905690250e42aed146
-DIST topp.f-r1.16.2.5-r1.16.2.6.diff 2083 RMD160 4f7522c52afc525bdf345feaec37958eb0557cbf SHA1 bdd1e5a81e65c6d3ed7ab89ba21bd68055cc72ca SHA256 6d28b8fae0c3640aaf7ffb9878db4d03d9e53a9398f6b7887c06094d0c680cec
-DIST util_windows.tcl-r1.27-r1.27.2.1.diff 1486 RMD160 06b5598bcff7da11e19ec62c73babd15c6adb1f3 SHA1 fec29ceec77944ecc37f77449147a26d1dc3f149 SHA256 092e2d281a9366c375711616c1e07d2e1f886c9709ed81da78ef7e9a039ff530
-EBUILD ccp4-6.0.1-r1.ebuild 13789 RMD160 55b973cdf387fd872fa991f613428b382178d67b SHA1 5627c990d854dc9ea6846158afa56cdd65aaa56f SHA256 4bd959e375f2213f00183c2ca01e0f2221f739079ecb7148fed85cd14355e3e5
-EBUILD ccp4-6.0.2-r1.ebuild 14198 RMD160 4cdec53ee322218e1bff17d4c4559a5f9e5d8598 SHA1 c16336ea7a8c8b0cab4312c1486025d3f2f9ee4a SHA256 a4973d5a3576dd4bb1b72dbae7688eebfee6cc3fd64607c0f93c73f4d85c3787
-EBUILD ccp4-6.0.2.ebuild 13342 RMD160 7288dc466b936b96bd19c68d40f85ea398aeca77 SHA1 eaf8d35e25453add3d15280434444d4c1436bd8d SHA256 729b78d3aa72e18b2f2f4adaf6aed539822501dc772b919526ca893fbb72bfd8
 EBUILD ccp4-6.1.3-r1.ebuild 1032 RMD160 6de4c54d6fc99648e89c6d136a49a2b196daca31 SHA1 224709c80b1b94aa71ab4bc61b2e7c3d084c873c SHA256 972d497860428d4a1dd7dbc799dd11acd411997169760506b01db9de4039a17c
-EBUILD ccp4-6.1.3.ebuild 876 RMD160 504ea3f3bf8f9b632db13881fbae8766f7c4e006 SHA1 ffffabbdce89df262e8ff6a46b4345ef44c3f84b SHA256 aa442df333913073514bb2e09987943d4aad8c0557f2046b962931eae3fcb883
-MISC ChangeLog 6088 RMD160 8dfd3ff06f566ff75b770a5d9b42f0c620564e8a SHA1 1fbce8401ce5233dbc0b1c463ce3f6b41961cd01 SHA256 5c564bb15e882b45d39eb7607584e06f9e0a0442d882a2688adced3961bd4f24
+MISC ChangeLog 6230 RMD160 d9cae93347e9830f919c01ce112c2cc3cb0db345 SHA1 140149a2ab2784b297ffae3a5c5167ecef71d495 SHA256 a2f144c07b37f37ed7e2415f154940562961ce5255089b503dcb05fd834e57ff
 MISC metadata.xml 316 RMD160 72738bd922f0a58192b1bceda4889755f9544180 SHA1 c7b73f171cb2da86b037cd747072bc07a69607bf SHA256 1aad7ad115d13781f8bf4eef6a35910e512f74b9d38397816bd6fcdfead864e4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+JSm8ACgkQakKUmsHeVLJeYgCfRdoPAQ16DwKmhiju3BFCSbXE
-tEEAnjtRtf28YHmzvhC2RMFK7aFXfFZY
-=MfA8
+iEYEAREKAAYFAk+ZbwQACgkQgAnW8HDreRb+RwCfcS7hxKl9AKSJ3r4VLn6dGVMj
+piMAni5n7do2i2HsW1XvCBNelxfiWl1P
+=03Q3
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild b/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild
deleted file mode 100644
index 7b6aa7dd02cb..000000000000
--- a/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild
+++ /dev/null
@@ -1,453 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild,v 1.13 2011/06/21 16:05:14 jlec Exp $
-
-inherit eutils fortran-2 gnuconfig toolchain-funcs
-
-SRC="ftp://ftp.ccp4.ac.uk/ccp4"
-
-PATCH_TOT="12"
-PATCH1=( src/mmdb_app_
-	chainsaw.cpp-11May2006.diff )
-PATCH2=( src
-	anisoanl.f-r1.22-r1.24.diff )
-PATCH3=( src/sc_
-	sc.f-r1.9-r1.9.2.1.diff )
-PATCH4=( src/sc_
-	setup.fh-r1.5-r1.5.2.1.diff )
-PATCH5=( src
-	contact.f-12June2006.diff )
-PATCH6=( ccp4i/tasks
-	refmac5.tcl-r1.39.2.3-r1.42.diff )
-PATCH7=( src
-	act.f-6July2006.diff )
-PATCH8=( src
-	rotmat.f-17July2006.diff )
-PATCH9=( src/molrep_
-	molrep.f-r1.28-r1.28.2.1.diff )
-PATCH10=( src
-	cad.f-r1.70-r1.72.diff )
-PATCH11=( src
-	mtztona4.f-r1.23-r1.24.diff )
-PATCH12=( src
-	omit.f-r1.12-r1.13.diff )
-
-DESCRIPTION="Protein X-ray crystallography toolkit"
-HOMEPAGE="http://www.ccp4.ac.uk/"
-RESTRICT="mirror"
-SRC_URI="${SRC}/${PV}/packed/${P}-core-src.tar.gz"
-
-for i in $(seq $PATCH_TOT); do
-	NAME="PATCH${i}[1]"
-	SRC_URI="${SRC_URI}
-		${SRC}/${PV}/patches/${!NAME}"
-done
-
-LICENSE="ccp4"
-SLOT="0"
-KEYWORDS="ppc x86"
-IUSE="X"
-
-# app-office/sc overlaps sc binary and man page
-# We can't rename ours since the automated ccp4i interface expects it there,
-# as do many scripts. app-office/sc can't rename its because that's the name
-# of the package.
-RDEPEND="
-	virtual/fortran
-
-		>=dev-lang/tcl-8.3
-		>=dev-lang/tk-8.3
-		>=dev-tcltk/blt-2.4
-		virtual/lapack
-		virtual/blas
-		=sci-libs/fftw-2*
-		sci-chemistry/pdb-extract
-		sci-chemistry/rasmol
-		sci-libs/mccp4
-		app-shells/tcsh
-		!app-office/sc
-		X? (
-			x11-libs/libX11
-			x11-libs/libXt
-			x11-libs/libXaw
-		)"
-DEPEND="${RDEPEND}
-		X? (
-			x11-misc/imake
-			x11-proto/inputproto
-			x11-proto/xextproto
-		)"
-
-S="${WORKDIR}/${PN}-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	einfo "Applying upstream patches ..."
-	for patch in $(seq $PATCH_TOT); do
-		base="PATCH${patch}"
-		dir=$(eval echo \${${base}[0]})
-		p=$(eval echo \${${base}[1]})
-		pushd ${dir} >& /dev/null
-		ccp_patch "${DISTDIR}/${p}"
-		popd >& /dev/null
-	done
-	einfo "Done."
-	echo
-
-	einfo "Applying Gentoo patches ..."
-	# These two only needed when attempting to install outside build dir via
-	# --bindir and --libdir instead of straight copying after build
-
-	# it attempts to install some libraries during the build
-	#ccp_patch "${FILESDIR}"/${P}-install-libs-at-install-time.patch
-	# hklview/ipdisp.exe/xdlmapman/ipmosflm can't find libxdl_view
-	# without this patch when --libdir is set
-	# Rotgen still needs more patching to find it
-	#ccp_patch "${FILESDIR}"/add-xdl-libdir.patch
-
-	# it tries to create libdir, bindir etc on live system in configure
-	ccp_patch "${FILESDIR}"/${PV}-dont-make-dirs-in-configure.patch
-
-	# We already have sci-chemistry/rasmol
-	ccp_patch "${FILESDIR}"/dont-build-rasmol.patch
-
-	# We already have sci-chemistry/pdb-extract
-# Use configure option instead
-#	ccp_patch "${FILESDIR}"/dont-build-pdb-extract.patch
-
-	ccp_patch "${FILESDIR}"/create-mosflm-bindir.patch
-	ccp_patch "${FILESDIR}"/make-mosflm-libdir.patch
-	ccp_patch "${FILESDIR}"/make-mosflm-index-libdir.patch
-	ccp_patch "${FILESDIR}"/make-mosflm-cbf-libdir.patch
-	ccp_patch "${FILESDIR}"/make-ipmosflm-dir.patch
-
-# Don't use these when we aren't building phaser
-#	ccp_patch "${FILESDIR}"/make-phaser-bindir.patch
-#	ccp_patch "${FILESDIR}"/no-phaser-ld-assume-kernel.patch
-#	# scons config.py tries to chmod python on live system
-#	ccp_patch "${FILESDIR}"/dont-chmod-python-binary.patch
-
-	# Don't use this when we aren't building clipper
-	# For some reason clipper check for $enableval even when --enable is passed
-	ccp_patch "${FILESDIR}"/pass-clipper-enablevals.patch
-	ccp_patch "${FILESDIR}"/clipper-find-mccp4-includes.patch
-
-	# Default to firefox browser, not 'netscape'
-	ccp_patch "${FILESDIR}"/ccp4i-default-to-firefox.patch
-
-	# Also use -lpthread when linking blas and lapack
-	# We may need more fixing to use libcblas for the C files
-	ccp_patch "${FILESDIR}"/check-blas-lapack-pthread.patch
-
-	# gerror_ gets defined twice on ppc if you're using gfortran/g95
-	ccp_patch "${FILESDIR}"/${PV}-ppc-double-define-gerror.patch
-
-	einfo "Done." # done applying Gentoo patches
-	echo
-
-	gnuconfig_update
-}
-
-src_compile() {
-	# Build system is broken if we set LDFLAGS
-	unset LDFLAGS
-
-	# GENTOO_OSNAME can be one of:
-	# irix irix64 sunos sunos64 aix hpux osf1 linux freebsd
-	# linux_compaq_compilers linux_intel_compilers generic Darwin
-	# ia64_linux_intel Darwin_ibm_compilers linux_ibm_compilers
-	if [[ "$(tc-getFC)" = "ifort" ]]; then
-		if use ia64; then
-			GENTOO_OSNAME="ia64_linux_intel"
-		else
-			# Should be valid for x86, maybe amd64
-			GENTOO_OSNAME="linux_intel_compilers"
-		fi
-	else
-		# Should be valid for x86 and amd64, at least
-		GENTOO_OSNAME="linux"
-	fi
-
-	# Sets up env
-	ln -s \
-		ccp4.setup-bash \
-		"${S}"/include/ccp4.setup
-
-	# We agree to the license by emerging this, set in LICENSE
-	sed -i \
-		-e "s~^\(^agreed=\).*~\1yes~g" \
-		"${S}"/configure
-
-	# Fix up variables -- need to reset CCP4_MASTER at install-time
-	sed -i \
-		-e "s~^\(setenv CCP4_MASTER.*\)/.*~\1${WORKDIR}~g" \
-		-e "s~^\(setenv CCP4I_TCLTK.*\)/usr/local/bin~\1/usr/bin~g" \
-		"${S}"/include/ccp4.setup*
-
-	# Set up variables for build
-	source "${S}"/include/ccp4.setup
-
-	export CC=$(tc-getCC)
-	export CXX=$(tc-getCXX)
-	export COPTIM=${CFLAGS}
-	export CXXOPTIM=${CXXFLAGS}
-	# Default to -O2 if FFLAGS is unset
-	export FC=$(tc-getFC)
-	export FOPTIM=${FFLAGS:- -O2}
-
-	# Can't use econf, configure rejects unknown options like --prefix
-	./configure \
-		$(use_enable X x) \
-		--with-shared-libs \
-		--with-fftw=/usr \
-		--with-warnings \
-		--disable-pdb_extract \
-		--disable-cctbx \
-		--disable-phaser \
-		--tmpdir="${TMPDIR}" \
-		${GENTOO_OSNAME} || die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	# Set up variables for build
-	source "${S}"/include/ccp4.setup
-
-# Only needed when using --bindir and --libdir
-	# Needed to avoid errors. Originally tried to make lib and bin
-	# in configure script, now patched out by dont-make-dirs-in-configure.patch
-#	dodir /usr/include /usr/$(get_libdir) /usr/bin
-
-#	make install || die "install failed"
-	einstall || die "install failed"
-
-	# Fix env
-	sed -i \
-		-e "s~^\(setenv CCP4_MASTER.*\)${WORKDIR}~\1/usr~g" \
-		-e "s~^\(setenv CCP4.*\$CCP4_MASTER\).*~\1~g" \
-		-e "s~^\(setenv CCP4I_TOP\).*~\1 \$CCP4/$(get_libdir)/ccp4/ccp4i~g" \
-		-e "s~^\(.*setenv CINCL.*\$CCP4\).*~\1/share/ccp4/include~g" \
-		-e "s~^\(.*setenv CLIBD .*\$CCP4\).*~\1/share/ccp4/data~g" \
-		-e "s~^\(.*setenv CLIBD_MON .*\)\$CCP4.*~\1\$CLIBD/monomers/~g" \
-		-e "s~^\(.*setenv MOLREPLIB .*\)\$CCP4.*~\1\$CLIBD/monomers/~g" \
-		-e "s~^\(.*setenv CCP4_BROWSER.*\).*~\1 firefox~g" \
-		"${S}"/include/ccp4.setup*
-
-	# Get rid of S instances
-	# Also the main clipper library is built as libclipper-core, not libclipper
-	sed -i \
-		-e "s:${S}:usr:g" \
-		-e "s:lclipper :lclipper-core :g" \
-		"${S}"/bin/clipper-config
-#	sed -i \
-#		-e "s:${S}:usr:g" \
-#		"${S}"/$(get_libdir)/cctbx/cctbx_build/setpaths*
-
-	# Bins
-	dobin "${S}"/bin/* || die
-
-	# Libs
-	for file in "${S}"/lib/*; do
-		if [[ -d ${file} ]]; then
-			continue
-		elif [[ -x ${file} ]]; then
-			dolib.so ${file} || die
-		else
-			insinto /usr/$(get_libdir)
-			doins ${file} || die
-		fi
-	done
-
-	# Fix libdir in all *.la files
-	sed -i \
-		-e "s:^\(libdir=\).*:\1\'/usr/$(get_libdir)\':g" \
-		"${D}"/usr/$(get_libdir)/*.la
-
-	# Library symlinks
-	local LIBNAMES="libclipper-ccp4.so.0.0.0
-		libclipper-cif.so.0.0.0
-		libclipper-contrib.so.0.0.0
-		libclipper-core.so.0.0.0
-		libclipper-minimol.so.0.0.0
-		libclipper-mmdbold.so.0.0.0
-		libclipper-mmdb.so.0.0.0
-		libclipper-mtz.so.1.0.0
-		libclipper-phs.so.0.0.0
-		libjwc_c.so.0.1.1
-		libjwc_f.so.0.1.1
-		libssm.so.0.0.0
-		libxdl_viewextra.so.0.0.0
-		libxdl_view.so.2.0.0"
-
-	for LIBNAME in ${LIBNAMES}; do
-		library_dosym ${LIBNAME}
-	done
-
-#	dosym libclipper-ccp4.so.0.0.0 /usr/$(get_libdir)/libclipper-ccp4.so
-#	dosym libclipper-ccp4.so.0.0.0 /usr/$(get_libdir)/libclipper-ccp4.so.0
-#	dosym libclipper-ccp4.so.0.0.0 /usr/$(get_libdir)/libclipper-ccp4.so.0.0
-#
-#	dosym libclipper-cif.so.0.0.0 /usr/$(get_libdir)/libclipper-cif.so
-#	dosym libclipper-cif.so.0.0.0 /usr/$(get_libdir)/libclipper-cif.so.0
-#	dosym libclipper-cif.so.0.0.0 /usr/$(get_libdir)/libclipper-cif.so.0.0
-#
-#	dosym libclipper-contrib.so.0.0.0 /usr/$(get_libdir)/libclipper-contrib.so
-#	dosym libclipper-contrib.so.0.0.0 /usr/$(get_libdir)/libclipper-contrib.so.0
-#	dosym libclipper-contrib.so.0.0.0 /usr/$(get_libdir)/libclipper-contrib.so.0.0
-#
-#	dosym libclipper-core.so.0.0.0 /usr/$(get_libdir)/libclipper-core.so
-#	dosym libclipper-core.so.0.0.0 /usr/$(get_libdir)/libclipper-core.so.0
-#	dosym libclipper-core.so.0.0.0 /usr/$(get_libdir)/libclipper-core.so.0.0
-#
-#	dosym libclipper-minimol.so.0.0.0 /usr/$(get_libdir)/libclipper-minimol.so
-#	dosym libclipper-minimol.so.0.0.0 /usr/$(get_libdir)/libclipper-minimol.so.0
-#	dosym libclipper-minimol.so.0.0.0 /usr/$(get_libdir)/libclipper-minimol.so.0.0
-#
-#	dosym libclipper-mmdbold.so.0.0.0 /usr/$(get_libdir)/libclipper-mmdbold.so
-#	dosym libclipper-mmdbold.so.0.0.0 /usr/$(get_libdir)/libclipper-mmdbold.so.0
-#	dosym libclipper-mmdbold.so.0.0.0 /usr/$(get_libdir)/libclipper-mmdbold.so.0.0
-#
-#	dosym libclipper-mmdb.so.0.0.0 /usr/$(get_libdir)/libclipper-mmdb.so
-#	dosym libclipper-mmdb.so.0.0.0 /usr/$(get_libdir)/libclipper-mmdb.so.0
-#	dosym libclipper-mmdb.so.0.0.0 /usr/$(get_libdir)/libclipper-mmdb.so.0.0
-#
-#	dosym libclipper-mtz.so.1.0.0 /usr/$(get_libdir)/libclipper-mtz.so
-#	dosym libclipper-mtz.so.1.0.0 /usr/$(get_libdir)/libclipper-mtz.so.1
-#	dosym libclipper-mtz.so.1.0.0 /usr/$(get_libdir)/libclipper-mtz.so.1.0
-#
-#	dosym libclipper-phs.so.0.0.0 /usr/$(get_libdir)/libclipper-phs.so
-#	dosym libclipper-phs.so.0.0.0 /usr/$(get_libdir)/libclipper-phs.so.0
-#	dosym libclipper-phs.so.0.0.0 /usr/$(get_libdir)/libclipper-phs.so.0.0
-#
-#	dosym libjwc_c.so.0.1.1 /usr/$(get_libdir)/libjwc_c.so
-#	dosym libjwc_c.so.0.1.1 /usr/$(get_libdir)/libjwc_c.so.0
-#	dosym libjwc_c.so.0.1.1 /usr/$(get_libdir)/libjwc_c.so.0.1
-#
-#	dosym libjwc_f.so.0.1.1 /usr/$(get_libdir)/libjwc_f.so
-#	dosym libjwc_f.so.0.1.1 /usr/$(get_libdir)/libjwc_f.so.0
-#	dosym libjwc_f.so.0.1.1 /usr/$(get_libdir)/libjwc_f.so.0.1
-#
-#	dosym libssm.so.0.0.0 /usr/$(get_libdir)/libssm.so
-#	dosym libssm.so.0.0.0 /usr/$(get_libdir)/libssm.so.0
-#	dosym libssm.so.0.0.0 /usr/$(get_libdir)/libssm.so.0.0
-#
-#	dosym libxdl_viewextra.so.0.0.0 /usr/$(get_libdir)/libxdl_viewextra.so
-#	dosym libxdl_viewextra.so.0.0.0 /usr/$(get_libdir)/libxdl_viewextra.so.0
-#	dosym libxdl_viewextra.so.0.0.0 /usr/$(get_libdir)/libxdl_viewextra.so.0.0
-#
-#	dosym libxdl_view.so.2.0.0 /usr/$(get_libdir)/libxdl_view.so
-#	dosym libxdl_view.so.2.0.0 /usr/$(get_libdir)/libxdl_view.so.2
-#	dosym libxdl_view.so.2.0.0 /usr/$(get_libdir)/libxdl_view.so.2.0
-
-	# Environment files, setup scripts, etc.
-	insinto /usr/share/ccp4/include
-	doins "${S}"/include/* || die
-
-	# CCP4Interface - GUI
-	insinto /usr/$(get_libdir)/ccp4
-	doins -r "${S}"/ccp4i || die
-	exeinto /usr/$(get_libdir)/ccp4/ccp4i/bin
-	doexe "${S}"/ccp4i/bin/* || die
-
-	# Data
-	insinto /usr/share/ccp4
-	doins -r "${S}"/lib/data || die
-
-	# Include files
-	insinto /usr/include
-	for i in ccp4 clipper mmdb ssm; do
-		doins -r "${S}"/include/${i} || die
-	done
-
-	# Install docs and examples
-
-	doman "${S}"/man/cat1/*
-
-	mv "${S}"/manual/README "${S}"/manual/README-manual
-	dodoc "${S}"/manual/*
-
-	dodoc "${S}"/README "${S}"/CHANGES
-
-	dodoc "${S}"/doc/*
-	rm "${D}"/usr/share/doc/${PF}/GNUmakefile.gz
-	rm "${D}"/usr/share/doc/${PF}/COPYING.gz
-
-	dohtml -r "${S}"/html/*
-	dodoc "${S}"/examples/README
-
-	# Fix wrongly installed HTML pages from clipper
-	dohtml "${D}"/usr/html/*
-	rm -rf "${D}"/usr/html
-
-	for i in data rnase toxd; do
-		docinto examples/${i}
-		dodoc "${S}"/examples/${i}/*
-	done
-
-	docinto examples/tutorial
-	dohtml -r "${S}"/examples/tutorial/html examples/tutorial/tut.css
-	for i in data results; do
-		docinto examples/tutorial/${i}
-		dodoc "${S}"/examples/tutorial/${i}/*
-	done
-
-	for i in non-runnable runnable; do
-		docinto examples/unix/${i}
-		dodoc "${S}"/examples/unix/${i}
-	done
-
-	# Needed for ccp4i docs to work
-	dosym ../../share/doc/${PF}/examples /usr/$(get_libdir)/ccp4/examples
-	dosym ../../share/doc/${PF}/html /usr/$(get_libdir)/ccp4/html
-
-	# Fix overlaps with other packages
-	rm "${D}"/usr/share/man/man1/rasmol.1*
-}
-
-pkg_postinst() {
-	einfo "The Web browser defaults to firefox. Change CCP4_BROWSER"
-	einfo "in /usr/share/ccp4/include/ccp4.setup* to modify this."
-
-	ewarn "Set your .bashrc or other shell login file to source"
-	ewarn "one of the ccp4.setup* files in ${ROOT}usr/share/ccp4/include."
-	ewarn "CCP4 will not work without this."
-}
-
-# Epatch wrapper for bulk patching
-ccp_patch() {
-	EPATCH_SINGLE_MSG="  ${1##*/} ..." epatch ${1}
-}
-
-# Links libname.so, libname.so.major and libname.so.major.minor
-# to libname.so.major.minor.micro
-library_dosym() {
-	local LIBNAME LIBDIR SUFFIX CORE_LIBNAME LIB_MAJOR LIB_MINOR LIB_VERSIONS
-
-	LIBNAME=${1}
-	LIBDIR=${2:-/usr/$(get_libdir)}
-
-	# Tag / on the end of libdir if needed
-	if [[ ${LIBDIR:$((${#LIBDIR}-1)):1} != "/" ]]; then
-		LIBDIR="${LIBDIR}/"
-	fi
-
-	if [[ "${LIBNAME}" != *.so.* ]]; then
-		msg="library_dosym() requires a shared, versioned library as an argument"
-		eerror "$msg"
-		die "$msg"
-	fi
-
-	SUFFIX=${LIBNAME##*so.}
-	CORE_LIBNAME=${LIBNAME%.so.*}
-	CORE_LIBNAME="${CORE_LIBNAME}.so"
-	LIB_MAJOR=${SUFFIX%%.*}
-	LIB_MINOR=${SUFFIX#*.}
-	LIB_MINOR=${SUFFIX%%.*}
-	LIB_VERSIONS="${LIB_MAJOR} ${LIB_MAJOR}.${LIB_MINOR}"
-	for LIB_SUFFIX in .${LIB_MAJOR} .${LIB_MAJOR}.${LIB_MINOR} ""; do
-		einfo "Calling dosym ${LIBNAME} ${LIBDIR} ${CORE_LIBNAME} ${LIB_SUFFIX}"
-		dosym ${LIBNAME} ${LIBDIR}${CORE_LIBNAME}${LIB_SUFFIX}
-	done
-}
diff --git a/sci-chemistry/ccp4/ccp4-6.0.2-r1.ebuild b/sci-chemistry/ccp4/ccp4-6.0.2-r1.ebuild
deleted file mode 100644
index 7b336edb3cdf..000000000000
--- a/sci-chemistry/ccp4/ccp4-6.0.2-r1.ebuild
+++ /dev/null
@@ -1,460 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.2-r1.ebuild,v 1.11 2011/06/21 16:05:14 jlec Exp $
-
-inherit eutils fortran-2 gnuconfig toolchain-funcs
-
-SRC="ftp://ftp.ccp4.ac.uk/ccp4"
-
-PATCH_TOT="10"
-# Here's a little scriptlet to generate this list from the provided
-# index.patches file
-#
-# i=1; while read -a line; do [[ ${line//#} != ${line} ]] && continue;
-# echo "PATCH${i}=( ${line[1]}"; echo "${line[0]} )"; (( i++ )); done <
-# index.patches
-PATCH1=( src/topp_
-topp.f-r1.16.2.5-r1.16.2.6.diff )
-PATCH2=( .
-configure-r1.372.2.18-r1.372.2.19.diff )
-PATCH3=( src/scala_
-scala.f-r1.101.2.3-r1.101.2.4.diff )
-PATCH4=( ccp4i/src
-util_windows.tcl-r1.27-r1.27.2.1.diff )
-PATCH5=( src
-amore.f-r1.115-r1.116.diff )
-PATCH6=( src/bp3_
-crystal.C-r1.5-r1.6.diff )
-PATCH7=( src
-mtz2various.f-r1.124.2.3-r1.124.2.4.diff )
-PATCH8=( src
-rstats.f-r1.39-r1.40.diff )
-PATCH9=( src/refmac5_
-rharvest.fh-r1.13-r1.14.diff )
-PATCH10=( ccp4i/utils
-amore_utils.tcl-r1.14-r1.15.diff )
-
-DESCRIPTION="Protein X-ray crystallography toolkit"
-HOMEPAGE="http://www.ccp4.ac.uk/"
-RESTRICT="mirror"
-SRC_URI="${SRC}/${PV}/source/${P}-core-src.tar.gz"
-for i in $(seq $PATCH_TOT); do
-	NAME="PATCH${i}[1]"
-	SRC_URI="${SRC_URI}
-		${SRC}/${PV}/patches/${!NAME}"
-done
-
-LICENSE="ccp4"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="X"
-
-# app-office/sc overlaps sc binary and man page
-# We can't rename ours since the automated ccp4i interface expects it there,
-# as do many scripts. app-office/sc can't rename its because that's the name
-# of the package.
-RDEPEND="
-	virtual/fortran
-
-		>=dev-lang/tcl-8.3
-		>=dev-lang/tk-8.3
-		>=dev-tcltk/blt-2.4
-		virtual/lapack
-		virtual/blas
-		=sci-libs/fftw-2*
-		sci-chemistry/pdb-extract
-		sci-chemistry/rasmol
-		sci-libs/mccp4
-		app-shells/tcsh
-		!app-office/sc
-		X? (
-			x11-libs/libX11
-			x11-libs/libXt
-			x11-libs/libXaw
-		)"
-DEPEND="${RDEPEND}
-		X? (
-			x11-misc/imake
-			x11-proto/inputproto
-			x11-proto/xextproto
-		)"
-
-S="${WORKDIR}/${PN}-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	einfo "Applying upstream patches ..."
-	for patch in $(seq $PATCH_TOT); do
-		base="PATCH${patch}"
-		dir=$(eval echo \${${base}[0]})
-		p=$(eval echo \${${base}[1]})
-		pushd ${dir} >& /dev/null
-		ccp_patch "${DISTDIR}/${p}"
-		popd >& /dev/null
-	done
-	einfo "Done."
-	echo
-
-	einfo "Applying Gentoo patches ..."
-	# These two only needed when attempting to install outside build dir via
-	# --bindir and --libdir instead of straight copying after build
-
-	# it attempts to install some libraries during the build
-	#ccp_patch "${FILESDIR}"/${P}-install-libs-at-install-time.patch
-	# hklview/ipdisp.exe/xdlmapman/ipmosflm can't find libxdl_view
-	# without this patch when --libdir is set
-	# Rotgen still needs more patching to find it
-	#ccp_patch "${FILESDIR}"/add-xdl-libdir.patch
-
-	# it tries to create libdir, bindir etc on live system in configure
-	ccp_patch "${FILESDIR}"/${PV}-dont-make-dirs-in-configure.patch
-
-	# We already have sci-chemistry/rasmol
-	ccp_patch "${FILESDIR}"/dont-build-rasmol.patch
-
-	# We already have sci-chemistry/pdb-extract
-# Use configure option instead
-#	ccp_patch "${FILESDIR}"/dont-build-pdb-extract.patch
-
-	ccp_patch "${FILESDIR}"/create-mosflm-bindir.patch
-	ccp_patch "${FILESDIR}"/make-mosflm-libdir.patch
-	ccp_patch "${FILESDIR}"/make-mosflm-index-libdir.patch
-	ccp_patch "${FILESDIR}"/make-mosflm-cbf-libdir.patch
-	ccp_patch "${FILESDIR}"/make-ipmosflm-dir.patch
-
-# Don't use these when we aren't building phaser
-#	ccp_patch "${FILESDIR}"/make-phaser-bindir.patch
-#	ccp_patch "${FILESDIR}"/no-phaser-ld-assume-kernel.patch
-#	# scons config.py tries to chmod python on live system
-#	ccp_patch "${FILESDIR}"/dont-chmod-python-binary.patch
-
-	# Don't use this when we aren't building clipper
-	# For some reason clipper check for $enableval even when --enable is passed
-	ccp_patch "${FILESDIR}"/pass-clipper-enablevals.patch
-	ccp_patch "${FILESDIR}"/clipper-find-mccp4-includes.patch
-
-	# Default to firefox browser, not 'netscape'
-	ccp_patch "${FILESDIR}"/ccp4i-default-to-firefox.patch
-
-	# Also use -lpthread when linking blas and lapack
-	# We may need more fixing to use libcblas for the C files
-	ccp_patch "${FILESDIR}"/check-blas-lapack-pthread.patch
-
-	# gerror_ gets defined twice on ppc if you're using gfortran/g95
-	ccp_patch "${FILESDIR}"/${PV}-ppc-double-define-gerror.patch
-
-	# Replace IDATE with UIDATE for compat with gcc 4.1.2
-	ccp_patch "${FILESDIR}"/${PV}-gcc-4.1.2-idate-fix.patch
-
-	einfo "Done." # done applying Gentoo patches
-	echo
-
-	gnuconfig_update
-}
-
-src_compile() {
-	# Build system is broken if we set LDFLAGS
-	unset LDFLAGS
-
-	# GENTOO_OSNAME can be one of:
-	# irix irix64 sunos sunos64 aix hpux osf1 linux freebsd
-	# linux_compaq_compilers linux_intel_compilers generic Darwin
-	# ia64_linux_intel Darwin_ibm_compilers linux_ibm_compilers
-	if [[ "$(tc-getFC)" = "ifort" ]]; then
-		if use ia64; then
-			GENTOO_OSNAME="ia64_linux_intel"
-		else
-			# Should be valid for x86, maybe amd64
-			GENTOO_OSNAME="linux_intel_compilers"
-		fi
-	else
-		# Should be valid for x86 and amd64, at least
-		GENTOO_OSNAME="linux"
-	fi
-
-	# Sets up env
-	ln -s \
-		ccp4.setup-bash \
-		"${S}"/include/ccp4.setup
-
-	# We agree to the license by emerging this, set in LICENSE
-	sed -i \
-		-e "s~^\(^agreed=\).*~\1yes~g" \
-		"${S}"/configure
-
-	# Fix up variables -- need to reset CCP4_MASTER at install-time
-	sed -i \
-		-e "s~^\(setenv CCP4_MASTER.*\)/.*~\1${WORKDIR}~g" \
-		-e "s~^\(setenv CCP4I_TCLTK.*\)/usr/local/bin~\1/usr/bin~g" \
-		"${S}"/include/ccp4.setup*
-
-	# Set up variables for build
-	source "${S}"/include/ccp4.setup
-
-	export CC=$(tc-getCC)
-	export CXX=$(tc-getCXX)
-	export COPTIM=${CFLAGS}
-	export CXXOPTIM=${CXXFLAGS}
-	# Default to -O2 if FFLAGS is unset
-	export FC=$(tc-getFC)
-	export FOPTIM=${FFLAGS:- -O2}
-
-	# Can't use econf, configure rejects unknown options like --prefix
-	./configure \
-		$(use_enable X x) \
-		--with-shared-libs \
-		--with-fftw=/usr \
-		--with-warnings \
-		--disable-pdb_extract \
-		--disable-cctbx \
-		--disable-phaser \
-		--tmpdir="${TMPDIR}" \
-		${GENTOO_OSNAME} || die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	# Set up variables for build
-	source "${S}"/include/ccp4.setup
-
-# Only needed when using --bindir and --libdir
-	# Needed to avoid errors. Originally tried to make lib and bin
-	# in configure script, now patched out by dont-make-dirs-in-configure.patch
-#	dodir /usr/include /usr/$(get_libdir) /usr/bin
-
-#	make install || die "install failed"
-	einstall || die "install failed"
-
-	# Fix env
-	sed -i \
-		-e "s~^\(setenv CCP4_MASTER.*\)${WORKDIR}~\1/usr~g" \
-		-e "s~^\(setenv CCP4.*\$CCP4_MASTER\).*~\1~g" \
-		-e "s~^\(setenv CCP4I_TOP\).*~\1 \$CCP4/$(get_libdir)/ccp4/ccp4i~g" \
-		-e "s~^\(.*setenv CINCL.*\$CCP4\).*~\1\$CCP4/share/ccp4/include~g" \
-		-e "s~^\(.*setenv CLIBD .*\$CCP4\).*~\1\$CCP4/share/ccp4/data~g" \
-		-e "s~^\(.*setenv CLIBD_MON .*\)\$CCP4.*~\1/share/ccp4/data/monomers/~g" \
-		-e "s~^\(.*setenv MOLREPLIB .*\)\$CCP4.*~\1/share/ccp4/data/monomers/~g" \
-		-e "s~^\(.*setenv CCP4_BROWSER.*\).*~\1 firefox~g" \
-		"${S}"/include/ccp4.setup*
-
-	# Get rid of S instances
-	# Also the main clipper library is built as libclipper-core, not libclipper
-	sed -i \
-		-e "s:${S}:$usr:g" \
-		-e "s:lclipper :lclipper-core :g" \
-		"${S}"/bin/clipper-config
-#	sed -i \
-#		-e "s:${S}:usr:g" \
-#		"${S}"/$(get_libdir)/cctbx/cctbx_build/setpaths*
-
-	# Bins
-	dobin "${S}"/bin/* || die
-
-	# Libs
-	for file in "${S}"/lib/*; do
-		if [[ -d ${file} ]]; then
-			continue
-		elif [[ -x ${file} ]]; then
-			dolib.so ${file} || die
-		else
-			insinto /usr/$(get_libdir)
-			doins ${file} || die
-		fi
-	done
-
-	# Fix libdir in all *.la files
-	sed -i \
-		-e "s:^\(libdir=\).*:\1\'/usr/$(get_libdir)\':g" \
-		"${D}"/usr/$(get_libdir)/*.la
-
-	# Library symlinks
-	local LIBNAMES="libclipper-ccp4.so.0.0.0
-		libclipper-cif.so.0.0.0
-		libclipper-contrib.so.0.0.0
-		libclipper-core.so.0.0.0
-		libclipper-minimol.so.0.0.0
-		libclipper-mmdbold.so.0.0.0
-		libclipper-mmdb.so.0.0.0
-		libclipper-mtz.so.1.0.0
-		libclipper-phs.so.0.0.0
-		libjwc_c.so.0.1.1
-		libjwc_f.so.0.1.1
-		libssm.so.0.0.0
-		libxdl_viewextra.so.0.0.0
-		libxdl_view.so.2.0.0"
-
-	for LIBNAME in ${LIBNAMES}; do
-		library_dosym ${LIBNAME}
-	done
-
-#	dosym libclipper-ccp4.so.0.0.0 /usr/$(get_libdir)/libclipper-ccp4.so
-#	dosym libclipper-ccp4.so.0.0.0 /usr/$(get_libdir)/libclipper-ccp4.so.0
-#	dosym libclipper-ccp4.so.0.0.0 /usr/$(get_libdir)/libclipper-ccp4.so.0.0
-#
-#	dosym libclipper-cif.so.0.0.0 /usr/$(get_libdir)/libclipper-cif.so
-#	dosym libclipper-cif.so.0.0.0 /usr/$(get_libdir)/libclipper-cif.so.0
-#	dosym libclipper-cif.so.0.0.0 /usr/$(get_libdir)/libclipper-cif.so.0.0
-#
-#	dosym libclipper-contrib.so.0.0.0 /usr/$(get_libdir)/libclipper-contrib.so
-#	dosym libclipper-contrib.so.0.0.0 /usr/$(get_libdir)/libclipper-contrib.so.0
-#	dosym libclipper-contrib.so.0.0.0 /usr/$(get_libdir)/libclipper-contrib.so.0.0
-#
-#	dosym libclipper-core.so.0.0.0 /usr/$(get_libdir)/libclipper-core.so
-#	dosym libclipper-core.so.0.0.0 /usr/$(get_libdir)/libclipper-core.so.0
-#	dosym libclipper-core.so.0.0.0 /usr/$(get_libdir)/libclipper-core.so.0.0
-#
-#	dosym libclipper-minimol.so.0.0.0 /usr/$(get_libdir)/libclipper-minimol.so
-#	dosym libclipper-minimol.so.0.0.0 /usr/$(get_libdir)/libclipper-minimol.so.0
-#	dosym libclipper-minimol.so.0.0.0 /usr/$(get_libdir)/libclipper-minimol.so.0.0
-#
-#	dosym libclipper-mmdbold.so.0.0.0 /usr/$(get_libdir)/libclipper-mmdbold.so
-#	dosym libclipper-mmdbold.so.0.0.0 /usr/$(get_libdir)/libclipper-mmdbold.so.0
-#	dosym libclipper-mmdbold.so.0.0.0 /usr/$(get_libdir)/libclipper-mmdbold.so.0.0
-#
-#	dosym libclipper-mmdb.so.0.0.0 /usr/$(get_libdir)/libclipper-mmdb.so
-#	dosym libclipper-mmdb.so.0.0.0 /usr/$(get_libdir)/libclipper-mmdb.so.0
-#	dosym libclipper-mmdb.so.0.0.0 /usr/$(get_libdir)/libclipper-mmdb.so.0.0
-#
-#	dosym libclipper-mtz.so.1.0.0 /usr/$(get_libdir)/libclipper-mtz.so
-#	dosym libclipper-mtz.so.1.0.0 /usr/$(get_libdir)/libclipper-mtz.so.1
-#	dosym libclipper-mtz.so.1.0.0 /usr/$(get_libdir)/libclipper-mtz.so.1.0
-#
-#	dosym libclipper-phs.so.0.0.0 /usr/$(get_libdir)/libclipper-phs.so
-#	dosym libclipper-phs.so.0.0.0 /usr/$(get_libdir)/libclipper-phs.so.0
-#	dosym libclipper-phs.so.0.0.0 /usr/$(get_libdir)/libclipper-phs.so.0.0
-#
-#	dosym libjwc_c.so.0.1.1 /usr/$(get_libdir)/libjwc_c.so
-#	dosym libjwc_c.so.0.1.1 /usr/$(get_libdir)/libjwc_c.so.0
-#	dosym libjwc_c.so.0.1.1 /usr/$(get_libdir)/libjwc_c.so.0.1
-#
-#	dosym libjwc_f.so.0.1.1 /usr/$(get_libdir)/libjwc_f.so
-#	dosym libjwc_f.so.0.1.1 /usr/$(get_libdir)/libjwc_f.so.0
-#	dosym libjwc_f.so.0.1.1 /usr/$(get_libdir)/libjwc_f.so.0.1
-#
-#	dosym libssm.so.0.0.0 /usr/$(get_libdir)/libssm.so
-#	dosym libssm.so.0.0.0 /usr/$(get_libdir)/libssm.so.0
-#	dosym libssm.so.0.0.0 /usr/$(get_libdir)/libssm.so.0.0
-#
-#	dosym libxdl_viewextra.so.0.0.0 /usr/$(get_libdir)/libxdl_viewextra.so
-#	dosym libxdl_viewextra.so.0.0.0 /usr/$(get_libdir)/libxdl_viewextra.so.0
-#	dosym libxdl_viewextra.so.0.0.0 /usr/$(get_libdir)/libxdl_viewextra.so.0.0
-#
-#	dosym libxdl_view.so.2.0.0 /usr/$(get_libdir)/libxdl_view.so
-#	dosym libxdl_view.so.2.0.0 /usr/$(get_libdir)/libxdl_view.so.2
-#	dosym libxdl_view.so.2.0.0 /usr/$(get_libdir)/libxdl_view.so.2.0
-
-	# Setup scripts
-	insinto /etc/profile.d
-	newins "${S}"/include/ccp4.setup-bash ccp4.setup.sh
-	newins "${S}"/include/ccp4.setup-dist ccp4.setup.csh
-	rm -f "${S}"/include/ccp4.setup-bash
-	rm -f "${S}"/include/ccp4.setup-dist
-
-	# Environment files, setup scripts, etc.
-	insinto /usr/share/ccp4/include
-	doins "${S}"/include/* || die
-
-	# CCP4Interface - GUI
-	insinto /usr/$(get_libdir)/ccp4
-	doins -r "${S}"/ccp4i || die
-	exeinto /usr/$(get_libdir)/ccp4/ccp4i/bin
-	doexe "${S}"/ccp4i/bin/* || die
-
-	# Data
-	insinto /usr/share/ccp4
-	doins -r "${S}"/lib/data || die
-
-	# Include files
-	insinto /usr/include
-	for i in ccp4 mmdb; do
-		doins -r "${S}"/include/${i} || die
-	done
-
-	# Install docs and examples
-
-	doman "${S}"/man/cat1/*
-
-	mv "${S}"/manual/README "${S}"/manual/README-manual
-	dodoc "${S}"/manual/*
-
-	dodoc "${S}"/README "${S}"/CHANGES
-
-	dodoc "${S}"/doc/*
-	rm "${D}"/usr/share/doc/${PF}/GNUmakefile.*
-	rm "${D}"/usr/share/doc/${PF}/COPYING.*
-
-	dohtml -r "${S}"/html/*
-	dodoc "${S}"/examples/README
-
-	# Fix wrongly installed HTML pages from clipper
-	dohtml "${D}"/usr/html/*
-	rm -rf "${D}"/usr/html
-
-	for i in data rnase toxd; do
-		docinto examples/${i}
-		dodoc "${S}"/examples/${i}/*
-	done
-
-	docinto examples/tutorial
-	dohtml -r "${S}"/examples/tutorial/html examples/tutorial/tut.css
-	for i in data results; do
-		docinto examples/tutorial/${i}
-		dodoc "${S}"/examples/tutorial/${i}/*
-	done
-
-	for i in non-runnable runnable; do
-		docinto examples/unix/${i}
-		dodoc "${S}"/examples/unix/${i}/*
-	done
-
-	# Needed for ccp4i docs to work
-	dosym ../../share/doc/${PF}/examples /usr/$(get_libdir)/ccp4/examples
-	dosym ../../share/doc/${PF}/html /usr/$(get_libdir)/ccp4/html
-
-	# Fix overlaps with other packages
-	rm -f "${D}"/usr/share/man/man1/rasmol.1*
-}
-
-pkg_postinst() {
-	einfo "The Web browser defaults to firefox. Change CCP4_BROWSER"
-	einfo "in /usr/share/ccp4/include/ccp4.setup* to modify this."
-}
-
-# Epatch wrapper for bulk patching
-ccp_patch() {
-	EPATCH_SINGLE_MSG="  ${1##*/} ..." epatch ${1}
-}
-
-# Links libname.so, libname.so.major and libname.so.major.minor
-# to libname.so.major.minor.micro
-library_dosym() {
-	local LIBNAME LIBDIR SUFFIX CORE_LIBNAME LIB_MAJOR LIB_MINOR LIB_VERSIONS
-
-	LIBNAME=${1}
-	LIBDIR=${2:-/usr/$(get_libdir)}
-
-	# Tag / on the end of libdir if needed
-	if [[ ${LIBDIR:$((${#LIBDIR}-1)):1} != "/" ]]; then
-		LIBDIR="${LIBDIR}/"
-	fi
-
-	if [[ "${LIBNAME}" != *.so.* ]]; then
-		msg="library_dosym() requires a shared, versioned library as an argument"
-		eerror "$msg"
-		die "$msg"
-	fi
-
-	SUFFIX=${LIBNAME##*so.}
-	CORE_LIBNAME=${LIBNAME%.so.*}
-	CORE_LIBNAME="${CORE_LIBNAME}.so"
-	LIB_MAJOR=${SUFFIX%%.*}
-	LIB_MINOR=${SUFFIX#*.}
-	LIB_MINOR=${SUFFIX%%.*}
-	LIB_VERSIONS="${LIB_MAJOR} ${LIB_MAJOR}.${LIB_MINOR}"
-	for LIB_SUFFIX in .${LIB_MAJOR} .${LIB_MAJOR}.${LIB_MINOR} ""; do
-		einfo "Calling dosym ${LIBNAME} ${LIBDIR} ${CORE_LIBNAME} ${LIB_SUFFIX}"
-		dosym ${LIBNAME} ${LIBDIR}${CORE_LIBNAME}${LIB_SUFFIX}
-	done
-}
diff --git a/sci-chemistry/ccp4/ccp4-6.0.2.ebuild b/sci-chemistry/ccp4/ccp4-6.0.2.ebuild
deleted file mode 100644
index 0bf4b0cd9fec..000000000000
--- a/sci-chemistry/ccp4/ccp4-6.0.2.ebuild
+++ /dev/null
@@ -1,432 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.2.ebuild,v 1.11 2011/06/21 16:05:14 jlec Exp $
-
-inherit eutils fortran-2 gnuconfig toolchain-funcs
-
-SRC="ftp://ftp.ccp4.ac.uk/ccp4"
-
-PATCH_TOT="0"
-#PATCH1=( src/mmdb_app_
-#	chainsaw.cpp-11May2006.diff )
-#PATCH2=( src
-#	anisoanl.f-r1.22-r1.24.diff )
-
-DESCRIPTION="Protein X-ray crystallography toolkit"
-HOMEPAGE="http://www.ccp4.ac.uk/"
-RESTRICT="mirror"
-SRC_URI="${SRC}/${PV}/source/${P}-core-src.tar.gz"
-for i in $(seq $PATCH_TOT); do
-	NAME="PATCH${i}[1]"
-	SRC_URI="${SRC_URI}
-		${SRC}/${PV}/patches/${!NAME}"
-done
-
-LICENSE="ccp4"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE="X"
-
-# app-office/sc overlaps sc binary and man page
-# We can't rename ours since the automated ccp4i interface expects it there,
-# as do many scripts. app-office/sc can't rename its because that's the name
-# of the package.
-RDEPEND="
-	virtual/fortran
-
-		>=dev-lang/tcl-8.3
-		>=dev-lang/tk-8.3
-		>=dev-tcltk/blt-2.4
-		virtual/lapack
-		virtual/blas
-		=sci-libs/fftw-2*
-		sci-chemistry/pdb-extract
-		sci-chemistry/rasmol
-		sci-libs/mccp4
-		app-shells/tcsh
-		!app-office/sc
-		X? (
-			x11-libs/libX11
-			x11-libs/libXt
-			x11-libs/libXaw
-		)"
-DEPEND="${RDEPEND}
-		X? (
-			x11-misc/imake
-			x11-proto/inputproto
-			x11-proto/xextproto
-		)"
-
-S="${WORKDIR}/${PN}-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	einfo "Applying upstream patches ..."
-	for patch in $(seq $PATCH_TOT); do
-		base="PATCH${patch}"
-		dir=$(eval echo \${${base}[0]})
-		p=$(eval echo \${${base}[1]})
-		pushd ${dir} >& /dev/null
-		ccp_patch "${DISTDIR}/${p}"
-		popd >& /dev/null
-	done
-	einfo "Done."
-	echo
-
-	einfo "Applying Gentoo patches ..."
-	# These two only needed when attempting to install outside build dir via
-	# --bindir and --libdir instead of straight copying after build
-
-	# it attempts to install some libraries during the build
-	#ccp_patch "${FILESDIR}"/${P}-install-libs-at-install-time.patch
-	# hklview/ipdisp.exe/xdlmapman/ipmosflm can't find libxdl_view
-	# without this patch when --libdir is set
-	# Rotgen still needs more patching to find it
-	#ccp_patch "${FILESDIR}"/add-xdl-libdir.patch
-
-	# it tries to create libdir, bindir etc on live system in configure
-	ccp_patch "${FILESDIR}"/${PV}-dont-make-dirs-in-configure.patch
-
-	# We already have sci-chemistry/rasmol
-	ccp_patch "${FILESDIR}"/dont-build-rasmol.patch
-
-	# We already have sci-chemistry/pdb-extract
-# Use configure option instead
-#	ccp_patch "${FILESDIR}"/dont-build-pdb-extract.patch
-
-	ccp_patch "${FILESDIR}"/create-mosflm-bindir.patch
-	ccp_patch "${FILESDIR}"/make-mosflm-libdir.patch
-	ccp_patch "${FILESDIR}"/make-mosflm-index-libdir.patch
-	ccp_patch "${FILESDIR}"/make-mosflm-cbf-libdir.patch
-	ccp_patch "${FILESDIR}"/make-ipmosflm-dir.patch
-
-# Don't use these when we aren't building phaser
-#	ccp_patch "${FILESDIR}"/make-phaser-bindir.patch
-#	ccp_patch "${FILESDIR}"/no-phaser-ld-assume-kernel.patch
-#	# scons config.py tries to chmod python on live system
-#	ccp_patch "${FILESDIR}"/dont-chmod-python-binary.patch
-
-	# Don't use this when we aren't building clipper
-	# For some reason clipper check for $enableval even when --enable is passed
-	ccp_patch "${FILESDIR}"/pass-clipper-enablevals.patch
-	ccp_patch "${FILESDIR}"/clipper-find-mccp4-includes.patch
-
-	# Default to firefox browser, not 'netscape'
-	ccp_patch "${FILESDIR}"/ccp4i-default-to-firefox.patch
-
-	# Also use -lpthread when linking blas and lapack
-	# We may need more fixing to use libcblas for the C files
-	ccp_patch "${FILESDIR}"/check-blas-lapack-pthread.patch
-
-	# gerror_ gets defined twice on ppc if you're using gfortran/g95
-	ccp_patch "${FILESDIR}"/${PV}-ppc-double-define-gerror.patch
-
-	einfo "Done." # done applying Gentoo patches
-	echo
-
-	gnuconfig_update
-}
-
-src_compile() {
-	# Build system is broken if we set LDFLAGS
-	unset LDFLAGS
-
-	# GENTOO_OSNAME can be one of:
-	# irix irix64 sunos sunos64 aix hpux osf1 linux freebsd
-	# linux_compaq_compilers linux_intel_compilers generic Darwin
-	# ia64_linux_intel Darwin_ibm_compilers linux_ibm_compilers
-	if [[ "$(tc-getFC)" = "ifort" ]]; then
-		if use ia64; then
-			GENTOO_OSNAME="ia64_linux_intel"
-		else
-			# Should be valid for x86, maybe amd64
-			GENTOO_OSNAME="linux_intel_compilers"
-		fi
-	else
-		# Should be valid for x86 and amd64, at least
-		GENTOO_OSNAME="linux"
-	fi
-
-	# Sets up env
-	ln -s \
-		ccp4.setup-bash \
-		"${S}"/include/ccp4.setup
-
-	# We agree to the license by emerging this, set in LICENSE
-	sed -i \
-		-e "s~^\(^agreed=\).*~\1yes~g" \
-		"${S}"/configure
-
-	# Fix up variables -- need to reset CCP4_MASTER at install-time
-	sed -i \
-		-e "s~^\(setenv CCP4_MASTER.*\)/.*~\1${WORKDIR}~g" \
-		-e "s~^\(setenv CCP4I_TCLTK.*\)/usr/local/bin~\1/usr/bin~g" \
-		"${S}"/include/ccp4.setup*
-
-	# Set up variables for build
-	source "${S}"/include/ccp4.setup
-
-	export CC=$(tc-getCC)
-	export CXX=$(tc-getCXX)
-	export COPTIM=${CFLAGS}
-	export CXXOPTIM=${CXXFLAGS}
-	# Default to -O2 if FFLAGS is unset
-	export FC=$(tc-getFC)
-	export FOPTIM=${FFLAGS:- -O2}
-
-	# Can't use econf, configure rejects unknown options like --prefix
-	./configure \
-		$(use_enable X x) \
-		--with-shared-libs \
-		--with-fftw=/usr \
-		--with-warnings \
-		--disable-pdb_extract \
-		--disable-cctbx \
-		--disable-phaser \
-		--tmpdir="${TMPDIR}" \
-		${GENTOO_OSNAME} || die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	# Set up variables for build
-	source "${S}"/include/ccp4.setup
-
-# Only needed when using --bindir and --libdir
-	# Needed to avoid errors. Originally tried to make lib and bin
-	# in configure script, now patched out by dont-make-dirs-in-configure.patch
-#	dodir /usr/include /usr/$(get_libdir) /usr/bin
-
-#	make install || die "install failed"
-	einstall || die "install failed"
-
-	# Fix env
-	sed -i \
-		-e "s~^\(setenv CCP4_MASTER.*\)${WORKDIR}~\1/usr~g" \
-		-e "s~^\(setenv CCP4.*\$CCP4_MASTER\).*~\1~g" \
-		-e "s~^\(setenv CCP4I_TOP\).*~\1 \$CCP4/$(get_libdir)/ccp4/ccp4i~g" \
-		-e "s~^\(.*setenv CINCL.*\$CCP4\).*~\1/share/ccp4/include~g" \
-		-e "s~^\(.*setenv CLIBD .*\$CCP4\).*~\1/share/ccp4/data~g" \
-		-e "s~^\(.*setenv CLIBD_MON .*\)\$CCP4.*~\1\$CLIBD/monomers/~g" \
-		-e "s~^\(.*setenv MOLREPLIB .*\)\$CCP4.*~\1\$CLIBD/monomers/~g" \
-		-e "s~^\(.*setenv CCP4_BROWSER.*\).*~\1 firefox~g" \
-		"${S}"/include/ccp4.setup*
-
-	# Get rid of S instances
-	# Also the main clipper library is built as libclipper-core, not libclipper
-	sed -i \
-		-e "s:${S}:$usr:g" \
-		-e "s:lclipper :lclipper-core :g" \
-		"${S}"/bin/clipper-config
-#	sed -i \
-#		-e "s:${S}:usr:g" \
-#		"${S}"/$(get_libdir)/cctbx/cctbx_build/setpaths*
-
-	# Bins
-	dobin "${S}"/bin/* || die
-
-	# Libs
-	for file in "${S}"/lib/*; do
-		if [[ -d ${file} ]]; then
-			continue
-		elif [[ -x ${file} ]]; then
-			dolib.so ${file} || die
-		else
-			insinto /usr/$(get_libdir)
-			doins ${file} || die
-		fi
-	done
-
-	# Fix libdir in all *.la files
-	sed -i \
-		-e "s:^\(libdir=\).*:\1\'/usr/$(get_libdir)\':g" \
-		"${D}"/usr/$(get_libdir)/*.la
-
-	# Library symlinks
-	local LIBNAMES="libclipper-ccp4.so.0.0.0
-		libclipper-cif.so.0.0.0
-		libclipper-contrib.so.0.0.0
-		libclipper-core.so.0.0.0
-		libclipper-minimol.so.0.0.0
-		libclipper-mmdbold.so.0.0.0
-		libclipper-mmdb.so.0.0.0
-		libclipper-mtz.so.1.0.0
-		libclipper-phs.so.0.0.0
-		libjwc_c.so.0.1.1
-		libjwc_f.so.0.1.1
-		libssm.so.0.0.0
-		libxdl_viewextra.so.0.0.0
-		libxdl_view.so.2.0.0"
-
-	for LIBNAME in ${LIBNAMES}; do
-		library_dosym ${LIBNAME}
-	done
-
-#	dosym libclipper-ccp4.so.0.0.0 /usr/$(get_libdir)/libclipper-ccp4.so
-#	dosym libclipper-ccp4.so.0.0.0 /usr/$(get_libdir)/libclipper-ccp4.so.0
-#	dosym libclipper-ccp4.so.0.0.0 /usr/$(get_libdir)/libclipper-ccp4.so.0.0
-#
-#	dosym libclipper-cif.so.0.0.0 /usr/$(get_libdir)/libclipper-cif.so
-#	dosym libclipper-cif.so.0.0.0 /usr/$(get_libdir)/libclipper-cif.so.0
-#	dosym libclipper-cif.so.0.0.0 /usr/$(get_libdir)/libclipper-cif.so.0.0
-#
-#	dosym libclipper-contrib.so.0.0.0 /usr/$(get_libdir)/libclipper-contrib.so
-#	dosym libclipper-contrib.so.0.0.0 /usr/$(get_libdir)/libclipper-contrib.so.0
-#	dosym libclipper-contrib.so.0.0.0 /usr/$(get_libdir)/libclipper-contrib.so.0.0
-#
-#	dosym libclipper-core.so.0.0.0 /usr/$(get_libdir)/libclipper-core.so
-#	dosym libclipper-core.so.0.0.0 /usr/$(get_libdir)/libclipper-core.so.0
-#	dosym libclipper-core.so.0.0.0 /usr/$(get_libdir)/libclipper-core.so.0.0
-#
-#	dosym libclipper-minimol.so.0.0.0 /usr/$(get_libdir)/libclipper-minimol.so
-#	dosym libclipper-minimol.so.0.0.0 /usr/$(get_libdir)/libclipper-minimol.so.0
-#	dosym libclipper-minimol.so.0.0.0 /usr/$(get_libdir)/libclipper-minimol.so.0.0
-#
-#	dosym libclipper-mmdbold.so.0.0.0 /usr/$(get_libdir)/libclipper-mmdbold.so
-#	dosym libclipper-mmdbold.so.0.0.0 /usr/$(get_libdir)/libclipper-mmdbold.so.0
-#	dosym libclipper-mmdbold.so.0.0.0 /usr/$(get_libdir)/libclipper-mmdbold.so.0.0
-#
-#	dosym libclipper-mmdb.so.0.0.0 /usr/$(get_libdir)/libclipper-mmdb.so
-#	dosym libclipper-mmdb.so.0.0.0 /usr/$(get_libdir)/libclipper-mmdb.so.0
-#	dosym libclipper-mmdb.so.0.0.0 /usr/$(get_libdir)/libclipper-mmdb.so.0.0
-#
-#	dosym libclipper-mtz.so.1.0.0 /usr/$(get_libdir)/libclipper-mtz.so
-#	dosym libclipper-mtz.so.1.0.0 /usr/$(get_libdir)/libclipper-mtz.so.1
-#	dosym libclipper-mtz.so.1.0.0 /usr/$(get_libdir)/libclipper-mtz.so.1.0
-#
-#	dosym libclipper-phs.so.0.0.0 /usr/$(get_libdir)/libclipper-phs.so
-#	dosym libclipper-phs.so.0.0.0 /usr/$(get_libdir)/libclipper-phs.so.0
-#	dosym libclipper-phs.so.0.0.0 /usr/$(get_libdir)/libclipper-phs.so.0.0
-#
-#	dosym libjwc_c.so.0.1.1 /usr/$(get_libdir)/libjwc_c.so
-#	dosym libjwc_c.so.0.1.1 /usr/$(get_libdir)/libjwc_c.so.0
-#	dosym libjwc_c.so.0.1.1 /usr/$(get_libdir)/libjwc_c.so.0.1
-#
-#	dosym libjwc_f.so.0.1.1 /usr/$(get_libdir)/libjwc_f.so
-#	dosym libjwc_f.so.0.1.1 /usr/$(get_libdir)/libjwc_f.so.0
-#	dosym libjwc_f.so.0.1.1 /usr/$(get_libdir)/libjwc_f.so.0.1
-#
-#	dosym libssm.so.0.0.0 /usr/$(get_libdir)/libssm.so
-#	dosym libssm.so.0.0.0 /usr/$(get_libdir)/libssm.so.0
-#	dosym libssm.so.0.0.0 /usr/$(get_libdir)/libssm.so.0.0
-#
-#	dosym libxdl_viewextra.so.0.0.0 /usr/$(get_libdir)/libxdl_viewextra.so
-#	dosym libxdl_viewextra.so.0.0.0 /usr/$(get_libdir)/libxdl_viewextra.so.0
-#	dosym libxdl_viewextra.so.0.0.0 /usr/$(get_libdir)/libxdl_viewextra.so.0.0
-#
-#	dosym libxdl_view.so.2.0.0 /usr/$(get_libdir)/libxdl_view.so
-#	dosym libxdl_view.so.2.0.0 /usr/$(get_libdir)/libxdl_view.so.2
-#	dosym libxdl_view.so.2.0.0 /usr/$(get_libdir)/libxdl_view.so.2.0
-
-	# Environment files, setup scripts, etc.
-	insinto /usr/share/ccp4/include
-	doins "${S}"/include/* || die
-
-	# CCP4Interface - GUI
-	insinto /usr/$(get_libdir)/ccp4
-	doins -r "${S}"/ccp4i || die
-	exeinto /usr/$(get_libdir)/ccp4/ccp4i/bin
-	doexe "${S}"/ccp4i/bin/* || die
-
-	# Data
-	insinto /usr/share/ccp4
-	doins -r "${S}"/lib/data || die
-
-	# Include files
-	insinto /usr/include
-	for i in ccp4 clipper mmdb ssm; do
-		doins -r "${S}"/include/${i} || die
-	done
-
-	# Install docs and examples
-
-	doman "${S}"/man/cat1/*
-
-	mv "${S}"/manual/README "${S}"/manual/README-manual
-	dodoc "${S}"/manual/*
-
-	dodoc "${S}"/README "${S}"/CHANGES
-
-	dodoc "${S}"/doc/*
-	rm "${D}"/usr/share/doc/${PF}/GNUmakefile.gz
-	rm "${D}"/usr/share/doc/${PF}/COPYING.gz
-
-	dohtml -r "${S}"/html/*
-	dodoc "${S}"/examples/README
-
-	# Fix wrongly installed HTML pages from clipper
-	dohtml "${D}"/usr/html/*
-	rm -rf "${D}"/usr/html
-
-	for i in data rnase toxd; do
-		docinto examples/${i}
-		dodoc "${S}"/examples/${i}/*
-	done
-
-	docinto examples/tutorial
-	dohtml -r "${S}"/examples/tutorial/html examples/tutorial/tut.css
-	for i in data results; do
-		docinto examples/tutorial/${i}
-		dodoc "${S}"/examples/tutorial/${i}/*
-	done
-
-	for i in non-runnable runnable; do
-		docinto examples/unix/${i}
-		dodoc "${S}"/examples/unix/${i}
-	done
-
-	# Needed for ccp4i docs to work
-	dosym ../../share/doc/${PF}/examples /usr/$(get_libdir)/ccp4/examples
-	dosym ../../share/doc/${PF}/html /usr/$(get_libdir)/ccp4/html
-
-	# Fix overlaps with other packages
-	rm "${D}"/usr/share/man/man1/rasmol.1*
-}
-
-pkg_postinst() {
-	einfo "The Web browser defaults to firefox. Change CCP4_BROWSER"
-	einfo "in /usr/share/ccp4/include/ccp4.setup* to modify this."
-
-	ewarn "Set your .bashrc or other shell login file to source"
-	ewarn "one of the ccp4.setup* files in ${ROOT}usr/share/ccp4/include."
-	ewarn "CCP4 will not work without this."
-}
-
-# Epatch wrapper for bulk patching
-ccp_patch() {
-	EPATCH_SINGLE_MSG="  ${1##*/} ..." epatch ${1}
-}
-
-# Links libname.so, libname.so.major and libname.so.major.minor
-# to libname.so.major.minor.micro
-library_dosym() {
-	local LIBNAME LIBDIR SUFFIX CORE_LIBNAME LIB_MAJOR LIB_MINOR LIB_VERSIONS
-
-	LIBNAME=${1}
-	LIBDIR=${2:-/usr/$(get_libdir)}
-
-	# Tag / on the end of libdir if needed
-	if [[ ${LIBDIR:$((${#LIBDIR}-1)):1} != "/" ]]; then
-		LIBDIR="${LIBDIR}/"
-	fi
-
-	if [[ "${LIBNAME}" != *.so.* ]]; then
-		msg="library_dosym() requires a shared, versioned library as an argument"
-		eerror "$msg"
-		die "$msg"
-	fi
-
-	SUFFIX=${LIBNAME##*so.}
-	CORE_LIBNAME=${LIBNAME%.so.*}
-	CORE_LIBNAME="${CORE_LIBNAME}.so"
-	LIB_MAJOR=${SUFFIX%%.*}
-	LIB_MINOR=${SUFFIX#*.}
-	LIB_MINOR=${SUFFIX%%.*}
-	LIB_VERSIONS="${LIB_MAJOR} ${LIB_MAJOR}.${LIB_MINOR}"
-	for LIB_SUFFIX in .${LIB_MAJOR} .${LIB_MAJOR}.${LIB_MINOR} ""; do
-		einfo "Calling dosym ${LIBNAME} ${LIBDIR} ${CORE_LIBNAME} ${LIB_SUFFIX}"
-		dosym ${LIBNAME} ${LIBDIR}${CORE_LIBNAME}${LIB_SUFFIX}
-	done
-}
diff --git a/sci-chemistry/ccp4/ccp4-6.1.3.ebuild b/sci-chemistry/ccp4/ccp4-6.1.3.ebuild
deleted file mode 100644
index e3bfa57a803b..000000000000
--- a/sci-chemistry/ccp4/ccp4-6.1.3.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-chemistry/ccp4/ccp4-6.1.3.ebuild,v 1.3 2011/06/21 16:05:14 jlec Exp $
-
-EAPI="2"
-
-DESCRIPTION="Protein X-ray crystallography toolkit -- meta package"
-HOMEPAGE="http://www.ccp4.ac.uk/"
-SRC_URI=""
-
-LICENSE="ccp4"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X arpwarp +balbes"
-
-RDEPEND="
-	virtual/fortran
-
-	~sci-chemistry/ccp4-apps-${PV}[X?]
-	sci-chemistry/molrep
-	sci-chemistry/mosflm
-	sci-chemistry/mrbump[X?]
-	sci-chemistry/oasis
-	sci-chemistry/pdb-extract
-	sci-chemistry/refmac
-	sci-chemistry/scala
-	sci-chemistry/sfcheck
-	sci-chemistry/xia2
-	arpwarp? ( sci-chemistry/arp-warp-bin )
-	balbes? ( sci-chemistry/balbes )
-	X? (
-		~sci-chemistry/ccp4i-${PV}
-		sci-chemistry/imosflm
-		sci-chemistry/pymol
-		sci-chemistry/rasmol
-		)"
-DEPEND=""