Drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

3 files changed, 22 insertions, 215 deletions

diff --git a/sci-libs/cctbx/ChangeLog b/sci-libs/cctbx/ChangeLog
index 7bde91a04740..b2e804aa050d 100644
--- a/sci-libs/cctbx/ChangeLog
+++ b/sci-libs/cctbx/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/cctbx
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v 1.37 2015/04/21 17:50:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v 1.38 2015/04/22 06:58:03 jlec Exp $
+
+  22 Apr 2015; Justin Lecher <jlec@gentoo.org> -cctbx-2010.03.29.2334-r6.ebuild:
+  Drop old
 
   21 Apr 2015; Pacho Ramos <pacho@gentoo.org> cctbx-2010.03.29.2334-r7.ebuild:
   x86 stable wrt bug #529534
diff --git a/sci-libs/cctbx/Manifest b/sci-libs/cctbx/Manifest
index eef954aa4414..636148d875dc 100644
--- a/sci-libs/cctbx/Manifest
+++ b/sci-libs/cctbx/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 2010.03.29.2334-boost.patch 18175 SHA256 f6a8a246dfd42e7981687802a0e00d933759d3c749c0344bfbfbfde12814f4d7 SHA512 e722312a878be229a24269471902bd1febe98c5510bfc50e1ba3a841c1a0228cdb7964e69703083850052e49e91899b229bc3543d90485ba50e79e7eceb11e2e WHIRLPOOL f87a78d93a94fb93fd243269fe1e5c0cfcc6beff02d936d2b609cece6ea9fbe08b5201c354f982df6ef5f09b84032a25b8a3cac357abf6279c6b5a5b2468e0e7
 AUX 2010.03.29.2334-clipper.patch 2209 SHA256 e7c8bf813bedd3b67de5ce727d5f75e9635568769373f237e7b624ed143351b1 SHA512 cb3fc1f89d9a4008b4add3ef2ecf5b2aa8e875e41e169916859a8e508858bc9548023bb552d4cb3794c46788eaa325c75bb858c7c08799b87f2e31bef57cf69a WHIRLPOOL 84b427cfc9ddba9891197f8185123a8f5831e6a9beaafe58ced2f52ea3d492217cbb5264f3118ec9f27b12746141b788e9464a66b00c56f54b786bd3aada9351
@@ -9,14 +9,25 @@ AUX 2010.03.29.2334-gcc-4.7.patch 6747 SHA256 ab01875a97ece09e4d729bb435b67960ef
 AUX 2010.03.29.2334-soname.patch 5177 SHA256 dd4ea6dbf34c1b2d9572adec5a33fe6a73b1a99e8c4364123e69382bb161ce74 SHA512 3f62bc52c32c3573fbcd90fc49234498d7c28fc0dc7a68497041af35da46cbd9cb386b9b13ed2269a5728e87526987ac49179e38b2bcb6a355ee4c180e9f7861 WHIRLPOOL cdd533d510defea65388ccd25c63055fc2798edd4222d1aa1b0201671d2c074107a151edc5ba62b5677908d5c045f98f26cd5ae5574e9fc83919632c4258c77c
 AUX 2010.03.29.2334-tst_server.py.patch 774 SHA256 df058d16d2dc5beaac9f1a1fbf2e640994c7e881d449eb01ac338dadbfb15ac3 SHA512 490918c3139355ecb0430d908ccafc6d66cb25ec7df285cedbb983d80f3473425c72d0766262c557c0c783626479edd2528eaf83b1decdeba416dde193472d5a WHIRLPOOL cc15b95661d8cba66bc3e06b3589188582c5e637faa860c70a4bbc53450a02afb36ec14c51796fe34441bd74842c06c938e22258a5ea5bf3264237a7afc169bc
 DIST cctbx-2010.03.29.2334.tar.gz 15570372 SHA256 e1fae804caaf8593c7a3f32e4544046f4c00293063d9099721578cc8fbd17213 SHA512 7aafd647db49925fc1df16a9ccb4f8caf040b4d73e9601731eb3da3051467c3005fb2cc95b498501c899cd1bd378e6a6135cffe734cb4f93eccacbc13575b2c8 WHIRLPOOL 5954ce6ae8bd3a29deaa5d7f8b354d9468a87a01fc7d6aa9a0545e1d323b1ee209348e88270e2f50d7985b1916a7b5bf687dfdf871013d3ec35925fde253d9a0
