sci-libs/ccp4-libs: Drop old

Package-Manager: portage-2.2.0_alpha159/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

4 files changed, 22 insertions, 343 deletions

diff --git a/sci-libs/ccp4-libs/ChangeLog b/sci-libs/ccp4-libs/ChangeLog
index 8602cace6f6a..1824c22c92c8 100644
--- a/sci-libs/ccp4-libs/ChangeLog
+++ b/sci-libs/ccp4-libs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/ccp4-libs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.51 2013/01/22 17:23:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.52 2013/01/22 18:46:53 jlec Exp $
+
+  22 Jan 2013; Justin Lecher <jlec@gentoo.org> -ccp4-libs-6.1.3-r10.ebuild,
+  metadata.xml:
+  Drop old
 
   22 Jan 2013; Agostino Sarubbo <ago@gentoo.org> ccp4-libs-6.1.3-r11.ebuild:
   Stable for x86, wrt bug #446232
diff --git a/sci-libs/ccp4-libs/Manifest b/sci-libs/ccp4-libs/Manifest
index c94b387e0425..c22c59e04a54 100644
--- a/sci-libs/ccp4-libs/Manifest
+++ b/sci-libs/ccp4-libs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 6.0.2-ppc-double-define-gerror.patch 424 SHA256 09c2c1e0176bee94673b21609b2b00118b2bb4f5942f3feb35c64c61c99ebc61 SHA512 3080aa9ce3fad2d972b5f2622b2f0119ad8c4306f84de6dfcb24c8ef17ebd9a163bf8e807d34508d999b8e205abec9d18daddeb3e5f8fdef075d888301ba4ed9 WHIRLPOOL 55dc0176c7aa84b5b4ab1e6ad397d358f794d0f42737efef2e4048a67cd2060c90652ecb356e3a2847091e0e5d5429c80fd1ce7c5a5348a6693d6065d18969fd
 AUX 6.1.3-cbf.patch 773 SHA256 767a2286956471c6dbf0feee9a5726f5170af21cb2dd85c7f45190cab5cce7a0 SHA512 ecf950cf82fc0c16e4e3f64b06f92a03c283dd04c2fc68932546ad863240fef49d44906a739d49d6913ceac5c8e0672ec3a7dfd2bb973f3c8ed5481c33464823 WHIRLPOOL 1307e0df9243f6cf867cefd18c7b22d4d880711f45ddf56729bedc2703584f7a42328fe87c00be7cf8d418bbd74db957128f3b527e283a384ed956bc0e5691b7
 AUX 6.1.3-ccif-shared.patch 1668 SHA256 57c201ee81e3fd95f174fecfd810ddf12509f0c2bfb1b2f317f893561eb60e3f SHA512 01b022cc4a36bafc0add56caa49b95303f36674af775074df1708008434a8d71bcc7ce1407a34d5d4079cc976e9158092f0e2f01ef5612206bf36394af486a9e WHIRLPOOL 66109e1db8469c784c22c2d22f69cb6cc6f418deb98f55c1381c8a5f3ab724ece46c9a24ebb137852e508ea6a42d485c408d49c886ecb8fd2cc65e2ac28b2c17
