diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2012-01-05 18:51:13 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2012-01-05 18:51:13 +0000 |
| commit | 6f8bf9083e972b1b569780a89e5830460e4d6c9a (patch) | |
| tree | 4b984476f1f0f790431a743b403268270adc38ce /sci-chemistry/apbs | |
| parent | New patchset with skeyinfo.c and skey.3 updated from newer NetBSD version. (diff) | |
| download | gentoo-2-6f8bf9083e972b1b569780a89e5830460e4d6c9a.tar.gz gentoo-2-6f8bf9083e972b1b569780a89e5830460e4d6c9a.tar.bz2 gentoo-2-6f8bf9083e972b1b569780a89e5830460e4d6c9a.zip | |
Fix for file collitions
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'sci-chemistry/apbs')
| -rw-r--r-- | sci-chemistry/apbs/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-chemistry/apbs/apbs-1.3-r1.ebuild | 9 | ||||
| -rw-r--r-- | sci-chemistry/apbs/apbs-1.3-r2.ebuild | 15 |
3 files changed, 24 insertions, 6 deletions
diff --git a/sci-chemistry/apbs/ChangeLog b/sci-chemistry/apbs/ChangeLog index 0c4db73650ac..2edfd3e6dae6 100644 --- a/sci-chemistry/apbs/ChangeLog +++ b/sci-chemistry/apbs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-chemistry/apbs # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.54 2012/01/04 17:25:25 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.55 2012/01/05 18:51:13 jlec Exp $ + + 05 Jan 2012; Justin Lecher <jlec@gentoo.org> apbs-1.3-r1.ebuild, + apbs-1.3-r2.ebuild: + Fix for file collitions *apbs-1.3-r2 (04 Jan 2012) diff --git a/sci-chemistry/apbs/apbs-1.3-r1.ebuild b/sci-chemistry/apbs/apbs-1.3-r1.ebuild index 014b1b0f5849..9035099080d4 100644 --- a/sci-chemistry/apbs/apbs-1.3-r1.ebuild +++ b/sci-chemistry/apbs/apbs-1.3-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.3-r1.ebuild,v 1.9 2011/12/13 14:25:50 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.3-r1.ebuild,v 1.10 2012/01/05 18:51:13 jlec Exp $ EAPI="3" @@ -26,7 +26,10 @@ DEPEND=" sys-libs/readline virtual/fortran arpack? ( sci-libs/arpack ) - tools? ( !sci-libs/gts ) + tools? ( + !sci-libs/gts + !sci-chemistry/ccpn + ) fetk? ( sci-libs/fetk sci-libs/amd diff --git a/sci-chemistry/apbs/apbs-1.3-r2.ebuild b/sci-chemistry/apbs/apbs-1.3-r2.ebuild index e4145b592a25..92b7629e343e 100644 --- a/sci-chemistry/apbs/apbs-1.3-r2.ebuild +++ b/sci-chemistry/apbs/apbs-1.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.3-r2.ebuild,v 1.1 2012/01/04 17:25:25 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.3-r2.ebuild,v 1.2 2012/01/05 18:51:13 jlec Exp $ EAPI=4 @@ -27,7 +27,6 @@ DEPEND=" sys-libs/readline virtual/fortran arpack? ( sci-libs/arpack ) - tools? ( !sci-libs/gts ) fetk? ( sci-libs/fetk sci-libs/amd @@ -138,10 +137,22 @@ src_install() { doins tools/python/*/{*.py,*.so} python_clean_installation_image fi + + if use python || use tools; then + mv "${ED}"/usr/bin/analysis{,_apbs} || die + mv "${ED}"/usr/bin/smooth{,_apbs} || die + fi } pkg_postinst() { use python && python_mod_optimize ${PN} + if use python || use tools; then + echo + elog "Following apps have been renamed" + elog "${EPREFIX}/usr/bin/analysis -> ${EPREFIX}/usr/bin/analysis_apbs" + elog "${EPREFIX}/usr/bin/smooth -> ${EPREFIX}/usr/bin/smooth_apbs" + echo + fi } pkg_postrm() { |