From 7028426af0bbd27028ebd5e48999643eba864a4a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulrich=20M=C3=BCller?= Date: Fri, 5 Dec 2014 23:31:20 +0000 Subject: [PATCH] [QA] Fix PDEPEND, bug 519530 comment 15. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x9433907D693FB5B8! --- media-sound/pulseaudio/ChangeLog | 5 +++- media-sound/pulseaudio/Manifest | 29 ++++++++----------- .../pulseaudio/pulseaudio-5.0-r6.ebuild | 6 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog index 945a5f55f898..0485f6424a14 100644 --- a/media-sound/pulseaudio/ChangeLog +++ b/media-sound/pulseaudio/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-sound/pulseaudio # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.361 2014/12/05 15:26:17 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.362 2014/12/05 23:31:04 ulm Exp $ + + 05 Dec 2014; Ulrich Müller pulseaudio-5.0-r6.ebuild: + [QA] Fix PDEPEND, bug 519530 comment 15. 05 Dec 2014; Michał Górny metadata.xml, pulseaudio-5.0-r6.ebuild: diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest index 90c612f0fcb5..03005e448d29 100644 --- a/media-sound/pulseaudio/Manifest +++ b/media-sound/pulseaudio/Manifest @@ -13,25 +13,20 @@ AUX pulseaudio.tmpfiles 36 SHA256 d836951fb800308256288506b6bd82919d377399e1292d DIST pulseaudio-5.0.tar.xz 1455428 SHA256 99c13a8b1249ddbd724f195579df79484e9af6418cecf6a15f003a7f36caf939 SHA512 f3d64bd6e03a732fd812da466b6658004600b4f3d0b9760403b7e113b6d654d54387658bf3704f45f28ab700245433e23fe517e4579130886fc58647eb97be2b WHIRLPOOL c85829c78ded3bbef234e455bfd3778f2daf50de9d7627508dbf131d0c398e35ab3ae41a4b5136f0c0da09249bc9a600ad85d848ba4e1faba74875af0a787036 EBUILD pulseaudio-5.0-r4.ebuild 10280 SHA256 ecfcb8e41987a89721eece1b90535d8b69e6051fc526b8017ed93cde28986588 SHA512 53bbcda4b9885cbdb4c3d2c3077052e519ceb64fe4ad74678eef75ddedd5590f4ea7b33efbd58bd8a35b29ab084fce596d8672188abf1b5b915ec007ee33cae0 WHIRLPOOL 7bb2a3898ee6b6775c51a207ff13102524f76ea38a49e68b30b647b8423eb456e841bf4e61fbe8a4bcb48a6cdbdd594253ccb1702989ac1ac460648e7f47e14d EBUILD pulseaudio-5.0-r5.ebuild 10463 SHA256 b74d44a38bcc42c73012138ced50c84f916d03068c439b6998940ea290372840 SHA512 5347fb31876ed4c72ef6596583f42e94a960eb97638f90921c51f75defbebf460b8c27b7b64d5beebf89c7cd0b3938f48746ad0ff5a6e572c5d419084000eada WHIRLPOOL cc5490557c23954787d44b0949794bcac9417cd7c39691db44fef865a28d4f6cc2dc1246f78f0ec12361f51a86d4f68b943a9c33242839e06fa96fbee7fef116 -EBUILD pulseaudio-5.0-r6.ebuild 10480 SHA256 e02f40553e2d149d9e237829e1deff1a2c74c0b1774f8390ce622748abb78605 SHA512 3ee807619f736fb96ba06a210159527a30201988409d43e7bbef0878b25ed1df1359ae7abcfb91f441875a4e234478d0643b756f3923105667dff05f4350c394 WHIRLPOOL 56dc9324b6c27f698233fd0011384cd6ab621276953d3cb392ed8c810f7a9af28cd19b6539595749dc4d803578ee2af907eb008c36c22296697f8148c8463f84 -MISC ChangeLog 68758 SHA256 62b3ee55c2fb6c550b6cac80f9415e8bea60700180c220913e6a8407398df82f SHA512 282eec119fe00de5e3be775190383dc26eb5ef789cf48521e49346a85f1c28613b69712b5da76e9c34f6741a7480a33cd4ba6fd03ea4140c1e9fd08dd9951f5c WHIRLPOOL bc1cff483292d83b32d53528bbd6dfdbbd2c66b6a783a0485457602320a1787c6e9eeaa517acb380c0dd70db6e64745e5dc26db5f516a23680ff4091d84dccac +EBUILD pulseaudio-5.0-r6.ebuild 10488 SHA256 2906e4beb1b8937e190987859ede4a57c9bc1de3c5c12885e2140a069ab61100 SHA512 73d0abb04d78a5cbe8e28fddea72a0724470cf0dfc68f041524b8da39b08cf16d163b3ab169262c5ecccd029a0f0546f2b5bf9b80ddc9fac5e5573f47af90efc WHIRLPOOL 1c115f53fba41964ef4f57b6bd1206929b1da0dcbb4ec97c4bb4b80ad05a93266f2c4d9a5eaa39c3cba341bc64da673b065c6b487ddcbefaf9085808a8b10963 +MISC ChangeLog 68872 SHA256 00404aba47e23e69b21be1d430b238d7c4e138c77820697cb69792382760e688 SHA512 af35e6c036b56f6cdad7bb295e3c7c6fd89ece8073b111499e1ebde2940e7647710c95330da518461e8d5f54b4586111c04e20a71a8497112e913fb82e35a089 WHIRLPOOL c1a73795a9d9f73a163b63fceaefa29d48eb26d04d003daceaae4da3fb53f411bf464aa4d7ba00496376a96d8effd7f52c793479d804a708c7d0c277e75db726 MISC metadata.xml 3046 SHA256 e25b23335acfbb05882919c33cbb60e32c3e3cbd00176f94a9059adba05ae313 SHA512 6f566f880c729a8b04015cb056b6e652f82a49309beb166f2ca340949048f37e802647ddf58ee0ae4762cbe537b053968bcd4f8586220f33400437c5483ab235 WHIRLPOOL 17f09b3b1da837bae84a1374fa6ac773cdccc2c4408f7c6b1e5e380f9778ae7008959a18dc7e9a4cb1acf44e3be7b66316c14aed839373e8cc9a3f22ffa84bb1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQJ8BAEBCABmBQJUgc6bXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOyH0P/2VEs0EQ35dYFfhIb46prY/3 -zxOblCj6bE6Vzk7ltm8AlBFKbyNDcDBDlPHqpZnlGP59S4znCIS07M1YMxOC7cYp -IDf+1LyHPPApvcKdXwd1tMYoBIdDAdRMOlXNETdD7O7nZLRLfLhFBuiRhhmr9j8D -eilMlgyMv+NrqxSLpXyxFQVCIF3F36mpHQyVy9BxSrgfZZ1VIuoB21Qr7OsoMST2 -9L5tE5zIoxclhZXJaCPOVZ54zYEjuttmeu/xT9Fvu1pZZvCP/gFVvI1gSFg5eh9z -KzH9tMY7wtoB6jDEEeYZll556TdcV2YVe0/dR0rtqbwZLEhCMwr22Sy6mW+rcKc9 -gZLhJYL5M5CMBQfXS0EZV8syz3nsu0f9+bCCQmwEtEvNqU/eVMEBD1DBcPHg/gVe -2NZwAGzKupfkbGzQotgZUJplQtV8mICjeV8NnMOqFxoqD9EckmSeO1CLHOn0vM/k -gL4Kt09hMgVFvwjelx81SmjscPvg13XmdWmaMb4RiZNVj1Cbfdzai01hndA7h22p -kmIBUY97DlgZS01SkCUjsjGtqLwz2q0FzCvAX+/zqb+fV0Oj7vEtLIDYmJzs94JM -vnn2WDR2G3p6XMaQWUw5tJfrWhMHF4iSJA41D7D2WxB4fy5eukvPq1ZSa0JWcgrV -pzhwOXkNRpV3liuCSzOX -=s7XD +iQGcBAEBCAAGBQJUgkE+AAoJEJQzkH1pP7W4HEML/2fUSjdtPG2bb7havoa2wZP/ +Gmi/uhws7AAiKQiB+Su19psN66HsBz/o+Q3xteMva3EQ2CNdi00oWWQsNDFLJ+F2 +IL0f906q9/uNLGXIl4G4gnvf14oMycgv7WqvKGRl52Q+ziAxlQQpaUF93i/H9Ivi +bNnp40KVORfDHsju7/KzHAgaSkjP3KySf/zAPJ+uzP7jjYjU3RheGwkhWUfN0bu2 +Z+sR9NgEfAImsywSMx0u+BC4H7aF8FfmlsbWCJuK3fQOzQQ+ITR+UhdserMqUkLA +cwlsxqp1ovj7neuj79MIcwEt1Vbzj8L91cLP4uxzapzyqk9evwSzhjo9s2gSzCcB +oghag+D4oD/Suj25D5ztTTsyaJPY1Ij9wQO4VIcx3WZ7zUonE+97RpLHPko2SnmB ++cOl9KTtJIrZSbyb8TUptoNBfI6lcGjzxrTMXsN31RkR72s35ZBaQRLJKvLV/ido +JrbhPXHUDatoprTFQDX6yakl/kKw40ELlMfGor3V1w== +=/tMw -----END PGP SIGNATURE----- diff --git a/media-sound/pulseaudio/pulseaudio-5.0-r6.ebuild b/media-sound/pulseaudio/pulseaudio-5.0-r6.ebuild index 3c054471d648..259b62cdf4dc 100644 --- a/media-sound/pulseaudio/pulseaudio-5.0-r6.ebuild +++ b/media-sound/pulseaudio/pulseaudio-5.0-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-5.0-r6.ebuild,v 1.3 2014/12/05 15:26:17 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-5.0-r6.ebuild,v 1.4 2014/12/05 23:31:04 ulm Exp $ EAPI="5" inherit autotools bash-completion-r1 eutils flag-o-matic linux-info readme.gentoo systemd user versionator udev multilib-minimal @@ -89,7 +89,9 @@ DEPEND="${RDEPEND} >=sys-devel/gettext-0.18.1 " # This is a PDEPEND to avoid a circular dep -PDEPEND="alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] )" +PDEPEND="alsa? ( alsa-plugin? ( + >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] +) )" # alsa-utils dep is for the alsasound init.d script (see bug #155707) # bluez dep is for the bluetooth init.d script -- 2.26.2