gentoo resync : 08.08.2018

5 files changed, 195 insertions, 3 deletions

diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 8c79ae6ceaa8..779bfda4bef8 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,5 +1,6 @@
 AUX btrfs-progs-4.15.1-e2fsprogs-1.44.0.patch 1168 BLAKE2B d2ebad85f6f15dfe97fbdce1f32170a14655ec3280ee5720fc6abece9b29c1a60eb3ad7207f396f9a4edd792a9f09928dc396e6906f1d2ce561d5d27ed8266b4 SHA512 de99775ec92dd87ed2bcb29885a18a69f781490bd71a26c0b5536f8b180d8a03ebb4fd52eb8b3939c2f28dcae01bcbddc93c0b7b347f15e5295939f5e5dfe9e4
 AUX btrfs-progs-4.16-static-linkage.patch 1215 BLAKE2B 8bf5d8523859c628e0cc4ea9ed42acaf6a0b1600209b1cd4934d80b6f5cd7c6df5c2e42769dc7e95152d252031eadf84f853d070414d4328c63388eab6671f99 SHA512 1e74dc0d350b30195c4b3b0ceed2a76310518dae1819acfba496c51f3ccf70bbb528f539eebaa96129dae09b7bc2172490eb852e17ccb405bc779e5e983eedb1
+AUX btrfs-progs-man-no-gz.patch 2206 BLAKE2B f195b10aa96230e056b4d5b94019a799cbe9717a1fdb2141a293c3916a929181ea12a1d32da6db7113b888da066463ebd55ae64712d54458cba0c7b654d6487b SHA512 94f0cf810f4f800f40a478595cfd062b0a523cb7538030152ee21d5a0adeceaafa310aab95c119c98309ee606a2ee6d6c4ff7014fe8026d43288ceb04c2773cd
 DIST btrfs-progs-v3.16.2.tar.xz 291604 BLAKE2B 66c19a47062386888209b2bb569cc5db8629446554387af971f5ba13ee49b654b2706fd6ed391115075533e6aa5637c7ebfe87b9abc2fa941739baee9fffe1aa SHA512 7dc0f2f8f0bbddbbf1d4d99854425341c4b3997334c65d7e936bcec1ee5ca880101b8b45498721502857b478edae6237a934c7d4acb735de43c6d8ff35efe53b
 DIST btrfs-progs-v3.18.2.tar.xz 1029228 BLAKE2B be8b3e0151c939135bcac11cdd118b7cafdfefa9d06de4629a0727db781b42dfdfa447265d1b4dafce8711a65ac838b19c38a2a93c0439d92d5b8fb4b4d974f5 SHA512 7fd125eeedabd54178f5198ac09c364b6772125124adcdb2620515a51c331307205ae06ff81375a49ebc62650d537c6f9eed2b63bf1f7e97b9ff047cda8a2cc4
 DIST btrfs-progs-v4.1.2.tar.xz 1123080 BLAKE2B 4b6395080c1456321d6923609544da066bd86806588e5860bc2750162a257a94a64cd4e3fb1362065eaa38a73fdee92f053cd2a26c367fe179aa13f068e8b1d2 SHA512 dd159bcc3adb65efd4f612d75f5a6b30df8ad9fa06ef952dd03dac965256de37eab26f4cc2fb3840178403ccbb7368cae11638e27eadb9b1835b636c4b126e2e
@@ -8,6 +9,7 @@ DIST btrfs-progs-v4.14.1.tar.xz 1926492 BLAKE2B 35575946c1de9cb81f1aed2a5be24331
 DIST btrfs-progs-v4.15.1.tar.xz 1931820 BLAKE2B 00c4b9f6ec2039ad680cd625e5ece1cd306b8eaa4572f262cd2272c9d1e03923834ec7af7e59afc9e931cf95d224aea883cc544ba8e26de03119d85c67f19b64 SHA512 6e6a9799f6716bbf772d5f0c8069579815060db20d30807e12948e7274448bca09a12c385ea05a95afc23722d12067a8d99623ea0091dca8ae75ea646aa84b88
 DIST btrfs-progs-v4.16.1.tar.xz 1980696 BLAKE2B 85854fd025c92bd31c957623b78ad72efd536fc8c9d72cc7ad65b9a435b3d57405208e355a86d95ea46ed0179a04e34c3693c4e465e7d6a8edfacdbd185e1421 SHA512 9f0e8c593a10c1c09749ccc00f470ba44d4357fabca8d89ce5891ab0d9cd70f1356f1c6677288019387a6b3b3746431537da205627791a35955bb8bed33d807e
 DIST btrfs-progs-v4.16.tar.xz 1980420 BLAKE2B 979dffe990ea92f44582fa29f634ba4fa8e75917c9907ae4d4c5a72f6623450b29b6b0f3c40423711bc11856bc7d7775fb134fc5210e092d2c61ebe2165352cc SHA512 3d794f890a7772c27c285410892b9de4c0629f6de6cd96e42d1e25c9263dd519d14428eaba75a3595f2d03a1154ffbbfe6a02449d7527a2ab6a1911a8736358e
