gentoo resync : 09.07.2022

9 files changed, 12 insertions, 308 deletions

diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 3038fc83890d..e5aadcb02b33 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -2,16 +2,12 @@ AUX 5.16-linux-headers-before-5.11.patch 1545 BLAKE2B 2e0f333d8ba42a45cde8089070
 DIST btrfs-progs-v5.10.1.tar.xz 2204164 BLAKE2B ed83729754f9abd22d4d2e7ae9a7e90e80be9b63d49a4a9692e20e5939467dbd864834b71495661e1c7a1fca89e253a62fbda37f1d01d2eadecb13f5904f0dd0 SHA512 32e5b8bda1863e34613802db91946f240b2cde21288ff8f95c1807e7afd0a67c5a704aa4d2bc0d7b1ca094de6831adbfec83fe61f74e1caf6d1975be7d972f2d
 DIST btrfs-progs-v5.15.1.tar.xz 2280796 BLAKE2B b460254a6261d3d04a2d265a3b4e05a89385888f7ea4f2b16ec5b73922646c7f47a546fc78ba7c009e65914125435cf38157eabffc74f5d00df2c21c844922e3 SHA512 68ed89e337ae857fdaf077eaa889e259e9f162ea2222bdaa03f4187783a8682c24d45c91b0559b901d81429ba2cd3f84087d032d354092d5512fb226bdf91549
 DIST btrfs-progs-v5.16.2.tar.xz 2334464 BLAKE2B a21809a840107c370f1598e19f8b07d8bdd704e8ff3ce4cb78431000e7560802e1047d8200c523a45a761d59a311f1ec384946bd585826a129b05a1a5fd0250e SHA512 c89a763e8b099e0e9d04ff239dfee156a15fc783c515bbd48597f5645f720c377dbb4f2dfe9065971a65d3ade9d8fcb24cf37d527811bf4204153a06f7c8c3a7
-DIST btrfs-progs-v5.16.tar.xz 2327376 BLAKE2B 3bb3b630d465068373bf39776389f733e734cb39801b389a4e94ba2bb325e9625e2cd767c783e4a05e1e18fed92c06190c5d3fbb476b57689a16482357c86b61 SHA512 3ba557134b19f1abb6c63bf3e2092852f92e988677c4bcf9421c824824b87565ae5cc0e5bca0370be81766a8c8fbda21dfb443dcd159f705f31e70b6bf19aa63
 DIST btrfs-progs-v5.17.tar.xz 2286016 BLAKE2B 013acc4f9ec294d8d88b04e9f0ee33c450bfa6621b029005d18885add7c0a1da7e645c1f984931749ebd8f3166e8d849ec128a0f95cc189c15878d45acc0901b SHA512 4c2bfafe0fcae47f01bad41910c2e2b3d48a12b88ca1891a9ea63ac1e65699c2e22f481492c7dd11fbea546647ab78718ab9b6997bb257fc29d1482fde9b08d1
 DIST btrfs-progs-v5.18.1.tar.xz 2293940 BLAKE2B ce2326cca51a4242895aada860e290c6af69a216dc6369673bb3321ab91bfe1c995fcc37dd0c1e15c8e28aabaedf3d6c9508bde393eb0ba4c7b9327c922f749a SHA512 265a03b0db00a231ad51bb75fb161dee0a7a51cd120a696ca0524f08ef635b18afe43b391fa9889a4a79734ccc3931e4374bd950eb26dc47ddc8482368efed0e
