gentoo auto-resync : 16:05:2024 - 00:01:30

4 files changed, 6 insertions, 64 deletions

diff --git a/dev-libs/libgpiod/Manifest b/dev-libs/libgpiod/Manifest
index b3105d1c91a7..a13cd3912474 100644
--- a/dev-libs/libgpiod/Manifest
+++ b/dev-libs/libgpiod/Manifest
@@ -1,10 +1,8 @@
 AUX libgpiod-2.1-libtool.patch 2722 BLAKE2B 35f41e534dfd27f7f0c42a1cf0dcf1350483ff6bf656feb51a64a58640f83153faddcd1169cad9ef722ace9621c1634c122971a8998b60f474235829dc321a41 SHA512 1a984470f1eca5ce7da162bce5f0040084ddd4a4de2efb970218944cd03675e51cf833063f0f151d796569b3f9e87843bbb6c04902fa99349284baf21aa9cef6
-DIST libgpiod-1.6.3.tar.xz 326068 BLAKE2B eda5409f2db3914ede92690589643211eca3002f8dc53a7c48213602f28158084c8eb8061319923f7a51c7d91650ff58b81b059323b5b9133a28b0bb04f6904d SHA512 f7e48662d02904f3f25976d61aa2cf4af0b8a52f65f184f23dfb6916bde9b86634b211f2696d3459a4f902ba5a79621b2fc47d18d487fd7a159018fe8933e370
 DIST libgpiod-1.6.4.tar.xz 334552 BLAKE2B 3bf52dab263638967e0f59c858e22f3d8ec1c9565ba1edd665dff580a883fbc6aa49a944e6df4da8fca9c2df873e222ed4e055c9792ee27d4562b3c2d0c65b79 SHA512 23ea27147039ae34505263dbfbb3ca9985fc671d26e489ccaf150543d4e853f709393f46a8a5a1e682fa91378163bd2db6c689159ef73c3a8d1eeea422eacda0
 DIST libgpiod-2.1.1.tar.xz 421164 BLAKE2B 940f2af832a0fc39accecd9cf76864d05f961c0d2e4899d09dc07670bb2a8d8c2704fa43e29e2163f2b486ba65cadce2114f96cf0e7637afece99c543852305f SHA512 d396f1b8f632c3592b2be37e23e5052f4050ab5c1a9de77de5f97ce50fa3115c119dd69b0bbcf59621e92b775bfc81f18a65cca1e57e022752d28c0e01baff6f
-DIST libgpiod-2.1.tar.xz 421132 BLAKE2B 97f43854070f19b37f4041c08d33c8156d69a3acd73845849f843223d159602ad8aa59096e1c8a3428bf16488272353a5747c6c95b9f729cb11e53ceeb6b29c2 SHA512 1c20a93fb2a6cf66f4690a5784ac1aeb077ca3da23c1942448f045972092468480e13b13174f327b3b7252bef5f23ffd226c990f11529b1151ba2dc318a47e52
-EBUILD libgpiod-1.6.3-r4.ebuild 1175 BLAKE2B 923b428c143c3640f71a66f1ecde97a49c6633437f445b19a83e40138e21147a4a653eeeefbe375ede291a1736823fa7b3bfeb5eae81961e7a8006add6db0336 SHA512 5ec466695703f6a6c2bc2a7bd852cbcace62e37b4dbe6dc7fc7897f483f7b77123bede6f8cea95dcc61a68a4a894ead137bfbf7c692b31386b21f16ca2e64ae3
-EBUILD libgpiod-1.6.4.ebuild 1179 BLAKE2B b17f3ab9ae5c3880edd03cc0fe4da74fc03cb0d032bb1a072bcedbb65427ac6a15d7dd81756d451ee190b648c5e2d8bc7383eca58a0328a52da44c743192bc2a SHA512 110908ffd82bd2569cb4020346f09f7931fcc6479e5ad91208de2fd43fd4df45f0880d347f72caeae45823d54e558cf23f88353d4309954794c6c58f86ca7284
+DIST libgpiod-2.1.2.tar.xz 419964 BLAKE2B 62b1df3af28d0ab4988101f6bcbce750fd5bd7db874a34c196630bc8badaefc8e3c5c60bbf3c4dfff074d4d2f681d3339fc32c9eeecf395b595b91e5727572e5 SHA512 e921ac34692d5ae92a29592e2103229a8b0afcdcfa750e30fbd292554cd2e59fd51aefc8fa2ad1c9ad5ea4a93bb3443e8f6e8f4f1537109b263aba33317106f3
+EBUILD libgpiod-1.6.4.ebuild 1175 BLAKE2B 89ff2b7a50822c55e91f248f74a4f1a4d526d809129dbd4870269861f83ba8c226cfb3cbb8b58ecd53b43db28ce521ebad7bbeaf66414efc62379ec5d934a4cd SHA512 9506ecad601726ad525fa5517234c9c855f031788df07023c23704dea29080b682133ab8cdddb3540ec772f67fd4d6b33720016716f2093186a54dc5dd6ac2f3
 EBUILD libgpiod-2.1.1.ebuild 1422 BLAKE2B ba1fc80b9b8681fd1b9eabad0b1781ad576c218831594d74c73592dfa35cfb66f2e8b7358e7312f35573bce1cbbc2232572d6ca4ae6290389ef2c0c7f7a4b8db SHA512 ba20b373159e3c94125c1003c28cb2f538217c7f2e3c5fde30a6446c92b9c67ebec532cb14128f6ae28b9511f00f377b232b4dbdfe9c17bc17a10d112fc450b4