+DIST btrfs-progs-v4.17.1.tar.xz 2045192 BLAKE2B cfc696f32ae8f02865206ff0b1f749a5af072b147537e2c6389a4fb7e93e437754b6af23f122722837612a08d86485bcf110e069facb6c5b76f193dc89a6d433 SHA512 90f291e362b640a22b41036351619e7b8a793a3b57d0537e7865edf4b830d6dc57b3051c0aed9e1ff38b602441a20fea7f974ccff789a3b4a622a0ea57756538
 DIST btrfs-progs-v4.17.tar.xz 2002792 BLAKE2B beb63b0dcbd7f84b9ec95338d50c13e410fd967dcee56449328eb40d0ed89def4136675ffc86fc693d961175e74f11bf89f725e101e5cf35e7cbf2e228887d77 SHA512 1d238ea6c75f2493f0c5f3995bcfd592e945e20e407a71d962a8ce534fe829f5aa139c0e2d2cb497435de6ddf5c29f0e9dfb900419cc0c9d91cac3ae8154ee75
 DIST btrfs-progs-v4.4.1.tar.xz 1173248 BLAKE2B 8bf07a3bc3d24a3f641c2dc7a6353f186ebd98f7a633bdbc2689359e6204b3f1db76accee3e648634f319e26b57e6376c13fa31d39413908d0b2308e0ae28d0e SHA512 3086e2e0385d9e14edcfa25e1aee1ed98087dd5b91a66aa450786c932d79841b5c4ee3f9a40b8fdecee0ba1e386196b89679d28e58e4924ce66cd78c5e3c0d4a
 DIST btrfs-progs-v4.9.1.tar.xz 1476524 BLAKE2B 3fdd1c040fdf8083fcf5d4106db22112aaba59dd9a6ab8ad164302ec153a83151fbf88d84181dc849c296bb96ad883d4f7329bff111c67c19fdb814db5073fb2 SHA512 143f5c8863f3b9eff2e4ca2c750bb80ffe62f66d0c15d23e6f5bf75dab0133dcd3ff4d4c722360560de24b73e3da1222f265230d18de06d7bccd85ad2cb9a6a5
@@ -19,8 +21,9 @@ EBUILD btrfs-progs-4.14.1.ebuild 2481 BLAKE2B 3e4db698cb95fdcdb982b424364cced1aa
 EBUILD btrfs-progs-4.15.1.ebuild 2586 BLAKE2B a4f784458b56797d6018ed5bcc84d5270419c3507cc861af002ee7756420e864889414deb713f5f78154d7e0c84bf2ec63e2509ae62cc1b00560f85b37a4a9f8 SHA512 94662ed43680e269ad10be9209b59e5e882839d30ff28e6311420f6298d4e37aeff328ec889b66f661f61bae0b21d0541c79733521dec0b4b8cc0d0c8ab652dc
 EBUILD btrfs-progs-4.16.1.ebuild 2861 BLAKE2B cd4e072ef8183ff769336767957e2b9528b4c9811170f91758cfc296fde24d23077d72cb6fe44af4b75e6ce8510e5f8db2b54545b461a6d358d75fc1705a93af SHA512 edb7fbdc799d29430afb45d6249ff533079d7fe8b60be61e9601fe285a3b332ddce80cd36e50d1a92cfd12be683e57c2ddacffd0b3c52a716903429af3967f2c
 EBUILD btrfs-progs-4.16.ebuild 2915 BLAKE2B e9215110a23394a2aca7a9eb087b37c9d7968c793fe3d8b8f45728c12b84915e26e96dc6b1642469b44d1b00c623951cb08c8c6f663e4428ba708cca48b26488 SHA512 d15f0318d5abdedcc2939cffcf53ded96f32163fb00e24ee4b49891abfd88f5fc9588a767971a711ea13d8a9ed71977798fae1152c2a0821006a8202a3ff4675
