From 8ac929120fc259f5e18985533f4a624201bd6a08 Mon Sep 17 00:00:00 2001 From: Yury Martynov Date: Mon, 5 Aug 2019 23:19:25 +0300 Subject: [PATCH] munin: add missing deps for 9999 live version, sync to the latest commit from upstream --- net-misc/munin/munin-0.14.1-r1.ebuild | 65 +++++++++++++++++++++++++++ net-misc/munin/munin-0.14.1.ebuild | 1 - net-misc/munin/munin-9999.ebuild | 11 +++-- 3 files changed, 73 insertions(+), 4 deletions(-) create mode 100644 net-misc/munin/munin-0.14.1-r1.ebuild delete mode 120000 net-misc/munin/munin-0.14.1.ebuild diff --git a/net-misc/munin/munin-0.14.1-r1.ebuild b/net-misc/munin/munin-0.14.1-r1.ebuild new file mode 100644 index 000000000..d21fd3ea9 --- /dev/null +++ b/net-misc/munin/munin-0.14.1-r1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6} ) + +inherit eutils python-single-r1 + +DESCRIPTION="Online hash checker for Virustotal and other services" +HOMEPAGE="https://github.com/Neo23x0/munin" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/Neo23x0/munin" +else + SRC_URI="https://github.com/Neo23x0/munin/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~mips ~x86" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +DEPEND="${PYTHON_DEPS}" +RDEPEND="${DEPEND} + >=dev-python/colorama-0.3.9[${PYTHON_USEDEP}] + dev-python/future[${PYTHON_USEDEP}] + >=dev-python/selenium-3.9.0[${PYTHON_USEDEP}] + dev-python/beautifulsoup:4[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + <=dev-python/pymisp-2.4.111[${PYTHON_USEDEP}] + dev-python/ipy[${PYTHON_USEDEP}] + dev-python/pycurl[${PYTHON_USEDEP}] + dev-python/dnspython[${PYTHON_USEDEP}] + dev-python/ipy[${PYTHON_USEDEP}]" + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_prepare() { + # Update warning messages + sed -e "s: munin.ini : /etc/${PN}/munin.ini :" \ + -i *.py || die "sed filed!" + + python_fix_shebang "${S}" + default +} + +src_install() { + insinto "/usr/share/${PN}" + doins -r lib *.py + python_optimize "${D}/usr/share/${PN}" + + for x in munin-checker munin-checker-host; do + make_wrapper "${x}" \ + "python3 /usr/share/${PN}/${x//-checker/}.py -i /etc/${PN}/${PN}.ini" + done + + insinto "/etc/${PN}" + doins ${PN}.ini + + dodoc README.md munin-*demo.txt +} diff --git a/net-misc/munin/munin-0.14.1.ebuild b/net-misc/munin/munin-0.14.1.ebuild deleted file mode 120000 index da6c2edde..000000000 --- a/net-misc/munin/munin-0.14.1.ebuild +++ /dev/null @@ -1 +0,0 @@ -munin-9999.ebuild \ No newline at end of file diff --git a/net-misc/munin/munin-9999.ebuild b/net-misc/munin/munin-9999.ebuild index 73ff5f549..bec12d66a 100644 --- a/net-misc/munin/munin-9999.ebuild +++ b/net-misc/munin/munin-9999.ebuild @@ -24,13 +24,19 @@ IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND="${PYTHON_DEPS}" RDEPEND="${DEPEND} + $(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' python2_7) >=dev-python/colorama-0.3.9[${PYTHON_USEDEP}] dev-python/future[${PYTHON_USEDEP}] >=dev-python/selenium-3.9.0[${PYTHON_USEDEP}] dev-python/beautifulsoup:4[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] <=dev-python/pymisp-2.4.111[${PYTHON_USEDEP}] - dev-python/ipy[${PYTHON_USEDEP}]" + dev-python/ipy[${PYTHON_USEDEP}] + dev-python/pycurl[${PYTHON_USEDEP}] + dev-python/dnspython[${PYTHON_USEDEP}] + dev-python/ipy[${PYTHON_USEDEP}] + dev-python/flask[${PYTHON_USEDEP}] + dev-python/flask-caching[${PYTHON_USEDEP}]" pkg_setup() { python-single-r1_pkg_setup @@ -50,7 +56,6 @@ src_install() { doins -r lib *.py python_optimize "${D}/usr/share/${PN}" - # The Gentoo repo have more packages using same name for x in munin-checker munin-checker-host; do make_wrapper "${x}" \ "python3 /usr/share/${PN}/${x//-checker/}.py -i /etc/${PN}/${PN}.ini" @@ -59,5 +64,5 @@ src_install() { insinto "/etc/${PN}" doins ${PN}.ini - dodoc README.md + dodoc README.md munin-*demo.txt }