bump; patch to set correct install of prebuilt docs

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

3 files changed, 86 insertions, 1 deletions

diff --git a/sys-process/glances/ChangeLog b/sys-process/glances/ChangeLog
index ccce98ca4856..8541e37d026a 100644
--- a/sys-process/glances/ChangeLog
+++ b/sys-process/glances/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/glances
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/glances/ChangeLog,v 1.25 2015/04/05 08:26:15 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/glances/ChangeLog,v 1.26 2015/07/10 07:55:04 idella4 Exp $
+
+*glances-2.4.2 (10 Jul 2015)
+
+  10 Jul 2015; Ian Delaney <idella4@gentoo.org> +files/2.4.2-setup-data.patch,
+  +glances-2.4.2.ebuild:
+  bump; patch to set correct install of prebuilt docs
 
 *glances-2.3 (05 Apr 2015)
 
diff --git a/sys-process/glances/files/2.4.2-setup-data.patch b/sys-process/glances/files/2.4.2-setup-data.patch
new file mode 100644
index 000000000000..b2d9d0b12319
--- /dev/null
+++ b/sys-process/glances/files/2.4.2-setup-data.patch
@@ -0,0 +1,15 @@
+diff -ur Glances-2.4.2.orig/setup.py Glances-2.4.2/setup.py
+--- setup.py	2015-05-29 04:10:10.000000000 +0800
++++ setup.py	2015-07-10 14:47:54.333415133 +0800
+@@ -13,9 +13,7 @@
+ 
+ def get_data_files():
+     data_files = [
+-        ('share/doc/glances', ['AUTHORS', 'COPYING', 'NEWS', 'README.rst',
+-                               'conf/glances.conf', 'docs/glances-doc.html']),
+-        ('share/doc/glances/images', glob.glob('docs/images/*.png')),
+-        ('share/man/man1', ['man/glances.1'])
++        ('share/man/man1', ['man/glances.1']),
++        ('etc/glances', ['conf/glances.conf'])
+     ]
+ 
diff --git a/sys-process/glances/glances-2.4.2.ebuild b/sys-process/glances/glances-2.4.2.ebuild
new file mode 100644
index 000000000000..6c3043e282ac
--- /dev/null
+++ b/sys-process/glances/glances-2.4.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/glances/glances-2.4.2.ebuild,v 1.1 2015/07/10 07:55:04 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,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="chart 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}] )
+	chart? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
+
+CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
+
+S="${WORKDIR}/${MYP}"
+
+# Remove duplicate entries of a prebuilt doc build and
+# ensure install of the file glances.conf in /etc/${PN}
+PATCHES=( "${FILESDIR}"/2.4.2-setup-data.patch )
+
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
+python_install_all() {
+	# add an intended file from original data set from setup.py to DOCS
+	local DOCS="README.rst conf/glances.conf"
+	# setup for pre-built html docs in setup.py
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	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"
+		elog "   app-admin/hddtemp - monitor hard drive temperatures"
+		elog "   dev-python/pysnmp - enable Python SNMP library support"
+		elog "   dev-python/bottle - for Web server mode"
+		elog "   dev-python/matplotlib - for graphical / chart support"
+	fi
+	elog "A copy of glances.conf has been added to DOCS"
+}