gentoo auto-resync : 22:04:2024 - 23:59:31

5 files changed, 18 insertions, 146 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index be0a05300e86..3576feb12a8e 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/i2c-tools/Manifest b/sys-apps/i2c-tools/Manifest
index 4b42f9141d85..cbb4608c57d2 100644
--- a/sys-apps/i2c-tools/Manifest
+++ b/sys-apps/i2c-tools/Manifest
@@ -1,5 +1,4 @@
-DIST i2c-tools-4.2.tar.xz 87600 BLAKE2B 89f84ad07f4c042f67c308d48a402aa9ed46352062ddad3456d048730019e099e6eef626d487d802e07b100ae2c836e9aa6b2345950ff8744cbc0fe1a22616fb SHA512 5e230be4983c5c9c5718491d3ce9ee2e6205edea75c4097735eb32a25e522e37a074ef4cb61d2492707efebf0cb1b75ff65f1b2ae8c0bc1684a169526809a096
 DIST i2c-tools-4.3.tar.xz 81276 BLAKE2B c7300224c8d32785cd067b632bf0e9591f05264b1572f44aebda5f30a95164732d606710c13739ccb7899476219ceb3033beaf95b718ed7e18122f9181dc13fc SHA512 8a6cc12d927d6291b9baf407bc15807280539a7048ec5c2edf77414432eab43b28353c42bc0e45b7b481502aa4c5588def08f130d97fc275f635d1f77488f501
-EBUILD i2c-tools-4.2.ebuild 1687 BLAKE2B 2667d4fcd4e22ac5f34871e0c5cf5e745bb3b3502b5feeb094315f50170e19d2396d467bc35f5fa28460326dcbebd1258e8bdf42acaca19a05713c485d72a473 SHA512 84751599666e8d040273ac371ec15bd1f6b0260366899fbb25bda4b5782c3d4a37963d571aaf1c3caefeb67c658db3c4ea67e5834f51d5c35c8fb7a7cba5d1a3
+EBUILD i2c-tools-4.3-r1.ebuild 1450 BLAKE2B 6ac89c65688e0a4ef13c610dd72be8e729510dd5d6ee5548d0d12c27631bd812bc0b7598f1d95e52d64d63f0894d217fcb7b3978592b6ac42854b367ddc3379f SHA512 eb1516c9d27a299b1fadb9b93b5b9c67a41f7576c1f4210bbdd0593322e8c5666a5a1c36e6392b781da336414c56e82aa122dfa84363de9c68a08ee81b9d6298
 EBUILD i2c-tools-4.3.ebuild 1348 BLAKE2B 899c9433161f81d99c13596af910c5b3c4bc05ba173f64e31d6d579d89e36a8fef57eacbdb72b248ee830870b17fccf93d26e391d457e00423c46f7bb430395f SHA512 34afd003549bdd10c039398be5e60c3aac7d2433a2b18b0aa49674acd7d32281579631da20570f8930c324c8fb660dcea8bc34b455474427c73d647c5c8d2cad
 MISC metadata.xml 260 BLAKE2B cfcc4618143410d07056c569a1ae3543443139a1f4ac0c07c5482a6caaf923f715b135e4b56b313d5b4d16aa49d30caec20f5dce01eb1fdb98bb717fc2a7db9a SHA512 541810c9d5b78246d55be1c5a0cfc6f59e816d8177fd73b20a1123db37de974820846b8752a8ad4eb89d474d7a1bae7b48d99a076d246b9e522b4358dc353808
diff --git a/sys-apps/i2c-tools/i2c-tools-4.2.ebuild b/sys-apps/i2c-tools/i2c-tools-4.3-r1.ebuild
index ed58d716a310..e0211bd875af 100644
--- a/sys-apps/i2c-tools/i2c-tools-4.2.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-4.3-r1.ebuild
@@ -1,37 +1,36 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9,10} )
-DISTUTILS_OPTIONAL="1"
+EAPI=8
 
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_OPTIONAL=1
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 flag-o-matic toolchain-funcs
 
 DESCRIPTION="I2C tools for bus probing, chip dumping, EEPROM decoding, and more"
 HOMEPAGE="https://www.kernel.org/pub/software/utils/i2c-tools"
 SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2.1+ GPL-2+ python? ( GPL-2 )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="perl python"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-RDEPEND+="
