Drop exit from source script; If present in the script, but package files are not present, you cannot log in anymore.

(Portage version: 2.2.0_alpha77/cvs/Linux x86_64, RepoMan options: --force)

3 files changed, 111 insertions, 4 deletions

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 <jlec@gentoo.org> 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 <ssuominen@gentoo.org> arp-warp-bin-7.1.ebuild:
   amd64 restable
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() {