app-admin/ngxtop: Fix compatibility with >= py3.3, #512380

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

4 files changed, 68 insertions, 18 deletions

diff --git a/app-admin/ngxtop/ChangeLog b/app-admin/ngxtop/ChangeLog
index c6294a97019c..412a95f8359c 100644
--- a/app-admin/ngxtop/ChangeLog
+++ b/app-admin/ngxtop/ChangeLog
@@ -1,6 +1,12 @@
 # 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.1 2014/06/04 09:59:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ngxtop/ChangeLog,v 1.2 2014/06/04 13:08:28 jlec Exp $
+
+*ngxtop-0.0.2-r1 (04 Jun 2014)
+
+  04 Jun 2014; Justin Lecher <jlec@gentoo.org> -ngxtop-0.0.2.ebuild,
+  +ngxtop-0.0.2-r1.ebuild, +files/ngxtop-0.0.2-py3.patch:
+  Fix compatibility with >= py3.3, #512380
 
 *ngxtop-0.0.2 (04 Jun 2014)
 
diff --git a/app-admin/ngxtop/Manifest b/app-admin/ngxtop/Manifest
index ad8a87fbc68c..dbdfe01fadbd 100644
--- a/app-admin/ngxtop/Manifest
+++ b/app-admin/ngxtop/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX ngxtop-0.0.2-py3.patch 1469 SHA256 718c1b83fae86e8fa5f01ac13b1d4b4906bd951dd750d261efc9fdb4baca5981 SHA512 f1368d14b5369d0584e992eb969fc7580e381650082082876d1bb91011cb21490b1f8c56ebc641666e11cf1d44ff970e35cdcfd6f738e06b899363acff651eed WHIRLPOOL 7f25f0a2229d73ec24f4141526864b0cb08ba6d9414d340732c02349364af951c740cc5715407fd86f8b2e5e287859e691a5dcb8275d07da6d8c386b362dde9f
 DIST ngxtop-0.0.2.tar.gz 9668 SHA256 3f98dc160a6b7ac1dd0b34bcbfb1a2f4ddef9a89337b2f6f75f173cafe1959d5 SHA512 49cd0f43bb7dae79253a13c4011a5bb92a33c137d0ce7a8de7d57ba18624ec1e10bf462a32fe96d1045ed85ba9c273260a846fb1983e189884e65c1621a39d43 WHIRLPOOL 3d844acfb7e47db2e45f57175b7020127e179be108c1fa1020675daec8ad7da514a9f919f6937f34e1787b172b0b203fc10e83b10cd4b18c4b99fc424e64a4b1