-	perl? ( dev-lang/perl )"
+BDEPEND="
+	python? (
+		${PYTHON_DEPS}
+		${DISTUTILS_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)"
 
 src_prepare() {
 	default
 	use python && distutils-r1_src_prepare
-
-	# Cut out the eeprom/ & stub/ dirs as only perl scripts live there.
-	if ! use perl ; then
-		sed -i '/^SRCDIRS/s: eeprom stub : :g' Makefile || die
-	fi
 }
 
 src_configure() {
@@ -43,9 +42,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake AR="$(tc-getAR)" CC="$(tc-getCC)" all-lib # parallel make
-	emake CC="$(tc-getCC)"
-	emake -C eepromer CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)" EXTRA="eeprog"
 
 	if use python ; then
 		cd py-smbus || die
@@ -55,14 +52,8 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" libdir="/usr/$(get_libdir)" PREFIX="/usr" install-lib install
-	dosbin eepromer/eeprom{,er}
+	emake EXTRA="eeprog" DESTDIR="${D}" libdir="/usr/$(get_libdir)" PREFIX="/usr" install
 	dodoc CHANGES README
-	local d
-	for d in $(usex perl eeprom '') eepromer ; do
-		docinto "${d}"
-		dodoc "${d}"/README*
-	done
 
 	if use python ; then
 		cd py-smbus || die
diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest
index 795286d07e3c..1d251cffd9be 100644
--- a/sys-apps/xdg-desktop-portal/Manifest
+++ b/sys-apps/xdg-desktop-portal/Manifest
@@ -1,7 +1,5 @@
 AUX default-portals.conf 22 BLAKE2B 06a584551d11a4b2d51bf236eb657cda2360e8b324574a936c9d6f03a2d4c041ce72b6cc8a00740e4773ce654ad1867a818215c1bf610007a9dcd4b7b6b65149 SHA512 29af734e44797d4812165fa7d0be36b9047b1b9cfa12aad3628bb95ee3dbb9ff4efbd8023fb43a63d01c7e8879d58c6634710b47416929d3a7a5ca376ae18451
 AUX xdg-desktop-portal-1.18.0-sandbox-disable-failing-tests.patch 2444 BLAKE2B a93b089a7bbd23b258d28711a144982b9c102f7d0001b10a80d1f378da6965f7547ce11c4bfee8e534aa23b573b600d6a40d22877d6d9ddbe81f89d46dc73373 SHA512 99f87d9ed61cdf63af2449c1e2d2f3472db4fd21fa2baec7403bee6460146183a84af01ec18b13c1c072e5a7dd68b2e07a47b0e0886e4dffa09bf788d92ab5ec
-DIST xdg-desktop-portal-1.18.2.tar.xz 698912 BLAKE2B c8b0da07c094627c36b72b775367ec9081d7e710c0c29640afc239c2048e686611ae0ab941515337605c175ad63345e8ffdcd4982ad0997d5ca67fc31e289f89 SHA512 937fea3dfa0ab4b99146fbf5e4e42fdd94a22ab204f45395257c562e97803e71a777ca17faa5077205a1dd6b7d86291dfeed75922e311a61a402ebf4e05cfa19
 DIST xdg-desktop-portal-1.18.4.tar.xz 699380 BLAKE2B 969d9359744f26a931d5d86fbdac222b0d55f7942bb8b1ffba67343c88696dbb4c905b122363c5eae5dcac8b55f58d03433acbbca6f7594a16e72e13bc78353a SHA512 482676777e8180752e13ff485acab91de117f4ecf2aefd313a6f596df800f37d7004ee4ba1040009eb69a6efc780efc7dcd7e46b3f59c47bd9f21aef48d346de
-EBUILD xdg-desktop-portal-1.18.2.ebuild 3408 BLAKE2B fad9fd0ad7fe52f3544fdba3d342b48a56c651923a41d161253aa89c62fffb9f0073f20e9215cc49af274547a97e97263408bfde2eb9c2ef0386d630e5f70275 SHA512 cde3e91a13d7a80071597015ccd7635cc245658cd968234c36375dd4ab0076a8fb3b9ece3e9d8efe5e70e954a2f98dbc5af65b52a3a013d7f08e539e97c4206f
 EBUILD xdg-desktop-portal-1.18.4.ebuild 3408 BLAKE2B 161dbe0340d0ea217f516b6a59a94bddeb73ebd60a397de2c2ff090ca002b79e2026156a982b000db4ff09bf692d08aa79dbfa09e09e806ad86eb6ac029d5e30 SHA512 1eaf4f4ebbaf20818866c52ae05eca5e7dc89017c0ce5b9b8fecca1ace44e140f59382abe7c3b9a72c22f0e994bedb6bc36132ad7c9a6a8fd8542821b9e56449
 MISC metadata.xml 572 BLAKE2B 5d1abb01d74881886beab22900a545b0364cd7b48990577a153bdd1d8125d517b8a26c89382b0ceb9e127e0cbd11d7462d3d74908facb521295314ddf2699723 SHA512 ffaa7cfd28794dd57d1229e5839a28cf5b178c6416cf1817e7e6753c7460c22e96e2997f005b80b574d7f4b49e3a0e5d9f44101258824edb00e328caf449b9d5
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.18.2.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.18.2.ebuild
deleted file mode 100644
index 8e8d4a6fe0c9..000000000000
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.18.2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit meson python-any-r1 systemd
-
-DESCRIPTION="Desktop integration portal"
-HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal"
-SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
-IUSE="geolocation flatpak seccomp systemd test"
-RESTRICT="!test? ( test )"
-# Upstream expect flatpak to be used w/ seccomp and flatpak needs bwrap anyway
-REQUIRED_USE="flatpak? ( seccomp )"
-
-DEPEND="
-	>=dev-libs/glib-2.66:2
-	dev-libs/json-glib
-	>=media-video/pipewire-0.3:=
-	>=sys-fs/fuse-3.10.0:3[suid]
-	x11-libs/gdk-pixbuf
-	geolocation? ( >=app-misc/geoclue-2.5.3:2.0 )
-	flatpak? ( sys-apps/flatpak )
-	seccomp? ( sys-apps/bubblewrap )
-	systemd? ( sys-apps/systemd )
-"
-RDEPEND="
-	${DEPEND}
-	sys-apps/dbus
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-python/docutils
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		dev-libs/libportal
-		$(python_gen_any_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/python-dbusmock[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-PATCHES=(
-	# These tests require connections to pipewire, internet, /dev/fuse
-	"${FILESDIR}/${PN}-1.18.0-sandbox-disable-failing-tests.patch"
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-python_check_deps() {
-	python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddbus-service-dir="${EPREFIX}/usr/share/dbus-1/services"
-		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
-		$(meson_feature flatpak flatpak-interfaces)
-		# Only used for tests
-		$(meson_feature test libportal)
-		$(meson_feature geolocation geoclue)
-		$(meson_use seccomp sandboxed-image-validation)
-		$(meson_feature systemd)
-		# Requires flatpak
-		-Ddocbook-docs=disabled
-		# -Dxmlto-flags=
-		-Ddatarootdir="${EPREFIX}/usr/share"
-		-Dman-pages=enabled
-		-Dinstalled-tests=false
-		$(meson_feature test pytest)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Install a default to avoid breakage: >=1.18.0 assumes that DEs/WMs
-	# will install their own, but we want some fallback in case they don't
-	# (so will probably keep this forever). DEs need time to catch up even
-	# if they will eventually provide one anyway. See bug #915356.
-	#
-	# TODO: Add some docs on wiki for users to add their own preference
-	# for minimalist WMs etc.
-	insinto /usr/share/xdg-desktop-portal
-	newins "${FILESDIR}"/default-portals.conf portals.conf
-}
-
-pkg_postinst() {
-	if ! has_version gui-libs/xdg-desktop-portal-lxqt && ! has_version gui-libs/xdg-desktop-portal-wlr && \
-		! has_version kde-plasma/xdg-desktop-portal-kde && ! has_version sys-apps/xdg-desktop-portal-gnome && \
-		! has_version sys-apps/xdg-desktop-portal-gtk; then
-		elog "${PN} is not usable without any of the following XDP"
-		elog "implementations installed:"
-		elog "  gui-libs/xdg-desktop-portal-lxqt"
-		elog "  gui-libs/xdg-desktop-portal-wlr"
-		elog "  kde-plasma/xdg-desktop-portal-kde"
-		elog "  sys-apps/xdg-desktop-portal-gnome"
-		elog "  sys-apps/xdg-desktop-portal-gtk"
-	fi
-}