public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2013-06-26 14:55 Justin Lecher
  2013-06-26 14:45 ` Justin Lecher
  0 siblings, 1 reply; 33+ messages in thread
From: Justin Lecher @ 2013-06-26 14:55 UTC (permalink / raw
  To: gentoo-commits

commit:     3c62235f98ee0d1f73c91ec56e021f51bd62fd5a
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 26 07:14:10 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Jun 26 14:44:59 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3c62235f

sci-chemistry/pymol: Update repo uri

Package-Manager: portage-2.2.0_alpha184
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

---
 sci-chemistry/pymol/pymol-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index fcdd516..57b5715 100644
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ b/sci-chemistry/pymol/pymol-9999.ebuild
@@ -12,7 +12,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"
-ESVN_REPO_URI="svn://svn.code.sf.net/p/pymol/code/trunk"
+ESVN_REPO_URI="svn://svn.code.sf.net/p/pymol/code/trunk/pymol"
 
 LICENSE="PSF-2.2"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2020-09-22 11:59 Aisha Tammy
  0 siblings, 0 replies; 33+ messages in thread
From: Aisha Tammy @ 2020-09-22 11:59 UTC (permalink / raw
  To: gentoo-commits

commit:     7776b136481f256d1cf8fcb4516b17fa7d3cd365
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Tue Sep 22 11:58:09 2020 +0000
Commit:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Tue Sep 22 11:58:09 2020 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=7776b136

sci-chemistry/pymol: drop package

present in ::gentoo

Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>

 sci-chemistry/pymol/metadata.xml      |  14 -----
 sci-chemistry/pymol/pymol-9999.ebuild | 113 ----------------------------------
 2 files changed, 127 deletions(-)

diff --git a/sci-chemistry/pymol/metadata.xml b/sci-chemistry/pymol/metadata.xml
deleted file mode 100644
index d36c262f4..000000000
--- a/sci-chemistry/pymol/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>jlec@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>sci-chemistry@gentoo.org</email>
-		<name>Gentoo Chemistry Project</name>
-	</maintainer>
-	<use>
-		<flag name="web">Install Pymodule needed for web app support</flag>
-	</use>
-</pkgmetadata>

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
deleted file mode 100644
index 5a8e51c63..000000000
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk"
-
-inherit distutils-r1 eutils fdo-mime flag-o-matic subversion versionator
-
-DESCRIPTION="A Python-extensible molecular graphics system"
-HOMEPAGE="http://www.pymol.org/"
-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"
-SLOT="0"
-KEYWORDS=""
-IUSE="web"
-
-DEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pyopengl[${PYTHON_USEDEP}]
-	media-libs/freeglut
-	media-libs/freetype:2
-	media-libs/glew:0=
-	media-libs/libpng:0=
-	media-video/mpeg-tools
-	sys-libs/zlib
-	virtual/python-pmw[${PYTHON_USEDEP}]
-	!sci-chemistry/pymol-apbs-plugin[${PYTHON_USEDEP}]
-	web? ( !dev-python/webpy[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	subversion_src_unpack
-}
-
-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
-
-	sed \
-		-e "s:/opt/local:${EPREFIX}/usr:g" \
-		-e '/ext_comp_args/s:\[.*\]:[]:g' \
-		-i setup.py || die
-
-	append-cxxflags -std=c++0x
-
-	distutils-r1_python_prepare_all
-}
-
-src_prepare() {
-	subversion_src_prepare
-	distutils-r1_src_prepare
-}
-
-python_install() {
-	distutils-r1_python_install --pymol-path="${EPREFIX}/usr/share/pymol"
-
-	sed \
-		-e '1d' \
-		-e "/APBS_BINARY_LOCATION/s:None:\"${EPREFIX}/usr/bin/apbs\":g" \
-		-e "/APBS_PSIZE_LOCATION/s:None:\"$(python_get_sitedir)/pdb2pqr/src/\":g" \
-		-e "/APBS_PDB2PQR_LOCATION/s:None:\"$(python_get_sitedir)/pdb2pqr/\":g" \
-		-i "${D}/$(python_get_sitedir)"/pmg_tk/startup/apbs_tools.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	sed \
-		-e '1i#!/usr/bin/env python' \
-		"${D}/$(python_get_sitedir)"/pymol/__init__.py > "${T}"/${PN} || die
-
-	python_foreach_impl python_doscript "${T}"/${PN}
-
-	# These environment variables should not go in the wrapper script, or else
-	# it will be impossible to use the PyMOL libraries from Python.
-	cat >> "${T}"/20pymol <<- EOF
-		PYMOL_PATH="${EPREFIX}/usr/share/pymol"
-		PYMOL_DATA="${EPREFIX}/usr/share/pymol/data"
-		PYMOL_SCRIPTS="${EPREFIX}/usr/share/pymol/scripts"
-	EOF
-
-	doenvd "${T}"/20pymol
-
-	newicon "${WORKDIR}"/${PN}-1.7.0.0.png ${PN}.png
-	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
-	fi
-
-	rm -f "${ED}"/usr/share/${PN}/LICENSE || die
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	optfeature "Electrostatic calculations" sci-chemistry/apbs sci-chemistry/pdb2pqr
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2015-11-12 16:23 Justin Lecher
  0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2015-11-12 16:23 UTC (permalink / raw
  To: gentoo-commits

commit:     48fda2d43d2691c28b535a2b4e289276cfaf079f
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 12 16:23:32 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 16:23:49 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=48fda2d4

sci-chemistry/pymol: Always use included apbs plugin

Correctly block files collisions

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=565600

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-chemistry/pymol/metadata.xml      |  1 -
 sci-chemistry/pymol/pymol-9999.ebuild | 11 ++++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/sci-chemistry/pymol/metadata.xml b/sci-chemistry/pymol/metadata.xml
index bca2106..b68426c 100644
--- a/sci-chemistry/pymol/metadata.xml
+++ b/sci-chemistry/pymol/metadata.xml
@@ -6,7 +6,6 @@
     <email>jlec@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name="apbs">Pymol supprt for sci-chemistry/apbs</flag>
     <flag name="web">Install Pymodule needed for web app support</flag>
   </use>
 </pkgmetadata>

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index 574855c..2abc15d 100644
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ b/sci-chemistry/pymol/pymol-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="tk"
 
-inherit distutils-r1 fdo-mime flag-o-matic subversion versionator
+inherit distutils-r1 eutils fdo-mime flag-o-matic subversion versionator
 
 DESCRIPTION="A Python-extensible molecular graphics system"
 HOMEPAGE="http://www.pymol.org/"
@@ -17,7 +17,7 @@ ESVN_REPO_URI="svn://svn.code.sf.net/p/pymol/code/trunk/pymol"
 LICENSE="PSF-2.2"
 SLOT="0"
 KEYWORDS=""
-IUSE="apbs web"
+IUSE="web"
 
 DEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
@@ -29,11 +29,7 @@ DEPEND="
 	media-video/mpeg-tools
 	sys-libs/zlib
 	virtual/python-pmw[${PYTHON_USEDEP}]
-	apbs? (
-		sci-chemistry/apbs[${PYTHON_USEDEP}]
-		sci-chemistry/pdb2pqr[${PYTHON_USEDEP}]
-		!sci-chemistry/pymol-apbs-plugin[${PYTHON_USEDEP}]
-	)
+	!sci-chemistry/pymol-apbs-plugin[${PYTHON_USEDEP}]
 	web? ( !dev-python/webpy[${PYTHON_USEDEP}] )"
 RDEPEND="${DEPEND}"
 
@@ -109,6 +105,7 @@ python_install_all() {
 pkg_postinst() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
+	optfeature "Electrostatic calculations" sci-chemistry/apbs sci-chemistry/pdb2pqr
 }
 
 pkg_postrm() {


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2015-08-27 15:01 Justin Lecher
  0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2015-08-27 15:01 UTC (permalink / raw
  To: gentoo-commits

commit:     290470a59921ff69775330acff730388f4740c6a
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 15:01:35 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 15:01:35 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=290470a5

sci-chemistry/pymol: React on subslot changes

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-chemistry/pymol/pymol-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index bf04075..d23916f 100644
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ b/sci-chemistry/pymol/pymol-9999.ebuild
@@ -24,7 +24,7 @@ DEPEND="
 	dev-python/pyopengl[${PYTHON_USEDEP}]
 	media-libs/freeglut
 	media-libs/freetype:2
-	media-libs/glew
+	media-libs/glew:0=
 	media-libs/libpng:0=
 	media-video/mpeg-tools
 	sys-libs/zlib


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2015-03-16  7:16 Justin Lecher
  0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2015-03-16  7:16 UTC (permalink / raw
  To: gentoo-commits

commit:     5e627dd32eaaec463699b87f9218fba9b23d88d0
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 16 07:15:52 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Mar 16 07:15:52 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=5e627dd3

sci-chemistry/pymol: Move to virtual/pmw

Package-Manager: portage-2.2.18

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

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 3a25bf8..656aa25 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Mar 2015; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
+  sci-chemistry/pymol: Move to virtual/pmw
+
   14 Mar 2015; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
   sci-chemistry/pymol: Fix for latest HEAD; fix SLOT operators
 

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index 8d8cf8e..ab58ffe 100644
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ b/sci-chemistry/pymol/pymol-9999.ebuild
@@ -21,14 +21,14 @@ IUSE="apbs web"
 
 DEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pmw:0[${PYTHON_USEDEP}]
 	dev-python/pyopengl[${PYTHON_USEDEP}]
+	media-libs/freeglut
 	media-libs/freetype:2
 	media-libs/glew
 	media-libs/libpng:0=
 	media-video/mpeg-tools
 	sys-libs/zlib
-	media-libs/freeglut
+	virtual/pmw[${PYTHON_USEDEP}]
 	apbs? (
 		sci-chemistry/apbs[${PYTHON_USEDEP}]
 		sci-chemistry/pdb2pqr[${PYTHON_USEDEP}]


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2015-03-14  8:21 Justin Lecher
  0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2015-03-14  8:21 UTC (permalink / raw
  To: gentoo-commits

commit:     b80d9ec04bf5d1fbddafa1c5b5d824f373d4d967
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 14 08:15:04 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Mar 14 08:21:00 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=b80d9ec0

sci-chemistry/pymol: Fix for latest HEAD; fix SLOT operators

Package-Manager: portage-2.2.18

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

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 2f4a843..3a25bf8 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-chemistry/pymol
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Mar 2015; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
+  sci-chemistry/pymol: Fix for latest HEAD; fix SLOT operators
+
   05 Nov 2014; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild,
   -files/pymol-9999-listing.patch, -files/pymol-9999-options.patch,
   -files/pymol-9999-tk8.6.patch:
@@ -371,4 +374,3 @@
   +sci-chemistry/pymol/files/nosplash-gentoo.patch,
   +sci-chemistry/pymol/metadata.xml:
   Initial checkin of pymol to sci-overlay
-

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index 56c62a8..8d8cf8e 100644
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ b/sci-chemistry/pymol/pymol-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -7,7 +7,7 @@ EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="tk"
 
-inherit distutils-r1 fdo-mime subversion versionator
+inherit distutils-r1 fdo-mime flag-o-matic subversion versionator
 
 DESCRIPTION="A Python-extensible molecular graphics system"
 HOMEPAGE="http://www.pymol.org/"
@@ -21,11 +21,11 @@ IUSE="apbs web"
 
 DEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pmw[${PYTHON_USEDEP}]
+	dev-python/pmw:0[${PYTHON_USEDEP}]
 	dev-python/pyopengl[${PYTHON_USEDEP}]
 	media-libs/freetype:2
 	media-libs/glew
-	media-libs/libpng
+	media-libs/libpng:0=
 	media-video/mpeg-tools
 	sys-libs/zlib
 	media-libs/freeglut
@@ -54,6 +54,8 @@ python_prepare_all() {
 		-e '/ext_comp_args/s:\[.*\]:[]:g' \
 		-i setup.py || die
 
+	append-cxxflags -std=c++0x
+
 	distutils-r1_python_prepare_all
 }
 


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2014-10-27 17:20 Justin Lecher
  0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2014-10-27 17:20 UTC (permalink / raw
  To: gentoo-commits

commit:     320cca039aa2511c26ad9bdff80df8101ec9f263
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 27 17:20:06 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Oct 27 17:20:06 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=320cca03

sci-chemistry/pymol: Add missing PYTHON_USEDEP

Package-Manager: portage-2.2.14

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

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 6648aad..67954f0 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: $
 
+  27 Oct 2014; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
+  Add missing PYTHON_USEDEP
+
   21 Oct 2014; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
   Patch included upstream
 

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index b45111e..cd57153 100644
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ b/sci-chemistry/pymol/pymol-9999.ebuild
@@ -30,8 +30,8 @@ DEPEND="
 	sys-libs/zlib
 	media-libs/freeglut
 	apbs? (
-		sci-chemistry/apbs
-		sci-chemistry/pdb2pqr
+		sci-chemistry/apbs[${PYTHON_USEDEP}]
+		sci-chemistry/pdb2pqr[${PYTHON_USEDEP}]
 		sci-chemistry/pymol-apbs-plugin[${PYTHON_USEDEP}]
 	)
 	web? ( !dev-python/webpy[${PYTHON_USEDEP}] )"


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2014-10-21  6:47 Justin Lecher
  0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2014-10-21  6:47 UTC (permalink / raw
  To: gentoo-commits

commit:     ba1e3dbb2201dc350399f7cf3d061ea4dac33ee6
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 21 06:46:58 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Oct 21 06:46:58 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ba1e3dbb

sci-chemistry/pymol: Patch included upstream

Package-Manager: portage-2.2.14

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

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 0364715..6648aad 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: $
 
+  21 Oct 2014; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
+  Patch included upstream
+
   20 Oct 2014; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild,
   +files/pymol-9999-listing.patch:
   Fix broken plugin listing

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index cbc6a4b..b45111e 100644
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ b/sci-chemistry/pymol/pymol-9999.ebuild
@@ -37,11 +37,6 @@ DEPEND="
 	web? ( !dev-python/webpy[${PYTHON_USEDEP}] )"
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-options.patch
-	"${FILESDIR}"/${P}-listing.patch
-)
-
 src_unpack() {
 	unpack ${A}
 	subversion_src_unpack


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2014-10-17  7:50 Justin Lecher
  0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2014-10-17  7:50 UTC (permalink / raw
  To: gentoo-commits

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


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2014-05-01 12:23 Justin Lecher
  0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2014-05-01 12:23 UTC (permalink / raw
  To: gentoo-commits

commit:     c607320009b4dc77f8c0f869f2bbb108baca32e5
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu May  1 12:23:27 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu May  1 12:23:27 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c6073200

sci-chemistry/pymol: Drop unneeded dep

Package-Manager: portage-2.2.10

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

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index c8db4fd..32b110e 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: $
 
+  01 May 2014; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
+  Drop unneeded dep
+
   26 Jan 2014; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
   Update HOMEPAGE
 

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index cd6e98d..406a4d6 100644
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ b/sci-chemistry/pymol/pymol-9999.ebuild
@@ -30,7 +30,6 @@ DEPEND="
 	sys-libs/zlib
 	media-libs/freeglut
 	apbs? (
-		dev-libs/maloc
 		sci-chemistry/apbs
 		sci-chemistry/pdb2pqr
 		sci-chemistry/pymol-apbs-plugin[${PYTHON_USEDEP}]


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2014-02-15 11:07 Justin Lecher
  0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2014-02-15 11:07 UTC (permalink / raw
  To: gentoo-commits

commit:     fc3784312a6f15820bb4e3a8c75115891dd36a83
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 26 09:22:05 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Feb 15 10:36:45 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fc378431

sci-chemistry/pymol: Update HOMEPAGE

Package-Manager: portage-2.2.8-r1

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

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 66ef72e..c8db4fd 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: $
 
+  26 Jan 2014; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
+  Update HOMEPAGE
+
   15 Jan 2014; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
   Readd argparse fix; fix icon installation
 

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index 5ad5032..2ec3bf0 100644
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ b/sci-chemistry/pymol/pymol-9999.ebuild
@@ -10,7 +10,7 @@ PYTHON_REQ_USE="tk"
 inherit distutils-r1 fdo-mime subversion versionator
 
 DESCRIPTION="A Python-extensible molecular graphics system"
-HOMEPAGE="http://pymol.sourceforge.net/"
+HOMEPAGE="http://www.pymol.org/"
 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"
 


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2014-01-18  7:39 Justin Lecher
  0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2014-01-18  7:39 UTC (permalink / raw
  To: gentoo-commits

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


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2014-01-18  7:39 Justin Lecher
  0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2014-01-18  7:39 UTC (permalink / raw
  To: gentoo-commits

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


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2014-01-18  7:38 Justin Lecher
  0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2014-01-18  7:38 UTC (permalink / raw
  To: gentoo-commits

commit:     ddcf64e3b3bd9e6c3e326c300d2e4e8a4ec25ac0
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: Sat Jan 18 07:38:33 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ddcf64e3

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


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2014-01-18  7:38 Justin Lecher
  0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2014-01-18  7:38 UTC (permalink / raw
  To: gentoo-commits

commit:     34a375b709fdecd6d49f5892d09119e2bccd55c5
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: Sat Jan 18 07:38:34 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=34a375b7

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


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2013-07-24  9:17 Justin Lecher
  0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2013-07-24  9:17 UTC (permalink / raw
  To: gentoo-commits

commit:     589bc8d2acbbd885abc49614a5a626e84f5a7d0f
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 24 06:10:55 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Jul 24 06:10:55 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=589bc8d2

sci-chemistry/pymol: Fx stupid argparse import

Package-Manager: portage-2.2.0_alpha188

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

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 80bd47e..795df11 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Jul 2013; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
+  Fx stupid argparse import
+
   26 Jun 2013; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
   Update repo uri
 

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index 57b5715..4d5a6bd 100644
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ b/sci-chemistry/pymol/pymol-9999.ebuild
@@ -46,6 +46,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


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2013-06-26 14:55 Justin Lecher
  2013-06-26  7:39 ` Justin Lecher
  0 siblings, 1 reply; 33+ messages in thread
