Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/alsa-lib/, media-libs/alsa-lib/files/
Date: Thu, 20 Feb 2020 15:49:49
Message-Id: 1582213773.ca92929fd4d999f04d0e8c5aa5e78af9cc3eb229.polynomial-c@gentoo
1 commit: ca92929fd4d999f04d0e8c5aa5e78af9cc3eb229
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 20 15:49:00 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 20 15:49:33 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca92929f
7
8 media-libs/alsa-lib: Removed old
9
10 Package-Manager: Portage-2.3.89, Repoman-2.3.20
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 media-libs/alsa-lib/Manifest | 3 -
14 media-libs/alsa-lib/alsa-lib-1.1.2.ebuild | 86 ----------------------
15 media-libs/alsa-lib/alsa-lib-1.1.9.ebuild | 83 ---------------------
16 media-libs/alsa-lib/alsa-lib-1.2.1.1-r1.ebuild | 86 ----------------------
17 .../alsa-lib-1.2.1.1-ucm_add_asoundlib_h.patch | 25 -------
18 5 files changed, 283 deletions(-)
19
20 diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
21 index 0fab83a64ee..b4503372211 100644
22 --- a/media-libs/alsa-lib/Manifest
23 +++ b/media-libs/alsa-lib/Manifest
24 @@ -1,6 +1,3 @@
25 -DIST alsa-lib-1.1.2.tar.bz2 947423 BLAKE2B 09cd6a625d8f681c5515fd925191fb5468158ed77cc3878c076f4344e4d8f7b15e9872d3d6635710049ca14199851f2343246e94810fe2a0bb0d1e02915c941e SHA512 a6c6675b1fd86955ef5072b9e6090795fc6b0b16f32481bece049e5f100e689be48b6416ff7cf36abfc67e0b94f420e08c15ff13a9701987d6bb69a8fa567e8a
26 DIST alsa-lib-1.1.8.tar.bz2 1002562 BLAKE2B a531ab501943924d007f7ae0e4489deea805ccbc8f2f02d3ee392aa2dbe54ffe31f58ee1744308f851a68f693c83125088708e901d0d83e4a7a5f644ef448aa3 SHA512 50ae107c6efe8200b4c41e0463e099d16e149332f1d3a22c3e81d3e7d980b7f93f3610fc9711ef62067caeb1054e7ea612ba3903bf8a91ebeffa48687cf80eed
27 -DIST alsa-lib-1.1.9.tar.bz2 1058187 BLAKE2B 60454be162a0f36334602586762f8ce657d2883636bcb65ae91dedce62297bd40f3dbdc6213ef773542708b367f8796e143b1fc987c40de6d5d5a69a648f6b18 SHA512 402e39cca82d17555e3e52ef06b8ed9dcf58531da393809a7b5cf18658299fa90ee8a60bfc5213482d7a02b13140c441f1333b144556f44ab4adb786a2fb3c49
28 -DIST alsa-lib-1.2.1.1.tar.bz2 1002960 BLAKE2B 6df2145e0fdd42b86759a6250f6fa3d18075d1bbff1c5ec0b4b6130f934ab369e5cc0edd9a53c3b6298dce0d374a9888c5fc63ae0d42b3fd0ef5ca97eff00369 SHA512 8a0b6f1ecc58d60991b4509e791b1581eebae57cd754b0b4829e66b1cfee81d588b04f42a17f598f06310b9658d9f46fd748cca516cc48b6f2989389c22c42e9
29 DIST alsa-lib-1.2.1.2.tar.bz2 1004129 BLAKE2B e8bf117f3036a32b020897f16b9648ac105c499f547ae157508720502722d4e1a651719c86a4e2756ca7a3c573a1f17c02524125ccaad12bcb8c7c71675c898a SHA512 e8286fd55f63ee0d95513279d0885c287533de89b7af6c338413dec5d38ba4f5a15da1a4a4ce36e052614e4b730e3778782dab9979d82958283be17b48604913
30 DIST alsa-lib-1.2.2.tar.bz2 1030747 BLAKE2B 176054c7783452fcd0b30482f4d85fb88a1364a97f79830f2c22cd578275280fa64537d00a08f3e3b1420e4aeb4e4269c7523cb4296db3ed095bcf078b452726 SHA512 d21adb3ff998918c7d1820f9ce2aaf4202dd45ccb87cb092d49da8b2402b6ddaad06325be0fd59f17393a5d9958e3743bfccb4b14bdb947a42e7d791d73c7033
31
32 diff --git a/media-libs/alsa-lib/alsa-lib-1.1.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.2.ebuild
33 deleted file mode 100644
34 index 11c4a371fbd..00000000000
35 --- a/media-libs/alsa-lib/alsa-lib-1.1.2.ebuild
36 +++ /dev/null
37 @@ -1,86 +0,0 @@
38 -# Copyright 1999-2020 Gentoo Authors
39 -# Distributed under the terms of the GNU General Public License v2
40 -
41 -EAPI=6
42 -
43 -# no support for python3_2 or above yet wrt #471326
44 -PYTHON_COMPAT=( python2_7 )
45 -
46 -inherit autotools eutils ltprune multilib multilib-minimal python-single-r1
47 -
48 -DESCRIPTION="Advanced Linux Sound Architecture Library"
49 -HOMEPAGE="https://alsa-project.org/"
50 -SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
51 -
52 -LICENSE="LGPL-2.1"
53 -SLOT="0"
54 -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
55 -IUSE="alisp debug doc elibc_uclibc python"
56 -
57 -RDEPEND="python? ( ${PYTHON_DEPS} )"
58 -DEPEND="${RDEPEND}
59 - doc? ( >=app-doc/doxygen-1.2.6 )"
60 -
61 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
62 -
63 -pkg_setup() {
64 - use python && python-single-r1_pkg_setup
65 -}
66 -
67 -src_prepare() {
68 - find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
69 - # https://bugs.gentoo.org/509886
70 - use elibc_uclibc && { sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die; }
71 - # https://bugs.gentoo.org/545950
72 - sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
73 - default
74 - eautoreconf
75 -}
76 -
77 -multilib_src_configure() {
78 - local myconf
79 - # enable Python only on final ABI
80 - if multilib_is_native_abi; then
81 - myconf="$(use_enable python)"
82 - else
83 - myconf="--disable-python"
84 - fi
85 - use elibc_uclibc && myconf+=" --without-versioned"
86 -
87 - ECONF_SOURCE=${S} \
88 - econf \
89 - --disable-maintainer-mode \
90 - --enable-shared \
91 - --disable-resmgr \
92 - --enable-rawmidi \
93 - --enable-seq \
94 - --enable-aload \
95 - $(use_with debug) \
96 - $(use_enable alisp) \
97 - ${myconf}
98 -}
99 -
100 -multilib_src_compile() {
101 - emake
102 -
103 - if multilib_is_native_abi && use doc; then
104 - emake doc
105 - fgrep -Zrl "${S}" doc/doxygen/html | \
106 - xargs -0 sed -i -e "s:${S}::"
107 - fi
108 -}
109 -
110 -multilib_src_install() {
111 - emake DESTDIR="${D}" install
112 - if multilib_is_native_abi && use doc; then
113 - docinto html
114 - dodoc -r doc/doxygen/html/.
115 - fi
116 -}
117 -
118 -multilib_src_install_all() {
119 - prune_libtool_files --all
120 - find "${ED}"/usr/$(get_libdir)/alsa-lib -name '*.a' -exec rm -f {} +
121 - docinto ""
122 - dodoc ChangeLog doc/asoundrc.txt NOTES TODO
123 -}
124
125 diff --git a/media-libs/alsa-lib/alsa-lib-1.1.9.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.9.ebuild
126 deleted file mode 100644
127 index ba510e92609..00000000000
128 --- a/media-libs/alsa-lib/alsa-lib-1.1.9.ebuild
129 +++ /dev/null
130 @@ -1,83 +0,0 @@
131 -# Copyright 1999-2020 Gentoo Authors
132 -# Distributed under the terms of the GNU General Public License v2
133 -
134 -EAPI=7
135 -
136 -PYTHON_COMPAT=( python{2_7,3_{6,7}} )
137 -
138 -inherit autotools multilib multilib-minimal python-single-r1
139 -
140 -DESCRIPTION="Advanced Linux Sound Architecture Library"
141 -HOMEPAGE="https://alsa-project.org/"
142 -SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
143 -
144 -LICENSE="LGPL-2.1"
145 -SLOT="0"
146 -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
147 -IUSE="alisp debug doc elibc_uclibc python +thread-safety"
148 -
149 -RDEPEND="python? ( ${PYTHON_DEPS} )"
150 -DEPEND="${RDEPEND}
151 - doc? ( >=app-doc/doxygen-1.2.6 )"
152 -
153 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
154 -
155 -PATCHES=(
156 - "${FILESDIR}/${PN}-1.1.6-missing_files.patch" #652422
157 -)
158 -
159 -pkg_setup() {
160 - use python && python-single-r1_pkg_setup
161 -}
162 -
163 -src_prepare() {
164 - find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
165 - # https://bugs.gentoo.org/509886
166 - use elibc_uclibc && { sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die; }
167 - # https://bugs.gentoo.org/545950
168 - sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
169 - default
170 - eautoreconf
171 -}
172 -
173 -multilib_src_configure() {
174 - local myeconfargs=(
175 - --disable-maintainer-mode
176 - --disable-resmgr
177 - --enable-aload
178 - --enable-rawmidi
179 - --enable-seq
180 - --enable-shared
181 - # enable Python only on final ABI
182 - $(multilib_native_use_enable python)
183 - $(use_enable alisp)
184 - $(use_enable thread-safety)
185 - $(use_with debug)
186 - $(usex elibc_uclibc --without-versioned '')
187 - )
188 -
189 - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
190 -}
191 -
192 -multilib_src_compile() {
193 - emake
194 -
195 - if multilib_is_native_abi && use doc; then
196 - emake doc
197 - grep -FZrl "${S}" doc/doxygen/html | \
198 - xargs -0 sed -i -e "s:${S}::"
199 - fi
200 -}
201 -
202 -multilib_src_install() {
203 - emake DESTDIR="${D}" install
204 - if multilib_is_native_abi && use doc; then
205 - docinto html
206 - dodoc -r doc/doxygen/html/.
207 - fi
208 -}
209 -
210 -multilib_src_install_all() {
211 - find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
212 - dodoc ChangeLog doc/asoundrc.txt NOTES TODO
213 -}
214
215 diff --git a/media-libs/alsa-lib/alsa-lib-1.2.1.1-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.1.1-r1.ebuild
216 deleted file mode 100644
217 index a9f1cec6097..00000000000
218 --- a/media-libs/alsa-lib/alsa-lib-1.2.1.1-r1.ebuild
219 +++ /dev/null
220 @@ -1,86 +0,0 @@
221 -# Copyright 1999-2020 Gentoo Authors
222 -# Distributed under the terms of the GNU General Public License v2
223 -
224 -EAPI=7
225 -
226 -PYTHON_COMPAT=( python{2_7,3_{6,7}} )
227 -
228 -inherit autotools multilib multilib-minimal python-single-r1
229 -
230 -DESCRIPTION="Advanced Linux Sound Architecture Library"
231 -HOMEPAGE="https://alsa-project.org/"
232 -SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
233 -
234 -LICENSE="LGPL-2.1"
235 -SLOT="0"
236 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
237 -IUSE="alisp debug doc elibc_uclibc python +thread-safety"
238 -
239 -RDEPEND="python? ( ${PYTHON_DEPS} )"
240 -DEPEND="${RDEPEND}
241 - doc? ( >=app-doc/doxygen-1.2.6 )"
242 -
243 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
244 -
245 -PATCHES=(
246 - "${FILESDIR}/${PN}-1.1.6-missing_files.patch" #652422
247 - "${FILESDIR}/${P}-ucm_add_asoundlib_h.patch" #700870
248 -)
249 -
250 -pkg_setup() {
251 - use python && python-single-r1_pkg_setup
252 -}
253 -
254 -src_prepare() {
255 - find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
256 - # https://bugs.gentoo.org/509886
257 - if use elibc_uclibc ; then
258 - sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die
259 - fi
260 - # https://bugs.gentoo.org/545950
261 - sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
262 - default
263 - eautoreconf
264 -}
265 -
266 -multilib_src_configure() {
267 - local myeconfargs=(
268 - --disable-maintainer-mode
269 - --disable-resmgr
270 - --enable-aload
271 - --enable-rawmidi
272 - --enable-seq
273 - --enable-shared
274 - # enable Python only on final ABI
275 - $(multilib_native_use_enable python)
276 - $(use_enable alisp)
277 - $(use_enable thread-safety)
278 - $(use_with debug)
279 - $(usex elibc_uclibc --without-versioned '')
280 - )
281 -
282 - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
283 -}
284 -
285 -multilib_src_compile() {
286 - emake
287 -
288 - if multilib_is_native_abi && use doc; then
289 - emake doc
290 - grep -FZrl "${S}" doc/doxygen/html | \
291 - xargs -0 sed -i -e "s:${S}::"
292 - fi
293 -}
294 -
295 -multilib_src_install() {
296 - emake DESTDIR="${D}" install
297 - if multilib_is_native_abi && use doc; then
298 - docinto html
299 - dodoc -r doc/doxygen/html/.
300 - fi
301 -}
302 -
303 -multilib_src_install_all() {
304 - find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die
305 - dodoc ChangeLog doc/asoundrc.txt NOTES TODO
306 -}
307
308 diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.1.1-ucm_add_asoundlib_h.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.1.1-ucm_add_asoundlib_h.patch
309 deleted file mode 100644
310 index 3c6072b8c3d..00000000000
311 --- a/media-libs/alsa-lib/files/alsa-lib-1.2.1.1-ucm_add_asoundlib_h.patch
312 +++ /dev/null
313 @@ -1,25 +0,0 @@
314 -From: Jaroslav Kysela <perex@×××××.cz>
315 -Date: Sat, 23 Nov 2019 14:38:35 +0000 (+0100)
316 -Subject: ucm: use-case.h - add <alsa/asoundlib.h> include
317 -X-Git-Url: https://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff_plain;h=1a4b362115b5e1bb4f5b888919ffd11736adbf0c
318 -
319 -ucm: use-case.h - add <alsa/asoundlib.h> include
320 -
321 -It is required for snd_ctl_elem_id_t and snd_mixer_selem_id_t.
322 -
323 -Signed-off-by: Jaroslav Kysela <perex@×××××.cz>
324 ----
325 -
326 -diff --git a/include/use-case.h b/include/use-case.h
327 -index 8a37121..80073ef 100644
328 ---- a/include/use-case.h
329 -+++ b/include/use-case.h
330 -@@ -42,6 +42,8 @@
331 - extern "C" {
332 - #endif
333 -
334 -+#include <alsa/asoundlib.h>
335 -+
336 - /**
337 - * \defgroup ucm Use Case Interface
338 - * The ALSA Use Case manager interface.