[gentoo-commits] repo/gentoo:master commit in: dev-python/pmw/files/, dev-python/pmw/

2019-08-04 Thread Alexey Shvetsov
commit: 9aa213d7354df7f3f4fde0474088b776b5e3e4f4
Author: Alexey Shvetsov  gentoo  org>
AuthorDate: Sun Aug  4 08:13:47 2019 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Sun Aug  4 08:13:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9aa213d7

dev-python/pmw: Updates for eapi7 ebuilds

Package-Manager: Portage-2.3.70, Repoman-2.3.16
Signed-off-by: Alexey Shvetsov  gentoo.org>

 dev-python/pmw/files/pmw-1.3.3-install-no-docs.patch | 6 +++---
 dev-python/pmw/pmw-2.0.1-r1.ebuild   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-python/pmw/files/pmw-1.3.3-install-no-docs.patch 
b/dev-python/pmw/files/pmw-1.3.3-install-no-docs.patch
index 979e24abf59..bbfd0f35f1c 100644
--- a/dev-python/pmw/files/pmw-1.3.3-install-no-docs.patch
+++ b/dev-python/pmw/files/pmw-1.3.3-install-no-docs.patch
@@ -1,10 +1,10 @@
  src/setup.py | 2 --
  1 file changed, 2 deletions(-)
 
-diff --git a/src/setup.py b/src/setup.py
+diff --git a/setup.py b/setup.py
 index a5f9039..cfcf8a2 100755
 a/src/setup.py
-+++ b/src/setup.py
+--- a/setup.py
 b/setup.py
 @@ -16,9 +16,7 @@ setup(name="Pmw",
'Pmw.Pmw_1_3_3.lib',],
  

diff --git a/dev-python/pmw/pmw-2.0.1-r1.ebuild 
b/dev-python/pmw/pmw-2.0.1-r1.ebuild
index 32d3e1c7c8a..9795b10364b 100644
--- a/dev-python/pmw/pmw-2.0.1-r1.ebuild
+++ b/dev-python/pmw/pmw-2.0.1-r1.ebuild
@@ -28,7 +28,7 @@ RESTRICT="test"
 S="${WORKDIR}/${MY_P}"
 
 python_prepare() {
-   distutils-r1_python_prepare
+   distutils-r1_python_prepare_all
2to3 Pmw
 }
 



[gentoo-commits] repo/gentoo:master commit in: dev-python/pmw/files/

2016-09-18 Thread David Seifert
commit: a7cf0e391af84ceec9426f91915ec35e99949894
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Fri Sep 16 15:44:18 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Sep 18 13:28:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7cf0e39

dev-python/pmw: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/2343

Signed-off-by: David Seifert  gentoo.org>

 dev-python/pmw/files/1.3.2-python2.5.patch | 54 --
 .../pmw/files/pmw-1.3.2-install-no-docs.patch  | 13 --
 2 files changed, 67 deletions(-)

diff --git a/dev-python/pmw/files/1.3.2-python2.5.patch 
b/dev-python/pmw/files/1.3.2-python2.5.patch
deleted file mode 100644
index cae2f9b..
--- a/dev-python/pmw/files/1.3.2-python2.5.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Source: 
http://github.com/nanotube/pmw_fixes/commit/5e6dcbdaef2bb6c40037b922dd0efa081f1575ab
 (Daniel Folkinshteyn)
-
-fix bug in OptionMenu.setitems, introduced with the fixing of this python 
-bug:
-http://bugs.python.org/issue1342811
-
-versions of python 2.5.4 and newer now automatically delete commands when 
-items are deleted
-however, that causes error if the command is deleted manually beforehand.
-old versions, on the contrary, require manual command deletion to free up 
-the objects.
-
-so we put in a python version check to see if we need to manually delete 
-commands.
-
-fixes the Pmw bug referred to here:
-https://sourceforge.net/forum/forum.php?thread_id=3283195_id=33675
-and here:
-https://sourceforge.net/tracker/?func=detail=2795731_id=10743
-d=110743
-
 a/src/Pmw/Pmw_1_3/lib/PmwOptionMenu.py
-+++ b/src/Pmw/Pmw_1_3/lib/PmwOptionMenu.py
-@@ -1,6 +1,7 @@
- import types
- import Tkinter
- import Pmw
-+import sys
- 
- class OptionMenu(Pmw.MegaWidget):
- 
-@@ -59,11 +60,17 @@ class OptionMenu(Pmw.MegaWidget):
- 
- def setitems(self, items, index = None):
- 
--# Clean up old items and callback commands.
--for oldIndex in range(len(self._itemList)):
--tclCommandName = str(self._menu.entrycget(oldIndex, 'command'))
--if tclCommandName != '':   
--self._menu.deletecommand(tclCommandName)
-+# python version check
-+# python versions >= 2.5.4 automatically clean commands
-+# and manually cleaning them causes errors when deleting items
-+
-+if sys.version_info[0] * 100 + sys.version_info[1] * 10 + \
-+sys.version_info[2] < 254:
-+# Clean up old items and callback commands.
-+for oldIndex in range(len(self._itemList)):
-+tclCommandName = str(self._menu.entrycget(oldIndex, 
'command'))
-+if tclCommandName != '':   
-+self._menu.deletecommand(tclCommandName)
- self._menu.delete(0, 'end')
-   self._itemList = list(items)
- 

diff --git a/dev-python/pmw/files/pmw-1.3.2-install-no-docs.patch 
b/dev-python/pmw/files/pmw-1.3.2-install-no-docs.patch
deleted file mode 100644
index 325dc4e..
--- a/dev-python/pmw/files/pmw-1.3.2-install-no-docs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -uNr Pmw.1.3.2.orig/src/setup.py Pmw.1.3.2/src/setup.py
 Pmw.1.3.2.orig/src/setup.py2008-08-02 15:40:19.0 -0430
-+++ Pmw.1.3.2/src/setup.py 2008-08-02 15:40:36.0 -0430
-@@ -16,9 +16,7 @@
-   'Pmw.Pmw_1_3.lib',],
- 
-   package_data={'Pmw': ['Pmw_1_3/lib/Pmw.def',
--  'Pmw_1_3/doc/*',
-   'Pmw_1_3/contrib/*',
--  'Pmw_1_3/demos/*',
-   'Pmw_1_3/tests/*',
- 'Pmw_1_3/bin/*',
-  ]