Version bump

Package-Manager: portage-2.2.0_alpha161/cvs/Linux i686
Manifest-Sign-Key: 0x23E9E900

8 files changed, 52 insertions, 197 deletions

diff --git a/media-plugins/audacious-plugins/ChangeLog b/media-plugins/audacious-plugins/ChangeLog
index c2313faae784..d322fb02bfad 100644
--- a/media-plugins/audacious-plugins/ChangeLog
+++ b/media-plugins/audacious-plugins/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/audacious-plugins
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.263 2013/01/16 16:44:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.264 2013/02/07 07:10:53 jdhore Exp $
+
+*audacious-plugins-3.3.4 (07 Feb 2013)
+
+  07 Feb 2013; Jeff Horelick <jdhore@gentoo.org>
+  +audacious-plugins-3.3.4.ebuild, -audacious-plugins-3.3.2.ebuild,
+  -audacious-plugins-3.3.ebuild:
+  Version bump
 
   16 Jan 2013; Samuli Suominen <ssuominen@gentoo.org>
   audacious-plugins-3.3.3.ebuild, +files/audacious-plugins-3.3.3-libcdio.patch:
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index 98bef601b714..5ed5df32d1e6 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX audacious-plugins-2.x-fix-skins-build-glib-2.32.patch 373 SHA256 35511091a09198cc52c272748da35f3bce44b0cdafc2284843c41033e0f2bbde SHA512 920edae070912a9eee4bb4ae548647dbbb44cdb55e228b1b1b6104ef17fc3ac98bf1d4dff9042c9f2b70e264c553d4af6aefd99ee634fe04072551d836d2a794 WHIRLPOOL b70d3fb616eac8ae33bb57e6c48df688c621fc2105eaf7da8054f224c0d776075dd2acea5db9ce4fa4b5a4467404b4be8804d2a8c93aa376ba540ecff920d844
 AUX audacious-plugins-3.2.2-fix-build-gmodule.patch 1244 SHA256 c86428993218ea785d740cc0e051a4c2401aadc17f35940048dd39347f1acdd5 SHA512 6dbe6364f4c2199c4b71d6dce55af425c0221d0ba9660c943d07207a438199019c2a13260a65056a1bbb29ee609b0fb0f8a35ab9289558da41832633837a9cee WHIRLPOOL 113cbfd01e23fc8484cba16a3ab47746906c7d8f08e1b6072244043c59fbf88dc95f334a3fa79f1f0a5099e201ade9bd39e90300f9b3fe73d52b338c6e445934
@@ -13,9 +13,8 @@ DIST audacious-plugins-3.1.tar.bz2 2156993 SHA256 2d1e9b229b83e4ab2a2065e7116d0d
 DIST audacious-plugins-3.2.2.tar.bz2 1898457 SHA256 c637e6770ed41ec0e885f210944234326090d9cecf0547e2545fff09bc25b7fc SHA512 22f7af18ce7e128a73c21942a73ea3ed6b9f022efec64c091dfa38abd6bba02f9260db93645f83e3d54c32b3c24573f2417fb24c51f1a00a4e9759f9198e96b5 WHIRLPOOL 2e840350767852cc9b8899a76fc18d892382639add7bce127212f1386675c29ef3e135e2fd3f9564c3f2431568aa7df6dc6c1e43cec3ee9491468674c85a3ad1
 DIST audacious-plugins-3.2.3.tar.bz2 1921236 SHA256 bba70fbbb4fa7d1f40de4d96265069b6faf23233cbf544cb2882f7c709c9d2da SHA512 d4a78bab856450213dbb35d4c899134360ff20b907fea81a532c9b1176f348e191be64ca1f51b575d76b9f6df44c124259e3a92f00f4eebe723f51b0e14b0698 WHIRLPOOL 73f8ba2cb7e6ffb15253d7bf25e545e4f8be71b18652ef2a18569ece526514e01750b2b21204a48ceb5114990ea3ad4b1bcb8860a74a4835bc0b4141449111f5
 DIST audacious-plugins-3.2.4.tar.bz2 1921658 SHA256 0f03556de593d85d4aba0895c4586643026d15f5c1243e7353a4636e84b31882 SHA512 3eb887559983b35c33c5f91550262fb7473c6c968f152c8605332fcd62674ddbb6250c2eb952b73f99aaefbcedc47fc74d1c2bf5116f9bd919faf76ffa483085 WHIRLPOOL 9b8ed381a3eab08dc83ba3507f74d35a5ef7a769c6ec1968b88bbcaa866b196fd6997e79fd51eab54055d99f8166c374f099f8e17393a2bce63745672b4b58e5