From: Justin Lecher @ 2013-06-26 14:55 UTC (permalink / raw
  To: gentoo-commits

commit:     c975989ca5af7c747ed1d1ea62a57252b36e228b
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 26 07:14:10 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Jun 26 07:39:15 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c975989c

sci-chemistry/pymol: Update repo uri

Package-Manager: portage-2.2.0_alpha184
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

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

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index f5e0f9b..80bd47e 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 Jun 2013; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
+  Update repo uri
+
   25 Mar 2013; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild, metadata.xml:
   Sync with tree
 

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index 564732c..fcdd516 100644
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ b/sci-chemistry/pymol/pymol-9999.ebuild
@@ -12,7 +12,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"
-ESVN_REPO_URI="https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol"
+ESVN_REPO_URI="svn://svn.code.sf.net/p/pymol/code/trunk"
 
 LICENSE="PSF-2.2"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2013-06-26 14:53 Justin Lecher
  0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2013-06-26 14:53 UTC (permalink / raw
  To: gentoo-commits

commit:     d08c1a3dc6a0c2e8780534781d2314bbbaf81c44
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 26 07:14:10 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Jun 26 14:49:54 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d08c1a3d

sci-chemistry/pymol: Update repo uri

Package-Manager: portage-2.2.0_alpha184
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

---
 sci-chemistry/pymol/pymol-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index fcdd516..57b5715 100644
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ b/sci-chemistry/pymol/pymol-9999.ebuild
@@ -12,7 +12,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"
-ESVN_REPO_URI="svn://svn.code.sf.net/p/pymol/code/trunk"
+ESVN_REPO_URI="svn://svn.code.sf.net/p/pymol/code/trunk/pymol"
 
 LICENSE="PSF-2.2"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2013-06-26 14:53 Justin Lecher
  0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2013-06-26 14:53 UTC (permalink / raw
  To: gentoo-commits

commit:     7819594647c4260b49fae9c779dfb05ca6ae162c
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 26 07:14:10 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Jun 26 14:49:54 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=78195946

sci-chemistry/pymol: Update repo uri

Package-Manager: portage-2.2.0_alpha184
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

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

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index f5e0f9b..80bd47e 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 Jun 2013; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
+  Update repo uri
+
   25 Mar 2013; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild, metadata.xml:
   Sync with tree
 

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index 564732c..fcdd516 100644
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ b/sci-chemistry/pymol/pymol-9999.ebuild
@@ -12,7 +12,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"
-ESVN_REPO_URI="https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol"
+ESVN_REPO_URI="svn://svn.code.sf.net/p/pymol/code/trunk"
 
 LICENSE="PSF-2.2"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2013-03-26 15:34 Justin Lecher
  0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2013-03-26 15:34 UTC (permalink / raw
  To: gentoo-commits

commit:     61e0c3c7f9266ad55e969fa6aac83f4c2ad1a823
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 07:56:54 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 07:56:54 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=61e0c3c7

sci-chemistry/pymol: Sync with tree

Package-Manager: portage-2.2.0_alpha169

---
 sci-chemistry/pymol/ChangeLog         |    3 +++
 sci-chemistry/pymol/metadata.xml      |    1 +
 sci-chemistry/pymol/pymol-9999.ebuild |   33 +++++++++++++++++++++++++++------
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index dad76a9..f5e0f9b 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Mar 2013; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild, metadata.xml:
+  Sync with tree
+
   03 Mar 2013; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Fix missing DOCTYPE
 

diff --git a/sci-chemistry/pymol/metadata.xml b/sci-chemistry/pymol/metadata.xml
index 0ced419..bca2106 100644
--- a/sci-chemistry/pymol/metadata.xml
+++ b/sci-chemistry/pymol/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <use>
     <flag name="apbs">Pymol supprt for sci-chemistry/apbs</flag>
+    <flag name="web">Install Pymodule needed for web app support</flag>
   </use>
 </pkgmetadata>

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index 6f6c5f7..564732c 100644
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ b/sci-chemistry/pymol/pymol-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="tk"
 
-inherit distutils-r1 fdo-mime prefix subversion versionator
+inherit distutils-r1 fdo-mime subversion versionator
 
 DESCRIPTION="A Python-extensible molecular graphics system"
 HOMEPAGE="http://pymol.sourceforge.net/"
@@ -17,10 +17,10 @@ ESVN_REPO_URI="https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol"
 LICENSE="PSF-2.2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="apbs"
+IUSE="apbs web"
 
 DEPEND="
-	dev-python/numpy
+	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/pmw[${PYTHON_USEDEP}]
 	media-libs/freetype:2
 	media-libs/glew
@@ -34,7 +34,7 @@ DEPEND="
 		sci-chemistry/pdb2pqr
 		sci-chemistry/pymol-apbs-plugin
 	)
-	!dev-python/webpy"
+	web? ( !dev-python/webpy )"
 RDEPEND="${DEPEND}"
 
 src_unpack() {
@@ -50,9 +50,12 @@ python_prepare_all() {
 
 	rm ./modules/pmg_tk/startup/apbs_tools.py || die
 
-	distutils-r1_python_prepare_all
+	sed \
+		-e "s:/opt/local:${EPREFIX}/usr:g" \
+		-e '/ext_comp_args/s:\[.*\]:[]:g' \
+		-i setup.py || die
 
-	eprefixify setup.py
+	distutils-r1_python_prepare_all
 }
 
 src_prepare() {
@@ -67,8 +70,26 @@ python_install() {
 python_install_all() {
 	distutils-r1_python_install_all
 
+	python_export python2_7 EPYTHON
+
+	# These environment variables should not go in the wrapper script, or else
+	# it will be impossible to use the PyMOL libraries from Python.
+	cat >> "${T}"/20pymol <<- EOF
+		PYMOL_PATH="$(python_get_sitedir)/${PN}"
+		PYMOL_DATA="${EPREFIX}/usr/share/pymol/data"
+		PYMOL_SCRIPTS="${EPREFIX}/usr/share/pymol/scripts"
+	EOF
+
+	doenvd "${T}"/20pymol
+
 	doicon "${WORKDIR}"/${PN}.{xpm,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
+	fi
+
+	rm -f "${ED}"/usr/share/${PN}/LICENSE || die
 }
 
 pkg_postinst() {


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2013-03-03 17:52 Justin Lecher
  0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2013-03-03 17:52 UTC (permalink / raw
  To: gentoo-commits

commit:     7edc182c2bb9fdd431d461c1f9e78f1ca7be1175
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  3 17:33:00 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Mar  3 17:33:00 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7edc182c

sci-chemistry/pymol: Fix missing DOCTYPE

Package-Manager: portage-2.2.0_alpha164

---
 sci-chemistry/pymol/ChangeLog    |    3 +++
 sci-chemistry/pymol/metadata.xml |    1 +
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 062b4a9..dad76a9 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Mar 2013; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Fix missing DOCTYPE
+
   18 Feb 2013; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
   Fix sed syntax
 

diff --git a/sci-chemistry/pymol/metadata.xml b/sci-chemistry/pymol/metadata.xml
index e2aa7cd..0ced419 100644
--- a/sci-chemistry/pymol/metadata.xml
+++ b/sci-chemistry/pymol/metadata.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-chemistry</herd>
   <maintainer>


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2013-02-19 19:35 Justin Lecher
  0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2013-02-19 19:35 UTC (permalink / raw
  To: gentoo-commits

commit:     e330d790ad278e88972ddadfe1c4875fb12cf7fa
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 18 20:26:40 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Feb 18 20:26:40 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e330d790

sci-chemistry/pymol: Fix sed syntax

Package-Manager: portage-2.2.0_alpha163

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

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 380939b..062b4a9 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -5,6 +5,9 @@
   18 Feb 2013; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
   Fix sed syntax
 
+  18 Feb 2013; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
+  Fix sed syntax
+
   18 Feb 2013; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild,
   -files/pymol-9999-flags.patch, -files/pymol-9999-prefix.patch, metadata.xml:
   Adapt to current HEAD

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index d1e847f..6f6c5f7 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" \
 		-i setup.py || die
 
 	rm ./modules/pmg_tk/startup/apbs_tools.py || die


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2013-02-19 19:35 Justin Lecher
  0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2013-02-19 19:35 UTC (permalink / raw
  To: gentoo-commits

commit:     6b38186682ba69818cb5803b33a8c0bf72f2c030
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 18 20:24:18 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Feb 18 20:24:18 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6b381866

sci-chemistry/pymol: Fix sed syntax

Package-Manager: portage-2.2.0_alpha163

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

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 9652f4b..380939b 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Feb 2013; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
+  Fix sed syntax
+
   18 Feb 2013; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild,
   -files/pymol-9999-flags.patch, -files/pymol-9999-prefix.patch, metadata.xml:
   Adapt to current HEAD

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index cd05037..d1e847f 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" \
 		-i setup.py || die
 
 	rm ./modules/pmg_tk/startup/apbs_tools.py || die


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2013-01-29 15:20 Justin Lecher
  0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2013-01-29 15:20 UTC (permalink / raw
  To: gentoo-commits

commit:     b61bef4418f124efdf37752805951f79b6572a7a
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 29 15:14:36 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jan 29 15:14:36 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b61bef44

sci-chemistry/pymol: Bump python eclass

Package-Manager: portage-2.2.0_alpha161

---
 sci-chemistry/pymol/ChangeLog         |    5 ++-
 sci-chemistry/pymol/metadata.xml      |   20 ++++++------
 sci-chemistry/pymol/pymol-9999.ebuild |   57 ++++++++++++++++-----------------
 3 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 83d97e1..c88876a 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-chemistry/pymol
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Jan 2013; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild, metadata.xml:
+  Bump python eclass
+
   15 Oct 2012; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
   Add mime type definition
 

diff --git a/sci-chemistry/pymol/metadata.xml b/sci-chemistry/pymol/metadata.xml
index 1a70ddc..8ada2f2 100644
--- a/sci-chemistry/pymol/metadata.xml
+++ b/sci-chemistry/pymol/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
-	<maintainer>
-		<email>jlec@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="apbs">Pymol supprt for sci-chemistry/apbs</flag>
-		<flag name="numpy">Enable numpy support for Pymol</flag>
-		<flag name="vmd">Builds molfile plugin support</flag>
-		<flag name="web">Install Pymodule needed for web app support</flag>
-	</use>
+  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="apbs">Pymol supprt for sci-chemistry/apbs</flag>
+    <flag name="numpy">Enable numpy support for Pymol</flag>
+    <flag name="vmd">Builds molfile plugin support</flag>
+    <flag name="web">Install Pymodule needed for web app support</flag>
+  </use>
 </pkgmetadata>

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index 932aa80..5cddebf 100644
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ b/sci-chemistry/pymol/pymol-9999.ebuild
@@ -1,16 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
-PYTHON_DEPEND="2:2.7"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.* *-jython 2.7-pypy-*"
-PYTHON_USE_WITH="tk"
-PYTHON_MODNAME="${PN} chempy pmg_tk pmg_wx"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk"
 
-inherit distutils eutils fdo-mime prefix subversion versionator
+inherit distutils-r1 fdo-mime prefix subversion versionator
 
 DESCRIPTION="A Python-extensible molecular graphics system."
 HOMEPAGE="http://pymol.sourceforge.net/"
@@ -24,7 +21,7 @@ IUSE="apbs numpy vmd web"
 
 DEPEND="
 	dev-python/numpy
-	dev-python/pmw
+	dev-python/pmw[${PYTHON_USEDEP}]
 	media-libs/freetype:2
 	media-libs/glew
 	media-libs/libpng
@@ -45,18 +42,16 @@ src_unpack() {
 	subversion_src_unpack
 }
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-setup.py.patch \
-		"${FILESDIR}"/${P}-data-path.patch \
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/${P}-setup.py.patch
+		"${FILESDIR}"/${P}-data-path.patch
 		"${FILESDIR}"/${P}-flags.patch
+		"${FILESDIR}"/${P}-prefix.patch
+		)
 
-	use web || epatch "${FILESDIR}"/${P}-web.patch
-
-	epatch "${FILESDIR}"/${P}-prefix.patch && \
-		eprefixify setup.py
-
-	use vmd && epatch "${FILESDIR}"/${P}-vmd.patch
+	use web || PATCHES+=( "${FILESDIR}"/${P}-web.patch )
+	use vmd && PATCHES+=( "${FILESDIR}"/${P}-vmd.patch )
 
 	if use numpy; then
 		sed \
@@ -66,29 +61,33 @@ src_prepare() {
 
 	rm ./modules/pmg_tk/startup/apbs_tools.py || die
 
-	echo "site_packages = \'$(python_get_sitedir -f)\'" > setup3.py || die
+	python_export python2_7 EPYTHON PYTHON_SITEDIR
+	echo "site_packages = \'$(python_get_sitedir)\'" > setup3.py || die
 
 	sed \
 		-e "s:/opt/local:${EPREFIX}/usr:g" \
 		-e '/ext_comp_args/s:\[.*\]:[]:g' \
 		-i setup.py || die
 
-	# python 3.* fix
-	# sed '452,465d' -i setup.py
-	distutils_src_prepare
+	distutils-r1_python_prepare_all
+
+	eprefixify setup.py
 }
 
-src_configure() {
-	:
+src_prepare() {
+	subversion_src_prepare
+	distutils-r1_src_prepare
 }
 
-src_install() {
-	distutils_src_install
+python_install_all() {
+	distutils-r1_python_install_all
+
+	python_export python2_7 EPYTHON
 
 	# These environment variables should not go in the wrapper script, or else
 	# it will be impossible to use the PyMOL libraries from Python.
 	cat >> "${T}"/20pymol <<- EOF
-		PYMOL_PATH="${EPREFIX}/$(python_get_sitedir -f)/${PN}"
+		PYMOL_PATH="${EPREFIX}/$(python_get_sitedir)/${PN}"
 		PYMOL_DATA="${EPREFIX}/usr/share/pymol/data"
 		PYMOL_SCRIPTS="${EPREFIX}/usr/share/pymol/scripts"
 	EOF
@@ -97,7 +96,7 @@ src_install() {
 
 	cat >> "${T}"/pymol <<- EOF
 	#!/bin/sh
-	$(PYTHON -f) -O \${PYMOL_PATH}/__init__.py -q \$*
+	${EPYTHON} -O \${PYMOL_PATH}/__init__.py -q \$*
 	EOF
 
 	dobin "${T}"/pymol


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2012-10-24  6:36 Justin Lecher
  0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2012-10-24  6:36 UTC (permalink / raw
  To: gentoo-commits

commit:     cfc42c90d0b31e8607bf554d199376ca8ac191e7
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 15 17:27:01 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Oct 15 17:27:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cfc42c90

sci-chemistry/pymol: Add mime type definition

Package-Manager: portage-2.2.0_alpha138

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

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index d889cfd..83d97e1 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Oct 2012; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
+  Add mime type definition
+
   12 Aug 2012; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
   Correct Desktop entry
 

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index 3995ae7..932aa80 100644
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ b/sci-chemistry/pymol/pymol-9999.ebuild
@@ -19,7 +19,7 @@ ESVN_REPO_URI="https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol"
 
 LICENSE="PSF-2.2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="apbs numpy vmd web"
 
 DEPEND="
@@ -68,6 +68,11 @@ src_prepare() {
 
 	echo "site_packages = \'$(python_get_sitedir -f)\'" > setup3.py || die
 
+	sed \
+		-e "s:/opt/local:${EPREFIX}/usr:g" \
+		-e '/ext_comp_args/s:\[.*\]:[]:g' \
+		-i setup.py || die
+
 	# python 3.* fix
 	# sed '452,465d' -i setup.py
 	distutils_src_prepare
@@ -106,13 +111,16 @@ src_install() {
 	dodoc DEVELOPERS README
 
 	doicon "${WORKDIR}"/${PN}.{xpm,png}
-	make_desktop_entry pymol PyMol ${PN} "Graphics;Education;Science;Chemistry"
+	make_desktop_entry pymol PyMol ${PN} "Graphics;Education;Science;Chemistry" "MimeType=chemical/x-pdb;"
 }
 
 pkg_postinst() {
 	elog "\t USE=shaders was removed,"
-	elog "please use pymol config settings"
+	elog "please use pymol config settings (~/.pymolrc)"
 	elog "\t set use_shaders, 1"
+	elog "in case of crashes, please deactivate this experimental feature by setting"
+	elog "\t set use_shaders, 0"
+	elog "\t set sphere_mode, 0"
 	distutils_pkg_postinst
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2012-08-13 20:22 Justin Lecher
  0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2012-08-13 20:22 UTC (permalink / raw
  To: gentoo-commits

commit:     87f21976ab5bfc4a8dca73aec83cee825bbb6cc3
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 12 17:56:15 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Aug 12 17:56:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=87f21976

sci-chemistry/pymol: Correct Desktop entry

(Portage version: 2.2.0_alpha121/git/Linux x86_64, unsigned Manifest commit)

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

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 98f4ebc..d889cfd 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Aug 2012; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
+  Correct Desktop entry
+
   02 May 2012; Justin Lecher <jlec@gentoo.org> files/pymol-9999-web.patch:
   Fix for latest HEAD
 

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index 98687dd..3995ae7 100644
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ b/sci-chemistry/pymol/pymol-9999.ebuild
@@ -106,7 +106,7 @@ src_install() {
 	dodoc DEVELOPERS README
 
 	doicon "${WORKDIR}"/${PN}.{xpm,png}
-	make_desktop_entry pymol PyMol ${PN} "Graphics;Science;Chemistry"
+	make_desktop_entry pymol PyMol ${PN} "Graphics;Education;Science;Chemistry"
 }
 
 pkg_postinst() {


^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2012-03-29 10:44 Justin Lecher
  0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2012-03-29 10:44 UTC (permalink / raw
  To: gentoo-commits

commit:     ddeb680212e470d0c6e927aeb5c96b3e9689cb46
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 29 10:42:20 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Mar 29 10:42:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ddeb6802

Add new icon files provided by Ramiro Téllez Sanz

(Portage version: 2.2.0_alpha96/git/Linux x86_64, unsigned Manifest commit)

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

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 78f20cb..d8f7712 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Mar 2012; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
+  Add new icon files provided by Ramiro Téllez Sanz
+
   29 Mar 2012; Justin Lecher <jlec@gentoo.org>
   files/pymol-9999-data-path.patch:
   Import tree changes

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index 8e83dda..ed432fe 100644
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ b/sci-chemistry/pymol/pymol-9999.ebuild
@@ -105,7 +105,7 @@ src_install() {
 
 	dodoc DEVELOPERS README
 
-	doicon "${WORKDIR}"/${PN}.xpm
+	doicon "${WORKDIR}"/${PN}.{xpm,png}
 	make_desktop_entry pymol PyMol ${PN} "Graphics;Science;Chemistry"
 }
 



^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2012-03-29 10:44 Justin Lecher
  0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2012-03-29 10:44 UTC (permalink / raw
  To: gentoo-commits

commit:     ded2958e021860bfd8e935935bc2434c2afdc684
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 29 10:42:20 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Mar 29 10:44:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ded2958e

correct URI for icons

---
 sci-chemistry/pymol/pymol-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index ed432fe..98687dd 100644
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ b/sci-chemistry/pymol/pymol-9999.ebuild
@@ -14,7 +14,7 @@ inherit distutils eutils fdo-mime prefix subversion versionator
 
 DESCRIPTION="A Python-extensible molecular graphics system."
 HOMEPAGE="http://pymol.sourceforge.net/"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${PN}.xpm.tar"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${PN}-icons.tar.xz"
 ESVN_REPO_URI="https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol"
 
 LICENSE="PSF-2.2"



^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2012-03-04  8:41 Justin Lecher
  0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2012-03-04  8:41 UTC (permalink / raw
  To: gentoo-commits

commit:     f3664b2d435663982051cbb873d1a573f4421f78
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  4 08:38:49 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Mar  4 08:38:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f3664b2d

Block pypy usage

(Portage version: 2.2.0_alpha89/git/Linux x86_64, unsigned Manifest commit)

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

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 0f6860d..3aee674 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Mar 2012; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
+  Block pypy usage
+
   19 Feb 2012; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild,
   files/pymol-9999-prefix.patch, files/pymol-9999-web.patch:
   Fix for current HEAD, correct desktop entry generation

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index 1671842..8e83dda 100644
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ b/sci-chemistry/pymol/pymol-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=4
 
 PYTHON_DEPEND="2:2.7"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
+RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.* *-jython 2.7-pypy-*"
 PYTHON_USE_WITH="tk"
 PYTHON_MODNAME="${PN} chempy pmg_tk pmg_wx"
 



^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2011-06-24 17:09 Justin Lecher
  0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2011-06-24 17:09 UTC (permalink / raw
  To: gentoo-commits

commit:     5f93421d23e9244ea8edbe22c1d888af4c7428e2
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 13:06:10 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 13:06:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5f93421d

Sort inherit and/or USE

(Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 sci-chemistry/pymol/pymol-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index 53f9bb2..62a7a60 100644
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ b/sci-chemistry/pymol/pymol-9999.ebuild
@@ -10,7 +10,7 @@ RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
 PYTHON_USE_WITH="tk"
 PYTHON_MODNAME="${PN} chempy pmg_tk pmg_wx"
 
-inherit eutils distutils prefix subversion versionator
+inherit distutils eutils prefix subversion versionator
 
 DESCRIPTION="A Python-extensible molecular graphics system."
 HOMEPAGE="http://pymol.sourceforge.net/"



^ permalink raw reply related	[flat|nested] 33+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/
@ 2011-04-04 11:18 Justin Lecher
  0 siblings, 0 replies; 33+ messages in thread
From: Justin Lecher @ 2011-04-04 11:18 UTC (permalink / raw
  To: gentoo-commits

commit:     2eb8440151cd748e70738aa6e5d53b96f68cea3a
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 11:13:31 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 11:13:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2eb84401

Useless blank line on line: 13

(Portage version: 2.2.0_alpha29/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 sci-chemistry/pymol/pymol-9999.ebuild |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index 38477a3..14ff467 100644
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ b/sci-chemistry/pymol/pymol-9999.ebuild
@@ -10,7 +10,6 @@ RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
 PYTHON_USE_WITH="tk"
 PYTHON_MODNAME="${PN} chempy pmg_tk pmg_wx"
 
-
 inherit eutils distutils prefix subversion versionator
 
 DESCRIPTION="A Python-extensible molecular graphics system."



^ permalink raw reply related	[flat|nested] 33+ messages in thread
end of thread, other threads:[~2020-09-22 11:59 UTC | newest]

Thread overview: 33+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-26 14:55 [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/ Justin Lecher
2013-06-26 14:45 ` Justin Lecher
  -- strict thread matches above, loose matches on Subject: below --
2020-09-22 11:59 Aisha Tammy
2015-11-12 16:23 Justin Lecher
2015-08-27 15:01 Justin Lecher
2015-03-16  7:16 Justin Lecher
2015-03-14  8:21 Justin Lecher
2014-10-27 17:20 Justin Lecher
2014-10-21  6:47 Justin Lecher
2014-10-17  7:50 Justin Lecher
2014-05-01 12:23 Justin Lecher
2014-02-15 11:07 Justin Lecher
2014-01-18  7:39 Justin Lecher
2014-01-18  7:39 Justin Lecher
2014-01-18  7:38 Justin Lecher
2014-01-18  7:38 Justin Lecher
2013-07-24  9:17 Justin Lecher
2013-06-26 14:55 Justin Lecher
2013-06-26  7:39 ` Justin Lecher
2013-06-26 14:53 Justin Lecher
2013-06-26 14:53 Justin Lecher
2013-03-26 15:34 Justin Lecher
2013-03-03 17:52 Justin Lecher
2013-02-19 19:35 Justin Lecher
2013-02-19 19:35 Justin Lecher
2013-01-29 15:20 Justin Lecher
2012-10-24  6:36 Justin Lecher
2012-08-13 20:22 Justin Lecher
2012-03-29 10:44 Justin Lecher
2012-03-29 10:44 Justin Lecher
2012-03-04  8:41 Justin Lecher
2011-06-24 17:09 Justin Lecher
2011-04-04 11:18 Justin Lecher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox