Version bump and cleanups.

Package-Manager: portage-2.2.0_alpha108/cvs/Linux i686

4 files changed, 165 insertions, 2 deletions

diff --git a/media-sound/audacious/ChangeLog b/media-sound/audacious/ChangeLog
index 63153ff7746d..16c5813b9f29 100644
--- a/media-sound/audacious/ChangeLog
+++ b/media-sound/audacious/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/audacious
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.264 2012/05/24 02:16:35 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.265 2012/05/27 21:00:17 jdhore Exp $
+
+*audacious-3.2.3 (27 May 2012)
+
+  27 May 2012; Jeff Horelick <jdhore@gentoo.org> +audacious-3.2.3.ebuild,
+  +files/audacious-3.2.3-fix-mutex.patch:
+  Version bump and cleanups.
 
   24 May 2012; Jeff Horelick <jdhore@gentoo.org> audacious-3.2.2-r1.ebuild:
   marked x86 per bug 417143
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index d2bb73d3904f..ef261ad34c14 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,4 +1,5 @@
 AUX audacious-3.2.2-fix-build-gmodule.patch 1668 RMD160 0f2f76725463b9710fbfe5f24b79e5a0928c44ec SHA1 930f888d7b95669ed36212cf6c9416483b7cf94d SHA256 21641fa4c35d4e3aeabbd0f0d51e71e3ee2b50a979b2154e00fbdd86399c55fa
+AUX audacious-3.2.3-fix-mutex.patch 3443 RMD160 39d7666e2f19c3e38a47c929420315f8b2cba45d SHA1 26f020710cb615afe49015879279b483c31b6990 SHA256 609dadba4911d7db548a38c11412e5fff185756991e2776d48271c12ea66899a
 AUX audacious_ldflags.patch 392 RMD160 270aba025929c216069e71b9b18edab76093a5c2 SHA1 358d3f3784e7a1563a6e3237dc318b5262f2a33f SHA256 b50f57ccc80ab472876b2a3726a5d894be11f5b6bfc70ac1411ece67c839d767
 DIST audacious-2.4.4.tgz 1344519 RMD160 75c960b158b3b6367cca4a7da65d98d8a35a13d9 SHA1 697b2cc217cef9785cf7ec0c4ee617bc174fbe98 SHA256 76f84038a0360da80aeaddd1ec23e5a55fee5a120abffce97c4609958cdb30e8
 DIST audacious-2.5.4.tar.gz 1221134 RMD160 40c4482a0ed35c76e214180cf5c3a308b4d83d7a SHA1 6374b09690fba540b82f7fbaa9a4d763c5ea7d79 SHA256 47bc36010e84c2c9638537a42a8451743d55a699bf85c614f3b913596f6e2fcd
@@ -6,6 +7,7 @@ DIST audacious-3.1.1.tar.bz2 766551 RMD160 2eea3bf3ca730636ab436d71c6ec90ed513af
 DIST audacious-3.1.tar.bz2 793321 RMD160 6e4ccf241c6f1ad17da84c373f30b2176f05462c SHA1 f87bba07c1abc8bfe60a21c3bcef3359856529d7 SHA256 306db180cd269b072cfb23551b4139cd2af28d8afb6699836ad82aa3bcec3a46
 DIST audacious-3.2.1.tar.bz2 719809 RMD160 a4917d57c17d6a88d4e3d2c3dab18bfba28aa82f SHA1 9183aef4d805d44b4aa456563aec7f104da97546 SHA256 064a8d2887a0f92a1637df9d71b8eefa8064199c04eccfaac725f840cff6eac3
 DIST audacious-3.2.2.tar.bz2 675192 RMD160 1f6a268613455f07bd209f0488aa0f2dbaf7b5b4 SHA1 50d2ef08d3dd48c2efb194a9fdf216fa4f8afd24 SHA256 c69c20e48c2ed330a0ffb55f3a648b50323406e2a15ca407e3291f83e57042ee
