commit:     53a4e46aba657e0367c7cf03d82cbec22f3741cd
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon Sep  4 17:00:40 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon Sep  4 17:00:40 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=53a4e46a

media-sound/pulseaudio: version bump to 10.99.1

Cleanup 10.0 as well.

 media-sound/pulseaudio/Manifest                    | 10 +++---
 media-sound/pulseaudio/files/pulseaudio.conf.d     |  1 -
 media-sound/pulseaudio/files/pulseaudio.init.d-5   |  1 -
 media-sound/pulseaudio/metadata.xml                |  5 +--
 media-sound/pulseaudio/pulseaudio-10.0.ebuild      | 36 +++++++++++-----------
 ...audio-10.0.ebuild => pulseaudio-10.99.1.ebuild} | 36 +++++++++++-----------
 6 files changed, 43 insertions(+), 46 deletions(-)

diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index be69ee6..08e1b21 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -1,8 +1,10 @@
 AUX pulseaudio-9.0-musl-padsp.patch 1681 SHA256 
bfa722e400ba820ee7013ceb050058b4e239b1ea8544be23767ceb70ee0bc332 SHA512 
25b648681d9397631138635c024b5c6e289e32f11bf222afe4d853f62501555b5d75cc9058023d24ab8f97e442bcb37a647667e01582539d146762912a8ce08e
 WHIRLPOOL 
543e2ff55f20aa653c7617894e1610f16193bc26b463662d44b6a7525e767b98782e8bee1bec402ce2c5ed02dae2c904da9e99b1d17b59b8823b87265c3988e7
-AUX pulseaudio.conf.d 158 SHA256 
06a4c3effeb3d30df6d384f7405a5c3297a04d7f1db17b511a77702007c95c95 SHA512 
05f1cea02d9fcbcca07202aa5c8664dceb6a71b72b306af7e361c1caeb8708c37760c62af8b27e34d3a00b817ecac73de9e4a9925479f0437c4a0345f0563b58
 WHIRLPOOL 
912ffc1d4da5c8bfdd664da9ac7143c0107084ce80fbd986082fad37c99d35d86cb254d5a81eafde9bfc1362467d4a338c817eadb8052f28eaab0702f2290506
-AUX pulseaudio.init.d-5 2234 SHA256 
77b53c1d70ad7439293c0fe42d72e73b0d56f2ef60d7c7a98d042a01a702300c SHA512 
b882ccf6d278dda70b3911d2fff4620908c1d87edac34fea6310f8db77f5e8514b473ed93b0fc4e7e3499dcae3d866d33fdaa476fea6419a219f9c178c48756b
 WHIRLPOOL 
9fa82547e98e8c632571aa40c6e9b54e06db65f727b497ccf64f248621e180c284b3db242917d4ca9eadcc26484f1d46541e75b1c0e9fc3fe76356c32f168e6e
+AUX pulseaudio.conf.d 151 SHA256 
99f8e923e249ad64a8dcc3084a3300988a42412f8160476184115d5f3580a667 SHA512 
f97ed431e371e43d297b099952bf1e897b243a822183524b8e3ea17e888c08590bb3793e195bc22e3254eae7f2e1fa00204a752638746c4dde825a423f08c24b
 WHIRLPOOL 
fd6904b6cbf82f9c216b64dd543be8899f91b196cdc1c37f70fd9e63aa7b2d9c08afad4c3eb392de5035d22f0e264facfd0be8393dc7df363d1c5aff5eec7ed7
+AUX pulseaudio.init.d-5 2227 SHA256 
f3f19fe6aee3822b861de486c55412f05aeed112e9a062103c1381e83ad72c69 SHA512 
d0e1519fc97208c2d42c7d9d8f2e7d4658e741e8063102713da361748b6deaeae475619a65b3d3d1893c107a4511e17d4245264b5430190087f1823899c0f64b
 WHIRLPOOL 
689d0cd2dd8c160f4c9ff610d49ddd0235078bd906f942383a77bc620de7e4e6c254ce23d5cf40da92974306d8ce3c160ad94350c6ae8666a4fbe262cb67f99c
 AUX pulseaudio.service 227 SHA256 
62cd3b7e83845a27f437790cf293970f85ff02816da599a53cd5f3bf13da3788 SHA512 
567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6
 WHIRLPOOL 
bb548efc14d88b372abaafae557fe23681ce93d1b010fe7761458c5f7793a96886aa368df4cbec5a4fde078f9e8d940020e3ad2a36248ff6c8ab3b70f412d634
 AUX pulseaudio.tmpfiles 36 SHA256 