-EBUILD cctbx-2010.03.29.2334-r6.ebuild 6049 SHA256 1d47b6df4ff018bfa5676ce447f9166b522ddace9ef392ad31b33f49416602e5 SHA512 16ea8a628f1b887ecfb01ab9c923a68597581ca26778d5538b0af2e18fedef63b03df7734897a8805b4a05e8c4efb021a527fafaf3cdbd717ef56d0eba086aa8 WHIRLPOOL 41b2a4ca47931248ca69b2acaa330d223e48d7da6faf67e1ea7622efd1389fef51cc48db7deb9532a9b0aa1a148dfd322e89cec260a0ce280f8244db25e351a2
 EBUILD cctbx-2010.03.29.2334-r7.ebuild 5781 SHA256 a373a15b6c3087ea69f5c31c87ae8aaac31707bd84953f83f775f56109352a51 SHA512 f388e2318381e6af18f4376c0dd73fa5692e2ebea6dc83e494942ac7a38c265b7a9b48cd08ca4946115f64431b8e39c31d31fb2e2f521f5ff0b00d23c77ea316 WHIRLPOOL 12fcea9d4f638fe045ab220c793594e15cc5863976c0840af7d5fa91dd12604399018dad3f02b78b00909995c40cdf206147b8df33f71219c3add4dcaef054d6
