New version for GNOME 2.26. Drop libxml and libgnome usage, breaks API/ABI, loose compatibility with GNOME 1 and KDE 2 icons in desktop files. Clean up old revisions.

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

5 files changed, 73 insertions, 96 deletions

diff --git a/gnome-base/gnome-desktop/ChangeLog b/gnome-base/gnome-desktop/ChangeLog
index b93d7015f29e..1d38cefd4e0a 100644
--- a/gnome-base/gnome-desktop/ChangeLog
+++ b/gnome-base/gnome-desktop/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/gnome-desktop
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.243 2009/04/28 11:19:26 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.244 2009/05/10 19:06:13 eva Exp $
+
+*gnome-desktop-2.26.1 (10 May 2009)
+
+  10 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-desktop-2.20.3.ebuild, -gnome-desktop-2.22.3.ebuild,
+  +gnome-desktop-2.26.1.ebuild:
+  New version for GNOME 2.26. Drop libxml and libgnome usage, breaks
+  API/ABI, loose compatibility with GNOME 1 and KDE 2 icons in desktop
+  files. Clean up old revisions.
 
   28 Apr 2009; Raúl Porcel <armin76@gentoo.org>
   gnome-desktop-2.24.3.ebuild:
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 5ef9d193bf51..96d393b53632 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,10 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-desktop-2.24.2-background.patch 886 RMD160 032349d5797ce2333a961a214bf078138ab16010 SHA1 6e271f942e130cf1f5020d1d7ab9f64f81903fc0 SHA256 cbe72e1e9f8b4891cbbe321ab7f6e16ca98fbdf05a5c833dbf5dfb8135173457
-DIST gnome-desktop-2.20.3.tar.bz2 1362861 RMD160 4c01a18cad9dd4965abe1202bccc9bf414e04287 SHA1 6d88e63686acea78e0e64efa9f213271a7ddf32e SHA256 b793ce87b99ba2f9b0eb48a4646128f752a1de2e7c4cd94da9b5e9fd6dcbc36a
-DIST gnome-desktop-2.22.3.tar.bz2 1444103 RMD160 f1bbba787e3924df0fac25c56f3d70334097ad1f SHA1 89d7938a73735e6e2d1309f36d5a4be47eb41cca SHA256 10c087e16c530eb2d09c5794ba5c0d6d2ec6e548860e13f31b2f2375df964dc9
 DIST gnome-desktop-2.24.3.tar.bz2 1509505 RMD160 b6489965a0baa6056b5c7826418401459ffbf0b9 SHA1 2ebbf2475bb741131b523819fb46e71d4489fa79 SHA256 03b1e08ee1318820f538864e8db492a245848bd727da1412a62de51d4cb76e89
-EBUILD gnome-desktop-2.20.3.ebuild 1286 RMD160 06b8836da57ea3cda1dd7d36b9f765205802a654 SHA1 64dab06c58c34e555c0b6519aa74092190c84996 SHA256 7be47396f85054896769be0c3b1261a556b99a8ab6a8cea0ce60c0cc345ceef0
-EBUILD gnome-desktop-2.22.3.ebuild 1279 RMD160 1bdc474affc9d48224a7c85a5bd4b3206b867f50 SHA1 a324c88207d17c1652b2f58fc3419ed07aec01e9 SHA256 fb67562f103ec402016dcc919c30567f97ad664701da3bf42219cb15efe40301
+DIST gnome-desktop-2.26.1.tar.bz2 3228329 RMD160 12456ea4f356b5e6b772b077ca23e0d8d59ffccb SHA1 236e8c63cdb8ae4bc2ebae662a1fac88e09c2747 SHA256 a0341c77360dbb23fbad61987ce9f78f9bfc11ac12e48f60cb049359b4b76d7d
 EBUILD gnome-desktop-2.24.3-r1.ebuild 1941 RMD160 51df9b804414b22118120e8d55682823820448a1 SHA1 9380adfb1309a230e7de36dfded122949a6d3be6 SHA256 b1e5ecd1d5410819e0ac2439652a0a5a1ebc45aca4660939e1322e620d3b7970
 EBUILD gnome-desktop-2.24.3.ebuild 1761 RMD160 72a9b9bdbbd8bd65d91e66d94280d4a2c3c6e99d SHA1 bfa8f1c74980ba4b5d42b5daa8b85f123679957d SHA256 fefb930cd148805d8bf247a225c87f571d4b6606cdedb10d82c9d65bbed96538