-EBUILD btrfs-progs-4.17.ebuild 2861 BLAKE2B cd4e072ef8183ff769336767957e2b9528b4c9811170f91758cfc296fde24d23077d72cb6fe44af4b75e6ce8510e5f8db2b54545b461a6d358d75fc1705a93af SHA512 edb7fbdc799d29430afb45d6249ff533079d7fe8b60be61e9601fe285a3b332ddce80cd36e50d1a92cfd12be683e57c2ddacffd0b3c52a716903429af3967f2c
+EBUILD btrfs-progs-4.17-r1.ebuild 2917 BLAKE2B ca3a8cf3f52a6df6b528b16aa01b9b3259d16e4e00fa268582ced9edd302a7d822f2be0364da0b0c16f1a1c88882199c8e7e4e438a06d5d48194d0e8486df594 SHA512 d3a99cc49e1771fedf29209b3787545ecd69636fb0033744b8e58b1242221be66f4caa80c69466a7e0bce36b3382314491f622f707a4210ca2332ec6e821c208
+EBUILD btrfs-progs-4.17.1.ebuild 2912 BLAKE2B cd9161dd0c7fa433d03020dc951e1bd0a6974fc02bbbf48353f6fea4d2724ced5c5187e6ab050d46dae41027338a9a55a8f97d65eb9899c282c0dcaf488bb426 SHA512 4b27b69c325883fd5728a6efd4fd9110dfa6e013dfd6ad56a447049097108247e62adcceae768980afd15f3a433eed5c041f70331d55495fd52875281019bbd5
 EBUILD btrfs-progs-4.4.1.ebuild 2233 BLAKE2B 3e7ccb59be25264c1b95f7d2a2a21ddeb338508f8b9a9c060decb0ff4999e87bfd67e4e6d2f00d811b818f13ba75d38972235b8f1685d4d072b8473cbaaa6d43 SHA512 85038dfcffd849ffdd62239f275e63a2fc4ce693c140c598c89f3dc19c92fa5b72c61fef27192d46853f3bcf828aa7efb34e74949acbd919cb358e1a20654dcd
 EBUILD btrfs-progs-4.9.1.ebuild 2201 BLAKE2B ae5b75a334cce82b436846179ebfa2dea8c1e61c41636821ec85e07c67c1fcbbbf60ecc6cff41bff77ddb0bae82b8b83c411ceb9f2b765fecb043790305c2bfe SHA512 51c6ab63b8cb3c0d6c99eec8412136a51788307c53eacbef3a81045b9cb093b9aa1c7cf9c2422d66bbcc9b714981927cac681c9838b5851d3311a3d9d2e4e6c4
-EBUILD btrfs-progs-9999.ebuild 2861 BLAKE2B cd4e072ef8183ff769336767957e2b9528b4c9811170f91758cfc296fde24d23077d72cb6fe44af4b75e6ce8510e5f8db2b54545b461a6d358d75fc1705a93af SHA512 edb7fbdc799d29430afb45d6249ff533079d7fe8b60be61e9601fe285a3b332ddce80cd36e50d1a92cfd12be683e57c2ddacffd0b3c52a716903429af3967f2c
+EBUILD btrfs-progs-9999.ebuild 2856 BLAKE2B eb48d619159a59b5e5984fbdf04ef1068ca276f7d348606ca6122684934ef085f43064e1d54145fa6c6d257459feb43a04b01ef89ccd73676073440a724067ab SHA512 2d7107291e4ff1cc82bc9bad3572fc0b5791b593de6901821ce77ec7052f0c9491dc12b94cabcd445d32758d594b7eb2c1bb50f5b8410860ec7eaf9467d55916
 MISC metadata.xml 934 BLAKE2B eb3a4c7fba09e537bcb97c3bdcc70b1cf7adf6c66a60abc7ab977f3d35ab0189ece1eb3994490a0418c3ad513a2896ee8bd19edbcef6f57ff3ab1d2af060289e SHA512 83c68333a33df7b836f3fe90c2dfe09789b8c3ecab7c1573534c37d745d565127ec291a91df400cf83d88ec7c284f1bf1a2f37130ec33b7f5e149f10edd80cee
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.17.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.17-r1.ebuild
index 0936ade75910..b11eba1014a7 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.17.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.17-r1.ebuild
@@ -72,6 +72,10 @@ fi
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+PATCHES=(
+	"${FILESDIR}"/btrfs-progs-man-no-gz.patch
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.17.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.17.1.ebuild
new file mode 100644
index 000000000000..5f71a58e642e
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.17.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit bash-completion-r1 python-single-r1
+
+libbtrfs_soname=0
+
+if [[ ${PV} != 9999 ]]; then
+	MY_PV="v${PV/_/-}"
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha ~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 python 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
+		)
+	)
+	python? ( ${PYTHON_DEPS} )
+	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
+	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+	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
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/btrfs-progs-man-no-gz.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+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 python)
+		$(use_enable static-libs static)
+		$(use_enable zstd)
+		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake V=1 all $(usev static)
+}
+
+src_install() {
+	local makeargs=(
+		$(usex python install_python '')
+		$(usex static install-static '')
+	)
+	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
+	newbashcomp btrfs-completion btrfs
+	use python && python_optimize
+}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index 0936ade75910..9051b02693bd 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -95,6 +95,7 @@ src_configure() {
 		$(use_enable convert)
 		$(use_enable elibc_glibc backtrace)
 		$(use_enable python)
+		$(use_enable static-libs static)
 		$(use_enable zstd)
 		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
 	)
