diff options
| -rw-r--r-- | net-analyzer/nagstamon/nagstamon-1.0.1.ebuild | 22 | ||||
| -rw-r--r-- | net-analyzer/nagstamon/nagstamon-1.0.1_p20150222.ebuild | 22 | ||||
| -rw-r--r-- | net-analyzer/nagstamon/nagstamon-2.0.1.ebuild | 24 |
3 files changed, 37 insertions, 31 deletions
diff --git a/net-analyzer/nagstamon/nagstamon-1.0.1.ebuild b/net-analyzer/nagstamon/nagstamon-1.0.1.ebuild index 64feb0f07102..e967ec068244 100644 --- a/net-analyzer/nagstamon/nagstamon-1.0.1.ebuild +++ b/net-analyzer/nagstamon/nagstamon-1.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -10,7 +10,7 @@ inherit eutils python-r1 MY_PN="Nagstamon" MY_P="${MY_PN}-${PV/_}" -DESCRIPTION="Nagstamon is a Nagios status monitor for a systray and displays a realtime status of a Nagios box" +DESCRIPTION="Nagstamon is a systray monitor for displaying realtime status of a Nagios box" HOMEPAGE="http://nagstamon.sourceforge.net" SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" @@ -18,15 +18,17 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" IUSE="gnome sound" - -DEPEND="" -RDEPEND="dev-python/pygobject:2 - dev-python/pygtk - dev-python/lxml - dev-python/beautifulsoup:python-2 +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS}" +RDEPEND="${DEPEND} + dev-python/pygobject:2[${PYTHON_USEDEP}] + dev-python/pygtk[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}] + dev-python/keyring[${PYTHON_USEDEP}] gnome-base/librsvg - dev-python/keyring - gnome? ( dev-python/egg-python ) + gnome? ( dev-python/egg-python[${PYTHON_USEDEP}] ) sound? ( media-sound/sox )" S="${WORKDIR}/${MY_PN}" diff --git a/net-analyzer/nagstamon/nagstamon-1.0.1_p20150222.ebuild b/net-analyzer/nagstamon/nagstamon-1.0.1_p20150222.ebuild index a6f99f32d47f..9a51798a0e5e 100644 --- a/net-analyzer/nagstamon/nagstamon-1.0.1_p20150222.ebuild +++ b/net-analyzer/nagstamon/nagstamon-1.0.1_p20150222.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -11,7 +11,7 @@ MY_PN="Nagstamon" MY_P="${MY_PN}-${PV/_}" MY_SHA="b7a91e68ca93ead4e5cfef22e2226c1ff9c7b52c" -DESCRIPTION="Nagstamon is a Nagios status monitor for a systray and displays a realtime status of a Nagios box" +DESCRIPTION="Nagstamon is a systray monitor for displaying realtime status of a Nagios box" HOMEPAGE="http://nagstamon.sourceforge.net" SRC_URI="https://github.com/HenriWahl/${PN}/archive/${MY_SHA}.tar.gz -> ${MY_PN}-${MY_SHA}.tar.gz" @@ -19,15 +19,17 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="gnome sound" - -DEPEND="" -RDEPEND="dev-python/pygobject:2 - dev-python/pygtk - dev-python/lxml - dev-python/beautifulsoup:python-2 +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS}" +RDEPEND="${DEPEND} + dev-python/pygobject:2[${PYTHON_USEDEP}] + dev-python/pygtk[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}] + dev-python/keyring[${PYTHON_USEDEP}] gnome-base/librsvg - dev-python/keyring - gnome? ( dev-python/egg-python ) + gnome? ( dev-python/egg-python[${PYTHON_USEDEP}] ) sound? ( media-sound/sox )" S="${WORKDIR}/${MY_PN}-${MY_SHA}/Nagstamon" diff --git a/net-analyzer/nagstamon/nagstamon-2.0.1.ebuild b/net-analyzer/nagstamon/nagstamon-2.0.1.ebuild index 1883f64fc44e..d811a4a1899f 100644 --- a/net-analyzer/nagstamon/nagstamon-2.0.1.ebuild +++ b/net-analyzer/nagstamon/nagstamon-2.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -10,7 +10,7 @@ inherit eutils python-r1 distutils-r1 MY_PN="Nagstamon" MY_P="${MY_PN}-${PV/_}" -DESCRIPTION="status monitor for the desktop" +DESCRIPTION="Nagstamon is a systray monitor for displaying realtime status of a Nagios box" HOMEPAGE="http://nagstamon.sourceforge.net" SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" @@ -18,24 +18,26 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" # TODO: secretstorage # TODO: Xlib - https://github.com/python-xlib/python-xlib/tree/master/Xlib -RDEPEND="dev-python/PyQt5[gui,multimedia,svg,widgets] - dev-python/beautifulsoup:4 - dev-python/dbus-python - dev-python/keyring - dev-python/requests - dev-python/psutil - dev-python/setuptools" -DEPEND="${RDEPEND}" +RDEPEND="${PYTHON_DEPS} + dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] + dev-python/beautifulsoup:4[${PYTHON_USEDEP}] + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/keyring[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" S="${WORKDIR}/${MY_PN}" PATCHES="${FILESDIR}/${PN}-2.0-setup.patch" src_prepare() { - default_src_prepare + default mv ${PN}.py ${PN} || die |