sys-fs/xfsdump: version bump to 3.1.6

3 files changed, 55 insertions, 13 deletions

diff --git a/sys-fs/xfsdump/Manifest b/sys-fs/xfsdump/Manifest
index 8e429bfb..7fc20d0b 100644
--- a/sys-fs/xfsdump/Manifest
+++ b/sys-fs/xfsdump/Manifest
@@ -1,6 +1,7 @@
 AUX xfsdump-3.0.4-no-symlink.patch 721 SHA256 b3ccccfce2b7f36263a8b3611724560ae768a3371dcc6e19045abae8df8052a3 SHA512 8b8feddfbdd76bebe61a8d06e174f5bef6edd05d0ce3b96731c234f58f36c73182e411a6f7b30f4e2bbc48b13b675edaf9ba30434e414b2bf2c7dbf431c1b819 WHIRLPOOL 576a5f0324ac20b80fe946f1b0390b9e70860b9f350811e41c7ccbbbb06ef8439ca1946b4d7db88b2d106ad4d67b9bf82cb46636e52d362b304c6d78bb35f142
 AUX xfsdump-3.0.5-prompt-overflow.patch 333 SHA256 80684664bae903256dd1b6355da9e88b727b8b42a559a6131aa2d24a6ce08428 SHA512 73f2a2f29b1f0e8585f49ac510b4da18deebbb799e428519fedf936f46dbd602c1cf6d300fd4e416ae4e6af1e6ce726798dec710c01d73c263782cb01ab21ba2 WHIRLPOOL 33e53b9b2690791df7374e8c7b9ff893850e076f936be86c2164798ae98ba33b35d9f2955c060d487688cb6dc9818591a05e1a74ce0792c40afd5d5989e514c7
 AUX xfsdump-3.1.4-compat-musl.patch 1023 SHA256 2983ea5405e6ebee2a595345b7c519f48f1202d8d557daff6f709ced65759801 SHA512 350638c7a214f565ea1ffbe7753ed01e8d6cee873f73a45c58fc99d49122099d6e83c55fe2966b5595bcffcc2bdb895d765dfa6874f02d2b4d0d1b75e75904f7 WHIRLPOOL 34178b7e079d6125031e677e2090a7409695ab3dccfdfa76b98c7111c3ab16687fc6e6f92aeef85157644ea04815eab3070deb4c87f49360cebc3f06d50eeb72
-DIST xfsdump-3.1.4.tar.gz 848188 SHA256 570eafd0721515bdd79cb0e295b701d49cdf81e71a0a0ff0df6d4c5cc1960943 SHA512 e82885ad6b3f1d81c1cdeff56714b73651e1c74eb4ce71574875ec0bb69b3fe707b40f85f0766b21ba589d13364ecfc0bad657a9b15c428cf821f926c3d66b25 WHIRLPOOL 5677000929f260b391743207a865c7529b788db46806a62c62bb6917025194913609cc804ead23314988f44853abc57f3c86ee22d2bde365697a35b0a7e3b607
-EBUILD xfsdump-3.1.4-r99.ebuild 1039 SHA256 fb5153e073b71fdc2ada1755e2a978d792327cd3b18c198002c7a7c0326e2f24 SHA512 61d616a66f0f0245fcfab6f5aaeb4818895089bedfca0a60246f355325d6da2bbf8679b824c53b2c3f6396ca2c35e73b1883a448fafb134529db485fbe41cb39 WHIRLPOOL 8f7655959ec2ab41f14e7f7fe6b23b2060b69b747efbfe64931ade60bfa9e02a1c1c10a451dcc42f2a5984e415d3eed5e7afd867ecec7eb6240bc1d491f056b8
+AUX xfsdump-3.1.6-linguas.patch 975 SHA256 16152976e972f32921a4b34636736f041d49d656111b43aee31b9c83da582992 SHA512 2fe49c6985eca950890d952b6e33c7f9d7687dfaeb52077895e92994d930f0026bb8fdc31ad3f31d072b8a5023a9e0e3d99c301cb34802d7657a93b964aa6c8e WHIRLPOOL c2c8d255fe0d01407bf1f5282c9f854794a521d165945944cbf092517745a94907fab1de7c5a11dcb7090eaac6aed5fc020574aa81d03f222c2df87a74c90320
+DIST xfsdump-3.1.6.tar.gz 848698 SHA256 7f78c11ca527477d90e5e62b0778f3ad96f2b71c19173044e9aca9515fff42d0 SHA512 6d8eff10c65e0a0893525590953ccb7ec0095ba528725ffe3f18260e6cb8f66dd3945c60477500e84421a9ed57fae9e8f0f25c3c0900be3671f30ca6951ed5e7 WHIRLPOOL 87182e97a5676be6ad36cf74e37d9ca312d742d20eb5396917a156842fe62a23c582e16862fb384fe7706097d9f0c7a6a8faced06fec0a999ac06ceb426eb7e3
+EBUILD xfsdump-3.1.6.ebuild 1500 SHA256 25b81f03d481458ac1eadbe986611b39e5d925eea5efb10baf2489413b0e75b1 SHA512 b38a8c0c176ff7278c14bfd9de5550739c871c73dd61d2abffcf4963f7cbfbd8dc298989381f58f88c3b7c61778e4d954ea31168358583b0eecc8fedc86743df WHIRLPOOL 7d3bfe0f5c108cff713ab3b45cdfbabfbf80e073a01e91c1b851f56f201aedc2449d467d856892be432b08f1a317639b597e7c6b24d745f1b31376a801e54344
 MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/sys-fs/xfsdump/files/xfsdump-3.1.6-linguas.patch b/sys-fs/xfsdump/files/xfsdump-3.1.6-linguas.patch
