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

2020-08-02 Thread Michał Górny
commit: 56b5dee6b726f45c43851732ee34dcea4ea3f13e
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Aug  2 08:53:37 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Aug  2 08:53:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56b5dee6

dev-python/pyfltk: Remove py2.7

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/pyfltk/pyfltk-1.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pyfltk/pyfltk-1.3.3.ebuild 
b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
index c26f0e9..5491e546183 100644
--- a/dev-python/pyfltk/pyfltk-1.3.3.ebuild
+++ b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
@@ -5,7 +5,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic



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

2017-05-03 Thread Michał Górny
commit: 68059e5610eab1c0b0d7791066212b92b3e20a6e
Author: Michał Górny  gentoo  org>
AuthorDate: Wed May  3 06:45:07 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed May  3 07:37:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68059e56

dev-python/pyfltk: Clean old versions up

 dev-python/pyfltk/Manifest |  1 -
 .../files/pyfltk-1.3.0-format-security.patch   | 74 --
 .../files/pyfltk-1.3.0-linux-3.x-detection.patch   | 15 -
 dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild   | 50 ---
 4 files changed, 140 deletions(-)

diff --git a/dev-python/pyfltk/Manifest b/dev-python/pyfltk/Manifest
index 6f52b4468f5..44b0eebb2b8 100644
--- a/dev-python/pyfltk/Manifest
+++ b/dev-python/pyfltk/Manifest
@@ -1,2 +1 @@
-DIST pyFltk-1.3.0.tar.gz 915600 SHA256 
c52852d21ee17d495185259b46ac9603d683edde7d7e6d4b6f9268da4ee3de57 SHA512 
908a6d9581741454440da92fe921f0a2a01be86a5ec01cbbf2d953eb5f0437efd8e635d7bff6c18015afc877a984872a6592df834709f93a1287307e17fbcc61
 WHIRLPOOL 
62281ef5c798986f1af82da53887fe40a6cd4f4bcfe7fab8d60fc7f3c4ad9cc2d481ced6b2e2bad7638ef843b9dcf396aa246838f173d2afaeaac530e0236d3b
 DIST pyFltk-1.3.3.tar.gz 946763 SHA256 
246b92c99b8d5610532456a4c956b355f6140514324916cf35efbe6468c4a188 SHA512 
dd4bbef8e82d455237dd085622e78e046ac522449fe63610ee5405c24d759482a89aeab07435fefb5223db78cc1f810f1eca8355afb1d0ff3e4b5e10b73bef8f
 WHIRLPOOL 
8d94349db36cd78722e75c9e1cef088e0f2743bd522eb0496f76faf70a159d6987902f308478a992bd7f2cb62a5bb770a80eee25c3e9feaf08b513956ce1

diff --git a/dev-python/pyfltk/files/pyfltk-1.3.0-format-security.patch 
b/dev-python/pyfltk/files/pyfltk-1.3.0-format-security.patch
deleted file mode 100644
index f29b7b3c922..000
--- a/dev-python/pyfltk/files/pyfltk-1.3.0-format-security.patch
+++ /dev/null
@@ -1,74 +0,0 @@
- python/fltk_wrap.cpp | 16 
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/python/fltk_wrap.cpp b/python/fltk_wrap.cpp
-index 9c16f59..ad42e89 100644
 a/python/fltk_wrap.cpp
