Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michal Gorny (mgorny)" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/emul-linux-x86-soundlibs: emul-linux-x86-soundlibs-20131008-r2.ebuild metadata.xml ChangeLog
Date: Sun, 01 Dec 2013 09:30:15
Message-Id: 20131201093010.78EEA2004B@flycatcher.gentoo.org
1 mgorny 13/12/01 09:30:10
2
3 Modified: emul-linux-x86-soundlibs-20131008-r2.ebuild
4 metadata.xml ChangeLog
5 Log:
6 Add USE=pulseaudio to disable PulseAudio support on multilib variant.
7
8 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
9
10 Revision Changes Path
11 1.3 app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild?rev=1.3&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild?rev=1.3&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild?r1=1.2&r2=1.3
16
17 Index: emul-linux-x86-soundlibs-20131008-r2.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild,v
20 retrieving revision 1.2
21 retrieving revision 1.3
22 diff -u -r1.2 -r1.3
23 --- emul-linux-x86-soundlibs-20131008-r2.ebuild 30 Nov 2013 21:41:55 -0000 1.2
24 +++ emul-linux-x86-soundlibs-20131008-r2.ebuild 1 Dec 2013 09:30:10 -0000 1.3
25 @@ -1,13 +1,13 @@
26 # Copyright 1999-2013 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild,v 1.2 2013/11/30 21:41:55 mgorny Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild,v 1.3 2013/12/01 09:30:10 mgorny Exp $
30
31 EAPI=5
32 inherit emul-linux-x86
33
34 LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1 LGPL-2 MIT gsm public-domain"
35 KEYWORDS="-* amd64"
36 -IUSE="abi_x86_32 alsa"
37 +IUSE="abi_x86_32 alsa +pulseaudio"
38
39 RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}[abi_x86_32=]
40 ~app-emulation/emul-linux-x86-medialibs-${PV}[abi_x86_32=]
41 @@ -38,9 +38,17 @@
42 >=media-libs/portaudio-19_pre20111121-r1[abi_x86_32(-)]
43 >=media-sound/mpg123-1.15.4-r1[abi_x86_32(-)]
44 >=media-libs/libao-1.1.0-r1[abi_x86_32(-)]
45 - >=media-sound/pulseaudio-4.0-r1[abi_x86_32(-)]
46 + pulseaudio? ( >=media-sound/pulseaudio-4.0-r1[abi_x86_32(-)] )
47 )"
48
49 +pkg_pretend() {
50 + if use abi_x86_32 && ! use pulseaudio; then
51 + ewarn "You have disabled USE=pulseaudio. This is known to break pre-built"
52 + ewarn "libavfilter in emul-linux-x86-medialibs. If you need that, please"
53 + ewarn "turn USE=pulseaudio back on."
54 + fi
55 +}
56 +
57 src_prepare() {
58 _ALLOWED="${S}/etc/env.d"
59 use alsa && _ALLOWED="${_ALLOWED}|${S}/usr/bin/aoss"
60
61
62
63 1.9 app-emulation/emul-linux-x86-soundlibs/metadata.xml
64
65 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/metadata.xml?rev=1.9&view=markup
66 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/metadata.xml?rev=1.9&content-type=text/plain
67 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/metadata.xml?r1=1.8&r2=1.9
68
69 Index: metadata.xml
70 ===================================================================
71 RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/metadata.xml,v
72 retrieving revision 1.8
73 retrieving revision 1.9
74 diff -u -r1.8 -r1.9
75 --- metadata.xml 22 Aug 2013 16:01:10 -0000 1.8
76 +++ metadata.xml 1 Dec 2013 09:30:10 -0000 1.9
77 @@ -5,5 +5,8 @@
78 <email>multilib@g.o</email>
79 <name>Gentoo multilib project</name>
80 </maintainer>
81 - <use><flag name="development">Install pkgconfig files</flag></use>
82 + <use>
83 + <flag name="development">Install pkgconfig files</flag>
84 + <flag name="pulseaudio">Pull in pulseaudio if using USE=abi_x86_32</flag>
85 + </use>
86 </pkgmetadata>
87
88
89
90 1.112 app-emulation/emul-linux-x86-soundlibs/ChangeLog
91
92 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog?rev=1.112&view=markup
93 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog?rev=1.112&content-type=text/plain
94 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog?r1=1.111&r2=1.112
95
96 Index: ChangeLog
97 ===================================================================
98 RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v
99 retrieving revision 1.111
100 retrieving revision 1.112
101 diff -u -r1.111 -r1.112
102 --- ChangeLog 30 Nov 2013 21:41:55 -0000 1.111
103 +++ ChangeLog 1 Dec 2013 09:30:10 -0000 1.112
104 @@ -1,6 +1,10 @@
105 # ChangeLog for app-emulation/emul-linux-x86-soundlibs
106 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
107 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.111 2013/11/30 21:41:55 mgorny Exp $
108 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.112 2013/12/01 09:30:10 mgorny Exp $
109 +
110 + 01 Dec 2013; Michał Górny <mgorny@g.o>
111 + emul-linux-x86-soundlibs-20131008-r2.ebuild, metadata.xml:
112 + Add USE=pulseaudio to disable PulseAudio support on multilib variant.
113
114 30 Nov 2013; Michał Górny <mgorny@g.o>
115 emul-linux-x86-soundlibs-20131008-r2.ebuild:
Report Message
Find on MARC Find on Google Groups