Fixing all binaray wrappers

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

3 files changed, 201 insertions, 5 deletions

diff --git a/sci-libs/cctbx/ChangeLog b/sci-libs/cctbx/ChangeLog
index 5715421c5003..b502039c421d 100644
--- a/sci-libs/cctbx/ChangeLog
+++ b/sci-libs/cctbx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/cctbx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v 1.8 2010/09/12 12:26:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v 1.9 2010/12/15 20:47:48 jlec Exp $
+
+*cctbx-2010.03.29.2334-r3 (15 Dec 2010)
+
+  15 Dec 2010; Justin Lecher <jlec@gentoo.org>
+  +cctbx-2010.03.29.2334-r3.ebuild:
+  Fixing all binaray wrappers
 
   12 Sep 2010; Justin Lecher <jlec@gentoo.org>
   cctbx-2009.11.01.0123-r1.ebuild, cctbx-2010.03.29.2334-r1.ebuild,
diff --git a/sci-libs/cctbx/Manifest b/sci-libs/cctbx/Manifest
index 6c11414cf29a..bbd957c7f84a 100644
--- a/sci-libs/cctbx/Manifest
+++ b/sci-libs/cctbx/Manifest
@@ -11,12 +11,13 @@ DIST cctbx-2010.03.29.2334.tar.gz 15570372 RMD160 e543578dbe6568f5f8f80b3ce7a20b
 EBUILD cctbx-2009.11.01.0123-r1.ebuild 5728 RMD160 68c9b3bd930b3bedb4a60b5384a1a39fa617e613 SHA1 73c3421e971d094658b4093d0bfa828ed6b63a0b SHA256 1ea973959bc3889f4e552e098a72004197e695fdc2ac3512acdbdf4603fe9b2c
 EBUILD cctbx-2010.03.29.2334-r1.ebuild 5863 RMD160 99543d767b0c6ea49d7e437a43705113b7eeb20f SHA1 e6ec2fd9e31e7be10124d9367d1adc811d5f86e4 SHA256 4d3ee5fb680d9fa807366c68e100d8a3068b06211294990eb2abf8fef1ce46e0
 EBUILD cctbx-2010.03.29.2334-r2.ebuild 5604 RMD160 6423b29fd1d69c6d32fc2dadfd5173d937c47546 SHA1 804186c64519a5b86cb1ee273a27437cf84d6f72 SHA256 b598c6234cbc76e3080eb74109a1fefa1bee3ac7c7b349d79809bda22669c6b7
-MISC ChangeLog 1858 RMD160 4952e87cae003346959c93aa8bf00ec483d6b858 SHA1 74e8e948e67ce3a2bf277591a33de4fa6e636fbc SHA256 bca894643aa67aee0f578462c488cd1792ca281188140b61d75f8045554112ae
+EBUILD cctbx-2010.03.29.2334-r3.ebuild 5862 RMD160 d3bcff426aa5968d1e786865183a9ceccac55fbd SHA1 814cc914278c6d6f8e8f2ab4a116f830aa611fd1 SHA256 41a5053ee01cac8d0a0ab036378281761fa179de3b4772634ff393b2c711c082
+MISC ChangeLog 2013 RMD160 d7cae2d2e32c7dee662f1ccd25cd84f6155246b0 SHA1 c2476a3e62287c7de529c2adde25eceb403ae343 SHA256 cbb2a04da1ef23f3f134eecaa28435ba23fe3fbfecf374024ae33e99f2746203
 MISC metadata.xml 767 RMD160 c2fc3bcc534e407e6066ee98beb6878d78a0f6e9 SHA1 a653677e160cf0726e1747b06b5d0cd95e51ac5f SHA256 ef36fc1a1d5d657ba67f88b303f08eef5a1a814d22a2091c07616dc16928e3fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyMxuEACgkQgAnW8HDreRb6wQCbBoD2gzL03/zSNjSplmBZVDNH
-P00AoMFkJlT8V+hemQzwaTeSu0JOXiEL
-=aX4t
+iEYEARECAAYFAk0JKYUACgkQgAnW8HDreRYHgACeO6i3JpP6b2fcwpB8UipBHabd
+l48An2E8GfIRN3MpWFhQxlVumY7Eduf9
+=GJ50
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/cctbx/cctbx-2010.03.29.2334-r3.ebuild b/sci-libs/cctbx/cctbx-2010.03.29.2334-r3.ebuild
new file mode 100644
index 000000000000..cf6dd422db9f
--- /dev/null
+++ b/sci-libs/cctbx/cctbx-2010.03.29.2334-r3.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2010 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-r3.ebuild,v 1.1 2010/12/15 20:47:48 jlec Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2"
+
+inherit eutils 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 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+minimal openmp threads"
+
+RDEPEND="
+	>dev-libs/boost-1.39
+	sci-libs/fftw
+	!minimal? (
+		sci-chemistry/cns
+		sci-chemistry/shelx )"
+DEPEND="${RDEPEND}
+	>=dev-util/scons-1.2"
+
+S="${WORKDIR}"
+MY_S="${WORKDIR}"/cctbx_sources
+MY_B="${WORKDIR}"/cctbx_build
+
+pkg_setup() {
+	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"
+	fi
+	python_set_active_version 2
+}
+
+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
+
+	rm -rf "${MY_S}/scons" "${MY_S}/boost" "${MY_S}/PyCifRW" || die
+	find "${MY_S}/clipper" -name "*.h" -delete || die
+
+	echo "import os, sys; os.execvp('scons', sys.argv)" > "${MY_S}"/libtbx/command_line/scons.py
+}
+
+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(){
+#	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 "${S}" -type f -name "*conftest*" -delete || die "failed to remove uneeded *.o"
+		find "${S}" -type f -name "*.o" -delete || die "failed to remove uneeded *.o"
+		find "${S}" -type f -name "*.c" -delete || die "failed to remove uneeded *.c"
+		find "${S}" -type f -name "*.f" -delete || die "failed to remove uneeded *.c"
+		find "${S}" -type f -name "*.cpp" -delete || die "failed to remove uneeded *.cpp"
+		find "${S}" -type f -name "*.pyc" -delete || die "failed to remove uneeded *.pyc"
+		find "${S}" -type f -name "SCons*" -delete || die "failed to remove uneeded *.pyc"
+		find "${S}" -type f -name "Makefile" -delete || die "failed to remove uneeded *.pyc"
+		find "${S}" -type f -name "config.log" -delete || die "failed to remove uneeded *.pyc"
+		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
+	rm -f "${MY_B}"/lib/lib*
+
+	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 -rvf "${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
+}