-EBUILD libgpiod-2.1.ebuild 1390 BLAKE2B 743975ee2b223cda564f4fb3e060f689d96f45c56e7b577e607e738e49cfd9e225e602388896fdb5ca382b4a509aeadf69bbf7e62ebd5463bc1650886de81853 SHA512 6fed11b64b96d623d668e0a446184e921945bc7d1132f925e6bdeaf676f8011d2818e39623be6d37a9e0fb2954c8ee286c634b2a76f80bb54d805b06fa4b7920
+EBUILD libgpiod-2.1.2.ebuild 1356 BLAKE2B 1c403f6e38f10ac04583f6bcb3f83f885f64576d6d4f26fc9cf95ad375b244ed073a3919dedef61b51e2ddc30cc6dec9498d719b93d489fefc488e519958ec8b SHA512 4940d94aee45bb0bccd44b4b987df75e72bba89b5edd651d69cf0152e65c5c38903f87009779ced037159923b697bc3eadf2e4684cb0395d832741f0f23cab17
 MISC metadata.xml 332 BLAKE2B 14e5a292a2b590adc7cb643ba4c58b997e5573719383e4b4f58583f992ebff4fbb1455c9a2e71665f739c112c9eb8311879f545f5b770d57d176d013e08e103d SHA512 45f341d7b87c774730451fb583b03347efe2f69188a38c8ad9690cf690d96d65c3d85c42c0b1d80e5a0a63ea749df879b2b71b7f44d124afeaeeb628e2fbec05
diff --git a/dev-libs/libgpiod/libgpiod-1.6.3-r4.ebuild b/dev-libs/libgpiod/libgpiod-1.6.3-r4.ebuild
deleted file mode 100644
index edd9c253a6f3..000000000000
--- a/dev-libs/libgpiod/libgpiod-1.6.3-r4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info
-
-DESCRIPTION="C library and tools for interacting with the linux GPIO character device"
-HOMEPAGE="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/"
-SRC_URI="https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-# Reflects the ABI of libgpiod.so
-SLOT="0/2"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
-IUSE="+tools cxx python test"
-RESTRICT="!test? ( test )"
-
-#  --enable-tests          enable libgpiod tests [default=no]
-#  --enable-bindings-cxx   enable C++ bindings [default=no]
-#  --enable-bindings-python
-DEPEND="
-	test? (
-		>=dev-libs/glib-2.50
-		>=sys-apps/kmod-18
-		>=sys-apps/util-linux-2.33.1
-		>=virtual/libudev-215
-	)
-"
-
-pkg_setup() {
-	CONFIG_CHECK="~GPIO_CDEV_V1"
-	linux-info_pkg_setup
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable tools)
-		$(use_enable cxx bindings-cxx)
-		$(use_enable test tests)
-		$(use_enable python bindings-python)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -type f -delete || die
-	find "${D}" -name "*.a" -delete || die
-}
diff --git a/dev-libs/libgpiod/libgpiod-1.6.4.ebuild b/dev-libs/libgpiod/libgpiod-1.6.4.ebuild
index 89067dc6f4b6..cab36b424ecb 100644
--- a/dev-libs/libgpiod/libgpiod-1.6.4.ebuild
+++ b/dev-libs/libgpiod/libgpiod-1.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/${P}.tar.xz"
 LICENSE="LGPL-2.1"
 # Reflects the ABI of libgpiod.so
 SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 IUSE="+tools cxx python test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libgpiod/libgpiod-2.1.ebuild b/dev-libs/libgpiod/libgpiod-2.1.2.ebuild
index d3c115ebeb62..63f9fafa352e 100644
--- a/dev-libs/libgpiod/libgpiod-2.1.ebuild
+++ b/dev-libs/libgpiod/libgpiod-2.1.2.ebuild
@@ -26,14 +26,10 @@ DEPEND="
 		>=sys-apps/kmod-18
 		>=sys-apps/util-linux-2.33.1
 		>=virtual/libudev-215
+		cxx? ( <dev-cpp/catch-3.5:0 )
 	)
 "
 
-PATCHES=(
-	# bug 913899
-	"${FILESDIR}"/${PN}-2.1-libtool.patch
-)
-
 pkg_setup() {
 	CONFIG_CHECK="~GPIO_CDEV_V1"
 	linux-info_pkg_setup