gentoo resync : 29.12.2022

4 files changed, 6 insertions, 108 deletions

diff --git a/dev-util/clippy/Manifest b/dev-util/clippy/Manifest
index 7126925369e9..8db13b526190 100644
--- a/dev-util/clippy/Manifest
+++ b/dev-util/clippy/Manifest
@@ -1,6 +1,3 @@
-AUX clippy-8.1-big-endian.patch 1677 BLAKE2B b47262fe1d6edb94005982ba854980acc47f21fccbd5969965fa2604cbf866748598a842b71a786a24e07ec39d0fc70652206d3b6d0464c435a06da40fff207b SHA512 c7849814b6b979fee63a2c52d364798f0a8fd4069d14a561881ee7db1c1213d6b1ad726f67a0d68df103e28f18b80aad1071427773b47d9916b3ca0247393c05
-DIST clippy-8.1.tar.gz 8514995 BLAKE2B 6b70756909b54af3317b1e97956345206612a471893dcfa4d4a7edaf27ae8d94624b0129eb511bf96ac100cc8c5c5234c2f7031d1692f4a81d5025fe797cfd11 SHA512 dcbee55b48e9d4aba005a455f8c89e63a86d63a230e6bf2e1f691adf99654e0e170efaf2c8759e0bfc33b977659a828bed248370722210e98a6e2abad8f502aa
 DIST clippy-8.2.2.tar.gz 9439460 BLAKE2B 7ea4b44e3d167677e087ac8767c470b91c485e52f9e45513fb6da8498ff3c56e84dd90257eff3b0067c061e7596578968017cbec7de7ea951b6f80134332e1bf SHA512 52d8e82979823f61ec6f117db1eb41b23fd8ad3197ae3f9d2cfa3ad9d96636a3d2f0b36720b2041a9261c8b639ddd48e46a2351ce41cb596f7dc432cddf29256
-EBUILD clippy-8.1-r1.ebuild 856 BLAKE2B c9faad7170c18e96b53ad6bf2e3ad3bf9bbd785e3c95aacfc6b7370aaacd90786dda7972fcc9ffdd112812e8cd4c6b51d36dcbacd5d03bbb99cd43fb59ce3906 SHA512 7b58aa8965114a6e96e804cbdc1a9fd94804fa1ef71156a55b25e9e55c29e3387691597ffabc66b82e5fd76edbd7ce0800cc644941bbac315cc2c6f4916a3d84
-EBUILD clippy-8.2.2.ebuild 808 BLAKE2B 297d64319747eea8b57be7b8b1324bbf1671b0b39adf0d6a9b87686d456d8beee3a3ca60e02652ccc79de0a5034eb51103aadc579f66ad3b86b6a81fdc5f5984 SHA512 b1ebcd5eb3385765fa4bd52893b3fcde8d62866821abf97e1c0a82f582fb64e69b2e3b98f8580daaa9bdab6da0415ebc4314e58b21acc04b3f54ccacf99552ac
+EBUILD clippy-8.2.2-r1.ebuild 975 BLAKE2B c6ece16f4e0f5e996ff7e2537058b70ebfd7bc3d867166fa8b4991b135f743aa33e41a9c6b37b15248bbbe3124095459918aefca30705c76651d32667fba27e9 SHA512 4634d13903540dd00ecf84c56b485c1a3bfb9eacdfa29edac1079fe7ed3e61407294b7d560be54290ff15dba13077d7e8f9f4ab4f6644a2a5a92b7376d5d1e72
 MISC metadata.xml 326 BLAKE2B b909c2525951476b2905e143974e734364023b9ac622f01ddae1e16427359ea47af02af11a3bb6ac5c51ef519c9c66995c8cba31d9ca41f1e48f33106a0678b3 SHA512 ee570ffd0054e2c132d637b41921bb25f3172fdfb0bcbc5d2214eaa3bb95c109ca58a5e6cd7ebd386de497ef3e20cf3696243dcc5e82fc4cfae25bba51be4db9
