1 |
commit: c3d149d6d75b441bf8f3292f3e5bbf97ea81c6d3 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Aug 26 12:21:30 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 26 12:26:07 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3d149d6 |
7 |
|
8 |
sys-apps/earlyoom: add 1.7 |
9 |
|
10 |
- Remove inappropriate USE=systemd (violates small file policy) and fix |
11 |
unit dir. |
12 |
- Rename USE=docs (should've been USE=doc anyway) to USE=man to be more |
13 |
accurate |
14 |
- Simplify ebuild |
15 |
- Use Bash tests per QA policy |
16 |
- Fix tests |
17 |
|
18 |
Closes: https://bugs.gentoo.org/843785 |
19 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
20 |
|
21 |
sys-apps/earlyoom/Manifest | 2 ++ |
22 |
sys-apps/earlyoom/earlyoom-1.7.ebuild | 61 ++++++++++++++++++++++++++++++++++ |
23 |
sys-apps/earlyoom/earlyoom-9999.ebuild | 50 ++++++++++++++++++---------- |
24 |
3 files changed, 95 insertions(+), 18 deletions(-) |
25 |
|
26 |
diff --git a/sys-apps/earlyoom/Manifest b/sys-apps/earlyoom/Manifest |
27 |
index 4afcde075831..c56a9dcc2fd8 100644 |
28 |
--- a/sys-apps/earlyoom/Manifest |
29 |
+++ b/sys-apps/earlyoom/Manifest |
30 |
@@ -1,2 +1,4 @@ |
31 |
DIST earlyoom-1.3.tar.gz 31399 BLAKE2B 3867540afb23493fbb532bcb72a5cfacca4ed297a053ff5e2c7e394bfa3640887e3e7c6430789bc1eda4b7a68680d8a74ab56b641fe9e5d4caa4406e2edb0667 SHA512 c5de742289e82c2098bd88c61dcb3e20eb022905a015b4894c95a4de3978ce18d794a9e7c17c97851ca9f8888728908f7bf978c014b3b69799bffa8b546d258a |
32 |
DIST earlyoom-1.6.2.tar.gz 49006 BLAKE2B 85a02d4171ba1bb94d5ddf573b8f5ac58d28a0cf9766f4fb2c96be5b45eee7aab853008c36f9e3aac76685b70008051faa2fe339797ecf9137469f089935a6b3 SHA512 d622a5347591d2017f6e62255940482af431e647acf1b35ab035e0dbfd44da7fc52633e6dd6433e42a1348fd294d766550ba092260f3ec59bd51e545f08e466b |
33 |
+DIST earlyoom-1.7-deps.tar.xz 1974036 BLAKE2B ff378ae64b6b293e3b9d9fa05607209a515edadd18edcb70e204de1e0808b06dfaca7e6dcddeffbda9dae8abbadf7ac6074df725997b96be8a8d8cc35ac4d8c8 SHA512 67072000f8695935f77494faca84c74c67de4b9a4b3b889b310ad674f28c7ed85a0d59e91f4d5caa06cc1d7c1e7ef31aa3a373851361b905dc29e6d4d04eeeb9 |
34 |
+DIST earlyoom-1.7.tar.gz 52210 BLAKE2B c8338434160e4ccaa5ee64299487ca47a3d94e894362c320cf8210caf895a34c7abb584654afcdcb6fc1e058d53c1fa7eb740477acb104ed295700faccbcbdc1 SHA512 5732632c38d9b511aaa81845b3d8f8afe737aa6498dca7e31accaf18bfcf271ba436946aa06a514a34c953f99343f9b197d8a2b8751e16d336aeb084944f3602 |
35 |
|
36 |
diff --git a/sys-apps/earlyoom/earlyoom-1.7.ebuild b/sys-apps/earlyoom/earlyoom-1.7.ebuild |
37 |
new file mode 100644 |
38 |
index 000000000000..42e4a6373240 |
39 |
--- /dev/null |
40 |
+++ b/sys-apps/earlyoom/earlyoom-1.7.ebuild |
41 |
@@ -0,0 +1,61 @@ |
42 |
+# Copyright 2020-2022 Gentoo Authors |
43 |
+# Distributed under the terms of the GNU General Public License v2 |
44 |
+ |
45 |
+EAPI=8 |
46 |
+ |
47 |
+GO_OPTIONAL=1 |
48 |
+inherit go-module systemd toolchain-funcs |
49 |
+ |
50 |
+DESCRIPTION="Early OOM Daemon for Linux" |
51 |
+HOMEPAGE="https://github.com/rfjakob/earlyoom" |
52 |
+ |
53 |
+if [[ ${PV} == 9999 ]] ; then |
54 |
+ EGIT_REPO_URI="https://github.com/rfjakob/earlyoom.git" |
55 |
+ inherit git-r3 |
56 |
+else |
57 |
+ SRC_URI="https://github.com/rfjakob/earlyoom/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
58 |
+ SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz )" |
59 |
+ |
60 |
+ KEYWORDS="~amd64 ~x86" |
61 |
+fi |
62 |
+ |
63 |
+LICENSE="MIT-with-advertising" |
64 |
+SLOT="0" |
65 |
+IUSE="man test" |
66 |
+RESTRICT="!test? ( test )" |
67 |
+ |
68 |
+BDEPEND=" |
69 |
+ man? ( virtual/pandoc ) |
70 |
+ test? ( dev-lang/go ) |
71 |
+" |
72 |
+ |
73 |
+src_unpack() { |
74 |
+ default |
75 |
+ |
76 |
+ use test && go-module_src_unpack |
77 |
+} |
78 |
+ |
79 |
+src_compile() { |
80 |
+ tc-export CC |
81 |
+ |
82 |
+ emake \ |
83 |
+ PREFIX="${EPREFIX}"/usr \ |
84 |
+ VERSION="v${PV}" \ |
85 |
+ SYSTEMDUNITDIR="$(systemd_get_systemunitdir)" \ |
86 |
+ earlyoom earlyoom.service $(usev man 'earlyoom.1') |
87 |
+} |
88 |
+ |
89 |
+src_install() { |
90 |
+ dobin earlyoom |
91 |
+ |
92 |
+ use man && doman earlyoom.1 |
93 |
+ |
94 |
+ insinto /etc/default |
95 |
+ newins earlyoom.default earlyoom |
96 |
+ |
97 |
+ dodir /etc/conf.d |
98 |
+ dosym -r /etc/default/earlyoom /etc/conf.d/earlyoom |
99 |
+ |
100 |
+ newinitd "${FILESDIR}"/${PN}-r1 ${PN} |
101 |
+ systemd_dounit earlyoom.service |
102 |
+} |
103 |
|
104 |
diff --git a/sys-apps/earlyoom/earlyoom-9999.ebuild b/sys-apps/earlyoom/earlyoom-9999.ebuild |
105 |
index 6a2d2be6cf4e..42e4a6373240 100644 |
106 |
--- a/sys-apps/earlyoom/earlyoom-9999.ebuild |
107 |
+++ b/sys-apps/earlyoom/earlyoom-9999.ebuild |
108 |
@@ -1,47 +1,61 @@ |
109 |
-# Copyright 2020-2021 Gentoo Authors |
110 |
+# Copyright 2020-2022 Gentoo Authors |
111 |
# Distributed under the terms of the GNU General Public License v2 |
112 |
|
113 |
-EAPI=7 |
114 |
+EAPI=8 |
115 |
|
116 |
-inherit systemd |
117 |
+GO_OPTIONAL=1 |
118 |
+inherit go-module systemd toolchain-funcs |
119 |
|
120 |
DESCRIPTION="Early OOM Daemon for Linux" |
121 |
HOMEPAGE="https://github.com/rfjakob/earlyoom" |
122 |
|
123 |
-LICENSE="MIT-with-advertising" |
124 |
-SLOT="0" |
125 |
-if [ "${PV}" = "9999" ]; then |
126 |
+if [[ ${PV} == 9999 ]] ; then |
127 |
EGIT_REPO_URI="https://github.com/rfjakob/earlyoom.git" |
128 |
inherit git-r3 |
129 |
else |
130 |
SRC_URI="https://github.com/rfjakob/earlyoom/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
131 |
+ SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz )" |
132 |
+ |
133 |
KEYWORDS="~amd64 ~x86" |
134 |
fi |
135 |
-IUSE="docs systemd test" |
136 |
|
137 |
-RDEPEND="" |
138 |
-DEPEND="" |
139 |
+LICENSE="MIT-with-advertising" |
140 |
+SLOT="0" |
141 |
+IUSE="man test" |
142 |
+RESTRICT="!test? ( test )" |
143 |
+ |
144 |
BDEPEND=" |
145 |
- docs? ( app-text/pandoc ) |
146 |
+ man? ( virtual/pandoc ) |
147 |
test? ( dev-lang/go ) |
148 |
" |
149 |
|
150 |
-#tests don't work |
151 |
-RESTRICT=test |
152 |
+src_unpack() { |
153 |
+ default |
154 |
+ |
155 |
+ use test && go-module_src_unpack |
156 |
+} |
157 |
|
158 |
src_compile() { |
159 |
- VERSION="v${PV}" emake earlyoom |
160 |
- use docs && VERSION="v${PV}" emake earlyoom.1 |
161 |
- use systemd && emake PREFIX=/usr earlyoom.service |
162 |
+ tc-export CC |
163 |
+ |
164 |
+ emake \ |
165 |
+ PREFIX="${EPREFIX}"/usr \ |
166 |
+ VERSION="v${PV}" \ |
167 |
+ SYSTEMDUNITDIR="$(systemd_get_systemunitdir)" \ |
168 |
+ earlyoom earlyoom.service $(usev man 'earlyoom.1') |
169 |
} |
170 |
|
171 |
src_install() { |
172 |
dobin earlyoom |
173 |
- use docs && doman earlyoom.1 |
174 |
+ |
175 |
+ use man && doman earlyoom.1 |
176 |
|
177 |
insinto /etc/default |
178 |
newins earlyoom.default earlyoom |
179 |
|
180 |
- doinitd "${FILESDIR}/${PN}" |
181 |
- use systemd && systemd_dounit earlyoom.service |
182 |
+ dodir /etc/conf.d |
183 |
+ dosym -r /etc/default/earlyoom /etc/conf.d/earlyoom |
184 |
+ |
185 |
+ newinitd "${FILESDIR}"/${PN}-r1 ${PN} |
186 |
+ systemd_dounit earlyoom.service |
187 |
} |