gentoo resync : 29.12.2022

3 files changed, 7 insertions, 60 deletions

diff --git a/sys-power/acpilight/Manifest b/sys-power/acpilight/Manifest
index 1a86d1a2a361..0f53121b8274 100644
--- a/sys-power/acpilight/Manifest
+++ b/sys-power/acpilight/Manifest
@@ -2,6 +2,5 @@ AUX acpilight-1.2-fix-log10-of-zero.patch 715 BLAKE2B 33a33f4869a5c3cc27898ca5ad
 AUX acpilight.confd 269 BLAKE2B 196245bd083f89d9d975a81aaaf66d0422655cd6a5f575c2cbb898747c92bdb888f8123dbf8ddf34089be2547d39e33508119065ffb97c26f9d1d3915bee8bb2 SHA512 28e513dbcaa30cec4d2f876c244766037eb6e94ff660ff2caf9cb955f40c710ea750cac73eb5e3890b42904227ccbd7f6c3e2595c2496e54d3339d6afdd0ffb0
 AUX acpilight.initd 1183 BLAKE2B 061676f47bfbd07a46c3bf6ab1cbebaca22fe8e5f43afc445ef30ac3b0b5f74a99d0f061c28b2c26b458b3606ffbe8afb6344aca6a4d5a19699b29614445a45c SHA512 623115ef09c5163d1c7301e0bc9a631cf414fc36d78677d12430091775bade6df51bd8d8e4ff597de4cc09f92cf1ab11ea29f8370f3e8e8e608191a044e4a200
 DIST acpilight-v1.2.tar.gz 18068 BLAKE2B 469fd12c0a24b152681d73add559733a294f8a0848f46d0d3a1e209dea2ad3b180294677a8d84a82387ec34b00bbfda85a10f447fe22b81a3c51225cdce14051 SHA512 ef634ec0f315fe94dca138f1b9231f320b93340db3365ab9a09cf898fe4691f70573041bcb04563d760f1201000ea3ff11ab5dad3bfffddf3d3070dedb5732d7
-EBUILD acpilight-1.2-r3.ebuild 1585 BLAKE2B 7ed3f91cb9b9e413e7496fe5d12ed33b96823545003853c32221a1df5b0c0d04d03c9d67d7b4cbee41fcdc6e118bab1226039037c5210e263a10f711a62aa3f2 SHA512 ece73afbc9b63c882de55b37f2236d76869263b40e44d0e963afb1f93608b2e814355cc0f63e043af1dd5223e98e8582d7187712a98cc0fa171ead64465bb52f
-EBUILD acpilight-1.2-r4.ebuild 1588 BLAKE2B 31a48bf0f5daeacf30eb802722bd2caa0bd4b2f4cd48d070c5372a67df76dc92456f6ab32b32f0a1263c3b5f4e58f4f4f23dc6a9f18d98027772c26373425c97 SHA512 e64bbda79101339cd0314dc84d740832b2bfe69f6c0e48b40fbafbef66e85d510f4a8888d5f357242a5367e6958ab8ae68a372b1e39c5e89ffde6e0d80e17ec8
+EBUILD acpilight-1.2-r4.ebuild 1653 BLAKE2B 694a4a9f6932b2285cb30c831b55ce4e1868c40ea13c73579f0140d63dc1306c90fae6bb6a0f8ea94ba46117acb5cbec8a127413278cbf86255e1682123ddc6a SHA512 050dd89d64991a72e4d27f02eac42dae116c7e23b9218ce326cd1dde198b0c0c0823018b0112d6065daa2fd9af4704b99d60a5d0c8425961b45da5cf19c7e14f
 MISC metadata.xml 338 BLAKE2B b78b457b201249e0b1636adbc1ad883254cae74f9212a2acc135a399b78a0987434cdce7c584e1b421b512dc1086c47883b75b5bb4cc79ac17255f6f4a16fe87 SHA512 08d6d838162f11e7c96760d6fdd4f4137359e03ad74e7ef0a8427a6b0df744988a56dbf2c97e3e2bf77156438873b307c2f073bcfd2e6e023e25606baa6ed6aa
diff --git a/sys-power/acpilight/acpilight-1.2-r3.ebuild b/sys-power/acpilight/acpilight-1.2-r3.ebuild
deleted file mode 100644
index c54de4cb4446..000000000000
--- a/sys-power/acpilight/acpilight-1.2-r3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
-
-inherit python-single-r1 udev
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="Replacement for xbacklight that uses the ACPI interface to set brightness"
-HOMEPAGE="https://gitlab.com/wavexx/acpilight/"
-SRC_URI="https://gitlab.com/wavexx/acpilight/-/archive/v${PV}/${MY_P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="virtual/udev
-	acct-group/video
-	!dev-libs/light
-	${PYTHON_DEPS}
-	!x11-apps/xbacklight"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-DOCS=( README.rst NEWS.rst )
-
-PATCHES=( "${FILESDIR}/acpilight-1.2-fix-log10-of-zero.patch" )
-
-# Disable Makefile that installs by default
-src_compile() { :; }
-
-src_install() {
-	python_doscript xbacklight
-	udev_dorules "${S}"/90-backlight.rules
-	doman xbacklight.1
-	einstalldocs
-	newinitd "${FILESDIR}"/acpilight.initd acpilight
-	newconfd "${FILESDIR}"/acpilight.confd acpilight
-}
-
-pkg_postinst() {
-	udev_reload
-	einfo
-	elog "To use the xbacklight binary as a regular user, you must be a part of the video group"
-	einfo
-	elog "If this utility does not find any backlights to manipulate,"
-	elog "verify you have kernel support on the device and display driver enabled."
-	einfo
-	elog "To take advantage of the OpenRC init script, and automate the process of"
-	elog "saving and restoring the brightness level you should add acpilight"
-	elog "to the boot runlevel. You can do this as root like so:"
-	elog "# rc-update add acpilight boot"
-	einfo
-}
diff --git a/sys-power/acpilight/acpilight-1.2-r4.ebuild b/sys-power/acpilight/acpilight-1.2-r4.ebuild
index 709ff0ca9954..16457c2bda89 100644
--- a/sys-power/acpilight/acpilight-1.2-r4.ebuild
+++ b/sys-power/acpilight/acpilight-1.2-r4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://gitlab.com/wavexx/acpilight/"
 SRC_URI="https://gitlab.com/wavexx/acpilight/-/archive/v${PV}/${MY_P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
@@ -55,3 +55,8 @@ pkg_postinst() {
 	elog "# rc-update add acpilight boot"
 	einfo
 }
+
+pkg_postrm() {
+	# Triggers a QA warning if missing
+	udev_reload
+}