-DIST btrfs-progs-v5.18.tar.xz 2293620 BLAKE2B dd5da4618e53d7d1c6636b4dcf9adb0e24e2e735a13ff1858bc55d21a90ad31cb2a7a11ab12beddd44682c62673fda41ebc7517aa80c81cd61cc1b195668a0e1 SHA512 142d9c133a41c0843ab8442018a6caf5186757d6c8d73f9a69a2245f62590d93a448dae6fdde2ebc5f091cc39da9a79ad0e8c94e1873d75e6c723dcc79d74309
-EBUILD btrfs-progs-5.10.1-r1.ebuild 3046 BLAKE2B ca40892695507f2d8ded08d2d43b0cddead63279b84a621eb003e87cdc41b48d98a307363f2e04c5b3ef1d287fcf66c00805c5ac99acd60856abb50be04f2120 SHA512 9c0c0dc2d6991686f076cb2376edabac7253b916b4e4f9446dcce403b70eb10e3c40c7ab6c92035b755a08144e492eb87ea178c9717b20db71d9b4d21f3429e6
-EBUILD btrfs-progs-5.15.1.ebuild 3084 BLAKE2B 1e22d8639ca8792ddf3bc7840091d375831489ad63bab756e445342009f80e3681d1432761a5aad561727c8deb076ece57e74b9ddc32af2cfd7341979f6704a9 SHA512 61c2fa949b59a185cf70ed40ca3109f50d5038b924690a3da543d51962d79e61061042a15e3349a1a3f7ca9a42cae6cad80438ac343bfb78752452c0680d0fce
-EBUILD btrfs-progs-5.16.2.ebuild 3139 BLAKE2B 44cd4f768d4d2beffc54a0325b22572096e978742786916f55e539d0573ed2d8f13d452edd94b2adde51a4a17cc64e5d3abc279039a610faded84b2f64ad9fe6 SHA512 deb3b2a793d381a957d2273438e39cb4df1f3b7d9c63cb4a400f7ea4a6745360ca9d3ff2f8cce166daffc58bc1865c34e65b797da0330ef0fa80196a2211c43a
-EBUILD btrfs-progs-5.16.ebuild 3155 BLAKE2B 70bedb119f3bc6d90de05558963a3663f763b5919f02dd85c76e3c8d34b515e817e0f579eac4bbdbac9b7513be9e20e6da2445c8b855b6a209321a380255dc9b SHA512 d00762deb927876a4384ec874bcf527c8c69a384fa99a1c15a84805b8dc1e56e9a0fd6e5c4808ea759b0c4988f840ad7735d7fd1564bd8d7e3f870718c67bc78
-EBUILD btrfs-progs-5.17.ebuild 3113 BLAKE2B b55f749346e5a0dc1c004dae7d7f888bafc5da8a0bd1c5032697a1e38f53903950f45e8004fea86ff04cabe4e5488a0dc31f064349a357188c0c21634af76cca SHA512 9e6bc0163180246cc96b992cc90c7960e3141f4cec9bc81fdbe6547051ff1d8e3e7158e36c505cea14f2576125190a99fc81363c56e62f60f33a7c866c5baabe
-EBUILD btrfs-progs-5.18.1-r1.ebuild 3315 BLAKE2B 21bcee35074e908afed1b369f07609565bbcc864def87f3c28bc4c5c9b2f8e02e37d7591f655cfdfb640186b0a3bcf4160c7784c556b0754385b9830cf0477a1 SHA512 c483f3ae0784548120a6a9db16c4be656b51097e676e6e333df778a499ba1cce8c6486dd951455468be0be39f26441f798138c4623232fc9431868d8da2a9710
-EBUILD btrfs-progs-5.18.ebuild 3404 BLAKE2B ffca9e8d9839b900e8fe04ae8e0e33564fd994e63b91080c8b4ef857e3259465e7441156192fafbdf8009a1362bf7ca89e0cbe8d93585ab7b86f105899cb39e0 SHA512 b7dcfb64b5a8331330e26e950f448461905a28de523bb0f01cc3c7a7a85dc58b187ed48819113ff4c27ec6c68a927668efe38d26eb0b1c963eb7e28755307e1d
-EBUILD btrfs-progs-9999.ebuild 3315 BLAKE2B 21bcee35074e908afed1b369f07609565bbcc864def87f3c28bc4c5c9b2f8e02e37d7591f655cfdfb640186b0a3bcf4160c7784c556b0754385b9830cf0477a1 SHA512 c483f3ae0784548120a6a9db16c4be656b51097e676e6e333df778a499ba1cce8c6486dd951455468be0be39f26441f798138c4623232fc9431868d8da2a9710
+EBUILD btrfs-progs-5.10.1-r1.ebuild 3047 BLAKE2B 8a303a3b29a3feff1023c95b7777361e3d9a267961fb8dc39290991f2856ceaba6862df281d636f9bea3448ac1a84105c6b050afdd961e4f316cf913d7f043ab SHA512 72f2a1cdaa286198d9d160515b5f1b0cd3887220e8d3498906141ea9f8f2c393d84b2a52304c05e4844b68991e4455f807619054b7407db3e2d0c0b09b75fcd7
+EBUILD btrfs-progs-5.15.1.ebuild 3085 BLAKE2B 5c2c91b9aa104a54967db818696acb8284ca7a4042e1d142a2e3db7b53b52a1b5530ecfade95cd51eae51ab1e095078415a36b650dd12430412f4d4fcbde3461 SHA512 4c700962937e4d45ed2b2cedec9c857ac38b2f716384916056abe091b36030cff9a609dbb54f60caf0ce1878a9fb6a3e887428bb44f3d63e0bbc0a2dbce8cf73
+EBUILD btrfs-progs-5.16.2.ebuild 3140 BLAKE2B 3725d3755fe9c1f55ac29c8e43ea71b4829cffad8f24939f5ac9bc222c7e52d44d95468da08945c3f9bf74b6ae62842adcfec4bd9f7a83976cfe226d38f02dca SHA512 bbe6a496de5092c6ce6ddf869418e738dc163e5bb5636921e9f475ceab4383cc30d868ea2fcfac9ca6abb0ccc748208194459d3f37c54a7800d9180c5012043d
+EBUILD btrfs-progs-5.17.ebuild 3114 BLAKE2B acecdd2560d5fd72f013e3604a23818608bf2cd87613f8fa4f282be2c6dfaaa5e0e3f7a8617610f11ff9a08dd9dce0fbf97b6c0941c6cf3ad476c4c37246fcaa SHA512 5ae0124a9f8ae4c448fa058c003be65225dc0281a50178bc1fb5cda5feccb684d85e10a86577b62c40341f07da13f06d72386eb876a14a7efce5277439d44818
+EBUILD btrfs-progs-5.18.1-r1.ebuild 3316 BLAKE2B 47162d7502cdcc51a5238d4138b5b84332054e73bb9ea60aa606a8a4019ad334d4e8760c6e639a942224f9c77fb2d311480b3d55a0e9eb940a6c4a1276b2a5fd SHA512 2a5a9821b0030515c1d16a621066457d242898e20077720186933747e7328c10aacaad1aee65254309d57929948b3ffd238f857b980d656c8a963563cff1a8ce
+EBUILD btrfs-progs-9999.ebuild 3316 BLAKE2B 47162d7502cdcc51a5238d4138b5b84332054e73bb9ea60aa606a8a4019ad334d4e8760c6e639a942224f9c77fb2d311480b3d55a0e9eb940a6c4a1276b2a5fd SHA512 2a5a9821b0030515c1d16a621066457d242898e20077720186933747e7328c10aacaad1aee65254309d57929948b3ffd238f857b980d656c8a963563cff1a8ce
 MISC metadata.xml 524 BLAKE2B 4e27833128aeb064271af7a4f3c05699b4603b1d993b32bef3d9d973182d3d0c88ac799c95f0f35495e9a99e645627afd96049273c08c3e1334d8fe1ccf0debe SHA512 471014a98bc3feb75e7930485e89daf6cb3390c37a330b8373d5c3b0b764b9180cbff133839ce4742a3c76f63e6f18895060d5906e6a113d2cd43af0df3b0d5a
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.10.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.10.1-r1.ebuild
index 01164d323b79..e1e6443d8c62 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.10.1-r1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.10.1-r1.ebuild
@@ -127,5 +127,5 @@ src_install() {
 }
 
 pkg_postrm() {
-	[[ -n ${REPLACING_VERSIONS} ]] || udev_reload
+	[[ -n ${REPLACED_BY_VERSION} ]] || udev_reload
 }
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
index 8132f35bc6ac..b009cd71b1d4 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
@@ -128,5 +128,5 @@ src_install() {
 }
 
 pkg_postrm() {
-	[[ -n ${REPLACING_VERSIONS} ]] || udev_reload
+	[[ -n ${REPLACED_BY_VERSION} ]] || udev_reload
 }
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.16.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.16.2.ebuild
index 5c1aabd39fb4..b8bd29ede157 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.16.2.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.16.2.ebuild
@@ -133,5 +133,5 @@ src_install() {
 }
 
 pkg_postrm() {
-	[[ -n ${REPLACING_VERSIONS} ]] || udev_reload
+	[[ -n ${REPLACED_BY_VERSION} ]] || udev_reload
 }
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild
deleted file mode 100644
index 81d242c828ef..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 2008-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-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 ~riscv ~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 doc python reiserfs static static-libs +zstd"
-
-RESTRICT="test" # tries to mount repaired filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	zstd? ( app-arch/zstd:0= )
-"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-5.10
-	convert? ( sys-apps/acl )
-	python? (
-		$(python_gen_cond_dep '
-			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[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd:0[static-libs(+)] )
-	)
-"
-BDEPEND="
-	doc? (
-		|| ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
-		app-text/docbook-xml-dtd:4.5
-		app-text/xmlto
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/5.16-linux-headers-before-5.11.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 "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable doc documentation)
-		$(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
-
-	# install prebuilt subset of manuals
-	use doc || doman Documentation/*.[58]
-}
-
-pkg_postrm() {
-	[[ -n ${REPLACING_VERSIONS} ]] || udev_reload
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.17.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.17.ebuild
index a8119d0182c4..ffb791583518 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.17.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.17.ebuild
@@ -144,5 +144,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	[[ -n ${REPLACING_VERSIONS} ]] || udev_reload
+	[[ -n ${REPLACED_BY_VERSION} ]] || udev_reload
 }
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild
index cc8ae19c469e..76f2afe1fe01 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild
@@ -145,5 +145,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	[[ -n ${REPLACING_VERSIONS} ]] || udev_reload
+	[[ -n ${REPLACED_BY_VERSION} ]] || udev_reload
 }
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.18.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.18.ebuild
deleted file mode 100644
index b6d87b7e0f05..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-5.18.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 2008-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 python-single-r1 udev
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-	fi
-
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-	WANT_LIBTOOL="none"
-	inherit autotools git-r3
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert python +man reiserfs static static-libs udev +zstd"
-# Could support it with just !systemd => eudev, see mdadm, but let's
-# see if someone asks for it first.
-REQUIRED_USE="static? ( !udev )"
-
-# Tries to mount repaired filesystems
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:=[static-libs(+)?]
-	sys-libs/zlib:=
-	convert? (
-		sys-fs/e2fsprogs:=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	udev? ( virtual/libudev:= )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-5.10
-	convert? ( sys-apps/acl )
-	python? (
-		$(python_gen_cond_dep '
-			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[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd[static-libs(+)] )
-	)
-"
-BDEPEND="virtual/pkgconfig
-	man? ( dev-python/sphinx )"
-
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-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 "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-
-		--enable-lzo
-		--disable-experimental
-		$(use_enable convert)
-		$(use_enable man documentation)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable static-libs static)
-		$(use_enable udev libudev)
-		$(use_enable zstd)
-
-		# Could support libgcrypt, libsodium, libkcapi
-		--with-crypto=builtin
-		--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
-
-	# Install prebuilt subset of manuals (very few)
-	use man || doman Documentation/*.[58]
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	[[ -n ${REPLACING_VERSIONS} ]] || udev_reload
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index cc8ae19c469e..76f2afe1fe01 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -145,5 +145,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	[[ -n ${REPLACING_VERSIONS} ]] || udev_reload
+	[[ -n ${REPLACED_BY_VERSION} ]] || udev_reload
 }