[gentoo-commits] repo/proj/guru:dev commit in: app-misc/powerpanel/, app-misc/powerpanel/files/

[gentoo-commits] repo/proj/guru:dev commit in: app-misc/powerpanel/, app-misc/powerpanel/files/

[Julien Roy]

commit:     186ce3d85551375303b41a9de2dbb98a0ef6c536
Author:     Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Sun Apr 24 02:15:53 2022 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Sun Apr 24 02:16:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=186ce3d8

app-misc/powerpanel: removed scripts from /etc

Signed-off-by: Julien Roy <julien <AT> jroy.ca>

 app-misc/powerpanel/files/powerpanel-scripts.patch | 35 +++++++++++++++++
 app-misc/powerpanel/files/pwrstatd                 |  2 +-
 app-misc/powerpanel/powerpanel-1.4.1.ebuild        | 45 ++++++++++------------
 3 files changed, 56 insertions(+), 26 deletions(-)

diff --git a/app-misc/powerpanel/files/powerpanel-scripts.patch b/app-misc/powerpanel/files/powerpanel-scripts.patch
new file mode 100644
index 000000000..bf4386145
--- /dev/null
+++ b/app-misc/powerpanel/files/powerpanel-scripts.patch
@@ -0,0 +1,35 @@
+diff --git a/conf/pwrstatd.conf b/conf/pwrstatd.conf-new
+index 548fc5e..c260823 100644
+--- a/conf/pwrstatd.conf
++++ b/conf/pwrstatd.conf
+@@ -3,7 +3,7 @@
+ #
+ 
+ # You must restart pwrstatd after changing this file in order for changes to take effect.
+-# Ex:/etc/init.d/pwrstatd restart
++# Ex:/opt/powerpanel/init.d/pwrstatd restart
+ 
+ #
+ # Action setting for event of Power Failure
+@@ -18,8 +18,8 @@ powerfail-delay = 60
+ powerfail-active = yes
+ 
+ # Assign a path of script file for event of Power Failure.
+-# The default is /etc/pwrstatd-powerfail.sh
+-powerfail-cmd-path = /etc/pwrstatd-powerfail.sh
++# The default is /opt/powerpanel/pwrstatd-powerfail.sh
++powerfail-cmd-path = /opt/powerpanel/pwrstatd-powerfail.sh
+ 
+ # How much time in seconds to take script running for event of Power Failure.
+ # The allowed range is 0 ~ 3600. Default is 0 sec. 
+@@ -50,8 +50,8 @@ runtime-threshold = 300
+ lowbatt-active = yes
+ 
+ # Assign a path of script file for event of Battery Low.
+-# The default is /etc/pwrstatd-lowbatt.sh
+-lowbatt-cmd-path = /etc/pwrstatd-lowbatt.sh
++# The default is /opt/powerpanel/pwrstatd-lowbatt.sh
++lowbatt-cmd-path = /opt/powerpanel/pwrstatd-lowbatt.sh
+ 
+ # How much time in seconds to take script running for event of Battery Low.
+ # The allowed range is 0 ~ 60. Default is 0 sec.

diff --git a/app-misc/powerpanel/files/pwrstatd b/app-misc/powerpanel/files/pwrstatd
index d57a17a3d..a3307f656 100644
--- a/app-misc/powerpanel/files/pwrstatd
+++ b/app-misc/powerpanel/files/pwrstatd
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 name="pwrstatd daemon"
-description=""
+description="Daemon for PowerPanel"
 command=/usr/sbin/pwrstatd
 command_args="${pwrstatd_args}"
 command_background=true

diff --git a/app-misc/powerpanel/powerpanel-1.4.1.ebuild b/app-misc/powerpanel/powerpanel-1.4.1.ebuild
index 3b22741b8..51d6384d3 100644
--- a/app-misc/powerpanel/powerpanel-1.4.1.ebuild
+++ b/app-misc/powerpanel/powerpanel-1.4.1.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=8
 
