[pkgsrc/trunk]: pkgsrc/devel/py-tryton Remove obsolete python 2.6 patch. Also...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d54af7b9ba43
branches:  trunk
changeset: 649129:d54af7b9ba43
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Wed Apr 01 11:34:55 2015 +0000

description:
Remove obsolete python 2.6 patch. Also make sure we append to
PYTHON_VERSIONS_INCOMPATIBLE in options.mk so it we don't overwrite the
default value.

diffstat:

 devel/py-tryton/Makefile                                                                    |   4 +-
 devel/py-tryton/distinfo                                                                    |   3 +-
 devel/py-tryton/options.mk                                                                  |   6 +-
 devel/py-tryton/patches/patch-tryton_gui_window_view__form_view_form__gtk_multiselection.py |  20 ----------
 4 files changed, 6 insertions(+), 27 deletions(-)

diffs (72 lines):

diff -r cd1d1ecc23c3 -r d54af7b9ba43 devel/py-tryton/Makefile
--- a/devel/py-tryton/Makefile  Wed Apr 01 10:45:34 2015 +0000
+++ b/devel/py-tryton/Makefile  Wed Apr 01 11:34:55 2015 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2015/03/20 00:58:38 tnn Exp $
+# $NetBSD: Makefile,v 1.15 2015/04/01 11:34:55 tnn Exp $
 TRYTON_MODULE_NAME=    tryton
 .include "../../devel/py-trytond/Makefile.common"
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel python
 
 MAINTAINER=    rodent%NetBSD.org@localhost
diff -r cd1d1ecc23c3 -r d54af7b9ba43 devel/py-tryton/distinfo
--- a/devel/py-tryton/distinfo  Wed Apr 01 10:45:34 2015 +0000
+++ b/devel/py-tryton/distinfo  Wed Apr 01 11:34:55 2015 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.9 2015/03/20 00:58:38 tnn Exp $
+$NetBSD: distinfo,v 1.10 2015/04/01 11:34:55 tnn Exp $
 
 SHA1 (tryton-3.4/tryton-3.4.2.tar.gz) = 9ee78df1ee11e22e194a5b0301ebcf87cb603dae
 RMD160 (tryton-3.4/tryton-3.4.2.tar.gz) = a4653be2e510073c360ab06cdb61404b08618bdf
 Size (tryton-3.4/tryton-3.4.2.tar.gz) = 824683 bytes
-SHA1 (patch-tryton_gui_window_view__form_view_form__gtk_multiselection.py) = 9729de7c5f58cdb0f061ab80020232e723277a0e
diff -r cd1d1ecc23c3 -r d54af7b9ba43 devel/py-tryton/options.mk
--- a/devel/py-tryton/options.mk        Wed Apr 01 10:45:34 2015 +0000
+++ b/devel/py-tryton/options.mk        Wed Apr 01 11:34:55 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2014/05/18 15:08:33 rodent Exp $
+# $NetBSD: options.mk,v 1.5 2015/04/01 11:34:55 tnn Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.py-tryton
 PKG_SUPPORTED_OPTIONS= cdecimal goocalendar pytz simplejson
@@ -7,12 +7,12 @@
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mcdecimal)
-PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # py-cdecimal not available because obsolete
+PYTHON_VERSIONS_INCOMPATIBLE+= 33 34 # py-cdecimal not available because obsolete
 DEPENDS+=              ${PYPKGPREFIX}-cdecimal-[0-9]*:../../math/py-cdecimal
 .endif
 
 .if !empty(PKG_OPTIONS:Mgoocalendar)
-PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # py-gtk2 via py-goocanvas via py-goocalendar
+PYTHON_VERSIONS_INCOMPATIBLE+= 33 34 # py-gtk2 via py-goocanvas via py-goocalendar
 DEPENDS+=              ${PYPKGPREFIX}-goocalendar-[0-9]*:../../time/py-goocalendar
 .endif
 
diff -r cd1d1ecc23c3 -r d54af7b9ba43 devel/py-tryton/patches/patch-tryton_gui_window_view__form_view_form__gtk_multiselection.py
--- a/devel/py-tryton/patches/patch-tryton_gui_window_view__form_view_form__gtk_multiselection.py       Wed Apr 01 10:45:34 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-tryton_gui_window_view__form_view_form__gtk_multiselection.py,v 1.2 2015/03/20 00:58:38 tnn Exp $
-
-Fixes python 2.6 support. Patch can go away when python26 does.
-
---- tryton/common/treeviewcontrol.py.orig      2015-02-09 23:43:55.000000000 +0000
-+++ tryton/common/treeviewcontrol.py
-@@ -3,11 +3,11 @@
- import gtk
- import gobject
- 
--MOVEMENT_KEYS = {gtk.keysyms.Up, gtk.keysyms.Down, gtk.keysyms.space,
-+MOVEMENT_KEYS = set((gtk.keysyms.Up, gtk.keysyms.Down, gtk.keysyms.space,
-     gtk.keysyms.Left, gtk.keysyms.KP_Left,
-     gtk.keysyms.Right, gtk.keysyms.KP_Right,
-     gtk.keysyms.Home, gtk.keysyms.KP_Home,
--    gtk.keysyms.End, gtk.keysyms.KP_End}
-+    gtk.keysyms.End, gtk.keysyms.KP_End))
- 
- __all__ = ['TreeViewControl']
-