bump; patch to set correct install of prebuilt docs

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 97 insertions, 19 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/Manifest b/sys-process/glances/Manifest
index e0b20a5d5949..f36b59f21e5e 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -1,28 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX 2.4.2-setup-data.patch 600 SHA256 de7c10c1bed27116a6a9c5ff7adc68706bcfda9fd04085abd81c88ce2a077c4f SHA512 773e5e49420df437cac797589d0b7590abf3e244b52e5e52af9c8dd15b3c82cca0b9223a2090130d6725f4cec700898328ddf1d756ab121ae626cb1e63525d80 WHIRLPOOL 4cb78c758c890d6151360898f8ba9de98d951dc4245516b06d7eb1d8c3550da4b1988ccb837021d80f218d6f3b6a8f31053ba59deea39179f8fc9a1d0d866cf2
 DIST Glances-2.2.1.tar.gz 3458958 SHA256 81d2a9b7132d70b4a156a61a724201bd70ab2edea01bf32e1b279fc4f765f7d5 SHA512 c7fa7431f0c503adae89702b52e51f7dc2f2beaa42d43a849896673d26e94a40a60f2511adb4404b31c8d91ef07244b8b0292924a5df8433afe1d2e2b656b383 WHIRLPOOL a32fd1a12eccb34d4616c23262535fd6a47fa334a5505ea601e560206f3ec5f32f4726ada28a736ed47b6ca81ec6cbada491e6d58a47385bc6b8433a4932aa8d
 DIST Glances-2.3.tar.gz 3918915 SHA256 b56bb17505b72862358b2d31b6b9a7c0f9045105454d1de0ffed416ad2883612 SHA512 e331ea09200c87311c0dd7fb60efda6a0015ebd8773624ed5cb519bbfa37152fb9d2d0d3aa3e7bef3ce617c4ea5dbf05a019bf857126637364119a7f9d70ebfa WHIRLPOOL 99c8ff2e254abf65ed5c86604fc2baaf8ad973cf9c21b536069cf27802930cb6b7a7b4ccf5b454804d061c5203fda68b2ba712350af9ce132f185051e448c8b9
+DIST Glances-2.4.2.tar.gz 5497895 SHA256 31f1e4c2e129904a373f3b20d6800472375e415e01161168469ccebb320c9517 SHA512 ada7e2a9766dec54b26fa1fccac3b1abe6b9abcc16a96c6bb30d537370648732a99cff41c6c812908531a4995e118cb3d1127196184f40dee7a01a6a8a85d9b9 WHIRLPOOL 91cd5dfbe891c16bbbe5c6ae17500498c230d36a0795ba134a0384770cae04cbdf08b5236fd56157e438eaff17a7bd9cac3bc42bee7980239faf5c9fc18fc683
 EBUILD glances-2.2.1.ebuild 1973 SHA256 650fb0e92be01c9359afa3e3b00bdb5cddfeb74b858037aeac1dd125ab956a94 SHA512 d8d0c53dd3afd498ccf4c568626ab849063ca0da9f10182a62bd6e7529c1605829db52fd6c92316b351a992daf9fc826222338c90ed3b206f41351a1e209dcc7 WHIRLPOOL 2dff7931ffc46954e3f57d48232973a035ecae1e0d3461b0b9c2f53bc295234b113dcdf5728e432a5bb3ac7e284dc129df88bcdb69998fb3e96ae8c44dae496e
 EBUILD glances-2.3.ebuild 1971 SHA256 4ac2d0d04a15058f11426048c72f31d9859442b5568cd403ebab0dd7e730807f SHA512 34b63d6f34ab79f8104992022543007fdde40e5986dfebd07aab9ad2b8ef687865864999d695d01f7d0d96c93be7d1795ad35e1c64183aac43ed4a7ef13fe813 WHIRLPOOL 8c7fadc079f61cbeba81f9badd3e66ef892ad7a5400f6d9ab4e6250a3b20090845b013ea077fe8b9877830a29a214b0ac97e7ecd1bad74c74dfbe9fafd96026a
