Add patch for conf

3 files changed, 50 insertions, 13 deletions

diff --git a/app-misc/powerpanel/Manifest b/app-misc/powerpanel/Manifest
index 66a1fee..27eda02 100644
--- a/app-misc/powerpanel/Manifest
+++ b/app-misc/powerpanel/Manifest
@@ -1,4 +1,5 @@
+AUX powerpanel-scripts.patch 1300 BLAKE2B 813dc626c874b102c5ec9d8398d99ffba462d571cd5864b36e939fc1fcd56f1126627a4e4a2cd7504e3d6a37dcb5e672d0b8f0290b1969e18bedc82c8bfcb46a SHA512 4fdc297683aaead7c4832252efa5aec2f6ed2db16f5488a5208ffd260c8adc110f70257cea3da594d323a49fe16a4799f3d79630138fee7886b13e650643498b
 AUX pwrstatd 273 BLAKE2B 253a140c201005205a1c1918698236a9e310ba46b606c20f7e9d586ec22bab77fffebacb508c9e46ba0a323c52c4956e82c897042d773c9f170dc73d2d9e2c5a SHA512 cd0ad173260e6ae8617e5e331f29e6ddda421670a5c3eeaccab32c3409e88f713b4a4d16016f08d7dec4ea09cc4d3324f24904b82f73764e8309e8ad28bc8430
 DIST powerpanel-1.4.1.tar.gz 1819169 BLAKE2B da37c44e61ca118b06010e79b8f76ad910e39e1932fc5bae65152d31ddbfda7dcde879c16cc93c6a5e74b449c879172f703be43d8af7b58eb205cdcd748a4fd8 SHA512 75aabe9c8e13ab32195126c0c3e3b6135872ddca2d40e5b075d9492e4786902d74d03b5c8f0d8273cc1ada61536e1ba189ffa5b91678f135655b91c96ec2247c
-EBUILD powerpanel-1.4.1.ebuild 2078 BLAKE2B 54dc4b46c6025d14aa5d42e630b3fd5db1145cb41bb3ef4bb0dd0f18eb26a1bd772480dfe18cd8cd78180855605ce723e21368ea9aad8632313033cd1d537c7b SHA512 d241d4c0024b2bb02124b30fab95f7436db180cb6f2ef2a2e230a5e778f1349fb69ada1e0af09fd033a7f527fba2721b8df7fb64bd494753b350e478cf5db2fa
+EBUILD powerpanel-1.4.1.ebuild 2173 BLAKE2B d3e90382887b87cf3e01a4e66546ffdec59cd46514b30cde0e2c9a8085b48963a4f96eec476b77f2f185f270eff4daed670138b365855b7538aee6b4afbb7b4d SHA512 eb6141514b07d8b55f354757e5f74d86d29db141a4738213d37b815a67e070e5de3bfa752e50a6efc0cebf32b7d464ee5790fb6d14af05980586e786e8970a25
 MISC metadata.xml 241 BLAKE2B 6dac420f48c539432671f9251c134a254e92cd56082e2551d3f9153c4319f11d06ee167a7ea10b4d16764fc2325db5057662ac61812c1ead8e7256915d9f494b SHA512 da3a07ed2a719b870f4a8f2fb10a54f6248184f553d6b8b55c7faa6b7d90aaf1d2a77ac40e08c1b6eb33f6a6da5f1db4d5eaf6c6332ffbd232fddc4ac3a1086a
diff --git a/app-misc/powerpanel/files/powerpanel-scripts.patch b/app-misc/powerpanel/files/powerpanel-scripts.patch
new file mode 100644
index 0000000..bf43861
--- /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/powerpanel-1.4.1.ebuild b/app-misc/powerpanel/powerpanel-1.4.1.ebuild
index ad88aa7..93e5dba 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}
@@ -20,6 +22,10 @@ RDEPEND="${DEPEND}
 	dev-libs/openssl
 	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
@@ -37,7 +43,8 @@ src_install() {
 	insinto /etc
 	doins conf/pwrstatd.conf
 
-	exeinto /etc
+	dodir /opt/${PN}
+	exeinto /opt/${PN}
 	doexe script/pwrstatd-powerfail.sh
 	doexe script/pwrstatd-lowbatt.sh
 	doexe script/pwrstatd-email.sh
@@ -46,13 +53,9 @@ 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
@@ -76,7 +79,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	if use systemd; then
-		systemctl daemon-reload
-	fi
+	systemctl daemon-reload || die
 }