From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E504B1387CA for ; Fri, 17 Oct 2014 07:50:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BE947E082F; Fri, 17 Oct 2014 07:50:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5BB0DE082F for ; Fri, 17 Oct 2014 07:50:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EE6CC33BF44 for ; Fri, 17 Oct 2014 07:50:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 948268140 for ; Fri, 17 Oct 2014 07:50:29 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1413532224.b5e3d247a7f065327a063da6e6edcb802e0a0b84.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/pymol/ChangeLog sci-chemistry/pymol/pymol-9999.ebuild X-VCS-Directories: sci-chemistry/pymol/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: b5e3d247a7f065327a063da6e6edcb802e0a0b84 X-VCS-Branch: master Date: Fri, 17 Oct 2014 07:50:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8f89f654-39bf-4905-82b2-bcb0b6292d09 X-Archives-Hash: 24cfd4e163424ce785b0e8d8aa9a6d3b commit: b5e3d247a7f065327a063da6e6edcb802e0a0b84 Author: Justin Lecher gentoo org> AuthorDate: Fri Oct 17 07:50:24 2014 +0000 Commit: Justin Lecher gentoo 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 pymol-9999.ebuild: + Import tree changes + 01 May 2014; Justin Lecher 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