gentoo resync : 18.08.2019

4 files changed, 94 insertions, 19 deletions

diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index b93d59beb7ff..a5c4e40e4459 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -2,10 +2,12 @@ AUX sysstat-11.0.4-cron.patch 1609 BLAKE2B b190f9b6e47da5240ced4fed912bdcdb130d8
 AUX sysstat-11.7.3-flags.patch 274 BLAKE2B 67abbdad7a4cf9f20af1baf16e0c73c63f49718cc0fb3c70bc681e8cdda29394ea5a75d871c76f658305b26d44d1034d09079f3b6306a4dd466cd0775b5514b2 SHA512 80dd658b06f2e1072a3a58bbe84770170f1cb6c3e2ae0d660713a007b0e9e59c45b710cc1484c94ec466759455ae18a7fbae237b6674ee9ddb43a7a4502cb0d5
 AUX sysstat.init.d 378 BLAKE2B fe781f1a53e183023da2b46ecefb37881eedf8e8df2623927b24f33aa3344776b39db038d598ad050f1d48462d52300fb17731f29b0a8ab9c800fbe379efa249 SHA512 328ee3d40d45a0b1702c74fe0195ce4444cc8f63cb0fa68ba40ca20cfa183dd7acf4fc846cd76a4bcf426a3b4064316061dbbf26ca20047711528399e17b20b4
 DIST sysstat-12.0.5.tar.gz 711967 BLAKE2B 96aa49d82e71407dbd99d840ca5f71af83f54ba6315c858fae71f97290e8cf9c4f5358ad6389c7489366a62667c35835151e3187382a56c98153d3a04bcc2b8d SHA512 c1061f1af35430e81e488e4b2f18b8588ec4f3c419ade004c49ca24baf60b5b76a6a59eb25f3b17b51a9f60c5833a914a514872d0235b2ca405341a2f4a32cb3
-DIST sysstat-12.1.4.tar.gz 738031 BLAKE2B 6803a727bb67e5027400f684d9d93efa6ca22526a1363e04f8bce06a6cd300d4ebf7e02c8f9048fc25794974efa38117dacdf12831bee4bfd43fe40d0b34dbb6 SHA512 e60721408861045bcb1a52b170682df54631926bf4eef5a2709e25b1469c13377026bac3e51f5eeed11c7149b916c00bf5c06a2ff65d9c28063de1ae108b61c2
+DIST sysstat-12.0.6.tar.gz 712148 BLAKE2B 1118ce071e06c2853ffdec2be1b8b3bf060571caf988e17e04ff62cbf43e7111c5951a131d176b49ad35e1da75d2b8936e23f1a385e1c83a013b802a0fc36003 SHA512 e8f542b26c2b0b7b3aadbf34dce640879d27f8f1659447f15ffb5a210987c74840418046409403da85a9eb4c01484615d230ddc700611b7c0088d72165bffe86
 DIST sysstat-12.1.5.tar.gz 1032031 BLAKE2B 9fbc0c0d132983daa334345f1f83ac8a46092cf52f35bafd443febd8ce40e4ab11b5b9b05b92e4074ecf9feab682035b2e08094ce10f3287036821be57db0800 SHA512 9dbc44b0226efc2f219ff71d2f0b83c930263fe8d6d0b451ae8404b3056558de04c76c16f2e8ba62083cde3a37cabbcd466d9247bd61ba5921dbc2ab6a1f686b
+DIST sysstat-12.1.6.tar.gz 1089333 BLAKE2B 3a3c3867b6b78ca1da7d5ef5838f5aad490e6d454aff3e8db266136ce7666112bcd1ad05b727c2455c16e53f6c84e0e75e32e8f4cc9318300aa9076921f68c1c SHA512 9c03e911fd6843b1719e080fce429e0d33f73f01619251f425dd4bbcc9d2764cd9beb8f8ebb4406b9540634d36c83303c10abcf682b079d35045454b1541984d
 EBUILD sysstat-12.0.5.ebuild 1693 BLAKE2B 13fe90d234884fe0e164ac2e2e69643383b6e2dd6048d8886f2871d5fd5e77dd81bd4e9a2b83f0e2e2a604d71cbbf1cc44eb1f320ef7c4d7114da1b3359999f0 SHA512 b072840085d01d79dff0b65988f54425dc900f7c2d98c9e3ed20fc91ab3e886fc117ae6d0d3327d2fa3ec40c46ff1dd25bd6f9a9005e52c4b845dc1429d10d15
-EBUILD sysstat-12.1.4.ebuild 1838 BLAKE2B caa28ea7a3eff2d9eb22a805485b31923ea3071757cc37af64ab55e412047eef1f4062d0df9f5c6cea958262190f466d2bd290187faae021fe44f06fdda1c1ed SHA512 a21db0825e71acba0c9ff658b9530f8ef00593a6d95dd5ce0c4ef8212af5f54bccda5f9a6ff2fee444245521c4eb50120f80dec434fdbfcf74696bf82e6661cf
+EBUILD sysstat-12.0.6.ebuild 1694 BLAKE2B f17e881c4322bd2ac87ce15d19f3dab84dec949c7c5c6fb25d1760546a116ff7191dc6904f86fcb835fd92b08edac261ed8888eb37fb7519f6ba9f161dd6af44 SHA512 09e75c118e1557209e51191efa50af6269b50416d0f387d518a5a3916f3e0d1d522049dcd631ebcdc39a72861209b48e4715989d0b764bae9c9a630bcdc649ec
 EBUILD sysstat-12.1.5.ebuild 1708 BLAKE2B 3ba833b6ff81e4a5599367e15bac6370ef91069ee909a05c22b339faee931c8f6b84cef9795585b3b1f94f09bbf7f99624047fbcb814ba3581176d4db48ba0d0 SHA512 960934a753749b6a82368da345402c434810e1e8eb98575ef3363b95f9f99a918e70b1882fda51bb9bc349dbffcdf53e55553318c85eec97484a62bc03dcbf93
