[gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/files/, sys-fs/btrfs-progs/

[Lars Wendler]

commit:     5d79fb1ed24a944946edfeff245699f743060208
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 17 08:22:30 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Oct 17 08:25:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d79fb1e

sys-fs/btrfs-progs: Removed old.

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 sys-fs/btrfs-progs/Manifest                        |  5 --
 sys-fs/btrfs-progs/btrfs-progs-4.13.1.ebuild       | 93 ---------------------
 sys-fs/btrfs-progs/btrfs-progs-4.8.1-r1.ebuild     | 95 ----------------------
 sys-fs/btrfs-progs/btrfs-progs-4.8.3.ebuild        | 95 ----------------------
 sys-fs/btrfs-progs/btrfs-progs-4.8.4.ebuild        | 93 ---------------------
 sys-fs/btrfs-progs/btrfs-progs-4.9.ebuild          | 93 ---------------------
 .../files/btrfs-progs-4.8.1-fix-ioctl.h            | 36 --------
 .../files/btrfs-progs-4.8.3-fix-ioctl-again.patch  |  9 --
 8 files changed, 519 deletions(-)

diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 23e3fdee6c2..77446d15741 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -8,7 +8,6 @@ DIST btrfs-progs-v4.1.2.tar.xz 1123080 SHA256 62db60c6a0868afb6302112cea54c75687
 DIST btrfs-progs-v4.10.2.tar.xz 1508304 SHA256 ed09df670338562a52d9e7d76a362cc932737e2a67adca4c09395374be1de60a SHA512 1a21ca29d03c8d0e697ce075b841e38b021771a67da20087c80ab84bb87c5f56ea80695f9b2a25a2a159fba8b01d74a364435f5462545ec00ebd6f335d3fcd6f WHIRLPOOL 621f1af0273ca3b27e63e20b8a6ec9a3f6519f67fb669f1295be7f742b68362f3c7295be5e4d12ce48e9bc5753d1099b03e52b71fdf878d02664cf1e59720de6
 DIST btrfs-progs-v4.11.tar.xz 1508580 SHA256 e17a68cc52a27d905b715445e91ddbaa4d42de4847d54836d6ed21e012dabf0e SHA512 914fb415f7ddec4d3ee203b67cde135dcc4c62d3e25e76e920b9a0ee5099d1cf75d21611795ce5aee78908ed466dc74b0b7ab2e036224b7e357e421f13e4f6c8 WHIRLPOOL 54b8d129ab0bd931dd7dab3c00c0b33cfeabaeaa9f9526d6a48adefc2b58537e8e8302538a7072820d21646360979f3b7fe78049f0244068f46cf6f7eeb6d18e
 DIST btrfs-progs-v4.12.tar.xz 1587604 SHA256 917710c84a9d529c92038390ddf8ace19ad409f61cdcf93c38ccaf2678472ece SHA512 6a9b13241edda68c866249874189aafb121f73515bf71e46f1f574eff858405d9ce22a251a07c6437f0dc21ca6ee55b4b57c15b431ce63faa3c16d1c8112616e WHIRLPOOL c929a5f453af005004b858873b3f5c78c8d51372644b3611cf2fc4900c45fee7a6153cf2f09fdf16336928b2427160c4393697751429dc4f1a405721f9ea70e5
-DIST btrfs-progs-v4.13.1.tar.xz 1672248 SHA256 e04f80fe55429a8a2541ab01951bb29a12c071d7ce8baa318b8feb49f3de8ab2 SHA512 4fabfaa36b67afcc21a3917bd1faae106a82a2bc97a3670dd054a33490ae60e63512a28af5fe27b016de1e7213809f89e096c39a082f0a5d4e48f8e377eba7ba WHIRLPOOL 0adda0f7fa4bd45c433ae988dbeb64774cd0af6e690c9895fea54aca5a71e7d93b2d314f6e09e827b26cbe441e44ea428cb41eac2a6345f04008351d7404c8e9
 DIST btrfs-progs-v4.13.2.tar.xz 1673732 SHA256 75c7331f1306495dfffabe542ef6c5539808f0cdaebdf14fa8b7ab09c59448bd SHA512 50db13868ed43433ec9b655825767e6e76036f407edc0caffecd4b371baf7d817575c2f25c77fe3d5e741bb52d57757c6c762de0c00cbefede615358a803d80a WHIRLPOOL c3dd7b8ee7c3e1b62885b2e1ad8f0bc4e72b24fd55090f43c7e95eaa2517c51c71d299c4f2450267721d41f1fa792ed48896b8e17215b65d50e61c6a1583cd98
 DIST btrfs-progs-v4.13.3.tar.xz 1674084 SHA256 805bdb0031c21a0a5d2ba295a8c9bdd8ba831a68c3fa801aab85677ec902d783 SHA512 6db18197ab48a43da5212ead2fdd4a6d0c9eb035cd5ce40fdb5e6e39a69dd118aa0112246df8cb4a339665c20c39479d630e03ccc1ffea3017646695e1c5f833 WHIRLPOOL e54a739862f26f2648def2fa0e8fc1d49f7a70f2dd498d29e47b0d74fa826db961ade323cb5039728b42d28a383a0949494aea584a4d53f4abfce449bf6f10cd
 DIST btrfs-progs-v4.2.2.tar.xz 1143760 SHA256 5d87e4ebb2a3a288c167791e489bfa484034d185c704870c484cb0771d921316 SHA512 2ad23546b3bb421faad1f67da37566b6ae1887c5340c0f1d06ca59fc0cd0fb1060d92e74e36ba7bfd85b0aff30811525654cd03b7d3570b0b51c2d8e2d6d9a76 WHIRLPOOL 5051f232bf5d6c2d19bc0fba9f2653546fc09000279863637a7ab44ff5c8bd107e5307aef3d2fbc7113581df3c224965f882045153eb9fa10da5b34cc4318188
@@ -17,9 +16,5 @@ DIST btrfs-progs-v4.4.1.tar.xz 1173248 SHA256 9964e3ae4fb64692e109ddd733de4554e7
 DIST btrfs-progs-v4.5.3.tar.xz 1207344 SHA256 e6e79608d81ccda62ad877c20e4d0868dc68e570ba42f4c94e66bf5e8ee0ebd3 SHA512 7bb15728577cdc56773e87583196ed36e15a4c417f03816e8a101506070e667b8e51f66fcf98095ddc20c9ce10da0b78de1171e9c8a6cb20a4811fd35d508961 WHIRLPOOL c938f35d4ec74beeb41e8ab56632bb33c7500f283cef3d59ff97494ab957be9f2e309feb80e383c29417ba78d7e2a89704faf6fe2558a06852944790f434172c
 DIST btrfs-progs-v4.6.1.tar.xz 1281240 SHA256 4ed15ccd0fa730c13e52fb930141a0d3f300f2bb34cb1366b32d093eaaa18919 SHA512 7bdf350a3051326f495e1694e11b27b830dce219ddbb0a805f1916f5deecdbd5332c3cd8abe36296832e196eee45e4cdc4695e99e186a51b85ec8b9f6ff5381d WHIRLPOOL d7c06549947278002c4de91f47b2b85d93a714bf1e984ce2b4d7321bcb8b0a11dd60cd84e070c382f61e67e919d3cbc88a723aaa5ab42806ecbe65ae01c4ae34
 DIST btrfs-progs-v4.7.3.tar.xz 1341512 SHA256 90cd6f0ce5a8bed5fcd6ea8a70d81de4a038163035d48a9ae0339bbf51df771c SHA512 2609bfa90483a14daf33b77f4f1560ca75de602ad3d4ce705a95f1aebbec016574db91b0287287622e49d199507c90243eb6739bb5719a5f99557f8f3e8e2c1a WHIRLPOOL 819879310484ba70d96f5492aca5463e5ba0c646dbd5e4b4ca797b76c754a352753641ef4d0f4ffe0109d07c72d99be5a2b1c749b1f03225cd582a83c9cf0d5a
-DIST btrfs-progs-v4.8.1.tar.xz 1348472 SHA256 836e6d707abfc155319c072f53d296261cbd17f0e03484a3694b8af48640db83 SHA512 43738c21b7c066fc13af742f61aad54572d5c293acb98915a2aa0ba6ec0e32022bf663155d77435d1179f05fb75b97bd0aba28da2ade04b596ef5348e8b5415c WHIRLPOOL d4b1e4c5ca0c826394b5d95ea92e27f0c625a0f5c940bdd88e310a7328f4ad77b4060f5f61d4b05ef03705fe605591dc7ae6c9368f37aa73b69fedee0ed0d448
-DIST btrfs-progs-v4.8.3.tar.xz 1396920 SHA256 c1a60c317d2fcaf8420779d2d0717ae53882c2bc22bc44e3bdcd5efb7ca68ef2 SHA512 bf6ed0269823bfe385659f652bcc18c76c3cac3ca6f04f76f1ebe1fd5e2212884edeed7f5649979f8d83745256e9555c038eb6713b262759ee424bb9f6f0f4ac WHIRLPOOL 4a4b20308e08ed85f73d70e95f0f971965a7e8abae35e12769a4c697f0f1502cc070240b5319579adf3f8565cf669acdf4b5aa32dfca77148b8f23bd97349f76
-DIST btrfs-progs-v4.8.4.tar.xz 1466164 SHA256 bf26ead666c337a62a74bc9ec7f8dd9ee200e60e5fe5289967d53328eff261c5 SHA512 f53a0bfcbeaa43b00e09b811b1e6eb5159cd8a4c78ddb26a5ce87975d203794cf6d0a026d4a646bed0266fbc2bec1833fe48a3ff3850ea27bc7a19d7aa7ad54b WHIRLPOOL caf015a1ab9411ef5ddfab50a32d11b678b6b931cf871a9bca88925a500612cb5718e8cd411cf39b6e94b2544e222545d24c89470b04545501d87b986ebf3e84
 DIST btrfs-progs-v4.8.5.tar.xz 1466688 SHA256 d247b1c022aca5def3415bfa51e00c566cce36660a3ee517d4b6a1af911a08ef SHA512 497c221fe329febc7cca777e347e8ab6ebb368070d35cb5122214bcf928eb2e7e854f7b0af5bc846f0d34ad84dfb33b372d24bf947ca0b15cb83291c390c664b WHIRLPOOL 3786ddbac699a22359911e89c989e58da7d7b6700f5380560645b6abc0cd46703bf512f8077c64b84fd5552915de1b620c7fe9aa0d96def025e7a3432bdfcd2e
 DIST btrfs-progs-v4.9.1.tar.xz 1476524 SHA256 464a9bfd2b5eda76b0246ee0a4043f4de8d17c10312bc8b84abc5fbf9317fede SHA512 143f5c8863f3b9eff2e4ca2c750bb80ffe62f66d0c15d23e6f5bf75dab0133dcd3ff4d4c722360560de24b73e3da1222f265230d18de06d7bccd85ad2cb9a6a5 WHIRLPOOL 34aa6010ad38b2bd88f22e4308dca587305a9f4c7c0053b60a2cb5d4a7fddcb92ca384152fcffe9c8bfe476de046dae0ab88093f9c9c4a805ebba07d3d8837e2
-DIST btrfs-progs-v4.9.tar.xz 1475844 SHA256 e227baeb4652e83aab33135ec29b30339e2c99bba67d56fb589cd8a6b642c8a3 SHA512 e39abf3808dd8b7ac2424cbf240cec5da12fb3e5d2eeaa2ed6a0e4b7d8bdc28a4c92891236feff70b801ce1e78b65370e05aed252890a076c0b1b9bbfd020f46 WHIRLPOOL 1dc2c98d2aec9dd41a661c6f03d5b0ca4d8e80f53f5951c5071a3fde67ebb72f97ecf89ee3448185d2c33c65f60a6de61e983169fabdf6284a6ef40c770573e6

diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.13.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.13.1.ebuild
deleted file mode 100644
index 397d271d38c..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.13.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 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="~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="git://repo.or.cz/btrfs-progs-unstable/devel.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert static static-libs"
-
-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=
-	)
-"
-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(+)]
-		)
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		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)
-	)
-	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-4.8.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.8.1-r1.ebuild
deleted file mode 100644
index 2d14380ad90..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.8.1-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 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="~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="git://repo.or.cz/btrfs-progs-unstable/devel.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert static static-libs"
-
-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=
-	)
-"
-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(+)]
-		)
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-PATCHES=("${FILESDIR}"/${P}-fix-ioctl.h)
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		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)
-	)
-	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-4.8.3.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.8.3.ebuild
deleted file mode 100644
index 8a75a9fca11..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.8.3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 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="~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="git://repo.or.cz/btrfs-progs-unstable/devel.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert static static-libs"
-
-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=
-	)
-"
-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(+)]
-		)
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-PATCHES=("${FILESDIR}"/${P}-fix-ioctl-again.patch)
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		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)
-	)
-	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-4.8.4.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.8.4.ebuild
deleted file mode 100644
index fa7bc3eb6b3..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.8.4.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2016 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="~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="git://repo.or.cz/btrfs-progs-unstable/devel.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert static static-libs"
-
-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=
-	)
-"
-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(+)]
-		)
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		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)
-	)
-	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-4.9.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.9.ebuild
deleted file mode 100644
index fa7bc3eb6b3..00000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.9.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2016 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="~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="git://repo.or.cz/btrfs-progs-unstable/devel.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert static static-libs"
-
-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=
-	)
-"
-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(+)]
-		)
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		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)
-	)
-	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/files/btrfs-progs-4.8.1-fix-ioctl.h b/sys-fs/btrfs-progs/files/btrfs-progs-4.8.1-fix-ioctl.h
deleted file mode 100644
index 61b60c78faa..00000000000
--- a/sys-fs/btrfs-progs/files/btrfs-progs-4.8.1-fix-ioctl.h
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 3ddbf895db678fb40f7513bac9dbc36fd4095693
-Author: Sergei Trofimovich <slyfox@g.o>
-Date:   Mon Oct 24 09:08:53 2016 +0100
-
-    ioctl.h: add missing kernel compatibility header for BUILD_ASSERT
-    
-    Header breakage noticed by cynede. Reproducible as:
-    
-        $ gcc -c /usr/include/btrfs/ioctl.h -o /tmp/a.o
-            /usr/include/btrfs/ioctl.h:42:14: error: expected declaration specifiers or '...' before 'sizeof'
-         BUILD_ASSERT(sizeof(struct btrfs_ioctl_vol_args) == 4096);
-                      ^~~~~~
-    
-    Basically gcc tries to say us BUILD_ASSERT is not visible.
-    
-    BUILD_ASSERT lives in kerncompat.h which this change adds.
-    
-    Signed-off-by: Sergei Trofimovich <slyfox@g.o>
-
-diff --git a/ioctl.h b/ioctl.h
-index a7235c0..abea7ed 100644
---- a/ioctl.h
-+++ b/ioctl.h
-@@ -26,6 +26,12 @@ extern "C" {
- #include <asm/types.h>
- #include <linux/ioctl.h>
- 
-+#if BTRFS_FLAT_INCLUDES
-+#include "kerncompat.h"
-+#else
-+#include <btrfs/kerncompat.h>
-+#endif /* BTRFS_FLAT_INCLUDES */
-+
- #ifndef __user
- #define __user
- #endif

diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-4.8.3-fix-ioctl-again.patch b/sys-fs/btrfs-progs/files/btrfs-progs-4.8.3-fix-ioctl-again.patch
deleted file mode 100644
index 9c894900e4a..00000000000
--- a/sys-fs/btrfs-progs/files/btrfs-progs-4.8.3-fix-ioctl-again.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/ioctl.h b/ioctl.h
-index cdfb888..ad4372c 100644
---- a/ioctl.h
-+++ b/ioctl.h
-@@ -710,3 +710,3 @@ static inline char *btrfs_err_str(enum btrfs_err_code err_code)
- 		default:
--			return NULL;
-+			return 0;
- 	}