diff --git a/dev-util/clippy/clippy-8.1-r1.ebuild b/dev-util/clippy/clippy-8.2.2-r1.ebuild
index 5102fb496f7b..56adc6b89f2d 100644
--- a/dev-util/clippy/clippy-8.1-r1.ebuild
+++ b/dev-util/clippy/clippy-8.2.2-r1.ebuild
@@ -28,10 +28,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="sys-devel/flex"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-big-endian.patch
-)
-
 src_prepare() {
 	default
 	eautoreconf
@@ -42,5 +38,9 @@ src_configure() {
 }
 
 src_install() {
-	dobin lib/clippy
+	# 830087
+	find "lib" -type f -name "clippy" -print0 |
+		xargs -0 file | grep executable | grep ELF | cut -f 1 -d : |
+		xargs -I '{}' dobin '{}' ||
+		die "Failed to install 'lib/clippy'"
 }
diff --git a/dev-util/clippy/clippy-8.2.2.ebuild b/dev-util/clippy/clippy-8.2.2.ebuild
deleted file mode 100644
index 7438cb91f503..000000000000
--- a/dev-util/clippy/clippy-8.2.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="frr-${PV}"
-PYTHON_COMPAT=( python3_{8..10} )
-inherit autotools python-single-r1
-
-DESCRIPTION="Standalone clippy tool built from FRR sources"
-HOMEPAGE="https://frrouting.org/"
-SRC_URI="https://github.com/FRRouting/frr/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/frr-${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# standalone clippy does not have any tests
-# restrict to prevent bug 811753
-RESTRICT="test"
-
-DEPEND="
-	${PYTHON_DEPS}
-	virtual/libelf:=
-"
-RDEPEND="${DEPEND}"
-BDEPEND="sys-devel/flex"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf --enable-clippy-only
-}
-
-src_install() {
-	dobin lib/clippy
-}
diff --git a/dev-util/clippy/files/clippy-8.1-big-endian.patch b/dev-util/clippy/files/clippy-8.1-big-endian.patch
deleted file mode 100644
index fa715cf23858..000000000000
--- a/dev-util/clippy/files/clippy-8.1-big-endian.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-https://github.com/FRRouting/frr/commit/cfc45e911e21820bc8b703b37e947a6a7e5d798a.patch
-https://github.com/FRRouting/frr/issues/10051
-
-From: David Lamparter <equinox@opensourcerouting.org>
-Date: Tue, 18 Jan 2022 09:50:25 +0100
-Subject: [PATCH] lib/clippy: don't endian-convert twice
-
-elf_getdata_rawchunk() already endian-converts; doing it again is, uh,
-counterproductive.
-
-Fixes: #10051
-Reported-by: Lucian Cristian <lucian.cristian@gmail.com>
-Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---- a/lib/elf_py.c
-+++ b/lib/elf_py.c
-@@ -1071,26 +1071,25 @@ static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
- 			 * always be a pointer...
- 			 */
- 			if (elffile_virt2file(w, rel->r_offset, &offs)) {
--				Elf_Data *ptr, *conv;
--				GElf_Addr tmp;
--				Elf_Data mem = {
--					.d_buf = (void *)&tmp,
--					.d_type = ELF_T_ADDR,
--					.d_version = EV_CURRENT,
--					.d_size = sizeof(tmp),
--					.d_off = 0,
--					.d_align = 0,
--				};
-+				Elf_Data *ptr;
- 
-+				/* NB: this endian-converts! */
- 				ptr = elf_getdata_rawchunk(w->elf, offs,
- 							   w->elfclass / 8,
- 							   ELF_T_ADDR);
- 
--				conv = gelf_xlatetom(w->elf, &mem, ptr,
--						     w->mmap[EI_DATA]);
--				if (conv) {
--					memcpy(&rel_offs, conv->d_buf,
--					       conv->d_size);
-+				if (ptr) {
-+					char *dst = (char *)&rel_offs;
-+
-+					/* sigh.  it endian-converts.  but
-+					 * doesn't size-convert.
-+					 */
-+					if (BYTE_ORDER == BIG_ENDIAN &&
-+					    ptr->d_size < sizeof(rel_offs))
-+						dst += sizeof(rel_offs) -
-+						       ptr->d_size;
-+
-+					memcpy(dst, ptr->d_buf, ptr->d_size);
- 
- 					relw->relative = false;
- 					relw->rela->r_addend = rel_offs;
-