gentoo resync : 06.01.2018

3 files changed, 108 insertions, 3 deletions

diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 9cf85c74fa8d..210968d1173f 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -11,6 +11,7 @@ DIST btrfs-progs-v4.11.tar.xz 1508580 BLAKE2B ff7fb9888193853883f230c884869aef07
 DIST btrfs-progs-v4.12.tar.xz 1587604 BLAKE2B da75d89c34c6500c32dc4deee1e77ef61dd3287842154f34cc9f8aca3dd53dc08c24ed30c2307f01cbd8d457317466c118fe111b4ad4def4261021ef76336935 SHA512 6a9b13241edda68c866249874189aafb121f73515bf71e46f1f574eff858405d9ce22a251a07c6437f0dc21ca6ee55b4b57c15b431ce63faa3c16d1c8112616e
 DIST btrfs-progs-v4.13.2.tar.xz 1673732 BLAKE2B 995c364a594d075dff088247cc8f745a59a6bc2beb7f709693269b4985aeee95c0b87881ecb02793a10a0c965f224a30410e1227b8e37ab847fe1d827318c889 SHA512 50db13868ed43433ec9b655825767e6e76036f407edc0caffecd4b371baf7d817575c2f25c77fe3d5e741bb52d57757c6c762de0c00cbefede615358a803d80a
 DIST btrfs-progs-v4.13.3.tar.xz 1674084 BLAKE2B 1ce0747e776253a8e93613705e4aa3bc704367b54939e010e2dc69a114760041b5d85b6a7370f6919010f694792dda280a1891c9f6193ad95c98317b5730784b SHA512 6db18197ab48a43da5212ead2fdd4a6d0c9eb035cd5ce40fdb5e6e39a69dd118aa0112246df8cb4a339665c20c39479d630e03ccc1ffea3017646695e1c5f833
+DIST btrfs-progs-v4.14.1.tar.xz 1926492 BLAKE2B 35575946c1de9cb81f1aed2a5be2433149b6aae5e8602cef4c892f7e5fa1160e4b8bbed354bf36c90d3a6a4d6856b57cb10e632a9fba47b1f0b312098a6393da SHA512 e01a52a84bc0de81e7173fda46c12fbd451b5117014008033e16c7bf48165065c6362d812a95ade17c01f62f66755b4c7ab11dd22804eb3bdfc56346a161e2a6
 DIST btrfs-progs-v4.14.tar.xz 1697584 BLAKE2B 8d5aeb251ab6ede72507db926fb21afddbfc87a9a25d330bcaa933971fc19831b9c9f452bfead836bfaeb0cdf21b0d09d8eb6f98e5be0424566f0d7b4c190937 SHA512 11171e6730f4aa102bdb4cd405da2d4c55e2c102fec4cc6d3135df516c78af1c34fede722a1677bd9c638b47e77085e005b29333ae70b98771501e32628890f7
 DIST btrfs-progs-v4.2.2.tar.xz 1143760 BLAKE2B 4a4aa9c55e03548e361308682dd24da96d98f32a5867fb1f15112f91f9911d59a7d5b4386f7585a1ade59b95a45bc149c0566746dbd7c4503c25bd55983dac3d SHA512 2ad23546b3bb421faad1f67da37566b6ae1887c5340c0f1d06ca59fc0cd0fb1060d92e74e36ba7bfd85b0aff30811525654cd03b7d3570b0b51c2d8e2d6d9a76
 DIST btrfs-progs-v4.3.1.tar.xz 1184416 BLAKE2B 395fd772a757f9f8de96ff0f3df991678b560c88f120b51d612fcaef79f760a347c94c66d0156724d79e2aaad0312119d3cdece22c4f50a89566e664ea5b9d01 SHA512 661c7c05ee3527cc34f3aa08e88e252e6e836a86752f7e607e3f6dc0a9a861d3bc645a6fa0a5af5f6abfe4f3f2f7e193cffc2bb1c53595e0b7f99c3ff59daeff
