6 files changed, 15 insertions, 204 deletions
diff --git a/sys-process/glances/ChangeLog b/sys-process/glances/ChangeLog
index 403b8c3c91f8..45b4d87a3338 100644
--- a/sys-process/glances/ChangeLog
+++ b/sys-process/glances/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-process/glances
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/glances/ChangeLog,v 1.18 2014/06/19 02:56:19 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/glances/ChangeLog,v 1.19 2014/07/07 14:49:56 idella4 Exp $
+
+*glances-2.0.1 (07 Jul 2014)
+
+  07 Jul 2014; Ian Delaney <idella4@gentoo.org> +glances-2.0.1.ebuild,
+  -glances-1.7.1.ebuild, -glances-1.7.2.ebuild, -glances-1.7.3.ebuild,
+  -glances-1.7.4.ebuild, -glances-1.7.7.ebuild:
+  bump, rm old
 
 *glances-2.0 (19 Jun 2014)
 
diff --git a/sys-process/glances/glances-1.7.1.ebuild b/sys-process/glances/glances-1.7.1.ebuild
deleted file mode 100644
index 6575c4204365..000000000000
--- a/sys-process/glances/glances-1.7.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/glances/glances-1.7.1.ebuild,v 1.1 2013/08/26 17:54:58 xarthisius Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1 linux-info
-
-MYPN=Glances
-MYP=${MYPN}-${PV}
-
-DESCRIPTION="CLI curses based monitoring tool"
-HOMEPAGE="https://github.com/nicolargo/glances"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/psutil[${PYTHON_USEDEP}]"
-
-CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
-
-S="${WORKDIR}/${MYP}"
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-python_prepare_all() {
-	sed -e "s:share/doc/glances:share/doc/${PF}:g" \
-		-e "s/'COPYING',//" \
-		-e "s:/etc:${EPREFIX}/etc:" \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "${PN} can gain additional functionality with following packages:"
-		elog "   dev-python/jinja - export statistics to HTML"
-		elog "   app-admin/hddtemp - monitor hard drive temperatures"
-	fi
-}
diff --git a/sys-process/glances/glances-1.7.2.ebuild b/sys-process/glances/glances-1.7.2.ebuild
deleted file mode 100644
index 22f692028d6e..000000000000
--- a/sys-process/glances/glances-1.7.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/glances/glances-1.7.2.ebuild,v 1.1 2013/11/16 09:33:29 xarthisius Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1 linux-info
-
-MYPN=Glances
-MYP=${MYPN}-${PV}
-
-DESCRIPTION="CLI curses based monitoring tool"
-HOMEPAGE="https://github.com/nicolargo/glances"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/psutil[${PYTHON_USEDEP}]"
-
-CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
-
-S="${WORKDIR}/${MYP}"
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-python_prepare_all() {
-	sed -e "s:share/doc/glances:share/doc/${PF}:g" \
-		-e "s/'COPYING',//" \
-		-e "s:/etc:${EPREFIX}/etc:" \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "${PN} can gain additional functionality with following packages:"
-		elog "   dev-python/jinja - export statistics to HTML"
-		elog "   app-admin/hddtemp - monitor hard drive temperatures"
-	fi
-}
diff --git a/sys-process/glances/glances-1.7.3.ebuild b/sys-process/glances/glances-1.7.3.ebuild
deleted file mode 100644
index dde67d322908..000000000000
--- a/sys-process/glances/glances-1.7.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/glances/glances-1.7.3.ebuild,v 1.1 2013/12/17 06:11:29 patrick Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1 linux-info
-
-MYPN=Glances
-MYP=${MYPN}-${PV}
-
-DESCRIPTION="CLI curses based monitoring tool"
-HOMEPAGE="https://github.com/nicolargo/glances"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/psutil[${PYTHON_USEDEP}]"
-
-CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
-
-S="${WORKDIR}/${MYP}"
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-python_prepare_all() {
-	sed -e "s:share/doc/glances:share/doc/${PF}:g" \
-		-e "s/'COPYING',//" \
-		-e "s:/etc:${EPREFIX}/etc:" \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "${PN} can gain additional functionality with following packages:"
-		elog "   dev-python/jinja - export statistics to HTML"
-		elog "   app-admin/hddtemp - monitor hard drive temperatures"
-	fi
-}
diff --git a/sys-process/glances/glances-1.7.4.ebuild b/sys-process/glances/glances-1.7.4.ebuild
deleted file mode 100644
index bb68936245e4..000000000000
--- a/sys-process/glances/glances-1.7.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/glances/glances-1.7.4.ebuild,v 1.2 2014/04/16 06:23:32 idella4 Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1 linux-info
-
-MYPN=Glances
-MYP=${MYPN}-${PV}
-
-DESCRIPTION="CLI curses based monitoring tool"
-HOMEPAGE="https://github.com/nicolargo/glances"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/psutil[${PYTHON_USEDEP}]"
-
-CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
-
-S="${WORKDIR}/${MYP}"
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-python_prepare_all() {
-	sed -e "s:share/doc/glances:share/doc/${PF}:g" \
-		-e "s/'COPYING',//" \
-		-e "s:/etc:${EPREFIX}/etc:" \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "${PN} can gain additional functionality with following packages:"
-		elog "   dev-python/jinja - export statistics to HTML"
-		elog "   app-admin/hddtemp - monitor hard drive temperatures"
-	fi
-}
diff --git a/sys-process/glances/glances-1.7.7.ebuild b/sys-process/glances/glances-2.0.1.ebuild
index d321ab5f78fe..70c425c0fe84 100644
--- a/sys-process/glances/glances-1.7.7.ebuild
+++ b/sys-process/glances/glances-2.0.1.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/sys-process/glances/glances-1.7.7.ebuild,v 1.1 2014/05/26 03:49:24 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/glances/glances-2.0.1.ebuild,v 1.1 2014/07/07 14:49:56 idella4 Exp $
 
 EAPI=5
 
@@ -19,11 +19,15 @@ SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
+IUSE="doc hddtemp snmp web"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+# There is another optional extra batinfo, absent from portage
 RDEPEND="${DEPEND}
-	dev-python/psutil[${PYTHON_USEDEP}]"
+	>=dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
+	hddtemp? ( app-admin/hddtemp )
+	snmp? ( dev-python/pysnmp[${PYTHON_USEDEP}] )
+	web? ( dev-python/bottle[${PYTHON_USEDEP}] )"
 
 CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"