-MISC ChangeLog 30898 RMD160 25c7ed2a1ac74501323f2699bdc47432df3d94a9 SHA1 27bdd615c8a9a6bd4db043d3a65795d0b52de208 SHA256 96050ea85eb5b81262aa924264b770055583798e55371a8b7d468ee29f45f800
+EBUILD gnome-desktop-2.26.1.ebuild 1496 RMD160 d23ed2a4cdbba16140b44a47ea8422c6548f922b SHA1 fbe5f556d8fd34a46f9580ca27e29a037df5b6c9 SHA256 46eab7df3bea4a82c9e02676c30c081df5816f7ff9f7d028c5fd6bc1395018e2
+MISC ChangeLog 31253 RMD160 92575b356fd4171cc2b0844ecfda926d2ad67af4 SHA1 1457ef6f47975c51665bdd88c483ca0955f428d6 SHA256 741136adf551a68fb34c54c3779b44c3dc0a044cbceef471deb3cbb2ddd8cf1e
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoHJasACgkQ1fmVwcYIWAanBACgynMsnUyBXFY0pN85VsucBlcY
+3K4AmgK1iztua7/tNUXpI7BhESzy6ZV6
+=BcCq
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.20.3.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.20.3.ebuild
deleted file mode 100644
index 8cd0ee288a69..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-2.20.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.20.3.ebuild,v 1.11 2009/04/22 03:30:16 leio Exp $
-
-inherit gnome2
-
-DESCRIPTION="Libraries for the gnome desktop that is not part of the UI"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="arm sh"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/libxml2-2.4.20
-	>=x11-libs/gtk+-2.11.3
-	>=dev-libs/glib-2.13.0
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/gnome-vfs-2
-	>=x11-libs/startup-notification-0.5
-	!gnome-base/gnome-core"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	>=app-text/gnome-doc-utils-0.3.2
-	~app-text/docbook-xml-dtd-4.1.2
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --with-gnome-distributor=Gentoo --disable-scrollkeeper"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix bug 16853 by building gnome-about with IEEE to prevent
-	# floating point exceptions on alpha
-	if use alpha; then
-		sed -i '/^CFLAGS/s/$/ -mieee/' "${S}"/gnome-about/Makefile.in \
-		|| die "sed failed (2)"
-	fi
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.22.3.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.22.3.ebuild
deleted file mode 100644
index 55e6de2f16d7..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-2.22.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.22.3.ebuild,v 1.9 2008/12/31 03:26:31 mr_bones_ Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="doc"
-
-# FIXME: Python deps are needed for gnome-about but not
-# listed in configure.ac
-RDEPEND=">=dev-libs/libxml2-2.4.20
-	>=x11-libs/gtk+-2.11.3
-	>=dev-libs/glib-2.15.4
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnomeui-2.6
-	>=x11-libs/startup-notification-0.5
-	>=dev-python/pygtk-2.8
-	>=dev-python/pygobject-2.14
-	>=dev-python/gnome-python-2.22"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	>=app-text/gnome-doc-utils-0.3.2
-	doc? ( >=dev-util/gtk-doc-1.4 )
-	~app-text/docbook-xml-dtd-4.1.2
-	x11-proto/xproto"
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --with-gnome-distributor=Gentoo --disable-scrollkeeper"
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.26.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.26.1.ebuild
new file mode 100644
index 000000000000..3185a8679a24
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.26.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.26.1.ebuild,v 1.1 2009/05/10 19:06:13 eva Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND=">=x11-libs/gtk+-2.14.0
+	>=dev-libs/glib-2.19.1
+	>=x11-libs/libXrandr-1.2
+	>=gnome-base/gconf-2
+	>=x11-libs/startup-notification-0.5"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.9
+	>=app-text/gnome-doc-utils-0.3.2
+	doc? ( >=dev-util/gtk-doc-1.4 )
+	~app-text/docbook-xml-dtd-4.1.2
+	x11-proto/xproto
+	>=x11-proto/randrproto-1.2"
+PDEPEND=">=dev-python/pygtk-2.8
+	>=dev-python/pygobject-2.14
+	>=dev-python/libgnome-python-2.22"
+
+# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
+# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
+# eventually libXrandr shouldn't RDEPEND on randrproto)
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--with-gnome-distributor=Gentoo
+		--disable-scrollkeeper
+		--disable-static"
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "If you are upgrading from <gnome-base/gnome-desktop-2.25, please"
+	ewarn "make sure you run revdep-rebuild at the end of the upgrade."
+}