gentoo resync : 17.02.2020

8 files changed, 157 insertions, 57 deletions

diff --git a/sys-fs/xfsdump/Manifest b/sys-fs/xfsdump/Manifest
index 69587c7dde30..6463935a3b8a 100644
--- a/sys-fs/xfsdump/Manifest
+++ b/sys-fs/xfsdump/Manifest
@@ -1,8 +1,12 @@
 AUX xfsdump-3.0.4-no-symlink.patch 721 BLAKE2B 11d827ddefaa4462c1c631854b429c9085bceee6980d1ea8224619569d0021d6280d175dd8a5b7b1374b105dfef73dc7c3fdee6991b45074fdf14a23a8c39e81 SHA512 8b8feddfbdd76bebe61a8d06e174f5bef6edd05d0ce3b96731c234f58f36c73182e411a6f7b30f4e2bbc48b13b675edaf9ba30434e414b2bf2c7dbf431c1b819
 AUX xfsdump-3.0.5-prompt-overflow.patch 337 BLAKE2B 2c6b2a5426a5d03a6dff1848df986a48a83502373df615d8177cfbc598c196994f9d1e5ad646bd1a9b7011941a3b124f78cf3ce9d48992129e0ea7f8fa80c6d2 SHA512 e81b36f0e72284f739150901b30b28386ac072f7d03c5b9c5052fe69b29104c2e87bc498aa6df29e21383b22f1da2ef9035b3acd9aed721601a9a1d9938f0bcf
 AUX xfsdump-3.1.6-linguas.patch 975 BLAKE2B c4a862aa55e3a473e4253433154e0e9a7032f7f35b018a412f47574268aae7a79c7956c01be8ffb3a10ad55cd904786079424b3a2a7574d16c7401343054db82 SHA512 2fe49c6985eca950890d952b6e33c7f9d7687dfaeb52077895e92994d930f0026bb8fdc31ad3f31d072b8a5023a9e0e3d99c301cb34802d7657a93b964aa6c8e
