New version for GNOME 2.26. Reduce libgnome/libgnomeui usage, drop remaining libart* calls. Clean up old revisions.

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

5 files changed, 38 insertions, 101 deletions

diff --git a/gnome-extra/gnome-utils/ChangeLog b/gnome-extra/gnome-utils/ChangeLog
index 46f6c4be48b0..9df210efcf0e 100644
--- a/gnome-extra/gnome-utils/ChangeLog
+++ b/gnome-extra/gnome-utils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/gnome-utils
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.176 2009/04/28 11:30:11 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.177 2009/05/11 23:13:37 eva Exp $
+
+*gnome-utils-2.26.0 (11 May 2009)
+
+  11 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-utils-2.18.1.ebuild, -gnome-utils-2.20.0.1.ebuild,
+  -gnome-utils-2.24.0.ebuild, +gnome-utils-2.26.0.ebuild:
+  New version for GNOME 2.26. Reduce libgnome/libgnomeui usage, drop
+  remaining libart* calls. Clean up old revisions.
 
   28 Apr 2009; Raúl Porcel <armin76@gentoo.org> gnome-utils-2.24.1.ebuild:
   sh stable
diff --git a/gnome-extra/gnome-utils/Manifest b/gnome-extra/gnome-utils/Manifest
index bf6bbb96e822..822fedbf04b0 100644
--- a/gnome-extra/gnome-utils/Manifest
+++ b/gnome-extra/gnome-utils/Manifest
@@ -1,10 +1,16 @@
-DIST gnome-utils-2.18.1.tar.bz2 4094695 RMD160 a404f1318de35d5bc3bb00209afbc8311d9f0a02 SHA1 e7e9f82a40b41336c8c081e621f1ef5864c6ba36 SHA256 6ceb22d73d47a819ad08aaed7597d2158168e8af9eba41b93ff6d10d85a250e7
-DIST gnome-utils-2.20.0.1.tar.bz2 4592719 RMD160 675c55e85cc9b34a170dfdc7b0c5b1c28fad17f1 SHA1 21aedfa39d2b937cf6e2ad697378dbecbe838dc7 SHA256 af208196c59443938b093a811aca7ca975761b9d0af028f9c2e49e84ddea26b1
-DIST gnome-utils-2.24.0.tar.bz2 6278383 RMD160 f23f91b1ddfb09bbe79612350d5f0b57610c9a55 SHA1 82144b0804b9f612eaec818a9acfdbe149d9c894 SHA256 d36f20dd3b5e5535ab1ffe18b56cba679d91fb3207d604209c077d99de55332e
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST gnome-utils-2.24.1.tar.bz2 6410784 RMD160 e7acaff8418eb62eb5e61f2ba52ecea5b753212f SHA1 8d0315293da2f646a67cb8025099d00ba8fbbeac SHA256 6b7e29feaa25d5e85fa55a00775e7b3296725ef98b455b8b1d810cf379cfdd00
-EBUILD gnome-utils-2.18.1.ebuild 1124 RMD160 ca99141279140b8820f8559dba12550da4e35ccb SHA1 ab2617a78624086d87b8dda221ca541032951b51 SHA256 447ce8dbfde65b5581ffb166620bac6702d72d2a08add924371709ed61ef158e
-EBUILD gnome-utils-2.20.0.1.ebuild 1173 RMD160 c0c3a09a126d9e42e12e97fb8072034f26c2a359 SHA1 9810c4fcbce226df3ae7a5f58945c5a2e217b730 SHA256 70eba39426997f338311606ede8392629946f54a805980fe3f879cfc55060328
-EBUILD gnome-utils-2.24.0.ebuild 1239 RMD160 953cc6d73c0b94359afe56ae1dba03c6bb7e7937 SHA1 6c9f3383381f32718efd96ed19630407f5a3dccc SHA256 489419c92fb42f8fa297617ce9084ad39c1cb4a0853d4b9d122b4945311ffbdd
+DIST gnome-utils-2.26.0.tar.bz2 6882359 RMD160 7ef1bc0d7a497135426fa79505726b50acb75547 SHA1 ac1078ad2d75a561f7aa562d06316a221d6dcbc4 SHA256 8407acc4f1839d86157d4eb19406cb8c0762729af8d0ddcc288844ffc9ecb120
 EBUILD gnome-utils-2.24.1.ebuild 1242 RMD160 be4c998f1bcfad27a0ae4ae2c68331751f295c6d SHA1 0e792ddd50d7f423f9fe9d1bf993aa632758cfc6 SHA256 48611b25eee54d8ebad31a6b7c82ba0879feb8e5afb6aa38c1468083f4a2dbf5