-DIST audacious-plugins-3.3.2.tar.bz2 1687043 SHA256 f1c3c2e5da7a1aa5e6ac246f46ebdab776608478da66464a5a430c2a9f9efdac SHA512 5fc0b0d81975409bf965f4d7b331dcc8bddc27e7c1efdee0b4cd254292f81cd6475590192e838c2cf0bfbf6348b2020a191751dba857601ebb0d25ae7b0a7fa3 WHIRLPOOL f37e8d9261d306da4bd48dd0c1faefe6e76d2413930caf2e48cddcd4cfd87ea647676c619b04be1ec78371f75c08f1475e3be601ea4fd94a86fa22d87a1ac2d0
 DIST audacious-plugins-3.3.3.tar.bz2 1740185 SHA256 3906a70090edb09b94504fa37c823635b752b408e129fc0156286d409d350f8f SHA512 0f9d07f3290dd25efd4360f064abce4ddfa21aa84d42b1eefb3308715fb7013b1db4958e620b1cd293a5487973b4e7d0e7313922a576c182cde458dbaaad0a00 WHIRLPOOL 3730c16f21c7cc4dd2f51a4c51033d6733f434b75a7076c081970feb8863a4f701aa98a19289e169a142717d557c9d217fc559cc71d033e25eb1987000187ae0
-DIST audacious-plugins-3.3.tar.bz2 1682057 SHA256 44b073b6e595d5a8d707d94fd82ea1ab91f93342a1d591be4e371d67dc969610 SHA512 f167599381af102e2417f7810223d90759098d1c2f1fc1e31d5385a74323473a8934dfd7048423aa884abd78860d94b88cd2891045d988e89dc97ddaef7cef70 WHIRLPOOL 32fcf46ce858f784250195c73563159e50e7d6240c60d5eb4b981a2a165003b1a36c51b1ea26445c13b3e4c6b992dda2fb4ecf394ce0eaf3765d024029b0ad85
+DIST audacious-plugins-3.3.4.tar.bz2 1756149 SHA256 b66dd84ab092d9fb64182599706ed60a3c382c904a77e23285e1e271f007afd0 SHA512 4e3ba9adc4f44c3f02934a98d5c3225ae560e062b1e1f93e478770c8ea7f6e741a9cf83ae2ec34a05ac4c40dd08d0cf732e41029fa88bc37014bb8bbe1c1a681 WHIRLPOOL a96db513d671f656a5c8747cf1e8c300a6043e4decf3b3b939e07ec7b49b583289793da2d7ac9b52f4ceedae14ed3fa3d076831ec0fd38300f28b7c99663e605
 EBUILD audacious-plugins-2.4.4-r1.ebuild 3601 SHA256 405c5f6f913b240e593efc9c2b74b12ae4ead4dfdf02ad088fecfa7e0fe6d436 SHA512 e8a15849327070318b5ba946d7c1cd4fb30756b91bb8d58aa2ca39068f01afce2f8ccaa669ed2fc36f66abf32c5b68069ccd4289b94b7104ae2a3f2fc14738a3 WHIRLPOOL 2e225371ba15df3bfe083cf3b93f6bf19baf1496a416720012f8f7b22b87cf6f2dec6400533e1b10a043f913dfc973c996a45457b8551a5b6319029e4a2c91be
 EBUILD audacious-plugins-2.5.4.ebuild 3559 SHA256 064d2f8afab6aabb3c29930f4573e1adfa456f853ea36764f6b4ab9782413964 SHA512 699e01dbaa9ecdc4073a0e6ccb05f2ace50da9853e09e2d7b3dfe3034d5c76e1ca164531aada29fa74133feff03e4ec9e6dd345bb9d5c15b393d1adf1cb02e07 WHIRLPOOL f982732c9a4b3ffb3c9ed738c4f5c4117a7871cbc72a3345bf65636c5edec83d8e37f597e3a412606b2bc6ed36176f790b87666c496dde35df340fc4b423054e
 EBUILD audacious-plugins-3.1.1.ebuild 3419 SHA256 7e38ce3d0a98bae82ccec208babeed40159bf4366530e2643f2a12d930e3a095 SHA512 330859d650f0a5cffcf01e29a67e7a783e7be9d591b7ce03b572588d52312fbe0a0c6601c57c28cbc0e22f0d3d8a958af3b20c299b92fe34c37a0a79501fdcf4 WHIRLPOOL a6f01f05df2b758dbc4f6b105a40b7ebc138e58f4b83325d23eb59f182ecfc779ec092ffe218a336376045aba7100a9a975ca029c3b31025231258a5a152fa02
@@ -23,19 +22,18 @@ EBUILD audacious-plugins-3.1.ebuild 3410 SHA256 ac9baf46de774a907147409bc0cc4b65
 EBUILD audacious-plugins-3.2.2-r1.ebuild 3439 SHA256 9c85dce8f2fb2b94b2160b1d72f35d34923fbc9ca47825e284ea188868150766 SHA512 a6e4defdcb2a9814b0067bb56d05bfde9889c5c720bd5422da1d94c6b84bae1d0a1688b0afebc612748797cd9e33c3ac3f4a163973683245f8a0bb5d5cef8e94 WHIRLPOOL 3351b43f58fbe56960a7c6219af415d35a23966036b939242d311ed7ab4e0bbbef14dfebf13813630cb099c3bd258455673ab1b92666ce877d6809dc867709be
 EBUILD audacious-plugins-3.2.3.ebuild 3125 SHA256 5f10e356901c0ba24cb881f347fd24d7b539d28aec81466b5325d836f8fceba6 SHA512 756a99683c0e640290097021fd33693e573d81b24612489bb58362bd7f88f074dada664ed8f7c7a7f4921006f3b5f45e84f633943030ecdac46b1c3ffb0b03ce WHIRLPOOL 6ab530c67a565e904ccba151878830ec1efbe991e3360a582d37f67b9f09d375e1cbbd5717e5b99adef7081b51a789faf0cfaef44e8cf3070aa796e644a0ce32
 EBUILD audacious-plugins-3.2.4.ebuild 3125 SHA256 c3dc669baea27a95ab86a4733ecf3a02d1ddcf53d3ec55e65aa41b12c5783a59 SHA512 4235fff35cafdf03f8de56a30e85f380b6acae790fc63d0186b7fed71b4445c38231f4c305f1524b73d49de5ac55f4bba389f2c36e6e9683d463311137d227ed WHIRLPOOL a6b6e8971d51a08c0db16cb7fc8434444713e326d60850efc40837aba3682a966b741967e35f2284c6d994c58918558fd8e9281f3a1fb7f23fb0a62b2b16d6d4
