1 |
commit: 981e34cfd95e60c1f55fbab8dd86fd93bb19fe0c |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 8 07:41:56 2021 +0000 |
4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 8 11:19:35 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=981e34cf |
7 |
|
8 |
app-arch/brotli: Drop 1.0.9-r1 and 1.0.9-r2 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/811681 |
11 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
Closes: https://github.com/gentoo/gentoo/pull/22514 |
14 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
15 |
|
16 |
app-arch/brotli/brotli-1.0.9-r1.ebuild | 84 --------------------------------- |
17 |
app-arch/brotli/brotli-1.0.9-r2.ebuild | 85 ---------------------------------- |
18 |
2 files changed, 169 deletions(-) |
19 |
|
20 |
diff --git a/app-arch/brotli/brotli-1.0.9-r1.ebuild b/app-arch/brotli/brotli-1.0.9-r1.ebuild |
21 |
deleted file mode 100644 |
22 |
index d03b1d78ade..00000000000 |
23 |
--- a/app-arch/brotli/brotli-1.0.9-r1.ebuild |
24 |
+++ /dev/null |
25 |
@@ -1,84 +0,0 @@ |
26 |
-# Copyright 1999-2021 Gentoo Authors |
27 |
-# Distributed under the terms of the GNU General Public License v2 |
28 |
- |
29 |
-EAPI=7 |
30 |
- |
31 |
-PYTHON_COMPAT=( python3_{8..10} pypy3 ) |
32 |
-DISTUTILS_OPTIONAL="1" |
33 |
-DISTUTILS_IN_SOURCE_BUILD="1" |
34 |
- |
35 |
-inherit cmake-multilib distutils-r1 |
36 |
- |
37 |
-DESCRIPTION="Generic-purpose lossless compression algorithm" |
38 |
-HOMEPAGE="https://github.com/google/brotli" |
39 |
- |
40 |
-SLOT="0/$(ver_cut 1)" |
41 |
- |
42 |
-RDEPEND="python? ( ${PYTHON_DEPS} )" |
43 |
-DEPEND="${RDEPEND}" |
44 |
- |
45 |
-IUSE="python test" |
46 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
47 |
- |
48 |
-LICENSE="MIT python? ( Apache-2.0 )" |
49 |
- |
50 |
-DOCS=( README.md CONTRIBUTING.md ) |
51 |
- |
52 |
-if [[ ${PV} == "9999" ]] ; then |
53 |
- SRC_URI="" |
54 |
- EGIT_REPO_URI="https://github.com/google/${PN}.git" |
55 |
- inherit git-r3 |
56 |
-else |
57 |
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" |
58 |
- SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
59 |
-fi |
60 |
- |
61 |
-# tests are currently broken, see https://github.com/google/brotli/issues/850 |
62 |
-RESTRICT="test" |
63 |
- |
64 |
-PATCHES=( |
65 |
- "${FILESDIR}/${PV}-linker.patch" |
66 |
-) |
67 |
- |
68 |
-src_prepare() { |
69 |
- use python && distutils-r1_src_prepare |
70 |
- cmake-utils_src_prepare |
71 |
-} |
72 |
- |
73 |
-multilib_src_configure() { |
74 |
- local mycmakeargs=( |
75 |
- -DBUILD_TESTING="$(usex test)" |
76 |
- ) |
77 |
- cmake-utils_src_configure |
78 |
-} |
79 |
-src_configure() { |
80 |
- cmake-multilib_src_configure |
81 |
- use python && distutils-r1_src_configure |
82 |
-} |
83 |
- |
84 |
-multilib_src_compile() { |
85 |
- cmake-utils_src_compile |
86 |
-} |
87 |
-src_compile() { |
88 |
- cmake-multilib_src_compile |
89 |
- use python && distutils-r1_src_compile |
90 |
-} |
91 |
- |
92 |
-python_test() { |
93 |
- esetup.py test || die |
94 |
-} |
95 |
- |
96 |
-multilib_src_test() { |
97 |
- cmake-utils_src_test |
98 |
-} |
99 |
-src_test() { |
100 |
- cmake-multilib_src_test |
101 |
- use python && distutils-r1_src_test |
102 |
-} |
103 |
- |
104 |
-multilib_src_install() { |
105 |
- cmake-utils_src_install |
106 |
-} |
107 |
-multilib_src_install_all() { |
108 |
- use python && distutils-r1_src_install |
109 |
-} |
110 |
|
111 |
diff --git a/app-arch/brotli/brotli-1.0.9-r2.ebuild b/app-arch/brotli/brotli-1.0.9-r2.ebuild |
112 |
deleted file mode 100644 |
113 |
index 73fbca2867f..00000000000 |
114 |
--- a/app-arch/brotli/brotli-1.0.9-r2.ebuild |
115 |
+++ /dev/null |
116 |
@@ -1,85 +0,0 @@ |
117 |
-# Copyright 1999-2021 Gentoo Authors |
118 |
-# Distributed under the terms of the GNU General Public License v2 |
119 |
- |
120 |
-EAPI=7 |
121 |
- |
122 |
-PYTHON_COMPAT=( python3_{8..10} pypy3 ) |
123 |
-DISTUTILS_OPTIONAL="1" |
124 |
-DISTUTILS_IN_SOURCE_BUILD="1" |
125 |
- |
126 |
-inherit cmake-multilib distutils-r1 |
127 |
- |
128 |
-DESCRIPTION="Generic-purpose lossless compression algorithm" |
129 |
-HOMEPAGE="https://github.com/google/brotli" |
130 |
- |
131 |
-SLOT="0/$(ver_cut 1)" |
132 |
- |
133 |
-RDEPEND="python? ( ${PYTHON_DEPS} )" |
134 |
-DEPEND="${RDEPEND}" |
135 |
- |
136 |
-IUSE="python static-libs test" |
137 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
138 |
- |
139 |
-LICENSE="MIT python? ( Apache-2.0 )" |
140 |
- |
141 |
-DOCS=( README.md CONTRIBUTING.md ) |
142 |
- |
143 |
-if [[ ${PV} == "9999" ]] ; then |
144 |
- SRC_URI="" |
145 |
- EGIT_REPO_URI="https://github.com/google/${PN}.git" |
146 |
- inherit git-r3 |
147 |
-else |
148 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" |
149 |
- SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
150 |
-fi |
151 |
- |
152 |
-# tests are currently broken, see https://github.com/google/brotli/issues/850 |
153 |
-RESTRICT="test" |
154 |
- |
155 |
-PATCHES=( |
156 |
- "${FILESDIR}/${PV}-linker.patch" |
157 |
-) |
158 |
- |
159 |
-src_prepare() { |
160 |
- use python && distutils-r1_src_prepare |
161 |
- cmake-utils_src_prepare |
162 |
-} |
163 |
- |
164 |
-multilib_src_configure() { |
165 |
- local mycmakeargs=( |
166 |
- -DBUILD_TESTING="$(usex test)" |
167 |
- ) |
168 |
- cmake-utils_src_configure |
169 |
-} |
170 |
-src_configure() { |
171 |
- cmake-multilib_src_configure |
172 |
- use python && distutils-r1_src_configure |
173 |
-} |
174 |
- |
175 |
-multilib_src_compile() { |
176 |
- cmake-utils_src_compile |
177 |
-} |
178 |
-src_compile() { |
179 |
- cmake-multilib_src_compile |
180 |
- use python && distutils-r1_src_compile |
181 |
-} |
182 |
- |
183 |
-python_test() { |
184 |
- esetup.py test || die |
185 |
-} |
186 |
- |
187 |
-multilib_src_test() { |
188 |
- cmake-utils_src_test |
189 |
-} |
190 |
-src_test() { |
191 |
- cmake-multilib_src_test |
192 |
- use python && distutils-r1_src_test |
193 |
-} |
194 |
- |
195 |
-multilib_src_install() { |
196 |
- cmake-utils_src_install |
197 |
- use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a || die |
198 |
-} |
199 |
-multilib_src_install_all() { |
200 |
- use python && distutils-r1_src_install |
201 |
-} |