Remove USE="gtk3" and always enable GTK+-3 wrt #374057. Install ChangeLog.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

4 files changed, 30 insertions, 29 deletions

diff --git a/media-sound/pavucontrol/ChangeLog b/media-sound/pavucontrol/ChangeLog
index 880eddb392d6..7fafb698d02c 100644
--- a/media-sound/pavucontrol/ChangeLog
+++ b/media-sound/pavucontrol/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/pavucontrol
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pavucontrol/ChangeLog,v 1.33 2011/09/27 09:48:56 ford_prefect Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pavucontrol/ChangeLog,v 1.34 2012/03/09 18:55:39 ssuominen Exp $
+
+  09 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> pavucontrol-1.0.ebuild,
+  metadata.xml:
+  Remove USE="gtk3" and always enable GTK+-3 wrt #374057. Install ChangeLog.
 
 *pavucontrol-1.0 (27 Sep 2011)
 
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
index 533c071aeddc..d2d97c6f3fe4 100644
--- a/media-sound/pavucontrol/Manifest
+++ b/media-sound/pavucontrol/Manifest
@@ -4,13 +4,17 @@ Hash: SHA1
 DIST pavucontrol-0.9.10.tar.gz 227735 RMD160 2ed2a2cbcb3352a1effeb3819632732ad5397a28 SHA1 6e95bd7e74219eb886b18ab4fcf0e4a223405e40 SHA256 7ee96d2ddc28f53e392a1bc51a7316d2a9087ea2ad18e611f6f6725e756a5a3c
 DIST pavucontrol-1.0.tar.xz 179596 RMD160 50a20c36a0d9355169d23edab7d80d01aed9bbfa SHA1 8d18130b3001c0e4d499731b325e16eafd38bbec SHA256 3dbe2865b6e3a195a8951967d9234f62cd254c30b08bdea1ecf8997b58f68cde
 EBUILD pavucontrol-0.9.10.ebuild 1088 RMD160 171dbf0ce3e46f6404fb98255a929efe7cf2f8bd SHA1 55489fd25b6a798277c43a14115890d266628688 SHA256 be50d984271b56d08c11085ad61805cc636947b64517261f71d8c3935e22dbec