d836951fb800308256288506b6bd82919d377399e1292dc10905a7aa12dac0e9 SHA512 
f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 WHIRLPOOL 
b293b7372b7f63ddea63e6985d1f66a2010d8778ea3ae00501e58f15bfba3ed19b794111c073ee3bd5c8cf98d33f3c8db95220acf57f97477523f4cfa7121553
 DIST pulseaudio-10.0.tar.xz 1608040 SHA256 
a3186824de9f0d2095ded5d0d0db0405dc73133983c2fbb37291547e37462f57 SHA512 
11d98b4b2000a41bdea92df253409452bc9b77d8bb309b6d14c439e3b902e3f90c69da00daff409e3859a54ad01c63a75be5723616bdcb492801d622a6406481
 WHIRLPOOL 
6d03d8cf7b96cbb46a8cc5f7810f7cf1c4187aa9321483d5e56435874b218d437bc66860d25a149be59ca73de7118916e05e481758e04619e099cb9a50dcb119
-EBUILD pulseaudio-10.0.ebuild 11093 SHA256 
022002b7353dd7ee5e5953c60ccaa99bc31b8ec4db4b08e679597ecca52cf5cf SHA512 
670fae85ffd252dc2159727b1d9a1ffe5ebf0e01232fab39f5fecefe278b339d34689691f17495170a855d41fb85d3c82485673eb71ec5de4cf60c6407da03db
 WHIRLPOOL 
879779bb5e7c0d4bd553f976122a0c5ce552cfac1c2bea469b895dea2ac53c6f40a1a50bdde6e8f42b0a45392d783a1238dd23ea3af39e187052cde398350cff
-MISC metadata.xml 3519 SHA256 
1acbacb97aa01f4b5f0906b845191023418c7c450579756d7f012e17fb9ffef1 SHA512 
caf3dd068c5ec66b53dedc44642f333e091e8aa745cd2a3218b40cefb6713bfaaa8826a773697e6dc22441ee1238b6bb468168fd4a85ef5d504b45b3d6eacbf9
 WHIRLPOOL 
aa7fe6f702994b84b440b6a267f333ac6e7b814e3fb3404fcb378b63f8d97a6eed32f53fcf4c10d0fa8dbe250cb1f3988468a2e5cc8402b61339db87dc34fd49
+DIST pulseaudio-10.99.1.tar.xz 1635836 SHA256 
c9791844569d8d0adb468c183d0d9fb6ac12b9db34a4a078a7773c8bac993f32 SHA512 
410758da3cf3431b5810b9a5790d60ed8fe0bba58f621f4ca8e7ba66be8dcdd53cbd8284105ee6694b04f81a37791c3e8c5fe4af3ee034e89dff0b66fdbde006
 WHIRLPOOL 
c8dfe0e4ab54029fdc3b47fb43282406908b7993ee155d6aaa9919419fb4e58a8f1df34bc569a33697a02533979c6ff4002944a20ed96c1246993eb3b97b7eb3
+EBUILD pulseaudio-10.0.ebuild 11018 SHA256 
fe6de7d9125875de17f8eec61d475922cfd1fdb586795780d0aed98e02cb06f5 SHA512 
afad5f4da75bbebf7537cad4938d2ec12389c0ab71ed55dd46d246987acd8b1418f52181f0fb130817018ce6050e4d8a34da1438093c01811718a7766fb14ea8
 WHIRLPOOL 
47ebb6864f3ce8b91015dd091605aa6fb9eebc4dda31d1314eaa6ee5e552a88aef9776badbd4e87a1f761e0e5f69af727ea28416eb538dc794ec878f2f7ec0cc
+EBUILD pulseaudio-10.99.1.ebuild 11027 SHA256 
cded1326d7cb4593e7a8eeac15198616de4395131415f18239be751aa34c81dc SHA512 
e8eb325b7cd8ff6ba3a785f52a1e1279935b0bda3372d6fede83a7406791e4ae7bb27d3310b57a4167567c5ff94b8781036bddeb777ee6cd50de4527f2160d22
 WHIRLPOOL 
6516a7aa65d6e03a86843db2ec660b3edfc0eb3641c7b979630035e92669167389e91d2e3dd7e9314723c9f69a93ef77979e1a64cea832866e40bf4139a537d8
+MISC metadata.xml 3412 SHA256 
cd935d80de811afb228e5ca6d9ec448f8eb1f8f76dfd35751ece76982139f3a4 SHA512 
93583cdaa021b818252c01aa575c812fbb594604ed0d8aca395d9d9db36d7ada3e2796047b585917c227a8c2030f3bde13e3ec6af5842829895104dc9cf41a48
 WHIRLPOOL 