-EBUILD audacious-plugins-3.3.2.ebuild 3473 SHA256 82415598affbba44e62ebc37bca52c6e7230416426edb8ecdb96158653112227 SHA512 971d49e62cd446cdd3449e7a25051f6e87007002553577a58d9854adbcca3892f897ded3517623b0bc9039e8267789aafce920d3099c77a51284a37e5cd68c49 WHIRLPOOL af51239b061d7e1f4d720b313b45617e19233a34b335cbd7a0385ebbc197e8123c5afa1c00dd961f94163fa3cda7f64eb76b9b8fcfc7db898a0ea73bda003847
 EBUILD audacious-plugins-3.3.3.ebuild 3576 SHA256 6f8c1ee53343724315855770cffca55768e38be720fae8f82436302733cc908a SHA512 1f6285b724c0b09ba42c981f9841d37049ca0a31a0f8e56d19f41da5ea63a15f9654d6868fc44338c26bdf4a7b84b414ac17321a81622b82b37cb73089994531 WHIRLPOOL 991c00a41dcb8694baf6354ee20503183cf3e66fa35fb1995486981357cd274ba24d53a27d5414bf284bfd23df0a604d940d2fda1ab4a59bae46825c7061359c
-EBUILD audacious-plugins-3.3.ebuild 3469 SHA256 5cdffb592e528e530e64ac09a1e34fe63297a027e61aed28a93367b626015752 SHA512 081cd124ddd17ac2630a994ec27cc8611b0bc20ba8d820c566ae9a2f5066946d89eb48a4db44a7af5122f992454f50a40bf82f072684590fc5b20c6e7cb723e6 WHIRLPOOL 9a6fe3eebf570c4192ab66406806f8fb631edff8d17760ccd60d04ca68e9e401263b7c030a7bae97360e2099207cf2add9bc5e30a00e4a5bb92137e74743cc1c
-MISC ChangeLog 54105 SHA256 56632e99d92e74d914e7b5e48cfaacd1158322e06b7aa5cbf55b7e3cbdcbd3e4 SHA512 5b0504f9fdf0427852aa29d3ae634dd14c7eae8d1312f3c49ff6a827695c40cddda18ca1a839e04862cc6d53835b8a1967b4ba4d771919154421afb119f0f19e WHIRLPOOL 3aa85fbdf145eecfc2c4bd2cc8c29cd3e140aa9121b0f668a9665dfc17465e3610725b2f292d7321a6b1b97cf0d9075d2cc7c39a69ee09f13babe491c3d264a6
+EBUILD audacious-plugins-3.3.4.ebuild 3531 SHA256 20da115c76bf6c119a6c08954f2d7bac382841e4bacebc3409c8b1883c0e2db8 SHA512 a8e5dd4063c8282f28a17a7abab773ebfd6e9f3af1771c21f2dbe8137674b6d60d782b7d0ede8bd976e3bffc60bbe182f6ac98b140d0e0e31192454d03f6d970 WHIRLPOOL b613eaee544426f832bd95696f16940782072bd4c596d05c4362327b8bcd46f9ea87097b29e30675827ac256b0dec8bf6eed0751feb7a6c79d978a772e6e241a
+MISC ChangeLog 54308 SHA256 7638d60f26712d830404c892eea13265a6f5cd5cd174e30f073815f41700ed7c SHA512 6d88b53501c6455cbdfb1e7a7d8bf06e2ec6a352e23fdcc07244185ddb9ed641fd1fd93af64ec89e59761647b02fe01aeeabc34dca4c686739bf95cd64caba7b WHIRLPOOL 7ceaceff62937e003708380560b227c059e43c9336cb5cd2f167e69f2a191dc4b965c2a373463c168f5eae59ac5f82abfcdc15108cc9f4efbc370369c5975c7e
 MISC metadata.xml 900 SHA256 67b5344a7a88e6d04a4df5958625bc175514692e5e0f5a9c441ebbbcf9bb2750 SHA512 ce599585b5e9e9bdae0c9cb7601cb8646c294a5975a1333ca1510842167410114ac10beb135f0b784a660ac08144eb483211858ca31c3be73265fd28175d0e8b WHIRLPOOL 77125319e91b557e886b4decd1bf3deddb48136022739214b52a4e4839c1e501711a75903e59bbb00eb6629471f75bc4e215070ae00867feae7ff0cd3169ec69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ9tiKAAoJEEdUh39IaPFNTxQIAJw8E+WwXlH3e8WlsBwOTbny
