gentoo resync : 06.08.2019

9 files changed, 171 insertions, 30 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index fa98ebf2ebc0..3aa506ebf411 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index 94f6022090b8..d5961a5f6e9f 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -1,4 +1,6 @@
 DIST acpid-2.0.31.tar.xz 155620 BLAKE2B 11338d72156dfd90f680367e23e373f8c4ee5e553ad4a8a9c9688163e9a97ee99a9b866940320ee5af5a9e9fe956dd3e675d0b879ea984c2cca56162c0d163fd SHA512 05eb96cdae698731b14caa89aa01239a0f16ce732f897d295447753aab7c8d49227c9b9ce901c6fd3bfdb117688e6ed80ec61aea0f64d75c9c0afe2aea2aa91a
+DIST acpid-2.0.32.tar.xz 155768 BLAKE2B 829b2f78f497d9c0bbd90d952cadad96beece3070240bee69f2a5cf28903e9e5f969a3bf9000552c63a52c17f8b94285a181f4301449a9b64c573032d9a4d255 SHA512 c7afffdf9818504e1ac03b0ad693a05f772bfd07af9808262b3b6bb82ca4dabe6253c94e6dc59e5be6f0da9e815e8bcf2d3e16f02b23d0248b6bad4509e78be7
 DIST sys-power_acpid_2.0.29-r1_extras.tar.xz 2548 BLAKE2B 4568f0e44d33382fd294248d48c8852f689f0a6082d9b74b33b77918d3ce21d7f1bf8a3aafeaa252e8fe170b3829155344a256f01fe80414369f02d50a17ff55 SHA512 f2c366c50c75790df32a1f6573b7de640fd09a97c4598155ebd0aad2eba118961ddc82fe0fbb4dc935aa5b6d7fcfe3ade73fff555b4588b0e4579a1028bef12f
 EBUILD acpid-2.0.31.ebuild 1962 BLAKE2B 4095dace6957e021be73c336ccf9b33049abcdc789be44820a99f06f092f0b309b6629ebeab97246fdbe12a72fedee5c4fb7a4ce029f79a11e7f79ea05b046a7 SHA512 a4178b8e8d93aabadc3b9be21728ff387a7e2259ff78fa4431cb32cbd913e6463c942bbaf19cce2132b3b1bd7a20ceae0d59a24be313337598cd345130b7a1b1
+EBUILD acpid-2.0.32.ebuild 1966 BLAKE2B ec877eb0334d301be61fe4ebc3d458e1c4b98895137d92d8fa6e6c320aa83c9b2199fe61a40ceb5d0fa3cb153da7c11f005d41705b1f0955c1bc223d28e72882 SHA512 ac8d3f67c720261d3d3757118e8196df612e024c0025ffd55861089e85ba8e63fee0ff6daa0ae5d64f90f02f3fd4ecc45f08c884a1afceb2c07d9b4f8579c1f3
 MISC metadata.xml 327 BLAKE2B f6c546808131faaccf65580107772b21a3fe59b681b1ae6c66846ce230c9bb4ce9209287ff88f150f4bd691d71cdbf7e2c4fd4ac8a049a2e8b9d9ab57967c1b3 SHA512 8e93170bc36e09c1cf6c1db7eb751cc1ddf737d3ed240ef69a5ba00279ea3d9e92c5ba5185faa5f2f3c86fca9922adfb8e8e0ffe673817984948aa941a2a7a3a
