From ecb0f4b1887244e43eb4b80fe6672ab00b6b8f74 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sat, 26 Nov 2011 11:00:18 +0000 Subject: [PATCH] Drop exit from source script; If present in the script, but package files are not present, you cannot log in anymore. Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64 RepoMan-Options: --force --- sci-chemistry/arp-warp-bin/ChangeLog | 9 +- sci-chemistry/arp-warp-bin/Manifest | 17 ++- .../arp-warp-bin/arp-warp-bin-7.1-r1.ebuild | 100 ++++++++++++++++++ .../arp-warp-bin/arp-warp-bin-7.1.ebuild | 6 +- 4 files changed, 118 insertions(+), 14 deletions(-) create mode 100644 sci-chemistry/arp-warp-bin/arp-warp-bin-7.1-r1.ebuild diff --git a/sci-chemistry/arp-warp-bin/ChangeLog b/sci-chemistry/arp-warp-bin/ChangeLog index 03c533ddf3ab..a36af45df76f 100644 --- a/sci-chemistry/arp-warp-bin/ChangeLog +++ b/sci-chemistry/arp-warp-bin/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-chemistry/arp-warp-bin # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/arp-warp-bin/ChangeLog,v 1.15 2011/10/16 12:24:10 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/arp-warp-bin/ChangeLog,v 1.16 2011/11/26 11:00:18 jlec Exp $ + +*arp-warp-bin-7.1-r1 (26 Nov 2011) + + 26 Nov 2011; Justin Lecher arp-warp-bin-7.1.ebuild, + +arp-warp-bin-7.1-r1.ebuild: + Drop exit from source script; If present in the script, but package files are + not present, you cannot log in anymore. 16 Oct 2011; Samuli Suominen arp-warp-bin-7.1.ebuild: amd64 restable diff --git a/sci-chemistry/arp-warp-bin/Manifest b/sci-chemistry/arp-warp-bin/Manifest index 15912f57938d..9541258802b5 100644 --- a/sci-chemistry/arp-warp-bin/Manifest +++ b/sci-chemistry/arp-warp-bin/Manifest @@ -1,19 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 AUX 7.1-setup.patch 6277 RMD160 0113b56d57a00d2daa625c540282c2e047890abf SHA1 11774b738401dcda1badfaed5614c7e620160e8b SHA256 4d4ae302589270ee73fc41d6f8231ba64969e2828578528a1bc06ff926507d06 DIST arp_warp_7.1.tar.gz 195970881 RMD160 16698d4d81c1380f0b9f0aa012dba2689c1faec0 SHA1 bcd033194770153c6ce130e18676d6d3d3a44316 SHA256 e3496283eb1d63ce0ce84b32812ababe0ac266a270918f93f333d036ba36f8c3 -EBUILD arp-warp-bin-7.1.ebuild 2682 RMD160 12b9f114a1793b9b867666b42389a49de3709319 SHA1 3a8afbd8e14ecc9b70b85ec0ee0fb90e0ef552fd SHA256 e86fd6add90b27d4b1d28243c6730d246ba8019200721d0bd7f92c4c745a506c -MISC ChangeLog 2407 RMD160 170cff9805c7d455ecf73f633c0129f15d05857a SHA1 555e91d6456d7f9edf0637dd9ce420a1a5e49e3f SHA256 ed69145c1adf528159d9b2ffde6b9811567feaea5e9d182ad8d72ac65c74ed4d +EBUILD arp-warp-bin-7.1-r1.ebuild 2739 RMD160 f0d036b0eae070ff9b33bda7cfc399fd833bdde2 SHA1 78db3fe984ca9ab0be5a03d845d6a1a844c6fe80 SHA256 79daad12b9fc054d6ae652cfbfc2db9b63f773fb052ca5bf5b1b8ef1be178083 +EBUILD arp-warp-bin-7.1.ebuild 2675 RMD160 855609cea673dc579ad5430e93278d037435b608 SHA1 1c976eda80e2aa64f50f63ebf34597e0adad1870 SHA256 377ff22315fbbc932c98af5e77666c18c6eae5146a3540770d02560149236872 +MISC ChangeLog 2664 RMD160 d0c15814e6d0924b6a525530675071b412afdf39 SHA1 25ea97a0f26b50c1ee94bddf1c9d326b2bff9e15 SHA256 7a024b380cb00e63cad360f7cf882bcc475bacc6a96ea30dbebbe245a6afad96 MISC metadata.xml 167 RMD160 ea4003a55d6e2079381a540c441fc59cde29025a SHA1 3bc6dc4dd68f7de22828138e62aa117387b1765d SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJOmszhAAoJEEdUh39IaPFN5hwH/j7Tp6TkS9Vn9fB1F0E5CE82 -geYypO8OG3f5JIpizpil9dXBI57Opp3vx7+wBzOdBErUvSdn0xMfKmn8WlowhbLo -YN/lzesd9cKBdMlGQ7vR8YQIVGHlIW6zJTjJNpRAKZF1kJwNBGbxs36LCKGzS1Ql -BUr+XwZa+ggHAUVVy/XS3xfMKIB5dbTzNfMJ+eetWBl/00iqlKkrW2hLqFtXmRk/ -v7XS/pg5jR6NrKkTNLppZbFzJqWxjAfy2bt9uL+RPLlrO9Mj45dni7nHw9JiNbco -ssBbqGOocEg/zSf09ljo1xuoqsmDB7lrRTKz5GM37JVFfqTOX+vNrjIutbEf/GA= -=X115 +iEYEAREKAAYFAk7QxtIACgkQgAnW8HDreRZcuACgpf3qYjOh9sqWXPvYiJPBqGWI +4noAnAngA65tT0UNSPzcpH8dnOUoD/KL +=wsOA -----END PGP SIGNATURE----- diff --git a/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1-r1.ebuild b/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1-r1.ebuild new file mode 100644 index 000000000000..a09f436ef708 --- /dev/null +++ b/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1-r1.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1-r1.ebuild,v 1.1 2011/11/26 11:00:18 jlec Exp $ + +EAPI=3 + +PYTHON_DEPEND="2" + +inherit eutils prefix python + +MY_P="arp_warp_${PV}" + +DESCRIPTION="Software for improvement and interpretation of crystallographic electron density maps" +SRC_URI="${MY_P}.tar.gz" +HOMEPAGE="http://www.embl-hamburg.de/ARP/" + +LICENSE="ArpWarp" +SLOT="0" +KEYWORDS="-* amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=" + app-shells/tcsh + >=sci-chemistry/ccp4-6.1.3 + sys-apps/gawk + virtual/jre + virtual/opengl + x11-libs/libX11" +DEPEND="" + +RESTRICT="fetch" + +S="${WORKDIR}/${MY_P}" + +pkg_nofetch(){ + elog "Fill out the form at http://www.embl-hamburg.de/ARP/" + elog "and place ${A} in ${DISTDIR}" +} + +pkg_setup() { + python_set_active_version 2 +} + +src_prepare() { + epatch "${FILESDIR}"/${PV}-setup.patch + eprefixify "${S}"/share/arpwarp_setup_base.* + sed "s:PYVER:$(python_get_version):g" -i "${S}"/share/arpwarp_setup_base.* + python_convert_shebangs $(python_get_version) flex-wARP-src-354/*py + sed -e "s:/usr/:${EPREFIX}/usr/:g" -i flex-wARP-src-354/*py || die + sed -e '/exit/d' -i "${S}"/share/arpwarp_setup_base.* || die +} + +src_install(){ + PYVER=$(python_get_version) + m_type=$(uname -m) + os_type=$(uname) + + insinto /opt/${PN}/byte-code/python-${PYVER} + doins "${S}"/flex-wARP-src-354/*py || die + + exeinto /opt/${PN}/bin/bin-${m_type}-${os_type} + doexe "${S}"/bin/bin-${m_type}-${os_type}/* && \ + doexe "${S}"/share/*sh || die + + insinto /opt/${PN}/bin/bin-${m_type}-${os_type} + doins "${S}"/share/*{gif,bmp,XYZ,bash,csh,dat,lib,tbl,llh} || die + + insinto /etc/profile.d/ + newins "${S}"/share/arpwarp_setup_base.csh 90arpwarp_setup.csh && \ + newins "${S}"/share/arpwarp_setup_base.bash 90arpwarp_setup.sh || die + + dodoc "${S}"/README manual/UserGuide${PV}.pdf || die + dohtml -r "${S}"/manual/html/* || die +} + +pkg_postinst(){ + python_need_rebuild + python_mod_optimize /opt/${PN}/byte-code/python-${PYVER} + + testcommand=$(echo 3 2 | awk '{printf"%3.1f",$1/$2}') + if [ $testcommand == "1,5" ];then + ewarn "*** ERROR ***" + ewarn " 3/2=" $testcommand + ewarn "Invalid decimal separator (must be ".")" + ewarn "You need to set this correctly!!!" + echo + ewarn "One way of setting the decimal separator is:" + ewarn "setenv LC_NUMERIC C' in your .cshrc file" + ewarn "\tor" + ewarn "export LC_NUMERIC=C' in your .bashrc file" + ewarn "Otherwise please consult your system manager" + fi + + grep -q sse2 /proc/cpuinfo || einfo "The CPU is lacking SSE2! You should use the cluster at EMBL-Hamburg." + echo +} + +pkg_postrm() { + python_mod_cleanup /opt/${PN}/byte-code/python-${PYVER} +} diff --git a/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1.ebuild b/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1.ebuild index 5a3fa0f25430..3f251c623d3d 100644 --- a/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1.ebuild +++ b/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1.ebuild,v 1.12 2011/10/16 12:24:10 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1.ebuild,v 1.13 2011/11/26 11:00:18 jlec Exp $ EAPI=3 @@ -82,7 +82,7 @@ pkg_postinst(){ ewarn " 3/2=" $testcommand ewarn "Invalid decimal separator (must be ".")" ewarn "You need to set this correctly!!!" - ewarn + echo ewarn "One way of setting the decimal separator is:" ewarn "setenv LC_NUMERIC C' in your .cshrc file" ewarn "\tor" @@ -91,7 +91,7 @@ pkg_postinst(){ fi grep -q sse2 /proc/cpuinfo || einfo "The CPU is lacking SSE2! You should use the cluster at EMBL-Hamburg." - einfo + echo } pkg_postrm() { -- 2.26.2