gentoo resync : 05.12.2021

5 files changed, 36 insertions, 88 deletions

diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index 2149c3ebb67a..8281cae364bc 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/tuxedo-control-center-bin/Manifest b/app-laptop/tuxedo-control-center-bin/Manifest
index b60599f6f9c6..84972fece1c4 100644
--- a/app-laptop/tuxedo-control-center-bin/Manifest
+++ b/app-laptop/tuxedo-control-center-bin/Manifest
@@ -1,5 +1,4 @@
-DIST tuxedo-control-center_1.0.4.rpm 71316848 BLAKE2B 9368825985f292556d0c4b60000ff05d8363b300be34708c4fb2f7ac284218b48051deaa30d62707aefa28db4b54c02a2f82d12db33bf56341f257a47bde13f2 SHA512 6881069a99b97b03234fca93423c72a9a8c2eca6d619d9cfd1712055d89d174ccc79a4931941cb8d65a28c10413e0faad2a9f16ad444d29799a1cfe14b9879d8
+AUX tccd.initd 673 BLAKE2B 418e8a473ca8592c7de313a4a18a71172555ed3a79cb7c5f22dca8932883ae0190c091d0585773d3a5ceec6637611740744fdaa4542b00edecbc04e00a39eab0 SHA512 d08f4e4b11e9a1b62c5694fba862cd6fc223e2461a93272fd7085daf7f7942cf15dad0f9370257d19f9252e2d38c82c15de4d311cc037326edf6dc4f05e2bebd
 DIST tuxedo-control-center_1.1.0.rpm 71893232 BLAKE2B f41702ba7faae2375e95a0bfe838dace738eb9f34364bac78bba405ca791c0b055ff7c7a05572172b04ec1acd87dad7e3abc29df06bba84296a8bc4c76d5d9c5 SHA512 3b98f27ada98ff77d0fc84425042dc63431fcd169ba28f5a0585589846e8dca1405a9d258bdf90f86d0e363a827bafa80e58c8dd56e94042e3b0f0d726737e05
-EBUILD tuxedo-control-center-bin-1.0.4.ebuild 1961 BLAKE2B 60bba00e9a047286ad392880d84535e621f26e79cabb3dd862425c45b1ff16fea3f408e81fccc38a5109ea7678208b292933c99d78124fd8c9bb12a7272b468b SHA512 d0ac29268c65bb130066968da12a4ffdba2360cd49b8b8d7fa95cd475d3769c3f03df88f9953d996ad3d13716fd609b5164555f8872834685e2cab0eb82f629c
-EBUILD tuxedo-control-center-bin-1.1.0.ebuild 1961 BLAKE2B 2421880abff5b2717d289203473d7c87d9d2ddcd85cc55f828824afc787a98780b7a55f2d8117edd032cc50839de366ac75f899ad39e0811c6532a94826a6e0d SHA512 89b0dbe213d0b99b82a037d02fbd8d560c676ac446da819ee5df94ccca286e99fcda29c3dff4bd0fb77a838d64817ba896141bb33ab9e87090997a5020f4731e
+EBUILD tuxedo-control-center-bin-1.1.0-r2.ebuild 2146 BLAKE2B 62e0cbb0360947d02a7dce758b0ab4099e7e38616ac674a9a11429ac1c797439a2b3ba916c84a014ab69836f856fedd8328e38ddb7fff2cf312c53030a18a2a1 SHA512 89a2dbd2f032553d284ae021422ce3e13faedda7ce8e4939324c78b42bc79c09a9ca76de89d026bf250ffe1b67b35d5a8f7c0ca19e343a321919ea6b2ca97a25
 MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