diff --git a/sys-power/acpid/acpid-2.0.32.ebuild b/sys-power/acpid/acpid-2.0.32.ebuild
new file mode 100644
index 000000000000..229b3a21d7ee
--- /dev/null
+++ b/sys-power/acpid/acpid-2.0.32.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit linux-info systemd
+
+DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
+HOMEPAGE="https://sourceforge.net/projects/acpid2"
+EXTRAS_VER="2.0.29-r1"
+EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
+SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz
+	https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz
+	"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-apm )"
+DEPEND=">=sys-kernel/linux-headers-3"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~INPUT_EVDEV"
+	local WARNING_INPUT_EVDEV="CONFIG_INPUT_EVDEV is required for ACPI button event support."
+	[[ ${MERGE_TYPE} != buildonly ]] && check_extra_config
+}
+
+pkg_setup() { :; }
+
+PATCHES=(
+)
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newdoc kacpimon/README README.kacpimon
+	dodoc -r samples
+	rm -f "${D}"/usr/share/doc/${PF}/COPYING || die
+
+	exeinto /etc/acpi
+	newexe "${WORKDIR}/${EXTRAS_NAME}/${PN}-1.0.6-default.sh" default.sh
+	exeinto /etc/acpi/actions
+	newexe samples/powerbtn/powerbtn.sh powerbtn.sh
+	insinto /etc/acpi/events
+	newins "${WORKDIR}/${EXTRAS_NAME}/${PN}-1.0.4-default" default
+
+	newinitd "${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.26-init.d" ${PN}
+	newconfd "${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.16-conf.d" ${PN}
+
+	systemd_dounit "${WORKDIR}"/${EXTRAS_NAME}/systemd/${PN}.{service,socket}
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "You may wish to read the Gentoo Linux Power Management Guide,"
+		elog "which can be found online at:"
+		elog "https://wiki.gentoo.org/wiki/Power_management/Guide"
+		elog
+	fi
+
+	# files/systemd/acpid.socket -> ListenStream=/run/acpid.socket
+	mkdir -p "${ROOT%/}"/run
+
+	if ! grep -qs "^tmpfs.*/run " "${ROOT%/}"/proc/mounts ; then
+		echo
+		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
+	fi
+}
diff --git a/sys-power/intel-undervolt/Manifest b/sys-power/intel-undervolt/Manifest
index 1f01f4330b39..a15c08193ab7 100644
--- a/sys-power/intel-undervolt/Manifest
+++ b/sys-power/intel-undervolt/Manifest
@@ -1,6 +1,8 @@
 AUX confd 75 BLAKE2B 48999f73a7bf3809383904c90a40d6e53a7c338f76585238260bb9d0261ec1b7a31db4ea8039ee31598b042b87c97e6487d048d7880a118864e7bf11cd474344 SHA512 335fc14643b6b0f8f19152966d41d40021b5e6a894f3c27211dcb42c106eef9c03e1b623b8a7bd9e48aeb904854b11d3ac9681738baa87d6eabfd4ac3df9b188
 AUX initd 506 BLAKE2B 0ead334ec3eb2cbfef7a02e326fe73f91a159b60080391b56dba10c021936fe02cc49fd99141b351e17b6231299a4c2ee7c4751744fa3c057ac06a5a8513d751 SHA512 22ba7987ea2dbebf88740967cb326dc6cc2e6797920d8f850494d3bd95280b41655598d07807fd7c2c3f653ee7b65c5e8ad6260dde083f953804497b40f19594
 DIST intel-undervolt-1.6.tar.gz 22465 BLAKE2B 947f3e3f94316a9988fc0311faa23b07e8e0a99afb737232e6e581f45cca89124a49e47bbc85eb0e836b7fc7f966869910fe4d42581e47d98d8c036390c3dec2 SHA512 1c1de1083654085d6711aad28d2815f2aa05d08b7fddbee425b59ab8109dc1e635c2a9bdda8ba0221420e9e00fcd61013bd4a4633d05ede87808c49898772db3
+DIST intel-undervolt-1.7.tar.gz 31481 BLAKE2B 0daade381b492184616356f097de32d14c76d6ab3f7dd59240fb25f92ee1b9aebb16cbef8b6836e16e361a9560b000655470140c31b5822fed7bd90e0b9d9bf2 SHA512 727eddd47a92f6092e89f9326c6b453785fac6155f2c2c50887f9a90704226e6abaf27b4a91cabd4783c4477371699a92186fe7847ac9218da9c26fb295a5304
 EBUILD intel-undervolt-1.6.ebuild 1148 BLAKE2B 8f84169e6bcb0d30fdb3b1901ba7cdbce971e933514e447d67c4cabde2078a57194107f900cd430306d81bfbd245c960d2c9c48780c8ff84694eed8f7afe3385 SHA512 8116d5545b70c0a3a8e81f4c5258462f4f1912712725574177cc92c61e58b355abdc2e70abe854f748eeca1ee747d5c0d436485fd49831580445fbb3e477bd5d