new file mode 100644
index 00000000..5d5e54e6
--- /dev/null
+++ b/sys-fs/xfsdump/files/xfsdump-3.1.6-linguas.patch
@@ -0,0 +1,32 @@
+From e12813b9d0883e02cc121ea503f4bff5fb67e9ef Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Fri, 8 Apr 2016 16:41:31 -0400
+Subject: [PATCH xfsdump] po: respect LINGUAS build setting
+
+It is common gettext practice to limit the translations a particular
+package will include by setting the LINGUAS environment variable.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ po/Makefile | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/po/Makefile b/po/Makefile
+index 6d40324..48a19c1 100644
+--- a/po/Makefile
++++ b/po/Makefile
+@@ -6,7 +6,10 @@ TOPDIR = ..
+ include $(TOPDIR)/include/builddefs
+ 
+ POTHEAD = $(PKG_NAME).pot
+-LINGUAS = de pl
++# If the user has requested a specific set of translations, only build those.
++SUPPORTED_LINGUAS = $(patsubst %.po,%,$(wildcard *.po))
++LINGUAS ?= $(SUPPORTED_LINGUAS)
++LINGUAS := $(filter $(SUPPORTED_LINGUAS),$(LINGUAS))
+ LSRCFILES = $(LINGUAS:%=%.po)
+ LDIRT = $(POTHEAD)
+ 
+-- 
+2.7.4
+
diff --git a/sys-fs/xfsdump/xfsdump-3.1.4-r99.ebuild b/sys-fs/xfsdump/xfsdump-3.1.6.ebuild
index 29996fb5..5807035b 100644
--- a/sys-fs/xfsdump/xfsdump-3.1.4-r99.ebuild
+++ b/sys-fs/xfsdump/xfsdump-3.1.6.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI="4"
+EAPI="5"
 
-inherit multilib eutils
+inherit multilib eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="xfs dump/restore utilities"
 HOMEPAGE="http://oss.sgi.com/projects/xfs"
@@ -13,23 +12,32 @@ SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE=""
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 -sparc x86"
+IUSE="ncurses nls"
 
-RDEPEND="sys-fs/e2fsprogs
+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}
-	sys-devel/gettext"
+	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
 	epatch "${FILESDIR}"/${PN}-3.1.4-compat-musl.patch #549116
 }
 
@@ -39,7 +47,8 @@ src_configure() {
 	export DEBUG=-DNDEBUG
 
 	econf \
-		--libdir=/$(get_libdir) \
-		--libexecdir=/usr/$(get_libdir) \
-		--sbindir=/sbin
+		$(use_enable nls gettext) \
+		--libdir="${EPREFIX}/$(get_libdir)" \
+		--libexecdir="${EPREFIX}/usr/$(get_libdir)" \
+		--sbindir="${EPREFIX}/sbin"
 }