Add small hack to fix bug 428632. Thanks Christian!

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

3 files changed, 28 insertions, 9 deletions

diff --git a/media-plugins/audacious-plugins/ChangeLog b/media-plugins/audacious-plugins/ChangeLog
index f92f57ec212c..a73c5ead1b99 100644
--- a/media-plugins/audacious-plugins/ChangeLog
+++ b/media-plugins/audacious-plugins/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-plugins/audacious-plugins
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.257 2012/07/29 17:10:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.258 2012/07/31 02:28:30 jdhore Exp $
+
+  31 Jul 2012; Jeff Horelick <jdhore@gentoo.org> audacious-plugins-3.3.ebuild:
+  Add small hack to fix bug 428632. Thanks Christian!
 
   29 Jul 2012; Raúl Porcel <armin76@gentoo.org>
   audacious-plugins-3.2.2-r1.ebuild:
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index 7179d91d5645..3ee0619206f5 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+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
@@ -20,13 +20,17 @@ EBUILD audacious-plugins-3.1.ebuild 3414 SHA256 29e41512a80145bdf089e7ae76db7ccb
 EBUILD audacious-plugins-3.2.2-r1.ebuild 3444 SHA256 4f0292b2141a474e5c46925b3103176d8b6628e6c6ae8f206adf013a8a54af4a SHA512 da04e823be423aec891496afa675618327164d4a00f01e46954bc4801f7e3ca45894df830a8cea2e6b2736e88b272b5331676c6f61ced8153e5818cea920db37 WHIRLPOOL ecae88bb27bedd681f0b4ff04daee6bdee41c98691042f71067c3c57c9e683ff8d7447bbe53368da68f9cf366c098759c0ec7567e0c44ad0fbace62797e839c3
 EBUILD audacious-plugins-3.2.3.ebuild 3126 SHA256 88f593960cd7f143d9850aa902229f9fab01c9a62f3d65f5289d437ea04ef63e SHA512 1ea859354939bc4b7cc02c9ded9f741153eb9676757509b7b5b2d2e6af64aabe0c887a87773af024715a74706c7be48647ae4c2f9fe6402b0b0062f64bb45d94 WHIRLPOOL 056cd55e224f16b7de973f8a0ee5e75e94949dca4288f15fd966af7df2b67be3f58a1b207c8464b7d4596a8aa23d5af983c79c4b0b0001b6d37e4dd31574edb3
 EBUILD audacious-plugins-3.2.4.ebuild 3126 SHA256 4873568ca25e04ab4391315cda89920a9a37755fa90c6d6a6eb2e61d3a8c7525 SHA512 17b7d050a4157205fd5701724648c9e7b718623b7b4fb584d781a0ab8def0c2307311abdf6aaaf7f57515251e67bf368b42ca499679355b79d50f63afb4fa0f6 WHIRLPOOL 3dabfc8bec43f2f7b28b785afdf60493ef86196dac2ec31078ffb9e7cbfc74927d297fffc34a76550802898bb9567c63ee5b0eefb6286c2f3bc5227c525bd62c
