gentoo resync : 12.07.2021

4 files changed, 15 insertions, 229 deletions

diff --git a/app-misc/ddcutil/Manifest b/app-misc/ddcutil/Manifest
index 9c624ce87cdb..9792b786a81a 100644
--- a/app-misc/ddcutil/Manifest
+++ b/app-misc/ddcutil/Manifest
@@ -1,7 +1,3 @@
-DIST ddcutil-0.9.1.tar.gz 656853 BLAKE2B e4f11253176587cb5ee3c9647a01ab04d5a92ce4ca7a4098378318fc069e635e43c3716ace316498f64ceaaa00aa90db3b5f409b74b8d7089a7c25254c0e360d SHA512 b2d5866606a4bc081d89180e910822f2a2a653a2782e3df582536ddc86c7d3dc02309dbb41f8d566f6ebdc5d82d3aa11792a04c28b3d83552b024dfd59891fda
-DIST ddcutil-0.9.5.tar.gz 681534 BLAKE2B 6746c239738d4f8eb7fe56323816fadee9b8fa9ad2b66a8242782e0b2688182c0140b40b9eddb3b54ad32c7ff7d1f0cf9a28c5477a48d90cc39431ed82f5d443 SHA512 6249ebdbb398ad5a6c32f3891be8bf5328114b1ed08afd75adf4b67f10a40f19451e188ce5cd88b3153a18f317e394146a34258a7d2298f126be227d7e1c25e8
 DIST ddcutil-0.9.9.tar.gz 725207 BLAKE2B ad7b0b35ad4c2dae21da066e4194209579d774ded10f2dc0d8d7d3d94e70d5893c3d1f772b86ea01be510cfb8d51a657178228d028ca34ab20d344e86e0581d2 SHA512 f7b2b961c6b76ef59f336290b494cdd331556848de881d57e5240075d50733030df4c47131070f1276907d712a45f60dad6bebaa052a66621b8b5517ff293c21
-EBUILD ddcutil-0.9.1.ebuild 2680 BLAKE2B 1d5a6ec7d867528aa82ea1c401a7b9f5e4e70da6f2f616ae9781851e0a1f320b266ca3b436631103c0e0f104dce55f55cafe131f910cb921e25522484b0946c0 SHA512 6da340c08a14dee704b9a6af2d889f55155414f16afaf3ba63669beaa090865f4049d2a938fcd6d76c45f947fe5a72cc01e1ff7df8aac70b6bd62dc52b3a4b5b
-EBUILD ddcutil-0.9.5.ebuild 2775 BLAKE2B 6d40485ba8b5ded81e0c3e378126b93e9b7cb8bbc71e86a516322a8b3d564275059c15b0f5f493601abec201f8b7ddeae30820d4bbef73591f26236bb9a26f24 SHA512 31b73b8e481f278275cdd4a488d49076f2a5da74927d34f9da012e3b13152925e1106543ba1d9695118fe3732a8ad5dc72ffcb45a1aa1200536b8a1a1fc58be6
-EBUILD ddcutil-0.9.9.ebuild 3224 BLAKE2B e41980da150d93833005be9c4b1463a7ed4db0e3e3213ae100d059ec3375a558bec66c6c771837cd7d9141a47e47e9b7746fbd0deddac978f7254f273efb07f4 SHA512 08a769977bfd8b6e45cd7d7e2463d3b3d62dc3594493621b0ca5ba1dad062af8c05c74c174f1ab1302b80354e301a5d1818def7e1d08977bfb5cd7516c553e0e
+EBUILD ddcutil-0.9.9-r2.ebuild 3272 BLAKE2B 3a5be51ba9d9b5ea5ffa34401f7ad3e452d080f18d96fb131d196e30f6f09d6cf503c28126baf4adec590cb6802eee2ce4db4b23b77afdf8f5aeeeb50eedbd08 SHA512 433b4e4fb43f3a0989924d9500a0ba09e268cd039b384e2dabd969fd76930ce6858cc9a20dd46bb80906a463d6caff1543a5eb0011a486619c21ed0ed6308be0
 MISC metadata.xml 1292 BLAKE2B 0b413e4a4f24a9ee9639994005ad818952e2ad1763c78cb254646d8d4a052f6c36dcc4709254fb4441d51c193f209f8d467a02537c0c1fd4c32c9bebf1bd8d13 SHA512 d70a5879bf4bbd599ac415bf4df1b1abf59f24c04d3ee3932c72207f97ada739e2fca73600e0c5694f16c91a87db6917903d374a45d867b087e82ed814a7a130
