gentoo resync : 06.08.2019

4 files changed, 94 insertions, 29 deletions

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>