[gentoo-commits] repo/gentoo:master commit in: media-gfx/printrun/files/, media-gfx/printrun/

2017-12-18 Thread Amy Liffey 
commit: 910314d89f11de81ceddc7963f07d5a5fc3249b9
Author: Amy Liffey  gentoo  org>
AuthorDate: Mon Dec 18 18:38:31 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Mon Dec 18 18:45:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=910314d8

media-gfx/printrun: remove oversized patch

Closes: https://bugs.gentoo.org/640754
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 media-gfx/printrun/Manifest|   1 +
 media-gfx/printrun/files/printrun-gtk3.patch   | 291 -
 media-gfx/printrun/printrun-20150310-r1.ebuild |  34 ---
 ...50310-r2.ebuild => printrun-20150310-r3.ebuild} |   7 +-
 media-gfx/printrun/printrun-.ebuild|   8 +-
 5 files changed, 12 insertions(+), 329 deletions(-)

diff --git a/media-gfx/printrun/Manifest b/media-gfx/printrun/Manifest
index 3cf6a004f27..199ff2b7c81 100644
--- a/media-gfx/printrun/Manifest
+++ b/media-gfx/printrun/Manifest
@@ -1 +1,2 @@
 DIST printrun-20150310.tar.gz 906153 BLAKE2B 
60671cab6661deb4f4d127f276b4ce545df161023e57e6ef8ca857c0fd8a41ccdfc1f1811fe854dc156fa8b328b4e3d12038f07bb43aa1b20f03ed612c15aaa4
 SHA512 
359a4a6128b274a6709fb5c35a2d6c510bb57e010cfb12ddefa39cdb371f2141e2cab394be7d9d2f1dbc0175cc24deba61941d73b6c19fb299083afbf1141f1e
+DIST printrun-gtk3.tar.xz 3824 BLAKE2B 
cc45bcc7f7ddc8a961e86b83d731a9860285206d06f3a2b2bf70327b88d1e496f6bda3756182d99d85ae237d20188959e0efa94002371c0ffaa3a185fbe32c4e
 SHA512 
8eece239ac40fe293709117b42111a5bc31e95edd0cbdfc52ae38c5d91dded777a365fdd52d996c159fe83ecbd9fb6b3318a7622eb524db316771756a684cc9e

diff --git a/media-gfx/printrun/files/printrun-gtk3.patch 
b/media-gfx/printrun/files/printrun-gtk3.patch
deleted file mode 100644
index a31bcd15580..000
--- a/media-gfx/printrun/files/printrun-gtk3.patch
+++ /dev/null
@@ -1,291 +0,0 @@
-diff -up a/printrun/gui/controls.py.gtk3 a/printrun/gui/controls.py
 a/printrun/gui/controls.py.gtk32015-03-09 07:22:14.0 -0400