-MISC ChangeLog 21863 RMD160 879e9c5a93a45e79a32550a50068629d8f66e7e9 SHA1 2935f7bcb39ee70696e2b30cefed7d9a799ab9c4 SHA256 2ab3f07707f9c7d0b01423c564ac305547f4a28ea8eadafe9cb409854945f878
+EBUILD gnome-utils-2.26.0.ebuild 1343 RMD160 bf1647931754bbc1016f4609d5044cfe170d92e2 SHA1 84db76a0418159fa4ee54ef0b159ce073e91b255 SHA256 804b8f8249568cef33371ff6f2e88cd1e0d6d1ff6787bf4c8ca1e9ade4349ee9
+MISC ChangeLog 22187 RMD160 a5f5a1490e5b593d2d2d02becd8c4d85377404e2 SHA1 7440e12df67581f7330cd05d47037144cc871de5 SHA256 d1275fc0fcd0e233795f151eb4fa0eed0104abd5ec2fc29748702f1bbea310b2
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoIsScACgkQ1fmVwcYIWAab/wCfR7z7N62jWmuJidFfsmJsOSZa
+o5IAoJlO+jUvHdu75NfylGBFTc3rzJsp
+=7OEj
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-utils/gnome-utils-2.18.1.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.18.1.ebuild
deleted file mode 100644
index d24c31a5aa6c..000000000000
--- a/gnome-extra/gnome-utils/gnome-utils-2.18.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2008 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.18.1.ebuild,v 1.14 2008/10/19 20:26:28 eva Exp $
-
-inherit gnome2
-
-DESCRIPTION="Utilities for the Gnome2 desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="arm sh"
-IUSE="hal ipv6"
-
-RDEPEND=">=x11-libs/gtk+-2.10
-	>=dev-libs/glib-2.9.1
-	>=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/libbonoboui-2.1
-	>=gnome-base/gnome-vfs-2.8.4
-	>=gnome-base/gnome-panel-2.13.4
-	>=gnome-base/libgnomeprint-2.8
-	>=gnome-base/libgnomeprintui-2.8
-	>=gnome-base/libgtop-2.12
-	>=gnome-base/libgnomecanvas-2.10.2
-	>=gnome-base/gconf-2
-	sys-fs/e2fsprogs
-	hal? ( >=sys-apps/hal-0.5 )"
-
-DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog NEWS README THANKS"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable hal)
-	$(use_enable hal gfloppy)"
-}
diff --git a/gnome-extra/gnome-utils/gnome-utils-2.20.0.1.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.20.0.1.ebuild
deleted file mode 100644
index a50ff619a7c7..000000000000
--- a/gnome-extra/gnome-utils/gnome-utils-2.20.0.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 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.20.0.1.ebuild,v 1.8 2007/11/29 06:12:50 jer Exp $
-
-inherit gnome2
-
-DESCRIPTION="Utilities for the Gnome2 desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="hal ipv6"
-
-RDEPEND=">=dev-libs/glib-2.13.3
-	>=x11-libs/gtk+-2.11.6
-	>=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/libbonoboui-2.1
-	>=gnome-base/gnome-vfs-2.8.4
-	>=gnome-base/gnome-panel-2.13.4
-	>=gnome-base/libgnomeprint-2.8
-	>=gnome-base/libgnomeprintui-2.8
-	>=gnome-base/libgtop-2.12
-	>=gnome-base/libgnomecanvas-2.10.2
-	>=gnome-base/gconf-2
-	sys-fs/e2fsprogs
-	hal? ( >=sys-apps/hal-0.5 )"
-
-DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog NEWS README THANKS"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable hal)
-	$(use_enable hal gfloppy)"
-}
diff --git a/gnome-extra/gnome-utils/gnome-utils-2.24.0.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.26.0.ebuild
index 83a597f4c7a7..3a5eb7bfb8cd 100644
--- a/gnome-extra/gnome-utils/gnome-utils-2.24.0.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-2.26.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 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.24.0.ebuild,v 1.3 2009/03/11 02:17:27 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.26.0.ebuild,v 1.1 2009/05/11 23:13:37 eva Exp $
+
+EAPI="2"
 
 inherit gnome2
 
@@ -9,16 +11,15 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc hal ipv6"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc hal ipv6 test"
 
 RDEPEND=">=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.11.6
+	>=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/libbonoboui-2.1
 	>=gnome-base/gnome-vfs-2.8.4
 	>=gnome-base/gnome-panel-2.13.4
 	>=gnome-base/libgtop-2.12
@@ -42,7 +43,15 @@ pkg_setup() {
 		$(use_enable ipv6)
 		$(use_enable hal)
 		$(use_enable hal gfloppy)
-		--enable-console-helper=no
+		--enable-zlib
 		--disable-schemas-install
 		--disable-scrollkeeper"
 }
+
+src_prepare() {
+	gnome2_src_pre
+
+	if ! use test ; then
+		sed -e 's/ tests//' -i logview/Makefile* || die "sed failed";
+	fi
+}