Version bump, drop old. Add dependency on dev-python/setuptools wrt #455044 by cutchyacokov <cutchyacokov@gmail.com>

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 895192F9)

5 files changed, 50 insertions, 68 deletions

diff --git a/sys-process/glances/ChangeLog b/sys-process/glances/ChangeLog
index d0c0b3a88b18..9a4e26b29bd9 100644
--- a/sys-process/glances/ChangeLog
+++ b/sys-process/glances/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-process/glances
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/glances/ChangeLog,v 1.3 2013/02/02 17:32:28 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/glances/ChangeLog,v 1.4 2013/02/02 18:05:57 xarthisius Exp $
+
+*glances-1.6 (02 Feb 2013)
+
+  02 Feb 2013; Kacper Kowalik <xarthisius@gentoo.org> +glances-1.6.ebuild,
+  -glances-1.4.2.1.ebuild, -glances-1.4.ebuild, metadata.xml:
+  Version bump, drop old. Add dependency on dev-python/setuptools wrt #455044 by
+  cutchyacokov <cutchyacokov@gmail.com>
 
   02 Feb 2013; Mike Gilbert <floppym@gentoo.org> glances-1.4.2.1.ebuild,
   glances-1.4.ebuild:
diff --git a/sys-process/glances/glances-1.4.2.1.ebuild b/sys-process/glances/glances-1.4.2.1.ebuild
deleted file mode 100644
index 1e6adbb86844..000000000000
--- a/sys-process/glances/glances-1.4.2.1.ebuild
+++ /dev/null
@@ -1,34 +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.4.2.1.ebuild,v 1.2 2013/02/02 17:32:28 floppym Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="CLI curses based monitoring tool"
-HOMEPAGE="
-	https://github.com/nicolargo/glances/blob/master/README.md
-	http://pypi.python.org/pypi/Glances"
-SRC_URI="mirror://github/nicolargo/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="html"
-
-DEPEND="dev-python/setuptools"
-RDEPEND="${DEPEND}
-	>=dev-python/psutil-0.4.1
-	html? ( dev-python/jinja )"
-
-src_prepare() {
-	sed \
-		-e "s:share/doc/glances:share/doc/${PF}:g" \
-		-e "/COPYING/d" -i setup.py || die
-	distutils_src_prepare
-}
diff --git a/sys-process/glances/glances-1.4.ebuild b/sys-process/glances/glances-1.4.ebuild
deleted file mode 100644
index dd2d003343c1..000000000000
--- a/sys-process/glances/glances-1.4.ebuild
+++ /dev/null
@@ -1,30 +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.4.ebuild,v 1.2 2013/02/02 17:32:28 floppym Exp $
-
-EAPI=4
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="CLI curses based monitoring tool"
-HOMEPAGE="https://github.com/nicolargo/glances/blob/master/README.md
-http://pypi.python.org/pypi/Glances"
-SRC_URI="mirror://github/nicolargo/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND="${DEPEND}
-	>=dev-python/psutil-0.4.1"
-
-src_prepare() {
-	sed -e "s:share/doc/glances:share/doc/${PF}:g" \
-		-e "/COPYING/d" -i setup.py || die
-	distutils_src_prepare
-}
diff --git a/sys-process/glances/glances-1.6.ebuild b/sys-process/glances/glances-1.6.ebuild
new file mode 100644
index 000000000000..6cc75a340349
--- /dev/null
+++ b/sys-process/glances/glances-1.6.ebuild
@@ -0,0 +1,42 @@
+# 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.6.ebuild,v 1.1 2013/02/02 18:05:57 xarthisius Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="CLI curses based monitoring tool"
+HOMEPAGE="https://github.com/nicolargo/glances/blob/master/README.md
+http://pypi.python.org/pypi/Glances"
+SRC_URI="https://github.com/nicolargo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/psutil-0.4.1"
+
+python_prepare_all() {
+	sed -e "s:share/doc/glances:share/doc/${PF}:g" \
+		-e "/COPYING/d" \
+		-e "/etc\/glances/d" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	insinto /etc/${PN}
+	doins ${PN}/conf/${PN}.conf
+	distutils-r1_python_install_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"
+	fi
+}
diff --git a/sys-process/glances/metadata.xml b/sys-process/glances/metadata.xml
index 49d54616ec00..4ae80f27ca89 100644
--- a/sys-process/glances/metadata.xml
+++ b/sys-process/glances/metadata.xml
@@ -6,7 +6,4 @@
 		<email>xarthisius@gentoo.org</email>
 		<name>Kacper Kowalik</name>
 	</maintainer>
-	<use>
-		<flag name="html">optional for HTML export</flag>
-	</use>
 </pkgmetadata>