-+++ a/printrun/gui/controls.py 2015-08-11 23:43:27.444624125 -0400
-@@ -136,7 +136,7 @@ def add_extra_controls(self, root, paren
- if root.settings.last_temperature not in map(float, root.temps.values()):
- htemp_choices = [str(root.settings.last_temperature)] + htemp_choices
- root.htemp = wx.ComboBox(parentpanel, -1, choices = htemp_choices,
-- style = wx.CB_DROPDOWN, size = (80, -1))
-+ style = wx.CB_DROPDOWN, size = (115, -1))
- root.htemp.SetToolTip(wx.ToolTip(_("Select Temperature for Hotend")))
- root.htemp.Bind(wx.EVT_COMBOBOX, root.htemp_change)
- 
-@@ -156,7 +156,7 @@ def add_extra_controls(self, root, paren
- if root.settings.last_bed_temperature not in map(float, 
root.bedtemps.values()):
- btemp_choices = [str(root.settings.last_bed_temperature)] + 
btemp_choices
- root.btemp = wx.ComboBox(parentpanel, -1, choices = btemp_choices,
-- style = wx.CB_DROPDOWN, size = (80, -1))
-+ style = wx.CB_DROPDOWN, size = (115, -1))
- root.btemp.SetToolTip(wx.ToolTip(_("Select Temperature for Heated Bed")))
- root.btemp.Bind(wx.EVT_COMBOBOX, root.btemp_change)
- add("btemp_val", root.btemp)
-@@ -192,7 +192,11 @@ def add_extra_controls(self, root, paren
- root.speed_slider = wx.Slider(speedpanel, -1, 100, 1, 300)
- speedsizer.Add(root.speed_slider, 1, flag = wx.EXPAND)
- 
--root.speed_spin = FloatSpin(speedpanel, -1, value = 100, min_val = 1, 
max_val = 300, digits = 0, style = wx.ALIGN_LEFT, size = (80, -1))
-+if wx.VERSION < (3, 0):
-+root.speed_spin = FloatSpin(speedpanel, -1, value = 100, min_val = 1, 
max_val = 300, digits = 0, style = wx.ALIGN_LEFT, size = (80, -1))
-+else:
-+root.speed_spin = wx.SpinCtrlDouble(speedpanel, -1, initial = 100, 
min = 1, max = 300, style = wx.ALIGN_LEFT, size = (115, -1))
-+root.speed_spin.SetDigits(0)
- speedsizer.Add(root.speed_spin, 0, flag = wx.ALIGN_CENTER_VERTICAL)
- root.speed_label = wx.StaticText(speedpanel, -1, _("%"))
- speedsizer.Add(root.speed_label, flag = wx.ALIGN_CENTER_VERTICAL | 
wx.ALIGN_RIGHT)
-@@ -210,7 +214,10 @@ def add_extra_controls(self, root, paren
- value = root.speed_spin.GetValue()
- root.speed_setbtn.SetBackgroundColour("red")
- root.speed_slider.SetValue(value)
--root.speed_spin.Bind(wx.EVT_SPINCTRL, speedslider_spin)
-+if wx.VERSION < (3, 0):
-+root.speed_spin.Bind(wx.EVT_SPINCTRL, speedslider_spin)
-+else:
-+root.speed_spin.Bind(wx.EVT_SPINCTRLDOUBLE, speedslider_spin)
- 
- def speedslider_scroll(event):
- value = root.speed_slider.GetValue()
-@@ -269,10 +276,15 @@ def add_extra_controls(self, root, paren
- esettingspanel = root.newPanel(parentpanel)
- esettingssizer = wx.GridBagSizer()
- esettingssizer.SetEmptyCellSize((0, 0))
--root.edist = FloatSpin(esettingspanel, -1, value =

[gentoo-commits] repo/gentoo:master commit in: media-gfx/printrun/files/, media-gfx/printrun/

2017-07-21 Thread Amy Liffey 
commit: 8a4a79755723ab19462a8606c69d92d2d19eaf78
Author: Amy Liffey  gentoo  org>
AuthorDate: Fri Jul 21 18:47:49 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Fri Jul 21 18:51:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a4a7975

media-gfx/printrun: fix dependencies, remove old versions

- Remove old versions, patches
- Remove old patch from 999

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 media-gfx/printrun/Manifest|   1 -
 .../files/printrun-no-py-in-binaries.patch | 396 -
 media-gfx/printrun/printrun-20140730.ebuild|  30 --
 ....ebuild => printrun-20150310-r2.ebuild} |  23 +-
 media-gfx/printrun/printrun-20150310.ebuild|  26 --
 media-gfx/printrun/printrun-.ebuild|  18 +-
 6 files changed, 25 insertions(+), 469 deletions(-)

diff --git a/media-gfx/printrun/Manifest b/media-gfx/printrun/Manifest
index c5da39cf85c..c7f22ab4142 100644
--- a/media-gfx/printrun/Manifest
+++ b/media-gfx/printrun/Manifest
@@ -1,2 +1 @@
-DIST printrun-20140730.tar.gz 902029 SHA256 
3412882627a82bba0fcd0cdf7639074085d3355e5aef48ccdc91687b027a24fa SHA512 
c60d3db1a9255a56aad30a8290e18707cc34774af8cc52be042a3fabe653a64874485a153763886458cb45fff718ba134642e530a9d065fcc42ae0473ee17da8
 WHIRLPOOL 
1f8c91e867a375df998248d31bda0c5901d1ba52071aee12acea42a53b44393332a86562ea96c58801bde63a961d4af14b05f4defc45cfe1f41061a4ee9438e1
 DIST printrun-20150310.tar.gz 906153 SHA256 
6edaa533df5a590f55039b81e47f61881d2a47de07c3391d53bfb6d847f46d2e SHA512 
359a4a6128b274a6709fb5c35a2d6c510bb57e010cfb12ddefa39cdb371f2141e2cab394be7d9d2f1dbc0175cc24deba61941d73b6c19fb299083afbf1141f1e
 WHIRLPOOL 
38d3ead2be8fb7f802d73956bda5e83c99a902c2682f5c48f74d92e8c5e30b351b06821d6178d3b44722a10982d7a79c471fb3a27d2f313bfb647e9a241e92e1

diff --git a/media-gfx/printrun/files/printrun-no-py-in-binaries.patch 
b/media-gfx/printrun/files/printrun-no-py-in-binaries.patch
deleted file mode 100644
index 250af5fd26a..000
--- a/media-gfx/printrun/files/printrun-no-py-in-binaries.patch
+++ /dev/null
@@ -1,396 +0,0 @@
-diff -urN Printrun-printrun-20140730.old/plater 
Printrun-printrun-20140730/plater
 Printrun-printrun-20140730.old/plater  1970-01-01 01:00:00.0 
+0100
-+++ Printrun-printrun-20140730/plater  2014-06-06 12:04:34.0 +0200
-@@ -0,0 +1,27 @@
-+#!/usr/bin/env python
-+
-+# This file is part of the Printrun suite.
-+#
-+# Printrun is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation, either version 3 of the License, or
-+# (at your option) any later version.
-+#
-+# Printrun is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with Printrun.  If not, see .
-+
-+import sys
-+import wx
-+
-+from printrun.stlplater import StlPlater
-+
-+if __name__ == '__main__':
-+app = wx.App(False)
-+main = StlPlater(sys.argv[1:])
-+main.Show()
-+app.MainLoop()
-diff -urN Printrun-printrun-20140730.old/plater.py 
Printrun-printrun-20140730/plater.py
 Printrun-printrun-20140730.old/plater.py   2014-08-10 15:44:04.877086955 
+0200
-+++ Printrun-printrun-20140730/plater.py   1970-01-01 01:00:00.0 
+0100
-@@ -1,27 +0,0 @@
--#!/usr/bin/env python
--
--# This file is part of the Printrun suite.
--#
--# Printrun is free software: you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation, either version 3 of the License, or
--# (at your option) any later version.
--#
--# Printrun is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with Printrun.  If not, see .
--
--import sys
--import wx
--
--from printrun.stlplater import StlPlater
--
--if __name__ == '__main__':
--app = wx.App(False)
--main = StlPlater(sys.argv[1:])
--main.Show()
--app.MainLoop()
-diff -urN Printrun-printrun-20140730.old/printcore 
Printrun-printrun-20140730/printcore
 Printrun-printrun-20140730.old/printcore   1970-01-01 01:00:00.0 
+0100
-+++ Printrun-printrun-20140730/printcore   2014-06-06 12:04:34.0 
+0200
-@@ -0,0 +1,76 @@
-+#!/usr/bin/env python
-+
-+# This file is part of the Printrun suite.
-+#
-+# Printrun is free software: you can redistribute it and/or modify
-+# it under the terms

[gentoo-commits] repo/gentoo:master commit in: media-gfx/printrun/files/, media-gfx/printrun/

2017-07-15 Thread Pacho Ramos 
commit: cfcb21113f746f5f8cb8ea27d2c6f90819e790aa
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jul 15 10:18:11 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jul 15 10:18:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfcb2111

media-gfx/printrun: Apply Fedora fixes, also improving support with gtk3 and 
wxpython3

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-gfx/printrun/files/printrun-gtk3.patch   | 291 +
 media-gfx/printrun/files/printrun-x11.patch|  39 +++
 ....ebuild => printrun-20150310-r1.ebuild} |  18 +-
 media-gfx/printrun/printrun-.ebuild|  10 +-
 4 files changed, 353 insertions(+), 5 deletions(-)

diff --git a/media-gfx/printrun/files/printrun-gtk3.patch 
b/media-gfx/printrun/files/printrun-gtk3.patch
new file mode 100644
index 000..a31bcd15580
--- /dev/null
+++ b/media-gfx/printrun/files/printrun-gtk3.patch
@@ -0,0 +1,291 @@
+diff -up a/printrun/gui/controls.py.gtk3 a/printrun/gui/controls.py
+--- a/printrun/gui/controls.py.gtk32015-03-09 07:22:14.0 -0400
 a/printrun/gui/controls.py 2015-08-11 23:43:27.444624125 -0400
+@@ -136,7 +136,7 @@ def add_extra_controls(self, root, paren
+ if root.settings.last_temperature not in map(float, root.temps.values()):
+ htemp_choices = [str(root.settings.last_temperature)] + htemp_choices
+ root.htemp = wx.ComboBox(parentpanel, -1, choices = htemp_choices,
+- style = wx.CB_DROPDOWN, size = (80, -1))
++ style = wx.CB_DROPDOWN, size = (115, -1))
+ root.htemp.SetToolTip(wx.ToolTip(_("Select Temperature for Hotend")))
+ root.htemp.Bind(wx.EVT_COMBOBOX, root.htemp_change)
+ 
+@@ -156,7 +156,7 @@ def add_extra_controls(self, root, paren
+ if root.settings.last_bed_temperature not in map(float, 
root.bedtemps.values()):
+ btemp_choices = [str(root.settings.last_bed_temperature)] + 
btemp_choices
+ root.btemp = wx.ComboBox(parentpanel, -1, choices = btemp_choices,
+- style = wx.CB_DROPDOWN, size = (80, -1))
++ style = wx.CB_DROPDOWN, size = (115, -1))
+ root.btemp.SetToolTip(wx.ToolTip(_("Select Temperature for Heated Bed")))
+ root.btemp.Bind(wx.EVT_COMBOBOX, root.btemp_change)
+ add("btemp_val", root.btemp)
+@@ -192,7 +192,11 @@ def add_extra_controls(self, root, paren
+ root.speed_slider = wx.Slider(speedpanel, -1, 100, 1, 300)
+ speedsizer.Add(root.speed_slider, 1, flag = wx.EXPAND)
+ 
+-root.speed_spin = FloatSpin(speedpanel, -1, value = 100, min_val = 1, 
max_val = 300, digits = 0, style = wx.ALIGN_LEFT, size = (80, -1))
++if wx.VERSION < (3, 0):
++root.speed_spin = FloatSpin(speedpanel, -1, value = 100, min_val = 1, 
max_val = 300, digits = 0, style = wx.ALIGN_LEFT, size = (80, -1))
++else:
++root.speed_spin = wx.SpinCtrlDouble(speedpanel, -1, initial = 100, 
min = 1, max = 300, style = wx.ALIGN_LEFT, size = (115, -1))
++root.speed_spin.SetDigits(0)
+ speedsizer.Add(root.speed_spin, 0, flag = wx.ALIGN_CENTER_VERTICAL)
+ root.speed_label = wx.StaticText(speedpanel, -1, _("%"))
+ speedsizer.Add(root.speed_label, flag = wx.ALIGN_CENTER_VERTICAL | 
wx.ALIGN_RIGHT)
+@@ -210,7 +214,10 @@ def add_extra_controls(self, root, paren
+ value = root.speed_spin.GetValue()
+ root.speed_setbtn.SetBackgroundColour("red")
+ root.speed_slider.SetValue(value)
+-root.speed_spin.Bind(wx.EVT_SPINCTRL, speedslider_spin)
++if wx.VERSION < (3, 0):
++root.speed_spin.Bind(wx.EVT_SPINCTRL, speedslider_spin)
++else:
++root.speed_spin.Bind(wx.EVT_SPINCTRLDOUBLE, speedslider_spin)
+ 
+ def speedslider_scroll(event):
+ value = root.speed_slider.GetValue()
+@@ -269,10 +276,15 @@ def add_extra_controls(self, root, paren
+ esettingspanel = root.newPanel(parentpanel)
+ esettingssizer = wx.GridBagSizer()
+ esettingssizer.SetEmptyCellSize((0, 0))
+-root.edist = FloatSpin(esettingspanel, -1, value = 
root.settings.last_extrusion, min_val = 0, max_val = 1000, size = (90, -1), 
digits = 1)
++if wx.VERSION < (3, 0):
++root.edist = FloatSpin(esettingspanel, -1, value = 
root.settings.last_extrusion, min_val = 0, max_val = 1000, size = (90, -1), 
digits = 1)
++root.edist.Bind(wx.EVT_SPINCTRL, root.setfeeds)
++else:
++root.edist = wx.SpinCtrlDouble(esettingspanel, -1, initial = 
root.settings.last_extrusion, min = 0, max = 1000, size = (135, -1))
++root.edist.SetDigits(1)
++root.edist.Bind(wx.EVT_SPINCTRLDOUBLE, root.setfeeds)
+ root.edist.SetBackgroundColour((225, 200, 200))
+ root.edist.SetForegroundColour("black")
+-root.edist.Bind(wx.EVT_SPINCTRL, root.setfeeds)
+ root.edist.Bind(wx.EVT_TEXT, root.setfeeds)
+ add("edist_label", wx.StaticText(esettingspanel, -1, _("Length:")), 
container