From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 09D7C15808B for ; Sun, 20 Mar 2022 22:52:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4EF8CE07EE; Sun, 20 Mar 2022 22:52:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 294F5E07EE for ; Sun, 20 Mar 2022 22:52:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 31E57342CD0 for ; Sun, 20 Mar 2022 22:52:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6BB99290 for ; Sun, 20 Mar 2022 22:52:19 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1647816713.e8468c7ce1130e455974c4d3ce0185d157753a6a.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-util/joycond/, games-util/joycond/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-util/joycond/files/joycond-systemd.patch games-util/joycond/joycond-0.1.0_p20210730-r1.ebuild games-util/joycond/joycond-0.1.0_p20210730.ebuild X-VCS-Directories: games-util/joycond/files/ games-util/joycond/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: e8468c7ce1130e455974c4d3ce0185d157753a6a X-VCS-Branch: master Date: Sun, 20 Mar 2022 22:52:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ff76ee33-5472-4780-911d-dea4337dd4e3 X-Archives-Hash: 5f8a4a572d1eb1ed9af18c4b7915df58 commit: e8468c7ce1130e455974c4d3ce0185d157753a6a Author: James Le Cuirot gentoo org> AuthorDate: Sun Mar 20 22:51:53 2022 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Sun Mar 20 22:51:53 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8468c7c games-util/joycond: Patch to install systemd files in the right locations Closes: https://bugs.gentoo.org/833792 Signed-off-by: James Le Cuirot gentoo.org> games-util/joycond/files/joycond-systemd.patch | 32 ++++++++++++++++++++++ ...30.ebuild => joycond-0.1.0_p20210730-r1.ebuild} | 5 +++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/games-util/joycond/files/joycond-systemd.patch b/games-util/joycond/files/joycond-systemd.patch new file mode 100644 index 000000000000..8b8288350a3e --- /dev/null +++ b/games-util/joycond/files/joycond-systemd.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f9d6e93..4e05976 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -28,12 +28,24 @@ add_subdirectory(src) + install(TARGETS joycond DESTINATION /usr/bin/ + PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE + ) +-install(FILES udev/89-joycond.rules udev/72-joycond.rules DESTINATION /lib/udev/rules.d/ ++ ++pkg_get_variable(UDEV_RULES_PATH udev udevdir) ++install(FILES udev/89-joycond.rules udev/72-joycond.rules DESTINATION ${UDEV_RULES_PATH}/rules.d/ + PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ + ) +-install(FILES systemd/joycond.service DESTINATION /etc/systemd/system ++ ++execute_process(COMMAND systemd-path systemd-system-unit OUTPUT_VARIABLE SYSTEMD_SYSTEM_UNIT_PATH OUTPUT_STRIP_TRAILING_WHITESPACE RESULT_VARIABLE UNIT_RETVAL) ++if(NOT "${UNIT_RETVAL}" EQUAL 0) ++ set(SYSTEMD_SYSTEM_UNIT_PATH "/usr/lib/systemd/system") ++endif() ++install(FILES systemd/joycond.service DESTINATION ${SYSTEMD_SYSTEM_UNIT_PATH} + PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ + ) +-install(FILES systemd/joycond.conf DESTINATION /etc/modules-load.d ++ ++execute_process(COMMAND systemd-path modules-load OUTPUT_VARIABLE SYSTEMD_MODULES_LOAD_PATH OUTPUT_STRIP_TRAILING_WHITESPACE RESULT_VARIABLE MODULES_RETVAL) ++if(NOT "${MODULES_RETVAL}" EQUAL 0) ++ set(SYSTEMD_MODULES_LOAD_PATH "/usr/lib/modules-load.d") ++endif() ++install(FILES systemd/joycond.conf DESTINATION ${SYSTEMD_MODULES_LOAD_PATH} + PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ + ) diff --git a/games-util/joycond/joycond-0.1.0_p20210730.ebuild b/games-util/joycond/joycond-0.1.0_p20210730-r1.ebuild similarity index 93% rename from games-util/joycond/joycond-0.1.0_p20210730.ebuild rename to games-util/joycond/joycond-0.1.0_p20210730-r1.ebuild index e06a319c6811..85cfd03bba1c 100644 --- a/games-util/joycond/joycond-0.1.0_p20210730.ebuild +++ b/games-util/joycond/joycond-0.1.0_p20210730-r1.ebuild @@ -31,9 +31,12 @@ CONFIG_CHECK=" S="${WORKDIR}/${PN}-${COMMIT}" +PATCHES=( + "${FILESDIR}"/${PN}-systemd.patch +) + src_install() { cmake_src_install - rm -r "${ED}"/etc/modules-load.d/ || die newinitd "${FILESDIR}"/${PN}.initd ${PN} doman doc/${PN}.1 }