-GIV5Fqegxd6dKbj4YfoRrV/ay0wxPSxi63QUFL3mannHrX/RvJutdxpQJHiThQK3
-RUeTQucVEJG+Gc2BzfV5XOTOqOYOaDoTGz743g62KGx1axUz+8Vfpq4NWQ/+i/Jq
-LcjhUbpVTvWranzQFnGoHWFUDnoaPLiym0oQ8OzVSPCMH224M21YyuKyAsQVcGN3
-dgOgvQj1r/3QLtlsHwMBBIBrtDBTcEeGP7c9eUc7PCe3Vbzt5iLcnIvurIyQbTxA
-rzLGoVazSEV25Ovrd5FeN+3BGV3CFkVGuzVNtbT0nh39K1asxMWFnF9753PJ/2M=
-=2nVN
+iQEcBAEBCgAGBQJRE1N+AAoJEPUd7O0j6ekAZTkH/0mUBNAy1IduA3XkDW5Vt6qV
+gbUSL1RkPLg+EUMc4U1XZvnz9RTGeDOwK3rdDMzS/LTBJDWJaHsLs8lo+ADESIv8
+vrXIxxoF207hQaFG4O1Z6mVGFgWEi1A2N2SAtyZo2vA10AACy9hTprwzhu/l2hbt
+HAZdIynujfn6o/D4tlGxmEVJWsbgvKhwOf5P7EZTPmbXwJMtBEr3BeQ7MdW6Zgsu
+69BRMFnRgQEKntD7KKwqRAyLOP0IsV324oGgaKIuewgfyzMZPK9N6qTXHHk9xrI+
+VuLvoe1MKmBbfQzOvy8N+I4TaHdOgj7kFfc3zzkez5/H8iNdCZTmkqyMMxw+MJY=
+=ko3F
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.3.2.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.3.4.ebuild
index b6280a2631f3..51b40d283b93 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.3.2.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.3.4.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-3.3.2.ebuild,v 1.2 2013/01/06 20:54:46 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-3.3.4.ebuild,v 1.1 2013/02/07 07:10:53 jdhore Exp $
 
 EAPI=4
+inherit eutils
 
 MY_P="${P/_/-}"
 S="${WORKDIR}/${MY_P}"
@@ -20,7 +21,7 @@ RDEPEND="app-arch/unzip
 	>=dev-libs/dbus-glib-0.60
 	dev-libs/libxml2:2
 	media-libs/libmodplug
-	~media-sound/audacious-3.3.2
+	~media-sound/audacious-3.3.4
 	>=net-libs/neon-0.26.4
 	x11-libs/gtk+:3
 	( || ( >=dev-libs/glib-2.32.2 dev-util/gdbus-codegen ) )
