sci-libs/ccp4-libs: Bump to EAPI=5 and new python eclasses, respect AR and RANLIB, #446350; drop silly PYTHONPATH from init files, #390715

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

4 files changed, 447 insertions, 6 deletions

diff --git a/sci-libs/ccp4-libs/ChangeLog b/sci-libs/ccp4-libs/ChangeLog
index 79b3660d3f39..13ad4f5536e6 100644
--- a/sci-libs/ccp4-libs/ChangeLog
+++ b/sci-libs/ccp4-libs/ChangeLog
@@ -1,6 +1,13 @@
 # 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.54 2013/02/27 16:46:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.55 2013/05/03 16:19:50 jlec Exp $
+
+*ccp4-libs-6.1.3-r12 (03 May 2013)
+
+  03 May 2013; Justin Lecher <jlec@gentoo.org> +ccp4-libs-6.1.3-r12.ebuild,
+  +files/6.1.3-no-pypath.patch:
+  Bump to EAPI=5 and new python eclasses, respect AR and RANLIB, #446350; drop
+  silly PYTHONPATH from init files, #390715
 
   27 Feb 2013; Justin Lecher <jlec@gentoo.org> files/6.1.3-lapack.patch,
   ccp4-libs-6.1.3-r11.ebuild:
diff --git a/sci-libs/ccp4-libs/Manifest b/sci-libs/ccp4-libs/Manifest
index c23b64c6c323..77e109859748 100644
--- a/sci-libs/ccp4-libs/Manifest
+++ b/sci-libs/ccp4-libs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+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
@@ -10,6 +10,7 @@ AUX 6.1.3-glibc2.10.patch 1018 SHA256 d2a2ddf2a66738d94723b50797e279f64c8e057a3e
 AUX 6.1.3-impl-dec.patch 3957 SHA256 29b68e7ced2160ef880b03b9e7488e0d4ccf1717c5b87b582ab32f1a3eff6bce SHA512 7412a51258b0c90904d662a9726cc7629894cf644726dc04779707fae7b1930338ed6b7dc2b11608d5310359b0e64d15ca9fdb62d086f418d809cdd70c18d927 WHIRLPOOL 771d49c2aa84b960b706ab5b7a25b3e37f3f42026c71e952b7ec62bf007cf7874d311c0f86de6087760e0c692ca5239d43d5063a0b57c4a200515862f2fa0c4f
 AUX 6.1.3-lapack.patch 21644 SHA256 3b6a1cbcd2fbdf1802f0ac34e21b8d6be0925e988ddabecc9fa6a757367d3a17 SHA512 8ccb59597d925f8ada3130d3bcbb2865b8b69d0ef45f2803847a651a088e4f1009b3b765475ea8737d19a6bc3265f16c3f0bfefcc5d64bd9cc17ef14c505c755 WHIRLPOOL 3824916eb045f9eceb921cf1d223efb58fd9d45e36fa43e17ccf6fe95c6f022ebf082adae0388d2a26a0f0c6de8abb76ee9a2b13b28c3392f7b5669e236fddac
 AUX 6.1.3-link-proberly.patch 8282 SHA256 f6623dfb0d270e5fbffe03f95b23c967ec8da34b3d0a1c5262941979a965f9ea SHA512 8a65f74fbb64026a399944da37d454e36f01896b8f9c362d6aa0ad91bafd90ff88f1f288b3c66f8c1ad62445363fb819d3fbf23de69ce5db47adf093686b56c1 WHIRLPOOL 1a5e8d36a4d1b5c8f6f7d61d03d45af4dbec7a4dabd9f13ccab35311f57212daadd1729ea4f190b80f1bef29c48af532d38cf75e2dc12b480b451918b0ce5c08
