diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2022-10-20 14:03:00 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2022-10-20 14:03:00 +0000 |
| commit | 7755b53de8481af596d2ce77cfaea2334d068064 (patch) | |
| tree | f78bad13f2bd4368b4bbb9d5a599068fe8958a37 /x11-misc/autorandr | |
| parent | 20581b55364ac26fbbf01fee4a690c666af3a797 (diff) | |
| download | baldeagleos-repo-7755b53de8481af596d2ce77cfaea2334d068064.tar.gz baldeagleos-repo-7755b53de8481af596d2ce77cfaea2334d068064.tar.xz baldeagleos-repo-7755b53de8481af596d2ce77cfaea2334d068064.zip | |
Adding metadata
Diffstat (limited to 'x11-misc/autorandr')
| -rw-r--r-- | x11-misc/autorandr/autorandr-1.12.1-r2.ebuild (renamed from x11-misc/autorandr/autorandr-1.12.1-r1.ebuild) | 12 | ||||
| -rw-r--r-- | x11-misc/autorandr/autorandr-9999.ebuild | 7 | ||||
| -rw-r--r-- | x11-misc/autorandr/files/autorandr-Makefile-fix-install_udev-target-by-s-TARGETS-MAKECM.patch | 28 |
3 files changed, 47 insertions, 0 deletions
diff --git a/x11-misc/autorandr/autorandr-1.12.1-r1.ebuild b/x11-misc/autorandr/autorandr-1.12.1-r2.ebuild index 630b5762f07f..f5f5bdd4fec6 100644 --- a/x11-misc/autorandr/autorandr-1.12.1-r1.ebuild +++ b/x11-misc/autorandr/autorandr-1.12.1-r2.ebuild @@ -3,6 +3,7 @@ EAPI=7 +DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{7,8,9,10} ) inherit bash-completion-r1 distutils-r1 systemd udev @@ -30,6 +31,11 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES=( + # https://github.com/phillipberndt/autorandr/pull/306 + "${FILESDIR}"/autorandr-Makefile-fix-install_udev-target-by-s-TARGETS-MAKECM.patch +) + src_compile() { distutils-r1_src_compile @@ -63,3 +69,9 @@ pkg_postinst() { udev_reload fi } + +pkg_postrm() { + if use udev; then + udev_reload + fi +} diff --git a/x11-misc/autorandr/autorandr-9999.ebuild b/x11-misc/autorandr/autorandr-9999.ebuild index 630b5762f07f..fa298c21a88c 100644 --- a/x11-misc/autorandr/autorandr-9999.ebuild +++ b/x11-misc/autorandr/autorandr-9999.ebuild @@ -3,6 +3,7 @@ EAPI=7 +DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{7,8,9,10} ) inherit bash-completion-r1 distutils-r1 systemd udev @@ -63,3 +64,9 @@ pkg_postinst() { udev_reload fi } + +pkg_postrm() { + if use udev; then + udev_reload + fi +} diff --git a/x11-misc/autorandr/files/autorandr-Makefile-fix-install_udev-target-by-s-TARGETS-MAKECM.patch b/x11-misc/autorandr/files/autorandr-Makefile-fix-install_udev-target-by-s-TARGETS-MAKECM.patch new file mode 100644 index 000000000000..ff3b31d01326 --- /dev/null +++ b/x11-misc/autorandr/files/autorandr-Makefile-fix-install_udev-target-by-s-TARGETS-MAKECM.patch @@ -0,0 +1,28 @@ +From 4b8d397fc7a0d22a51ee13428ae13d892c0cc911 Mon Sep 17 00:00:00 2001 +From: Florian Schmaus <flo@geekplace.eu> +Date: Thu, 20 Oct 2022 10:48:54 +0200 +Subject: [PATCH] Makefile: fix install_udev target by s/TARGETS/MAKECMDGOALS/ + +A Gentoo user reported [1] that the 'install_udev' target would +install a systemd-flavored udev rules, despite the 'systemd' target +not being selected. Replacing 'TARGETS' with 'MAKECMDGOALS' in the +Makefile rule fixes this . + +I am not sure where the TARGETS variable origniates from, but GNU make +uses MAKECMDGOALS (FreeBSD make uses .TARGETS, i.e., with a leading +dot). So if further portability between make variants is required, +then this needs to be adjusted. + +1: https://bugs.gentoo.org/803545#c3 +Fixes: ae1f18a06039 ("udev rule: Dynamically call either systemd or autorandr directly depending on whether systemd unit is available") +--- a/Makefile ++++ b/Makefile +@@ -129,7 +129,7 @@ endif + install_udev: + $(if $(UDEV_RULES_DIR),,$(error UDEV_RULES_DIR is not defined)) + mkdir -p ${DESTDIR}/${UDEV_RULES_DIR}/ +- echo 'ACTION=="change", SUBSYSTEM=="drm", RUN+="$(if $(findstring systemd, $(TARGETS)),/bin/systemctl start --no-block autorandr.service,${PREFIX}/bin/autorandr --batch --change --default default)"' > ${DESTDIR}/${UDEV_RULES_DIR}/40-monitor-hotplug.rules ++ echo 'ACTION=="change", SUBSYSTEM=="drm", RUN+="$(if $(findstring systemd, $(MAKECMDGOALS)),/bin/systemctl start --no-block autorandr.service,${PREFIX}/bin/autorandr --batch --change --default default)"' > ${DESTDIR}/${UDEV_RULES_DIR}/40-monitor-hotplug.rules + @echo + @echo "To activate the udev rules, run this command as root:" + @echo " udevadm control --reload-rules" |