-+++ b/python/fltk_wrap.cpp
-@@ -5238,13 +5238,13 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, 
PyObject *args)
- 
-   const char *fl_vararg_input(const char *label, const char *deflt = 0) {
- const char* result = 0;
--result = fl_input(label, deflt);
-+result = fl_input("%s", deflt, label);
- return result;
-   };
- 
-   const char *fl_vararg_password(const char *label, const char *deflt = 0) {
- const char* result = 0;
--result = fl_password(label, deflt);
-+result = fl_password("%s", deflt, label);
- return result;
-   };
- 
-@@ -5282,20 +5282,20 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, 
PyObject *args)
- 
-   void fl_mt_message(const char* text) {
- Py_BEGIN_ALLOW_THREADS;
--fl_message(text);
-+fl_message("%s", text);
- Py_END_ALLOW_THREADS;
-   };
- 
-   void fl_mt_alert(const char* text) {
- Py_BEGIN_ALLOW_THREADS;
--fl_alert(text);
-+fl_alert("%s", text);
- Py_END_ALLOW_THREADS;
-   };
- 
-   int fl_mt_ask(const char* text) {
- int status = 0;
- Py_BEGIN_ALLOW_THREADS;
--status = fl_ask(text);
-+status = fl_ask("%s", text);
- Py_END_ALLOW_THREADS;
- return status;
-   };
-@@ -5303,7 +5303,7 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject 
*args)
-   int fl_mt_choice(const char *q,const char *b0,const char *b1,const char 
*b2) {
- int status = 0;
- Py_BEGIN_ALLOW_THREADS;
--status = fl_choice(q, b0, b1, b2);
-+status = fl_choice("%s", b0, b1, b2, q);
- Py_END_ALLOW_THREADS;
- return status;
-   };
-@@ -5311,7 +5311,7 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject 
*args)
-   const char *fl_mt_input(const char *label, const char *deflt = 0) {
- const char* result = 0;
- Py_BEGIN_ALLOW_THREADS;
--result = fl_input(label, deflt);
-+result = fl_input("%s", deflt, label);
- Py_END_ALLOW_THREADS;
- return result;
-   };
-@@ -5319,7 +5319,7 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject 
*args)
-   const char *fl_mt_password(const char *label, const char *deflt = 0) {
- const char* result = 0;
- Py_BEGIN_ALLOW_THREADS;
--result = fl_password(label, deflt);
-+result = fl_password("%s", deflt, label);
- Py_END_ALLOW_THREADS;
- return result;
-   };

diff --git a/dev-python/pyfltk/files/pyfltk-1.3.0-linux-3.x-detection.patch 
b/dev-python/pyfltk/files/pyfltk-1.3.0-linux-3.x-detection.patch
deleted file mode 100644
index 9b084616c87..000
--- a/dev-python/pyfltk/files/pyfltk-1.3.0-linux-3.x-detection.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=375253
-
-http://lipyrary.blogspot.com/2011/09/python-and-linux-kernel-30-sysplatform.html
-
 setup.py
-+++ setup.py
-@@ -76,7 +76,7 @@
- lib_dir_list = [fltk_lib_dir]
- lib_list = ["fltk", "kernel32", "user32", "gdi32", "winspool", 
"comdlg32", 

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

2017-03-10 Thread Zac Medico
commit: f3b68849011e161f6f317100457463571a8b3e83
Author: Zac Medico  gentoo  org>
AuthorDate: Fri Mar 10 09:42:47 2017 +
Commit: Zac Medico  gentoo  org>
CommitDate: Fri Mar 10 09:42:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3b68849

dev-python/pyfltk: Add python3_6 to PYTHON_COMPAT

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 dev-python/pyfltk/pyfltk-1.3.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/pyfltk/pyfltk-1.3.3.ebuild 
b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
index c51e6e5e86a..c668e224574 100644
--- a/dev-python/pyfltk/pyfltk-1.3.3.ebuild
+++ b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # FIXME: MakeSwig.py execution should be made work from pyfltk-1.1.5.ebuild
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic



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

2015-11-12 Thread Justin Lecher
commit: 0ff0f4b7589d62f1ad84252b2a31143310363ad1
Author: Justin Lecher  gentoo  org>
AuthorDate: Thu Nov 12 16:38:22 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Nov 12 16:38:29 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ff0f4b7

dev-python/pyfltk: Require thread support in python

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

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

 dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild | 1 +
 dev-python/pyfltk/pyfltk-1.3.3.ebuild| 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild 
b/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild
index 845f7a2..eac4dbc 100644
--- a/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild
+++ b/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild
@@ -7,6 +7,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic
 

diff --git a/dev-python/pyfltk/pyfltk-1.3.3.ebuild 
b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
index 73c3a14..921e894 100644
--- a/dev-python/pyfltk/pyfltk-1.3.3.ebuild
+++ b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
@@ -7,6 +7,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic
 



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

2015-11-08 Thread Justin Lecher
commit: cdb612fb936f3c2b341a6cf3485d7607cc5fdd83
Author: Justin Lecher  gentoo  org>
AuthorDate: Sun Nov  8 16:16:59 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Nov  8 16:27:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdb612fb

dev-python/pyfltk: Update supported python implementations and move to SLOT=0

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

 dev-python/pyfltk/pyfltk-1.3.3.ebuild | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dev-python/pyfltk/pyfltk-1.3.3.ebuild 
b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
index 50f988d..73c3a14 100644
--- a/dev-python/pyfltk/pyfltk-1.3.3.ebuild
+++ b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_{3,4,5} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit distutils-r1 flag-o-matic
 
@@ -18,11 +18,14 @@ HOMEPAGE="http://pyfltk.sourceforge.net/;
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz -> ${MY_PN}.tar.gz"
 
 LICENSE="LGPL-2"
-SLOT="1"
+SLOT="0"
 KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE="doc"
 
-DEPEND=">=x11-libs/fltk-1.3.0:1[opengl]"
+DEPEND="
+   >=x11-libs/fltk-1.3.0:1[opengl]
+   !dev-python/pyfltk:1
+   "
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_PN}



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

