diff options
| author |   Zoltan Puskas <zoltan@sinustrom.info> | 2023-05-22 22:50:01 -0700 |
|---|---|---|
| committer |   Matthew Smith <matthew@gentoo.org> | 2023-05-24 08:26:11 +0100 |
| commit | 46225adcb29a471740e1f3e04847303af0b4ede0 (patch) | |
| tree | a900af645a9d6c23fa472dd96e4d6aea6432926e | |
| parent | dev-python/cx_Freeze: Bump to 6.15.0 (diff) | |
| download | gentoo-46225adcb29a471740e1f3e04847303af0b4ede0.tar.gz gentoo-46225adcb29a471740e1f3e04847303af0b4ede0.tar.bz2 gentoo-46225adcb29a471740e1f3e04847303af0b4ede0.zip | |
x11-misc/ydotool: Really fix license, fix OpenRC script
Signed-off-by: Zoltan Puskas <zoltan@sinustrom.info>
Closes: https://github.com/gentoo/gentoo/pull/31138
Signed-off-by: Matthew Smith <matthew@gentoo.org>
| -rw-r--r-- | x11-misc/ydotool/files/ydotool-openrc.patch | 25 | ||||
| -rw-r--r-- | x11-misc/ydotool/ydotool-1.0.4-r2.ebuild (renamed from x11-misc/ydotool/ydotool-1.0.4-r1.ebuild) | 7 |
2 files changed, 27 insertions, 5 deletions
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 ) |