gentoo resync : 16.04.2022

3 files changed, 3 insertions, 120 deletions

diff --git a/app-misc/ddcutil/Manifest b/app-misc/ddcutil/Manifest
index bfc9329f07dc..990c5547a078 100644
--- a/app-misc/ddcutil/Manifest
+++ b/app-misc/ddcutil/Manifest
@@ -1,5 +1,3 @@
-DIST ddcutil-0.9.9.tar.gz 725207 BLAKE2B ad7b0b35ad4c2dae21da066e4194209579d774ded10f2dc0d8d7d3d94e70d5893c3d1f772b86ea01be510cfb8d51a657178228d028ca34ab20d344e86e0581d2 SHA512 f7b2b961c6b76ef59f336290b494cdd331556848de881d57e5240075d50733030df4c47131070f1276907d712a45f60dad6bebaa052a66621b8b5517ff293c21
 DIST ddcutil-1.2.2.tar.gz 803943 BLAKE2B 65cc5dc0d1ee85d1e2b6670f7c24508ab817c6eebdb596b5f6f70c7ff7b9257f12f70abfea2d735e23755e508d4829d4be6574ac16564d4d828e0b1153cf8afe SHA512 0329711e536cbcaee2efe6cf981a17181ab318846e9c6a82f2ceacc42691ba49c06df44a52d1f079568e9ccec588cc85d4de4adf19b6db83bebe4bb90ae29207
-EBUILD ddcutil-0.9.9-r3.ebuild 3281 BLAKE2B fa1f2dcf4f43dc5b746b3f3e3f0b3bac994f1d6be2bf5a2938f975a196c142b5c41723590566824d7887bc6067300c2e0a913e377c18002e579a73ff5bc3b889 SHA512 f0d0e919847bb907566fdc63e6639a265422b1332153b759ad456d9fb15e4360f5bbe72e67d53734372f4b6ef539bdaff9e38dd73b1fdf831be77ef45586878a
-EBUILD ddcutil-1.2.2.ebuild 2746 BLAKE2B 9f43f5583e77a0472b6210aa822c38d8285884234d0ae309c444a12ac4cc427fb44500cf1fe1190c1f8c3b8050843d918656f4444a3d8fc9430a35a076e2a0cf SHA512 ef8e04cedff182c67de5906eedea0eccb8f213d57903c82b385c10a218a261f4c2e1bbd5018ad6d4e72e9bd2101dfd6c5ab185c12d0f4ff78d7c126844a6732b
+EBUILD ddcutil-1.2.2.ebuild 2795 BLAKE2B 3c9671ed66b143175a21c88d8e3289430b65ec6cc2da40cd08166f062bc1f8b1fab6b0865781ffafa72e2249f0425710f363cf4a7b8fb60fb87101dbab988cd8 SHA512 f6d571f3e57f46e407a684c503467842f3b91c29bd78643c3105f80a61159bf0a7f3427a824de87c9e7087e87766ac1e7668e914e4b9a64d78b1424e8bbbb88d
 MISC metadata.xml 1293 BLAKE2B c7fc827c0bcf7914b2c0b3f9ecec9dee145824c33a516ef3d9cd43fcd368977d9f17a76b6b8775fa773f8ce8b109d16b1e5c8b14dee5d0e9e56aa7a4024a190d SHA512 a795c9fb1479ae198446160e9a020ce911b02ffd0d51af9cd634504aca1ded4c38d3295eca0cbc6ad33506684f55cf96676c868ec349229d0dfdaa17f8afa806
diff --git a/app-misc/ddcutil/ddcutil-0.9.9-r3.ebuild b/app-misc/ddcutil/ddcutil-0.9.9-r3.ebuild
deleted file mode 100644
index 53bf5448e893..000000000000
--- a/app-misc/ddcutil/ddcutil-0.9.9-r3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic linux-info udev
-
-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/3"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="drm introspection 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 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
-	usb-monitor? (
-		dev-libs/hidapi
-		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}"
-BDEPEND="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 -e "s#usr/local/bin#usr/bin#" -i 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
-		# Please read upstream's note about the original purpose of these flags before re-enabling them:
-		# https://github.com/rockowitz/ddcutil/issues/128
-		# As of 0.9.9 the following no longer compile:
-		# Python3 & CFFI is already broken as of Python 3.7, with future removal;
-		# SWIG : Python3.7 breakage as well PyFileObject vs PyCodeObject
-		--disable-cffi
-		--disable-cython
-		--disable-swig
-		$(use_enable introspection)
-	)
-
-	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
-		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
-			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-1.2.2.ebuild b/app-misc/ddcutil/ddcutil-1.2.2.ebuild
index 91a57f143aeb..9aa77c1cc2d3 100644
--- a/app-misc/ddcutil/ddcutil-1.2.2.ebuild
+++ b/app-misc/ddcutil/ddcutil-1.2.2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+# Check for bumps & cleanup with app-misc/ddcui
+
 inherit autotools linux-info udev
 
 DESCRIPTION="Program for querying and changing monitor settings"