+inherit systemd
+
 DESCRIPTION="PowerPanel software for CyberPower UPS systems"
 HOMEPAGE="https://www.cyberpowersystems.com/"
 SRC_URI="x86? ( https://dl4jz3rbrsfum.cloudfront.net/software/PPL_32bit_v${PV}.tar.gz -> ${P}.tar.gz )
@@ -12,7 +14,7 @@ SRC_URI="x86? ( https://dl4jz3rbrsfum.cloudfront.net/software/PPL_32bit_v${PV}.t
 LICENSE="PowerPanel"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="systemd"
+IUSE=""
 
 DEPEND=""
 RDEPEND="${DEPEND}
@@ -21,6 +23,9 @@ RDEPEND="${DEPEND}
 	virtual/libusb"
 BDEPEND=""
 QA_FLAGS_IGNORED="/usr/sbin/pwrstat /usr/sbin/pwrstatd /usr/lib64/libpaho-mqtt3cs.so.1"
+PATCHES=(
+	"${FILESDIR}/${PN}-scripts.patch"
+)
 
 src_install() {
 	dosbin bin/pwrstat
@@ -38,7 +43,7 @@ src_install() {
 	insinto /etc
 	doins conf/pwrstatd.conf
 
-	exeinto /etc
+	exeinto /opt/${PN}
 	doexe script/pwrstatd-powerfail.sh
 	doexe script/pwrstatd-lowbatt.sh
 	doexe script/pwrstatd-email.sh
@@ -47,37 +52,27 @@ src_install() {
 
 	newlib.so lib/libpaho-mqtt3cs.so.1.3.1 libpaho-mqtt3cs.so.1
 
-	if use systemd; then
-		insinto /usr/lib/systemd/system/
-		doins script/pwrstatd.service
-		newinitd script/default_pwrstatd pwrstatd
-	else
-		newinitd ${FILESDIR}/pwrstatd pwrstatd
-	fi
+	newinitd ${FILESDIR}/pwrstatd pwrstatd
+	systemd_dounit script/pwrstatd.service
+	systemd_newunit script/default_pwrstatd pwrstatd
 
 	fowners root:root /usr/sbin/pwrstat
 	fowners root:root /usr/sbin/pwrstatd
-	fowners root:root /etc/pwrstatd-powerfail.sh
-	fowners root:root /etc/pwrstatd-lowbatt.sh
-	fowners root:root /etc/pwrstatd-email.sh
-	fowners root:root /etc/shutdown.sh
-	fowners root:root /etc/hibernate.sh
+	fowners root:root /opt/${PN}/pwrstatd-powerfail.sh
+	fowners root:root /opt/${PN}/pwrstatd-lowbatt.sh
+	fowners root:root /opt/${PN}/pwrstatd-email.sh
+	fowners root:root /opt/${PN}/shutdown.sh
+	fowners root:root /opt/${PN}/hibernate.sh
 	fowners root:root /etc/init.d/pwrstatd
 	fowners root:root /etc/pwrstatd.conf
 
 	fperms 700 /usr/sbin/pwrstat
 	fperms 700 /usr/sbin/pwrstatd
-	fperms 755 /etc/pwrstatd-powerfail.sh
-	fperms 755 /etc/pwrstatd-lowbatt.sh
-	fperms 755 /etc/pwrstatd-email.sh
-	fperms 755 /etc/shutdown.sh
-	fperms 755 /etc/hibernate.sh
+	fperms 755 /opt/${PN}/pwrstatd-powerfail.sh
+	fperms 755 /opt/${PN}/pwrstatd-lowbatt.sh
+	fperms 755 /opt/${PN}/pwrstatd-email.sh
+	fperms 755 /opt/${PN}/shutdown.sh
+	fperms 755 /opt/${PN}/hibernate.sh
 	fperms 755 /etc/init.d/pwrstatd
 	fperms 755 /etc/pwrstatd.conf
 }
-
-pkg_postinst() {
-	if use systemd; then
-		systemctl daemon-reload
-	fi
-}