gentoo resync : 25.08.2020

4 files changed, 13 insertions, 91 deletions

diff --git a/sys-fs/btrfsmaintenance/Manifest b/sys-fs/btrfsmaintenance/Manifest
index ea6421a98b80..cbbe0ede3fa4 100644
--- a/sys-fs/btrfsmaintenance/Manifest
+++ b/sys-fs/btrfsmaintenance/Manifest
@@ -1,8 +1,5 @@
-AUX fix-btrfs-defrag.patch 298 BLAKE2B 3fb4d86066af4a09701494c82b1aa595d7a8989732c12e0aa41cfe9c4faf1f03a5a9b2e8b74b06118e4d789fd914a0f142af1ef4b877d9a99d0d1aa89b429a81 SHA512 5305f9e7d7b80f901c6a8a9a52d6a08cfa38a720b590f9413a621604fe6f468d7259491ebb08e8dd87a2fd5274bc9d493d2e47a6b642e535114fd8a3b3a9a5e6
-DIST btrfsmaintenance-0.4.1.tar.gz 21621 BLAKE2B 36632d64022c7bf64548b0f6076640ee41cc9a6705b521fdc841f72f46808006ea6888476e05bb18bc51c44cb29eb444f816f34a1f251a8254156959aa178cdd SHA512 9a7ccc874e5c62689a0c899e8cc40d0b61625a492d28d8a0fe6c8a32be5990600d55094cb203d81a66488ff363fb960208bda5c19cf2948b51ba1b2764e34000
 DIST btrfsmaintenance-0.4.2.tar.gz 21826 BLAKE2B 0efc06b6780d7e75573958cd979b991580d518ab756ae80c9f4328f113ab7de87367c6730c23b408298919ac740da3b0ec85ae76face60ad97bf75d9aaa2a178 SHA512 802c131edfbc07bca13b89cd8bfc90923b2f23ba780dcb07009a4c4991a588c66a6ffe780938e66ab632201980e5087cd0751cd9185a8bae1a5faba84bf87233
-DIST btrfsmaintenance-0.4.tar.gz 21622 BLAKE2B 844d467b7712093370c1d6391e26d5046deb84cee6fd60b5774743415c75ad00a1e27c0be21004c260680b72b5615dcfd01b84f1eba3d57f7c9c5d22b6750d8d SHA512 2d19e82c03b291d157dc5f763dcb094330fd1a4aaee6215dbe576a5da44f71f4adee55fd06c60409e4699ac671d2fc73628f202f4f68270910eeba782f0ad153
-EBUILD btrfsmaintenance-0.4.1-r1.ebuild 2061 BLAKE2B 4d019f8de6871da3319c52d040c2d23f7abbe52f804450801a20d97451b5ab70b7bd705f1aa0f23fd383fb57e82e80b38a55c8fd2da0792186bfa80e52726d3b SHA512 ba9f8b94f49b686f637086f68a6db23437a13bd661ee03ae2b4b26e114e0aa5b179ae29d3a9191348750be6b47f950f0d55ddb8bdb288fcee93545a78019df8f
+DIST btrfsmaintenance-0.5.tar.gz 24602 BLAKE2B 313c904aa53fc237472256ae74c9eafaf2305b437e280b6bb9c79c2bbaffb6b273304e57d096a911e658fa41fe80308f2a7ad76ded62d79a7f72439163b36444 SHA512 fadab1cf33992c42d476649fd017ac4ae26d6bf6a814dc49d0b7b38e04861474c4e54e6ebe429a83e662b8e5c7be7f460b551c65788d960e2f8f0c7512deef41
 EBUILD btrfsmaintenance-0.4.2.ebuild 2014 BLAKE2B 21e7ca9e7ef23f8baaceb2058fb5308b8059e6f7e8a2280967280651558806a9fca93274a125a5e25b1257e43b57e12d4b577a48c1364ce6e1e96436fa994126 SHA512 17de5b583a6626c6f5fac7118354cd130f740daadd18a71272c9ce7e5b97b644e4be1312845ef2884baf607e9ff69cfdcf1cbce3762f1a33402b3bab4ee042ca
-EBUILD btrfsmaintenance-0.4.ebuild 2052 BLAKE2B 066777c1ce55409a50ea2e1a640881cc0161ebc128e1d5d84bf7081f0ce5834bcf00ff5dc2d85d8fedccc7d2283223bf0842d227604fc6bd9ab3c2ac31de249c SHA512 80c3f7ae618e6b14dff3aae9d8387654de280388cbb7607d8a347d016c7c73a5015942fd1bf1a2fbbbd1f1e68e139c1d3af393aee6d4bd56b6836ee7c65c3b1a
+EBUILD btrfsmaintenance-0.5.ebuild 2154 BLAKE2B 920f0293198963d2a2d5d3ca9612862b7d2b2c31b354f265daad6a2f1392506d048d09624d2ca0b77b61c02a41a0344a7f8fcd1060bab0aecf1d6af15ae8422c SHA512 109e6e1aa4971a07d41e38c6ba78aa67f6267157d6a22cf3d405c545643bb44193fcdbeca6313a00afe095ad65eff196bf3a017cf33513252514eaa6fb8fc46f
 MISC metadata.xml 564 BLAKE2B a54366a1b7a22e5b6f7ba8814ebcc75e4fb6185a5ce49f021bc2dec51277f31f82cafd4cf2de29918b97aa9276485bdc0dcf42d21e65d71636d3ab6ea4bf78da SHA512 6affb15730bb1ec7d8601c46ac5ea9f48b603d36825b364831459025764080641f51644af6c838d0e6de9edca766236662d068ee5893ba811687c4a1d7585bdc
diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.ebuild
deleted file mode 100644
index 0cf94723f7d2..000000000000
--- a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd
-
-DESCRIPTION="Scripts for btrfs maintenance tasks like periodic scrub, balance, trim or defrag"
-HOMEPAGE="https://github.com/kdave/btrfsmaintenance"
-SRC_URI="https://github.com/kdave/btrfsmaintenance/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="systemd"
-
-RDEPEND="systemd? ( sys-apps/systemd )
-	sys-fs/btrfs-progs
-	virtual/cron"
-
-src_prepare() {
-	# Fix config path into watching service
-	sed -i 's%/etc/sysconfig/btrfsmaintenance%/etc/default/btrfsmaintenance%g' btrfsmaintenance-refresh.* || \
-		die "Unable to patch btrfsmaintenance-refresh.*"
-	default
-}
-
-src_install() {
-	dodoc README.md CONTRIBUTING.md btrfsmaintenance.changes
-	insinto /etc/default
-	newins sysconfig.btrfsmaintenance btrfsmaintenance
-	insinto /usr/share/btrfsmaintenance
-	doins btrfsmaintenance-functions
-	exeinto /usr/share/btrfsmaintenance
-	doexe btrfs*.sh
-	systemd_dounit *.service
-	systemd_dounit *.timer
-	systemd_dounit *.path
-}
-
-pkg_postinst() {
-	elog "Installing default btrfsmaintenance scripts"
-	if use systemd; then
-		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer || die
-	else
-		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh || die
-	fi
-	elog "Now edit cron periods and mount points in /etc/default/btrfsmaintenance "
-	elog "then run /usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh to"
-	elog "update cron symlinks or run"
-	elog "/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer"
-	elog "to update systemd timers."
-	elog "You can also enable btrfsmaintenance-refresh.path service in order to"
-	elog "monitor the config files changes and update systemd timers accordly."
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		elog "Removing symlinks from btrfsmaintenance cron tasks"
-		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh uninstall || die
-	fi
-}
diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.1-r1.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.ebuild
index 6290c1a9ccc1..3c44355dfc46 100644
--- a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.1-r1.ebuild
+++ b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit systemd
 
@@ -11,23 +11,22 @@ SRC_URI="https://github.com/kdave/btrfsmaintenance/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="systemd"
 
 RDEPEND="
+	app-shells/bash
+	sys-apps/util-linux
 	sys-fs/btrfs-progs
-	virtual/cron
 	systemd? ( sys-apps/systemd )
+	!systemd? ( virtual/cron )
 "
 
-PATCHES=(
-	"${FILESDIR}/fix-btrfs-defrag.patch"
-	)
-
 src_prepare() {
 	# Fix config path into watching service
-	sed -i 's%/etc/sysconfig/btrfsmaintenance%/etc/default/btrfsmaintenance%g' btrfsmaintenance-refresh.* || \
+	sed -i 's%/etc/sysconfig/btrfsmaintenance%/etc/default/btrfsmaintenance%g' btrfsmaintenance-refresh.* ||
 		die "Unable to patch btrfsmaintenance-refresh.*"
+	rm btrfs-defrag-plugin.sh || die "cannot remove btrfs-defrag-plugin.sh" # not necessary on gentoo systems
 	default
 }
 
@@ -45,9 +44,9 @@ src_install() {
 pkg_postinst() {
 	elog "Installing default btrfsmaintenance scripts"
 	if use systemd; then
-		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer || die
+		"${EROOT}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer || die
 	else
-		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh || die
+		"${EROOT}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh || die
 	fi
 	elog "Now edit cron periods and mount points in /etc/default/btrfsmaintenance "
 	elog "then run /usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh to"
@@ -61,6 +60,6 @@ pkg_postinst() {
 pkg_prerm() {
 	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
 		elog "Removing symlinks from btrfsmaintenance cron tasks"
-		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh uninstall || die
+		"${EROOT}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh uninstall || die
 	fi
 }
diff --git a/sys-fs/btrfsmaintenance/files/fix-btrfs-defrag.patch b/sys-fs/btrfsmaintenance/files/fix-btrfs-defrag.patch
deleted file mode 100644
index 4dc5fd6b1d92..000000000000
--- a/sys-fs/btrfsmaintenance/files/fix-btrfs-defrag.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/btrfs-defrag.sh b/btrfs-defrag.sh
-index 284abc8..5ced921 100755
---- a/btrfs-defrag.sh
-+++ b/btrfs-defrag.sh
-@@ -15,6 +15,7 @@ if [ -f /etc/default/btrfsmaintenance ] ; then
- fi
- 
- LOGIDENTIFIER='btrfs-defrag'
-+. $(dirname $(realpath "$0"))/btrfsmaintenance-functions
- 
- {
- OIFS="$IFS"