Fixed installation issue when csh is not present, #303463; fix src_test, #320345, removed old, fixed PYTHON ABIs stuff

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 29 insertions, 127 deletions

diff --git a/sci-chemistry/autodock/ChangeLog b/sci-chemistry/autodock/ChangeLog
index ff9c6f9528e6..b91d07c668dc 100644
--- a/sci-chemistry/autodock/ChangeLog
+++ b/sci-chemistry/autodock/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-chemistry/autodock
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/autodock/ChangeLog,v 1.7 2010/02/04 13:03:15 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/autodock/ChangeLog,v 1.8 2010/06/25 10:41:06 jlec Exp $
+
+*autodock-4.2.3-r1 (25 Jun 2010)
+
+  25 Jun 2010; Justin Lecher <jlec@gentoo.org> -autodock-4.0.1.ebuild,
+  -autodock-4.0.1-r1.ebuild, -autodock-4.2.3.ebuild,
+  +autodock-4.2.3-r1.ebuild:
+  Fixed installation issue when csh is not present, #303463; fix src_test,
+  #320345; removed old, fixed PYTHON ABIs stuff
 
 *autodock-4.2.3 (04 Feb 2010)
 
diff --git a/sci-chemistry/autodock/autodock-4.0.1-r1.ebuild b/sci-chemistry/autodock/autodock-4.0.1-r1.ebuild
deleted file mode 100644
index 5d84dfb185c9..000000000000
--- a/sci-chemistry/autodock/autodock-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/autodock/autodock-4.0.1-r1.ebuild,v 1.2 2008/08/05 05:48:56 dberkholz Exp $
-
-inherit eutils
-
-MY_PN="autodocksuite"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A suite of automated docking tools"
-HOMEPAGE="http://autodock.scripps.edu/"
-SRC_URI="mirror://gentoo/${MY_PN}/${MY_P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}/src"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-gcc-4.3.patch
-}
-
-src_compile() {
-	cd autodock/
-	econf || die "AutoDock econf failed."
-	emake || die "AutoDock emake failed."
-	cd ..
-
-	cd autogrid/
-	econf || die "AutoGrid econf failed."
-	emake || die "AutoGrid emake failed."
-	cd ..
-}
-
-src_install() {
-	cd "${S}/autodock"
-	dobin autodock4 || die "Failed to install autodock binary."
-	dodoc AUTHORS ChangeLog NEWS README || die \
-			"Failed to install documentation."
-	insinto "/usr/share/autodock"
-	doins AD4_parameters.dat AD4_PARM99.dat || die \
-			"Failed to install shared files."
-
-	cd "${S}/autogrid"
-	dobin autogrid4 || die "Failed to install autogrid binary."
-}
-
-src_test() {
-	cd "${S}/autodock/Tests"
-	python test_autodock4.py || die "AutoDock tests failed."
-	cd "${S}/autogrid/Tests"
-	python test_autogrid4.py || die "AutoGrid tests failed."
-}
-
-pkg_postinst() {
-	echo
-	einfo "The AutoDock development team requests all users to fill out the"
-	einfo "registration form at:"
-	einfo
-	einfo "\thttp://autodock.scripps.edu/downloads/autodock-registration"
-	einfo
-	einfo "The number of unique users of AutoDock is used by Prof. Arthur J."
-	einfo "Olson and the Scripps Research Institude to support grant"
-	einfo "applications."
-	echo
-}
diff --git a/sci-chemistry/autodock/autodock-4.0.1.ebuild b/sci-chemistry/autodock/autodock-4.0.1.ebuild
deleted file mode 100644
index 7805ff6ec7b8..000000000000
--- a/sci-chemistry/autodock/autodock-4.0.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/autodock/autodock-4.0.1.ebuild,v 1.2 2007/06/21 14:58:03 ribosome Exp $
-
-MY_PN="autodocksuite"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A suite of automated docking tools"
-HOMEPAGE="http://autodock.scripps.edu/"
-SRC_URI="mirror://gentoo/${MY_PN}/${MY_P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}/src"
-
-src_compile() {
-	cd autodock/
-	econf || die "econf failed"
-	emake || die "build failed"
-	cd ..
-
-	cd autogrid/
-	econf || die "econf failed"
-	emake || die "build failed"
-	cd ..
-}
-
-src_install() {
-	dobin autodock/autodock4
-	dobin autogrid/autogrid4
-}
-
-pkg_postinst() {
-	echo
-	einfo "The AutoDock development team requests all users to fill out the"
-	einfo "registration form at:"
-	einfo
-	einfo "\thttp://autodock.scripps.edu/downloads/autodock-registration"
-	einfo
-	einfo "The number of unique users of AutoDock is used by Prof. Arthur J."
-	einfo "Olson and the Scripps Research Institude to support grant"
-	einfo "applications."
-	echo
-}
diff --git a/sci-chemistry/autodock/autodock-4.2.3.ebuild b/sci-chemistry/autodock/autodock-4.2.3-r1.ebuild
index 465d14e7a73c..dfe28fb48fc0 100644
--- a/sci-chemistry/autodock/autodock-4.2.3.ebuild
+++ b/sci-chemistry/autodock/autodock-4.2.3-r1.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/autodock/autodock-4.2.3.ebuild,v 1.1 2010/02/04 13:03:15 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/autodock/autodock-4.2.3-r1.ebuild,v 1.1 2010/06/25 10:41:06 jlec Exp $
 
 EAPI="2"
 
-inherit autotools eutils
+PYTHON_DEPEND="test? 2"
+
+inherit autotools eutils python
 
 MY_PN="autodocksuite"
 MY_P="${MY_PN}-${PV}"
@@ -20,19 +22,25 @@ IUSE=""
 
 S="${WORKDIR}/src"
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
 src_prepare() {
+	sed -i -e "s/\tcsh/\tsh/" \
+		autodock/Makefile.am autogrid/Makefile.am || die "sed failed"
 	for i in autodock autogrid; do
-		pushd $i
+		pushd $i &>/dev/null
 		eautoreconf
-		popd
+		popd &>/dev/null
 	done
 }
 
 src_configure() {
 	for i in autodock autogrid; do
-		pushd $i
-		econf || die "AutoDock econf failed."
-		popd
+		pushd $i &>/dev/null
+		econf
+		popd &>/dev/null
 	done
 }
 
@@ -54,10 +62,13 @@ src_install() {
 }
 
 src_test() {
+	einfo "Testing autodock"
 	cd "${S}/autodock/Tests"
-	python test_autodock4.py || die "AutoDock tests failed."
+	cp ../*.dat .
+	$(PYTHON) test_autodock4.py || die "AutoDock tests failed."
+	einfo "Testing autogrid"
 	cd "${S}/autogrid/Tests"
-	python test_autogrid4.py || die "AutoGrid tests failed."
+	$(PYTHON) test_autogrid4.py || die "AutoGrid tests failed."
 }
 
 pkg_postinst() {