+AUX 6.1.3-no-pypath.patch 2718 SHA256 29e84941ccae25e6201f73996225db41d28ee39192b56b5c99f35a733041136a SHA512 a372cdaeee5b98e107c5648bf4f43ad67589add6f9342b6beb7a5253e9cbf47b469ce02b12752e5aa329b0ff0b9f6cb5fedb8b9cbe858884cd6be3ab3111f605 WHIRLPOOL a6e37b6e1f533314dd9509f58713b8c04d2ef012fa1f5b460c02b1e7b431551501ea3134338550aeba4164aade3d32eb7cfab317de93881abf830360258f099d
 AUX 6.1.3-noinstall.patch 5188 SHA256 22d96aea9d3d5e6e090713e610b35bdb34eaff9157c41687b47294f0d62ccff7 SHA512 c965f2d31abab4cd8a29281009d628d15c94ab2ec0323aa55aa98b96b4b79515f78f0df377c9e872db8ef6d732ce469cfd877a3fdee8e9076d84457d31aa8ceb WHIRLPOOL 02f576fa879b844a5fe3b48bed34aafc578ac84cd2073a3a7a8ce712cd15b50a6a03080dda3889f4604a19df97300c44ef28d8b5158320750e5164184a0dfce3
 AUX 6.1.3-overflows.patch 904 SHA256 e5c62922daf832b62e9ea1e14a2be0d54c88b035b78b5831eee07025dff9222a SHA512 eeb9d160f6c63b224910eb7db73d599c0adbf60adcd654d3b4b05bb3f8214dc99684ba1ad81e5b1147dbd4f3f8356d2d4c7cf366e8ecf464ef4e03347fe2da04 WHIRLPOOL 52dbdc4ccd0f8f96fb9b561d94f0d66d97a29e9df22c35b9fe74d6263ccba96dffa432859783ca7edfdfec91ff2d9da53bb4c791b2350d8f31db5bdfb793c875
 AUX 6.1.3-unbundle-libs-ng.patch 13925 SHA256 e24757ac37a173fc501f1036e283f048faf7705b28cb8345492c4a8683a37e90 SHA512 b2f1e23ce2b1e5c8efd9b53a8c2f844c6ea472582f5ed79fc43ac00347f207eb56ce3dc080f57b15d80cfe6a7d1cd7ff01b0c8b8e72bc7f403acadb3566bb5c4 WHIRLPOOL 58273fade76919bc14181025cc35ff790e1b2734c4e753dc76336be9424dfb0666c3ea76f588e1ab91fb23f5fbf6eb131d0a0fe39c2f1d16fbdfac0879c0967d
@@ -17,12 +18,13 @@ AUX 6.1.3-unbundle-libs-ng2.patch 15485 SHA256 ded20e7e5a3fd347bc852ca119b3cbe6c
 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-r11.ebuild 10952 SHA256 432924c4a519d30ec5c4b3c2c4ae5789b266b96eba9e996db6d035dd4e286fea SHA512 43d44c87dbe38a89c24c6e5cd22adab0902a79dff2be66089af36ad2e081617b756930d315ed38f12ab7503eea2482506a703b379c6ebd26257306172626139c WHIRLPOOL f9dcd018cf68de7cedeb6053cba919d4fefcf9a4f109636d794a18e21d5a13ea22712748c89facc53ac9a38b65e07cd3fe93a491e0999f13edb8191eb38ea964
-MISC ChangeLog 7992 SHA256 45976252b770f5515c304d01cd487c055b56486c4d031ef548f0f9699742ea05 SHA512 f314ca77033088a7f62f8dd9642a3f75520834e37f865748b914703915bc4d0cb67b6c9fe160a0f6466e3b4569b0b79d8646ccf2d8233cf7fdae6112b238f30b WHIRLPOOL 6ac7210031d8d735bac4b32179ce534371db53dd8fa90b6895749942b9cbd7fd4af41308b8a8e1249b5d3c2337f4954f969042a247bbb70798a207aba43b5742
+EBUILD ccp4-libs-6.1.3-r12.ebuild 11153 SHA256 b34439edb7f77ca8ab3096d83586f0ecade7708737305f20d898c3888a0c857e SHA512 a02ffee1aac9d6b56422ef88837dc67b80dc8915fc849b8bc38a5cb7b12aebb9a2a1b5c8957b12a68c14a852ca4ec1bdc26c539df7188d3201277f58723f8f23 WHIRLPOOL 04d0212c91b6e77edaccc04491115e7d753a00748d5c09f1c8b2b0b2e99e96a7c3ed866bf4d39b2eaca1d0786b1a82b5f62b24926148f9ca832dbd0fb1df904f
+MISC ChangeLog 8260 SHA256 e9f284fdd0e5dfe4052f18342a6135b22d378b3976ace30df9bb6d7f10d4bcf9 SHA512 8bd92820dfc079f0e96f6e16503294ee4f4e3dfdc369df5b0b5ab477dc3184bca6113f0312032aee7744e8f213ae5a8cd2fc60e73ff83ab79318aa840abc01df WHIRLPOOL a78bdcdf516633319acf403e27b6ae0c6798f55169d51aac35f202d3296832aff0bead8ca7cebc90ab7c2da7a131703251b37044ee0ca69dcd9bfa40ef6e9c80
 MISC metadata.xml 272 SHA256 464cdfad7e5470cd4897f4d81fb87220dfdb9b8645f720e2fcf5157a7a75fbec SHA512 3e8682fbb209895927a39021555e3a440c49e61dcce93ea1b13759e067b285c604328cff031843e3aac6528970384c8fdbf15c8edd76a421db111a3981825fa5 WHIRLPOOL fc8d5f3db9db73bb2026ca21c4448107558ac53d568c89c7c6ccc635fde460aec1bbd177a4ad770b20d35693b59fc0721c8d60aea997973db3efd6b3c3777eba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEuOHoACgkQgAnW8HDreRYxzwCggylkXdvDldgu3iddmO3DlO3Q