4b73707a368354166090949c6a2a9cc41d20c37407b36582a4567f33e743bdd1ded174330f868b7eb0c4acbe983b1654eab0cae9f0cdf3ab43046d732b823831

diff --git a/media-sound/pulseaudio/files/pulseaudio.conf.d 
b/media-sound/pulseaudio/files/pulseaudio.conf.d
index 348540b..9e72453 100644
--- a/media-sound/pulseaudio/files/pulseaudio.conf.d
+++ b/media-sound/pulseaudio/files/pulseaudio.conf.d
@@ -1,5 +1,4 @@
 # Config file for /etc/init.d/pulseaudio
-# $Id$
 
 # For more see "pulseaudio -h".
 

diff --git a/media-sound/pulseaudio/files/pulseaudio.init.d-5 
b/media-sound/pulseaudio/files/pulseaudio.init.d-5
index 099edd3..d5415d6 100644
--- a/media-sound/pulseaudio/files/pulseaudio.init.d-5
+++ b/media-sound/pulseaudio/files/pulseaudio.init.d-5
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
        need localmount

diff --git a/media-sound/pulseaudio/metadata.xml 
b/media-sound/pulseaudio/metadata.xml
index 1f547a3..e35348f 100644
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/metadata.xml
@@ -42,7 +42,7 @@
       script for PulseAudio. Since this support is only supported for
       embedded situations, do not enable without reading the upstream
       instructions at
-         
http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/
 .
+         
https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/
 .
     </flag>
     <flag name="asyncns">Use libasyncns for asynchronous name 
resolution.</flag>
     <flag name="doc">Build the doxygen-described API documentation.</flag>
@@ -67,9 +67,6 @@
       greatly in applications that support it by performing acoustic echo
       cancellation, analog gain control, noise suppression and other 
processing.
     </flag>
-    <flag name="xen">
-      Builds a special paravirtualized module for running in a Xen guest.
-    </flag>
     <flag name="systemd">
       Build with <pkg>sys-apps/systemd</pkg> support to replace standalone
       ConsoleKit.

diff --git a/media-sound/pulseaudio/pulseaudio-10.0.ebuild 
b/media-sound/pulseaudio/pulseaudio-10.0.ebuild
index afd9272..fd392bb 100644
--- a/media-sound/pulseaudio/pulseaudio-10.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-10.0.ebuild
@@ -1,31 +1,33 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils 
linux-info systemd user versionator udev multilib-minimal
 
 DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="http://www.pulseaudio.org/";
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/";
 SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz";
 
 # libpulse-simple and libpulse link to libpulse-core; this is daemon's
 # library and can link to gdbm and other GPL-only libraries. In this
 # cases, we have a fully GPL-2 package. Leaving the rest of the
 # GPL-forcing USE flags for those who use them.
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
+# qpaeq equalizer pyqt GUI frontend is AGPL-3+
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd 
~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd 
~amd64-linux ~x86-linux"
 
 # +alsa-plugin as discussed in bug #519530
 IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm 
+glib
 gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon 
ofono-headset
 +orc oss qt4 realtime selinux sox ssl systemd system-wide tcpd test +udev
-+webrtc-aec +X xen zeroconf"
++webrtc-aec +X zeroconf"
 
 # See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
 REQUIRED_USE="
        bluetooth? ( dbus )
+       equalizer? ( dbus )
        ofono-headset? ( bluetooth )
        native-headset? ( bluetooth )
        udev? ( || ( alsa oss ) )
@@ -73,12 +75,19 @@ RDEPEND="
                !libressl? ( dev-libs/openssl:0= )
                libressl? ( dev-libs/libressl:= )
        )
-       >=media-libs/speex-1.2_rc1
+       || (
+               (
+                       >=media-libs/speex-1.2.0
+                       media-libs/speexdsp
+               )
+               (
+                       <media-libs/speex-1.2.0
+                       >=media-libs/speex-1.2_rc1
+               )
+       )
        gdbm? ( sys-libs/gdbm )
        webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
-       xen? ( app-emulation/xen-tools )
        systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
-       >=dev-libs/json-c-0.11[${MULTILIB_USEDEP}]
        dev-libs/libltdl:0
        selinux? ( sec-policy/selinux-pulseaudio )
 "
@@ -87,7 +96,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
        sys-devel/m4
        doc? ( app-doc/doxygen )