@@ -32,6 +33,7 @@ EBUILD btrfs-progs-4.11.ebuild 2201 BLAKE2B ae5b75a334cce82b436846179ebfa2dea8c1
 EBUILD btrfs-progs-4.12.ebuild 2201 BLAKE2B ae5b75a334cce82b436846179ebfa2dea8c1e61c41636821ec85e07c67c1fcbbbf60ecc6cff41bff77ddb0bae82b8b83c411ceb9f2b765fecb043790305c2bfe SHA512 51c6ab63b8cb3c0d6c99eec8412136a51788307c53eacbef3a81045b9cb093b9aa1c7cf9c2422d66bbcc9b714981927cac681c9838b5851d3311a3d9d2e4e6c4
 EBUILD btrfs-progs-4.13.2.ebuild 2477 BLAKE2B e4e145b92fa24e5c02e6a85c4de7211326f5166a81318ee557c91b7b2aeb2ad1321e226929c24dbf38ffd80fba0e560134166a42415d4dd3fa3308bcc536156b SHA512 c6309b90e764b71c40d7beb29086faace1b144a748385a83be472c251c354f5d95399c56e56615d530330f2cd1804c70b98d6f8968b63b89026fee5c9372c3ce
 EBUILD btrfs-progs-4.13.3.ebuild 2389 BLAKE2B 9657578c6e58f09496d139c228539b3bb849a9410fa0b8559fc04336e6ee7578ef4b471cf07b9b2c9508c9dcd51a3971bd0eb0f6b8ba4388d7df7c79a9055eb1 SHA512 e48fbe435e195718a5ff8e129712512c8c3627e8aca8a1217e691fdcb2d6933d4f08d368cb3b6332e2fdca2a9b1da38517b14142cb33b435f8e200580e5c432e
+EBUILD btrfs-progs-4.14.1.ebuild 2481 BLAKE2B 3e4db698cb95fdcdb982b424364cced1aa3087eeb77f2d5e86f51995dba2c85b557c5546f659798d593e36cc03307d436a11a98ab768bce47ffa186c7a2da6d2 SHA512 01032adb19e4ebef2bc923c16284274b5177701551c578e8813596f13e938b5504b1735e438f4633cc9131a2e20decd6e5bc58a45b3955f08b7d9c9144f60512
 EBUILD btrfs-progs-4.14.ebuild 2481 BLAKE2B 4bf035eacc95fcab5c1a495cee562afb28d0130e94b1fb338b22ae19dfada51a52d75e032a35314e855062410c207840e8597902d8684f43e28fceb14dd38be1 SHA512 f5a0b926e555ebd00a97ddcf8375c1415b94fedda038c6cac7403a7e096a8ea3fef553c7407b0a39911e7a7aa362b046e6c6bdb4de5bbc2565c5100f44f97c58
 EBUILD btrfs-progs-4.2.2.ebuild 1891 BLAKE2B 6164d918d4452a4d91ee812a84fe7a2859fd303396ccacde0fa2dcd5fe7ed1e974bee47e9deece3b621e62d8176379d45b12c2ce6b52497d406425781cb35a3a SHA512 9f0771068eae7ec9bd54545d1f7d1146e9c1a221599dacb40c15106f73ea15bded433adc13dda8d2f7e302b2b4a989fd3a4442904ab222901eab70652e43d28c
 EBUILD btrfs-progs-4.3.1.ebuild 2260 BLAKE2B 5ee8e3850dbb83c42e84754981fe549ee201899ab12e7f74c69bf140a3cdb38ff4d1de88f9365633c80d5e9a5ca96917f4f55755fce359cc633be4eaf9a6e9dc SHA512 8e435e7c541dda1b45e1a0ea4af82143688101bcf5cc3afc83c38429f2c300420bc72f56460dd237cce1cda7c0c84de8fa552cac4b2fa6d5052f7388b5041727
@@ -41,5 +43,5 @@ EBUILD btrfs-progs-4.6.1.ebuild 2196 BLAKE2B 158f01418ef2ec0e2050f455b0abeb721dc
 EBUILD btrfs-progs-4.7.3.ebuild 2201 BLAKE2B 89321272067fbc533b3045a079b412edad021ffe5a3f73d5e2c44b24e20a42120114814aa08fa42b57aca8d599c3f00b7a3a4476b0019a0ac4d68a2e6297f533 SHA512 a2506e9d43d8b408d5d16bafdbfabe4f5ca6861a77e079dad62580418680a34dfb7ccb7ba847b1f05accb8afb8e624c5aeb86a940f354250dc8006884d9a47f1
 EBUILD btrfs-progs-4.8.5.ebuild 2201 BLAKE2B 89321272067fbc533b3045a079b412edad021ffe5a3f73d5e2c44b24e20a42120114814aa08fa42b57aca8d599c3f00b7a3a4476b0019a0ac4d68a2e6297f533 SHA512 a2506e9d43d8b408d5d16bafdbfabe4f5ca6861a77e079dad62580418680a34dfb7ccb7ba847b1f05accb8afb8e624c5aeb86a940f354250dc8006884d9a47f1
 EBUILD btrfs-progs-4.9.1.ebuild 2201 BLAKE2B ae5b75a334cce82b436846179ebfa2dea8c1e61c41636821ec85e07c67c1fcbbbf60ecc6cff41bff77ddb0bae82b8b83c411ceb9f2b765fecb043790305c2bfe SHA512 51c6ab63b8cb3c0d6c99eec8412136a51788307c53eacbef3a81045b9cb093b9aa1c7cf9c2422d66bbcc9b714981927cac681c9838b5851d3311a3d9d2e4e6c4
