From 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:52:04 +0100 Subject: gentoo resync : 14.07.2018 --- sys-fs/btrfsmaintenance/Manifest | 5 +- .../btrfsmaintenance/btrfsmaintenance-0.3.1.ebuild | 45 --------------- .../btrfsmaintenance-0.4.1-r1.ebuild | 66 ++++++++++++++++++++++ .../btrfsmaintenance/btrfsmaintenance-0.4.1.ebuild | 60 -------------------- .../btrfsmaintenance/files/fix-btrfs-defrag.patch | 12 ++++ 5 files changed, 80 insertions(+), 108 deletions(-) delete mode 100644 sys-fs/btrfsmaintenance/btrfsmaintenance-0.3.1.ebuild create mode 100644 sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.1-r1.ebuild delete mode 100644 sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.1.ebuild create mode 100644 sys-fs/btrfsmaintenance/files/fix-btrfs-defrag.patch (limited to 'sys-fs/btrfsmaintenance') diff --git a/sys-fs/btrfsmaintenance/Manifest b/sys-fs/btrfsmaintenance/Manifest index d1dbfeb0cd94..da2737dd5f1c 100644 --- a/sys-fs/btrfsmaintenance/Manifest +++ b/sys-fs/btrfsmaintenance/Manifest @@ -1,7 +1,6 @@ -DIST btrfsmaintenance-0.3.1.tar.gz 19698 BLAKE2B f792d7e55dd738b4be2f18aa4047c8b2c092244b71c50e32cf881a7862b14a2d897a170515388fcee40a89763c4c91d357ca3ceb559e372ca3c673d0b1d3aec2 SHA512 89be6da3d6bb3f85f645ac899f173d19cb787e938dd2fc91be16b3202a6784ca33dc4a4d9f9ee78ac6a96468dbaa4f4dc7a2f2e6998d550ea44d7af24198dbfb +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.tar.gz 21622 BLAKE2B 844d467b7712093370c1d6391e26d5046deb84cee6fd60b5774743415c75ad00a1e27c0be21004c260680b72b5615dcfd01b84f1eba3d57f7c9c5d22b6750d8d SHA512 2d19e82c03b291d157dc5f763dcb094330fd1a4aaee6215dbe576a5da44f71f4adee55fd06c60409e4699ac671d2fc73628f202f4f68270910eeba782f0ad153 -EBUILD btrfsmaintenance-0.3.1.ebuild 1381 BLAKE2B c3dcf441fb735792133f6dca9a5bdf5d2cb76d03fc46540a2ac87ea0211b83027249706c6eb55494aaab223ac222c0e3dfd65d09cfa169c37b950436daa46a59 SHA512 f681469cc0db852d21625736f3ecca7cd745c2dae6ef3d2d1b7ca1a4cf51645e904346ab18ce0d19abcd5b372aa40d42822629c9e113dd7fee856e7481b5c2c6 -EBUILD btrfsmaintenance-0.4.1.ebuild 2008 BLAKE2B ad5bf783282a0eb8a58b3d059d8996dfd7c4b374ccf21f80379cab09c0bd4c90b02d205f6849f3e2d8416227118524fddf935591c4756ab1c02559eb785d986c SHA512 0a40cef065c104f976241a80bc4377d07eeb8f8f9a4920e650127d897e1e64fa77bdb601c709ac23014b1e0c9a77884b9d96112bb1fdf13b8f9ec22563038967 +EBUILD btrfsmaintenance-0.4.1-r1.ebuild 2061 BLAKE2B 4d019f8de6871da3319c52d040c2d23f7abbe52f804450801a20d97451b5ab70b7bd705f1aa0f23fd383fb57e82e80b38a55c8fd2da0792186bfa80e52726d3b SHA512 ba9f8b94f49b686f637086f68a6db23437a13bd661ee03ae2b4b26e114e0aa5b179ae29d3a9191348750be6b47f950f0d55ddb8bdb288fcee93545a78019df8f EBUILD btrfsmaintenance-0.4.ebuild 2052 BLAKE2B 066777c1ce55409a50ea2e1a640881cc0161ebc128e1d5d84bf7081f0ce5834bcf00ff5dc2d85d8fedccc7d2283223bf0842d227604fc6bd9ab3c2ac31de249c SHA512 80c3f7ae618e6b14dff3aae9d8387654de280388cbb7607d8a347d016c7c73a5015942fd1bf1a2fbbbd1f1e68e139c1d3af393aee6d4bd56b6836ee7c65c3b1a MISC metadata.xml 564 BLAKE2B a54366a1b7a22e5b6f7ba8814ebcc75e4fb6185a5ce49f021bc2dec51277f31f82cafd4cf2de29918b97aa9276485bdc0dcf42d21e65d71636d3ab6ea4bf78da SHA512 6affb15730bb1ec7d8601c46ac5ea9f48b603d36825b364831459025764080641f51644af6c838d0e6de9edca766236662d068ee5893ba811687c4a1d7585bdc diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.3.1.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.3.1.ebuild deleted file mode 100644 index 7e5966d6ecfd..000000000000 --- a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.3.1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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="" - -DEPEND="" -RDEPEND="${DEPEND} - sys-fs/btrfs-progs - virtual/cron" - -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 - insinto /usr/lib/systemd/system - doins btrfsmaintenance-refresh.service -} - -pkg_postinst() { - elog "Installing default btrfsmaintenance scripts" - "${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh || die - 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" -} - -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.4.1-r1.ebuild new file mode 100644 index 000000000000..6290c1a9ccc1 --- /dev/null +++ b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.1-r1.ebuild @@ -0,0 +1,66 @@ +# 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=" + sys-fs/btrfs-progs + virtual/cron + systemd? ( sys-apps/systemd ) +" + +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.* || \ + die "Unable to patch btrfsmaintenance-refresh.*" + default +} + +src_install() { + dodoc README.md CONTRIBUTING.md CHANGES.md + insinto /etc/default + newins sysconfig.btrfsmaintenance btrfsmaintenance + insinto /usr/share/btrfsmaintenance + doins btrfsmaintenance-functions + exeinto /usr/share/btrfsmaintenance + doexe btrfs*.sh + systemd_dounit *.service *.timer *.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.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.1.ebuild deleted file mode 100644 index 1a84583a1cbd..000000000000 --- a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.1.ebuild +++ /dev/null @@ -1,60 +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 CHANGES.md - insinto /etc/default - newins sysconfig.btrfsmaintenance btrfsmaintenance - insinto /usr/share/btrfsmaintenance - doins btrfsmaintenance-functions - exeinto /usr/share/btrfsmaintenance - doexe btrfs*.sh - systemd_dounit *.service *.timer *.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/files/fix-btrfs-defrag.patch b/sys-fs/btrfsmaintenance/files/fix-btrfs-defrag.patch new file mode 100644 index 000000000000..4dc5fd6b1d92 --- /dev/null +++ b/sys-fs/btrfsmaintenance/files/fix-btrfs-defrag.patch @@ -0,0 +1,12 @@ +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" -- cgit v1.2.3