diff --git a/app-misc/ddcutil/ddcutil-0.9.1.ebuild b/app-misc/ddcutil/ddcutil-0.9.1.ebuild
deleted file mode 100644
index a0f3bc6bf4da..000000000000
--- a/app-misc/ddcutil/ddcutil-0.9.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic linux-info udev user
-
-DESCRIPTION="Program for querying and changing monitor settings"
-HOMEPAGE="http://www.ddcutil.com/"
-SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="drm usb-monitor user-permissions video_cards_nvidia X"
-REQUIRED_USE="drm? ( X )"
-
-RDEPEND="dev-libs/glib:2
-	sys-apps/i2c-tools
-	virtual/udev
-	drm? ( x11-libs/libdrm )
-	usb-monitor? (
-		dev-libs/hidapi
-		virtual/libusb:1
-		sys-apps/usbutils
-	)
-	X? (
-		x11-libs/libXrandr
-		x11-libs/libX11
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	# This program needs /dev/ic2-* devices to communicate with the monitor.
-	CONFIG_CHECK="~I2C_CHARDEV"
-	ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
-	if use usb-monitor; then
-		CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
-		ERROR_HIDRAW="HIDRAW is needed to support USB monitors"
-		ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB monitors"
-	fi
-
-	# Now do the actual checks setup above
-	check_extra_config
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Bug 607818.
-	replace-flags -O3 -O2
-
-	local myeconfargs=(
-		$(use_enable drm)
-		$(use_enable usb-monitor usb)
-		$(use_enable X x11)
-		--enable-lib
-		--disable-cffi
-		--disable-cython
-		--disable-swig
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	if use user-permissions; then
-		udev_dorules data/etc/udev/rules.d/45-ddcutil-i2c.rules
-		if use usb-monitor; then
-			udev_dorules data/etc/udev/rules.d/45-ddcutil-usb.rules
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if use user-permissions; then
-		enewgroup i2c
-		einfo "To allow non-root users access to the /dev/i2c-* devices, add those"
-		einfo "users to the i2c group: usermod -aG i2c user"
-		einfo "Restart the computer or reload the i2c-dev module to activate"
-		einfo "the new udev rule."
-		einfo "For more information read: http://www.ddcutil.com/i2c_permissions/"
-
-		if use usb-monitor; then
-			enewgroup video
-			einfo "To allow non-root users access to USB monitors, add those users"
-			einfo "to the video group: usermod -aG video user"
-			einfo "Restart the computer, reload the hiddev and hidraw modules, or replug"
-			einfo "the monitor to activate the new udev rule."
-			einfo "For more information read: http://www.ddcutil.com/usb/"
-		fi
-
-		udev_reload
-	fi
-
-	if use video_cards_nvidia; then
-		ewarn "Please read the following webpage on proper usage with the nVidia "
-		ewarn "binary drivers, or it may not work: http://www.ddcutil.com/nvidia/"
-	fi
-}
diff --git a/app-misc/ddcutil/ddcutil-0.9.5.ebuild b/app-misc/ddcutil/ddcutil-0.9.5.ebuild
deleted file mode 100644
index 06560df4d338..000000000000
--- a/app-misc/ddcutil/ddcutil-0.9.5.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic linux-info udev user
-
-DESCRIPTION="Program for querying and changing monitor settings"
-HOMEPAGE="http://www.ddcutil.com/"
-SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="drm usb-monitor user-permissions video_cards_nvidia X"
-REQUIRED_USE="drm? ( X )"
-
-RDEPEND="dev-libs/glib:2
-	sys-apps/i2c-tools
-	virtual/udev
-	drm? ( x11-libs/libdrm )
-	usb-monitor? (
-		dev-libs/hidapi
-		virtual/libusb:1
-		sys-apps/usbutils
-	)
-	X? (
-		x11-libs/libXrandr
-		x11-libs/libX11
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	# This program needs /dev/ic2-* devices to communicate with the monitor.
-	CONFIG_CHECK="~I2C_CHARDEV"
-	ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
-	if use usb-monitor; then
-		CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
-		ERROR_HIDRAW="HIDRAW is needed to support USB monitors"
-		ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB monitors"
-	fi
-
-	# Now do the actual checks setup above
-	check_extra_config
-}
-
-src_prepare() {
-	default
-	eautoreconf
-	sed -i -e "s#usr/local/bin#usr/bin#" data/etc/udev/rules.d/45-ddcutil-usb.rules || die
-}
-
-src_configure() {
-	# Bug 607818.
-	replace-flags -O3 -O2
-
-	local myeconfargs=(
-		$(use_enable drm)
-		$(use_enable usb-monitor usb)
-		$(use_enable X x11)
-		--enable-lib
-		--disable-cffi
-		--disable-cython
-		--disable-swig
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	if use user-permissions; then
-		udev_dorules data/etc/udev/rules.d/45-ddcutil-i2c.rules
-		if use usb-monitor; then
-			udev_dorules data/etc/udev/rules.d/45-ddcutil-usb.rules
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if use user-permissions; then
-		enewgroup i2c
-		einfo "To allow non-root users access to the /dev/i2c-* devices, add those"
-		einfo "users to the i2c group: usermod -aG i2c user"
-		einfo "Restart the computer or reload the i2c-dev module to activate"
-		einfo "the new udev rule."
-		einfo "For more information read: http://www.ddcutil.com/i2c_permissions/"
-
-		if use usb-monitor; then
-			enewgroup video
-			einfo "To allow non-root users access to USB monitors, add those users"
-			einfo "to the video group: usermod -aG video user"
-			einfo "Restart the computer, reload the hiddev and hidraw modules, or replug"
-			einfo "the monitor to activate the new udev rule."
-			einfo "For more information read: http://www.ddcutil.com/usb/"
-		fi
-
-		udev_reload
-	fi
-
-	if use video_cards_nvidia; then
-		ewarn "Please read the following webpage on proper usage with the nVidia "
-		ewarn "binary drivers, or it may not work: http://www.ddcutil.com/nvidia/"
-	fi
-}
diff --git a/app-misc/ddcutil/ddcutil-0.9.9.ebuild b/app-misc/ddcutil/ddcutil-0.9.9-r2.ebuild
index 08aaa306dd03..2517c6fbb733 100644
--- a/app-misc/ddcutil/ddcutil-0.9.9.ebuild
+++ b/app-misc/ddcutil/ddcutil-0.9.9-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools flag-o-matic linux-info udev user
+inherit autotools flag-o-matic linux-info udev
 
 DESCRIPTION="Program for querying and changing monitor settings"
 HOMEPAGE="http://www.ddcutil.com/"
@@ -15,7 +15,8 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="drm introspection usb-monitor user-permissions video_cards_nvidia X"
 REQUIRED_USE="drm? ( X )"
 
-RDEPEND="dev-libs/glib:2
+RDEPEND="
+	dev-libs/glib:2
 	sys-apps/i2c-tools
 	virtual/udev
 	drm? ( x11-libs/libdrm )
@@ -25,13 +26,17 @@ RDEPEND="dev-libs/glib:2
 		virtual/libusb:1
 		sys-apps/usbutils
 	)
+	user-permissions? (
+		acct-group/i2c
+		usb-monitor? ( acct-group/video )
+	)
 	X? (
 		x11-libs/libXrandr
 		x11-libs/libX11
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 pkg_pretend() {
 	# This program needs /dev/ic2-* devices to communicate with the monitor.
@@ -50,7 +55,7 @@ pkg_pretend() {
 src_prepare() {
 	default
 	eautoreconf
-	sed -i -e "s#usr/local/bin#usr/bin#" data/etc/udev/rules.d/45-ddcutil-usb.rules || die
+	sed -e "s#usr/local/bin#usr/bin#" -i data/etc/udev/rules.d/45-ddcutil-usb.rules || die
 }
 
 src_configure() {
@@ -88,7 +93,6 @@ src_install() {
 
 pkg_postinst() {
 	if use user-permissions; then
-		enewgroup i2c
 		einfo "To allow non-root users access to the /dev/i2c-* devices, add those"
 		einfo "users to the i2c group: usermod -aG i2c user"
 		einfo "Restart the computer or reload the i2c-dev module to activate"
@@ -96,7 +100,6 @@ pkg_postinst() {
 		einfo "For more information read: http://www.ddcutil.com/i2c_permissions/"
 
 		if use usb-monitor; then
-			enewgroup video
 			einfo "To allow non-root users access to USB monitors, add those users"
 			einfo "to the video group: usermod -aG video user"
 			einfo "Restart the computer, reload the hiddev and hidraw modules, or replug"