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

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

commit:     b176722593ec57ae62664e3a37a7d8d479a30da4
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 15 07:44:23 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> 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 <jlec@gentoo.org> pymol-9999.ebuild:
+  Merge tree changes
+
   24 Jul 2013; Justin Lecher <jlec@gentoo.org> 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