Gentoo Archives: gentoo-commits

From: Gilles Dartiguelongue <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/eva:master commit in: media-sound/pulseaudio/
Date: Tue, 03 Nov 2015 23:19:27
Message-Id: 1446592701.e0a20ff580b8c99e309b5df25e3e44d459280814.eva@gentoo
1 commit: e0a20ff580b8c99e309b5df25e3e44d459280814
2 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 3 23:16:25 2015 +0000
4 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 3 23:18:21 2015 +0000
6 URL: https://gitweb.gentoo.org/dev/eva.git/commit/?id=e0a20ff5
7
8 media-sound/pulseaudio: use openssl slot and switch to libltdl
9
10 As in gentoo-x86 tree
11
12 media-sound/pulseaudio/pulseaudio-4.0-r1.ebuild | 8 ++++----
13 media-sound/pulseaudio/pulseaudio-5.0-r3.ebuild | 9 +++++----
14 media-sound/pulseaudio/pulseaudio-9999.ebuild | 9 +++++----
15 3 files changed, 14 insertions(+), 12 deletions(-)
16
17 diff --git a/media-sound/pulseaudio/pulseaudio-4.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-4.0-r1.ebuild
18 index fda4fdd..2f1798b 100644
19 --- a/media-sound/pulseaudio/pulseaudio-4.0-r1.ebuild
20 +++ b/media-sound/pulseaudio/pulseaudio-4.0-r1.ebuild
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2014 Gentoo Foundation
23 +# Copyright 1999-2015 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 # $Id$
26
27 @@ -62,7 +62,7 @@ RDEPEND="
28 realtime? ( sys-auth/rtkit )
29 equalizer? ( sci-libs/fftw:3.0 )
30 orc? ( >=dev-lang/orc-0.4.9 )
31 - ssl? ( dev-libs/openssl )
32 + ssl? ( dev-libs/openssl:0 )
33 >=media-libs/speex-1.2_rc1
34 gdbm? ( sys-libs/gdbm )
35 webrtc-aec? ( media-libs/webrtc-audio-processing )
36 @@ -72,9 +72,9 @@ RDEPEND="
37 abi_x86_32? (
38 !<=app-emulation/emul-linux-x86-soundlibs-20131008-r1
39 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
40 - >=sys-devel/libtool-2.2.4
41 + dev-libs/libltdl:0
42 "
43 -# it's a valid RDEPEND, libltdl.so is used
44 +# it's a valid RDEPEND, libltdl.so is used for native abi
45
46 DEPEND="${RDEPEND}
47 sys-devel/m4
48
49 diff --git a/media-sound/pulseaudio/pulseaudio-5.0-r3.ebuild b/media-sound/pulseaudio/pulseaudio-5.0-r3.ebuild
50 index 673d1bc..8d7bdd6 100644
51 --- a/media-sound/pulseaudio/pulseaudio-5.0-r3.ebuild
52 +++ b/media-sound/pulseaudio/pulseaudio-5.0-r3.ebuild
53 @@ -1,8 +1,9 @@
54 -# Copyright 1999-2014 Gentoo Foundation
55 +# Copyright 1999-2015 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 # $Id$
58
59 EAPI="5"
60 +
61 inherit autotools bash-completion-r1 eutils flag-o-matic linux-info readme.gentoo systemd user versionator udev multilib-minimal
62
63 DESCRIPTION="A networked sound server with an advanced plugin system"
64 @@ -61,7 +62,7 @@ RDEPEND="
65 realtime? ( sys-auth/rtkit )
66 equalizer? ( sci-libs/fftw:3.0 )
67 orc? ( >=dev-lang/orc-0.4.9 )
68 - ssl? ( dev-libs/openssl )
69 + ssl? ( dev-libs/openssl:0 )
70 >=media-libs/speex-1.2_rc1
71 gdbm? ( sys-libs/gdbm )
72 webrtc-aec? ( media-libs/webrtc-audio-processing )
73 @@ -70,9 +71,9 @@ RDEPEND="
74 dev-libs/json-c[${MULTILIB_USEDEP}]
75 abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20131008-r1
76 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
77 - >=sys-devel/libtool-2.4.2
78 + dev-libs/libltdl:0
79 "
80 -# it's a valid RDEPEND, libltdl.so is used
81 +# it's a valid RDEPEND, libltdl.so is used for native abi
82
83 DEPEND="${RDEPEND}
84 sys-devel/m4
85
86 diff --git a/media-sound/pulseaudio/pulseaudio-9999.ebuild b/media-sound/pulseaudio/pulseaudio-9999.ebuild
87 index c88e3a6..4a536fc 100644
88 --- a/media-sound/pulseaudio/pulseaudio-9999.ebuild
89 +++ b/media-sound/pulseaudio/pulseaudio-9999.ebuild
90 @@ -1,4 +1,4 @@
91 -# Copyright 1999-2014 Gentoo Foundation
92 +# Copyright 1999-2015 Gentoo Foundation
93 # Distributed under the terms of the GNU General Public License v2
94 # $Id$
95
96 @@ -35,9 +35,9 @@ RDEPEND="
97 dev-libs/libpcre
98 )
99 dev-libs/json-c[${MULTILIB_USEDEP}]
100 + dev-libs/libltdl:0
101 >=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
102 >=media-libs/speex-1.2_rc1
103 - >=sys-devel/libtool-2.4.2
104
105 abi_x86_32? (
106 !<=app-emulation/emul-linux-x86-soundlibs-20131008-r1
107 @@ -63,7 +63,7 @@ RDEPEND="
108 lirc? ( app-misc/lirc )
109 orc? ( >=dev-lang/orc-0.4.9 )
110 realtime? ( sys-auth/rtkit )
111 - ssl? ( dev-libs/openssl )
112 + ssl? ( dev-libs/openssl:0 )
113 systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
114 tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
115 tdb? ( sys-libs/tdb )
116 @@ -79,7 +79,8 @@ RDEPEND="
117 xen? ( app-emulation/xen-tools )
118 zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
119 "
120 -# libtool a valid RDEPEND, libltdl.so is used
121 +# it's a valid RDEPEND, libltdl.so is used for native abi
122 +
123 DEPEND="${RDEPEND}
124 dev-libs/libatomic_ops
125 dev-util/intltool