[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/pymol-apbs-plugin/files/, sci-chemistry/pymol-apbs-plugin/, ...

[Justin Lecher]

commit:     3b2fcdb2a906620608ddcb217ca3c0727575841e
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 22 15:19:40 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 15:19:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b2fcdb2

Drop sci-chemistry/pymol-apbs-plugin

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 profiles/package.mask                              |   5 -
 sci-chemistry/pymol-apbs-plugin/Manifest           |   4 -
 .../files/pymol-apbs-plugin-2.1_p26-tcltk8.6.patch | 176 ---------------------
 sci-chemistry/pymol-apbs-plugin/metadata.xml       |  11 --
 .../pymol-apbs-plugin-0_p15.ebuild                 |  57 -------
 .../pymol-apbs-plugin-0_p18.ebuild                 |  57 -------
 .../pymol-apbs-plugin-2.1_p24.ebuild               |  57 -------
 .../pymol-apbs-plugin-2.1_p26-r1.ebuild            |  56 -------
 .../pymol-apbs-plugin-2.1_p26.ebuild               |  56 -------
 9 files changed, 479 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 1f63929..2e82221 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -303,11 +303,6 @@ www-apps/389-dsgw
 dev-lang/php:5.4
 ~virtual/httpd-php-5.4
 
-# Justin Lecher <jlec@g.o> (12 Nov 2015)
-# deprecated version of the plugin. 
-# sci-chemistry/pymol includes the newer version
-sci-chemistry/pymol-apbs-plugin
-
 # Brian Evans <grknight@g.o> (11 Nov 2015)
 # Mask latest xdebug{,-client} beta versions
 # Upstream keeps changing the tarballs causing Manifest errors.

diff --git a/sci-chemistry/pymol-apbs-plugin/Manifest b/sci-chemistry/pymol-apbs-plugin/Manifest
deleted file mode 100644
index 8d2bd38..0000000
--- a/sci-chemistry/pymol-apbs-plugin/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST pymol-apbs-plugin-0_p15.py 104351 SHA256 c5a259ddc1931f1ec4efe0ffc3ae9e9ac4a84a28c83a4f93a06ebb7c1bef0c1d SHA512 1bfba44aed8ca03300430e00b6b2a3297bda5820b06a7a8914e5396c6720005ea5acaebc07bdf5d27d82f563afb8210e59af145422c7cacab92160f6f22874e1 WHIRLPOOL a0737250151503b431aa302c3ca175088b068a5aaf7e55c6673a9dd077d28ff7f58f40d2080426484a704ecc4e43f2845ae0d9ef6b5fc3ad850fff5bdffe36c0
-DIST pymol-apbs-plugin-0_p18.py 108766 SHA256 ec09c5a0903ac965cc29fcf0a3c1999bd939f9791d037915596092698855d12c SHA512 e736c2852851014eb412dcb573ee177f57dd9dd163673d5c7df1240f0f9c21fdc4277c647ba2a9e510d1cf8e53fabc6671da5a5b90b989cbcfc0835552c4ffdb WHIRLPOOL 3b418afc7198752e7d3578574238756c9a992b6c7c3a16d474a7d5363533d91cedc8300033f60666605efae478a2606b9b5e1a6e6b74aed8a0ec46842b8b02ac
-DIST pymol-apbs-plugin-2.1_p24.py 113049 SHA256 d51bb1bbbf641777ee36713c0c47696d7906179e42cac8cdd0e8e156ef081c9f SHA512 49141ea7e4a3a3430d342fb4fbb497d522ce6485c6d9e3527414519574eab7b8218fe240f26920013676528c40059a46341d58153bfe9d05bf747ead926b2cfd WHIRLPOOL 17a4f9ed9670b9a7f82395a9cf1ad465635f840b7389c10ad8c8eae3262c3696383bbacadf5aee9fed817eff7370008cc85a1666896fed56dffb0163e4c3d7e1
-DIST pymol-apbs-plugin-2.1_p26.py 113086 SHA256 552242b4f5b47f298eeb0616e0d51924b4a7649dc8a16e4809e923dbcb97738d SHA512 3561d077875a1880d6badccf835db3d17e0c45416accd6127cbef7c550711908b47ccb392563e3d29ecb7d6527c098584eeabb6490d1033720ed7efe751d0fb0 WHIRLPOOL dccd32b0193e74e505d69922b441323fb24b0ba30aa85f4d69b94663ab406a57b772985ca2c56146e2c4b929f73b321095c3ae2caf95f297f14d8b31671f475e

diff --git a/sci-chemistry/pymol-apbs-plugin/files/pymol-apbs-plugin-2.1_p26-tcltk8.6.patch b/sci-chemistry/pymol-apbs-plugin/files/pymol-apbs-plugin-2.1_p26-tcltk8.6.patch
deleted file mode 100644
index c3675cf..0000000
--- a/sci-chemistry/pymol-apbs-plugin/files/pymol-apbs-plugin-2.1_p26-tcltk8.6.patch
+++ /dev/null
@@ -1,176 +0,0 @@
---- pymol-apbs-plugin-2.1_p26.py.orig        2013-08-16 20:29:27.000000000 -0400
-+++ pymol-apbs-plugin-2.1_p26.py        2013-08-16 20:31:35.000000000 -0400
-@@ -560,7 +560,8 @@
-         # Set up the Main page
-         page = self.notebook.add('Main')
-         group = Pmw.Group(page,tag_text='Main options')
--        group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
-         self.selection = Pmw.EntryField(group.interior(),
-                                         labelpos='w',
-                                         label_text='Selection to use: ',
-@@ -606,7 +607,8 @@
-         page = self.notebook.add('Configuration')
- 
-         group = Pmw.Group(page,tag_text='Dielectric Constants')
--        group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+        group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
-         group.grid(column=0, row=0)
-         self.interior_dielectric = Pmw.EntryField(group.interior(),labelpos='w',
-                                    label_text = 'Protein Dielectric:',
-@@ -625,7 +627,8 @@
-             #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.pack(fill='both',expand=1, padx=4, pady=5)
-+        group.grid(padx=4, pady=5, sticky=(N, S, E, W))
-         group.grid(column=1, row=1,columnspan=4)
-         self.max_mem_allowed = Pmw.EntryField(group.interior(),labelpos='w',
-                                               label_text = 'Maximum Memory Allowed (MB):',
-@@ -683,7 +686,8 @@
- 
- 
-         group = Pmw.Group(page,tag_text='Ions')
--        group.pack(fill='both',expand=1, padx=4, pady=5)
-+        #group.pack(fill='both',expand=1, padx=4, pady=5)
-+        group.grid(padx=4, pady=5, sticky=(N, S, E, W))
-         group.grid(column=0, row=1, )
-         self.ion_plus_one_conc = Pmw.EntryField(group.interior(),
-                                                 labelpos='w',
-@@ -742,7 +746,8 @@
-             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.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+        group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
-         group.grid(column = 1, row = 0)
-         for coord in 'x y z'.split():
-             setattr(self,'grid_coarse_%s'%coord,Pmw.EntryField(group.interior(),
-@@ -757,7 +762,8 @@
- 
- 
-         group = Pmw.Group(page,tag_text = 'Fine Mesh Length')
--        group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+        group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
-         group.grid(column = 2, row = 0)
-         for coord in 'x y z'.split():
-             setattr(self,'grid_fine_%s'%coord,Pmw.EntryField(group.interior(),
-@@ -772,7 +778,8 @@
- 
- 
-         group = Pmw.Group(page,tag_text = 'Grid Center')
--        group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+        group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
-         group.grid(column = 3, row = 0)
-         for coord in 'x y z'.split():
-             setattr(self,'grid_center_%s'%coord,Pmw.EntryField(group.interior(),
-@@ -786,7 +793,8 @@
-             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.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+        group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
-         group.grid(column = 4, row = 0)
-         for coord in 'x y z'.split():
-             setattr(self,'grid_points_%s'%coord,Pmw.EntryField(group.interior(),
-@@ -804,7 +812,8 @@
-         page.grid_columnconfigure(5,weight=1)
-         page = self.notebook.add('Program Locations')
-         group = Pmw.Group(page,tag_text='Locations')
--        group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
-         def quickFileValidation(s):
-             if s == '': return Pmw.PARTIAL
-             elif os.path.isfile(s): return Pmw.OK
-@@ -867,7 +876,8 @@
-         
-         page = self.notebook.add('Temp File Locations')
-         group = Pmw.Group(page,tag_text='Locations')
--        group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
-         self.pymol_generated_pqr_filename = Pmw.EntryField(group.interior(),
-                                                            labelpos = 'w',
-                                                            label_pyclass = FileDialogButtonClassFactory.get(self.setPymolGeneratedPqrFilename),
-@@ -915,17 +925,20 @@
-         page = self.notebook.add('Visualization (1)')
-         group = VisualizationGroup(page,tag_text='Visualization',visgroup_num=1)
-         self.visualization_group_1 = group
--        group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
- 
-         page = self.notebook.add('Visualization (2)')
-         group = VisualizationGroup(page,tag_text='Visualization',visgroup_num=2)
-         self.visualization_group_2 = group
--        group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
- 
-         # Create a couple of other empty pages
-         page = self.notebook.add('About')
-         group = Pmw.Group(page, tag_text='About PyMOL APBS Tools')
--        group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
-         text = """This plugin integrates PyMOL (http://PyMOL.org/) with APBS (http://www.poissonboltzmann.org/apbs/).
- 
- Documentation may be found at
-@@ -2158,7 +2171,8 @@
-             self.update_buttonbox = Pmw.ButtonBox(self.mm_group.interior(), padx=0)
-             self.update_buttonbox.pack(side=LEFT)
-             self.update_buttonbox.add('Update',command=self.refresh)
--            self.mm_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=TOP)
-+            #self.mm_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=TOP)
-+            self.mm_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
- 
-             self.ms_group = Pmw.Group(self.interior(),tag_text='Molecular Surface')
-             self.ms_buttonbox = Pmw.ButtonBox(self.ms_group.interior(), padx=0)
-@@ -2209,7 +2223,8 @@
-             bars = (self.mol_surf_low,self.mol_surf_middle,self.mol_surf_high)
-             Pmw.alignlabels(bars)
-             for bar in bars: bar.pack(side=LEFT)
--            self.ms_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
-+            #self.ms_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
-+            self.ms_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
- 
-             self.fl_group = Pmw.Group(self.interior(),tag_text='Field Lines')
-             self.fl_buttonbox = Pmw.ButtonBox(self.fl_group.interior(), padx=0)
-@@ -2224,7 +2239,8 @@
-                                   text = """Follows same coloring as surface.""",
-                                   )
-             label.pack()
--            self.fl_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=TOP)
-+            #self.fl_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=TOP)
-+            self.fl_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
- 
-             self.pi_group = Pmw.Group(self.interior(),tag_text='Positive Isosurface')
-             self.pi_buttonbox = Pmw.ButtonBox(self.pi_group.interior(), padx=0)
-@@ -2243,7 +2259,8 @@
-                                             entryfield_validate = {'validator' : 'real', 'min':0}
-                                             )
-             self.pos_surf_val.pack(side=LEFT)
--            self.pi_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
-+            #self.pi_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
-+            self.pi_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
- 
-             self.ni_group = Pmw.Group(self.interior(),tag_text='Negative Isosurface')
-             self.ni_buttonbox = Pmw.ButtonBox(self.ni_group.interior(), padx=0)
-@@ -2262,7 +2279,8 @@
-                                             entryfield_validate = {'validator' : 'real', 'max':0}
-                                             )
-             self.neg_surf_val.pack(side=LEFT)
--            self.ni_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
-+            #self.ni_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
-+            self.ni_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
- 
- 
- 

diff --git a/sci-chemistry/pymol-apbs-plugin/metadata.xml b/sci-chemistry/pymol-apbs-plugin/metadata.xml
deleted file mode 100644
index 41a45ae..0000000
--- a/sci-chemistry/pymol-apbs-plugin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-chemistry@g.o</email>
-    <name>Gentoo Chemistry Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">pymolapbsplugin</remote-id>
-  </upstream>
-</pkgmetadata>

diff --git a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p15.ebuild b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p15.ebuild
deleted file mode 100644
index 8609778..0000000
--- a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p15.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit python
-
-MY_PV="${PV##*_p}"
-
-DESCRIPTION="APBS plugin for pymol"
-HOMEPAGE="http://sourceforge.net/projects/pymolapbsplugin/"
-SRC_URI="http://pymolapbsplugin.svn.sourceforge.net/viewvc/pymolapbsplugin/trunk/src/apbsplugin.py?revision=${MY_PV} -> ${P}.py"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-LICENSE="pymol"
-IUSE=""
-
-RDEPEND="
-	sci-chemistry/apbs
-	sci-chemistry/pdb2pqr
-	!<sci-chemistry/pymol-1.2.2-r1"
-DEPEND="${RDEPEND}"
-RESTRICT_PYTHON_ABIS="3.*"
-
-src_unpack() {
-	mkdir "${S}"
-	cp "${DISTDIR}"/${P}.py "${S}"/
-	python_copy_sources
-}
-
-src_install() {
-	installation() {
-		sed \
-			-e "s:^APBS_BINARY_LOCATION.*:APBS_BINARY_LOCATION = \"${EPREFIX}/usr/bin/apbs\":g" \
-			-e "s:^APBS_PSIZE_LOCATION.*:APBS_PSIZE_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/src/\":g" \
-			-e "s:^APBS_PDB2PQR_LOCATION.*:APBS_PDB2PQR_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/\":g" \
-			-e "s:^TEMPORARY_FILE_DIR.*:TEMPORARY_FILE_DIR = \"./\":g" \
-			-i ${P}.py
-
-		insinto $(python_get_sitedir)/pmg_tk/startup/
-		newins ${P}.py apbs_tools.py || die
-	}
-	python_execute_function -s installation
-}
-
-pkg_postinst() {
-	python_mod_optimize pmg_tk/startup/apbs_tools.py
-}
-
-pkg_postrm() {
-	python_mod_cleanup pmg_tk/startup/apbs_tools.py
-}

diff --git a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p18.ebuild b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p18.ebuild
deleted file mode 100644
index 11596fe..0000000
--- a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p18.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit python
-
-MY_PV="${PV##*_p}"
-
-DESCRIPTION="APBS plugin for pymol"
-HOMEPAGE="http://sourceforge.net/projects/pymolapbsplugin/"
-SRC_URI="http://pymolapbsplugin.svn.sourceforge.net/viewvc/pymolapbsplugin/trunk/src/apbsplugin.py?revision=${MY_PV} -> ${P}.py"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-LICENSE="pymol"
-IUSE=""
-
-RDEPEND="
-	sci-chemistry/apbs
-	sci-chemistry/pdb2pqr
-	!<sci-chemistry/pymol-1.2.2-r1"
-DEPEND="${RDEPEND}"
-RESTRICT_PYTHON_ABIS="3.*"
-
-src_unpack() {
-	mkdir "${S}"
-	cp "${DISTDIR}"/${P}.py "${S}"/
-	python_copy_sources
-}
-
-src_install() {
-	installation() {
-		sed \
-			-e "s:^APBS_BINARY_LOCATION.*:APBS_BINARY_LOCATION = \"${EPREFIX}/usr/bin/apbs\":g" \
-			-e "s:^APBS_PSIZE_LOCATION.*:APBS_PSIZE_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/src/\":g" \
-			-e "s:^APBS_PDB2PQR_LOCATION.*:APBS_PDB2PQR_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/\":g" \
-			-e "s:^TEMPORARY_FILE_DIR.*:TEMPORARY_FILE_DIR = \"./\":g" \
-			-i ${P}.py
-
-		insinto $(python_get_sitedir)/pmg_tk/startup/
-		newins ${P}.py apbs_tools.py || die
-	}
-	python_execute_function -s installation
-}
-
-pkg_postinst() {
-	python_mod_optimize pmg_tk/startup/apbs_tools.py
-}
-
-pkg_postrm() {
-	python_mod_cleanup pmg_tk/startup/apbs_tools.py
-}

diff --git a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p24.ebuild b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p24.ebuild
deleted file mode 100644
index 627780c..0000000
--- a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p24.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit python
-
-MY_PV="${PV##*_p}"
-
-DESCRIPTION="APBS plugin for pymol"
-HOMEPAGE="http://sourceforge.net/projects/pymolapbsplugin/"
-SRC_URI="http://pymolapbsplugin.svn.sourceforge.net/viewvc/pymolapbsplugin/trunk/src/apbsplugin.py?revision=${MY_PV} -> ${P}.py"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-LICENSE="pymol"
-IUSE=""
-
-RDEPEND="
-	sci-chemistry/apbs
-	sci-chemistry/pdb2pqr
-	!<sci-chemistry/pymol-1.2.2-r1"
-DEPEND="${RDEPEND}"
-RESTRICT_PYTHON_ABIS="3.*"
-
-src_unpack() {
-	mkdir "${S}"
-	cp "${DISTDIR}"/${P}.py "${S}"/
-	python_copy_sources
-}
-
-src_install() {
-	installation() {
-		sed \
-			-e "s:^APBS_BINARY_LOCATION.*:APBS_BINARY_LOCATION = \"${EPREFIX}/usr/bin/apbs\":g" \
-			-e "s:^APBS_PSIZE_LOCATION.*:APBS_PSIZE_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/src/\":g" \
-			-e "s:^APBS_PDB2PQR_LOCATION.*:APBS_PDB2PQR_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/\":g" \
-			-e "s:^TEMPORARY_FILE_DIR.*:TEMPORARY_FILE_DIR = \"./\":g" \
-			-i ${P}.py
-
-		insinto $(python_get_sitedir)/pmg_tk/startup/
-		newins ${P}.py apbs_tools.py || die
-	}
-	python_execute_function -s installation
-}
-
-pkg_postinst() {
-	python_mod_optimize pmg_tk/startup/apbs_tools.py
-}
-
-pkg_postrm() {
-	python_mod_cleanup pmg_tk/startup/apbs_tools.py
-}

diff --git a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26-r1.ebuild b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26-r1.ebuild
deleted file mode 100644
index 6d3aac6..0000000
--- a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-r1
-
-MY_PV="${PV##*_p}"
-
-DESCRIPTION="APBS plugin for pymol"
-HOMEPAGE="http://sourceforge.net/projects/pymolapbsplugin/"
-SRC_URI="http://sourceforge.net/p/pymolapbsplugin/code/${MY_PV}/tree/trunk/src/apbsplugin.py?format=raw -> ${P}.py"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-LICENSE="pymol"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	sci-chemistry/apbs
-	sci-chemistry/pdb2pqr
-	!<sci-chemistry/pymol-1.2.2-r1"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	mkdir "${S}"
-	cp "${DISTDIR}"/${P}.py "${S}"/
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-tcltk8.6.patch
-	python_copy_sources
-}
-
-src_install() {
-	installation() {
-		cd "${BUILD_DIR}" || die
-		sed \
-			-e "s:^APBS_BINARY_LOCATION.*:APBS_BINARY_LOCATION = \"${EPREFIX}/usr/bin/apbs\":g" \
-			-e "s:^APBS_PSIZE_LOCATION.*:APBS_PSIZE_LOCATION = \"$(python_get_sitedir)/pdb2pqr/src/\":g" \
-			-e "s:^APBS_PDB2PQR_LOCATION.*:APBS_PDB2PQR_LOCATION = \"$(python_get_sitedir)/pdb2pqr/\":g" \
-			-e "s:^TEMPORARY_FILE_DIR.*:TEMPORARY_FILE_DIR = \"./\":g" \
-			${P}.py > apbs_tools.py || die
-
-		python_moduleinto pmg_tk/startup
-		python_domodule apbs_tools.py
-		python_optimize
-	}
-	python_foreach_impl installation
-}

diff --git a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26.ebuild b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26.ebuild
deleted file mode 100644
index f943d5d..0000000
--- a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-r1
-
-MY_PV="${PV##*_p}"
-
-DESCRIPTION="APBS plugin for pymol"
-HOMEPAGE="http://sourceforge.net/projects/pymolapbsplugin/"
-SRC_URI="http://sourceforge.net/p/pymolapbsplugin/code/${MY_PV}/tree/trunk/src/apbsplugin.py?format=raw -> ${P}.py"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-LICENSE="pymol"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	sci-chemistry/apbs
-	sci-chemistry/pdb2pqr
-	!<sci-chemistry/pymol-1.2.2-r1"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	mkdir "${S}"
-	cp "${DISTDIR}"/${P}.py "${S}"/
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-tcltk8.6.patch
-	python_copy_sources
-}
-
-src_install() {
-	installation() {
-		cd "${BUILD_DIR}" || die
-		sed \
-			-e "s:^APBS_BINARY_LOCATION.*:APBS_BINARY_LOCATION = \"${EPREFIX}/usr/bin/apbs\":g" \
-			-e "s:^APBS_PSIZE_LOCATION.*:APBS_PSIZE_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/src/\":g" \
-			-e "s:^APBS_PDB2PQR_LOCATION.*:APBS_PDB2PQR_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/\":g" \
-			-e "s:^TEMPORARY_FILE_DIR.*:TEMPORARY_FILE_DIR = \"./\":g" \
-			${P}.py > apbs_tools.py
-
-		python_moduleinto pmg_tk/startup
-		python_domodule apbs_tools.py || die
-		python_optimize
-	}
-	python_foreach_impl installation
-}