gentoo resync : 10.11.2017

3 files changed, 4 insertions, 107 deletions

diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index a25861f56024..c803d0dcc6ee 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -2,13 +2,11 @@ AUX sysstat-10.0.4-flags.patch 887 SHA256 198660c418902107914afefbed1b07a0206ee0
 AUX sysstat-11.0.4-cron.patch 1609 SHA256 40be139a456adeb21e76fc1f9663c171750f5aab3af2a4c6ed255fbabb14f02c SHA512 531340bb0770c07743caa6c760584c0f4cda5a5db7dd46bd2eee8ae1cccabecffee084571fb68a3510735b04430f2bb454068d9983da2856a0459ccb258eb89d WHIRLPOOL 01b9f3aedac49494265891b03a885b59ead854099a6441f21a8aede873eba967b83c54df139f2be3215f489ddd0544c4c1d0241f5623985cdaf7082dbb912333
 AUX sysstat.init.d 378 SHA256 d42258dd706e387503a827515eec7081e10f78d51a0a507c71258e0388177a43 SHA512 328ee3d40d45a0b1702c74fe0195ce4444cc8f63cb0fa68ba40ca20cfa183dd7acf4fc846cd76a4bcf426a3b4064316061dbbf26ca20047711528399e17b20b4 WHIRLPOOL 44652d5d89ac23aec6b81ad9825e8470aa90270c8c1243d64a7d09d8c801e76e511877acd20054b1f1a7916adcc6b398cc270cf184391f27af4f1b17704dfb9c
 DIST sysstat-11.4.0.tar.xz 343968 SHA256 b8518ca88acfcbc474a406022ee9c0c3210ccef4f0ec80e5b3e8c41dda8c16f2 SHA512 4a5c81d75fdbc8dcaf80685f302688c39bd7143554e5a06cb324532ddb5180caac19b261182d5320f40b317bdb1e81664887acc7cedfeb5a95dc6ad37a898604 WHIRLPOOL 39f48929040405f83a0d3c49dcf2aac471deeadd10d31181ee03809a30573868a7da43df160688ad553d305221bd21c2e253f56913f8f8a53020fb66f62c05ba
-DIST sysstat-11.4.5.tar.xz 344796 SHA256 785d754d64c746b21190773a846539ef2ee789bf908f05cd8245c234d15784ff SHA512 e195e0fa4afa45e894fc1089ecdc7e77dd0532f0db0d10b717b32e642710baa96de31be01c70c8a1173359c8f65f34dc72ac2722ecd2c8e63bf286a6eed202fd WHIRLPOOL a35f673129b873a0fac657447905d7662eaa22f3bd80a095d5c440586d116a595dab68136a147f3f50b0019eb1e244a29c8cdff0fb4b8e6698f31920a901f623
-DIST sysstat-11.4.6.tar.xz 344832 SHA256 2bc1d98572169a901868afdf0c56f98580191353ba3bc5c7ce6efd12e7a7fa2e SHA512 50fa1426fde528758dcc3b067f3f52987bf6e09788f81feda9fa5db5286960f7cff9bf832ab8320448904429ee473c444eca25c40c545b875b83b90b9b132439 WHIRLPOOL 16b7e5d69f1bd4f3d2198b9a32f3cb88ff1063df331c9a336947e240789aa7945b34a009a27c69752e4002992718c6e461b52ee36e02b6b7aae361e8a7c79965
 DIST sysstat-11.6.0.tar.xz 468528 SHA256 122172f5730162efd80e74fbbc0eeee8facfe10b30f38fe4b8f0693588474ee4 SHA512 b54af1724777e20df54e9dac97b558abd4f669724234d4a62debbfa2dd5788020683ca8e47f95ea018feefd024abe2f930a91363b35ef490ddf69b7cf2d5df68 WHIRLPOOL bffada8ed40938fb1f67ec894403f2339a7736a2a11a8b14a370b7ab1c8bd0e0e3fbcb4d2e2a3d91916cc348e34848c215b72caa3cad5202eeb723df1c09c7ba