-EBUILD btrfs-progs-9999.ebuild 2475 BLAKE2B 5a669628c68cefda426e817eb1d7d47829718e2d35c805881c6bac09698af31c42a66cc36bd389514ab7493002a16184f2415fc64662495e272d22fe2e9ec6a0 SHA512 3dea7f1271f488cc6ba40f2f394725386ed205fb0ae0db112d92fb66bbc7dff791e5f90a03b7d48c5a9b85f9131a607e998e391e93e61e27143cdf288d386e0b
+EBUILD btrfs-progs-9999.ebuild 2481 BLAKE2B 3e4db698cb95fdcdb982b424364cced1aa3087eeb77f2d5e86f51995dba2c85b557c5546f659798d593e36cc03307d436a11a98ab768bce47ffa186c7a2da6d2 SHA512 01032adb19e4ebef2bc923c16284274b5177701551c578e8813596f13e938b5504b1735e438f4633cc9131a2e20decd6e5bc58a45b3955f08b7d9c9144f60512
 MISC metadata.xml 810 BLAKE2B 0f36bf0c2c7f161669d8511683a6947a25d5a5ac7e79389e1f189d8bff70b6f0ac1095712a6646f1958fadb27a8b0d7b58b146bc300ee6e8b5b3d63e3acb7917 SHA512 9654d8d242c503b6a64bb01274407e92afb661db96ccd0831fef2f41ae03a22b950dcc11eee57605d1f7ca4ff38613803542486e12b20780e1fce9f642e64852
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.14.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.14.1.ebuild
new file mode 100644
index 000000000000..783e23d3203d
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.14.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+libbtrfs_soname=0
+
+if [[ ${PV} != 9999 ]]; then
+	MY_PV=v${PV}
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
+	S="${WORKDIR}"/${PN}-${MY_PV}
+else
+	WANT_LIBTOOL=none
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
+	EGIT_BRANCH="devel"
+fi
+
+DESCRIPTION="Btrfs filesystem utilities"
+HOMEPAGE="https://btrfs.wiki.kernel.org"
+
+LICENSE="GPL-2"
+SLOT="0/${libbtrfs_soname}"
+IUSE="+convert reiserfs static static-libs +zstd"
+
+RESTRICT=test # tries to mount repared filesystems
+
+RDEPEND="
+	dev-libs/lzo:2=
+	sys-apps/util-linux:0=[static-libs(+)?]
+	sys-libs/zlib:0=
+	convert? (
+		sys-fs/e2fsprogs:0=
+		sys-libs/e2fsprogs-libs:0=
+		reiserfs? (
+			>=sys-fs/reiserfsprogs-3.6.27
+		)
+	)
+	zstd? ( app-arch/zstd:0= )
+"
+DEPEND="${RDEPEND}
+	convert? ( sys-apps/acl )
+	>=app-text/asciidoc-8.6.0
+	app-text/docbook-xml-dtd:4.5
+	app-text/xmlto
+	static? (
+		dev-libs/lzo:2[static-libs(+)]
+		sys-apps/util-linux:0[static-libs(+)]
+		sys-libs/zlib:0[static-libs(+)]
+		convert? (
+			sys-fs/e2fsprogs:0[static-libs(+)]
+			sys-libs/e2fsprogs-libs:0[static-libs(+)]
+			reiserfs? (
+				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
+			)
+		)
+		zstd? ( app-arch/zstd:0[static-libs(+)] )
+	)
+"
+
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+=" sys-devel/gnuconfig"
+fi
+
+src_prepare() {
+	default
+	if [[ ${PV} == 9999 ]]; then
+		AT_M4DIR=m4 eautoreconf
+		mkdir config || die
+		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
+		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
+		ln -s "${automakedir}"/install-sh config/install-sh || die
+		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
+		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/sbin
+		$(use_enable convert)
+		$(use_enable elibc_glibc backtrace)
+		$(use_enable zstd)
+		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake V=1 all $(usev static)
+}
+
+src_install() {
+	local makeargs=(
+		$(usex static-libs '' 'libs_static=')
+		$(usex static install-static '')
+	)
+	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
+	newbashcomp btrfs-completion btrfs
+}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index 5ecd90460254..783e23d3203d 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ libbtrfs_soname=0
 
 if [[ ${PV} != 9999 ]]; then
 	MY_PV=v${PV}
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
 	S="${WORKDIR}"/${PN}-${MY_PV}
 else