Patch a deadlock observed when both methods of selecting a decoder are disabled.

(Portage version: 2.1.2_rc4-r6)
 (Signed Manifest commit)

3 files changed, 19 insertions, 75 deletions

diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index 73312b3c412a..48a949557139 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -17,6 +17,10 @@ AUX 1.1.2-robust-resume.patch 697 RMD160 c5835fce2bf0c2bf5440af68b8ac4d1a5c8f278
 MD5 eb6cee8203c226ec7d4d92b0ab86c0f8 files/1.1.2-robust-resume.patch 697
 RMD160 c5835fce2bf0c2bf5440af68b8ac4d1a5c8f278b files/1.1.2-robust-resume.patch 697
 SHA256 da94b6b5e792cb49477bd6196695a4a49671e6d88680063d9d7e92c6b1c841e9 files/1.1.2-robust-resume.patch 697
+AUX 1.3.0_alpha1-avoid-decoder-selection-deadlock.patch 1433 RMD160 6da4c0d95852475d7af186c778bbd252e4d7a200 SHA1 c011388a65c89d76d04e456eb1d5843e01d1d0ee SHA256 4db30659f506471c153fe25e0998da32025d0f8d8e53f79af62a1bae4c964862
+MD5 00fa7badc1ed7b8c098ec065e0a82a23 files/1.3.0_alpha1-avoid-decoder-selection-deadlock.patch 1433
+RMD160 6da4c0d95852475d7af186c778bbd252e4d7a200 files/1.3.0_alpha1-avoid-decoder-selection-deadlock.patch 1433
+SHA256 4db30659f506471c153fe25e0998da32025d0f8d8e53f79af62a1bae4c964862 files/1.3.0_alpha1-avoid-decoder-selection-deadlock.patch 1433
 DIST audacious-1.1.0.tgz 3365149 RMD160 5825caacd093dabadd16d1f37d7225490e1ce1c9 SHA1 443c68b185381d3ad6c7f053e17aa5345bbc5ba1 SHA256 ac2fcba9020d4ae38c578d9494f99761cddd153b0281570b538d7d3a6af6a4f8
 DIST audacious-1.1.1.tgz 3387162 RMD160 852a2af9ad71fcb9480f32d0581c4864aeaece17 SHA1 89246f0232e6e4d98419268e395a9fc4a40a6ed9 SHA256 11f0079bfedb01ff7248c32065cca7706d0eba75dd3035a0770ed9c42b94b887
 DIST audacious-1.1.2.tgz 3394364 RMD160 920cb247dc1e583364cfac9cc8f1f0c39c37550e SHA1 25087f081054807aa48e3415aae0e1679667a392 SHA256 54f8f9e10e9a20a0a77e9d063708cd4bd572576ea9b36b9b1bb3ea3cbeaa1a81
@@ -62,14 +66,14 @@ EBUILD audacious-1.2.2.ebuild 1348 RMD160 6aa0cca50fce6a006ac084180d720e4a06f28a
 MD5 aa9eef61593fe60417886a6abd6790f4 audacious-1.2.2.ebuild 1348
 RMD160 6aa0cca50fce6a006ac084180d720e4a06f28ae1 audacious-1.2.2.ebuild 1348
 SHA256 00b5c04b0f71f298db7d52e26a9974e576cce7b03d5320fe00b1f74ac8af8ea5 audacious-1.2.2.ebuild 1348
-EBUILD audacious-1.3.0_alpha1.ebuild 1366 RMD160 cbda5c6a7ea88c829626f6089759dcc8450803b5 SHA1 db38846babf027e059cc865f3df2c3e1485cd68d SHA256 61b899fa6fb487ee3ad3a1d79699793524b5a49f8d28614bfc446fe5f2b7ecbc
-MD5 6a1b138e35eeac7dee25f0957dfb341f audacious-1.3.0_alpha1.ebuild 1366
-RMD160 cbda5c6a7ea88c829626f6089759dcc8450803b5 audacious-1.3.0_alpha1.ebuild 1366
-SHA256 61b899fa6fb487ee3ad3a1d79699793524b5a49f8d28614bfc446fe5f2b7ecbc audacious-1.3.0_alpha1.ebuild 1366
-MISC ChangeLog 16737 RMD160 fe9eab2f5b4614593182cc4e17b40e9f578d6396 SHA1 9f5cf8de1de65d79508e01fea4119c4b7d0f4c84 SHA256 2c9f36d8bf45ced8a0705cd163bde75713a182a0f6a993c2b325c0fe0d529b0b
-MD5 77713b9e0d8f3717c6ec0992d557e64f ChangeLog 16737
-RMD160 fe9eab2f5b4614593182cc4e17b40e9f578d6396 ChangeLog 16737
-SHA256 2c9f36d8bf45ced8a0705cd163bde75713a182a0f6a993c2b325c0fe0d529b0b ChangeLog 16737
+EBUILD audacious-1.3.0_alpha1-r1.ebuild 1481 RMD160 b8d7aaea74b4f4d44f05d572b1f12e232dea4ed2 SHA1 c757dd87716a911ebfc5d6fe2b9fe6e6d184ec58 SHA256 e5647f2c924b2429ece59d33b1c30c275d6649b928653cdbab60aee853fc1f02
+MD5 ba6d5fc30de4a3c86b08f426b98a7545 audacious-1.3.0_alpha1-r1.ebuild 1481
+RMD160 b8d7aaea74b4f4d44f05d572b1f12e232dea4ed2 audacious-1.3.0_alpha1-r1.ebuild 1481
+SHA256 e5647f2c924b2429ece59d33b1c30c275d6649b928653cdbab60aee853fc1f02 audacious-1.3.0_alpha1-r1.ebuild 1481
+MISC ChangeLog 17044 RMD160 a2bdd40e248acd8fdfbc715fd302b5e5c1c17537 SHA1 e98a213df697bbf797506e2c8bfeaacd1238772c SHA256 4f812eee6566bc5db3d3ed8dc95d40550f615120dbc3a35c8240f22326439281
+MD5 b3b29da9b00e38c53d85818cb4269de8 ChangeLog 17044
+RMD160 a2bdd40e248acd8fdfbc715fd302b5e5c1c17537 ChangeLog 17044
+SHA256 4f812eee6566bc5db3d3ed8dc95d40550f615120dbc3a35c8240f22326439281 ChangeLog 17044
 MISC metadata.xml 248 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d SHA1 4ea80510c4e90c385ac851b4f82c36b4f91d9402 SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6
 MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248
 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d metadata.xml 248