+DIST audacious-3.2.3.tar.bz2 695917 RMD160 e29b42df08138ed1e4fcbab8324bf7683c4e26dc SHA1 23be0fcb0a7d5ec2bc4d4fee436e77f2138903ef SHA256 aea8ad2f4da80fb58cf8b0e880585ab49ac42e8a02247c364ea29ccca5572bae
 DIST audacious-3.2.tar.bz2 728063 RMD160 25f054ee0eb11bb74d3b8fe77038ea438f93e604 SHA1 3ebc4dcdcf5da960ba400078023e167e02105e84 SHA256 f18d2a28e8e5ff06d1528cdbd7be11fc1e5c78687258a7c57a28d36b8f29bcb6
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 SHA1 e97ebbf204e0d1b150265f9e67f0ed54d779e110 SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1
 EBUILD audacious-2.4.4.ebuild 1750 RMD160 2b610cd341c0bf7848dc46f18a6b1e9abbb026eb SHA1 33886f8963f5f431c000e8b66c486a249e62c60f SHA256 dfe72be9b75ac6ab50c7ac197980f3774477f06707e492bca53a238889331b17
@@ -14,6 +16,7 @@ EBUILD audacious-3.1.1.ebuild 1910 RMD160 ba7603417f12308a58b3e52ee56593634c348d
 EBUILD audacious-3.1.ebuild 1894 RMD160 17c652aadce149af828fbd476936177bd0f8eb4e SHA1 79ca66ad1cdb73ed4984636964026d3433f14923 SHA256 8f26a16c15045c499bdbddfb6c4a0eea5d195deec02759869c1df8832f265332
 EBUILD audacious-3.2.1.ebuild 1790 RMD160 041f3e04d2133e672cc66174712432458ffa0967 SHA1 2b9378fa4e8ceb65a7bcc1f3f3e4091e3f55ff24 SHA256 aa4498513c874cccba76fe1543c6d7cbf1e84050a45890df1530acf8f4773df0
 EBUILD audacious-3.2.2-r1.ebuild 1912 RMD160 87ce76522ad40a7a776744a9e97335d5452497be SHA1 a8143ebee5cfa88a58b651d4ec87b8e1b9817d72 SHA256 b6963c6bde70d2e06569e757cf74714b438d23b23f488c54ebd4baf5680a8a96
+EBUILD audacious-3.2.3.ebuild 1850 RMD160 d4bbe1f99d5a3aba9e412bf41283eedcbb650a85 SHA1 0ddff35db9893419d44a3fea1fc7f19e1b98a6c7 SHA256 a229532b961e18e8e728b9a69a13e51e4a4d5a7a8fa24a206a9deb6e4b776372
 EBUILD audacious-3.2.ebuild 1786 RMD160 ff5f9b1eb1b1b5d166aa1e30a40f66b80c10d9ba SHA1 f3b2375a8a9293aa557b36c8089e3535bd869bf4 SHA256 70dacca92c9dc4dca4e92ed20e2e704bff60b8387c94486048524ea5a40f19d7
-MISC ChangeLog 45958 RMD160 d1594cc152e8a00429433f56a1c4705328fad186 SHA1 8eb23f91d8940a16acd8e85e1fbf4a995188cd16 SHA256 6ee69c5360c3bfd4a51da4fbf8e8814518f27e3fce26936eae7eb6e86bedee8a
+MISC ChangeLog 46136 RMD160 35930596dc94186fbafe93db7463271331d395b9 SHA1 a9f75ccda0c64b2290be3e2195c29ba04b0299c2 SHA256 d8889068d8ffaee87c8cce03815e5e6fc1d8ee3d3d7e00424ac9e76f9b951370
 MISC metadata.xml 470 RMD160 93b2078a69da3e04398a89e2dae4ea4a780df80b SHA1 980b09dfad5e13b7c63eb933ec9c3b2c72f09839 SHA256 36f1b9c65ec01a55e194084dd8549b7369938e5cf689c8165f4a3aa266f48798