-MISC ChangeLog 4186 SHA256 9c2f393f0e65f8f74d05cee846b377f8c0ee88e81e8b2c64e1b2eb93e9fa7e21 SHA512 17d94b4e7dbb0f15e4876c9b7c548ae54a77e2a555758bc383d4d971d117943605e539469863fbd3cb6e6d4a6bf86f894e449e439cd3ce100ac43b9cfa2e205a WHIRLPOOL fb461341257bcfe93d9cc661760c1d51f67f1a39ec01ae6be654bc30d5ef45519dd2b23c217937ab73c58f1012911e880528df312e7fe8aab97f0474c3c98b90
+EBUILD glances-2.4.2.ebuild 2036 SHA256 fe0aeea82cc9bfd48f8518383e7acd16159d0c3cfc38cd63109ba08ae9d8a30e SHA512 b028cf0a98f4dd402a0a56664d1729d11595048aeac1df4f3f18b996f922b01092fd1c60c0545f0a9e8306a39bcb0584fd4854da47b9487f849557d4b8d79982 WHIRLPOOL fa4701897b31ab6f4f5d46792d0854c11f7694860ccf15a516d94f5e0380e86661265fa98fc0f0f31d78eb0500e67172f6513d7070d923e653058456ddb74c3e
+MISC ChangeLog 4375 SHA256 459215bc5426c31b9025be4cc9b5ccae94439f5f21123c3f731203f1d4f51127 SHA512 63214c1428d7f0493234191c9cb59fff712e058526c886bb58315dca1e2d6d00a63e2cf48c49eb14f29adb11ce77b2f161d00eb7e41f60b4029719d759ccad37 WHIRLPOOL bbe6420a3509c215f18162d94dea0edd00375f9b5316d73a4fdc28d68a537f63316c9e7e6da4c1c0f10b2e308063d9e454698c8aa917955d494a05e3dd1c9237
 MISC metadata.xml 666 SHA256 d2987c49eb6986db3d95f153417b721cc78609b16a5f9cb3c0da3ee46df13091 SHA512 1f4aca21ef830d076e81a5fbec7e2fa60bd2c97f161448ef1d4d78253d01b216e19091ee27ea4c8dea8f7af1f03e1b401a1184ed7f6fd2835f2d975d3b2cc054 WHIRLPOOL c45ffdcf5d86629bc0398348314e86890bfc8e9dd05c218725c8358714dd4b002ac5eb6fa512446b2eb52f75391253ee81fe4b369f140377e2bbd764cae32ddc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVfyyzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiz3IQAJddbVKRBvarVM+n+TImc7U6
-YVM7a0IOpHLnNcUBkOqREfjwoTxmngWOG3FlggGQf2jKK3jh4tMIIVC1YoLFMuY6
-bJ9Q6JbPkRb7TVebAEKGQtJQHcgGGJ1I4sMyEKHz8+rGLkWKxew9u/e9HoWUDTxk
-RqLn/ErtsWFDIjLNr/VSDLAJxBEV057spushV1dyUuxQviNMcBdVvWho5NBM+qu5
-Av4ZtEYbVHmif9eCcqwG/jkUYQ+UYZEVpDCYqtfmKYLN50zpF+ziQVxhUSEn9IWa
-m/Lqz9xSopwdOSmpg6IY7c3pyW3KNQTGCLjeN507IbaMJtmuW4/rmlgP+X+WSluE
-jVy+XDCydA1gYCvyDYDu2CyQ62e77Ukhy/iHctl+QsfYVBpWmOe5js8e98sCxWi+
-Phi7u8X0jSmtFtL/04vLSf2t1OLgLhQlDcGqebJP/EHrNwZvoWa7n4+dU8lY4oAs
-3jdW5YT+diB+fSYoHZDbyFb2Cd9C9JL0UqmlcapJPG7rKBppPW73GgvuYCgjvEBp
-Fxin/hrBmZHKbSVA/Brz/DwYJbzEbM4WW7Zd/XRDsnTVn3Hqkj6teP4+K4DyQTxE
-d0cgfh4APkb1aXjFun9T3wkx81/hTxsodzxR09JFhEeo1f4zzjWEXFFlNuS/FKIZ
-QGii0HL5X9Ndd3eKviDT
-=Hhyq
+iKYEAREIAGYFAlWfelpfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDdDQUM1OUY0ODkzMERBREU1NUQ1RjJBRkIy
+OEVDMjEzQjgwNzJCMEQACgkQso7CE7gHKw07vQCg0YvI3n1kbPe1MZhDKFtYWBZ9
+oHMAn3i27dbYtebcAAeCRNcNp7cn8GoO
+=8cWV
 -----END PGP SIGNATURE-----
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"
+}