| 1 |
jlec 12/01/05 18:51:13 |
| 2 |
|
| 3 |
Modified: ChangeLog apbs-1.3-r1.ebuild apbs-1.3-r2.ebuild |
| 4 |
Log: |
| 5 |
Fix for file collitions |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.55 sci-chemistry/apbs/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/ChangeLog?rev=1.55&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/ChangeLog?rev=1.55&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/ChangeLog?r1=1.54&r2=1.55 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v |
| 19 |
retrieving revision 1.54 |
| 20 |
retrieving revision 1.55 |
| 21 |
diff -u -r1.54 -r1.55 |
| 22 |
--- ChangeLog 4 Jan 2012 17:25:25 -0000 1.54 |
| 23 |
+++ ChangeLog 5 Jan 2012 18:51:13 -0000 1.55 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for sci-chemistry/apbs |
| 26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.54 2012/01/04 17:25:25 jlec Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.55 2012/01/05 18:51:13 jlec Exp $ |
| 29 |
+ |
| 30 |
+ 05 Jan 2012; Justin Lecher <jlec@g.o> apbs-1.3-r1.ebuild, |
| 31 |
+ apbs-1.3-r2.ebuild: |
| 32 |
+ Fix for file collitions |
| 33 |
|
| 34 |
*apbs-1.3-r2 (04 Jan 2012) |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.10 sci-chemistry/apbs/apbs-1.3-r1.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/apbs-1.3-r1.ebuild?rev=1.10&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/apbs-1.3-r1.ebuild?rev=1.10&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/apbs-1.3-r1.ebuild?r1=1.9&r2=1.10 |
| 44 |
|
| 45 |
Index: apbs-1.3-r1.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.3-r1.ebuild,v |
| 48 |
retrieving revision 1.9 |
| 49 |
retrieving revision 1.10 |
| 50 |
diff -u -r1.9 -r1.10 |
| 51 |
--- apbs-1.3-r1.ebuild 13 Dec 2011 14:25:50 -0000 1.9 |
| 52 |
+++ apbs-1.3-r1.ebuild 5 Jan 2012 18:51:13 -0000 1.10 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
-# Copyright 1999-2011 Gentoo Foundation |
| 55 |
+# Copyright 1999-2012 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.3-r1.ebuild,v 1.9 2011/12/13 14:25:50 jlec Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.3-r1.ebuild,v 1.10 2012/01/05 18:51:13 jlec Exp $ |
| 59 |
|
| 60 |
EAPI="3" |
| 61 |
|
| 62 |
@@ -26,7 +26,10 @@ |
| 63 |
sys-libs/readline |
| 64 |
virtual/fortran |
| 65 |
arpack? ( sci-libs/arpack ) |
| 66 |
- tools? ( !sci-libs/gts ) |
| 67 |
+ tools? ( |
| 68 |
+ !sci-libs/gts |
| 69 |
+ !sci-chemistry/ccpn |
| 70 |
+ ) |
| 71 |
fetk? ( |
| 72 |
sci-libs/fetk |
| 73 |
sci-libs/amd |
| 74 |
|
| 75 |
|
| 76 |
|
| 77 |
1.2 sci-chemistry/apbs/apbs-1.3-r2.ebuild |
| 78 |
|
| 79 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/apbs-1.3-r2.ebuild?rev=1.2&view=markup |
| 80 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/apbs-1.3-r2.ebuild?rev=1.2&content-type=text/plain |
| 81 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/apbs-1.3-r2.ebuild?r1=1.1&r2=1.2 |
| 82 |
|
| 83 |
Index: apbs-1.3-r2.ebuild |
| 84 |
=================================================================== |
| 85 |
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.3-r2.ebuild,v |
| 86 |
retrieving revision 1.1 |
| 87 |
retrieving revision 1.2 |
| 88 |
diff -u -r1.1 -r1.2 |
| 89 |
--- apbs-1.3-r2.ebuild 4 Jan 2012 17:25:25 -0000 1.1 |
| 90 |
+++ apbs-1.3-r2.ebuild 5 Jan 2012 18:51:13 -0000 1.2 |
| 91 |
@@ -1,6 +1,6 @@ |
| 92 |
# Copyright 1999-2012 Gentoo Foundation |
| 93 |
# Distributed under the terms of the GNU General Public License v2 |
| 94 |
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.3-r2.ebuild,v 1.1 2012/01/04 17:25:25 jlec Exp $ |
| 95 |
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.3-r2.ebuild,v 1.2 2012/01/05 18:51:13 jlec Exp $ |
| 96 |
|
| 97 |
EAPI=4 |
| 98 |
|
| 99 |
@@ -27,7 +27,6 @@ |
| 100 |
sys-libs/readline |
| 101 |
virtual/fortran |
| 102 |
arpack? ( sci-libs/arpack ) |
| 103 |
- tools? ( !sci-libs/gts ) |
| 104 |
fetk? ( |
| 105 |
sci-libs/fetk |
| 106 |
sci-libs/amd |
| 107 |
@@ -138,10 +137,22 @@ |
| 108 |
doins tools/python/*/{*.py,*.so} |
| 109 |
python_clean_installation_image |
| 110 |
fi |
| 111 |
+ |
| 112 |
+ if use python || use tools; then |
| 113 |
+ mv "${ED}"/usr/bin/analysis{,_apbs} || die |
| 114 |
+ mv "${ED}"/usr/bin/smooth{,_apbs} || die |
| 115 |
+ fi |
| 116 |
} |
| 117 |
|
| 118 |
pkg_postinst() { |
| 119 |
use python && python_mod_optimize ${PN} |
| 120 |
+ if use python || use tools; then |
| 121 |
+ echo |
| 122 |
+ elog "Following apps have been renamed" |
| 123 |
+ elog "${EPREFIX}/usr/bin/analysis -> ${EPREFIX}/usr/bin/analysis_apbs" |
| 124 |
+ elog "${EPREFIX}/usr/bin/smooth -> ${EPREFIX}/usr/bin/smooth_apbs" |
| 125 |
+ echo |
| 126 |
+ fi |
| 127 |
} |
| 128 |
|
| 129 |
pkg_postrm() { |
Archives