2015-11-07 Thread Markus Meier
commit: 6a6402dc7e9d1ac7a7a6a2756d8dc086a3c78262
Author: Markus Meier  gentoo  org>
AuthorDate: Sat Nov  7 12:08:16 2015 +
Commit: Markus Meier  gentoo  org>
CommitDate: Sat Nov  7 12:08:16 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a6402dc

dev-python/pyfltk: arm stable, bug #563184

Package-Manager: portage-2.2.23
RepoMan-Options: --include-arches="arm"

 dev-python/pyfltk/pyfltk-1.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pyfltk/pyfltk-1.3.3.ebuild 
b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
index 586a16e..50f988d 100644
--- a/dev-python/pyfltk/pyfltk-1.3.3.ebuild
+++ b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz -> 
${MY_PN}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="1"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE="doc"
 
 DEPEND=">=x11-libs/fltk-1.3.0:1[opengl]"



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

2015-11-07 Thread Jeroen Roovers
commit: b39f2acde24b95c4be5ed1e83c3a0d71fc58ab11
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Nov  8 06:53:39 2015 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Nov  8 06:53:39 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b39f2acd

dev-python/pyfltk: Old.

Package-Manager: portage-2.2.24

 dev-python/pyfltk/Manifest |  1 -
 .../files/pyfltk-1.3.0-format-security.patch   | 74 --
 .../files/pyfltk-1.3.0-linux-3.x-detection.patch   | 15 -
 dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild   | 50 ---
 4 files changed, 140 deletions(-)

diff --git a/dev-python/pyfltk/Manifest b/dev-python/pyfltk/Manifest
index 6f52b44..44b0eeb 100644
--- a/dev-python/pyfltk/Manifest
+++ b/dev-python/pyfltk/Manifest
@@ -1,2 +1 @@
-DIST pyFltk-1.3.0.tar.gz 915600 SHA256 
c52852d21ee17d495185259b46ac9603d683edde7d7e6d4b6f9268da4ee3de57 SHA512 
908a6d9581741454440da92fe921f0a2a01be86a5ec01cbbf2d953eb5f0437efd8e635d7bff6c18015afc877a984872a6592df834709f93a1287307e17fbcc61
 WHIRLPOOL 
62281ef5c798986f1af82da53887fe40a6cd4f4bcfe7fab8d60fc7f3c4ad9cc2d481ced6b2e2bad7638ef843b9dcf396aa246838f173d2afaeaac530e0236d3b
 DIST pyFltk-1.3.3.tar.gz 946763 SHA256 
246b92c99b8d5610532456a4c956b355f6140514324916cf35efbe6468c4a188 SHA512 
dd4bbef8e82d455237dd085622e78e046ac522449fe63610ee5405c24d759482a89aeab07435fefb5223db78cc1f810f1eca8355afb1d0ff3e4b5e10b73bef8f
 WHIRLPOOL 
8d94349db36cd78722e75c9e1cef088e0f2743bd522eb0496f76faf70a159d6987902f308478a992bd7f2cb62a5bb770a80eee25c3e9feaf08b513956ce1

diff --git a/dev-python/pyfltk/files/pyfltk-1.3.0-format-security.patch 
b/dev-python/pyfltk/files/pyfltk-1.3.0-format-security.patch
deleted file mode 100644
index f29b7b3..000
--- a/dev-python/pyfltk/files/pyfltk-1.3.0-format-security.patch
+++ /dev/null
@@ -1,74 +0,0 @@
- python/fltk_wrap.cpp | 16 
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/python/fltk_wrap.cpp b/python/fltk_wrap.cpp
-index 9c16f59..ad42e89 100644
 a/python/fltk_wrap.cpp