-EBUILD ngxtop-0.0.2.ebuild 698 SHA256 4cbf9ab8d506f74017569c889fe585f08f66e2fd44e624df082fdf7702243fa6 SHA512 55e8fdf6ded8337a9ab83cb8529191cac702a861eaad4d53376f548ef0b45f0c022850109079c786dda5e4fb2e27b69634188169c55efef28764457488e08c59 WHIRLPOOL 230987dcb6ff42732b1d8b558feaf994ca6e3a960ce86f0f3cb05c2465ca3e3c097f07fa02834d65019d3b6e2cac0a3be0cf4ac65d476eba7c30a3a314210ad8
-MISC ChangeLog 348 SHA256 ec42fda5a999e1fa657d95661ba6d6abdf9b71aadbfb5d1c6859176dc1a09d0b SHA512 26110283ec531a441ef6a0ba85124b240995e3ccab22c30e7adec71f1bb2de8760de00cc71209386783046b4f8c0e070425c129f138f79c630beb68c82df1580 WHIRLPOOL ad75580b68104019bc72156231b1f483b2db79db2a36b1bd676a7d109fa64568c82c4c80d69ce3997c815614b422ac8907fff73e1d8ec2ca00e4308b9af7a542
+EBUILD ngxtop-0.0.2-r1.ebuild 743 SHA256 7ec7dea7ef94783c076747b660c57a21e59a7dcb6d3d922d1e2fcb5e15911353 SHA512 ad408f38d1625ba19fbb93baa77377afc286124fd8e76f95b0b4e2e0563c529002c0b983784c29edd29abb385f2a0f0ddb02f5d219da7daec5b3cabc588e2173 WHIRLPOOL 209ce0b6f893ddcc29aa8c904888679178f31ca8e09d01e2ff1863683fdc00a9009071e95577b0c364d0863f445f827dc1c35b56063dbc0306e5e4f16cf40b31
+MISC ChangeLog 551 SHA256 e3035a34122bd6f716e1f4493793d2081ac86b9c66b8775738204eefbe385172 SHA512 0539566705318329c7e628074cf4238ac0e56a2fa4b54ed2db6fd32a921707e3af03dc29e3d93a2497e0e15dbd814f57a8057d8b81219c787411136cf8827c17 WHIRLPOOL 5bab7e6ac2fafabb4208295a2743296533b5d777ca3e541cf2e6b3218e55683299b89d4e3faabc33b3a729e1add6df64863c62def8eebca83f78ca53d3492ff1
 MISC metadata.xml 205 SHA256 b4660d1f4b47c8c40fc6f986791c6da3f0d7513fe4489a0d2bbb83346dcb1f5b SHA512 0e0b6e89b125b4849b4164e7cabb5297ae930c4db499c6685c3852a60e209418c26eb33e452a0a78e800c960ac5032f97d436bc3b7266a0ac76092f6f2595d11 WHIRLPOOL dc3dc7c840a6640b42e3fc981c95d0a8e43d3b5834f447a09deebc1b35dbb26e48c3d85db73725c42d2036edd9f141fb02a3a9d61522861f4e97e3e974987473
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCgBmBQJTju4AXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJTjxpOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir/qMP/imegkACpt6KdEsorZjrB57l
-4fbkL4bNvNYL3QdUJleFmX7iG8jDeV/crDFG7kkJ9oo9Sa7EbvuVm9E1hhgbtn3O
-S09Bb61RS3v3vl65TqtGmWxmtEhwtMz2h7OQiux2/BInAV1Czwm6X/llG0Mip1cL
-Nx2qvJx8exLk5LPVsDEX11Ef8nomZOwtPP/73GGXsGitKV6E7dmov1K1dbgJSLM3
-J/EerFWV7BedCfrqsXmmkwvJ5FPxe72NPtDzYPJVdVrRvefvI+Llh/9tP5xgItqP
-nFKtRAr9JIQTp3o4yT/1oGfv3/uYgsNxN8k1AYhPl8i7MymUt0qnGNCSaJM5E7hc
-D45l8QKKGOJKsfhMGijyt67G3disFaY1MvuMYkYQC/6RnclxTI34IKxn6fdTltn4
-VUBMirNdfpvEXOWJpvhl9Jng5f9nOyoWAjetgC4qEPpqEGaBHZfIAtnczn0Vzvr2
-dIzCMg/X4mC+osqBFZpGNw42V/7ZVpdWDF+SYRX7IpAmphvMqgMSPfaVaA9EeFQI
-LbhbsCKFMLvZSZn1gKomkDMdZKhHtsxRt3iabV7zYzRBB8qLkP8/Skr5WgHcGEh3
-iBbo5eGSF2WoNh+wqdNz/eapJ5B9vAB6+BkUbT3cihsY/3ETlUwB7G4mQxwskpug
-AB5Tjm4unpgq+uwJ/vYO
-=A0a6
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirruUQAJYiHGXXrd2OVVDElTsfHOu0
+nx24scMZfaIvZsEZUatJBhV7MANo/f1HQ91wa6fBRbu3+T7s6KJXP2pf0EZYnsdb
+mxD1thLA0W9ZKowb70NgnLbjQ9f3CmU/dgog/IzRQJxf75ND7EIYaHphSpcH/gwU
+bM1KRWvjqpFXCxLfl15XJWghnuOr7/nW1Gp+7YvrR5SxAodefLJDq5I/hM6fZShe
+g6mLEsyS7vlkc8qadvz5ydkxgU0uE4jFVAdsAE4sbB7kbS+5OtknXPBnKwJPSChi
+JEG2Z/dnye9q9DPfQxIkVcfQ2hWMXIHIvGTqbCLsTT4nlZXNLc65B/iA6qAilazV
+I0L2OSRMx+qpEflhrq56MRXEa81qkwVVjMXsBdXLbHrNZyrdjbmH95cQdQNIilyW
+jcSZh2PEe/sX7eGgtuC8LsYLyByzFIUt6zHWJTzmXQyVLMi1CXFfMd7yAjwzL/Wc
+TWIy+GeWbOWMaRYPBjNNj+tt16mbKklOTGXtqweyrlCb4TVrSlrwKVpAv9y8viRy
+HtcRN2l4Y5d37EnFP1NjDVnnMFBpZo7BD96a85QKLPUgBsKQqb9IDkIZd1tmwUlN
+8WdDjr8SebMRpZrJ3TmCGocItftGuw156YXn4G+e7bMyi4s8KrxabkLgJIoyMBS3
+wVjkRgswqY/38M4xoPTa
+=FXKi
 -----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
new file mode 100644
index 000000000000..1e4520c7f7e0
--- /dev/null
+++ b/app-admin/ngxtop/files/ngxtop-0.0.2-py3.patch
@@ -0,0 +1,41 @@
+ 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
+--- 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))
+     if len(access_logs) == 1:
+-        log_path, format_name = access_logs.items()[0]
++        log_path, format_name = list(access_logs.items())[0]
+         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
+ 
+ 
+ DEFAULT_QUERIES = [
diff --git a/app-admin/ngxtop/ngxtop-0.0.2.ebuild b/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild
index 8065b24730cc..cb730d8bd62f 100644
--- a/app-admin/ngxtop/ngxtop-0.0.2.ebuild
+++ b/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.1 2014/06/04 09:59:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild,v 1.1 2014/06/04 13:08:28 jlec Exp $
 
 EAPI=5
 
@@ -23,3 +23,5 @@ RDEPEND="
 	dev-python/tabulate[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 "
+
+PATCHES=( "${FILESDIR}"/${P}-py3.patch )