-EBUILD pavucontrol-1.0.ebuild 1215 RMD160 30c921f73d97743abb7e00b39e648216c9f38b86 SHA1 5b702ce6a4199c431d431d7362b5871e7ed1b836 SHA256 4112198fd1c42776775f32cbd8186f64e7d4707702507ef1c7d4d24f478f5f59
-MISC ChangeLog 5391 RMD160 a0320a8126ec0afbf64a6d42373a53946d20930f SHA1 60310136e525e46d42c3271b29871debcd4dc6f0 SHA256 03b6e8804a47643d367ce8a6d0c1b27674fcf644e852d0e4d6619106fdad96a9
-MISC metadata.xml 379 RMD160 4280a03034c1d8b63bcc09142144bfeaf59a0570 SHA1 9a49fc94031c3f90e86f2b88c7c88d1712ff1860 SHA256 6294a59b918735b451055c5cd0a2b959bce2818bbdee2a2812cc978f89d5ef4a
+EBUILD pavucontrol-1.0.ebuild 1005 RMD160 d12b1aa26cc7dbde88e7457e6f254a54bcb0b8d5 SHA1 77c100233e11e0a24ef9e926fad5366337fa22ba SHA256 6855e20257185e1fe58b03bba4243f419618c50eaa8c2725b6d0abf24b47538c
+MISC ChangeLog 5560 RMD160 8182e6be885a578618f1fcd52653f36f9b70090e SHA1 ac41ec673e27759aa7f62a8269b4a6b95cc78a30 SHA256 ef3a50b4052bba9723c2e2518523de78fff7433c2bdb59c32df8e92dcb9956d8
+MISC metadata.xml 265 RMD160 b1b62f7bc406bc8ca8e79c78a19dc1a9f42e5e7d SHA1 cf6a9c420c5ca6d34dd022d3b5a633e562457af3 SHA256 01e6f3df857d82941b9bcb4bf82993fbffb3b35e7e35a6e487320f1bac1c4f93
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6BnFQACgkQ+Vqt1inD4uzSIQCfYd+enp3rF/zxv2Lhj4imI5lV
-w/IAn2l44CV+Cx4IjXj6AGGUVshcmXf1
-=TAYb
+iQEcBAEBAgAGBQJPWlIwAAoJEEdUh39IaPFNO6IH/iev84MmGcusRLvjK+ATYvUd
+qgPWUHx1xkglhO5VnRmKVZV56poV4Y4kqjAL1Q8d1pTjRAOOftm6VFP3oyAvF+P2
+MEilKj53cetIsYFwxaIIOj54IOO+qHfGPjmXaz+S33LACBS8j4nF/2tul42SKMdM
+sabD7hSQZ3lRC9pr+g+/cgKwkOETDyvwp6rT7VKoJiWdelqa7xENIS9TF1GnQ5aY
+mz2d96ZQtzvr5QTEAoQCbowfPN/WcenQcn3FEVkZTFSB5tKFC6kLhrjQtaktAj3v
+svm/Bev/On2lI2kWm8GcICjgzljYmvZ9BdbA36mBjM1zCmy3fgdYPIs+iUFGLOA=
+=UpaC
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pavucontrol/metadata.xml b/media-sound/pavucontrol/metadata.xml
index 313d0cbae7d0..64b6d1e97793 100644
--- a/media-sound/pavucontrol/metadata.xml
+++ b/media-sound/pavucontrol/metadata.xml
@@ -6,9 +6,4 @@
     <email>ford_prefect@gentoo.org</email>
     <name>Arun Raghavan</name>
   </maintainer>
-  <use>
-    <flag name="gtk3">
-	  Build against GTK+ 3 rather than 2 (which is the default).
-    </flag>
-  </use>
 </pkgmetadata>
diff --git a/media-sound/pavucontrol/pavucontrol-1.0.ebuild b/media-sound/pavucontrol/pavucontrol-1.0.ebuild
index a2ef3470affe..5140f227d608 100644
--- a/media-sound/pavucontrol/pavucontrol-1.0.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pavucontrol/pavucontrol-1.0.ebuild,v 1.1 2011/09/27 09:48:56 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pavucontrol/pavucontrol-1.0.ebuild,v 1.2 2012/03/09 18:55:39 ssuominen Exp $
 
 EAPI=4
 
@@ -11,29 +11,27 @@ SRC_URI="http://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="gtk3 nls"
+IUSE="nls"
 
-RDEPEND=">=dev-libs/libsigc++-2.2:2
-	!gtk3? ( >=dev-cpp/gtkmm-2.16:2.4
-		>=x11-libs/gtk+-2.16:2
-		>=media-libs/libcanberra-0.16[gtk] )
-	gtk3? ( >=dev-cpp/gtkmm-3.0:3.0
-		>=x11-libs/gtk+-2.16:2
-		>=media-libs/libcanberra-0.16[gtk3] )
+RDEPEND=">=dev-cpp/gtkmm-3.0:3.0
+	>=dev-libs/libsigc++-2.2:2
+	>=media-libs/libcanberra-0.16[gtk3]
 	>=media-sound/pulseaudio-0.9.16[glib]
-	|| ( x11-themes/tango-icon-theme x11-themes/gnome-icon-theme )"
+	virtual/freedesktop-icon-theme"
 DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext
-		dev-util/intltool )
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+		)"
+
+DOCS="ChangeLog"
 
 src_configure() {
 	econf \
 		--docdir=/usr/share/doc/${PF} \
 		--htmldir=/usr/share/doc/${PF}/html \
-		--disable-dependency-tracking \
 		--disable-lynx \
-		$(use_enable gtk3) \
 		$(use_enable nls)
 }