-DIST xfsdump-3.1.6.tar.gz 848698 BLAKE2B c87738640f2d5f424d8e8e9df50a75b2424c1f2741a47cd94f1e63d18b460946f1cb0ff362d2a00345db8fcc8e3518faa720e6495b138aaa51fe4e8d2d1bd24a SHA512 6d8eff10c65e0a0893525590953ccb7ec0095ba528725ffe3f18260e6cb8f66dd3945c60477500e84421a9ed57fae9e8f0f25c3c0900be3671f30ca6951ed5e7
+AUX xfsdump-3.1.9-fix-docs.patch 515 BLAKE2B f630b5e7540b8857c62b212b81ce33f2e08980644defb75e3fd7bd07a0bbb63fc07d4d51cdfc91476378a38b19a17c71407f32d49f1ba11677604ee2d28c9cea SHA512 7319936d24a0f805793cc6cbc9d35fca9a86632df104391054bfb57e4b6e20618f898f3968926a757e1f1181f4b7b1a444f025e0477db9dae544b573e6fc08a5
+AUX xfsdump-3.1.9-no-symlink.patch 1027 BLAKE2B 35e0a308e9c368448305361e1632a22922b85442ff771efb130f23f4cb292741f244caf76010e9bb0d95f282214c405284f5fc49cf568dad928cd6492fed7735 SHA512 1ac052d93dbd02b8da31c9fccbee05fad773babeaa35ad43b074f9c76566e80733a1f9d311acc2cf95c3d258f9abba3f43cc4971b08e397fd1cffeccd77bedd2
+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.8.tar.xz 603304 BLAKE2B 8f923ca267f648e88e4e964bcafcfd3bfde0fdb4e6753a9c21bbb8a1ae0f63e868cdad3da4eed5e95ffda861278eaaad49758701384681f3b0a19b93e07a232d SHA512 84720c83627647c75b42c59d180bb31cbb6e064568bef18b73641cf821fa7d39e6f7e0df4a6c7ffd36fba63296ab88cb83f0effdb1f6aa98f4b593ca0e658e0b
-EBUILD xfsdump-3.1.6.ebuild 1438 BLAKE2B 50e733ea6c26fbcf118ca3f7a92cbeba1f84ca6ab0d10d677f2a26ba3646a8002021402eae2044f85986559a52b84a7806f568a1b96a25c1b47685de27aaac48 SHA512 89c87ea84626c8f7128b7868aca1ab5e2daeda2ea991e02938bd121c4d589cd98e12e3c9bdadfe871076af70ed6f850fed26066829506113cf2e08c28cb3f827
-EBUILD xfsdump-3.1.8.ebuild 1495 BLAKE2B 5658fba84a1b060835dab66905bd0f77a3556670e3cf33f6d871bde949c0f3efadda2d7e3b09efc6b04f5cec4ac1fb7bdca14ddb4281a6264add1251d244d83c SHA512 b860ebc87f7db80383a6cfe7994be62807f790a6a73f18e67f4319d6115f9e81c7da59602dd3b8604d060cf85d79505297444e5054eee40266e95429d5e64c41
+DIST xfsdump-3.1.9.tar.xz 600348 BLAKE2B 9e833acaacd3ad581b4f23731d7d613fcffa3d518f43638cddbc7da7015e582cb9415e00616e5e8586836831b6d5877fa83e8a5fd931fd454731bf2af7072095 SHA512 e8f9811d16fc06ab49fe2c109de0546c989575eca6e68b579c6d219a745f935952020069f58b357c5c87b944c5097ca2894466d328d09f06beb8a55880142351
+EBUILD xfsdump-3.1.8.ebuild 1492 BLAKE2B 60fcf6da3d2998eae8f2eea33d40a04ad1377cac4c8cd3ea2264f40287a448b23da2624692a73450cc620180b8aad9483b370933ecc00f82c80830ce0e44e2d9 SHA512 a04f518dad0720bdf08cf6acbfa305c4bdcad36d36024f87803bd7fb176f0aa7ffccebfc9ec84f517e37ebc990f3271cf48a93c1e874acdbe58730443055bb84
+EBUILD xfsdump-3.1.9.ebuild 1605 BLAKE2B 4df33c74965f8f2f8753fa5bbf71d9ca31eda2a326b462a98c88410aeadfa563db0c63c60cef68ba4b9d67765df6d29da80b3c2e894781d927598f324348375b SHA512 780af530d0fe109738fa88f77b9ee7b7a63d6b0b56b002be457b31dbe0e8eed661f4fdec3377fc1e243fce0d1b741b2dd776e78c3de4e33c04680012bf076edb
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/xfsdump/files/xfsdump-3.1.9-fix-docs.patch b/sys-fs/xfsdump/files/xfsdump-3.1.9-fix-docs.patch
new file mode 100644
index 000000000000..e8584a0e3401
--- /dev/null
+++ b/sys-fs/xfsdump/files/xfsdump-3.1.9-fix-docs.patch
@@ -0,0 +1,22 @@
+Do not compress changelog during build.
+
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -12,7 +12,7 @@ LSRCFILES = INSTALL CHANGES COPYING $(README) \
+ 
+ LDIRT = *.gz
+ 
+-default: CHANGES.gz
++default:
+ 
+ include $(BUILDRULES)
+ 
+@@ -22,7 +22,7 @@ CHANGES.gz:
+ 
+ install: default
+ 	$(INSTALL) -m 755 -d $(PKG_DOC_DIR)
+-	$(INSTALL) -m 644 CHANGES.gz $(README) $(PKG_DOC_DIR)
++	$(INSTALL) -m 644 CHANGES $(README) $(PKG_DOC_DIR)
+ ifeq ($(PKG_DISTRIBUTION), debian)
+ 	$(INSTALL) -S CHANGES.gz $(PKG_DOC_DIR)/changelog.gz
+ else
diff --git a/sys-fs/xfsdump/files/xfsdump-3.1.9-no-symlink.patch b/sys-fs/xfsdump/files/xfsdump-3.1.9-no-symlink.patch
new file mode 100644
index 000000000000..295533a6a9d5
--- /dev/null
+++ b/sys-fs/xfsdump/files/xfsdump-3.1.9-no-symlink.patch
@@ -0,0 +1,26 @@
+http://bugs.gentoo.org/311881
+
+--- a/dump/Makefile
++++ b/dump/Makefile
+@@ -100,9 +100,6 @@ install: default
+ 	$(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
+ 	$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)
+ 	$(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
+-	# skip symlink when /sbin is alread symlinked to /usr/sbin, like on Fedora
+-	test $(PKG_ROOT_SBIN_DIR) -ef $(PKG_SBIN_DIR) || \
+-		$(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND)
+ install-dev:
+ 
+ .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON)
+--- a/restore/Makefile
++++ b/restore/Makefile
+@@ -114,9 +114,6 @@ install: default
+ 	$(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
+ 	$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)
+ 	$(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
+-	# skip symlink when /sbin is alread symlinked to /usr/sbin, like on Fedora
+-	test $(PKG_ROOT_SBIN_DIR) -ef $(PKG_SBIN_DIR) || \
+-		$(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND)
+ install-dev:
+ 
+ .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON)
diff --git a/sys-fs/xfsdump/files/xfsdump-3.1.9-prompt-overflow.patch b/sys-fs/xfsdump/files/xfsdump-3.1.9-prompt-overflow.patch
new file mode 100644
index 000000000000..60a01f8639be
--- /dev/null
+++ b/sys-fs/xfsdump/files/xfsdump-3.1.9-prompt-overflow.patch
@@ -0,0 +1,14 @@
+http://oss.sgi.com/bugzilla/show_bug.cgi?id=876
+https://bugs.gentoo.org/335115
+
+--- a/dump/content.c
++++ b/dump/content.c
+@@ -6460,7 +6460,7 @@
+ Media_prompt_erase( drive_t *drivep )
+ {
+ 	fold_t fold;
+-	char question[100];
++	char question[200];
+ 	char *preamblestr[PREAMBLEMAX];
+ 	size_t preamblecnt;
+ 	char *querystr[QUERYMAX];
diff --git a/sys-fs/xfsdump/files/xfsdump-3.1.9-skip-inventory-debian-subfolder.patch b/sys-fs/xfsdump/files/xfsdump-3.1.9-skip-inventory-debian-subfolder.patch
new file mode 100644
index 000000000000..643495faa714
--- /dev/null
+++ b/sys-fs/xfsdump/files/xfsdump-3.1.9-skip-inventory-debian-subfolder.patch
@@ -0,0 +1,18 @@
+Do not build inventory/ subdirectory.
+Bug: https://bugs.gentoo.org/692972
+Upstream report: https://www.spinics.net/lists/linux-xfs/msg36884.html
+
+
+Do not build debian/ subdirectory.
+
+--- a/Makefile
++++ b/Makefile
+@@ -42,7 +42,7 @@ LDIRT += $(SRCTAR)
+ endif
+ 
+ LIB_SUBDIRS = librmt
+-TOOL_SUBDIRS = common inventory invutil dump restore m4 man doc po debian
++TOOL_SUBDIRS = common invutil dump restore m4 man doc po
+ 
+ SUBDIRS = include $(LIB_SUBDIRS) $(TOOL_SUBDIRS)
+ 
diff --git a/sys-fs/xfsdump/xfsdump-3.1.6.ebuild b/sys-fs/xfsdump/xfsdump-3.1.6.ebuild
deleted file mode 100644
index a860a52aa858..000000000000
--- a/sys-fs/xfsdump/xfsdump-3.1.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="xfs dump/restore utilities"
-HOMEPAGE="https://xfs.wiki.kernel.org/"
-SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
-	ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 -sparc x86"
-IUSE="ncurses nls"
-
-RDEPEND="ncurses? ( sys-libs/ncurses:0= )
-	sys-fs/e2fsprogs
-	>=sys-fs/xfsprogs-3.2.0
-	sys-apps/dmapi
-	>=sys-apps/attr-2.4.19"
-DEPEND="${RDEPEND}
-	nls? (
-		sys-devel/gettext
-		elibc_uclibc? ( dev-libs/libintl )
-	)"
-
-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
-	epatch "${FILESDIR}"/${PN}-3.0.5-prompt-overflow.patch #335115
-	epatch "${FILESDIR}"/${PN}-3.0.4-no-symlink.patch #311881
-	epatch "${FILESDIR}"/${PN}-3.1.6-linguas.patch #561664
-}
-
-src_configure() {
-	unset PLATFORM #184564
-	export OPTIMIZER=${CFLAGS}
-	export DEBUG=-DNDEBUG
-
-	econf \
-		$(use_enable nls gettext) \
-		--libdir="${EPREFIX}/$(get_libdir)" \
-		--libexecdir="${EPREFIX}/usr/$(get_libdir)" \
-		--sbindir="${EPREFIX}/sbin"
-}
diff --git a/sys-fs/xfsdump/xfsdump-3.1.8.ebuild b/sys-fs/xfsdump/xfsdump-3.1.8.ebuild
index ff2f8d236981..afa4e1df55ea 100644
--- a/sys-fs/xfsdump/xfsdump-3.1.8.ebuild
+++ b/sys-fs/xfsdump/xfsdump-3.1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/sys-fs/xfsdump/xfsdump-3.1.9.ebuild b/sys-fs/xfsdump/xfsdump-3.1.9.ebuild
new file mode 100644
index 000000000000..f1954b101a54
--- /dev/null
+++ b/sys-fs/xfsdump/xfsdump-3.1.9.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib flag-o-matic 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86"
+IUSE="ncurses nls"
+
+RDEPEND="
+	>=sys-apps/attr-2.4.19
+	sys-apps/dmapi
+	sys-apps/util-linux
+	sys-fs/e2fsprogs
+	>=sys-fs/xfsprogs-3.2.0
+	ncurses? ( sys-libs/ncurses:0= )
+"
+DEPEND="${RDEPEND}
+	nls? (
+		sys-devel/gettext
+		elibc_uclibc? ( dev-libs/libintl )
+	)"
+
+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
+}