diff --git a/app-laptop/tuxedo-control-center-bin/files/tccd.initd b/app-laptop/tuxedo-control-center-bin/files/tccd.initd
new file mode 100644
index 000000000000..ced84c8baa60
--- /dev/null
+++ b/app-laptop/tuxedo-control-center-bin/files/tccd.initd
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name=$RC_SVCNAME
+description="TUXEDO Control Center Service"
+supervisor="supervise-daemon"
+command="/opt/tuxedo-control-center/resources/dist/tuxedo-control-center/data/service/tccd"
+command_args="--start"
+
+depend() {
+	need localmount
+}
+
+start(){
+	ebegin "Starting $RC_SVCNAME"
+	start-stop-daemon -b --start /opt/tuxedo-control-center/resources/dist/tuxedo-control-center/data/service/tccd -- --start
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping $RC_SVCNAME"
+	/opt/tuxedo-control-center/resources/dist/tuxedo-control-center/data/service/tccd --stop
+	eend $?
+}
diff --git a/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-1.0.4.ebuild b/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-1.0.4.ebuild
deleted file mode 100644
index 78114d2c1de4..000000000000
--- a/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-1.0.4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rpm systemd xdg-utils
-
-MY_PN="${PN/-bin/}"
-
-DESCRIPTION="Tool to control performance, energy, fan and comfort settings on TUXEDO laptops"
-HOMEPAGE="https://github.com/tuxedocomputers/tuxedo-control-center"
-SRC_URI="https://rpm.tuxedocomputers.com/opensuse/15.2/x86_64/${MY_PN}_${PV}.rpm"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE=""
-
-RESTRICT="strip splitdebug"
-
-DEPEND="sys-power/tuxedo-cc-wmi"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-	rm -rf usr/lib
-	mkdir files
-}
-
-src_install() {
-	insinto /
-	doins -r usr opt
-	find . -type f -perm -a=x | while read f; do
-		chmod 0755 "${D}/${f}"
-	done
-
-	dosym ../../opt/tuxedo-control-center/tuxedo-control-center /usr/bin/tuxedo-control-center
-
-	insinto /usr/share/dbus-1/system.d/
-	doins opt/tuxedo-control-center/resources/dist/tuxedo-control-center/data/dist-data/com.tuxedocomputers.tccd.conf
-
-	insinto /usr/share/polkit-1/actions
-	doins opt/tuxedo-control-center/resources/dist/tuxedo-control-center/data/dist-data/de.tuxedocomputers.tcc.policy
-
-	systemd_dounit opt/tuxedo-control-center/resources/dist/tuxedo-control-center/data/dist-data/tccd.service
-	systemd_dounit opt/tuxedo-control-center/resources/dist/tuxedo-control-center/data/dist-data/tccd-sleep.service
-}
-
-pkg_config() {
-	ebegin "Reloading systemd"
-	systemctl daemon-reload
-	eend $?
-	ebegin "Enabling and starting tccd.service"
-	systemctl enable --now tccd
-	eend $?
-	ebegin "Enabling and starting tccd-sleep.service"
-	systemctl enable --now tccd-sleep
-	eend $?
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	elog
-	elog "You need to enable tccd and tccd-sleep service before running tuxedo-control-center"
-	elog
-	elog "For your convenience you may just call:"
-	elog "  emerge --config =${P}"
-	elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-1.1.0.ebuild b/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-1.1.0-r2.ebuild
index 26e89d4b651e..40fcd5d28243 100644
--- a/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-1.1.0.ebuild
+++ b/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-1.1.0-r2.ebuild
@@ -14,27 +14,27 @@ SRC_URI="https://rpm.tuxedocomputers.com/opensuse/15.2/x86_64/${MY_PN}_${PV}.rpm
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-IUSE=""
 
 RESTRICT="strip splitdebug"
 
 DEPEND="sys-power/tuxedo-cc-wmi"
 RDEPEND="${DEPEND}"
-BDEPEND=""
+# See bug #827729
+BDEPEND="app-arch/xz-utils[extra-filters]"
 
 S="${WORKDIR}"
 
 src_prepare() {
 	default
-	rm -rf usr/lib
-	mkdir files
+	rm -rf usr/lib || die "could not remove usr/lib"
+	mkdir files || die "could not create files dir"
 }
 
 src_install() {
 	insinto /
 	doins -r usr opt
 	find . -type f -perm -a=x | while read f; do
-		chmod 0755 "${D}/${f}"
+		fperms 0755 "${f/./}"
 	done
 
 	dosym ../../opt/tuxedo-control-center/tuxedo-control-center /usr/bin/tuxedo-control-center
@@ -47,6 +47,8 @@ src_install() {
 
 	systemd_dounit opt/tuxedo-control-center/resources/dist/tuxedo-control-center/data/dist-data/tccd.service
 	systemd_dounit opt/tuxedo-control-center/resources/dist/tuxedo-control-center/data/dist-data/tccd-sleep.service
+
+	newinitd "${FILESDIR}/tccd.initd" tccd
 }
 
 pkg_config() {
@@ -67,8 +69,8 @@ pkg_postinst() {
 	elog
 	elog "You need to enable tccd and tccd-sleep service before running tuxedo-control-center"
 	elog
-	elog "For your convenience you may just call:"
-	elog "  emerge --config =${P}"
+	elog "For your convenience, if you use systemd, you may just call:"
+	elog "  emerge --config =app-laptop/${PF}"
 	elog
 }