Version bump. API usage updates, translation updates.

Package-Manager: portage-2.2_rc89/cvs/Linux x86_64

4 files changed, 40 insertions, 77 deletions

diff --git a/gnome-extra/gnome-utils/ChangeLog b/gnome-extra/gnome-utils/ChangeLog
index 01f0fca21740..26cce812dd3b 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.207 2010/10/17 15:47:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.208 2010/10/22 20:59:30 eva Exp $
+
+*gnome-utils-2.32.0 (22 Oct 2010)
+
+  22 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-utils-2.26.0.ebuild, -gnome-utils-2.28.3.ebuild,
+  +gnome-utils-2.32.0.ebuild:
+  Version bump. API usage updates, translation updates.
 
   17 Oct 2010; Raúl Porcel <armin76@gentoo.org> gnome-utils-2.30.0.ebuild:
   alpha/ia64/sh/sparc stable wrt #324077
diff --git a/gnome-extra/gnome-utils/Manifest b/gnome-extra/gnome-utils/Manifest
index fb345739eaa0..41917965e55d 100644
--- a/gnome-extra/gnome-utils/Manifest
+++ b/gnome-extra/gnome-utils/Manifest
@@ -1,8 +1,16 @@
-DIST gnome-utils-2.26.0.tar.bz2 6882359 RMD160 7ef1bc0d7a497135426fa79505726b50acb75547 SHA1 ac1078ad2d75a561f7aa562d06316a221d6dcbc4 SHA256 8407acc4f1839d86157d4eb19406cb8c0762729af8d0ddcc288844ffc9ecb120
-DIST gnome-utils-2.28.3.tar.bz2 6862868 RMD160 ee947e5eb8acb3796358b0d76a2aba32459cd0b5 SHA1 e3e13d257d57f7b289fdd0b62cf827b15f487332 SHA256 35f4456fbefda17d39cacb788298e5c1bae29c06a1bd0477b5dc16400255bfd9
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST gnome-utils-2.30.0.tar.bz2 7608826 RMD160 952102bb1751819a22d468309958234f00b2733b SHA1 107f60f499340bb5c02e92db645836f6187b4c37 SHA256 745bb25fce536dc5337e7b5cbcbce9eee66b3cc0c500de302759b98ebcef6a8f
-EBUILD gnome-utils-2.26.0.ebuild 1442 RMD160 878a89298603cb1e00b04f5d34454116a87080ef SHA1 a11c55bd2ee4d1db7c8ad64bb30914045dbfcb4e SHA256 677535bef7ff852c360fbb54ae669f0be42ddae23114ddd1d5f5cf3bd70aa6c8
-EBUILD gnome-utils-2.28.3.ebuild 1535 RMD160 031a4a4dc591324850cb2509b5adc2b8c9a26bfe SHA1 02ab2360f90341b5eda46d452163d4858f799fcc SHA256 177244c01eb1975909bbac346d29e8e9ce684ba83639b9bab9617e7cef0d1640
+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
-MISC ChangeLog 25766 RMD160 57c29c66cd2a294e7ddbdbe16426e8270a7f0872 SHA1 5d5bb05e3514106badc664927ed16e9b3e5396a5 SHA256 c69409ff0f8510c7b460467e797ad6c7dbcf43ea20a9e55f6d12bce4fb262c96
+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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzB+z0ACgkQ1fmVwcYIWAYMzACggpy9eOt6bx216FJeDxYlvn2Y
+m18AoLIfRJ4EXMBIkDRoQ66I8EOjRoQI
+=v2WD
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-utils/gnome-utils-2.26.0.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.26.0.ebuild
deleted file mode 100644
index 58a709b8213a..000000000000
--- a/gnome-extra/gnome-utils/gnome-utils-2.26.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.26.0.ebuild,v 1.13 2010/07/20 02:19:28 jer Exp $
-
-EAPI="2"
-
-inherit gnome2
-
-DESCRIPTION="Utilities for the Gnome2 desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc hal ipv6 test"
-
-# gnome-search-tool is the only part needing gnome-vfs
-# gfloppy is the only part needing hal + e2fsprogs
-RDEPEND=">=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.14
-	>=gnome-base/gnome-desktop-2.9.91
-	>=gnome-base/libgnome-2.13.2
-	>=gnome-base/libgnomeui-2.13.7
-	>=gnome-base/libglade-2.3
-	>=gnome-base/gnome-vfs-2.8.4
-	>=gnome-base/gnome-panel-2.13.4
-	>=gnome-base/libgtop-2.12
-	>=gnome-base/gconf-2
-	hal? (
-		>=sys-apps/hal-0.5
-		sys-fs/e2fsprogs )
-	x11-libs/libXext"
-
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	app-text/gnome-doc-utils
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog NEWS README THANKS"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable ipv6)
-		$(use_enable hal)
-		$(use_enable hal gfloppy)
-		--enable-zlib
-		--disable-schemas-install
-		--disable-scrollkeeper"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	if ! use test ; then
-		sed -e 's/ tests//' -i logview/Makefile* || die "sed failed";
-	fi
-}
diff --git a/gnome-extra/gnome-utils/gnome-utils-2.28.3.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.32.0.ebuild
index be6a4d21731e..b92511ba430d 100644
--- a/gnome-extra/gnome-utils/gnome-utils-2.28.3.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-2.32.0.ebuild
@@ -1,8 +1,9 @@
 # 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.28.3.ebuild,v 1.6 2010/08/18 22:27:37 maekke Exp $
+# $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 $
 
-EAPI="2"
+EAPI="3"
+GCONF_DEBUG="yes"
 
 inherit gnome2
 
@@ -11,16 +12,17 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 IUSE="doc ipv6 test"
 
-RDEPEND=">=dev-libs/glib-2.20.0
-	>=x11-libs/gtk+-2.18.0
+RDEPEND=">=dev-libs/glib-2.20:2
+	>=x11-libs/gtk+-2.20:2
 	>=gnome-base/gnome-panel-2.13.4
 	>=gnome-base/libgtop-2.12
 	>=gnome-base/gconf-2
 	>=media-libs/libcanberra-0.4[gtk]
-	x11-libs/libXext"
+	x11-libs/libXext
+	x11-libs/libX11"
 
 DEPEND="${RDEPEND}
 	x11-proto/xextproto
@@ -39,7 +41,7 @@ pkg_setup() {
 
 	G2CONF="${G2CONF}
 		$(use_enable ipv6)
-		--enable-maintainer-flags=no
+		--disable-maintainer-flags
 		--enable-zlib
 		--disable-static
 		--disable-schemas-install
@@ -49,15 +51,21 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
+	# Remove idiotic -D.*DISABLE_DEPRECATED cflags
+	# This method is kinda prone to breakage. Recheck carefully with next bump.
+	# bug 339074
+	find . -iname 'Makefile.am' -exec \
+		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed"
+	# Do Makefile.in after Makefile.am to avoid automake maintainer-mode
+	find . -iname 'Makefile.in' -exec \
+		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed"
 
 	if ! use test ; then
-		sed -e 's/ tests//' -i logview/Makefile.{am,in} || die "sed failed";
+		sed -e 's/ tests//' -i logview/Makefile.{am,in} || die "sed 2 failed"
 	fi
 }
 
 src_install() {
 	gnome2_src_install
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
+	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
 }