diff options
Diffstat (limited to 'app-admin/ngxtop')
| -rw-r--r-- | app-admin/ngxtop/Manifest | 8 | ||||
| -rw-r--r-- | app-admin/ngxtop/files/ngxtop-0.0.2-py3.patch | 45 | ||||
| -rw-r--r-- | app-admin/ngxtop/metadata.xml | 8 | ||||
| -rw-r--r-- | app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild | 27 | ||||
| -rw-r--r-- | app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild | 28 |
5 files changed, 116 insertions, 0 deletions
diff --git a/app-admin/ngxtop/Manifest b/app-admin/ngxtop/Manifest new file mode 100644 index 000000000000..bbcc5beef261 --- /dev/null +++ b/app-admin/ngxtop/Manifest @@ -0,0 +1,8 @@ +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 +DIST ngxtop-0.0.3_pre141201.tar.xz 9012 SHA256 b1df55b8874011fe009f58039c9dee1bb13092ba98609b292bb007d5482cc634 SHA512 ce0c6d027eacfe553752a4a66b7d5823de45ef847d4db1a50d9677126a1d574c22e17b5a60f073bf74eb93d56d15d88d6201353324b201b77c1dd5bede6d7cde WHIRLPOOL 4c2c3fd7d0db9ddd177f5895604cedc7c1ba8799db2e64d58484ae0b935d574bf51c7ddeac12f46e56de062a471619fc1ce96ac4f3d4b13b0a2b33060898e730 +EBUILD ngxtop-0.0.2-r1.ebuild 651 SHA256 33e6767e3fc2760b074173e4f891548dea1d75695c27dd4e8019831f002ca640 SHA512 77bad90097cb535f8e610a2498ec23e6c665adb943d7df7dfc1a20be8b938aa43fea0e295f97fb3219716c2652c9bddb33059f4df2c4dd6b4b2f50b33c7f2d99 WHIRLPOOL ed79c7f62d029f4033ad61667fe817bb4063ffc69ae4c6f403963caf7d1c66e21f91e18744c87da447ddd221a3ed155511235a9a7eaeff472363bec5cf5525ef +EBUILD ngxtop-0.0.3_pre141201.ebuild 728 SHA256 eb3513680d5c5ed1ac6d2943c947bc9eea29a0fc21e3afb2a99c7f128b81e56b SHA512 b857066578c5c46f2bcbe0413f11e0996e0e4a9fdd932d3c2ebf9e4e24a9e003f54237b884d8b9588fd8d37ae21485476c4d7053c3c4bfcdb380e3f69809887c WHIRLPOOL e5b83892585e2cc99a54ea7df32e8ad8e4b5620c98e0fcec3476ff8cb13cf1dbdb1ecfef3434cd565abb1d7e85785410faf49ae8f19642310074a3406345e84a +MISC ChangeLog 2737 SHA256 c8068277a4aec1d75895b405392cea342453598faca147103ace9dede4660491 SHA512 7fb355c6f76161a3dd5f87a8e32a405ec363c85b5fba91007d4830fc9eef4796c3dc063a2c7bade33172acc5b8c73885d72630e235fac033e11de989a25736a0 WHIRLPOOL 9086b6903581cff8d396e87929835ac0ce8563d865f073bd7ff8dabed42761784e2d1b9bbf9bcc44b867133bf3090e4ed58b9ddca7e501d77f9231bc23deaae4 +MISC ChangeLog-2015 1200 SHA256 7b2c0d0a1c50dd300d2ec4d2e504f500114a2c172056481aefbb531e8ec7891b SHA512 b68f60bf8d45a496fad79bcb5ccad099ea7bac1f239d0440f59d49f61719a36122931df143ee1fff68c439ac80486034129d31e7fe5b9afa527ab826865e5028 WHIRLPOOL 5d90c446e862a305466f15077604806dda0f5c1c97097a65cd3beb885dc0da9d1e360f7b30a89bb107bca14c6f24267905f08093363ca8302837f34dec46f703 +MISC metadata.xml 250 SHA256 8f9da03ca96e19696ab30c9af17c5f3152ce7e920a5bab7182f4f451a2060558 SHA512 3b834414c779d9155f38a0bddf7949a53b43da55fdffc52b32e1dcd1a666d3262187571cad366b89fc5985471e8ecccc7e241c497cf6104a31e83d4b0d555d11 WHIRLPOOL 4122f3ccf5ee7fb4843c86f64e9f9077d17fbcdb5ef12ddac57ae935ada7fa5d23cd2331612162b22bd74393452fd794270b29d8effe5d9ce361ddfebc5172ed 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..b86361584798 --- /dev/null +++ b/app-admin/ngxtop/files/ngxtop-0.0.2-py3.patch @@ -0,0 +1,45 @@ +diff --git a/ngxtop/config_parser.py b/ngxtop/config_parser.py +index f6999cf..7c0d79a 100644 +--- a/ngxtop/config_parser.py ++++ b/ngxtop/config_parser.py +@@ -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: +@@ -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): + + 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/metadata.xml b/app-admin/ngxtop/metadata.xml new file mode 100644 index 000000000000..6352c64cfc66 --- /dev/null +++ b/app-admin/ngxtop/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">lebinh/ngxtop</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild b/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild new file mode 100644 index 000000000000..e187ef559f43 --- /dev/null +++ b/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_4} ) +PYTHON_REQ_USE="sqlite" + +inherit distutils-r1 + +DESCRIPTION="real-time metrics for nginx server (and others)" +HOMEPAGE="https://github.com/lebinh/ngxtop" +SRC_URI="https://github.com/lebinh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="MIT" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=" + dev-python/docopt[${PYTHON_USEDEP}] + dev-python/pyparsing[${PYTHON_USEDEP}] + dev-python/tabulate[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} +" + +PATCHES=( "${FILESDIR}"/${P}-py3.patch ) diff --git a/app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild b/app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild new file mode 100644 index 000000000000..6bf6aa1b02f1 --- /dev/null +++ b/app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_REQ_USE="sqlite" + +inherit distutils-r1 + +DESCRIPTION="real-time metrics for nginx server (and others)" +HOMEPAGE="https://github.com/lebinh/ngxtop" +#SRC_URI="https://github.com/lebinh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz" + +SLOT="0" +LICENSE="MIT" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=" + dev-python/docopt[${PYTHON_USEDEP}] + dev-python/pyparsing[${PYTHON_USEDEP}] + dev-python/tabulate[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} +" + +PATCHES=( "${FILESDIR}"/${PN}-0.0.2-py3.patch ) |