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

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

commit:     b5e3d247a7f065327a063da6e6edcb802e0a0b84
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 17 07:50:24 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Oct 17 07:50:24 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b5e3d247

sci-chemistry/pymol: Import tree changes

Package-Manager: portage-2.2.14_rc1

---
 sci-chemistry/pymol/ChangeLog         | 3 +++
 sci-chemistry/pymol/pymol-9999.ebuild | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 32b110e..bb3c5db 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  17 Oct 2014; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
+  Import tree changes
+
   01 May 2014; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
   Drop unneeded dep
 

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index 406a4d6..b45111e 100644
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ b/sci-chemistry/pymol/pymol-9999.ebuild
@@ -45,7 +45,7 @@ src_unpack() {
 python_prepare_all() {
 	sed \
 		-e "s:\"/usr:\"${EPREFIX}/usr:g" \
-		-e "/ext_comp_args/s:=\[.*\]$:= \[\]:g" \
+		-e "/ext_comp_args.*+=/s:\[.*\]$:\[\]:g" \
 		-e "/import/s:argparse:argparseX:g" \
 		-i setup.py || die
 
@@ -84,7 +84,9 @@ python_install_all() {
 	doenvd "${T}"/20pymol
 
 	newicon "${WORKDIR}"/${PN}-1.7.0.0.png ${PN}.png
-	make_desktop_entry pymol PyMol ${PN} "Graphics;Education;Science;Chemistry" "MimeType=chemical/x-pdb;"
+	make_desktop_entry ${PN} PyMol ${PN} \
+		"Graphics;Education;Science;Chemistry;" \
+		"MimeType=chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;"
 
 	if ! use web; then
 		rm -rf "${D}/$(python_get_sitedir)/web" || die