app-admin/ngxtop: Add py3 compatibility, #512380

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 55 insertions, 47 deletions

diff --git a/app-admin/ngxtop/ChangeLog b/app-admin/ngxtop/ChangeLog
index 16d68e2b4d3f..4022532db383 100644
--- a/app-admin/ngxtop/ChangeLog
+++ b/app-admin/ngxtop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/ngxtop
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ngxtop/ChangeLog,v 1.4 2014/06/05 06:40:23 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ngxtop/ChangeLog,v 1.5 2014/06/07 20:33:40 jlec Exp $
+
+  07 Jun 2014; Justin Lecher <jlec@gentoo.org> ngxtop-0.0.2-r1.ebuild,
+  files/ngxtop-0.0.2-py3.patch:
+  Add py3 compatibility, #512380
 
   05 Jun 2014; Justin Lecher <jlec@gentoo.org> ngxtop-0.0.2-r1.ebuild:
   Dropping py3 for now, #512380
diff --git a/app-admin/ngxtop/Manifest b/app-admin/ngxtop/Manifest
index 43d4881ebe01..d12177ee9c62 100644
--- a/app-admin/ngxtop/Manifest
+++ b/app-admin/ngxtop/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX ngxtop-0.0.2-py3.patch 1469 SHA256 718c1b83fae86e8fa5f01ac13b1d4b4906bd951dd750d261efc9fdb4baca5981 SHA512 f1368d14b5369d0584e992eb969fc7580e381650082082876d1bb91011cb21490b1f8c56ebc641666e11cf1d44ff970e35cdcfd6f738e06b899363acff651eed WHIRLPOOL 7f25f0a2229d73ec24f4141526864b0cb08ba6d9414d340732c02349364af951c740cc5715407fd86f8b2e5e287859e691a5dcb8275d07da6d8c386b362dde9f
+AUX ngxtop-0.0.2-py3.patch 1816 SHA256 f243c9ee394aa2eb27ee96b2273fe6b23540d2f22e05e2663f3b38f78ecbd664 SHA512 47127c5ba26d0d6319ca74f21370bf01ce3a74676066bf7476f862de8165c2d62d90e5cad1cb2369e5743db4fa51090e8bdf59da04f9dcfafec62edc44122f8f WHIRLPOOL dcb7c3793adce9bf0f88079b6b2b4619191c71c70054570e278b0780beed48f6c769b392b75c810341b4e7ea400b5c326492c3e2f0610096660f2dc13dbe9001
 DIST ngxtop-0.0.2.tar.gz 9668 SHA256 3f98dc160a6b7ac1dd0b34bcbfb1a2f4ddef9a89337b2f6f75f173cafe1959d5 SHA512 49cd0f43bb7dae79253a13c4011a5bb92a33c137d0ce7a8de7d57ba18624ec1e10bf462a32fe96d1045ed85ba9c273260a846fb1983e189884e65c1621a39d43 WHIRLPOOL 3d844acfb7e47db2e45f57175b7020127e179be108c1fa1020675daec8ad7da514a9f919f6937f34e1787b172b0b203fc10e83b10cd4b18c4b99fc424e64a4b1
