gentoo resync : 22.01.2019

4 files changed, 89 insertions, 1 deletions

diff --git a/app-laptop/thinkfan/Manifest b/app-laptop/thinkfan/Manifest
index f0093fb649da..94eb5ee5238c 100644
--- a/app-laptop/thinkfan/Manifest
+++ b/app-laptop/thinkfan/Manifest
@@ -1,3 +1,6 @@
+AUX thinkfan-1.0.1-update-runscript.patch 864 BLAKE2B a37f598fcf7ea7772b1bb431a5804ea4c5b0b8a20d74109b2629151109ba1e405d4b8a2a30bb3f093792863ca3ca266b4bc8d9673e2d5cc029168eae4e01f2dc SHA512 1fbe2548f42d84af599f720132b53ea9cd6374359458b7ebf0480ed6fb91386c12b72a98e71f4b10eb9d385e5397880cce2a7482c4ab057f27ead871d776ca2d
 DIST thinkfan-0.9.3.tar.gz 39527 BLAKE2B e6a6d09493d94b4de9ada20dcc4b0251c5f2c148f7faa7f69c04fe2a279a9cfe253a0ea1a01fe94ed108e8731e2ba01edef5df10dfb887ea961a356dff733854 SHA512 d2a29f9cae636c22b66958f8ec50cb60a162d745c3967257bb5e20cc9e152894d4e8a66f897ffa4e49353eba4a42e3499bb9e554719974284089a46cfc6280d7
+DIST thinkfan-1.0.1.tar.gz 77587 BLAKE2B 7a2d4d77be8a9abdafe2cdb8485c92dfe9850ad2309d45d0ac32e8c0e7e6db22ef6c2e16161cccbd6e6147497accc8ec3f5d4467dbe5d2fe6d7fdfd06bb3261f SHA512 61fac9e99f5a2974c5a80e2565956d203baf670dc4b97625389e91fe3fe4d026c07847c10e7d46a4f57914a8156aeea0141570202c0ce2b497f8a1daefa47d6e
 EBUILD thinkfan-0.9.3.ebuild 1069 BLAKE2B 0e4862e477f197efc30f9c72330e8153327325a733277220a0e65725483762e700515dc3204712d8f6af2b06c576cf17f114683993c0385383cc92c58e211318 SHA512 ffec534bfe1c1eb08c1de3858347781d6f0dc349d7f3de39196a47166e65142d649e0e889141e9c90ce193f0f984ac386ce39cc45f6e70ff971278c3b6560247
-MISC metadata.xml 423 BLAKE2B dcf942bcbecce2fdebf719e2b4dcff81dc77dac1e3e79e514b76c51c57607fd6c94ff5a5b98d8396f5d9f7ded1fbf852662f78efaf595f5da5c122003dca6018 SHA512 15064f7e7eb212afbc5df5d26fdae4cd542cf41f3b2b27acfa927a1d964119cdc7408f8027b72dc7d4874a25f11460a4e4eb0f6a2246c9e3f3879c4adde0c763
+EBUILD thinkfan-1.0.1.ebuild 988 BLAKE2B c6c4f9f655d75095dcca3c98fc47361309b1adb3f1675cd9c98db4224da51d89b62a0280d059d35eda6eabe171e58f8c12a852ff310cb6e2456c0027df79c158 SHA512 655786b80c76128c9501ae333b910a1053d3ce25c3d2c0d812e11a055435999c56599274ac31822d9ee0f668ddcaec8ea62800333a6597943d4272d53a98bd65
+MISC metadata.xml 585 BLAKE2B d58c398a0280995a6ec8a92af6947462f0c4706c55067004916d25fd1b5536e0bcf6f72da3839d9d4ec2768e73202e6dd32ba6cc5d19f98c4ae3a11c6ab4913c SHA512 27be53762d6974c08098d70fb340f3aef2067e3c053cc9d6509e7d3a2065ac43e71c6a574588a6b8345bb4fd9dc17ace48cffb7941f547ca7f81594f0e41149b
diff --git a/app-laptop/thinkfan/files/thinkfan-1.0.1-update-runscript.patch b/app-laptop/thinkfan/files/thinkfan-1.0.1-update-runscript.patch
new file mode 100644
index 000000000000..a0896af3d264
--- /dev/null
+++ b/app-laptop/thinkfan/files/thinkfan-1.0.1-update-runscript.patch
@@ -0,0 +1,39 @@
+https://github.com/vmatare/thinkfan/pull/61
+
+--- a/rcscripts/openrc/thinkfan.cmake
++++ b/rcscripts/openrc/thinkfan.cmake
+@@ -1,26 +1,19 @@
+ #!/sbin/openrc-run
+ 
++command="@CMAKE_INSTALL_PREFIX@/sbin/thinkfan"
++command_args="-q -s5 -c /etc/thinkfan.conf"
++pidfile="@PID_FILE@"
++
+ extra_started_commands="reload"
+ 
++required_files="/etc/thinkfan.conf"
++
+ depend() {
+ 	after modules
+ }
+ 
+-start() {
+-	ebegin "Starting thinkfan"
+-	start-stop-daemon --start --exec @CMAKE_INSTALL_PREFIX@/sbin/thinkfan -- -q -s5 -c /etc/thinkfan.conf
+-	eend $?
+-}
+-
+-stop() {
+-	ebegin "Stopping thinkfan"
+-	start-stop-daemon --stop --exec @CMAKE_INSTALL_PREFIX@/sbin/thinkfan
+-	eend $?
+-}
+-
+ reload() {
+-	PID=$(<@PID_FILE@)
+-	ebegin "Sending SIGHUP to thinkfan($PID)"
+-	kill -HUP $PID
++	ebegin "Reloading ${SVCNAME}"
++	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+ 	eend $?
+ }
diff --git a/app-laptop/thinkfan/metadata.xml b/app-laptop/thinkfan/metadata.xml
index e4b22975b67b..c6b8ff4c4c32 100644
--- a/app-laptop/thinkfan/metadata.xml
+++ b/app-laptop/thinkfan/metadata.xml
@@ -7,6 +7,8 @@
 	</maintainer>
 	<use>
 		<flag name="atasmart">include libatasmart support to get disc temperature</flag>
+		<flag name="nvidia">allow thinkfan to read GPU temperature from the proprietary nVidia driver</flag>
+		<flag name="yaml">use YAML format for config file</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">thinkfan</remote-id>
diff --git a/app-laptop/thinkfan/thinkfan-1.0.1.ebuild b/app-laptop/thinkfan/thinkfan-1.0.1.ebuild
new file mode 100644
index 000000000000..e7e7da5f821f
--- /dev/null
+++ b/app-laptop/thinkfan/thinkfan-1.0.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils readme.gentoo-r1
+
+DESCRIPTION="simple fan control program for thinkpads"
+HOMEPAGE="http://thinkfan.sourceforge.net"
+SRC_URI="https://github.com/vmatare/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="atasmart nvidia +yaml"
+
+DEPEND="atasmart? ( dev-libs/libatasmart )
+	yaml? ( dev-cpp/yaml-cpp )"
+RDEPEND="${DEPEND}
+	nvidia? ( x11-drivers/nvidia-drivers )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.1-update-runscript.patch )
+
+DOC_CONTENTS="
+	Please read the documentation and copy an appropriate
+	file to /etc/thinkfan.conf.
+"
+
+src_configure() {
+	local mycmakeargs+=(
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DUSE_NVML="$(usex nvidia)"
+		-DUSE_ATASMART="$(usex atasmart)"
+		-DUSE_YAML="$(usex yaml)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	readme.gentoo_create_doc
+}