-MISC ChangeLog 6626 SHA256 12c60f22f7c19c12ff71949cb60b6c68bac7d4d7622a43c1a068d03cc4f9ae28 SHA512 cb93b2b049ca5e3beb1fdcfb4bb99f71c8b3796f0125516b1db60ae1077609bf18354b6b18c27501e470378f60f010aa3422aeccd3211ec1d6ba500198a84a01 WHIRLPOOL 6f6a544e0919a8801f0198fae4010c9a8ae2792e65aca8c59ced82e0675a87632f4bcec58e2c291d95b6c18200f7d84314d6ed0ad23f25fef8d035f64aa9949d
+MISC ChangeLog 6718 SHA256 d2e60ee0c34d38989854655108902403a9024c9e6622a3a78785fce01e3096d2 SHA512 334fde1d10d1f0ae506319d2e73a64b5d3afcdb56f5a98e160a88b5fe4ab17a4a16f426f7edb2943d35c9a57596c12b9ddb7380c88f0707bc8d380122e4a5d81 WHIRLPOOL 78c6492249b9d6209325180edfa8e5cb65244cd1295de3a3efc227ca23f2c4e0f98519002c91030705844cd24cb64d0e4c4177a6726618bc5a9a70addf1e2f84
 MISC metadata.xml 773 SHA256 6d424e7d549ba25e0ed4efaa2114679116006dca9592bac473a78baef48af1f0 SHA512 81ddc8d7808b9ca772955e865e49bcff68fc686672679758433d0d3bf8d27047f9dfeb29b36e72bd0b5c86c4a1e50ecd01bce96c71d0790084a0ef5894094899 WHIRLPOOL dee8ca57313ed6cecef6f4108f06feb614fe4f450f2feeacf88a9da534a0a6ebb7b791abb19fed1f9cff771579fec96883a63caf6d4b2c3b3c2e8cf6ff799746
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlU2jdcACgkQCaWpQKGI+9S3lACePZvLtEGIO/qPkecfLtK40Flq
-ETkAn2I5SF9lYVTrHN0Okt+TAICSW02k
-=Sh73
+iQJ8BAEBCgBmBQJVN0Z8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirejEP/ir2HyrUidTzA1NwzCu3dH5g
+0yzkViXqJQmf7pb8uhcn3dRmktlUu5gQZTKoDrnayWxzLsOeLnb0lGNw/h8F3Ij3
+aCU6jz700CSXfRmSys2D5jZpzTs50py4/juw+3vyA6jG6JItVqT6bxeak8nWtClm
+CQVJ1ByQqc/fdxU9ED3f5gx4CQAO50SL5qMRv6PAuLYasjp21C2zb8ykCPvbwguw
+LzU4iYG9sUfPVHVJRhN0kCSKBVo0E3gNUH8I9MB+F+GIOmkq7uAM37AmmTLfDFis
+iWG2Q+lx5IbE9ABwbWMaIoXV7Thsvvz+fp9VbCtLYE2d3ouaAeKpazn6KowUjqjr
+fycKj03rbxjeKxfyN+WUn3cgNk7y0Ekzel23yuaWDJrag/x5bf0o2fu/6LeDfqX7
+nlt39Yj+fe8sjs+hr28sFxE8S2pPvxiQe1Oj7sSeqKfVyWZ2JKRKueFwb6krlDyc
+0PUI1L/hneT3NMeDyT265EX4JODzzbvdfLK5twmcmfOND3jk0u/SF46T92gkfoXE
+CETgoS7u68COl/td0Ekn56cLSsBbgBc7uM6s0oOUT6RPkJd5kqQkcTMipt/ehO81
+szNtlUfAFd3s/UEIYGeGXKPyYX519Od4sKxLPXZayP3OmqwlYaDfauPEmmLSN8Hp
+oPDZIsvpDhIShl906H5m
+=0P38
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild b/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild
deleted file mode 100644
index e15d16e75a46..000000000000
--- a/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild,v 1.10 2015/04/03 13:41:28 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-
-inherit eutils fortran-2 multilib prefix python toolchain-funcs
-
-MY_PV="${PV//./_}"
-
-DESCRIPTION="Computational Crystallography Toolbox"
-HOMEPAGE="http://cctbx.sourceforge.net/"
-SRC_URI="http://cci.lbl.gov/cctbx_build/results/${MY_PV}/${PN}_bundle.tar.gz -> ${P}.tar.gz"
-
-LICENSE="cctbx-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="+minimal openmp threads"
-
-RDEPEND="
-	>=dev-libs/boost-1.48[python]
-	sci-libs/clipper
-	sci-libs/fftw:3.0
-	!minimal? (
-		sci-chemistry/cns
-		sci-chemistry/shelx )"
-DEPEND="${RDEPEND}
-	!prefix? ( >=dev-util/scons-1.2 )"
-
-S="${WORKDIR}"
-MY_S="${WORKDIR}"/cctbx_sources
-MY_B="${WORKDIR}"/cctbx_build
-
-pkg_setup() {
-	use openmp && FORTRAN_NEED_OPENMP="1"
-	if use openmp && ! tc-has-openmp; then
-		ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 and icc"
-		ewarn "If you want to build ${PN} with OpenMP, abort now,"
-		ewarn "and switch CC to an OpenMP capable compiler"
-		FORTRAN_NEED_OPENMP=1
-	fi
-	fortran-2_pkg_setup
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	local opts
-	local optsld
-
-	epatch \
-		"${FILESDIR}"/${PV}-tst_server.py.patch \
-		"${FILESDIR}"/${PV}-boost.patch \
-		"${FILESDIR}"/${PV}-clipper.patch \
-		"${FILESDIR}"/${PV}-flags.patch \
-		"${FILESDIR}"/${PV}-soname.patch \
-		"${FILESDIR}"/${PV}-gcc-4.6.patch \
-		"${FILESDIR}"/${PV}-gcc-4.7.patch
-
-	eprefixify "${MY_S}"/scitbx/libtbx_refresh.py
-
-	rm -rf "${MY_S}/boost" "${MY_S}/PyCifRW" || die
-	if ! use prefix; then
-		rm -rvf "${MY_S}/scons"
-		echo "import os, sys; os.execvp('scons', sys.argv)" > "${MY_S}"/libtbx/command_line/scons.py
-	fi
-
-	find "${MY_S}/clipper" -name "*.h" -delete || die
-
-	sed \
-		-e "/LIBS/s:boost_python:boost_python-${PYTHON_ABI}:g" \
-		-i "${MY_S}"/boost_adaptbx/SConscript "${MY_S}"/scitbx/boost_python/SConscript || die
-}
-
-src_configure() {
-	local compiler
-	local myconf
-
-	myconf="${MY_S}/libtbx/configure.py"
-
-	compiler=$(expr match "$(tc-getCC)" '.*\([a-z]cc\)')
-	myconf="${myconf} --compiler=${compiler}"
-
-	# Additional USE flag usage
-	check_use openmp
-	myconf="${myconf} --enable-openmp-if-possible=${USE_openmp}"
-
-	use threads && USEthreads="--enable-boost-threads" && \
-		ewarn "If using boost threads openmp support is disabled"
-
-	myconf="${myconf} ${USE_threads} --scan-boost --use_environment_flags"
-
-	mkdir "${MY_B}" && myconf="${myconf} --current_working_directory=${MY_B}"
-	cd "${MY_B}"
-
-	myconf="${myconf} --build=release fftw3tbx rstbx smtbx mmtbx clipper_adaptbx fable"
-	einfo "configuring with ${python} ${myconf}"
-
-	$(PYTHON) ${myconf} || die "configure failed"
-}
-
-src_compile() {
-	local makeopts_exp
-
-	cd "${MY_B}"
-
-	makeopts_exp=${MAKEOPTS/j/j }
-	makeopts_exp=${makeopts_exp%-l[0-9]*}
-
-	source setpaths_all.sh
-
-	einfo "compiling with libtbx.scons ${makeopts_exp}"
-	libtbx.scons ${makeopts_exp} .|| die "make failed"
-}
-
-src_test(){
-	source "${MY_B}"/setpaths_all.sh
-	libtbx.python $(libtbx.show_dist_paths boost_adaptbx)/tests/tst_rational.py && \
-	libtbx.python ${SCITBX_DIST}/run_tests.py ${MAKEOPTS_EXP} && \
-	libtbx.python ${CCTBX_DIST}/run_tests.py  ${MAKEOPTS_EXP} \
-	|| die "test failed"
-}
-
-src_install(){
-	local lib baselib
-#	find cctbx_build/ -type f \( -name "*.py" -o -name "*sh" \) -exec \
-#	sed -e "s:${MY_S}:${EPREFIX}/usr/$(get_libdir)/cctbx/cctbx_sources:g" \
-#	    -e "s:${MY_B}:${EPREFIX}/usr/$(get_libdir)/cctbx/cctbx_build:g"  \
-#	    -i '{}' \; || die "Fail to correct path"
-
-	sed \
-		-e "s:${MY_B}:${EPREFIX}/usr:g" \
-		-e "s:${MY_S}:${EPREFIX}/$(python_get_sitedir):g" \
-		-i "${MY_B}/libtbx_env" || die
-
-	insinto /usr/share/cctbx
-	doins "${MY_B}/libtbx_env" || die
-
-	ebegin "removing unnessary files"
-		rm -r "${S}"/cctbx_sources/{clipper,ccp4io,ucs-fonts,TAG} || die "failed to remove uneeded scons"
-		find -O3 "${S}" -type f \
-			\( -name "*conftest*" -o -name "*.o" -o -name "*.c" -o -name "*.f" -o -name "*.cpp" -o \
-			-name "*.pyc" -o -name "SCons*" -o -name "Makefile" -o -name "config.log" \) -delete || die
-		find "${S}" -type d -empty -delete || die
-		find "${MY_B}" -maxdepth 1 -type f -delete || die
-	eend
-
-	dobin "${MY_B}"/bin/* || die
-	rm -rf "${MY_B}/bin"
-	dolib.so "${MY_B}"/lib/lib* || die
-	mv "${ED}"/usr/$(get_libdir)/libscitbx_min{,i}pack.so || die
-	rm -f "${MY_B}"/lib/lib*
-
-	for lib in "${ED}"/usr/$(get_libdir)/*.so; do
-		baselib=$(basename ${lib})
-		mv ${lib}{,.0.0}
-		dosym ${baselib}.0.0 /usr/$(get_libdir)/${baselib}
-	done
-
-	insinto /usr/include
-	doins -r "${MY_B}"/include/* || die
-	rm -rf "${MY_B}/include"
-
-	insinto /usr/libexec/${PN}
-	doins -r "${MY_B}"/* || die
-	find "${ED}"/usr/libexec/${PN} -type f -exec chmod 755 '{}' \;
-
-	cd "${MY_S}"
-	insinto $(python_get_sitedir)
-	doins -r * || die
-	exeinto $(python_get_sitedir)
-	doexe "${MY_B}"/lib/* || die
-	rm -rf "${MY_B}/lib"
-
-	sed \
-		-e "/PYTHONPATH/s:${MY_S}:$(python_get_sitedir):g" \
-		-e "/PYTHONPATH/s:${MY_B}:$(python_get_sitedir):g" \
-		-e "/LD_LIBRARY_PATH/s:${MY_B}/lib:${EPREFIX}/usr/$(get_libdir):g" \
-		-e "/PATH/s:${MY_B}/bin:${EPREFIX}/usr/bin:g" \
-		-e "/PATH/s:${MY_B}/exe:${EPREFIX}/usr/bin:g" \
-		-e "/exec/s:${MY_S}:$(python_get_sitedir):g" \
-		-e "/LIBTBX_BUILD/s:${MY_B}:${EPREFIX}/usr/share/cctbx:g" \
-		-e "s:${MY_B}/exe_dev/:${EPREFIX}/usr/libexec/${PN}/exe_dev/:g" \
-		-i "${ED}"/usr/bin/* || die
-
-}
-
-pkg_postinst () {
-	python_mod_optimize boost_adaptbx cbflib_adaptbx ccp4io_adaptbx cctbx chiltbx clipper_adaptbx crys3d fable fftw3tbx gltbx iotbx libtbx mmtbx omptbx rstbx scitbx smtbx spotfinder tntbx
-}
-
-pkg_postrm () {
-	python_mod_cleanup boost_adaptbx cbflib_adaptbx ccp4io_adaptbx cctbx chiltbx clipper_adaptbx crys3d fable fftw3tbx gltbx iotbx libtbx mmtbx omptbx rstbx scitbx smtbx spotfinder tntbx
-}
-
-check_use() {
-	for var in $@; do
-		if use ${var}; then
-			printf -v "USE_$var" True
-		else
-			printf -v "USE_$var" False
-		fi
-	shift
-	done
-}