No py in binaries patch added

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x34E69781

3 files changed, 410 insertions, 9 deletions

diff --git a/media-gfx/printrun/ChangeLog b/media-gfx/printrun/ChangeLog
index a32fda23a28f..046ddc984a1b 100644
--- a/media-gfx/printrun/ChangeLog
+++ b/media-gfx/printrun/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/printrun
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/printrun/ChangeLog,v 1.3 2014/08/09 21:19:16 amynka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/printrun/ChangeLog,v 1.4 2014/08/10 13:54:24 amynka Exp $
+
+  10 Aug 2014; Amy Winston <amynka@gentoo.org>
+  +files/printrun-no-py-in-binaries.patch:
+  No py in binaries patch added
 
   09 Aug 2014; Amy Winston <amynka@gentoo.org> printrun-20140730.ebuild:
   Removing 2_6 python. Deprecated
diff --git a/media-gfx/printrun/Manifest b/media-gfx/printrun/Manifest
index 6875ffe3b279..6da504b5aeed 100644
--- a/media-gfx/printrun/Manifest
+++ b/media-gfx/printrun/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX printrun-no-py-in-binaries.patch 14454 SHA256 6924e20495af75e25c03540ea442b409c5115116c2efdc3ec116ad889f19f348 SHA512 964f7a3b4f7685a31b3d82bd57af0fe11b2d1230d5f9c5dc422ee5739c44711360fce0b3abfd65ff4274979e4aea03a2bcbcbc818096c8e5eb6ecc617522806e WHIRLPOOL 73062fb27bdcc0c07a9177728bc406c10015f6126bde826c716b02082b825d2c135550853c2090447f0b42566e786390e623762d3f316dea7ddd00486a41aee5
 DIST printrun-20140730.tar.gz 902029 SHA256 3412882627a82bba0fcd0cdf7639074085d3355e5aef48ccdc91687b027a24fa SHA512 c60d3db1a9255a56aad30a8290e18707cc34774af8cc52be042a3fabe653a64874485a153763886458cb45fff718ba134642e530a9d065fcc42ae0473ee17da8 WHIRLPOOL 1f8c91e867a375df998248d31bda0c5901d1ba52071aee12acea42a53b44393332a86562ea96c58801bde63a961d4af14b05f4defc45cfe1f41061a4ee9438e1
 EBUILD printrun-20140730.ebuild 711 SHA256 d5922eeb6964cf53ced4464e4612d4b861ae3acc88dbd0b54252c474c3c0ebbb SHA512 df9168ef99db99b688e7780fba38d32ab33ea39f64c917095439fe87ff8bf65114a211a884279d251642d24ed39f31ade565562544e6977f0860b7d3a6104bf4 WHIRLPOOL 381ff0a21ea9fdbd10ab52e1bc72972e678b761b24704b7af2ea14f32dbb2d6f75ce7d8233dbf40d739a88113ebd8501995435d31609917fef43e1c81af40b3f
-MISC ChangeLog 586 SHA256 0a2b647137c366a28e06a10d064729a0107dab6caf10232d1e6c45bf30e09acf SHA512 1239fa5a7d68fd3395e5396adf044fe24565d70bb26ea95e398a0b229ddb4167cd3983d1e950cf4aed780859ab00ee1d71bc5a058dc44c40b42c5f592feaf6b3 WHIRLPOOL 1c92cbce1d5e24e926bee582415b33791689726bd39ecceca1ba595cc8e34795750ec1d8c136218a68d5b649a358261cbcfd1d0ffade3b279e122a8e067540ff
+MISC ChangeLog 709 SHA256 bd507446920326867004b01a612fc67c4125708548871ee116dec4440df2b3bc SHA512 650adebecd97b488fa815c6a6b4c5a1c4927b8900c5751726678d2cd95ab1e10ca8d80b726d0e27ee5a28c31ab7871ffe63e488b8e76bd441e0e37db0ef44c48 WHIRLPOOL 67dec8bfdce3cd15a3ab48b8146bcfb0a358b35dba2afaa2639405b4ce57445fa7ce51290f07532537b51e02b8bbc54d3d68007138830546001b193143f9b1c7
 MISC metadata.xml 518 SHA256 d6f88889a0d32abcf6094683eb9d1cf662474faf1c1d75836082c1876afc9f1c SHA512 c16ef3c516d0034f223d3c3b2cfad392ecf385446a119eb68e0afcf8099ba849a1bc5559d08b489907c730b91a0db708f5e27ed0855b034bedb96b6131c310b8 WHIRLPOOL c3674da57267ec90ab449b81200744c8d0dab9870491e048dbda8d0c474a39c102338048f795950efd8f7e1910e0a6780b5e1dfa52986d03b15a81608ceb77a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT5pBpAAoJEDuJ1FA05peBoSsH/AySzwXfgeZgH+3YBHFN6dv8
-by3HkBdmHP5EFAQOV/oEe91ZegVGnaOZSjEDbbgcHAs34nfSaDBRCmEvxFo95Bh4
-gPUUI9c4pjkmqZcMcS3UglMrXKI1I0eE7P00wNDLWcj/DCy09jBk47OXEsOWjFcp
-BF9OQ4jS73h5cLhUc7MrCklL2ijl84OrpLaUXBfuFtxqREQy1qQDWVmyuulC0hUg
-Mib8khhRK9Er2FqEgrOH4H00UMZ/XDnvFPQpMaehNsyXJYo7/rtJ62IwfAJtHMlS
-SlUN4VzvJ//h2sSYAwfgkHaP4LS7GyuAbTtqxp/9lhq+w89y7NNEZ5t2+v1XekY=
-=VZ3e
+iQEcBAEBCAAGBQJT53mRAAoJEDuJ1FA05peBsNsH/2AzcX+Xsyhy6L7K9gjpc4rJ
+JSIUzYwG9RMvjCpVx8ijgTAtS+/WfOpAO1SLeBSKqsjZ2jnnX0PbKIQvR1G/8MkE
+Zv4Re3uwYspE2/a2u0dClceGKE2VKVXmKCD7Lb/M5khSa/Vggcoldj0VRbkqNFfQ
+ptA6d1mJLIP/Ynj3445nsEikovbdF+q5I0ac4vAy/3L+8jMm8EO+g0L6MDLNW+ad
+oT+cMkuUQ7+6huOLzhryWY74rEHZHFGjJOxeWMhCnGCi3HC4dGRd7fge1aYvw0oi
+weLfImcLSJC1Uc5kTWd3boSQGEFKMt+Esho3apkxCruW6/SQy0Diy5RinYmopDA=
+=biC0
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/printrun/files/printrun-no-py-in-binaries.patch b/media-gfx/printrun/files/printrun-no-py-in-binaries.patch
new file mode 100644
index 000000000000..250af5fd26ae
--- /dev/null
+++ b/media-gfx/printrun/files/printrun-no-py-in-binaries.patch
@@ -0,0 +1,396 @@
+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,
+       )