-EBUILD audacious-plugins-3.3.ebuild 3069 SHA256 90d4eea0462f6f060f19c84a579c26affd6cd92778de20882921d7d0ef532bd0 SHA512 8dbbfd8fd1515f657a757ba9c89db9be59b5a80b76f7f9a778a1304976ce7fb562149f2ab7c5f56d5450fff5ceb46c886944e9ec685d2825c3db2344ca622e10 WHIRLPOOL 31c539e67ad51f1ddde26b5dbb4e6b99d8c1bab3f3383bed55a808a3e8054027f17ee9696f18d4728ce555cf95ffe8dc370269dd02c675287c1e7725c2c55c7e
-MISC ChangeLog 52975 SHA256 358406cda3d7183f0c68aeba1445a15e605b2eabcaee7ac6dc3a10fb907d43a2 SHA512 5982483425ec3aedda8ee1bd0154d5871da9012402f687c3df4a0b73e1b82cdddf1fef0fab997483cf6e3d60a4c8fe7696a44bcad3b040f8e3dd4ec864c5a921 WHIRLPOOL e58f2a724a38419c7a9ffd7cee7e5268f00cd5cac26ddae21c784e84edbfbb4ec88090cc932621c3c98725eac0272cb9ebfa8d013e84d4ec9be4b5af87daa65b
+EBUILD audacious-plugins-3.3.ebuild 3470 SHA256 86362f9798ec79279ebb98783da256cb2f7882b152f9727480a27c65d37b1651 SHA512 dc3309d34c51dba5c33dd06d5a22f4db87f61a57ac5b559d717cf0eab0e4ca1be198a425cc26452af100ba01a2de3d1175773100ed3fb5949e02047814850e72 WHIRLPOOL b30d7ca337c71da7c89453e81a92b41d473fc05101dfb83e2ef10172f4fddf1b49410f412f959c3d5b24a36ea6ca82db76418e6246131a771731a7b61ebd79ce
+MISC ChangeLog 53108 SHA256 68baf395a239dfbe3ddd1517de0aa88c0b63f9e634f120a6642f8cfd65966196 SHA512 e51d06b2b4bf0b927007f3e4eb6f87ad8c7d2f624ca808c305af48b141dad68ec73a02ef4a98f2f6b4b6e1c0a545df6eec513d682f85410d5ea80313f6f4292c WHIRLPOOL f7514c72c383cc4b91fe77a990118f5fc3f7a7c63312908ab9801783e06fa3b7bd7a7d31af82373f3b3dc82639ae99e580b856b1236167bab45fbaf73adc8b82
 MISC metadata.xml 900 SHA256 67b5344a7a88e6d04a4df5958625bc175514692e5e0f5a9c441ebbbcf9bb2750 SHA512 ce599585b5e9e9bdae0c9cb7601cb8646c294a5975a1333ca1510842167410114ac10beb135f0b784a660ac08144eb483211858ca31c3be73265fd28175d0e8b WHIRLPOOL 77125319e91b557e886b4decd1bf3deddb48136022739214b52a4e4839c1e501711a75903e59bbb00eb6629471f75bc4e215070ae00867feae7ff0cd3169ec69
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlAVbm8ACgkQuQc30/atMkCNjQCgkwHrwAan/oC3VTMLafjX680w
-p9AAnRDRlbMzmckNeRd8vQJ9jH/AsXI6
-=Mz24
+iQEcBAEBCgAGBQJQF0LUAAoJEPUd7O0j6ekAEv0H/0TKTClAh69uJX0TmAG1TL3w
+go3uy90sSXkzxtZojP5qVJqjzzzK65eRdJ2OI1PMPXTcR6fU2Db9FS186sOxjMFw
+PNEDokGf/Aw1bAdnj4GIeHNJY6dHXsN3uNn7KIAhxK5vHv7FQCq+kCne9E8OPFje
+yEHzoG9HzuNcpxOkBQDoEyBftLWEPIccUOTTq1mXR+YoL55oSOkULTU6ZVaxsmZ5
+j8Ar6UwIkBhQbcvi6fhLrfL4nCaHvZLc3XD8jSCTO+KXj7prWOoB31iC9I3jtM0j
+zyour8VvJDeEQ0DEKGI8UaO8mlxPBexykSwYVjpNEK48YY8EB8A4PK4wTwtxse4=
+=Q4ID
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.3.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.3.ebuild
index 2bdde9300b9b..fca3beb830e2 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.3.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.1 2012/07/27 04:49:49 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-3.3.ebuild,v 1.2 2012/07/31 02:28:30 jdhore Exp $
 
 EAPI=4
 
@@ -23,6 +23,7 @@ RDEPEND="app-arch/unzip
 	>=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 )
@@ -63,6 +64,17 @@ mp3_warning() {
 	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