1 |
commit: 109be7e6b9f524f6290b76e15f2b284c3ea43eb9 |
2 |
Author: Mattéo Rossillol‑‑Laruelle <beatussum <AT> protonmail <DOT> com> |
3 |
AuthorDate: Tue Jun 2 09:30:48 2020 +0000 |
4 |
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 26 17:09:28 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=109be7e6 |
7 |
|
8 |
sys-block/zram-init: version bump |
9 |
|
10 |
Closes: https://bugs.gentoo.org/732176 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/16049 |
12 |
Signed-off-by: Mattéo Rossillol‑‑Laruelle <beatussum <AT> protonmail.com> |
13 |
Package-Manager: Portage-2.3.99, Repoman-2.3.23 |
14 |
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org> |
15 |
|
16 |
sys-block/zram-init/Manifest | 2 +- |
17 |
sys-block/zram-init/metadata.xml | 7 ++- |
18 |
sys-block/zram-init/zram-init-10.5.ebuild | 73 +++++++++++++++++++++++++++++ |
19 |
sys-block/zram-init/zram-init-9.1.ebuild | 56 ---------------------- |
20 |
sys-block/zram-init/zram-init-9999.ebuild | 77 +++++++++++++++++++------------ |
21 |
5 files changed, 127 insertions(+), 88 deletions(-) |
22 |
|
23 |
diff --git a/sys-block/zram-init/Manifest b/sys-block/zram-init/Manifest |
24 |
index f0102627e4b..cc5be001e1a 100644 |
25 |
--- a/sys-block/zram-init/Manifest |
26 |
+++ b/sys-block/zram-init/Manifest |
27 |
@@ -1,2 +1,2 @@ |
28 |
+DIST zram-init-10.5.tar.gz 20496 BLAKE2B a28ba9e3813be7ca571ac033ca7b4bdf7c95624f9be72288d8478a2fffa950f7bb18fe865b9933fd209dabc705366af8f825fa7ee8a16be364e1d71c7062067c SHA512 97591549aa9b678b0b12efcc27136826c19b42cc0cf027a3f251843ef5678425568c9eb573d24661ce795eede1d136243fcccbf4dcd62e9d61eb7d775f84f1c1 |
29 |
DIST zram-init-8.1.tar.gz 9177 BLAKE2B 229a469aeeb0b22b80f48d946d4ff746c7bd5d7b58ea9290db0da011df6d618c7c55ad95810b0be74ff81350182057d9067e834ecba688eb4ffa668521468a8b SHA512 8f688accb7a4231f705f694c4b4e7344bbb338b2b1f09a6dacd900020a4e8583105b25fef5b40f39630db88db6fcc8ec79824945ceaee95ea1279d09d081a994 |
30 |
-DIST zram-init-9.1.tar.gz 11414 BLAKE2B d7f7d1fd49594882a043322b905c02ac9e1f6ea78a626fb35ab0939096a062ef384e759d62e2cc4a990946e124317d70a4325b145e38612ebad173752209fa55 SHA512 4e3c76a389d188df98479f3f70af28405144b065df60ba191777cbec88d9bfe94be472d94bbb16314c0eefd41d177105cba74b45d1f13e82a741ff21a4d69c6a |
31 |
|
32 |
diff --git a/sys-block/zram-init/metadata.xml b/sys-block/zram-init/metadata.xml |
33 |
index b8a5b3e6784..013ba527f06 100644 |
34 |
--- a/sys-block/zram-init/metadata.xml |
35 |
+++ b/sys-block/zram-init/metadata.xml |
36 |
@@ -9,8 +9,13 @@ |
37 |
<email>perfinion@g.o</email> |
38 |
<name>Jason Zaman</name> |
39 |
</maintainer> |
40 |
- |
41 |
<upstream> |
42 |
+ <maintainer status="active"> |
43 |
+ <name>Martin Väth</name> |
44 |
+ <email>martin@×××××.de</email> |
45 |
+ </maintainer> |
46 |
+ <changelog>https://raw.githubusercontent.com/vaeth/zram-init/master/ChangeLog</changelog> |
47 |
+ <bugs-to>https://github.com/vaeth/zram-init/issues/</bugs-to> |
48 |
<remote-id type="github">vaeth/zram-init</remote-id> |
49 |
</upstream> |
50 |
</pkgmetadata> |
51 |
|
52 |
diff --git a/sys-block/zram-init/zram-init-10.5.ebuild b/sys-block/zram-init/zram-init-10.5.ebuild |
53 |
new file mode 100644 |
54 |
index 00000000000..adc7997651c |
55 |
--- /dev/null |
56 |
+++ b/sys-block/zram-init/zram-init-10.5.ebuild |
57 |
@@ -0,0 +1,73 @@ |
58 |
+# Copyright 1999-2020 Gentoo Authors |
59 |
+# Distributed under the terms of the GNU General Public License v2 |
60 |
+ |
61 |
+EAPI=7 |
62 |
+ |
63 |
+inherit prefix readme.gentoo-r1 |
64 |
+ |
65 |
+DESCRIPTION="Scripts to support compressed swap devices or ramdisks with zRAM" |
66 |
+HOMEPAGE="https://github.com/vaeth/zram-init/" |
67 |
+ |
68 |
+if [[ ${PV} == *9999 ]]; then |
69 |
+ inherit git-r3 |
70 |
+ EGIT_REPO_URI="https://github.com/vaeth/${PN}.git" |
71 |
+else |
72 |
+ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
73 |
+ KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" |
74 |
+fi |
75 |
+ |
76 |
+LICENSE="GPL-2" |
77 |
+SLOT="0" |
78 |
+ |
79 |
+BDEPEND="sys-devel/gettext" |
80 |
+ |
81 |
+RDEPEND=" |
82 |
+ >=app-shells/push-2.0 |
83 |
+ virtual/libintl |
84 |
+ || ( sys-apps/openrc sys-apps/systemd ) |
85 |
+" |
86 |
+ |
87 |
+DISABLE_AUTOFORMATTING=true |
88 |
+DOC_CONTENTS="\ |
89 |
+To use zram-init, activate it in your kernel and add it to the default |
90 |
+runlevel: |
91 |
+ rc-update add zram-init default |
92 |
+If you use systemd enable zram_swap, zram_tmp, and/or zram_var_tmp with |
93 |
+systemctl. You might need to modify the following file depending on the |
94 |
+number of devices that you want to create: |
95 |
+ ${EROOT}/etc/modprobe.d/zram.conf. |
96 |
+If you use the \$TMPDIR as zRAM device with OpenRC, you should add zram-init |
97 |
+to the boot runlevel: |
98 |
+ rc-update add zram-init boot |
99 |
+Still for the same case, you should add in the OpenRC configuration file |
100 |
+for the services using \$TMPDIR the following line: |
101 |
+ rc_need=\"zram-init\"" |
102 |
+ |
103 |
+src_prepare() { |
104 |
+ default |
105 |
+ |
106 |
+ hprefixify "${S}/man/${PN}.8" |
107 |
+ |
108 |
+ hprefixify -e "s%(}|:)(/(usr/)?sbin)%\1${EPREFIX}\2%g" \ |
109 |
+ "${S}/sbin/${PN}.in" |
110 |
+ |
111 |
+ hprefixify -e "s%( |=)(/tmp)%\1${EPREFIX}\2%g" \ |
112 |
+ "${S}/systemd/system"/* \ |
113 |
+ "${S}/openrc"/*/* |
114 |
+} |
115 |
+ |
116 |
+src_compile() { |
117 |
+ emake PREFIX="${EPREFIX}/usr" MODIFY_SHEBANG=FALSE |
118 |
+} |
119 |
+ |
120 |
+src_install() { |
121 |
+ einstalldocs |
122 |
+ readme.gentoo_create_doc |
123 |
+ |
124 |
+ emake DESTDIR="${ED}" PREFIX="/usr" SYSCONFDIR="/etc" \ |
125 |
+ BINDIR="${ED}/sbin" install |
126 |
+} |
127 |
+ |
128 |
+pkg_postinst() { |
129 |
+ readme.gentoo_print_elog |
130 |
+} |
131 |
|
132 |
diff --git a/sys-block/zram-init/zram-init-9.1.ebuild b/sys-block/zram-init/zram-init-9.1.ebuild |
133 |
deleted file mode 100644 |
134 |
index 87a6d31eaf2..00000000000 |
135 |
--- a/sys-block/zram-init/zram-init-9.1.ebuild |
136 |
+++ /dev/null |
137 |
@@ -1,56 +0,0 @@ |
138 |
-# Copyright 1999-2020 Gentoo Authors |
139 |
-# Distributed under the terms of the GNU General Public License v2 |
140 |
- |
141 |
-EAPI=7 |
142 |
-inherit readme.gentoo-r1 systemd |
143 |
- |
144 |
-DESCRIPTION="Scripts to support compressed swap devices or ramdisks with zram" |
145 |
-HOMEPAGE="https://github.com/vaeth/zram-init/" |
146 |
- |
147 |
-LICENSE="GPL-2" |
148 |
-SLOT="0" |
149 |
-IUSE="" |
150 |
- |
151 |
-if [[ ${PV} == *9999 ]] ; then |
152 |
- EGIT_REPO_URI="https://github.com/vaeth/${PN}.git" |
153 |
- inherit git-r3 |
154 |
-else |
155 |
- SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
156 |
- KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" |
157 |
-fi |
158 |
- |
159 |
-RDEPEND=">=app-shells/push-2.0 |
160 |
- !<sys-apps/openrc-0.13" |
161 |
- |
162 |
-DISABLE_AUTOFORMATTING="true" |
163 |
-DOC_CONTENTS="To use zram, activate it in your kernel and add it to default runlevel: |
164 |
- rc-config add zram default |
165 |
-If you use systemd enable zram_swap, tmp, and/or var_tmp with systemctl. |
166 |
-You might need to modify /etc/modprobe.d/zram.conf" |
167 |
- |
168 |
-src_prepare() { |
169 |
- use prefix || sed -i \ |
170 |
- -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ |
171 |
- -e 's#PushA_=`push.sh 2>/dev/null`#PushA_=`cat '"${EPREFIX}"'/usr/share/push/push.sh`#' \ |
172 |
- -- sbin/zram-init || die |
173 |
- default |
174 |
-} |
175 |
- |
176 |
-src_install() { |
177 |
- doinitd openrc/init.d/* |
178 |
- doconfd openrc/conf.d/* |
179 |
- systemd_dounit systemd/system/* |
180 |
- insinto /etc/modprobe.d |
181 |
- doins modprobe.d/* |
182 |
- insinto /usr/share/zsh/site-functions |
183 |
- doins zsh/* |
184 |
- dodoc AUTHORS ChangeLog README.md |
185 |
- readme.gentoo_create_doc |
186 |
- into / |
187 |
- dosbin sbin/* |
188 |
- doman man/${PN}.8 |
189 |
-} |
190 |
- |
191 |
-pkg_postinst() { |
192 |
- readme.gentoo_print_elog |
193 |
-} |
194 |
|
195 |
diff --git a/sys-block/zram-init/zram-init-9999.ebuild b/sys-block/zram-init/zram-init-9999.ebuild |
196 |
index 87a6d31eaf2..adc7997651c 100644 |
197 |
--- a/sys-block/zram-init/zram-init-9999.ebuild |
198 |
+++ b/sys-block/zram-init/zram-init-9999.ebuild |
199 |
@@ -2,53 +2,70 @@ |
200 |
# Distributed under the terms of the GNU General Public License v2 |
201 |
|
202 |
EAPI=7 |
203 |
-inherit readme.gentoo-r1 systemd |
204 |
|
205 |
-DESCRIPTION="Scripts to support compressed swap devices or ramdisks with zram" |
206 |
-HOMEPAGE="https://github.com/vaeth/zram-init/" |
207 |
+inherit prefix readme.gentoo-r1 |
208 |
|
209 |
-LICENSE="GPL-2" |
210 |
-SLOT="0" |
211 |
-IUSE="" |
212 |
+DESCRIPTION="Scripts to support compressed swap devices or ramdisks with zRAM" |
213 |
+HOMEPAGE="https://github.com/vaeth/zram-init/" |
214 |
|
215 |
-if [[ ${PV} == *9999 ]] ; then |
216 |
- EGIT_REPO_URI="https://github.com/vaeth/${PN}.git" |
217 |
+if [[ ${PV} == *9999 ]]; then |
218 |
inherit git-r3 |
219 |
+ EGIT_REPO_URI="https://github.com/vaeth/${PN}.git" |
220 |
else |
221 |
SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
222 |
KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" |
223 |
fi |
224 |
|
225 |
-RDEPEND=">=app-shells/push-2.0 |
226 |
- !<sys-apps/openrc-0.13" |
227 |
+LICENSE="GPL-2" |
228 |
+SLOT="0" |
229 |
+ |
230 |
+BDEPEND="sys-devel/gettext" |
231 |
+ |
232 |
+RDEPEND=" |
233 |
+ >=app-shells/push-2.0 |
234 |
+ virtual/libintl |
235 |
+ || ( sys-apps/openrc sys-apps/systemd ) |
236 |
+" |
237 |
|
238 |
-DISABLE_AUTOFORMATTING="true" |
239 |
-DOC_CONTENTS="To use zram, activate it in your kernel and add it to default runlevel: |
240 |
- rc-config add zram default |
241 |
-If you use systemd enable zram_swap, tmp, and/or var_tmp with systemctl. |
242 |
-You might need to modify /etc/modprobe.d/zram.conf" |
243 |
+DISABLE_AUTOFORMATTING=true |
244 |
+DOC_CONTENTS="\ |
245 |
+To use zram-init, activate it in your kernel and add it to the default |
246 |
+runlevel: |
247 |
+ rc-update add zram-init default |
248 |
+If you use systemd enable zram_swap, zram_tmp, and/or zram_var_tmp with |
249 |
+systemctl. You might need to modify the following file depending on the |
250 |
+number of devices that you want to create: |
251 |
+ ${EROOT}/etc/modprobe.d/zram.conf. |
252 |
+If you use the \$TMPDIR as zRAM device with OpenRC, you should add zram-init |
253 |
+to the boot runlevel: |
254 |
+ rc-update add zram-init boot |
255 |
+Still for the same case, you should add in the OpenRC configuration file |
256 |
+for the services using \$TMPDIR the following line: |
257 |
+ rc_need=\"zram-init\"" |
258 |
|
259 |
src_prepare() { |
260 |
- use prefix || sed -i \ |
261 |
- -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ |
262 |
- -e 's#PushA_=`push.sh 2>/dev/null`#PushA_=`cat '"${EPREFIX}"'/usr/share/push/push.sh`#' \ |
263 |
- -- sbin/zram-init || die |
264 |
default |
265 |
+ |
266 |
+ hprefixify "${S}/man/${PN}.8" |
267 |
+ |
268 |
+ hprefixify -e "s%(}|:)(/(usr/)?sbin)%\1${EPREFIX}\2%g" \ |
269 |
+ "${S}/sbin/${PN}.in" |
270 |
+ |
271 |
+ hprefixify -e "s%( |=)(/tmp)%\1${EPREFIX}\2%g" \ |
272 |
+ "${S}/systemd/system"/* \ |
273 |
+ "${S}/openrc"/*/* |
274 |
+} |
275 |
+ |
276 |
+src_compile() { |
277 |
+ emake PREFIX="${EPREFIX}/usr" MODIFY_SHEBANG=FALSE |
278 |
} |
279 |
|
280 |
src_install() { |
281 |
- doinitd openrc/init.d/* |
282 |
- doconfd openrc/conf.d/* |
283 |
- systemd_dounit systemd/system/* |
284 |
- insinto /etc/modprobe.d |
285 |
- doins modprobe.d/* |
286 |
- insinto /usr/share/zsh/site-functions |
287 |
- doins zsh/* |
288 |
- dodoc AUTHORS ChangeLog README.md |
289 |
+ einstalldocs |
290 |
readme.gentoo_create_doc |
291 |
- into / |
292 |
- dosbin sbin/* |
293 |
- doman man/${PN}.8 |
294 |
+ |
295 |
+ emake DESTDIR="${ED}" PREFIX="/usr" SYSCONFDIR="/etc" \ |
296 |
+ BINDIR="${ED}/sbin" install |
297 |
} |
298 |
|
299 |
pkg_postinst() { |