-EBUILD ngxtop-0.0.2-r1.ebuild 757 SHA256 397a5b9fae21949b6e36ad041632c7aba71952c9c0097d68615243aeb7122993 SHA512 a37e76a2a02153aae4604ffb7c22924ad79f8f53feda85a1283b0130a123dd776d34471a2bda5b5264b6414f2a8c563b399347a6e808c41009a96b334f97d451 WHIRLPOOL 859c35dd293a589fcfd38edda26a6422151ac27949bc129372e80657585d563bfa64ea11a24fcef287ad9e70f896876736ededc5ba15e4bf04e31052b93969a4
-MISC ChangeLog 766 SHA256 ed9772a8b511ca3a4adff1e7357d07cdb6c9a197582ab38a87b080af1952348d SHA512 648d1c690c084eeec3b00b489024600b5b0b57d093d55b452a1271597bfa1ad4a37cd47213b1a3a3d4e209aa0c0fcbfdb0d6ab9b3366a5db49213094743e3f1b WHIRLPOOL 6fe152fab90ba60db129b71fb2159e8ba99fe2309352e34d63364f7590efd48bba1063c0049c9e6d03e1ffd1177589382aaf4212e2030b3e971b43591013f54a
+EBUILD ngxtop-0.0.2-r1.ebuild 767 SHA256 0e487cfab2539b1f80e6a9371f2f33fb99721bd2b33bb2078600171b25c73a29 SHA512 f3826cd7c7b9fef3e4d1d0b31bfee35816d62aa4952af41aff8e366aad6101c6aff547d4213d36715647b9b74d712f565d763daee5a7f23e20b6464037d6515d WHIRLPOOL d4a9a23c9f080668da949f3108cf0444cb3fe9a3b5a87a444e3ce2afe5a625c29ae0f3da5326a80fa836bd63f70cfe2f270ed99746758e47112c2a222bbd3c42
+MISC ChangeLog 903 SHA256 434363ac8237678ef9361764430235dabd576d151e91f67090106cfefa5e9d74 SHA512 6cbd4976f3c8ec357205fa1c63bdf12a9a4a326f1f94457458d63f9d96f239fa4e61675253ae514a5ba8e0fbfbe1bec7355aefc601300d7b176ef289fa05fbee WHIRLPOOL 93dcc8dcca4b14e10343ae9a4ede09de4216fde2974ede3d116bca564a69a830d25b028f149cf8769ee2f669f72282aefd8c171553ca643d1f71827cc80bf472
 MISC metadata.xml 205 SHA256 b4660d1f4b47c8c40fc6f986791c6da3f0d7513fe4489a0d2bbb83346dcb1f5b SHA512 0e0b6e89b125b4849b4164e7cabb5297ae930c4db499c6685c3852a60e209418c26eb33e452a0a78e800c960ac5032f97d436bc3b7266a0ac76092f6f2595d11 WHIRLPOOL dc3dc7c840a6640b42e3fc981c95d0a8e43d3b5834f447a09deebc1b35dbb26e48c3d85db73725c42d2036edd9f141fb02a3a9d61522861f4e97e3e974987473
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCgBmBQJTkBDYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJTk3coXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirdqcQAKCCDMcUG5eY7fWynswBxj3t
-sVwg32rximzrHFnmnVf5gqgOXoEgLdL+2cQGlBgXs0hfLKss00Pwjy/45I5ESi6D
-blShQY6wNTTekICEtHtkYenBW0jjq0HPF8pALC9WyM1xyvwSQqYFKYc2RJd2CTdo
-+/E+uXia0frxcybK1NRgYOh6zDByMfGnI8be/ZgCEUluoytL+wNyUNUV8IESEg4W
-m6kqkSFAWMlwG8gUlwe9UIEG+BOOVkqX46KklnSIY2AAOntFZc6CzMUU0O3tny3D
-5b0szRV8mRiCGReNcNUcSeqkdZvF+EKoCUE6LbsgOapZ1iOcJsH8VQED8SeIv6lx
-0faYzIpYku8t6oDmN6eOkGPMLtYw37Gf89zfhsRorxHm0ux6ilDpqA0drN8GFkNi
-6JYDlmg1/TprDdwt2BTqqzm2pG/MWgT/KqLFjK1Jh6i0lvqgYNU24FCmrF2+tjaB
-YKHMHMjieMld7uTFYV2OMCmHRhsE4jzZjNlMR7QsVhy4qKZyjl6MjkzRDru710BX
-lEXzNQM4cyn15ZxH7CPyKsMC0T5O9veCrOcdXwVCaNnK+W407yy5KCdsW+a7T6Pg
-dBvOcGTk4GBBVNKsO2R4K2KpEtkdKTgb/TPcOkpc0Qw0jGP/T9MSl6h9nVY4gdVd
-Q7zJt/pOvshLhd+I5sbw
-=Xt/R
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir/+gQAJshe1ttgjGEqR4UIXgsM7Aj
+l5hkTT61T6KvgNFwPZyrgeWJhQnU969jqhcAyJPZL15g52wx/1KVv1Ws+D392oJH
+1BuyGTPdkJIQZ0sGMGbumuowj0oFp0aBH9rdT35cAxtJuX9Fe1NWoXTE+8jXC8xj
+9I0eAPNwb/RaJnYeJiUA5vphuF08hSQXdqiEccp7vUboDjmkWJIXsJVe4tD5vZGQ
+oIbkchAK+9K4JStPL0R3xcU7VlcKaXCfWY43ZrRfjt1fNb+RDXukw6NnI16hE/+L
+CfTVcDMWDUn2O6Ov3lIM+7+nw4apXO5UJJmLwnb640x1dRhScDdpm2y1xc5LNhGN
+q3dYnJtXx7CSA1BL4oNhSY1IdlE9jksj5MMApdLEeF//ML4tGMEcGseaMGc4vjhZ
+1uEc76Ly+UHIFibz2GMQ6Jgq70BdBHb70gOaVWeFTv4XMyLEfNFLHqkUbtyUgRm9
+h3xiMPyXTge6Xr0hjzwRvtVqoEFBgU7tQY9af05+9wXRD20+8zKhcNiWFJ2hKJqI
+esVBPK9NL+JNX3FQ6WpfgJabFDa2s1OgS0svqThf+bE8ayhtgIQdr4lbMmyhdUqv
+TCnLir1OeA78NZsURtfoFQUKfm13FcCJENpjPT7gH1Bd58tqs7nYSwNzTaNk6bBw
+5cohJOeAz9+lf9E0dubh
+=EqMj
 -----END PGP SIGNATURE-----