@@ -29,7 +30,7 @@ RDEPEND="app-arch/unzip
 	alsa? ( >=media-libs/alsa-lib-1.0.16 )
 	bs2b? ( media-libs/libbs2b )
 	cdda? ( >=media-libs/libcddb-1.2.1
-		>=dev-libs/libcdio-0.79-r1 )
+		|| ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
 	cue? ( media-libs/libcue )
 	ffmpeg? ( >=virtual/ffmpeg-0.7.3 )
 	flac? ( >=media-libs/libvorbis-1.0
@@ -66,13 +67,13 @@ mp3_warning() {
 
 src_prepare() {
 	has_version "<dev-libs/glib-2.32" && \
-		cd ${S}/src/mpris2 && \
+		cd "${S}"/src/mpris2 && \
 		gdbus-codegen --interface-prefix org.mpris. \
 			--c-namespace Mpris --generate-c-code object-core mpris2.xml && \
 		gdbus-codegen --interface-prefix org.mpris. \
 			--c-namespace Mpris \
 			--generate-c-code object-player mpris2-player.xml && \
-		cd ${S}
+		cd "${S}"
 }
 
 src_configure() {
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.3.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.3.ebuild
deleted file mode 100644
index 5f66d747f812..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-3.3.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-3.3.ebuild,v 1.3 2013/01/06 20:54:46 jdhore Exp $
-
-EAPI=4
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack
-lame libnotify libsamplerate lirc midi mms mp3 nls pulseaudio scrobbler sdl sid sndfile vorbis wavpack"
-
-RDEPEND="app-arch/unzip
-	>=dev-libs/dbus-glib-0.60
-	dev-libs/libxml2:2
-	media-libs/libmodplug
-	~media-sound/audacious-3.3
-	>=net-libs/neon-0.26.4
-	x11-libs/gtk+:3
-	( || ( >=dev-libs/glib-2.32.2 dev-util/gdbus-codegen ) )
-	aac? ( >=media-libs/faad2-2.7 )
-	adplug? ( >=dev-cpp/libbinio-1.4 )
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	bs2b? ( media-libs/libbs2b )
-	cdda? ( >=media-libs/libcddb-1.2.1
-		>=dev-libs/libcdio-0.79-r1 )
-	cue? ( media-libs/libcue )
-	ffmpeg? ( >=virtual/ffmpeg-0.7.3 )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.2.1-r1 )
-	fluidsynth? ( media-sound/fluidsynth )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit )
-	lame? ( media-sound/lame )
-	libnotify? ( x11-libs/libnotify )
-	libsamplerate? ( media-libs/libsamplerate )
-	lirc? ( app-misc/lirc )
-	mms? ( >=media-libs/libmms-0.3 )
-	mp3? ( >=media-sound/mpg123-1.12.1 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	scrobbler? ( net-misc/curl )
-	sdl? ( media-libs/libsdl[audio] )
-	sid? ( >=media-libs/libsidplay-2.1.1-r2 )
-	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
-	vorbis? ( >=media-libs/libvorbis-1.2.0
-		  >=media-libs/libogg-1.1.3 )
-	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	virtual/pkgconfig"
-
-DOCS="AUTHORS"
-
-mp3_warning() {
-	if ! use mp3 ; then
-		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-	fi
-}
-
-src_prepare() {
-	has_version "<dev-libs/glib-2.32" && \
-		cd ${S}/src/mpris2 && \
-		gdbus-codegen --interface-prefix org.mpris. \
-			--c-namespace Mpris --generate-c-code object-core mpris2.xml && \
-		gdbus-codegen --interface-prefix org.mpris. \
-			--c-namespace Mpris \
-			--generate-c-code object-player mpris2-player.xml && \
-		cd ${S}
-}
-
-src_configure() {
-	mp3_warning
-
-	econf \
-		--enable-modplug \
-		--enable-neon \
-		$(use_enable adplug) \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable alsa amidiplug-alsa) \
-		$(use_enable bs2b) \
-		$(use_enable cdda cdaudio) \
-		$(use_enable cue) \
-		$(use_enable ffmpeg ffaudio) \
-		$(use_enable flac flacng) \
-		$(use_enable fluidsynth amidiplug-flsyn) \
-		$(use_enable flac filewriter_flac) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable gnome gnomeshortcuts) \
-		$(use_enable lame filewriter_mp3) \
-		$(use_enable libnotify notify) \
-		$(use_enable libsamplerate resample) \
-		$(use_enable lirc) \
-		$(use_enable mms) \
-		$(use_enable mp3) \
-		$(use_enable midi amidiplug) \
-		$(use_enable nls) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable scrobbler) \
-		$(use_enable sdl sdlout) \
-		$(use_enable sid) \
-		$(use_enable sndfile) \
-		$(use_enable vorbis) \
-		$(use_enable wavpack)
-}
diff --git a/media-sound/audacious/ChangeLog b/media-sound/audacious/ChangeLog
index c0ddc4510150..82db6be06a60 100644
--- a/media-sound/audacious/ChangeLog
+++ b/media-sound/audacious/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/audacious
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.286 2013/01/07 19:56:04 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.287 2013/02/07 07:10:52 jdhore Exp $
+
+*audacious-3.3.4 (07 Feb 2013)
+
+  07 Feb 2013; Jeff Horelick <jdhore@gentoo.org> +audacious-3.3.4.ebuild,
+  -audacious-3.3.2.ebuild, -audacious-3.3.ebuild:
+  Version bump
 
   07 Jan 2013; Sergey Popov <pinkbyte@gentoo.org> audacious-3.3.3.ebuild:
   Correct dependency on audacious-plugins, wrt bug #450186
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index d69a7c57ae90..0a7b0e01d70a 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX audacious-3.2.2-fix-build-gmodule.patch 1668 SHA256 21641fa4c35d4e3aeabbd0f0d51e71e3ee2b50a979b2154e00fbdd86399c55fa SHA512 0d9f275f45847203b013a0242f0ab249bdad558019b41ba389f6488be6993e534eaf7f92e8007d2496260b912f0fe0d44c904cee7c8cc55abc35a6cc2a39dc14 WHIRLPOOL 8532554df6de53c01e4d328d01c9f837634d824354ef7f38cec78332f7ecf15334fd6fb437d9ca35e67ea02db3201e6b7d2e38d977118bea6a1466473e206319
 AUX audacious-3.2.3-fix-mutex.patch 3443 SHA256 609dadba4911d7db548a38c11412e5fff185756991e2776d48271c12ea66899a SHA512 71dc285068d2c6565c0b7d0680531976018a09d5fd41fe66eb2abf8c38d2ba555b176ade47838d5f2338167b852258a81ba132e258e915c2c1494f2ab929ac45 WHIRLPOOL aaa8fa5cf88e4f8a36cc4d4e94e8ccb30d713c841ac199634f3da9eee87bcb23a138c4ad2449ba6506bcf92791f51e53736c57be4ca398dfff1486ad1c34273b
 AUX audacious_ldflags.patch 392 SHA256 b50f57ccc80ab472876b2a3726a5d894be11f5b6bfc70ac1411ece67c839d767 SHA512 188b6054e8a8c99fdf475358ca8b27e082cc4349bb84c8b5c6a7f27ab0244cb0db0878872f3d643ddb89fcfecbc55ebd1cd3c454208572bf36736b3a23df4129 WHIRLPOOL 7cfd17acb7a0c9a0c5caa388b4d68f91e75ff09a3be5f7ab3ad38c4a59374cfe0a4502e790b15f4222cfdb06d64984d91cf17718ff12dc767b1f6576ecff80bd