-+++ b/python/fltk_wrap.cpp
-@@ -5238,13 +5238,13 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, 
PyObject *args)
- 
-   const char *fl_vararg_input(const char *label, const char *deflt = 0) {
- const char* result = 0;
--result = fl_input(label, deflt);
-+result = fl_input("%s", deflt, label);
- return result;
-   };
- 
-   const char *fl_vararg_password(const char *label, const char *deflt = 0) {
- const char* result = 0;
--result = fl_password(label, deflt);
-+result = fl_password("%s", deflt, label);
- return result;
-   };
- 
-@@ -5282,20 +5282,20 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, 
PyObject *args)
- 
-   void fl_mt_message(const char* text) {
- Py_BEGIN_ALLOW_THREADS;
--fl_message(text);
-+fl_message("%s", text);
- Py_END_ALLOW_THREADS;
-   };
- 
-   void fl_mt_alert(const char* text) {
- Py_BEGIN_ALLOW_THREADS;
--fl_alert(text);
-+fl_alert("%s", text);
- Py_END_ALLOW_THREADS;
-   };
- 
-   int fl_mt_ask(const char* text) {
- int status = 0;
- Py_BEGIN_ALLOW_THREADS;
--status = fl_ask(text);
-+status = fl_ask("%s", text);
- Py_END_ALLOW_THREADS;
- return status;
-   };
-@@ -5303,7 +5303,7 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject 
*args)
-   int fl_mt_choice(const char *q,const char *b0,const char *b1,const char 
*b2) {
- int status = 0;
- Py_BEGIN_ALLOW_THREADS;
--status = fl_choice(q, b0, b1, b2);
-+status = fl_choice("%s", b0, b1, b2, q);
- Py_END_ALLOW_THREADS;
- return status;
-   };
-@@ -5311,7 +5311,7 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject 
*args)
-   const char *fl_mt_input(const char *label, const char *deflt = 0) {
- const char* result = 0;
- Py_BEGIN_ALLOW_THREADS;
--result = fl_input(label, deflt);
-+result = fl_input("%s", deflt, label);
- Py_END_ALLOW_THREADS;
- return result;
-   };
-@@ -5319,7 +5319,7 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject 
*args)
-   const char *fl_mt_password(const char *label, const char *deflt = 0) {
- const char* result = 0;
- Py_BEGIN_ALLOW_THREADS;
--result = fl_password(label, deflt);
-+result = fl_password("%s", deflt, label);
- Py_END_ALLOW_THREADS;
- return result;
-   };

diff --git a/dev-python/pyfltk/files/pyfltk-1.3.0-linux-3.x-detection.patch 
b/dev-python/pyfltk/files/pyfltk-1.3.0-linux-3.x-detection.patch
deleted file mode 100644
index 9b08461..000
--- a/dev-python/pyfltk/files/pyfltk-1.3.0-linux-3.x-detection.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=375253
-
-http://lipyrary.blogspot.com/2011/09/python-and-linux-kernel-30-sysplatform.html
-
 setup.py