+DIST sysstat-11.6.1.tar.xz 470584 SHA256 4b2a2cfa8c8fe6ae0155e168ed9a7066caebc3ecb903b0e64a9ede28ecb68fcb SHA512 55b3c361f7cda3d5efc0a42bef26d154c159a465ef45b56d2567f38aeec8c935c4e3b65a92eaf996abbf2d6a2604b2b8bba95741d707e8f387c9fadc05fafa93 WHIRLPOOL c349cab5b7475c357131d5780568be0d3bc6ebba24a145432e1fe6613c0d42ca91356ee18180b03ea5b59aa61e17d9915488cfef67a2d5d17aae26f8a6435891
 EBUILD sysstat-11.4.0.ebuild 1945 SHA256 8b4c42c450645fbb9552c64ee24677370ce0c3c954dd76bfc984e15ec9fbe3ad SHA512 25438d8e95dac4789c18215f83c09868ef7bb9886d5abe76f70b5461b65cfa42648c7593d861c0d075f1ec7bde52503d3235f3aea716e9fc9a39dfc5762e269c WHIRLPOOL eeb276f07de690091e6627607e3558c1d2e800d3eabff1918e43b58f95a1a36a637d7d5a2999e16e8dea17e4f57c42dfc7a315581834b94775a27b25303ae9bc
-EBUILD sysstat-11.4.5.ebuild 1959 SHA256 ae8a5a91e3e2be0935ccd56159e9c09b6cf8bc10705ae278b61bb8628d3ae0e4 SHA512 fd1743523099869d6ad26dd693c432a68b240af4833174681a902276bac5d8d953c0579ea2f5ccad3122fe83cae4c99a37f3ad5f9e2edb0d54499cbf8b4d7643 WHIRLPOOL 15ef41b0934e5c01217d5f74a58ae37d1c6c7f6c2f473884cccd0bb390685bafd9cb76e67c05eedca0cf7a29e6cee5bdca376e09bd45ba706f0a9e31ee3fb96d
-EBUILD sysstat-11.4.6.ebuild 1959 SHA256 ae8a5a91e3e2be0935ccd56159e9c09b6cf8bc10705ae278b61bb8628d3ae0e4 SHA512 fd1743523099869d6ad26dd693c432a68b240af4833174681a902276bac5d8d953c0579ea2f5ccad3122fe83cae4c99a37f3ad5f9e2edb0d54499cbf8b4d7643 WHIRLPOOL 15ef41b0934e5c01217d5f74a58ae37d1c6c7f6c2f473884cccd0bb390685bafd9cb76e67c05eedca0cf7a29e6cee5bdca376e09bd45ba706f0a9e31ee3fb96d
 EBUILD sysstat-11.6.0.ebuild 1833 SHA256 07ccc378ea215ff4c83a7fc4bf4213cb898c9c58f9e0a15e486a62a54779d918 SHA512 643e2d9abd82818c04ae64858afd3682b61ec60f5a74f61f945319563eac525c95cfbac2a9d5143456214f48c4b5936b8138db2ac4ec04604fa6011c4549838b WHIRLPOOL ed6b9fb0f3db56980b001c9c22f3d0b1d70de9f8b7989d3421ca2d11b9a1db86e0f53efdba174e03af097fe036df52a9cc073ec466edbb25c15012326d0d8753
