Trying to use GTK+2 results in plugin build failures, particularly aosd. Stop offerin...

Package-Manager: portage-2.1.10.18/cvs/Linux x86_64

diff --git a/media-sound/audacious/ChangeLog b/media-sound/audacious/ChangeLog
index 80d629a2d69f44465a601dc866b1793808416ffd..147d7f2a6ba204fdb8139599df04d5082785d6c7 100644 (file)
--- a/media-sound/audacious/ChangeLog
+++ b/media-sound/audacious/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/audacious
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.241 2011/09/22 15:17:43 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.242 2011/09/24 12:20:34 chainsaw Exp $
+
+*audacious-3.0.3-r1 (24 Sep 2011)
+
+  24 Sep 2011; Tony Vroon <chainsaw@gentoo.org> -audacious-3.0.3.ebuild,
+  +audacious-3.0.3-r1.ebuild, metadata.xml:
+  Trying to use GTK+2 results in plugin build failures, particularly aosd. Stop
+  offering the choice and handing the user the pieces. Closes bug #384185 by
+  Lance Poore.
 
   22 Sep 2011; Mike Gilbert <floppym@gentoo.org> audacious-3.0.3.ebuild:
   Fix faulty gtk dependency.

diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index b96e92e9551136f5d3e45aa4eeee52b4dda9c97c..723f72538b9760bcea102e7b062cd8c8da943081 100644 (file)
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 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
 DIST audacious-3.0.3.tar.bz2 839693 RMD160 d387b155ee5a6a859b4b443bfc82f45e1003d3ff SHA1 f8e547fc9d743da0eba591395d353bae8b73facf SHA256 141d1963d6c44be3d140a43a5c01ebe9db588e5d9f29049a4819f24448dd3cf9
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 SHA1 e97ebbf204e0d1b150265f9e67f0ed54d779e110 SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1
 EBUILD audacious-2.4.4.ebuild 1761 RMD160 26538d3751242ced3ab13cc0b7311279453af931 SHA1 634cea8403b0cb84779153a3fad24d0e83304ff4 SHA256 a78092e6ae76bc34a04214b3b6bb7d66768c9e1fef9180840c5dc8d22ab971e1
 EBUILD audacious-2.5.4.ebuild 1760 RMD160 c4bc506db956c9d37fa55cb4aa95a726032df469 SHA1 226b507f5b3be1d84d0915e2573e33306c3f8d87 SHA256 11e336cbd311edc5ee5aba7a8dbafeb22f518b6016afcb218715aa2cc6b4ad16
-EBUILD audacious-3.0.3.ebuild 1802 RMD160 27e5df9d8727628f441130c44b733ed449c2bfc3 SHA1 084139b3c3f039931be209ed901777a6b747037c SHA256 c828d5f7303e1e667caa220baf7ff94f3519472ed84dcdee8bc3e240947afe11
-MISC ChangeLog 42150 RMD160 cff57aa9a9b71eab5cf112376ee61f07565f84bd SHA1 1c3b5ad8ee75141ee5da386245820a71ccf28d58 SHA256 a2bad369e5f20bde26ec6812e16cf65c23a8e75df4299958f51a4716b50617e8
-MISC metadata.xml 437 RMD160 f2dbca8e5f7b042237beacdc10f9462dad14cd4c SHA1 cdc3370a7850ec58cabe571e7d0badf0f9f37d21 SHA256 4d1e6d5b47b09c463fcdf31174abcac883f4f8759d2fc662ef4500151c163fd1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk57UZ8ACgkQC77qH+pIQ6RTxQEAwvSBi7HTlyKSNpYycPQ38ptr
-bJo8m3NceBksRIALtdwBAL98VounUHmPkYMS6kOW2d+1dW6Dj3VD9AkYTnnL6MBB
-=062v
------END PGP SIGNATURE-----
+EBUILD audacious-3.0.3-r1.ebuild 1809 RMD160 b2497984a863c4fdf016dc3f48a5b3f31bde403b SHA1 996ffdbfa7777d313f453256165ce742ea79f9c5 SHA256 f1e3b269132f6a5d8f1c63920ca72fadeefedff384ff099043545de6fed65d21
+MISC ChangeLog 42476 RMD160 d55600f195fc7833cdaa5fbebb2562a9514047e3 SHA1 f1b31216945db97e3217c9015164c1b6742ef8b5 SHA256 8c0bce034a58d6270060d1aa09de3af46337913214b20e93c9e80d726c5184a5
+MISC metadata.xml 363 RMD160 fba132fb7596814a0d7e42330a5703dc4afa32dc SHA1 2a77afacfd9e5628bd59bfc6332320302d3a6387 SHA256 cc833502f2ab5b13e4b22684d0f7bec07804c3aa2daccaee913297853e6e5b07

diff --git a/media-sound/audacious/audacious-3.0.3.ebuild b/media-sound/audacious/audacious-3.0.3-r1.ebuild
similarity index 89%
rename from media-sound/audacious/audacious-3.0.3.ebuild
rename to media-sound/audacious/audacious-3.0.3-r1.ebuild
index e65b6465a6415a20261d0957113df384df9b86c7..5238bfa23578a46c5ac5e3d8e8fa185e5bc4d4bf 100644 (file)
--- a/media-sound/audacious/audacious-3.0.3.ebuild
+++ b/media-sound/audacious/audacious-3.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-3.0.3.ebuild,v 1.2 2011/09/22 15:17:43 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-3.0.3-r1.ebuild,v 1.1 2011/09/24 12:20:34 chainsaw Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="http://distfiles.atheme.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="altivec chardet gtk3 nls session sse2"
+IUSE="altivec chardet nls session sse2"
 
 RDEPEND=">=dev-libs/dbus-glib-0.60
        >=dev-libs/glib-2.16
@@ -23,8 +23,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.60
        dev-libs/libxml2
        >=x11-libs/cairo-1.2.6
        >=x11-libs/pango-1.8.0
-       gtk3? ( x11-libs/gtk+:3 )
-       !gtk3? ( >=x11-libs/gtk+-2.14:2 )
+       x11-libs/gtk+:3
        session? ( x11-libs/libSM )"
 
 DEPEND="${RDEPEND}
@@ -40,11 +39,12 @@ src_configure() {
        # 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 \
+               --enable-gtk3 \
                $(use_enable altivec) \
                $(use_enable chardet) \
-               $(use_enable gtk3) \
                $(use_enable nls) \
                $(use_enable session sm) \
                $(use_enable sse2)

diff --git a/media-sound/audacious/metadata.xml b/media-sound/audacious/metadata.xml
index 8b0c56abf9aa636dfe088abe2ccccfa832d2ea4a..1cd8056dd3682314b6776350754c1a06c56ecd21 100644 (file)
--- a/media-sound/audacious/metadata.xml
+++ b/media-sound/audacious/metadata.xml
@@ -8,6 +8,5 @@
   </maintainer>
   <use>
     <flag name="chardet">Try to handle non-UTF8 chinese/japanese/korean ID3 tags</flag>
-    <flag name="gtk3">Use GTK+ version 3 instead of GTK+ version 2</flag>
   </use>
 </pkgmetadata>