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 9CCD4138825 for ; Wed, 5 Nov 2014 07:24:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E1BEE092F; Wed, 5 Nov 2014 07:24:28 +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 B02E7E093E for ; Wed, 5 Nov 2014 07:24:27 +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 7B84234041C for ; Wed, 5 Nov 2014 07:24:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 959339784 for ; Wed, 5 Nov 2014 07:24:23 +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: <1415172258.0acc85d3a08b77620f564c32e16480ad0a7ea034.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/files/, sci-chemistry/pymol/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/pymol/ChangeLog sci-chemistry/pymol/files/pymol-9999-listing.patch sci-chemistry/pymol/files/pymol-9999-options.patch sci-chemistry/pymol/files/pymol-9999-tk8.6.patch sci-chemistry/pymol/pymol-9999.ebuild X-VCS-Directories: sci-chemistry/pymol/files/ sci-chemistry/pymol/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 0acc85d3a08b77620f564c32e16480ad0a7ea034 X-VCS-Branch: master Date: Wed, 5 Nov 2014 07:24:23 +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: beec6655-1385-4c76-aae8-bd5b4cf60d8e X-Archives-Hash: e4a928abbc12389542d48f818defed72 commit: 0acc85d3a08b77620f564c32e16480ad0a7ea034 Author: Justin Lecher gentoo org> AuthorDate: Wed Nov 5 07:24:18 2014 +0000 Commit: Justin Lecher gentoo org> CommitDate: Wed Nov 5 07:24:18 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0acc85d3 sci-chemistry/pymol: Drop obsolete patches Package-Manager: portage-2.2.14 --- sci-chemistry/pymol/ChangeLog | 5 ++ sci-chemistry/pymol/files/pymol-9999-listing.patch | 17 ------ sci-chemistry/pymol/files/pymol-9999-options.patch | 15 ----- sci-chemistry/pymol/files/pymol-9999-tk8.6.patch | 66 ---------------------- sci-chemistry/pymol/pymol-9999.ebuild | 2 - 5 files changed, 5 insertions(+), 100 deletions(-) diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog index c55379b..2f4a843 100644 --- a/sci-chemistry/pymol/ChangeLog +++ b/sci-chemistry/pymol/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 05 Nov 2014; Justin Lecher pymol-9999.ebuild, + -files/pymol-9999-listing.patch, -files/pymol-9999-options.patch, + -files/pymol-9999-tk8.6.patch: + Drop obsolete patches + 31 Oct 2014; Justin Lecher files/pymol-9999-tk8.6.patch: Update patch to upstream suggestion diff --git a/sci-chemistry/pymol/files/pymol-9999-listing.patch b/sci-chemistry/pymol/files/pymol-9999-listing.patch deleted file mode 100644 index 1b4039c..0000000 --- a/sci-chemistry/pymol/files/pymol-9999-listing.patch +++ /dev/null @@ -1,17 +0,0 @@ - pymol/modules/pymol/plugins/repository.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/pymol/modules/pymol/plugins/repository.py b/pymol/modules/pymol/plugins/repository.py -index 9697f68..9820fac 100644 ---- a/pymol/modules/pymol/plugins/repository.py -+++ b/pymol/modules/pymol/plugins/repository.py -@@ -182,7 +182,8 @@ class GithubRepository(HttpRepository): - - def fetchjson(self, url): - handle = urlopen('https://api.github.com' + url) -- return eval(handle.read()) -+ ret = handle.read().replace("false", "False") -+ return eval(ret) - - class LocalRepository(Repository): - def __init__(self, url): diff --git a/sci-chemistry/pymol/files/pymol-9999-options.patch b/sci-chemistry/pymol/files/pymol-9999-options.patch deleted file mode 100644 index ce05e17..0000000 --- a/sci-chemistry/pymol/files/pymol-9999-options.patch +++ /dev/null @@ -1,15 +0,0 @@ - pymol/setup.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/pymol/setup.py b/pymol/setup.py -index c446d6c..b7b353b 100644 ---- a/pymol/setup.py -+++ b/pymol/setup.py -@@ -51,6 +51,7 @@ def CCompiler_compile(self, sources, output_dir=None, macros=None, - class options: - osx_frameworks = False - jobs = int(os.getenv('JOBS', 0)) -+ no_libxml = False - - try: - import argparse diff --git a/sci-chemistry/pymol/files/pymol-9999-tk8.6.patch b/sci-chemistry/pymol/files/pymol-9999-tk8.6.patch deleted file mode 100644 index 529de84..0000000 --- a/sci-chemistry/pymol/files/pymol-9999-tk8.6.patch +++ /dev/null @@ -1,66 +0,0 @@ -commit afb1c62e05d56dfbe2940f4f939428739d834f05 -Author: Thomas Holder -Date: Thu Oct 30 17:04:45 2014 -0400 - - fix apbs_tools for tcl/tk 8.6 - -diff --git a/modules/pmg_tk/startup/apbs_tools.py b/modules/pmg_tk/startup/apbs_tools.py -index 9b76070..c9f649c 100644 ---- a/modules/pmg_tk/startup/apbs_tools.py -+++ b/modules/pmg_tk/startup/apbs_tools.py -@@ -658,7 +658,6 @@ class APBSTools2: - page = self.notebook.add('Configuration') - - group = Pmw.Group(page,tag_text='Dielectric Constants') -- group.pack(fill = 'both', expand = 1, padx = 4, pady = 5) - group.grid(column=0, row=0) - self.interior_dielectric = Pmw.EntryField(group.interior(),labelpos='w', - label_text = 'Protein Dielectric:', -@@ -677,7 +676,6 @@ class APBSTools2: - #entry.pack(side='left',fill='both',expand=1,padx=4) # side-by-side - entry.pack(fill='x',expand=1,padx=4,pady=1) # vertical - group = Pmw.Group(page,tag_text='Other') -- group.pack(fill='both',expand=1, padx=4, pady=5) - group.grid(column=1, row=1,columnspan=4) - self.max_mem_allowed = Pmw.EntryField(group.interior(),labelpos='w', - label_text = 'Maximum Memory Allowed (MB):', -@@ -735,7 +733,6 @@ class APBSTools2: - - - group = Pmw.Group(page,tag_text='Ions') -- group.pack(fill='both',expand=1, padx=4, pady=5) - group.grid(column=0, row=1, ) - self.ion_plus_one_conc = Pmw.EntryField(group.interior(), - labelpos='w', -@@ -794,7 +791,6 @@ class APBSTools2: - entry.pack(fill='x',expand=1,padx=4) - - group = Pmw.Group(page,tag_text = 'Coarse Mesh Length') -- group.pack(fill = 'both', expand = 1, padx = 4, pady = 5) - group.grid(column = 1, row = 0) - for coord in 'x y z'.split(): - setattr(self,'grid_coarse_%s'%coord,Pmw.EntryField(group.interior(), -@@ -809,7 +805,6 @@ class APBSTools2: - - - group = Pmw.Group(page,tag_text = 'Fine Mesh Length') -- group.pack(fill = 'both', expand = 1, padx = 4, pady = 5) - group.grid(column = 2, row = 0) - for coord in 'x y z'.split(): - setattr(self,'grid_fine_%s'%coord,Pmw.EntryField(group.interior(), -@@ -824,7 +819,6 @@ class APBSTools2: - - - group = Pmw.Group(page,tag_text = 'Grid Center') -- group.pack(fill = 'both', expand = 1, padx = 4, pady = 5) - group.grid(column = 3, row = 0) - for coord in 'x y z'.split(): - setattr(self,'grid_center_%s'%coord,Pmw.EntryField(group.interior(), -@@ -838,7 +832,6 @@ class APBSTools2: - getattr(self,'grid_center_%s'%coord).pack(fill='x', expand=1, padx=4, pady=1) - - group = Pmw.Group(page,tag_text = 'Grid Points') -- group.pack(fill = 'both', expand = 1, padx = 4, pady = 5) - group.grid(column = 4, row = 0) - for coord in 'x y z'.split(): - setattr(self,'grid_points_%s'%coord,Pmw.EntryField(group.interior(), diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild index 957afd0..56c62a8 100644 --- a/sci-chemistry/pymol/pymol-9999.ebuild +++ b/sci-chemistry/pymol/pymol-9999.ebuild @@ -37,8 +37,6 @@ DEPEND=" web? ( !dev-python/webpy[${PYTHON_USEDEP}] )" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}"/${P}-tk8.6.patch ) - src_unpack() { unpack ${A} subversion_src_unpack