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 27CE1138247 for ; Sat, 18 Jan 2014 07:39:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9BF73E0DF2; Sat, 18 Jan 2014 07:39:24 +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 88980E0DDB for ; Sat, 18 Jan 2014 07:39:23 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9584D33FA44 for ; Sat, 18 Jan 2014 07:39:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 63B611872D for ; Sat, 18 Jan 2014 07:39:21 +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: <1389771863.b176722593ec57ae62664e3a37a7d8d479a30da4.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: b176722593ec57ae62664e3a37a7d8d479a30da4 X-VCS-Branch: master Date: Sat, 18 Jan 2014 07:39:21 +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: 3b0dce3e-7e4a-429b-a881-41af2d34ef63 X-Archives-Hash: c721875b66d0f962a147e2065e74c168 commit: b176722593ec57ae62664e3a37a7d8d479a30da4 Author: Justin Lecher gentoo org> AuthorDate: Wed Jan 15 07:44:23 2014 +0000 Commit: Justin Lecher gentoo org> CommitDate: Wed Jan 15 07:44:23 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b1767225 sci-chemistry/pymol: Merge tree changes Package-Manager: portage-2.2.8 --- sci-chemistry/pymol/ChangeLog | 5 ++++- sci-chemistry/pymol/pymol-9999.ebuild | 14 +++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog index 795df11..5444971 100644 --- a/sci-chemistry/pymol/ChangeLog +++ b/sci-chemistry/pymol/ChangeLog @@ -1,7 +1,10 @@ # ChangeLog for sci-chemistry/pymol -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 15 Jan 2014; Justin Lecher pymol-9999.ebuild: + Merge tree changes + 24 Jul 2013; Justin Lecher pymol-9999.ebuild: Fx stupid argparse import diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild index 4d5a6bd..b610295 100644 --- a/sci-chemistry/pymol/pymol-9999.ebuild +++ b/sci-chemistry/pymol/pymol-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -11,7 +11,7 @@ inherit distutils-r1 fdo-mime subversion versionator DESCRIPTION="A Python-extensible molecular graphics system" HOMEPAGE="http://pymol.sourceforge.net/" -SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${PN}-icons.tar.xz" +SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${PN}-1.7.0.0.png.xz" ESVN_REPO_URI="svn://svn.code.sf.net/p/pymol/code/trunk/pymol" LICENSE="PSF-2.2" @@ -22,6 +22,7 @@ IUSE="apbs web" DEPEND=" dev-python/numpy[${PYTHON_USEDEP}] dev-python/pmw[${PYTHON_USEDEP}] + dev-python/pyopengl[${PYTHON_USEDEP}] media-libs/freetype:2 media-libs/glew media-libs/libpng @@ -32,9 +33,9 @@ DEPEND=" dev-libs/maloc sci-chemistry/apbs sci-chemistry/pdb2pqr - sci-chemistry/pymol-apbs-plugin + sci-chemistry/pymol-apbs-plugin[${PYTHON_USEDEP}] ) - web? ( !dev-python/webpy )" + web? ( !dev-python/webpy[${PYTHON_USEDEP}] )" RDEPEND="${DEPEND}" src_unpack() { @@ -46,7 +47,6 @@ 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,11 +83,11 @@ python_install_all() { doenvd "${T}"/20pymol - doicon "${WORKDIR}"/${PN}.{xpm,png} + newicon "${WORKDIR}"/${P}.png ${PN}.png make_desktop_entry pymol PyMol ${PN} "Graphics;Education;Science;Chemistry" "MimeType=chemical/x-pdb;" if ! use web; then - rm -rvf "${D}/$(python_get_sitedir)/web" || die + rm -rf "${D}/$(python_get_sitedir)/web" || die fi rm -f "${ED}"/usr/share/${PN}/LICENSE || die