Fixed installation issue when csh is not present, #303463; fix src_test, #320345...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sci-chemistry/autodock/ChangeLog b/sci-chemistry/autodock/ChangeLog
index ff9c6f9528e6e3957ff78713e7e8012ea3d2ba8e..b91d07c668dc5a24af5a6d199457e5e9bbf2bd82 100644 (file)
--- 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/Manifest b/sci-chemistry/autodock/Manifest
index 85d639df4dfa7b63b0a7f8675e037b517ae3b963..e63358b0f96bd4a9bc90f61ae01da3acad4ee020 100644 (file)
--- a/sci-chemistry/autodock/Manifest
+++ b/sci-chemistry/autodock/Manifest
@@ -2,17 +2,14 @@
 Hash: SHA1
 
 AUX 4.0.1-gcc-4.3.patch 288 RMD160 baa74a563ff1307f10f7a8231884004c62f42598 SHA1 7316ded087e79b04a9c5cd0437ef07d7bc10a83f SHA256 1bbd84b47a93856245103e2c6ab3ed4932ab0d8909010f2e43fd62bdf680936c
-DIST autodocksuite-4.0.1-src.tar.gz 1898212 RMD160 af2709277c1e9d36602c7100091b707937aa32d8 SHA1 3c43d9cf67790b47803a37e9e8ace893018cf874 SHA256 8265e313c575dbb4e284dab90af2ed9b8f34dfdeb45508e652ca5fa9a09dc11b
 DIST autodocksuite-4.2.3-src.tar.gz 3680365 RMD160 8b0712d5a70611830d49af412cf3b33304562d91 SHA1 cd0d89624f729ea555480713f7b07464dc2d4908 SHA256 e401ed7e15b3dc0fbcda4e90931631e98e22eed2fe7f67b98cdc9c419bbf3a88
-EBUILD autodock-4.0.1-r1.ebuild 1779 RMD160 97bf7f90b4a2fe0b2591852a3ff8b493e191358f SHA1 db503745862b6ccdd56cb743254dcb8bb65958d4 SHA256 088749dcf8ace7b293e39269b7f7295f97a05b7cfaf07728c59561e1c198737a
-EBUILD autodock-4.0.1.ebuild 1138 RMD160 a1ba78e2bd89663670b4d6f8582c22d04ea07b37 SHA1 60f811a48b2d497698d0c890ca6db093eff826dd SHA256 fc9045111ea03f1aaa0340b002384320a8cce2204b1723b4d423af5a6771326d
-EBUILD autodock-4.2.3.ebuild 1729 RMD160 ef4c0d0229835dee862b344c48044ede5cd75747 SHA1 6148392983169b3d9562c5acd04ca06483760456 SHA256 9a07d0b5719bd86293a7b90adf8a809a038cde61d0abb2dd17001aa0caee8c1e
-MISC ChangeLog 1225 RMD160 1ea5654061241393ffa05d4ee3652877f99dc1da SHA1 570c9935b940ee026a2e24f85990028e995a1215 SHA256 777afca9ff3a63f0dfe700ca8bb56182b7c2ad3c84c3b204eee52b3c8a3c873d
+EBUILD autodock-4.2.3-r1.ebuild 1990 RMD160 06dd1a2ce4958a5d383c1591c1691d85747ba008 SHA1 3426cde34a67f6d0ff1e34aca043e1e167364819 SHA256 0411a5ebb552cc397c98f9250106be798a0213674503ae6027aff85a474648d3
+MISC ChangeLog 1534 RMD160 3a4d3272cf7f5ae8f9be04723c3b94f97f61e0ad SHA1 51dbd9d926d927106e1b1c86da742beab8133af4 SHA256 adeab4948ed6d8b67afe5391c9e1d0dc6d931f8d631a43573777547d5f0ef6dc
 MISC metadata.xml 167 RMD160 ea4003a55d6e2079381a540c441fc59cde29025a SHA1 3bc6dc4dd68f7de22828138e62aa117387b1765d SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAktqxZ8ACgkQ5BmOA85PVLiC7QCfTiBC5XQbVTU+a3JtbiuRFlVj
-KuAAnRwVSU2fiJcj4HN9MXz3aWHohuQ4
-=bnth
+iEYEARECAAYFAkwkh8gACgkQgAnW8HDreRY19ACfYkCEjo9Vbvoz2T+/GoPUVo4Q
+iUkAnj2SkEC21fJPvejGy8OwV5nE2yhj
+=GyOx
 -----END PGP SIGNATURE-----

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 (file)
index 5d84dfb..0000000
--- 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 (file)
index 7805ff6..0000000
--- 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
similarity index 73%
rename from sci-chemistry/autodock/autodock-4.2.3.ebuild
rename to sci-chemistry/autodock/autodock-4.2.3-r1.ebuild
index 465d14e7a73c28d9f1009e4fbd0f88e52e23b7d7..dfe28fb48fc0c7c5426a2a7ed82b32343f8e7195 100644 (file)
--- 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() {