diff --git a/app-admin/ngxtop/files/ngxtop-0.0.2-py3.patch b/app-admin/ngxtop/files/ngxtop-0.0.2-py3.patch
index 1e4520c7f7e0..b86361584798 100644
--- a/app-admin/ngxtop/files/ngxtop-0.0.2-py3.patch
+++ b/app-admin/ngxtop/files/ngxtop-0.0.2-py3.patch
@@ -1,20 +1,7 @@
- ngxtop/config_parser.py | 4 ++--
- ngxtop/ngxtop.py        | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
 diff --git a/ngxtop/config_parser.py b/ngxtop/config_parser.py
-index b8e4804..40b23c9 100644
+index f6999cf..7c0d79a 100644
 --- a/ngxtop/config_parser.py
 +++ b/ngxtop/config_parser.py
-@@ -8,7 +8,7 @@ import subprocess
- from pyparsing import Literal, Word, ZeroOrMore, OneOrMore, Group, \
-     printables, quotedString, pythonStyleComment, removeQuotes
- 
--from utils import choose_one, error_exit
-+from .utils import choose_one, error_exit
- 
- 
- REGEX_SPECIAL_CHARS = r'([\.\*\+\?\|\(\)\{\}\[\]])'
 @@ -106,7 +106,7 @@ def detect_log_config(arguments):
  
      log_formats = dict(get_log_formats(config_str))
@@ -24,18 +11,35 @@ index b8e4804..40b23c9 100644
          if format_name == 'combined':
              return log_path, LOG_FORMAT_COMBINED
          if format_name not in log_formats:
-diff --git a/ngxtop/ngxtop.py b/ngxtop/ngxtop.py
-index afb5bc3..8667b8b 100755
---- a/ngxtop/ngxtop.py
-+++ b/ngxtop/ngxtop.py
-@@ -74,8 +74,8 @@ except ImportError:
- from docopt import docopt
- import tabulate
- 
--from config_parser import detect_log_config, detect_config_path, extract_variables, build_pattern
--from utils import error_exit
-+from .config_parser import detect_log_config, detect_config_path, extract_variables, build_pattern
-+from .utils import error_exit
+@@ -115,7 +115,7 @@ def detect_log_config(arguments):
  
+     # multiple access logs configured, offer to select one
+     print('Multiple access logs detected in configuration:')
+-    log_path = choose_one(access_logs.keys(), 'Select access log file to process: ')
++    log_path = choose_one(list(access_logs.keys()), 'Select access log file to process: ')
+     format_name = access_logs[log_path]
+     if format_name not in log_formats:
+         error_exit('Incorrect format name set in config for access log file "%s"' % log_path)
+diff --git a/ngxtop/ngxtop.py b/ngxtop/ngxtop.py
+old mode 100755
+new mode 100644
+diff --git a/ngxtop/utils.py b/ngxtop/utils.py
+index ef61072..7bd9a2a 100644
+--- a/ngxtop/utils.py
++++ b/ngxtop/utils.py
+@@ -5,6 +5,8 @@ def choose_one(choices, prompt):
+     for idx, choice in enumerate(choices):
+         print('%d. %s' % (idx + 1, choice))
+     selected = None
++    if sys.version[0] == '3':
++        raw_input = input
+     while not selected or selected <= 0 or selected > len(choices):
+         selected = raw_input(prompt)
+         try:
+@@ -16,4 +18,4 @@ def choose_one(choices, prompt):
  
- DEFAULT_QUERIES = [
+ def error_exit(msg, status=1):
+     sys.stderr.write('Error: %s\n' % msg)
+-    sys.exit(status)
+\ No newline at end of file
++    sys.exit(status)
diff --git a/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild b/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild
index 70cf22c382cb..2146ea9e6162 100644
--- a/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild
+++ b/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild,v 1.3 2014/06/05 06:40:23 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild,v 1.4 2014/06/07 20:33:40 jlec Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1