-f8YAn2AKsp0KPYPEGMi+ZCF8/aYlNjaw
-=3ina
+iEYEAREKAAYFAlGD46cACgkQgAnW8HDreRZlbACaA61WhdJM0aGDED7QiMzd16Ur
+AWAAn3pwxokPOPpKeCnWPpjf6ZqlNSra
+=MT0K
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r12.ebuild b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r12.ebuild
new file mode 100644
index 000000000000..1201077fd3b1
--- /dev/null
+++ b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r12.ebuild
@@ -0,0 +1,345 @@
+# Copyright 1999-2013 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-r12.ebuild,v 1.1 2013/05/03 16:19:50 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit autotools eutils fortran-2 gnuconfig multilib python-single-r1 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-${PV}-r10
+	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}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+MAKEOPTS+=" -j1"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	tc-export PKG_CONFIG RANLIB AR
+
+	sed \
+		-e "/^AR/s:ar:$(tc-getAR):g" \
+		-i lib/src/Makefile.in src/Makefile.in src/ccp4mapwish_/Makefile.in lib/ccif/Makefile.in || die
+
+	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
+
+	# proto type changing in version 0.9.2.2
+	ccp_patch "${FILESDIR}"/${PV}-cbf.patch
+
+	# proto type changing in version 0.9.2.2
+	ccp_patch "${FILESDIR}"/${PV}-no-pypath.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 -e '/libdir/s:ssm::g' -i Makefile.in || die
+	find ./lib/src/mmdb ./lib/ssm ./lib/clipper ./lib/fftw lib/lapack -delete || die
+}
+
+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 || die
+
+	# We agree to the license by emerging this, set in LICENSE
+	sed -i \
+		-e "s~^\(^agreed=\).*~\1yes~g" \
+		"${S}"/configure || die
+
+	# 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* || die
+
+	# 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 $($(tc-getPKG_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 DESTDIR="${D}" onlylib
+}
+
+src_install() {
+	# Set up variables for build
+	source "${S}"/include/ccp4.setup-sh
+
+	emake \
+		DESTDIR="${D}" \
+		includedir="${EPREFIX}/usr/include" \
+		library_includedir="${EPREFIX}/usr/include" \
+		install
+
+	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}
+		else
+			insinto /usr/$(get_libdir)
+			doins ${file}
+		fi
+	done
+
+	prune_libtool_files
+
+	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
+	newins "${S}"/include/ccp4.setup-sh 40ccp4.setup.sh
+	rm -f "${S}"/include/ccp4.setup*
+
+	# Data
+	insinto /usr/share/ccp4/data/
+	doins -r "${S}"/lib/data/{*.PARM,*.prt,*.lib,*.dic,*.idl,*.cif,*.resource,*.york,*.hist,fraglib,reference_structures}
+
+	# Environment files, setup scripts, etc.
+	rm -rf "${S}"/include/{ccp4.setup*,COPYING,cpp_c_headers} || die
+	insinto /usr/share/ccp4/
+	doins -r "${S}"/include
+
+	dodoc "${S}"/lib/data/*.doc
+	newdoc "${S}"/lib/data/README DATA-README
+}
+
+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/files/6.1.3-no-pypath.patch b/sci-libs/ccp4-libs/files/6.1.3-no-pypath.patch
new file mode 100644
index 000000000000..6a0cb5be7c3d
--- /dev/null
+++ b/sci-libs/ccp4-libs/files/6.1.3-no-pypath.patch
@@ -0,0 +1,87 @@
+ include/ccp4.setup-bash |  8 --------
+ include/ccp4.setup-csh  | 11 -----------
+ include/ccp4.setup-sh   |  8 --------
+ include/ccp4.setup-zsh  | 10 ----------
+ 4 files changed, 37 deletions(-)
+
+diff --git a/include/ccp4.setup-bash b/include/ccp4.setup-bash
+index 3a67791..80aef23 100755
+--- a/include/ccp4.setup-bash
++++ b/include/ccp4.setup-bash
+@@ -185,14 +185,6 @@ else
+   fi
+ fi
+ 
+-#Python path for the subprocess fixed module
+-
+-if [ $ccp4_first_in_path -eq 1 ]; then
+-    setenv PYTHONPATH ${CCP4}/share/python:${PYTHONPATH}
+-else
+-    setenv PYTHONPATH ${PYTHONPATH}:${CCP4}/share/python
+-fi
+-
+ ### PLOT_COMMAND PRINT_COMMAND for the XCCPJIFFY programs to compile ###
+ setenv PLOT_COMMAND   'lp -s -dmicrolaser'  
+ setenv PRINT_COMMAND  'lp -s -denscript'    
+diff --git a/include/ccp4.setup-csh b/include/ccp4.setup-csh
+index 10d3ab8..72cc479 100755
+--- a/include/ccp4.setup-csh
++++ b/include/ccp4.setup-csh
+@@ -177,17 +177,6 @@ else
+   endif
+ endif
+ 
+-#Python path for the subprocess fixed module
+-if (${?PYTHONPATH}) then
+-  if ($ccp4_first_in_path) then
+-      setenv PYTHONPATH ${CCP4}/share/python:${PYTHONPATH}
+-  else
+-      setenv PYTHONPATH ${PYTHONPATH}:${CCP4}/share/python
+-  endif
+-else
+-    setenv PYTHONPATH ${CCP4}/share/python
+-endif
+-
+ ### PLOT_COMMAND PRINT_COMMAND for the XCCPJIFFY programs to compile ###
+ setenv PLOT_COMMAND   'lp -s -dmicrolaser'  
+ setenv PRINT_COMMAND  'lp -s -denscript'    
+diff --git a/include/ccp4.setup-sh b/include/ccp4.setup-sh
+index 2298bba..44643ab 100755
+--- a/include/ccp4.setup-sh
++++ b/include/ccp4.setup-sh
+@@ -225,14 +225,6 @@ test -r $CCP4/include/ccp4.msg && cat $CCP4/include/ccp4.msg
+ 
+ ################### EXPERIENCED USERS STOP HERE #####################
+ 
+-#Python path for the subprocess fixed module
+-
+-if test $ccp4_first_in_path -eq 1; then
+-    export PYTHONPATH=${CCP4}/share/python:${PYTHONPATH}
+-else
+-    export PYTHONPATH=${PYTHONPATH}:${CCP4}/share/python
+-fi
+-
+ ################### THE REST SHOULDN'T NEED EDITING #####################
+ 
+ ### dbCCP4i database handler setup ###
+diff --git a/include/ccp4.setup-zsh b/include/ccp4.setup-zsh
+index 660b35b..e453db9 100755
+--- a/include/ccp4.setup-zsh
++++ b/include/ccp4.setup-zsh
+@@ -154,16 +154,6 @@ export CCP4_BIN=$CBIN
+ CLASSPATH=$CBIN:$CLASSPATH               # edit this if necessary
+ export CLASSPATH
+ 
+-#Python path for the subprocess fixed module
+-
+-if ($ccp4_first_in_path) then
+-    PYTHONPATH=${CCP4}/share/python:${PYTHONPATH}
+-    export PYTHONPATH
+-else
+-    PYTHONPATH=${PYTHONPATH}:${CCP4}/share/python
+-    export PYTHONPATH
+-fi
+-
+ ### PLOT_COMMAND PRINT_COMMAND for the XCCPJIFFY programs to compile ###
+ export PLOT_COMMAND='lpr'  
+ export PRINT_COMMAND='lpr'