@@ -108,7 +109,6 @@ src_compile() {
 src_install() {
 	local makeargs=(
 		$(usex python install_python '')
-		$(usex static-libs '' 'libs_static=')
 		$(usex static install-static '')
 	)
 	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-man-no-gz.patch b/sys-fs/btrfs-progs/files/btrfs-progs-man-no-gz.patch
new file mode 100644
index 000000000000..aeb187baaf41
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/btrfs-progs-man-no-gz.patch
@@ -0,0 +1,64 @@
+From 0a319cad0f002c2dfd44cffc1de0a26cf270560f Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 6 Aug 2018 11:26:54 -0400
+Subject: [PATCH] Install uncompressed man pages
+
+Bug: https://bugs.gentoo.org/662920
+---
+ Documentation/Makefile.in | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/Documentation/Makefile.in b/Documentation/Makefile.in
+index 184647c4..c4c843cb 100644
+--- a/Documentation/Makefile.in
++++ b/Documentation/Makefile.in
+@@ -37,9 +37,9 @@ MAN3_TXT += btrfs-ioctl.asciidoc
+ MAN_TXT = $(MAN3_TXT) $(MAN8_TXT) $(MAN5_TXT)
+ MAN_XML = $(patsubst %.asciidoc,%.xml,$(MAN_TXT))
+ MAN_HTML = $(patsubst %.asciidoc,%.html,$(MAN_TXT))
+-GZ_MAN3 = $(patsubst %.asciidoc,%.3.gz,$(MAN3_TXT))
+-GZ_MAN5 = $(patsubst %.asciidoc,%.5.gz,$(MAN5_TXT))
+-GZ_MAN8 = $(patsubst %.asciidoc,%.8.gz,$(MAN8_TXT))
++MAN3 = $(patsubst %.asciidoc,%.3,$(MAN3_TXT))
++MAN5 = $(patsubst %.asciidoc,%.5,$(MAN5_TXT))
++MAN8 = $(patsubst %.asciidoc,%.8,$(MAN8_TXT))
+ 
+ mandir ?= $(prefix)/share/man
+ man3dir = $(mandir)/man3
+@@ -86,9 +86,9 @@ endif
+ 
+ all: man
+ man: man3 man5 man8
+-man3: $(GZ_MAN3)
+-man5: $(GZ_MAN5)
+-man8: $(GZ_MAN8)
++man3: $(MAN3)
++man5: $(MAN5)
++man8: $(MAN8)
+ html: $(MAN_HTML)
+ 
+ install: install-man
+@@ -96,15 +96,15 @@ install: install-man
+ install-man: man
+ 	$(INSTALL) -d -m 755 $(DESTDIR)$(man5dir)
+ 	$(INSTALL) -d -m 755 $(DESTDIR)$(man8dir)
+-	$(INSTALL) -m 644 $(GZ_MAN5) $(DESTDIR)$(man5dir)
++	$(INSTALL) -m 644 $(MAN5) $(DESTDIR)$(man5dir)
+ 	# the source file name of btrfs.5 clashes with section 8 page, but we
+ 	# want to keep the code generic
+-	$(MV) $(DESTDIR)$(man5dir)/btrfs-man5.5.gz $(DESTDIR)$(man5dir)/btrfs.5.gz
+-	$(INSTALL) -m 644 $(GZ_MAN8) $(DESTDIR)$(man8dir)
+-	$(LN_S) -f btrfs-check.8.gz $(DESTDIR)$(man8dir)/btrfsck.8.gz
++	$(MV) $(DESTDIR)$(man5dir)/btrfs-man5.5 $(DESTDIR)$(man5dir)/btrfs.5
++	$(INSTALL) -m 644 $(MAN8) $(DESTDIR)$(man8dir)
++	$(LN_S) -f btrfs-check.8 $(DESTDIR)$(man8dir)/btrfsck.8
+ 
+ uninstall:
+-	cd $(DESTDIR)$(man8dir); rm -f btrfs-check.8.gz $(GZ_MAN8)
++	cd $(DESTDIR)$(man8dir); rm -f btrfs-check.8 $(MAN8)
+ 	$(RMDIR) -p --ignore-fail-on-non-empty $(DESTDIR)$(man8dir)
+ 
+ clean:
+-- 
+2.18.0
+