@@ -13,7 +16,13 @@ AUX 6.1.3-unbundle-libs-ng.patch 13925 SHA256 e24757ac37a173fc501f1036e283f048fa
 AUX 6.1.3-unbundle-libs-ng2.patch 15485 SHA256 ded20e7e5a3fd347bc852ca119b3cbe6cde22c8acae21d710d69da4ab12fa7a6 SHA512 4ba517c14a298a31cf894c26dafc713c1b3b5acc114c653874f914bf3d197fa2fec82305775357e343d809e8d240f5f2b0c6573859ecf2b89a7aa17e1f1c7554 WHIRLPOOL 52dbd8044f563d2ba2f4c8cef615067fd6fb9034b5e6fd543a0dc3830ced99b47347cb5bd57f5a246e744f67609883e800057b552831f75d6b4553726f7b764a
 AUX 6.1.3-unbundle-libs.patch 9063 SHA256 7e5fc919b5204e2d9141f7715afdd8a8b4e3e2a96e2bf95aa00fbd56046f1aa4 SHA512 3e4b2564e3870f024a95bbf556ad597c0de7f83309aaa0f3d3af80c05b616eb0cbec04abe94546951c316b172accb74580c74a16963e3213c5477c89d4fae85d WHIRLPOOL 64d9c5408a48b80a515e465d0ce59ffad3b61e6f9ab247cfd23ac17af40e723d387a7970d116ce8d4aae45a051ae5901de0e96ccbf21a6df84cc341c03a6224e
 DIST ccp4-6.1.3-core-src.tar.gz 242134076 SHA256 1e529c660e7f390ec0feca9d45caa00a2813d23156c10a2747c427117293c324 SHA512 413eba806107ebcdbd93e9122275463709133d9b2a9ce44ae57a6c2350465a47ba66ad9875237aead74f5d422c0104f58f728ab37a757b10d82cde92af444c20 WHIRLPOOL faebf8ee7920013bc3d0e83565207dca1f31ba0b5c92fe1eae4b740f70ff2031d95787fa0d545b09c853d25657c08973527e43de02fddc086988123ca2a6339c
-EBUILD ccp4-libs-6.1.3-r10.ebuild 10914 SHA256 2eec2fe0c58936f5d000c88868bada1f559a397b867301f61019c42192c7c804 SHA512 52ab756355770ad2bd79889820a7fa98e6689e796b5d10d37405f8b5a3dc351101145312b586916b8c40d2c5cbd6282ace3d646fb7761c69f5100eced7b7c1a9 WHIRLPOOL 35234552022ea6433b89fae1c9390e727e8d83cf76dc288e56287091bc65a57c72056aaa5c398ae747669275be564a83124046deed8340252bd47e4803a99e74
 EBUILD ccp4-libs-6.1.3-r11.ebuild 10899 SHA256 908b9e316ebfaa2d8bd501699a6b25d41204ec5c2d53e33666639458741cb81b SHA512 54dd7d26c9e85c145ab12433d9f0c065b997ad201971d4ec7200a3571534cbdebc4128cf0fdc57b83eb5c6fa13908c11b69cb5acf31dd81600b3d46af0765e48 WHIRLPOOL 36e94f1f78fa4b96ade07f7c6eb5cd1be1e35fade8ab56a714efa5e43175b1d6bd071594582e13f326531665eef24e068b161f5586612bef794e878ef6f9720e