@@ -8,9 +11,8 @@ DIST audacious-3.1.tar.bz2 793321 SHA256 306db180cd269b072cfb23551b4139cd2af28d8
 DIST audacious-3.2.2.tar.bz2 675192 SHA256 c69c20e48c2ed330a0ffb55f3a648b50323406e2a15ca407e3291f83e57042ee SHA512 e9c1e4c6c9bccac83f64280742036bfbab07737af903c8b3cf7d41dda0ce1c7d449eecba6c87918d750197cb8bd7b6c9eb034e670ea3a04cbcc3699de4762e36 WHIRLPOOL 0fe8ff2bcbd366ba0f887910f99bb4f691bca716c49a31f69a90b0ee4db209875514da8fa2c440ccaae934ff0bd10692f07713bf73cb89bddb00a7e0caf00f31
 DIST audacious-3.2.3.tar.bz2 695917 SHA256 aea8ad2f4da80fb58cf8b0e880585ab49ac42e8a02247c364ea29ccca5572bae SHA512 29bcb02240cfeca8611935a9093b6271bc52809515b07fdaf846457b914ff13c03d82332a762332a16cc7a036963c582f5ab2f0b25592312478dee3a38510c7e WHIRLPOOL d92d6a5f9cb2ef46138527c47adac50f44acf33f2dd89a624875467dff39e20e72be61eb4aebd9216306b70cce43abb75e5c286da3108ec7bc14d27127b0991a
 DIST audacious-3.2.4.tar.bz2 690943 SHA256 12a14542883407110d2b4367db38e8e0620d83a266388427f358a66689a4553a SHA512 a6d4ce6c352f875caa84b32d8ff30d49e787ca387f6a25cb6a7d44be7f5432c147259a9112b247497804ffc2959ffc2713a90eeed7204d55dd26607896d3936e WHIRLPOOL a50cc579b50266e581b7c25ee56b97a54433f1c5310dd8e34eec96c5d205e921ae781ff4207f87bf1d08800b1a94cbc2baedc84f72dad30f2b2fd35bfeb79b7f
-DIST audacious-3.3.2.tar.bz2 466951 SHA256 ee12e08d2486cc433c9906f388443331dd6f586f63bb5f6ad7d57a898af3b704 SHA512 40e9df55486042097ccfca619ed41cb1b6b7c59133e60403c18f3d9ab90199dd2474eb78ab3c7fad14e847ddd2ffb896eb57d2a2a54a9d43797de80e742c09fd WHIRLPOOL 8bd2ffea77a006846e5c4f82b56a067defdb3bdd99f2d42274169397c52d54b15e339ba8b85354eb627ea00286682e4c15c3d3ece85f902a936045ae0cf86d2a
 DIST audacious-3.3.3.tar.bz2 470286 SHA256 bda1074c98284471b8ded1caa5f640cdde6e8723fa8b3f4fd685de97228f7c94 SHA512 82593b3cb2b104e6d1dcbd87ff51dad0d8ff125065700db8349032fd4eb2bdf4d08f214fd575cc405914234817a6c3092c3cf4ad62c223b4287a44845b91350f WHIRLPOOL 646980115e8c3cbe2441700b4926adb528e9a2c1e234e82290a1e9c702f5eb7aa7e069d94af210ecee8337aae905bedf77055e7ff5b16043f670094c62a65855
-DIST audacious-3.3.tar.bz2 456940 SHA256 6cb56535c143e6d0b3563fe17cce59a3b8aee2dc2689769f1fc26e8124e367a7 SHA512 50bf8d889fcec810995b6bceead47c199bf4f408079ba7009233a95b9b0384d5ad375f8a46059a7a34f2b683f6500b041a84359e67ec6b1a3db62f994c4ccbc5 WHIRLPOOL a41792c6cd12de814fdaab2e373bf7b82f167ba57a7a93dce320a033999228fb4dbded1cc8750d797086a6ad1429133d781b528b377d7dada8eeb0ec3de6c84b
+DIST audacious-3.3.4.tar.bz2 473345 SHA256 671cdbf9b6b722b4ff4f43bcf85da0bdd1dfdf461b510cf6ecdb9187a427fca7 SHA512 0da20e09dec3104f6e0c16a61eee7fdbd221e21d460544efd1dd2b2f12476f62f0f9042976e6b682510a21fb894fa8a089730ed7a780544e4b49ca6f5b0b6b89 WHIRLPOOL 38ae46e98e378d8b16dc3841f2ebf9907735cb7d2a204d00cc93837f132a0fdeab9acc6c1da40dd3ac0a41a1e33074a308a7941653e4d0ca5e1347b1ef24ed04
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05 WHIRLPOOL b7a4409629a860021477f34f8886c40c005ea2ec34373d80e6a696323866e54f361e38c76b1ac536775ae5912308f11416e613dec791f21473f01a2fad35bcfd
 EBUILD audacious-2.4.4.ebuild 1750 SHA256 f253bbbe5f4666fb437e09f02f5280a087dd0a6e4e333d0ad4230208c7620389 SHA512 1f0ec20e4c57587957b8d63a347dea28835ff16e1f123a4be957ce4dc6f2380bfa8db343dc3cd29e87f09372a7294dd770b7b59ad6205b8375afde2cdda70421 WHIRLPOOL fdcd5afd5fee63961b3deaca592489712912ac4b210a0e8a91f1a19f383ec735cfb53317732243d44e146403ffddbfcb3be75bfec0f1ab9e99a6a71699be892f
 EBUILD audacious-2.5.4.ebuild 1749 SHA256 e0291c2b3ebc6d8b8b0a4918382ab25f1228bf047e71101d097ce5848b69a64d SHA512 2569fd55342bb62c013f75b5ff40fd6612b066f481cc39b21985ea215752110c9443b6599459b264538ef4ee25f65e16a87bd2affa896844c09bdaa6217adce5 WHIRLPOOL b2953cdbd5ddc6e8413ecf9fd97693fdc8115981d214bb29af106511d55549043715541ef875c578ba46e7ffb80160d80fa8444321664cc5c3874a97506c853c
