Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfsmaintenance/files/, sys-fs/btrfsmaintenance/
Date: Sat, 15 Aug 2020 06:19:56
Message-Id: 1597472385.6ac325a36192442675c5aa55523999cccf0ce3f8.juippis@gentoo
1 commit: 6ac325a36192442675c5aa55523999cccf0ce3f8
2 Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net>
3 AuthorDate: Mon Aug 3 22:21:53 2020 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 15 06:19:45 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ac325a3
7
8 sys-fs/btrfsmaintenance: remove old
9
10 Package-Manager: Portage-2.3.103, Repoman-2.3.23
11 Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net>
12 Closes: https://github.com/gentoo/gentoo/pull/16991
13 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
14
15 sys-fs/btrfsmaintenance/Manifest | 2 -
16 .../btrfsmaintenance-0.4.1-r1.ebuild | 66 ----------------------
17 .../btrfsmaintenance/btrfsmaintenance-0.4.ebuild | 62 --------------------
18 .../btrfsmaintenance/files/fix-btrfs-defrag.patch | 12 ----
19 4 files changed, 142 deletions(-)
20
21 diff --git a/sys-fs/btrfsmaintenance/Manifest b/sys-fs/btrfsmaintenance/Manifest
22 index 0cffa3253be..80ba3e9881b 100644
23 --- a/sys-fs/btrfsmaintenance/Manifest
24 +++ b/sys-fs/btrfsmaintenance/Manifest
25 @@ -1,4 +1,2 @@
26 -DIST btrfsmaintenance-0.4.1.tar.gz 21621 BLAKE2B 36632d64022c7bf64548b0f6076640ee41cc9a6705b521fdc841f72f46808006ea6888476e05bb18bc51c44cb29eb444f816f34a1f251a8254156959aa178cdd SHA512 9a7ccc874e5c62689a0c899e8cc40d0b61625a492d28d8a0fe6c8a32be5990600d55094cb203d81a66488ff363fb960208bda5c19cf2948b51ba1b2764e34000
27 DIST btrfsmaintenance-0.4.2.tar.gz 21826 BLAKE2B 0efc06b6780d7e75573958cd979b991580d518ab756ae80c9f4328f113ab7de87367c6730c23b408298919ac740da3b0ec85ae76face60ad97bf75d9aaa2a178 SHA512 802c131edfbc07bca13b89cd8bfc90923b2f23ba780dcb07009a4c4991a588c66a6ffe780938e66ab632201980e5087cd0751cd9185a8bae1a5faba84bf87233
28 -DIST btrfsmaintenance-0.4.tar.gz 21622 BLAKE2B 844d467b7712093370c1d6391e26d5046deb84cee6fd60b5774743415c75ad00a1e27c0be21004c260680b72b5615dcfd01b84f1eba3d57f7c9c5d22b6750d8d SHA512 2d19e82c03b291d157dc5f763dcb094330fd1a4aaee6215dbe576a5da44f71f4adee55fd06c60409e4699ac671d2fc73628f202f4f68270910eeba782f0ad153
29 DIST btrfsmaintenance-0.5.tar.gz 24602 BLAKE2B 313c904aa53fc237472256ae74c9eafaf2305b437e280b6bb9c79c2bbaffb6b273304e57d096a911e658fa41fe80308f2a7ad76ded62d79a7f72439163b36444 SHA512 fadab1cf33992c42d476649fd017ac4ae26d6bf6a814dc49d0b7b38e04861474c4e54e6ebe429a83e662b8e5c7be7f460b551c65788d960e2f8f0c7512deef41
30
31 diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.1-r1.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.1-r1.ebuild
32 deleted file mode 100644
33 index 6290c1a9ccc..00000000000
34 --- a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.1-r1.ebuild
35 +++ /dev/null
36 @@ -1,66 +0,0 @@
37 -# Copyright 1999-2018 Gentoo Foundation
38 -# Distributed under the terms of the GNU General Public License v2
39 -
40 -EAPI=6
41 -
42 -inherit systemd
43 -
44 -DESCRIPTION="Scripts for btrfs maintenance tasks like periodic scrub, balance, trim or defrag"
45 -HOMEPAGE="https://github.com/kdave/btrfsmaintenance"
46 -SRC_URI="https://github.com/kdave/btrfsmaintenance/archive/v${PV}.tar.gz -> ${P}.tar.gz"
47 -
48 -LICENSE="GPL-2"
49 -SLOT="0"
50 -KEYWORDS="amd64 x86"
51 -IUSE="systemd"
52 -
53 -RDEPEND="
54 - sys-fs/btrfs-progs
55 - virtual/cron
56 - systemd? ( sys-apps/systemd )
57 -"
58 -
59 -PATCHES=(
60 - "${FILESDIR}/fix-btrfs-defrag.patch"
61 - )
62 -
63 -src_prepare() {
64 - # Fix config path into watching service
65 - sed -i 's%/etc/sysconfig/btrfsmaintenance%/etc/default/btrfsmaintenance%g' btrfsmaintenance-refresh.* || \
66 - die "Unable to patch btrfsmaintenance-refresh.*"
67 - default
68 -}
69 -
70 -src_install() {
71 - dodoc README.md CONTRIBUTING.md CHANGES.md
72 - insinto /etc/default
73 - newins sysconfig.btrfsmaintenance btrfsmaintenance
74 - insinto /usr/share/btrfsmaintenance
75 - doins btrfsmaintenance-functions
76 - exeinto /usr/share/btrfsmaintenance
77 - doexe btrfs*.sh
78 - systemd_dounit *.service *.timer *.path
79 -}
80 -
81 -pkg_postinst() {
82 - elog "Installing default btrfsmaintenance scripts"
83 - if use systemd; then
84 - "${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer || die
85 - else
86 - "${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh || die
87 - fi
88 - elog "Now edit cron periods and mount points in /etc/default/btrfsmaintenance "
89 - elog "then run /usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh to"
90 - elog "update cron symlinks or run"
91 - elog "/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer"
92 - elog "to update systemd timers."
93 - elog "You can also enable btrfsmaintenance-refresh.path service in order to"
94 - elog "monitor the config files changes and update systemd timers accordly."
95 -}
96 -
97 -pkg_prerm() {
98 - if [[ -z ${REPLACED_BY_VERSION} ]] ; then
99 - elog "Removing symlinks from btrfsmaintenance cron tasks"
100 - "${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh uninstall || die
101 - fi
102 -}
103
104 diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.ebuild
105 deleted file mode 100644
106 index 0cf94723f7d..00000000000
107 --- a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.ebuild
108 +++ /dev/null
109 @@ -1,62 +0,0 @@
110 -# Copyright 1999-2018 Gentoo Foundation
111 -# Distributed under the terms of the GNU General Public License v2
112 -
113 -EAPI=6
114 -
115 -inherit systemd
116 -
117 -DESCRIPTION="Scripts for btrfs maintenance tasks like periodic scrub, balance, trim or defrag"
118 -HOMEPAGE="https://github.com/kdave/btrfsmaintenance"
119 -SRC_URI="https://github.com/kdave/btrfsmaintenance/archive/v${PV}.tar.gz -> ${P}.tar.gz"
120 -
121 -LICENSE="GPL-2"
122 -SLOT="0"
123 -KEYWORDS="amd64 x86"
124 -IUSE="systemd"
125 -
126 -RDEPEND="systemd? ( sys-apps/systemd )
127 - sys-fs/btrfs-progs
128 - virtual/cron"
129 -
130 -src_prepare() {
131 - # Fix config path into watching service
132 - sed -i 's%/etc/sysconfig/btrfsmaintenance%/etc/default/btrfsmaintenance%g' btrfsmaintenance-refresh.* || \
133 - die "Unable to patch btrfsmaintenance-refresh.*"
134 - default
135 -}
136 -
137 -src_install() {
138 - dodoc README.md CONTRIBUTING.md btrfsmaintenance.changes
139 - insinto /etc/default
140 - newins sysconfig.btrfsmaintenance btrfsmaintenance
141 - insinto /usr/share/btrfsmaintenance
142 - doins btrfsmaintenance-functions
143 - exeinto /usr/share/btrfsmaintenance
144 - doexe btrfs*.sh
145 - systemd_dounit *.service
146 - systemd_dounit *.timer
147 - systemd_dounit *.path
148 -}
149 -
150 -pkg_postinst() {
151 - elog "Installing default btrfsmaintenance scripts"
152 - if use systemd; then
153 - "${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer || die
154 - else
155 - "${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh || die
156 - fi
157 - elog "Now edit cron periods and mount points in /etc/default/btrfsmaintenance "
158 - elog "then run /usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh to"
159 - elog "update cron symlinks or run"
160 - elog "/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer"
161 - elog "to update systemd timers."
162 - elog "You can also enable btrfsmaintenance-refresh.path service in order to"
163 - elog "monitor the config files changes and update systemd timers accordly."
164 -}
165 -
166 -pkg_prerm() {
167 - if [[ -z ${REPLACED_BY_VERSION} ]] ; then
168 - elog "Removing symlinks from btrfsmaintenance cron tasks"
169 - "${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh uninstall || die
170 - fi
171 -}
172
173 diff --git a/sys-fs/btrfsmaintenance/files/fix-btrfs-defrag.patch b/sys-fs/btrfsmaintenance/files/fix-btrfs-defrag.patch
174 deleted file mode 100644
175 index 4dc5fd6b1d9..00000000000
176 --- a/sys-fs/btrfsmaintenance/files/fix-btrfs-defrag.patch
177 +++ /dev/null
178 @@ -1,12 +0,0 @@
179 -diff --git a/btrfs-defrag.sh b/btrfs-defrag.sh
180 -index 284abc8..5ced921 100755
181 ---- a/btrfs-defrag.sh
182 -+++ b/btrfs-defrag.sh
183 -@@ -15,6 +15,7 @@ if [ -f /etc/default/btrfsmaintenance ] ; then
184 - fi
185 -
186 - LOGIDENTIFIER='btrfs-defrag'
187 -+. $(dirname $(realpath "$0"))/btrfsmaintenance-functions
188 -
189 - {
190 - OIFS="$IFS"