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

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

Package-Manager: Portage-2.3.6, Repoman-2.3.1

6 files changed, 49 insertions, 461 deletions

diff --git a/media-gfx/printrun/Manifest b/media-gfx/printrun/Manifest
index c5da39cf85cc..c7f22ab4142d 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 250af5fd26ae..000000000000
--- 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.000000000 +0100
-+++ Printrun-printrun-20140730/plater	2014-06-06 12:04:34.000000000 +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 <http://www.gnu.org/licenses/>.
-+
-+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.000000000 +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 <http://www.gnu.org/licenses/>.
--
--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.000000000 +0100
-+++ Printrun-printrun-20140730/printcore	2014-06-06 12:04:34.000000000 +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 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 <http://www.gnu.org/licenses/>.
-+
-+import time
-+import getopt
-+import sys
-+
-+from printrun.printcore import printcore
-+from printrun import gcoder
-+
-+if __name__ == '__main__':
-+    baud = 115200
-+    loud = False
-+    statusreport = False
-+    try:
-+        opts, args = getopt.getopt(sys.argv[1:], "h,b:,v,s",
-+                                   ["help", "baud", "verbose", "statusreport"])
-+    except getopt.GetoptError, err:
-+        print str(err)
-+        sys.exit(2)
-+    for o, a in opts:
-+        if o in ('-h', '--help'):
-+            # FIXME: Fix help
-+            print ("Opts are: --help, -b --baud = baudrate, -v --verbose, "
-+                   "-s --statusreport")
-+            sys.exit(1)
-+        if o in ('-b', '--baud'):
-+            baud = int(a)
-+        if o in ('-v', '--verbose'):
-+            loud = True
-+        elif o in ('-s', '--statusreport'):
-+            statusreport = True
-+
-+    if len(args) > 1:
-+        port = args[-2]
-+        filename = args[-1]
-+        print "Printing: %s on %s with baudrate %d" % (filename, port, baud)
-+    else:
-+        print "Usage: python [-h|-b|-v|-s] printcore.py /dev/tty[USB|ACM]x filename.gcode"
-+        sys.exit(2)
-+    p = printcore(port, baud)
-+    p.loud = loud
-+    time.sleep(2)
-+    gcode = [i.strip() for i in open(filename)]
-+    gcode = gcoder.LightGCode(gcode)
-+    p.startprint(gcode)
-+
-+    try:
-+        if statusreport:
-+            p.loud = False
-+            sys.stdout.write("Progress: 00.0%\r")
-+            sys.stdout.flush()
-+        while p.printing:
-+            time.sleep(1)
-+            if statusreport:
-+                progress = 100 * float(p.queueindex) / len(p.mainqueue)
-+                sys.stdout.write("Progress: %02.1f%%\r" % progress)
-+                sys.stdout.flush()
-+        p.disconnect()
-+        sys.exit(0)
-+    except:
-+        p.disconnect()
-diff -urN Printrun-printrun-20140730.old/printcore.py Printrun-printrun-20140730/printcore.py
---- Printrun-printrun-20140730.old/printcore.py	2014-08-10 15:44:04.881086932 +0200
-+++ Printrun-printrun-20140730/printcore.py	1970-01-01 01:00:00.000000000 +0100
-@@ -1,76 +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 <http://www.gnu.org/licenses/>.
--
--import time
--import getopt
--import sys
--
--from printrun.printcore import printcore
--from printrun import gcoder
--
--if __name__ == '__main__':
--    baud = 115200
--    loud = False
--    statusreport = False
--    try:
--        opts, args = getopt.getopt(sys.argv[1:], "h,b:,v,s",
--                                   ["help", "baud", "verbose", "statusreport"])
--    except getopt.GetoptError, err:
--        print str(err)
--        sys.exit(2)
--    for o, a in opts:
--        if o in ('-h', '--help'):
--            # FIXME: Fix help
--            print ("Opts are: --help, -b --baud = baudrate, -v --verbose, "
--                   "-s --statusreport")
--            sys.exit(1)
--        if o in ('-b', '--baud'):
--            baud = int(a)
--        if o in ('-v', '--verbose'):
--            loud = True
--        elif o in ('-s', '--statusreport'):
--            statusreport = True
--
--    if len(args) > 1:
--        port = args[-2]
--        filename = args[-1]
--        print "Printing: %s on %s with baudrate %d" % (filename, port, baud)
--    else:
--        print "Usage: python [-h|-b|-v|-s] printcore.py /dev/tty[USB|ACM]x filename.gcode"
--        sys.exit(2)
--    p = printcore(port, baud)
--    p.loud = loud
--    time.sleep(2)
--    gcode = [i.strip() for i in open(filename)]
--    gcode = gcoder.LightGCode(gcode)
--    p.startprint(gcode)
--
--    try:
--        if statusreport:
--            p.loud = False
--            sys.stdout.write("Progress: 00.0%\r")
--            sys.stdout.flush()
--        while p.printing:
--            time.sleep(1)
--            if statusreport:
--                progress = 100 * float(p.queueindex) / len(p.mainqueue)
--                sys.stdout.write("Progress: %02.1f%%\r" % progress)
--                sys.stdout.flush()
--        p.disconnect()
--        sys.exit(0)
--    except:
--        p.disconnect()
-diff -urN Printrun-printrun-20140730.old/pronsole Printrun-printrun-20140730/pronsole
---- Printrun-printrun-20140730.old/pronsole	1970-01-01 01:00:00.000000000 +0100
-+++ Printrun-printrun-20140730/pronsole	2014-06-06 12:04:34.000000000 +0200
-@@ -0,0 +1,33 @@
-+#!/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 <http://www.gnu.org/licenses/>.
-+
-+import sys
-+import traceback
-+from printrun.pronsole import pronsole
-+
-+if __name__ == "__main__":
-+
-+    interp = pronsole()
-+    interp.parse_cmdline(sys.argv[1:])
-+    try:
-+        interp.cmdloop()
-+    except SystemExit:
-+        interp.p.disconnect()
-+    except:
-+        print _("Caught an exception, exiting:")
-+        traceback.print_exc()
-+        interp.p.disconnect()
-diff -urN Printrun-printrun-20140730.old/pronsole.py Printrun-printrun-20140730/pronsole.py
---- Printrun-printrun-20140730.old/pronsole.py	2014-08-10 15:44:04.863087038 +0200
-+++ Printrun-printrun-20140730/pronsole.py	1970-01-01 01:00:00.000000000 +0100
-@@ -1,33 +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 <http://www.gnu.org/licenses/>.
--
--import sys
--import traceback
--from printrun.pronsole import pronsole
--
--if __name__ == "__main__":
--
--    interp = pronsole()
--    interp.parse_cmdline(sys.argv[1:])
--    try:
--        interp.cmdloop()
--    except SystemExit:
--        interp.p.disconnect()
--    except:
--        print _("Caught an exception, exiting:")
--        traceback.print_exc()
--        interp.p.disconnect()
-diff -urN Printrun-printrun-20140730.old/pronterface Printrun-printrun-20140730/pronterface
---- Printrun-printrun-20140730.old/pronterface	1970-01-01 01:00:00.000000000 +0100
-+++ Printrun-printrun-20140730/pronterface	2014-06-06 12:04:34.000000000 +0200
-@@ -0,0 +1,40 @@
-+#!/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 <http://www.gnu.org/licenses/>.
-+
-+import sys
-+
-+try:
-+    import wx  # NOQA
-+except:
-+    print("wxPython is not installed. This program requires wxPython to run.")
-+    if sys.version_info.major >= 3:
-+        print("""\
-+As you are currently running python3, this is most likely because wxPython is
-+not yet available for python3. You should try running with python2 instead.""")
-+        sys.exit(-1)
-+    else:
-+        raise
-+
-+from printrun.pronterface import PronterApp
-+
-+if __name__ == '__main__':
-+    app = PronterApp(False)
-+    try:
-+        app.MainLoop()
-+    except KeyboardInterrupt:
-+        pass
-+    del app
-diff -urN Printrun-printrun-20140730.old/pronterface.py Printrun-printrun-20140730/pronterface.py
---- Printrun-printrun-20140730.old/pronterface.py	2014-08-10 15:44:04.862087044 +0200
-+++ Printrun-printrun-20140730/pronterface.py	1970-01-01 01:00:00.000000000 +0100
-@@ -1,40 +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 <http://www.gnu.org/licenses/>.
--
--import sys
--
--try:
--    import wx  # NOQA
--except:
--    print("wxPython is not installed. This program requires wxPython to run.")
--    if sys.version_info.major >= 3:
--        print("""\
--As you are currently running python3, this is most likely because wxPython is
--not yet available for python3. You should try running with python2 instead.""")
--        sys.exit(-1)
--    else:
--        raise
--
--from printrun.pronterface import PronterApp
--
--if __name__ == '__main__':
--    app = PronterApp(False)
--    try:
--        app.MainLoop()
--    except KeyboardInterrupt:
--        pass
--    del app
-diff -urN Printrun-printrun-20140730.old/setup.py Printrun-printrun-20140730/setup.py
---- Printrun-printrun-20140730.old/setup.py	2014-08-10 15:44:04.869087003 +0200
-+++ Printrun-printrun-20140730/setup.py	2014-08-10 15:44:59.470765212 +0200
-@@ -162,7 +162,7 @@
-       license = "GPLv3",
-       data_files = data_files,
-       packages = ["printrun", "printrun.gl", "printrun.gl.libtatlin", "printrun.gui", "printrun.power"],
--      scripts = ["pronsole.py", "pronterface.py", "plater.py", "printcore.py"],
-+      scripts = ["pronsole", "pronterface", "plater", "printcore"],
-       cmdclass = cmdclass,
-       ext_modules = extensions,
-       )
diff --git a/media-gfx/printrun/printrun-20140730.ebuild b/media-gfx/printrun/printrun-20140730.ebuild
deleted file mode 100644
index 5d9f12ea98e1..000000000000
--- a/media-gfx/printrun/printrun-20140730.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="GUI interface for 3D printing on RepRap and other printers"
-HOMEPAGE="https://github.com/kliment/Printrun"
-SRC_URI="https://github.com/kliment/Printrun/archive/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/pyserial
-	dev-python/wxpython
-	dev-python/pyglet
-	dev-python/dbus-python
-	media-gfx/cairosvg"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/printrun-no-py-in-binaries.patch"
-)
-
-S="${WORKDIR}/Printrun-${P}"
diff --git a/media-gfx/printrun/printrun-20150310-r2.ebuild b/media-gfx/printrun/printrun-20150310-r2.ebuild
new file mode 100644
index 000000000000..72839c7ab4e8
--- /dev/null
+++ b/media-gfx/printrun/printrun-20150310-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="GUI interface for 3D printing on RepRap and other printers"
+HOMEPAGE="https://github.com/kliment/Printrun"
+SRC_URI="https://github.com/kliment/Printrun/archive/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	app-text/psutils
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pyglet[${PYTHON_USEDEP}]
+	dev-python/pyserial[${PYTHON_USEDEP}]
+	dev-python/wxpython:*[${PYTHON_USEDEP}]
+	media-gfx/cairosvg[${PYTHON_USEDEP}]"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/Printrun-${P}"
+
+PATCHES=(
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1231518
+	"${FILESDIR}"/${PN}-gtk3.patch
+
+	# https://github.com/kliment/Printrun/pull/790
+	"${FILESDIR}"/${PN}-x11.patch
+)
diff --git a/media-gfx/printrun/printrun-20150310.ebuild b/media-gfx/printrun/printrun-20150310.ebuild
deleted file mode 100644
index 5bf664f6aee5..000000000000
--- a/media-gfx/printrun/printrun-20150310.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="GUI interface for 3D printing on RepRap and other printers"
-HOMEPAGE="https://github.com/kliment/Printrun"
-SRC_URI="https://github.com/kliment/Printrun/archive/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/pyserial
-	dev-python/wxpython:2.8
-	dev-python/pyglet
-	dev-python/dbus-python
-	media-gfx/cairosvg"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/Printrun-${P}"
diff --git a/media-gfx/printrun/printrun-99999999.ebuild b/media-gfx/printrun/printrun-99999999.ebuild
index 2599912dead2..d12fe530c379 100644
--- a/media-gfx/printrun/printrun-99999999.ebuild
+++ b/media-gfx/printrun/printrun-99999999.ebuild
@@ -16,17 +16,19 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-DEPEND="dev-python/pyserial
-	dev-python/wxpython:*
-	dev-python/pyglet
-	dev-python/dbus-python
-	media-gfx/cairosvg"
+DEPEND="
+	app-text/psutils
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pyglet[${PYTHON_USEDEP}]
+	dev-python/pyserial[${PYTHON_USEDEP}]
+	dev-python/wxpython:*[${PYTHON_USEDEP}]
+	media-gfx/cairosvg[${PYTHON_USEDEP}]"
+
 RDEPEND="${DEPEND}"
 
 PATCHES=(
 	# https://bugzilla.redhat.com/show_bug.cgi?id=1231518
 	"${FILESDIR}"/${PN}-gtk3.patch
-
-	# https://github.com/kliment/Printrun/pull/790
-	"${FILESDIR}"/${PN}-x11.patch
 )