@@ -19,8 +21,18 @@ EBUILD audacious-3.1.ebuild 1893 SHA256 c862886099cb850aa8dedc22ecd42883eb4f9be4
 EBUILD audacious-3.2.2-r1.ebuild 1903 SHA256 808ed8914c4324ead3a9c4134945f2b014eab4a434986d718cb53cac66b71246 SHA512 1938081cc1b6bf6d419437be6f73f0b4886841f533d179c33c71de23f3402fe5bf60dc63151226246518f096e16d1d24cc562ef47d9a76c9a23a022420c97327 WHIRLPOOL b3afd0db2b5045198b669848aede211072e36a441d318728ea7ba41efeab23539e9f082afdf8f93e679af53b754261d8a3b0c07ae38a5cac9d4ac6d74c67c8bf
 EBUILD audacious-3.2.3.ebuild 1879 SHA256 a649694f5e711d1fc95ad9fb1fa2ca1304203952ce4231593c44ee06d42e253a SHA512 43422e17a1a89014a52b086c059f3902d0a32f9dfadcd9a11256e7c0bf99b310d43f1d7340baf3c68c186c7d28ee9f82a53e4479f48150a240bbc1599dc9e570 WHIRLPOOL 810cd90131522934cb82aeeec4fd2de5cb2852da0b69941d04f9adc14d0614830388df6345e8deec2cd302a37536decbf73f2d4f2c718a8ff41211b3ab35c793
 EBUILD audacious-3.2.4.ebuild 1681 SHA256 1257b23abfbd349e4682e057fedcd16fb174e9a3c385f30086b90b4c29663280 SHA512 e0ee4db3f4cdcd69080bd891e825f0c5862db98b6e7a0414635b15feda5ec04c958c3cff68c409636b3d20a1a0ae32d253552efadd3f59416e87fd7e57eea437 WHIRLPOOL 4fdf3b802abafd89f88cc03fe76b3c291fcb163a1811ea1db2dabdae68e27545b1a67f58c8d9e17dd8e84b6ab5182d021f37246fa9a76ac5d0fc45b4493392a2
-EBUILD audacious-3.3.2.ebuild 1561 SHA256 3da2b32441d49a05b4785d8399ee9352d5e7f58f59287099cc1b194179b0afca SHA512 29e9e7a1f9a78a620d5ab5ef7a9294791eb51e1e601aca8aa410c06e48e68c95f749fbda10d7810564d81b1ff5818a3084f8dc6d73ec2a2da0ae17a090a678d4 WHIRLPOOL 05fac0dc9ff357e0a6d8067525a33135213c1e87c2a272698ff7ff2484868bedff0fd2d548bed274d8b9edf7689dc86456970fc1a8af546db4d5a778a452b7a8
 EBUILD audacious-3.3.3.ebuild 1561 SHA256 7125be643c7b5b98e61f32379934dfbc5226d9b0ca8dd1737131fc38f6c975f9 SHA512 d0028bab6a5467ba153561ff4c52395e0d16fa4138edd1ec56011943bdc414159a7479698cff49a520ac2e1d42f40cc927cc65a13fe070851ad022ffe564e759 WHIRLPOOL 14ee23a741b83c9e06719b0bcfa22be9a23e21621f95f7c8110fa7118e03fc866a0a8df8343b0034baec37f59cbd2ef3202248e989a938ba3dee9e42b602edb8