-EBUILD intel-undervolt-9999.ebuild 1148 BLAKE2B 8f84169e6bcb0d30fdb3b1901ba7cdbce971e933514e447d67c4cabde2078a57194107f900cd430306d81bfbd245c960d2c9c48780c8ff84694eed8f7afe3385 SHA512 8116d5545b70c0a3a8e81f4c5258462f4f1912712725574177cc92c61e58b355abdc2e70abe854f748eeca1ee747d5c0d436485fd49831580445fbb3e477bd5d
-MISC metadata.xml 462 BLAKE2B 6d4509f86962260abc93564e10dd087dcc1a7aa4b18c804a4a78c0c51d8659c8bd16227dcc654f60c05a0db178d81643a0a301135cb6a0857122a9b591f20e2c SHA512 99358e143a74ab36d352331d30a65ca100818edd57e62258f5ffb32f8c33f41be06e190b9f1291779db5e68228ce82241c7e30af7052c204df2c70ed7dafae1a
+EBUILD intel-undervolt-1.7.ebuild 1219 BLAKE2B 7e03cb969aa0e8852c21e09f2f5505bb6e375198f5a25eb8944570df30d309d8a4b293c0ccb6a5274d3628d46b8840f2aeaa359b22414af8a43925394e97ad3a SHA512 42142c857b9bbcb1c273b725e3aaee484c81b0de48e8a840fb4c49f932b0e284a2523d3a125d6e7e2d15a2b38729fb36221165f4a2a6da9d2e897c8b21e85d79
+EBUILD intel-undervolt-9999.ebuild 1219 BLAKE2B 7e03cb969aa0e8852c21e09f2f5505bb6e375198f5a25eb8944570df30d309d8a4b293c0ccb6a5274d3628d46b8840f2aeaa359b22414af8a43925394e97ad3a SHA512 42142c857b9bbcb1c273b725e3aaee484c81b0de48e8a840fb4c49f932b0e284a2523d3a125d6e7e2d15a2b38729fb36221165f4a2a6da9d2e897c8b21e85d79
+MISC metadata.xml 560 BLAKE2B 64440b4ecea98975cee61547bd93e8ce22f2c718cc8d2cf8b0cfbb76634585fa1c20309099f0b62c05b847b9db34b5b49832ffd1473f21015d74c3894b2ce972 SHA512 4c7c00d520f219cf24e4828f023d617b3829f2df70960a4156b214e2de5b94d1b33b865c72fff5c53215c236061ed0e1623c2f8f1a397bca960880548a00ec3c
diff --git a/sys-power/intel-undervolt/intel-undervolt-1.7.ebuild b/sys-power/intel-undervolt/intel-undervolt-1.7.ebuild
new file mode 100644
index 000000000000..4fa869561791
--- /dev/null
+++ b/sys-power/intel-undervolt/intel-undervolt-1.7.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="Intel CPU undervolting and throttling configuration tool"
+HOMEPAGE="https://github.com/kitsunyan/intel-undervolt"
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/kitsunyan/${PN}.git"
+else
+	SRC_URI="https://github.com/kitsunyan/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="-* ~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="elogind"
+
+DEPEND="elogind? ( sys-auth/elogind )"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~INTEL_RAPL ~X86_MSR"
+
+src_configure() {
+	local myconf=(
+		# it's a non-standard build system
+		$(usex elogind --enable-elogind '')
+		--enable-openrc
+		--enable-systemd
+		--unitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	tc-export CC
+
+	local myemakeargs=(
+		CC="${CC}"
+		CFLAGS="${CFLAGS}"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+pkg_postinst() {
+	for v in ${REPLACING_VERSIONS}; do
+		if [[ ${v} == 1.6 ]] ; then
+			elog "openrc service has been renamed to intel-undervolt-loop"
+			elog "please update your startup configuration"
+		fi
+	done
+}
diff --git a/sys-power/intel-undervolt/intel-undervolt-9999.ebuild b/sys-power/intel-undervolt/intel-undervolt-9999.ebuild
index 74c44d3fe535..4fa869561791 100644
--- a/sys-power/intel-undervolt/intel-undervolt-9999.ebuild
+++ b/sys-power/intel-undervolt/intel-undervolt-9999.ebuild
@@ -18,45 +18,44 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
+IUSE="elogind"
 
-DEPEND=""
-RDEPEND=""
-BDEPEND=""
+DEPEND="elogind? ( sys-auth/elogind )"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
 
 CONFIG_CHECK="~INTEL_RAPL ~X86_MSR"
 
-src_prepare() {
-	# respect CC, CFLAGS and avoid calling pkg-config
-	sed -i \
-		-e 's/^CC=/CC?=/' \
-		-e 's/^CFLAGS=/CFLAGS?=/' \
-		-e '/^UNITDIR=/d' \
-		Makefile || die
+src_configure() {
+	local myconf=(
+		# it's a non-standard build system
+		$(usex elogind --enable-elogind '')
+		--enable-openrc
+		--enable-systemd
+		--unitdir="$(systemd_get_systemunitdir)"
+	)
 
-	default
+	econf "${myconf[@]}"
 }
 
 src_compile() {
-
 	tc-export CC
 
-	myemakeargs=(
-		BINDIR="${EPREFIX}"/usr/bin
-		SYSCONFDIR="${EPREFIX}"/etc
-		UNITDIR="$(systemd_get_systemunitdir)"
+	local myemakeargs=(
+		CC="${CC}"
+		CFLAGS="${CFLAGS}"
 	)
+
 	emake "${myemakeargs[@]}"
 }
 
-src_install() {
-	myemakeargs+=(
-		DESTDIR="${D}"
-	)
-	emake "${myemakeargs[@]}" install
-
-	newinitd "${FILESDIR}"/initd "${PN}"
-	newconfd "${FILESDIR}"/confd "${PN}"
-
-	einstalldocs
+pkg_postinst() {
+	for v in ${REPLACING_VERSIONS}; do
+		if [[ ${v} == 1.6 ]] ; then
+			elog "openrc service has been renamed to intel-undervolt-loop"
+			elog "please update your startup configuration"
+		fi
+	done
 }
diff --git a/sys-power/intel-undervolt/metadata.xml b/sys-power/intel-undervolt/metadata.xml
index 52dabf8e7809..ae8c6fe793f2 100644
--- a/sys-power/intel-undervolt/metadata.xml
+++ b/sys-power/intel-undervolt/metadata.xml
@@ -8,6 +8,9 @@
 	<longdescription lang="en">
 		Tool for undervolting and throttling limits alteration for Intel CPUs
 	</longdescription>
+	<use>
+		<flag name="elogind">Use elogind hook to apply voltage after system sleep</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">kitsunyan/intel-undervolt</remote-id>
 	</upstream>
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index ba8dd50b516c..d4144e6340da 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -13,4 +13,4 @@ DIST nut-2.7.4.tar.gz 2509831 BLAKE2B 367c687efd739150898a14c700d5fddbe22bf92652
 EBUILD nut-2.7.4-r1.ebuild 9000 BLAKE2B 53cf51da6aaa6d9655b9fe68a2eeab13c53ce284fbd09b7fc5aee790220cc32a5d9c11ef50b31cae409ec034609e5e2ad7ab2d3f95db4f8fe6b38f69a4123968 SHA512 3fa055f36890e108ac31cd2cb79598a58c926ac887022c3871e7e31461b843b74744c064008afdb7e936c6b19c675881f6f53742479f5f5f070efe1167447807
 EBUILD nut-2.7.4-r2.ebuild 9730 BLAKE2B c8f4c2854ab90599e3d0d3813835d66af8bc94f21ddda161f9252edca05128aef019e7d38e4fb1ab0c394b00204d784889fbfd5c501223a8b547719dc5cc6a8a SHA512 ed9339618cca6caed393b8bce150900d86438fccb6a63ca863c60465b6b032e79ece41b3be931e864868031291a3045d16d6d5afa99ce73f9d64983705dcd21a
 EBUILD nut-2.7.4-r3.ebuild 9770 BLAKE2B 213ab23a9ba2e470f0cdb81511dc95ddf89719b90577cd429fbd823155ba62a01ae6a897332268da33f516fd68a49e3276bca37236f58afc39de073fe4a6dfd0 SHA512 0fa8444fc165f82c3027a2a8187d4d077af728b2e300b19f02fb744357781d60aaddcc58f415d5978e435e58ba567276219524d1f4e73471ba2843747067763f
-MISC metadata.xml 5178 BLAKE2B 4fd7fd1ac52507faf24113bd583784bb1c14b37e6b68cd9b670580262e05d82992cb87ce3d5b9573ffed35ada17fe0399cc1437ad503b7c1d49cd781be01bad9 SHA512 d94f262b166977866e94b7a81b8c625fc78bbd0861ef04de4dc8124773c5f2374999d9cdbc1c82b7fa258548b6b2d9a5f4db1647cf3e106a09ce7049f510b3b0
+MISC metadata.xml 5329 BLAKE2B a97167cdd654c0a1cfc035fbab98a8c94150522b77651186f8c706ac2ebadac6b3e38c8c563a6fa16ac91fc8da760efd204ce3d3ce8e3e0c5239a9dd8c1adf4e SHA512 e57d635a530b16627fbc4807a07a227900189a8796285f309b710c4acb951c990b4f613dc9b3cbab71c480641d8ebfd942520a13e5712527d0058ca07c16b67d
diff --git a/sys-power/nut/metadata.xml b/sys-power/nut/metadata.xml
index 85d0b12815ae..bde98d03e531 100644
--- a/sys-power/nut/metadata.xml
+++ b/sys-power/nut/metadata.xml
@@ -63,4 +63,8 @@
 		<flag name="ups_drivers_snmp-ups">Multi-MIB Driver for SNMP UPS equipment</flag>
 		<flag name="ups_drivers_nut-ipmipsu">Driver for IPMI Power Supply Units (PSU)</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">networkupstools/nut</remote-id>
+		<bugs-to>https://github.com/networkupstools/nut/issues</bugs-to>
+	</upstream>
 </pkgmetadata>