[gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/

["Justin Lecher" <jlec@gentoo.org>]

commit:     77475f8f5e21afb24909dc136b199ac2c3a82f75
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 15 07:47:28 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Jan 15 07:47:28 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=77475f8f

sci-chemistry/pymol: Readd argparse fix; fix icon installation

Package-Manager: portage-2.2.8

---
 sci-chemistry/pymol/ChangeLog         | 3 +++
 sci-chemistry/pymol/pymol-9999.ebuild | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 5444971..66ef72e 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -3,6 +3,9 @@
 # $Header: $
 
   15 Jan 2014; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
+  Readd argparse fix; fix icon installation
+
+  15 Jan 2014; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
   Merge tree changes
 
   24 Jul 2013; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index b610295..5ad5032 100644
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ b/sci-chemistry/pymol/pymol-9999.ebuild
@@ -47,6 +47,7 @@ python_prepare_all() {
 	sed \
 		-e "s:\"/usr:\"${EPREFIX}/usr:g" \
 		-e "/ext_comp_args/s:=\[.*\]$:= \[\]:g" \
+		-e "/import/s:argparse:argparseX:g" \
 		-i setup.py || die
 
 	rm ./modules/pmg_tk/startup/apbs_tools.py || die
@@ -83,7 +84,7 @@ python_install_all() {
 
 	doenvd "${T}"/20pymol
 
-	newicon "${WORKDIR}"/${P}.png ${PN}.png
+	newicon "${WORKDIR}"/${PN}-1.7.0.0.png ${PN}.png
 	make_desktop_entry pymol PyMol ${PN} "Graphics;Education;Science;Chemistry" "MimeType=chemical/x-pdb;"
 
 	if ! use web; then