-       test? ( dev-libs/check )
+       test? ( >=dev-libs/check-0.9.10 )
        X? (
                x11-proto/xproto[${MULTILIB_USEDEP}]
                >=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
@@ -200,7 +209,6 @@ multilib_src_configure() {
                $(use_enable ipv6)
                $(use_enable ssl openssl)
                $(use_enable webrtc-aec)
-               $(use_enable xen)
                $(use_with caps)
                $(use_with equalizer fftw)
                --disable-adrian-aec
@@ -227,7 +235,6 @@ multilib_src_configure() {
                        --disable-openssl
                        --disable-orc
                        --disable-webrtc-aec
-                       --disable-xen
                        --without-fftw
                        --without-soxr
 
@@ -359,11 +366,4 @@ pkg_postinst() {
                elog "The libsamplerate based resamplers are now deprecated, 
because they offer no"
                elog "particular advantage over speex. Upstream suggests 
disabling them."
        fi
-
-       # Needed for pulseaudio-6.0 update from older versions
-       if use udev; then
-               if ! version_is_at_least 6.0 ${REPLACING_VERSIONS}; then
-                       udevadm control --reload && udevadm trigger
-               fi
-       fi
 }

diff --git a/media-sound/pulseaudio/pulseaudio-10.0.ebuild 
b/media-sound/pulseaudio/pulseaudio-10.99.1.ebuild
similarity index 94%
copy from media-sound/pulseaudio/pulseaudio-10.0.ebuild
copy to media-sound/pulseaudio/pulseaudio-10.99.1.ebuild
index afd9272..97cd6d6 100644
--- a/media-sound/pulseaudio/pulseaudio-10.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-10.99.1.ebuild
@@ -1,31 +1,33 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils 
linux-info systemd user versionator udev multilib-minimal
 
 DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="http://www.pulseaudio.org/";
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/";
 SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz";
 
 # libpulse-simple and libpulse link to libpulse-core; this is daemon's
 # library and can link to gdbm and other GPL-only libraries. In this
 # cases, we have a fully GPL-2 package. Leaving the rest of the
 # GPL-forcing USE flags for those who use them.
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
+# qpaeq equalizer pyqt GUI frontend is AGPL-3+
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd 
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 
~amd64-fbsd ~amd64-linux ~x86-linux"
 
 # +alsa-plugin as discussed in bug #519530
 IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm 
+glib
 gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon 
ofono-headset
 +orc oss qt4 realtime selinux sox ssl systemd system-wide tcpd test +udev
-+webrtc-aec +X xen zeroconf"
++webrtc-aec +X zeroconf"
 
 # See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
 REQUIRED_USE="
        bluetooth? ( dbus )
+       equalizer? ( dbus )
        ofono-headset? ( bluetooth )
        native-headset? ( bluetooth )
        udev? ( || ( alsa oss ) )
@@ -73,12 +75,19 @@ RDEPEND="
                !libressl? ( dev-libs/openssl:0= )
                libressl? ( dev-libs/libressl:= )
        )
-       >=media-libs/speex-1.2_rc1
+       || (
+               (
+                       >=media-libs/speex-1.2.0
+                       media-libs/speexdsp
+               )
+               (
+                       <media-libs/speex-1.2.0
+                       >=media-libs/speex-1.2_rc1
+               )
+       )
        gdbm? ( sys-libs/gdbm )
        webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
-       xen? ( app-emulation/xen-tools )
        systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
-       >=dev-libs/json-c-0.11[${MULTILIB_USEDEP}]
        dev-libs/libltdl:0
        selinux? ( sec-policy/selinux-pulseaudio )
 "
@@ -87,7 +96,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
        sys-devel/m4
        doc? ( app-doc/doxygen )
-       test? ( dev-libs/check )
+       test? ( >=dev-libs/check-0.9.10 )
        X? (
                x11-proto/xproto[${MULTILIB_USEDEP}]
                >=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
@@ -200,7 +209,6 @@ multilib_src_configure() {
                $(use_enable ipv6)
                $(use_enable ssl openssl)
                $(use_enable webrtc-aec)
-               $(use_enable xen)
                $(use_with caps)
                $(use_with equalizer fftw)
                --disable-adrian-aec
@@ -227,7 +235,6 @@ multilib_src_configure() {
                        --disable-openssl
                        --disable-orc
                        --disable-webrtc-aec
-                       --disable-xen
                        --without-fftw
                        --without-soxr
 
@@ -359,11 +366,4 @@ pkg_postinst() {
                elog "The libsamplerate based resamplers are now deprecated, 
because they offer no"
                elog "particular advantage over speex. Upstream suggests 
disabling them."
        fi
-
-       # Needed for pulseaudio-6.0 update from older versions
-       if use udev; then
-               if ! version_is_at_least 6.0 ${REPLACING_VERSIONS}; then
-                       udevadm control --reload && udevadm trigger
-               fi
-       fi
 }

Reply via email to