Revision bump to fix intltoolize broken file and allowing people to not build gdict-applet if they don't want bonobo on their systems. Remove old.

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

4 files changed, 28 insertions, 12 deletions

diff --git a/gnome-extra/gnome-utils/ChangeLog b/gnome-extra/gnome-utils/ChangeLog
index 26cce812dd3b..c40b0250d550 100644
--- a/gnome-extra/gnome-utils/ChangeLog
+++ b/gnome-extra/gnome-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gnome-utils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.208 2010/10/22 20:59:30 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.209 2010/12/04 18:08:10 pacho Exp $
+
+*gnome-utils-2.32.0-r1 (04 Dec 2010)
+
+  04 Dec 2010; Pacho Ramos <pacho@gentoo.org> -gnome-utils-2.32.0.ebuild,
+  +gnome-utils-2.32.0-r1.ebuild, metadata.xml:
+  Revision bump to fix intltoolize broken file and allowing people to not build
+  gdict-applet if they don't want bonobo on their systems. Remove old.
 
 *gnome-utils-2.32.0 (22 Oct 2010)
 
diff --git a/gnome-extra/gnome-utils/Manifest b/gnome-extra/gnome-utils/Manifest
index 41917965e55d..a531f0668dec 100644
--- a/gnome-extra/gnome-utils/Manifest
+++ b/gnome-extra/gnome-utils/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
 DIST gnome-utils-2.30.0.tar.bz2 7608826 RMD160 952102bb1751819a22d468309958234f00b2733b SHA1 107f60f499340bb5c02e92db645836f6187b4c37 SHA256 745bb25fce536dc5337e7b5cbcbce9eee66b3cc0c500de302759b98ebcef6a8f
 DIST gnome-utils-2.32.0.tar.bz2 7705320 RMD160 c25667eec2ba4fd0d704c10a92e2e6b071eb1bfc SHA1 68ef7e12280969bde9bee4bbd566ad4ab0572e77 SHA256 033a55cf442096b28ea6292043354feafe000d1e5f4ebb962a9b6d72eb9a93fa
 EBUILD gnome-utils-2.30.0.ebuild 1843 RMD160 e3ba020adef969e7f113430ea2c799e01e3bfadc SHA1 ba71731fc4f21adab238312a62dbb4ed55b46cdc SHA256 4a18fa5858d4dc747443c0c88fe6817bc45970514f4c7f51d8d71d82bf493f19
-EBUILD gnome-utils-2.32.0.ebuild 1864 RMD160 47d68d01594f255a3545a7f9863fef9af3961938 SHA1 4059e3c2247e2a70955512311accde9a55a0f21c SHA256 a65bb11c0b46705ece4f481d6ef892ad33cb5b448c2fcc5b70bb49031b31e6c3
-MISC ChangeLog 25996 RMD160 1cff87b1f379c913b70a3c0393a9a7980274d183 SHA1 81cc91f668b526563c6fa53eb6e7158d4b5734d4 SHA256 1bf70738eaf928c99eb802c1074d2a369058d17c62983d5855b99a0a729f52d2
-MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+EBUILD gnome-utils-2.32.0-r1.ebuild 2134 RMD160 60c1819f5568ed5c9e3544f503b02de6fa5bfa0e SHA1 0822a61e36665d8bb42823e7df26122f179f3c8f SHA256 6ead336353bb6bb755a3090fa55b4af889bfccd9b5e833bd63b67a3bfd6819ec
+MISC ChangeLog 26309 RMD160 546e13136883e04f60e6606610bc9ee290993e48 SHA1 40802c3aca92b59bb073dc71ed209fa4ff7040a4 SHA256 18c7e58a66982b322aa96b49c8e51ad9b479c7a2c99b9b096948697388d81196
+MISC metadata.xml 305 RMD160 c788a49e4dc8332a8f5a5a79268ed2bff3d164c8 SHA1 9aa1970fee27c41f0eebf198f94b1fa41b3644b9 SHA256 3c6d345a89e0c8dbacd26f232e8220bd2558bc90cff9041e3e07f2f44ce4bb85
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzB+z0ACgkQ1fmVwcYIWAYMzACggpy9eOt6bx216FJeDxYlvn2Y
-m18AoLIfRJ4EXMBIkDRoQ66I8EOjRoQI
-=v2WD
+iEYEARECAAYFAkz6g48ACgkQCaWpQKGI+9SQigCeI7kbkt+DtKlPF6XGvnvi1l+K
+P1YAn0KhH/vLbc13waKsPgRRhFi73VBO
+=2Ip2
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-utils/gnome-utils-2.32.0.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.32.0-r1.ebuild
index b92511ba430d..e1213b73fb02 100644
--- a/gnome-extra/gnome-utils/gnome-utils-2.32.0.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-2.32.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.32.0.ebuild,v 1.1 2010/10/22 20:59:30 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.32.0-r1.ebuild,v 1.1 2010/12/04 18:08:10 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="doc ipv6 test"
+IUSE="bonobo doc ipv6 test"
 
 RDEPEND=">=dev-libs/glib-2.20:2
 	>=x11-libs/gtk+-2.20:2
@@ -22,7 +22,8 @@ RDEPEND=">=dev-libs/glib-2.20:2
 	>=gnome-base/gconf-2
 	>=media-libs/libcanberra-0.4[gtk]
 	x11-libs/libXext
-	x11-libs/libX11"
+	x11-libs/libX11
+	bonobo? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) )"
 
 DEPEND="${RDEPEND}
 	x11-proto/xextproto
@@ -32,8 +33,6 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
 	doc? ( >=dev-util/gtk-doc-1.10 )"
 
-DOCS="AUTHORS ChangeLog NEWS README THANKS"
-
 pkg_setup() {
 	if ! use debug; then
 		G2CONF="${G2CONF} --enable-debug=minimum"
@@ -41,11 +40,13 @@ pkg_setup() {
 
 	G2CONF="${G2CONF}
 		$(use_enable ipv6)
+		$(use_enable bonobo gdict-applet)
 		--disable-maintainer-flags
 		--enable-zlib
 		--disable-static
 		--disable-schemas-install
 		--disable-scrollkeeper"
+	DOCS="AUTHORS ChangeLog NEWS README THANKS"
 }
 
 src_prepare() {
@@ -63,6 +64,10 @@ src_prepare() {
 	if ! use test ; then
 		sed -e 's/ tests//' -i logview/Makefile.{am,in} || die "sed 2 failed"
 	fi
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+		|| die "sed failed"
 }
 
 src_install() {
diff --git a/gnome-extra/gnome-utils/metadata.xml b/gnome-extra/gnome-utils/metadata.xml
index da6fd63d0085..b1fd14e1d978 100644
--- a/gnome-extra/gnome-utils/metadata.xml
+++ b/gnome-extra/gnome-utils/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<use>
+	<flag name="bonobo">Enable applets (gdict one) still not ported to
+	DBUS, requiring	deprecated bonobo support in gnome-panel.</flag>
+</use>
 </pkgmetadata>