-+++ setup.py
-@@ -76,7 +76,7 @@
- lib_dir_list = [fltk_lib_dir]
- lib_list = ["fltk", "kernel32", "user32", "gdi32", "winspool", 
"comdlg32", 

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

2015-11-07 Thread Jeroen Roovers
commit: 8dcfe8ce03453de9d677ad1211379e245e62564c
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Nov  8 06:56:44 2015 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Nov  8 06:56:44 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dcfe8ce

dev-python/pyfltk: Clean up patch.

Package-Manager: portage-2.2.24

 dev-python/pyfltk/files/fltk_wrap.patch   | 5 ++---
 dev-python/pyfltk/files/ignore-func.patch | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-python/pyfltk/files/fltk_wrap.patch 
b/dev-python/pyfltk/files/fltk_wrap.patch
index 5a3904e..e0c7ba3 100644
--- a/dev-python/pyfltk/files/fltk_wrap.patch
+++ b/dev-python/pyfltk/files/fltk_wrap.patch
@@ -1,6 +1,5 @@
-diff -ur pyFltk-1.3.3.orig/python/fltk_wrap.cpp 
pyFltk-1.3.3/python/fltk_wrap.cpp
 python/fltk_wrap.cpp2015-01-03 18:31:21.0 +0800
-+++ python/fltk_wrap.cpp2015-06-23 22:26:23.453212512 +0800
+--- a/python/fltk_wrap.cpp
 b/python/fltk_wrap.cpp
 @@ -144,7 +144,9 @@
  # define _SCL_SECURE_NO_DEPRECATE
  #endif

diff --git a/dev-python/pyfltk/files/ignore-func.patch 
b/dev-python/pyfltk/files/ignore-func.patch
index e4e9f3b..a61f4cd 100644
--- a/dev-python/pyfltk/files/ignore-func.patch
+++ b/dev-python/pyfltk/files/ignore-func.patch
@@ -1,4 +1,5 @@
 http://sourceforge.net/p/pyfltk/code/506/
+
 --- a/swig/filename.i
 +++ b/swig/filename.i
 @@ -14,6 +14,7 @@



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

2015-11-07 Thread Michał Górny
commit: f7817bf4b4c48d0bee680b4a64690c15023a0c95
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Nov  8 07:49:42 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Nov  8 07:49:42 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7817bf4

dev-python/pyfltk: Revert "Old."

Restore the last ebuild that supported python2.7.

Reverts: b39f2acde2 ("dev-python/pyfltk: Old.")

 dev-python/pyfltk/Manifest |  1 +
 .../files/pyfltk-1.3.0-format-security.patch   | 74 ++
 .../files/pyfltk-1.3.0-linux-3.x-detection.patch   | 15 +
 dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild   | 50 +++
 4 files changed, 140 insertions(+)

diff --git a/dev-python/pyfltk/Manifest b/dev-python/pyfltk/Manifest
index 44b0eeb..6f52b44 100644
--- a/dev-python/pyfltk/Manifest
+++ b/dev-python/pyfltk/Manifest
@@ -1 +1,2 @@
+DIST pyFltk-1.3.0.tar.gz 915600 SHA256 
c52852d21ee17d495185259b46ac9603d683edde7d7e6d4b6f9268da4ee3de57 SHA512 
908a6d9581741454440da92fe921f0a2a01be86a5ec01cbbf2d953eb5f0437efd8e635d7bff6c18015afc877a984872a6592df834709f93a1287307e17fbcc61
 WHIRLPOOL 
62281ef5c798986f1af82da53887fe40a6cd4f4bcfe7fab8d60fc7f3c4ad9cc2d481ced6b2e2bad7638ef843b9dcf396aa246838f173d2afaeaac530e0236d3b
 DIST pyFltk-1.3.3.tar.gz 946763 SHA256 
246b92c99b8d5610532456a4c956b355f6140514324916cf35efbe6468c4a188 SHA512 
dd4bbef8e82d455237dd085622e78e046ac522449fe63610ee5405c24d759482a89aeab07435fefb5223db78cc1f810f1eca8355afb1d0ff3e4b5e10b73bef8f
 WHIRLPOOL 
8d94349db36cd78722e75c9e1cef088e0f2743bd522eb0496f76faf70a159d6987902f308478a992bd7f2cb62a5bb770a80eee25c3e9feaf08b513956ce1

diff --git a/dev-python/pyfltk/files/pyfltk-1.3.0-format-security.patch 
b/dev-python/pyfltk/files/pyfltk-1.3.0-format-security.patch
new file mode 100644
index 000..f29b7b3
--- /dev/null
+++ b/dev-python/pyfltk/files/pyfltk-1.3.0-format-security.patch
@@ -0,0 +1,74 @@
+ python/fltk_wrap.cpp | 16 
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/python/fltk_wrap.cpp b/python/fltk_wrap.cpp
+index 9c16f59..ad42e89 100644
+--- a/python/fltk_wrap.cpp
 b/python/fltk_wrap.cpp
+@@ -5238,13 +5238,13 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, 
PyObject *args)
+ 
+   const char *fl_vararg_input(const char *label, const char *deflt = 0) {
+ const char* result = 0;
+-result = fl_input(label, deflt);
++result = fl_input("%s", deflt, label);
+ return result;
+   };
+ 
+   const char *fl_vararg_password(const char *label, const char *deflt = 0) {
+ const char* result = 0;
+-result = fl_password(label, deflt);
++result = fl_password("%s", deflt, label);
+ return result;
+   };
+ 
+@@ -5282,20 +5282,20 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, 
PyObject *args)
+ 
+   void fl_mt_message(const char* text) {
+ Py_BEGIN_ALLOW_THREADS;
+-fl_message(text);
++fl_message("%s", text);
+ Py_END_ALLOW_THREADS;
+   };
+ 
+   void fl_mt_alert(const char* text) {
+ Py_BEGIN_ALLOW_THREADS;
+-fl_alert(text);
++fl_alert("%s", text);
+ Py_END_ALLOW_THREADS;
+   };
+ 
+   int fl_mt_ask(const char* text) {
+ int status = 0;
+ Py_BEGIN_ALLOW_THREADS;
+-status = fl_ask(text);
++status = fl_ask("%s", text);
+ Py_END_ALLOW_THREADS;
+ return status;
+   };
+@@ -5303,7 +5303,7 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject 
*args)
+   int fl_mt_choice(const char *q,const char *b0,const char *b1,const char 
*b2) {
+ int status = 0;
+ Py_BEGIN_ALLOW_THREADS;
+-status = fl_choice(q, b0, b1, b2);
++status = fl_choice("%s", b0, b1, b2, q);
+ Py_END_ALLOW_THREADS;
+ return status;
+   };
+@@ -5311,7 +5311,7 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject 
*args)
+   const char *fl_mt_input(const char *label, const char *deflt = 0) {
+ const char* result = 0;
+ Py_BEGIN_ALLOW_THREADS;
+-result = fl_input(label, deflt);
++result = fl_input("%s", deflt, label);
+ Py_END_ALLOW_THREADS;
+ return result;
+   };
+@@ -5319,7 +5319,7 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject 
*args)
+   const char *fl_mt_password(const char *label, const char *deflt = 0) {
+ const char* result = 0;
+ Py_BEGIN_ALLOW_THREADS;
+-result = fl_password(label, deflt);
++result = fl_password("%s", deflt, label);
+ Py_END_ALLOW_THREADS;
+ return result;
+   };