-MISC ChangeLog 7567 SHA256 9d0cf3bef9f20270089387c589489ed15bd42aea619b500c56c823949bb146c0 SHA512 a54ce8563943d33d9fc74bd3aa6769815746d7480d9e420f95ecd528309b62a82f667749063da25ad4b2b8b21c82a6db89370c13f9c5ab9074f082729afcf4e1 WHIRLPOOL c148f637a577d0d0bb7c4fb65b98cd3f5d4c89959b943734768baaa3461bc7510c2a0ed71d4e533d200ab8c2b4e56736be65c54fa05816a4b93e21b4bb36fb94
-MISC metadata.xml 265 SHA256 6206181a1050a92258360204c836a620d6f016d552a4d829b3007242ee0d294f SHA512 6c94cfbe6d7b849d39de05609ed1515e8bf02562c032a1af47a089cc4f3d5e1809b33825c3511ff3b5612f26d5aaf3278be79eedbf3f5d6fd1882aa5d22d06f5 WHIRLPOOL b2a7dfd6df074f261364143d30eb30357adab07a404556cb83ce8c0bd7b577d8fd12d9dd6a88b9a985a974970b09c48f3d2dbdd0f3247fbd7f69762336858828
+MISC ChangeLog 7672 SHA256 3f83458a99c4c8c27d63e972d7d63e5846501fa3f3b680e6f8f122a2b86c7c47 SHA512 3e88a90917319b7d9fe3095283cf744d56679d03d9648a6124c96fbf8cbcfc778ab01bae88aa6f3f3bb7847dc10de88fda49d65bab58d7f040b2f32a305b366f WHIRLPOOL 0581af68d6f7582a09d32e843f68d60aadb3126cf1c0762e2263e6c254f05c7e5d6ac39bd82f7553d3bfbdb05a3d1b90e3fd64adfc5da6511e1b605c03b050f5
+MISC metadata.xml 272 SHA256 464cdfad7e5470cd4897f4d81fb87220dfdb9b8645f720e2fcf5157a7a75fbec SHA512 3e8682fbb209895927a39021555e3a440c49e61dcce93ea1b13759e067b285c604328cff031843e3aac6528970384c8fdbf15c8edd76a421db111a3981825fa5 WHIRLPOOL fc8d5f3db9db73bb2026ca21c4448107558ac53d568c89c7c6ccc635fde460aec1bbd177a4ad770b20d35693b59fc0721c8d60aea997973db3efd6b3c3777eba
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREKAAYFAlD+3qIACgkQgAnW8HDreRaZ/ACgkRHpvFIJM4PPcjQdLMQm2JRt
+yd0AoIoEuMtftQ+4RylQ0XLXOhidkQzC
+=eDAg
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r10.ebuild b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r10.ebuild
deleted file mode 100644
index a86352e2cddc..000000000000
--- a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r10.ebuild
+++ /dev/null
@@ -1,334 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r10.ebuild,v 1.10 2012/10/18 21:37:53 jlec Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-
-inherit autotools eutils fortran-2 gnuconfig multilib python toolchain-funcs
-
-SRC="ftp://ftp.ccp4.ac.uk/ccp4"
-
-#UPDATE="04_03_09"
-#PATCHDATE="090511"
-
-MY_P="${P/-libs}"
-
-PATCH_TOT="0"
-
-DESCRIPTION="Protein X-ray crystallography toolkit - Libraries"
-HOMEPAGE="http://www.ccp4.ac.uk/"
-SRC_URI="${SRC}/${PV}/${MY_P}-core-src.tar.gz"
-# patch tarball from upstream
-	[[ -n ${UPDATE} ]] && SRC_URI="${SRC_URI} ${SRC}/${PV}/updates/${P}-src-patch-${UPDATE}.tar.gz"
-# patches created by us
-	[[ -n ${PATCHDATE} ]] && SRC_URI="${SRC_URI} http://dev.gentooexperimental.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2"
-
-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 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	!<sci-chemistry/ccp4-6.1.3
-	!<sci-chemistry/ccp4-apps-${PVR}
-	app-shells/tcsh
-	dev-lang/tcl
-	<sci-libs/cbflib-0.9.2.2
-	sci-libs/fftw:2.1
-	sci-libs/mmdb
-	sci-libs/monomer-db
-	sci-libs/ssm
-	virtual/jpeg
-	virtual/lapack
-	virtual/blas"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python_set_active_version 2
-}
-
-src_prepare() {
-	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
-
-	[[ -n ${PATCHDATE} ]] && epatch "${WORKDIR}"/${PV}-${PATCHDATE}-updates.patch
-
-	einfo "Applying Gentoo patches ..."
-	# fix buffer overflows wrt bug 339706
-	ccp_patch "${FILESDIR}"/${PV}-overflows.patch
-
-	# it tries to create libdir, bindir etc on live system in configure
-	ccp_patch "${FILESDIR}"/${PV}-dont-make-dirs-in-configure.patch
-
-	# gerror_ gets defined twice on ppc if you're using gfortran/g95
-	ccp_patch "${FILESDIR}"/6.0.2-ppc-double-define-gerror.patch
-
-	# make creation of libccif.so smooth
-	ccp_patch "${FILESDIR}"/${PV}-ccif-shared.patch
-
-	# lets try to build libmmdb seperatly
-	ccp_patch "${FILESDIR}"/${PV}-dont-build-mmdb.patch
-
-	# unbundle libjpeg and cbflib
-	ccp_patch "${FILESDIR}"/${PV}-unbundle-libs-ng2.patch
-
-	# Fix missing DESTIDR
-	# not installing during build
-	ccp_patch "${FILESDIR}"/${PV}-noinstall.patch
-	sed \
-		-e '/SHARE_INST/s:$(libdir):$(DESTDIR)/$(libdir):g' \
-		-i configure || die
-
-	# Fix upstreams code
-	ccp_patch "${FILESDIR}"/${PV}-impl-dec.patch
-
-	# use pkg-config to detect BLAS/LAPACK
-	ccp_patch "${FILESDIR}"/${PV}-lapack.patch
-
-	einfo "Done." # done applying Gentoo patches
-	echo
-
-	# not needed, we have it extra
-	rm -rf src/rapper/{libxml2,gc7.0} || die
-
-	sed \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e 's:-Wl,-rpath,$CLIB::g' \
-		-e 's: -rpath $CLIB::g' \
-		-e 's: -I${srcdir}/include/cpp_c_headers::g' \
-		-e 's:sleep 1:sleep .2:g' \
-		-i configure || die
-
-	gnuconfig_update
-
-	for i in lib/DiffractionImage src/rapper src/pisa; do
-		pushd ${i} > /dev/null
-			sed 's:-g::g' -i configure* || die
-			eautoreconf
-		popd > /dev/null
-	done
-
-	## unbundle libssm
-	sed '/libdir/s:ssm::g' -i Makefile.in
-	find ./lib/src/mmdb ./lib/ssm ./lib/clipper ./lib/fftw lib/lapack -delete
-}
-
-src_configure() {
-	rm -rf lib/DiffractionImage/{jpg,CBFlib} || die
-
-	# Build system is broken if we set LDFLAGS
-	userldflags="${LDFLAGS}"
-	export SHARED_LIB_FLAGS="${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~^\(export CCP4_MASTER.*\)/.*~\1${WORKDIR}~g" \
-		-e "s~^\(.*export CBIN=.*\)\$CCP4.*~\1\$CCP4/libexec/ccp4/bin/~g" \
-		-e "s~^\(.*setenv CBIN .*\)\$CCP4.*~\1\$CCP4/libexec/ccp4/bin/~g" \
-		-e "s~^\(setenv CCP4I_TCLTK.*\)/usr/local/bin~\1${EPREFIX}/usr/bin~g" \
-		"${S}"/include/ccp4.setup*
-
-	# Set up variables for build
-	source "${S}"/include/ccp4.setup-sh
-
-	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}
-
-	export SHARE_LIB="\
-		$(tc-getCC) ${userldflags} -shared -Wl,-soname,libccp4c.so -o libccp4c.so \${CORELIBOBJS} \${CGENERALOBJS} \${CUCOBJS} \${CMTZOBJS} \${CMAPOBJS} \${CSYMOBJS} -L../ccif/ -lccif $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lm && \
-		$(tc-getFC) ${userldflags} -shared -Wl,-soname,libccp4f.so -o libccp4f.so \${FORTRANLOBJS} \${FINTERFACEOBJS} -L../ccif/ -lccif -L. -lccp4c $(pkg-config --libs mmdb) $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lstdc++ -lgfortran -lm"
-
-	# Can't use econf, configure rejects unknown options like --prefix
-	./configure \
-		--onlylibs \
-		--with-shared-libs \
-		--with-fftw="${EPREFIX}/usr" \
-		--with-warnings \
-		--disable-cctbx \
-		--disable-clipper \
-		--disable-ssm \
-		--tmpdir="${TMPDIR}" \
-		--bindir="${EPREFIX}/usr/libexec/ccp4/bin/" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		${GENTOO_OSNAME} || die "configure failed"
-}
-
-src_compile() {
-	emake -j1 \
-		DESTDIR="${D}" onlylib || die "emake failed"
-}
-
-src_install() {
-	# Set up variables for build
-	source "${S}"/include/ccp4.setup-sh
-
-	emake -j1 \
-		DESTDIR="${D}" \
-		includedir="${EPREFIX}/usr/include" \
-		library_includedir="${EPREFIX}/usr/include" \
-		install || die
-
-	sed \
-		-e "330,1000d" \
-		-i "${S}"/include/ccp4.setup-sh || die
-
-	sed \
-		-e "378,1000d" \
-		-i "${S}"/include/ccp4.setup-csh || die
-
-	sed \
-		-e "s:-${PV/-r*/}::g" \
-		-e "s:^\(.*export CCP4_MASTER=\).*:\1${EPREFIX}/usr:g" \
-		-e "s:^\(.*setenv CCP4_MASTER\).*:\1 ${EPREFIX}/usr:g" \
-		-e "s:^\(.*export CCP4=\).*CCP4_MASTER.*:\1${EPREFIX}/usr:g" \
-		-e "s:^\(.*setenv CCP4\).*CCP4_MASTER.*:\1 ${EPREFIX}/usr:g" \
-		-e "s:^\(.*export CCP4_SCR=\).*:\1${EPREFIX}/tmp:g" \
-		-e "s:^\(.*setenv CCP4_SCR \).*:\1${EPREFIX}/tmp:g" \
-		-e "s:^\(.*export BINSORT_SCR=\).*:\1${EPREFIX}/tmp:g" \
-		-e "s:^\(.*setenv BINSORT_SCR \).*:\1${EPREFIX}/tmp:g" \
-		-e "s:^\(.*export CCP4I_TOP=\).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i:g" \
-		-e "s:^\(.*setenv CCP4I_TOP \).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i:g" \
-		-e "s:^\(.*export CCP4I_TCLTK=\).*:\1${EPREFIX}/usr/bin:g" \
-		-e "s:^\(.*setenv CCP4I_TCLTK \).*:\1${EPREFIX}/usr/bin:g" \
-		-e "s:^\(.*export CCP4I_HELP=\).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i/help:g" \
-		-e "s:^\(.*setenv CCP4I_HELP \).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i/help:g" \
-		-e "s:^\(.*export CBIN=\).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \
-		-e "s:^\(.*setenv CBIN \).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \
-		-e "s:^\(.*export CCP4_BIN=\).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \
-		-e "s:^\(.*setenv CCP4_BIN \).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \
-		-e "s:^\(.*export CLIBD_MON=\).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \
-		-e "s:^\(.*setenv CLIBD_MON \).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \
-		-e "s:^\(.*export CLIBD=\).*:\1${EPREFIX}/usr/share/ccp4/data:g" \
-		-e "s:^\(.*setenv CLIBD \).*:\1${EPREFIX}/usr/share/ccp4/data:g" \
-		-e "s:^\(.*export CLIBS=\).*:\1${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(.*setenv CLIBS \).*:\1${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(.*export CLIB=\).*:\1${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(.*setenv CLIB \).*:\1${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(.*export CCP4_LIB=\).*:\1${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(.*setenv CCP4_LIB \).*:\1${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(.*export CCP4_BROWSER=\).*:\1firefox:g" \
-		-e "s:^\(.*setenv CCP4_BROWSER \).*:\1firefox:g" \
-		-e "s:^\(.*export MANPATH=\).*:\1\${MANPATH}:g" \
-		-e "s:^\(.*setenv MANPATH \).*:\1\${MANPATH}:g" \
-		-e "s:^\(.*export DBCCP4I_TOP=\).*:\1${EPREFIX}/usr/share/ccp4/dbccp4i:g" \
-		-e "s:^\(.*setenv DBCCP4I_TOP \).*:\1${EPREFIX}/usr/share/ccp4/dbccp4i:g" \
-		-e "s:^\(.*export MOLREPLIB=\).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \
-		-e "s:^\(.*setenv MOLREPLIB \).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \
-		-e "s:^\(.*export CDOC=\).*:\1${EPREFIX}/usr/share/doc:g" \
-		-e "s:^\(.*setenv CDOC \).*:\1${EPREFIX}/usr/share/doc:g" \
-		-e "s:^\(.*export CEXAM=\).*:\1${EPREFIX}/usr/share/doc/examples:g" \
-		-e "s:^\(.*setenv CEXAM \).*:\1${EPREFIX}/usr/share/doc/examples:g" \
-		-e "s:^\(.*export CINCL=\).*:\1${EPREFIX}/usr/share/ccp4/include:g" \
-		-e "s:^\(.*setenv CINCL \).*:\1${EPREFIX}/usr/share/ccp4/include:g" \
-		-e '/# .*LD_LIBRARY_PATH specifies/,/^$/d' \
-		-e "/CCP4_HELPDIR/d" \
-		-e "/IMOSFLM_VERSION/d" \
-		-i "${S}"/include/ccp4.setup* || die
-
-	# Don't check for updates on every sourcing of /etc/profile
-	sed -i \
-		-e "s:\(eval python.*\):#\1:g" \
-		"${S}"/include/ccp4.setup* || 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
-
-	sed \
-		-e 's:test "LD_LIBRARY_PATH":test "$LD_LIBRARY_PATH":g' \
-		-i "${S}"/include/ccp4.setup-sh || die
-
-	# Setup scripts
-	insinto /etc/profile.d
-	newins "${S}"/include/ccp4.setup-csh 40ccp4.setup.csh || die
-	newins "${S}"/include/ccp4.setup-sh 40ccp4.setup.sh || die
-	rm -f "${S}"/include/ccp4.setup*
-
-	# Fix libdir in all *.la files
-	sed -i \
-		-e "s:^\(libdir=\).*:\1\'${EPREFIX}/usr/$(get_libdir)\':g" \
-		"${ED}"/usr/$(get_libdir)/*.la || die
-
-	# Data
-	insinto /usr/share/ccp4/data/
-	doins -r "${S}"/lib/data/{*.PARM,*.prt,*.lib,*.dic,*.idl,*.cif,*.resource,*.york,*.hist,fraglib,reference_structures} || die
-
-	# Environment files, setup scripts, etc.
-	rm -rf "${S}"/include/{ccp4.setup*,COPYING,cpp_c_headers} || die
-	insinto /usr/share/ccp4/
-	doins -r "${S}"/include || die
-
-	dodoc "${S}"/lib/data/*.doc || die
-	newdoc "${S}"/lib/data/README DATA-README || die
-}
-
-pkg_postinst() {
-	einfo "The Web browser defaults to firefox. Change CCP4_BROWSER"
-	einfo "in ${EPREFIX}/etc/profile.d/40ccp4.setup* to modify this."
-}
-
-# Epatch wrapper for bulk patching
-ccp_patch() {
-	EPATCH_SINGLE_MSG="  ${1##*/} ..." epatch ${1}
-}
diff --git a/sci-libs/ccp4-libs/metadata.xml b/sci-libs/ccp4-libs/metadata.xml
index 18c54916e3b4..c0432fefe855 100644
--- a/sci-libs/ccp4-libs/metadata.xml
+++ b/sci-libs/ccp4-libs/metadata.xml
@@ -1,9 +1,9 @@
 <?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>
-		<name>Justin Lecher (jlec)</name>
-	</maintainer>
+  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+    <name>Justin Lecher (jlec)</name>
+  </maintainer>
 </pkgmetadata>