@@ -101,13 +105,13 @@ SHA256 c31c0615a959810add592dcfce092f7af7acb047c3870137d2faa31e09329577 files/di
 MD5 b80dbea6f1ccd7fb02ba3ef1f42ef0b1 files/digest-audacious-1.2.2 500
 RMD160 2d550eec31a23374cdcbb709684bbb7bc7dc6d97 files/digest-audacious-1.2.2 500
 SHA256 080f70b65f5900ce980a9f3662975ae7e8593129fc4bf57a4112e6c0584c8b45 files/digest-audacious-1.2.2 500
-MD5 f87783c4ec064a8e622518fb0001c8d2 files/digest-audacious-1.3.0_alpha1 521
-RMD160 94ad531add3b773e9a61fbb46f8550eda0049fdc files/digest-audacious-1.3.0_alpha1 521
-SHA256 7cb2b400efec479543707d1fb0339d192c187e4610a8238a6584acb7048db0f5 files/digest-audacious-1.3.0_alpha1 521
+MD5 f87783c4ec064a8e622518fb0001c8d2 files/digest-audacious-1.3.0_alpha1-r1 521
+RMD160 94ad531add3b773e9a61fbb46f8550eda0049fdc files/digest-audacious-1.3.0_alpha1-r1 521
+SHA256 7cb2b400efec479543707d1fb0339d192c187e4610a8238a6584acb7048db0f5 files/digest-audacious-1.3.0_alpha1-r1 521
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFnijhp5vW4rUFj5oRAmdpAJ9dwQQWvfj5er0Dd5JSs4m0PfCIEACeKFef
-RrgeLxuxBiCIgkAVi93cMOM=
-=QRtR
+iD8DBQFFn7Iep5vW4rUFj5oRAh4bAJ4oC2j22x9hKBxe9jpTkk+YJXYgJQCeOtU0
+z5JE1DY8YHm/UvpJ5ICZ2mk=
+=6CvX
 -----END PGP SIGNATURE-----
diff --git a/media-sound/audacious/audacious-1.3.0_alpha1.ebuild b/media-sound/audacious/audacious-1.3.0_alpha1.ebuild
deleted file mode 100644
index 272f18bc2bc2..000000000000
--- a/media-sound/audacious/audacious-1.3.0_alpha1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-1.3.0_alpha1.ebuild,v 1.1 2007/01/05 10:30:18 chainsaw Exp $
-
-inherit flag-o-matic
-
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://audacious-media-player.org/release/${MY_P}.tgz
-	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="chardet nls gnome"
-
-RDEPEND=">=x11-libs/gtk+-2.6
-	>=gnome-base/libglade-2.3.1
-	dev-libs/libxml2
-	gnome? ( >=gnome-base/gconf-2.6.0 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	>=dev-util/pkgconfig-0.9.0"
-
-PDEPEND=">=media-plugins/audacious-plugins-1.3.0_alpha1"
-
-src_compile() {
-	# Bug #42893
-	replace-flags "-Os" "-O2"
-	# Bug #86689
-	is-flag "-O*" || append-flags -O
-
-	econf \
-		$(use_enable chardet) \
-		$(use_enable nls) \
-		$(use_enable gnome gconf) \
-		|| die
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README
-
-	# Gentoo_ice skin installation; bug #109772
-	insinto /usr/share/audacious/Skins/gentoo_ice
-	doins "${WORKDIR}"/gentoo_ice/*
-	docinto gentoo_ice
-	dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/audacious/files/digest-audacious-1.3.0_alpha1 b/media-sound/audacious/files/digest-audacious-1.3.0_alpha1
deleted file mode 100644
index 285723a315dd..000000000000
--- a/media-sound/audacious/files/digest-audacious-1.3.0_alpha1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 037ddc1b36d104af4979b599ba01c32c audacious-1.3.0-alpha1.tgz 1791152
-RMD160 1f12cc2c4def13148b3f5cc233b4663ae2eacc26 audacious-1.3.0-alpha1.tgz 1791152
-SHA256 1dbabe4a6c676194fb3235930e13c5a6e34eb50baf6dff99416a3f9bdf5afdd8 audacious-1.3.0-alpha1.tgz 1791152
-MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
-RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 gentoo_ice-xmms-0.2.tar.bz2 51839
-SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1 gentoo_ice-xmms-0.2.tar.bz2 51839