From 88d90be668a40cd3704a49e0e016b934c10cab7d Mon Sep 17 00:00:00 2001
From: Justin Lecher <jlec@gentoo.org>
Date: Thu, 5 Jan 2012 18:51:13 +0000
Subject: [PATCH] Fix for file collitions

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
---
 sci-chemistry/apbs/ChangeLog          |  6 +++++-
 sci-chemistry/apbs/Manifest           | 12 ++++++------
 sci-chemistry/apbs/apbs-1.3-r1.ebuild |  9 ++++++---
 sci-chemistry/apbs/apbs-1.3-r2.ebuild | 15 +++++++++++++--
 4 files changed, 30 insertions(+), 12 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/Manifest b/sci-chemistry/apbs/Manifest
index 599e303ee03a..cd698d6b010c 100644
--- a/sci-chemistry/apbs/Manifest
+++ b/sci-chemistry/apbs/Manifest
@@ -35,15 +35,15 @@ AUX apbs-1.3/0015-apbs-1.3-pythonlib-fix.patch 2055 RMD160 dd424aa44e3bc1d08a56f
 DIST apbs-1.2.1b-source.tar.gz 40647966 RMD160 4ba1f72a7f9adcf7b283dc18743488143025b398 SHA1 dc3e6933a987ff9fdf88db510db79b3dacb100d6 SHA256 7d088def1ed7689127eb64014ea44069b9d7bfc995941fe5800ff753d48c87be
 DIST apbs-1.3-source.tar.gz 48625351 RMD160 c075a747dc28f382f3a383a0944a1b20e0c8a9f1 SHA1 1494f36e35f2e4b1a18d4b22516fad4948c6391f SHA256 5fa5b597f7d5a3d9bb55429ec4fefc69e7d0f918d568c3c4a288088c0fde9ef2
 EBUILD apbs-1.2.1b-r4.ebuild 3605 RMD160 9cc3a6e31fef129da866bf90f6a6eeb97710a111 SHA1 c8df66903bcaf4e2cd39715112b9b83280513820 SHA256 38dc067d4a8efd351a15d292b3d00424e3782871e1ff8caada78a8ab2772bfac
-EBUILD apbs-1.3-r1.ebuild 4543 RMD160 ad848dd2f7f9f02dc13bbd1ac4b98ccccbb20c8e SHA1 d3140513caa7d5ea77472d560e040a3f38024849 SHA256 04edd7a4849302039b34cbbad5623eeaaf163eb32b20d84fa5253126b85f0f99
-EBUILD apbs-1.3-r2.ebuild 3797 RMD160 0c43f05fe04db4488802b2a8b8815e700b0a6000 SHA1 a08887dd834dd8891dc07e76cc917c065dd42fd2 SHA256 556e07abeb74313aa5a8fdc69c72b6994a3abb2ae9082722672a01dbca4632dc
+EBUILD apbs-1.3-r1.ebuild 4570 RMD160 72340af109b8a98a8dd671ad5200035b51e35f9d SHA1 d81ae8aa7ea38f6b5294feba3e3df3f79933ac0d SHA256 edd4ad503de5850c4b6d1ad9ca1b11c947c7bbb1cbc990a50f9b2286ec39e39b
+EBUILD apbs-1.3-r2.ebuild 4134 RMD160 4e359cc0b83fef0a1a19ecfa1d85c8b28d3c7ed0 SHA1 aa5b58f3e29c0884fdc031972c71aebbb1ecef72 SHA256 71fdadc08b5851ce99feab691586fc28b1ab32a1b2dcc1f6a72fe9772ad1bd04
 EBUILD apbs-1.3.ebuild 4358 RMD160 c3897181791ca3715ed77f30031af6a811f2beac SHA1 17c656a149e83de4a8158145ded80423f4fe5d3a SHA256 d3683ca49b49838368d70658a0e28b30f6a172de1709983d11a33bd1dc042cde
-MISC ChangeLog 10034 RMD160 a3b6a30b63574cba316726a47922371dcf5152fc SHA1 3a0ad2e4445cfea90257708f7e7e19c3ba10531d SHA256 1aea2cdf6aa2ee002bb57063907da7df81d00f3d73239764064aab41b15e8624
+MISC ChangeLog 10150 RMD160 6cfc0c38d45e0424881e0f64aa463a0699844ea4 SHA1 c4dd23f6c8c14da4ab9e46118c13d9a225fe02c6 SHA256 19e2dffc22eeac6a0bbc9a149bdf0f4a425f271b29771298d4a785d12e47734f
 MISC metadata.xml 871 RMD160 e50499e926ad62fc924b5c48f6d6fd56519c7cf7 SHA1 fe5335ee3c033f9f0b336663c4065ba4af3f9c8b SHA256 510d88fd555af07b55320109b1a56718980f6eb9e3569f9c39d88c82268cf56f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk8Ei5AACgkQgAnW8HDreRa18ACeNgsXOGQeeQ2mETxlRp2H6OBp
-l1YAnRvZKKAqxtq4dYbDiKKc04855w+Y
-=rlk6
+iEYEAREKAAYFAk8F8S0ACgkQgAnW8HDreRbKjQCfaN+Z/vOOctLe+ceOgIgH+3IK
+6KEAoJshS1KN2u/29Bf8h6k1/SNS/uC6
+=k9IN
 -----END PGP SIGNATURE-----
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() {
-- 
2.26.2