bump; add IUSE flags for optional extras, upgrade deps accordingly

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

3 files changed, 78 insertions, 4 deletions

diff --git a/sys-process/glances/ChangeLog b/sys-process/glances/ChangeLog
index 9dfae7d68c51..403b8c3c91f8 100644
--- a/sys-process/glances/ChangeLog
+++ b/sys-process/glances/ChangeLog
@@ -1,6 +1,12 @@
 # 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.17 2014/05/26 03:49:24 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/glances/ChangeLog,v 1.18 2014/06/19 02:56:19 idella4 Exp $
+
+*glances-2.0 (19 Jun 2014)
+
+  19 Jun 2014; Ian Delaney <idella4@gentoo.org> +glances-2.0.ebuild,
+  glances-1.7.7.ebuild, metadata.xml:
+  bump; add IUSE flags for optional extras, upgrade deps accordingly
 
 *glances-1.7.7 (26 May 2014)
 
diff --git a/sys-process/glances/glances-2.0.ebuild b/sys-process/glances/glances-2.0.ebuild
new file mode 100644
index 000000000000..a810d3a7eb4b
--- /dev/null
+++ b/sys-process/glances/glances-2.0.ebuild
@@ -0,0 +1,64 @@
+# 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-2.0.ebuild,v 1.1 2014/06/19 02:56:19 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+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="doc hddtemp snmp web"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+# There is another optional extra batinfo, absent from portage
+RDEPEND="${DEPEND}
+	>=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"
+
+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
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use doc; then
+		mkdir "${D}"usr/share/doc/${P}/html || die
+		mv "${D}"usr/share/doc/${P}/{glances-doc.html,images/} "${D}"usr/share/doc/${P}/html/ || die
+	else
+		rm -rf "${D}"usr/share/doc/${P}/{glances-doc.html,images/} || die
+	fi
+}
+
+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/metadata.xml b/sys-process/glances/metadata.xml
index ae7d3504f796..54d0505bd141 100644
--- a/sys-process/glances/metadata.xml
+++ b/sys-process/glances/metadata.xml
@@ -3,10 +3,14 @@
 <pkgmetadata>
 <herd>python</herd>
 <longdescription>
-  Glances is a cross-platform curses-based monitoring tool written in
-  Python.
+	Glances is a cross-platform curses-based monitoring tool written in Python.
 </longdescription>
+	<use>
+    		<flag name='web'>Enables the web server mode</flag>
+		<flag name='hddtemp'>Enables hard drive temperature monitoring</flag>
+		<flag name='snmp'>Enables SNMP support</flag>
+	</use>
 <upstream>
-  <remote-id type="pypi">Glances</remote-id>
+	<remote-id type="pypi">Glances</remote-id>
 </upstream>
 </pkgmetadata>