diff --git a/media-sound/audacious/audacious-3.2.3.ebuild b/media-sound/audacious/audacious-3.2.3.ebuild
new file mode 100644
index 000000000000..93cf15410754
--- /dev/null
+++ b/media-sound/audacious/audacious-3.2.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-3.2.3.ebuild,v 1.1 2012/05/27 21:00:17 jdhore Exp $
+
+EAPI=4
+inherit eutils
+
+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://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
+	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="chardet +gtk gtk3 nls session"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.16
+	dev-libs/libxml2
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	session? ( x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	chardet? ( >=app-i18n/libguess-1.1 )
+	nls? ( dev-util/intltool )"
+
+PDEPEND=">=media-plugins/audacious-plugins-3.2.3"
+REQUIRED_USE="^^ ( gtk gtk3 )"
+
+src_prepare() {
+	epatch "$FILESDIR"/${P}-fix-mutex.patch
+}
+
+src_configure() {
+	# D-Bus is a mandatory dependency, remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	# Use of GTK+2 causes plugin build failures, bug #384185
+	econf \
+		--enable-dbus \
+		$(use_enable gtk3) \
+		$(use_enable chardet) \
+		$(use_enable nls) \
+		$(use_enable session sm)
+}
+
+src_install() {
+	default
+	dodoc AUTHORS 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/audacious-3.2.3-fix-mutex.patch b/media-sound/audacious/files/audacious-3.2.3-fix-mutex.patch
new file mode 100644
index 000000000000..3fb209196f83
--- /dev/null
+++ b/media-sound/audacious/files/audacious-3.2.3-fix-mutex.patch
@@ -0,0 +1,89 @@
+commit b53935921298b8164f80454c2016bd40de29704b
+Author: John Lindgren <john.lindgren@aol.com>
+Date:   Sat May 26 11:55:42 2012 -0400
+
+    Fix violation of mutex locking order (playback then playlist). Found by Helgrind.
+
+diff --git a/src/audacious/playlist-new.c b/src/audacious/playlist-new.c
+index 6407f64..596fbaa 100644
+--- a/src/audacious/playlist-new.c
++++ b/src/audacious/playlist-new.c
+@@ -822,6 +822,7 @@ void playlist_reorder (int from, int to, int count)
+ 
+ void playlist_delete (int playlist_num)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing ())
+         playback_stop ();
+ 
+@@ -969,6 +970,7 @@ int playlist_get_active (void)
+ 
+ void playlist_set_playing (int playlist_num)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing ())
+         playback_stop ();
+ 
+@@ -1112,6 +1114,7 @@ void playlist_entry_insert_batch_raw (int playlist_num, int at,
+ 
+ void playlist_entry_delete (int playlist_num, int at, int number)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing () &&
+      playlist_get_position (playlist_num) >= at && playlist_get_position
+      (playlist_num) < at + number)
+@@ -1225,6 +1228,7 @@ int playlist_entry_get_length (int playlist_num, int entry_num, bool_t fast)
+ 
+ void playlist_set_position (int playlist_num, int entry_num)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing ())
+         playback_stop ();
+ 
+@@ -1423,6 +1427,7 @@ int playlist_shift (int playlist_num, int entry_num, int distance)
+ 
+ void playlist_delete_selected (int playlist_num)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing () &&
+      playlist_get_position (playlist_num) >= 0 && playlist_entry_get_selected
+      (playlist_num, playlist_get_position (playlist_num)))
+@@ -2023,6 +2028,7 @@ static bool_t shuffle_prev (Playlist * playlist)
+ 
+ bool_t playlist_prev_song (int playlist_num)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing ())
+         playback_stop ();
+ 
+@@ -2110,6 +2116,7 @@ static void shuffle_reset (Playlist * playlist)
+ 
+ bool_t playlist_next_song (int playlist_num, bool_t repeat)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing ())
+         playback_stop ();
+ 
+@@ -2253,6 +2260,11 @@ int playback_entry_get_end_time (void)
+ 
+ void playlist_save_state (void)
+ {
++    /* get playback state before locking playlists */
++    resume_state = playback_get_playing () ? (playback_get_paused () ?
++     RESUME_PAUSE : RESUME_PLAY) : RESUME_STOP;
++    resume_time = playback_get_playing () ? playback_get_time () : 0;
++
+     ENTER;
+ 
+     char * path = g_strdup_printf ("%s/" STATE_FILE, get_path (AUD_PATH_USER_DIR));
+@@ -2261,10 +2273,6 @@ void playlist_save_state (void)
+     if (! handle)
+         LEAVE_RET_VOID;
+ 
+-    resume_state = playback_get_playing () ? (playback_get_paused () ?
+-     RESUME_PAUSE : RESUME_PLAY) : RESUME_STOP;
+-    resume_time = playback_get_playing () ? playback_get_time () : 0;
+-
+     fprintf (handle, "resume-state %d\n", resume_state);
+     fprintf (handle, "resume-time %d\n", resume_time);
+