gentoo auto-resync : 24:05:2023 - 09:01:50

3 files changed, 29 insertions, 6 deletions

diff --git a/x11-misc/ydotool/Manifest b/x11-misc/ydotool/Manifest
index a712bc62bb6d..b7ac5c5735ef 100644
--- a/x11-misc/ydotool/Manifest
+++ b/x11-misc/ydotool/Manifest
@@ -1,3 +1,4 @@
+AUX ydotool-openrc.patch 1207 BLAKE2B 12fd60ec698a623e69831eed3fe5fde9c323708e9520e017a8a4bc8aafe15b43fad2df9067f065af37235d4b5e5e888013c5eff1a47deede26b660aad299a9bc SHA512 79122655532bb2191627d9b56f88f5c4d29274a3fd355ad89a2ba428bfdf13882b0c734b19dc9c4f14c1858282279b269bf4142fa37c8f293f25fcee301e3618
 DIST ydotool-1.0.4.tar.gz 29364 BLAKE2B d021d0bc6cea3118cb91bd1e0cf0eab6b808925902c29274a417f16b0727998904085ca725411371284f222d7a043b9f3460725a07a911d40d0bd477d4fe9fcb SHA512 bbf66d752aa1dce9173c930e3a71bc277b330763b1aa0e38f9fec1976c282c64330251ba5abe222a991f4bcafbabf1312a940eb4b40a34bf99f628c2a41bc4a2
-EBUILD ydotool-1.0.4-r1.ebuild 495 BLAKE2B 3432b7aa34cd154ede4e4b8454bdb1748ae1e51c8eb3117aba0a2f5451edf7fc871d164cd9428abd6aa626a8aabce43da72e739643cb1f69b8a91495f3c88a65 SHA512 61f862275e09b2565ff8a185e0e07931bd4f5fd12e6d279f8161f54afaced73630928a27a7a29940896f4909fdf92cb8816497dab7f00adffb920df630a32652
+EBUILD ydotool-1.0.4-r2.ebuild 456 BLAKE2B 747921176849ff645ce273d78c4f11b18c56d9e1375869641917e9c801fb2cbb89b086991085a72e8ad44051ea972a3e0dcc92baa3f7181968396d0090466a4e SHA512 b8ff734bbfb215ce2960b856a2d19c83731f49c4d619aeaa11dc559a992c25f1748bebc46f1d510cf00c38568dc584a3405d73e42b367d7fe36940fa097fbcec
 MISC metadata.xml 821 BLAKE2B 269e63bd65d1a7500c9c10d758866a36d7a2099c31768add216e9021d53ab3414ebd07cd9f99ba9575c8b1ff9637d920ee10b7d7e00effcde3a757b902855b40 SHA512 b4290cd3bf156281ce20e3f527a02ac30e7e47fae931a846db82a91db332c79719bb0a9b1cd31e021b553fbcf83c15e35363a29745d64198e09fb2eb250e2a01
diff --git a/x11-misc/ydotool/files/ydotool-openrc.patch b/x11-misc/ydotool/files/ydotool-openrc.patch
new file mode 100644
index 000000000000..2a90087109e3
--- /dev/null
+++ b/x11-misc/ydotool/files/ydotool-openrc.patch
@@ -0,0 +1,25 @@
+diff -Naur ydotool-1.0.4-orig/Daemon/CMakeLists.txt ydotool-1.0.4/Daemon/CMakeLists.txt
+--- ydotool-1.0.4-orig/Daemon/CMakeLists.txt	2023-01-30 03:53:24.000000000 -0800
++++ ydotool-1.0.4/Daemon/CMakeLists.txt	2023-05-22 22:42:53.960568790 -0700
+@@ -2,4 +2,9 @@
+     "${CMAKE_CURRENT_SOURCE_DIR}/ydotool.service.in"
+     "${PROJECT_BINARY_DIR}/ydotool.service"
+     @ONLY)
++configure_file(
++    "${CMAKE_CURRENT_SOURCE_DIR}/ydotool.service-openrc.in"
++    "${PROJECT_BINARY_DIR}/ydotool.openrc"
++    @ONLY)
+ install(FILES "${PROJECT_BINARY_DIR}/ydotool.service" DESTINATION ${SD_UNITDIR})
++install(FILES "${PROJECT_BINARY_DIR}/ydotool.openrc" DESTINATION "/etc/init.d" RENAME ydotool)
+diff -Naur ydotool-1.0.4-orig/Daemon/ydotool.service-openrc.in ydotool-1.0.4/Daemon/ydotool.service-openrc.in
+--- ydotool-1.0.4-orig/Daemon/ydotool.service-openrc.in	2023-01-30 03:53:24.000000000 -0800
++++ ydotool-1.0.4/Daemon/ydotool.service-openrc.in	2023-05-22 22:38:49.822064144 -0700
+@@ -3,7 +3,7 @@
+ name=$RC_SVCNAME
+ description="Starts ydotoold service"
+ supervisor="supervise-daemon"
+-command="/usr/local/bin/ydotoold"
++command="@CMAKE_INSTALL_FULL_BINDIR@/ydotoold"
+ 
+ reload() {
+ 	ebegin "Reloading $RC_SVCNAME"
diff --git a/x11-misc/ydotool/ydotool-1.0.4-r1.ebuild b/x11-misc/ydotool/ydotool-1.0.4-r2.ebuild
index 7e5ec069a404..ff0493be7ad9 100644
--- a/x11-misc/ydotool/ydotool-1.0.4-r1.ebuild
+++ b/x11-misc/ydotool/ydotool-1.0.4-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Generic command-line automation tool (no X!)"
 HOMEPAGE="https://github.com/ReimuNotMoe/ydotool"
 SRC_URI="https://github.com/ReimuNotMoe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="AGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
 
@@ -18,7 +18,4 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-src_install() {
-	cmake_src_install
-	newinitd Daemon/ydotool.service-openrc.in ${PN}
-}
+PATCHES=( "${FILESDIR}"/${PN}-openrc.patch )