diff --git a/dev-python/pyfltk/files/pyfltk-1.3.0-linux-3.x-detection.patch 
b/dev-python/pyfltk/files/pyfltk-1.3.0-linux-3.x-detection.patch
new file mode 100644
index 000..9b08461
--- /dev/null
+++ b/dev-python/pyfltk/files/pyfltk-1.3.0-linux-3.x-detection.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/show_bug.cgi?id=375253
+
+http://lipyrary.blogspot.com/2011/09/python-and-linux-kernel-30-sysplatform.html
+
+--- setup.py
 setup.py
+@@ -76,7 +76,7 @@
+ lib_dir_list = [fltk_lib_dir]
+ lib_list = ["fltk", 

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

2015-11-03 Thread Agostino Sarubbo
commit: 05154726704c681549c1eef1ed859440df5286f5
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Nov  3 16:17:43 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Nov  3 16:17:43 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05154726

dev-python/pyfltk: x86 stable wrt bug #563184

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"

 dev-python/pyfltk/pyfltk-1.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pyfltk/pyfltk-1.3.3.ebuild 
b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
index 270c811..586a16e 100644
--- a/dev-python/pyfltk/pyfltk-1.3.3.ebuild
+++ b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz -> 
${MY_PN}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="1"
-KEYWORDS="amd64 ~arm ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="doc"
 
 DEPEND=">=x11-libs/fltk-1.3.0:1[opengl]"



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

2015-10-30 Thread Agostino Sarubbo
commit: 3b46a57cf5b853e39241780edccb921ced7f6cb2
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Oct 30 10:14:11 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Oct 30 10:15:12 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b46a57c

dev-python/pyfltk: ppc stable wrt bug #563184

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="ppc"

 dev-python/pyfltk/pyfltk-1.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pyfltk/pyfltk-1.3.3.ebuild 
b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
index 3d8ee69..270c811 100644
--- a/dev-python/pyfltk/pyfltk-1.3.3.ebuild
+++ b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz -> 
${MY_PN}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 ~x86"
 IUSE="doc"
 
 DEPEND=">=x11-libs/fltk-1.3.0:1[opengl]"



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

2015-10-25 Thread Jeroen Roovers
commit: 04320a530566ab8eee80b8eb12a8772a02e7039d
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Oct 25 06:13:20 2015 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Oct 25 06:13:20 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04320a53

dev-python/pyfltk: Stable for PPC64 (bug #563184).

Package-Manager: portage-2.2.23
RepoMan-Options: --ignore-arches

 dev-python/pyfltk/pyfltk-1.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pyfltk/pyfltk-1.3.3.ebuild 
b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
index 3638bc7..3d8ee69 100644
--- a/dev-python/pyfltk/pyfltk-1.3.3.ebuild
+++ b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz -> 
${MY_PN}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ppc64 ~x86"
 IUSE="doc"
 
 DEPEND=">=x11-libs/fltk-1.3.0:1[opengl]"



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

2015-10-23 Thread Agostino Sarubbo
commit: fdb3093bbc55a0fb2d6e55ae5da3f90c5766bc6a
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Oct 23 09:05:13 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Oct 23 09:05:13 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdb3093b

dev-python/pyfltk: amd64 stable wrt bug #563184

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

 dev-python/pyfltk/pyfltk-1.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pyfltk/pyfltk-1.3.3.ebuild 
b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
index c79b4ad..3638bc7 100644
--- a/dev-python/pyfltk/pyfltk-1.3.3.ebuild
+++ b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz -> 
${MY_PN}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="doc"
 
 DEPEND=">=x11-libs/fltk-1.3.0:1[opengl]"



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

2015-10-19 Thread Justin Lecher
commit: 302ae0010b6ab72106219f4fafafb8fd35e7d822
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Oct 19 14:06:14 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Oct 19 16:29:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=302ae001

dev-python/pyfltk: Add python3.5 support

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

 dev-python/pyfltk/pyfltk-1.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pyfltk/pyfltk-1.3.3.ebuild 
b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
index 2ea7dd2..c79b4ad 100644
--- a/dev-python/pyfltk/pyfltk-1.3.3.ebuild
+++ b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{3_3,3_4} )
+PYTHON_COMPAT=( python3_{3,4,5} )
 
 inherit distutils-r1 flag-o-matic
 



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

2015-09-23 Thread Agostino Sarubbo
commit: 2f9f267eb8c61fe7ab613f40e60bc5d2178153f2
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Sep 23 12:51:02 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Sep 23 12:51:52 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f9f267e

dev-python/pyfltk: ppc64 stable wrt bug #552940

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="ppc64"

 dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild 
b/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild
index 34bb043..845f7a2 100644
--- a/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild
+++ b/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE="doc"
 
 DEPEND=">=x11-libs/fltk-1.3.0:1[opengl]"



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

2015-09-23 Thread Justin Lecher
commit: b37aca6a9ca8a3ee051f2ecd7e1c7e5f7e63657c
Author: Justin Lecher  gentoo  org>
AuthorDate: Wed Sep 23 13:00:58 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Wed Sep 23 13:04:30 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b37aca6a

dev-python/pyfltk: Drop old

Package-Manager: portage-2.2.21
Signed-off-by: Justin Lecher  gentoo.org>

 dev-python/pyfltk/pyfltk-1.3.0-r1.ebuild | 46 
 1 file changed, 46 deletions(-)

diff --git a/dev-python/pyfltk/pyfltk-1.3.0-r1.ebuild 
b/dev-python/pyfltk/pyfltk-1.3.0-r1.ebuild
deleted file mode 100644
index 6cbe1a8..000
--- a/dev-python/pyfltk/pyfltk-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# FIXME: MakeSwig.py execution should be made work from pyfltk-1.1.5.ebuild
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 flag-o-matic
-
-MY_P=pyFltk-${PV}
-
-DESCRIPTION="Python interface to Fltk library"
-HOMEPAGE="http://pyfltk.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE="doc"
-
-DEPEND=">=x11-libs/fltk-1.3.0:1[opengl]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-   local PATCHES=(
-   "${FILESDIR}"/${P}-linux-3.x-detection.patch
-   )
-
-   # Disable installation of documentation and tests.
-   sed -i -e '/package_data=/d' setup.py || die
-
-   distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-   append-flags -fno-strict-aliasing
-}
-
-python_install_all() {
-   use doc && local HTML_DOCS=( fltk/docs/. )
-   distutils-r1_python_install_all
-}