gentoo resync : 29.12.2022

3 files changed, 2 insertions, 74 deletions

diff --git a/sys-fs/xfsdump/Manifest b/sys-fs/xfsdump/Manifest
index 4db31b14a980..606a79c7f76d 100644
--- a/sys-fs/xfsdump/Manifest
+++ b/sys-fs/xfsdump/Manifest
@@ -4,7 +4,5 @@ AUX xfsdump-3.1.9-no-symlink.patch 1027 BLAKE2B 35e0a308e9c368448305361e1632a229
 AUX xfsdump-3.1.9-prompt-overflow.patch 329 BLAKE2B 58bada935969c61fe9a161e810c6402642a87d0803076c89f1cecf5367037f96ff234d3231c49fa8b450810b21f60ac391bd631400e30738b9b11d3000158bd7 SHA512 dae03fd09ac45c8a974cf1818625cbb07c1bd7c88b28613f855d0a5878c1bf3bcb071c6f8ebd46627b83fd482ff4847a33f8a54f1de5be7595025df9f22d2fdf
 AUX xfsdump-3.1.9-skip-inventory-debian-subfolder.patch 468 BLAKE2B 81cf0af8cef61efa4dff6e230b71c0db65c3e7d93fd252035b6b5bf14afe28e65eccaef22bc3fc4419d196b0cca1428bc1697233efcc4f28aa138beaf3a5ccbf SHA512 c94af1c52c95a7617586b64a8936cdbfbd3a264c9580fabc3e1e7d3d5c37ca368b97f730baef2330e796ef7459561fa37b03280601aaa3b79eb2f90d9af5170d
 DIST xfsdump-3.1.10.tar.xz 609424 BLAKE2B 742d392c4ca4532e64ab8fd89a27b0d7c669e3f977fb9362f3f41e1db09c250951aff3906a5f598892cf58b00a7aab636864af9461afb724feec2708f52cdbd9 SHA512 8a1b671b22fffb5d2eac45d5fd7a2948c137b3ca21fde06779cff13fc6eaa27286876f56715f2eeb82ce107278d763028474260a54a8fec722e5a5d7c5875c9a
-DIST xfsdump-3.1.9.tar.xz 600348 BLAKE2B 9e833acaacd3ad581b4f23731d7d613fcffa3d518f43638cddbc7da7015e582cb9415e00616e5e8586836831b6d5877fa83e8a5fd931fd454731bf2af7072095 SHA512 e8f9811d16fc06ab49fe2c109de0546c989575eca6e68b579c6d219a745f935952020069f58b357c5c87b944c5097ca2894466d328d09f06beb8a55880142351
-EBUILD xfsdump-3.1.10.ebuild 1620 BLAKE2B 1e832a79810f6bddf605e8f11b4064736360403479060c88d2568f0200421945f1341975dddb50cd27ad56c608a6b5065344390599feaa01879545c3b51e6cc7 SHA512 743668303895e950a51e3895b40a1d5d0445f56694ab39bee83e1e36036996d331945e82bbd7111170b2f75c3e6c6bce352b241f2819c9bb1a51de4cdbf49543
-EBUILD xfsdump-3.1.9-r1.ebuild 1581 BLAKE2B 0613d92c205bf68359bad98cd4ad56bb0e1c1b6e1996189d85e68b41aebcb73d8643dd9f63ee9c97d6fc7f316a791b44bb74a77a28c7b99875e68ec75dca6a2b SHA512 5ea03e7f5f112ae94578db745372394559a37a7847baeafbd24b687c03568649c1e3c5eb21d03362e17ab161eaa8f068a8c42f5ca9d6539532b649f88a7ab0ec
+EBUILD xfsdump-3.1.10.ebuild 1616 BLAKE2B 44ccf45aec6af77e80cc4208b3ff1229025a919acb0b6bde29e9ec54e3682e981572f5fd8526c8e8b329568b5b2a1482fb3cfaac1385b159b8a3caf504456917 SHA512 1f5d694aa1168252f9b0a3fcd6a506416414f9711126dec5c475551a2247a3cf22b9604a02d14cf8887de20dcedae7ec1ac936f73cb6e418b09106880b007ae8
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-fs/xfsdump/xfsdump-3.1.10.ebuild b/sys-fs/xfsdump/xfsdump-3.1.10.ebuild
index 0ef28b237d54..29816a7fd3f6 100644
--- a/sys-fs/xfsdump/xfsdump-3.1.10.ebuild
+++ b/sys-fs/xfsdump/xfsdump-3.1.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 -sparc x86"
 IUSE="ncurses nls"
 
 RDEPEND=">=sys-apps/attr-2.4.19
diff --git a/sys-fs/xfsdump/xfsdump-3.1.9-r1.ebuild b/sys-fs/xfsdump/xfsdump-3.1.9-r1.ebuild
deleted file mode 100644
index 500e295dd5f7..000000000000
--- a/sys-fs/xfsdump/xfsdump-3.1.9-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="xfs dump/restore utilities"
-HOMEPAGE="https://xfs.wiki.kernel.org/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 -sparc x86"
-IUSE="ncurses nls"
-
-RDEPEND="
-	>=sys-apps/attr-2.4.19
-	sys-apps/util-linux
-	sys-fs/e2fsprogs
-	>=sys-fs/xfsprogs-3.2.0
-	ncurses? ( sys-libs/ncurses:0= )
-"
-DEPEND="${RDEPEND}
-	nls? (
-		sys-devel/gettext
-	)
-"
-BDEPEND="ncurses? ( virtual/pkgconfig )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.9-prompt-overflow.patch #335115
-	"${FILESDIR}"/${PN}-3.1.9-no-symlink.patch #311881
-	"${FILESDIR}"/${PN}-3.1.6-linguas.patch #561664
-	"${FILESDIR}"/${PN}-3.1.9-fix-docs.patch
-	"${FILESDIR}"/${PN}-3.1.9-skip-inventory-debian-subfolder.patch
-)
-
-src_prepare() {
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		include/builddefs.in \
-		|| die
-
-	sed -i \
-		-e "s:enable_curses=[a-z]*:enable_curses=$(usex ncurses):" \
-		-e "s:libcurses=\"[^\"]*\":libcurses='$(use ncurses && $(tc-getPKG_CONFIG) --libs ncurses)':" \
-		configure || die #605852
-
-	default
-}
-
-src_configure() {
-	unset PLATFORM #184564
-	export OPTIMIZER=${CFLAGS}
-	export DEBUG=-DNDEBUG
-
-	local myeconfargs=(
-		$(use_enable nls gettext)
-		--libdir="${EPREFIX}/$(get_libdir)"
-		--libexecdir="${EPREFIX}/usr/$(get_libdir)"
-		--sbindir="${EPREFIX}/sbin"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# enable verbose build
-	emake V=1
-}