-EBUILD sysstat-999999.ebuild 1741 BLAKE2B 17d47e7c1a6f90d9930b1291d54f684889e7f617cd29030cdfecd4909c50c4008e5a35a860a2b1b165c432d7b444debf2fbd2f8aecafe51532ee3b35740f126e SHA512 450f00d7fdd18fff61eac06f2c4cb02aff1a540593812965aa8f29f3338da6c0950e89314eab5fe870a8d024e58126b7015f1b1c920b5a9012099c54a3394260
+EBUILD sysstat-12.1.6.ebuild 1701 BLAKE2B 8158defd39b0bee0414fbf72509c687cac2138f06d5db309b0d4b52d729a66bff4f9f59048150eb69dd93377aaef9deb78d263a87e0d7a9eeea1c882d8ca98c5 SHA512 8b63f4400cbfd2ff99a9e73aa377a5fe01a5fd9e730839e4b1b2bc469d5400e772bc27e89dbb3387c25e23c665f6a8f7441e87df27433b6764b490646fdce7be
+EBUILD sysstat-999999.ebuild 1597 BLAKE2B f7f0260cfa097d792c587b41148bc300c1ee20e0b2b91f3307e0bbae32f8eed00d2a3e925967b754d3e7f5492d56b604a7fe417d633252a573acd4c8244b720d SHA512 be8c3366fcb833b47dc82076616b6ea95e87592bb62377d0c07268ca0fe8651130eb843374c965f519bc1eddf3fe2a97c119c2a29c2de9e9e6384d3fc5765ba7
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/app-admin/sysstat/sysstat-12.1.4.ebuild b/app-admin/sysstat/sysstat-12.0.6.ebuild
index b9ca3b9892bd..db640d7d5f9e 100644
--- a/app-admin/sysstat/sysstat-12.1.4.ebuild
+++ b/app-admin/sysstat/sysstat-12.0.6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils flag-o-matic multilib systemd toolchain-funcs
+EAPI=7
+inherit flag-o-matic systemd toolchain-funcs
 
 DESCRIPTION="System performance tools for Linux"
 HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
@@ -30,8 +30,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-11.7.3-flags.patch
 )
 
-SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
-
 src_prepare() {
 	if use nls; then
 		strip-linguas -i nls/
@@ -52,9 +50,8 @@ src_configure() {
 	tc-export AR
 	use static && append-ldflags -static
 
-	sa_lib_dir=/usr/$(get_libdir)/sa \
+	sa_lib_dir=/usr/lib/sa \
 		conf_dir=/etc \
-		rcdir=${SYSSTAT_FAKE_RC_DIR} \
 		econf \
 			$(use_enable debug debuginfo) \
 			$(use_enable lm_sensors sensors) \
@@ -77,9 +74,8 @@ src_install() {
 
 	dodoc -r contrib/
 
-	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
+	rm "${D}"/usr/share/doc/${PF}/COPYING || die
 }
diff --git a/app-admin/sysstat/sysstat-12.1.6.ebuild b/app-admin/sysstat/sysstat-12.1.6.ebuild
new file mode 100644
index 000000000000..fd3a1dd527e7
--- /dev/null
+++ b/app-admin/sysstat/sysstat-12.1.6.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE="debug nls lm_sensors selinux static"
+
+CDEPEND="
+	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}-11.0.4-cron.patch
+	"${FILESDIR}"/${PN}-11.7.3-flags.patch
+)
+
+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/lib/sa \
+		conf_dir=/etc \
+		econf \
+			$(use_enable debug debuginfo) \
+			$(use_enable lm_sensors sensors) \
+			$(use_enable nls) \
+			--enable-copy-only \
+			--enable-documentation \
+			--enable-install-cron \
+			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+}
+
+src_install() {
+	keepdir /var/log/sa
+
+	emake \
+		CHOWN=true \
+		DESTDIR="${D}" \
+		DOC_DIR=/usr/share/doc/${PF} \
+		MANGRPARG='' \
+		install
+
+	dodoc -r contrib/
+
+	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+	systemd_dounit ${PN}.service
+
+	rm "${D}"/usr/share/doc/${PF}/COPYING || die
+}
diff --git a/app-admin/sysstat/sysstat-999999.ebuild b/app-admin/sysstat/sysstat-999999.ebuild
index b8e79ab247b8..62f6cc193b2b 100644
--- a/app-admin/sysstat/sysstat-999999.ebuild
+++ b/app-admin/sysstat/sysstat-999999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils flag-o-matic git-r3 multilib systemd toolchain-funcs
+EAPI=7
+inherit flag-o-matic git-r3 systemd toolchain-funcs
 
 DESCRIPTION="System performance tools for Linux"
 HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
@@ -30,8 +30,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-11.7.3-flags.patch
 )
 
-SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
-
 src_prepare() {
 	if use nls; then
 		strip-linguas -i nls/
@@ -52,9 +50,8 @@ src_configure() {
 	tc-export AR
 	use static && append-ldflags -static
 
-	sa_lib_dir=/usr/$(get_libdir)/sa \
+	sa_lib_dir=/usr/lib/sa \
 		conf_dir=/etc \
-		rcdir=${SYSSTAT_FAKE_RC_DIR} \
 		econf \
 			$(use_enable debug debuginfo) \
 			$(use_enable lm_sensors sensors) \
@@ -77,9 +74,8 @@ src_install() {
 
 	dodoc -r contrib/
 
-	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
+	rm "${D}"/usr/share/doc/${PF}/COPYING || die
 }