-EBUILD audacious-3.3.ebuild 1555 SHA256 c4aca7df1bbdf74d19c8e77e6177ceca19028c3457655be932ce0dc5ef111fb3 SHA512 de5c36486728bceea03add277e4366560192d1ecd6404c41937721ad1631e37516995c89428a02f971e918d6169c2f96627b9926339e8f8d0b1280bdba63d50c WHIRLPOOL 2dc11aeae2610c4cc3b024edabb463b020cda5358b7fd651164ad15608ef73fd1aa1b7133a4f39a7817e89100edda692d6dfe4469277f0f538f461a0190f456b
-MISC ChangeLog 49385 SHA256 8a323e4aca09bce1dd6bd2249dd1bcf4280848a5081c96e1cc69ecadd5c34f0b SHA512 a19bf4dd2cfd5b8a44b6c0c8af7a705e62af9a10a0cbab70fd564a488a51c011d66693dcc2feb5eb0970895b57efec2a130a27e7aa0910ea39b176d2bc12f8d3 WHIRLPOOL 3600fdfef58ed3ce223fb3719cc3b3c3ae258fbd1aacc8cfac00300a237cb79ba0f3d868cfad4e2bae7592c987d0918c26da3fdd0a2a6f7aab240aef4401e561
+EBUILD audacious-3.3.4.ebuild 1559 SHA256 7062ac3079481a4be45a9acd6ba0daa0ee448f1576c5b8e54be803d0a9afbab5 SHA512 22e9fd0a7b777201b50b32dfd9c95b08590fdba716d85be573f59d6f16f4cd23d14c13bcbf849b7f376e90b8abfef08a4e8d005ddeb4803435d5280fd57c6ba9 WHIRLPOOL c48b4b0c611df6fbbfc1e42e4f0a7aac45551f4931170f2892fd6172e0dc650d303de12463d3bd48b83ed6f7e023e7c3a08400b1794b26d04950d55d314db8c8
+MISC ChangeLog 49555 SHA256 a8d4dbff0c39b68f992d6b2f895a6f697e7d154e0286fdfe084c131036bed553 SHA512 2de51a6ee422bb4d3bc8b42442121b25e3a378e899916212424fa8fee5b3b02e91cdc57604ed5f1fe696ce4bfedd8065b990c6a0ed1c0e0ef0f71308848f4853 WHIRLPOOL 60827be5d0888df68cfacbef5eba5d3b6ed4468ad04dfa407ff825fc641b7443096de7b5f1380fbf4077e7809ec8eabb4ed845ee7535687d22bd184844e6150b
 MISC metadata.xml 470 SHA256 36f1b9c65ec01a55e194084dd8549b7369938e5cf689c8165f4a3aa266f48798 SHA512 69a1b4591547f804e5a10fc4eda24e42971f2615e2824adaf694af421ff5477150a048a31651ad3a7e31fa4c9f50fb4b76f208370dd9588ad501553fb35ce20b WHIRLPOOL b664f5670c1d9bde74612bc0ee55baee181794b06de982e34dc967498823961c09d89d275028e0fff0d643fb05688632c6f4ec708f3f225be88b860ee489aed6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCgAGBQJRE1N+AAoJEPUd7O0j6ekAgQcH/A2urdhp5eBsAxmjGkNE5JOx
+hIhd5x/07wOS4Ma4C6ULnmroEH6lf1W6N6dtewUHYJnuZJi4zviCrLREX+WwAfnM
+5h76sU4NwAi+Wzxvl47kY0h0L9aKsCI1us4I+NovpuVJmWbQQGRtV/hQigthMlsu
+h9DAIdeABQS23WR03Rba9WkkgxUdNZFskER4xPVK8CT9KjtjLJ7K4n3PbnPGoL30
+k2k3Am77GrTIStIitaO4By+ECtRSALCwKhmDj/Y365CnC04woqlIzHAyQl8wuels
+KGqIBt+rcerHEtoDZx6cwq5mXJ2TRCBcVP1Xt+Ed7vMN8px00n1RzmZOKmJZFyU=
+=DJIc
+-----END PGP SIGNATURE-----
diff --git a/media-sound/audacious/audacious-3.3.2.ebuild b/media-sound/audacious/audacious-3.3.2.ebuild
deleted file mode 100644
index fb5c499b93b8..000000000000
--- a/media-sound/audacious/audacious-3.3.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-3.3.2.ebuild,v 1.3 2013/01/07 19:55:27 pinkbyte 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="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
-
-IUSE="chardet nls"
-
-RDEPEND=">=dev-libs/dbus-glib-0.60
-	>=dev-libs/glib-2.30
-	dev-libs/libxml2
-	>=x11-libs/cairo-1.2.6
-	>=x11-libs/pango-1.8.0
-	x11-libs/gtk+:3"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	chardet? ( >=app-i18n/libguess-1.1 )
-	nls? ( dev-util/intltool )"
-
-PDEPEND="~media-plugins/audacious-plugins-3.3.2"
-
-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
-	econf \
-		--enable-dbus \
-		$(use_enable chardet) \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-	dodoc AUTHORS
-
-	# 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/audacious-3.3.ebuild b/media-sound/audacious/audacious-3.3.4.ebuild
index 83fae41ef87d..b2d04daa5066 100644
--- a/media-sound/audacious/audacious-3.3.ebuild
+++ b/media-sound/audacious/audacious-3.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-3.3.ebuild,v 1.3 2013/01/06 20:53:19 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-3.3.4.ebuild,v 1.1 2013/02/07 07:10:52 jdhore Exp $
 
 EAPI=4
 inherit eutils
@@ -19,7 +19,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x8
 IUSE="chardet nls"
 
 RDEPEND=">=dev-libs/dbus-glib-0.60
-	>=dev-libs/glib-2.30
+	>=dev-libs/glib-2.28
 	dev-libs/libxml2
 	>=x11-libs/cairo-1.2.6
 	>=x11-libs/pango-1.8.0
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 	chardet? ( >=app-i18n/libguess-1.1 )
 	nls? ( dev-util/intltool )"
 
-PDEPEND="~media-plugins/audacious-plugins-3.3"
+PDEPEND="~media-plugins/audacious-plugins-3.3.4"
 
 src_configure() {
 	# D-Bus is a mandatory dependency, remote control,