+EBUILD sysstat-11.6.1.ebuild 1833 SHA256 07ccc378ea215ff4c83a7fc4bf4213cb898c9c58f9e0a15e486a62a54779d918 SHA512 643e2d9abd82818c04ae64858afd3682b61ec60f5a74f61f945319563eac525c95cfbac2a9d5143456214f48c4b5936b8138db2ac4ec04604fa6011c4549838b WHIRLPOOL ed6b9fb0f3db56980b001c9c22f3d0b1d70de9f8b7989d3421ca2d11b9a1db86e0f53efdba174e03af097fe036df52a9cc073ec466edbb25c15012326d0d8753
 MISC ChangeLog 8800 SHA256 5a0dd841ec6fbb34ed7a3f70251a92ef2ba1d0d0bd1a60dcefd8636ec5fbb32a SHA512 9bf8efe78cc0fe4d6184abdaa9878780c56d8a02646594f3ebb7dee39a7def233b9264fde4751149a347966522e30112545010a39b125b814575d14e0463aa3c WHIRLPOOL 8430e337e1addb437f672841b11dd6cc95862a975181d7ae7f7930870acad2b956e93ad0760b5afc4dba246ebed56c4d6e8915fadb289de229dc719f69edc0d3
 MISC ChangeLog-2015 37518 SHA256 f020b27cf6b458e9fce1b9cd3294ca030b9a5992df7801e12c23ea3e3e8adb22 SHA512 13251666a2fdd4cf4efb042e997c24d4fc9090c387d75b46ff4d6e29074d9f96a05353903f278319987800c8b130f54962ed49974f3ed68f554bac51543029bd WHIRLPOOL 94424ca038660ae939574de7ea313c6e2c05a26749dcad1d376489567256b272e671d099bdff2de90efd2604782e3060ec85521603eb0868887ec1071eacf05f
 MISC metadata.xml 336 SHA256 128b2d510f79bb699bcfbc65c40ed0f8ffd0e29cdd7d13475e41f77637d26166 SHA512 63adb90aca54ec347aac7feaad3b2ee3c707fc536c0de0e0ee045d4fe2c08e231bdbd4473b9722a747ef1263cb98a067a43cbbbae28aabad71458c16df946bc6 WHIRLPOOL b33f41dddcecf3e249345056e094266a0a467ce7dcfa0195be2fecab6854cd61e5facb1cf1c7ef10995360b583da6b3fa1ffd2487e028a89af742de0aec0959b
diff --git a/app-admin/sysstat/sysstat-11.4.6.ebuild b/app-admin/sysstat/sysstat-11.4.6.ebuild
deleted file mode 100644
index 74bbea22aec4..000000000000
--- a/app-admin/sysstat/sysstat-11.4.6.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic multilib systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug isag nls lm_sensors selinux static"
-
-CDEPEND="
-	isag? (
-		dev-lang/tk:0
-		dev-vcs/rcs
-		sci-visualization/gnuplot
-	)
-	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sysstat )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.0.4-flags.patch
-	"${FILESDIR}"/${PN}-11.0.4-cron.patch
-)
-
-SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-
-	default
-}
-
-src_configure() {
-	tc-export AR
-	use static && append-ldflags -static
-
-	sa_lib_dir=/usr/$(get_libdir)/sa \
-		conf_dir=/etc \
-		rcdir=${SYSSTAT_FAKE_RC_DIR} \
-		econf \
-			$(use_enable debug debuginfo) \
-			$(use_enable isag install-isag) \
-			$(use_enable lm_sensors sensors) \
-			$(use_enable nls) \
-			--enable-copy-only \
-			--enable-documentation \
-			--enable-install-cron \
-			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_compile() {
-	emake LFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	emake \
-		CHOWN=true \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		MANGRPARG='' \
-		install
-
-	dodoc contrib/sargraph/sargraph
-
-	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	rm -f "${D}"usr/share/doc/${PF}/COPYING
-}
diff --git a/app-admin/sysstat/sysstat-11.4.5.ebuild b/app-admin/sysstat/sysstat-11.6.1.ebuild
index 74bbea22aec4..aa17b2d17f98 100644
--- a/app-admin/sysstat/sysstat-11.4.5.ebuild
+++ b/app-admin/sysstat/sysstat-11.6.1.ebuild
@@ -11,14 +11,9 @@ SRC_URI="${HOMEPAGE}${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug isag nls lm_sensors selinux static"
+IUSE="debug nls lm_sensors selinux static"
 
 CDEPEND="
-	isag? (
-		dev-lang/tk:0
-		dev-vcs/rcs
-		sci-visualization/gnuplot
-	)
 	nls? ( virtual/libintl )
 	lm_sensors? ( sys-apps/lm_sensors )
 "
@@ -62,7 +57,6 @@ src_configure() {
 		rcdir=${SYSSTAT_FAKE_RC_DIR} \
 		econf \
 			$(use_enable debug debuginfo) \
-			$(use_enable isag install-isag) \
 			$(use_enable lm_sensors sensors) \
 			$(use_enable nls) \
 			--enable-copy-only \
@@ -85,7 +79,7 @@ src_install() {
 		MANGRPARG='' \
 		install
 
-	dodoc contrib/sargraph/sargraph
+	dodoc -r contrib/
 
 	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
 	newinitd "${FILESDIR}"/${PN}.init.d ${PN}