diff options
6 files changed, 7 insertions, 239 deletions
diff --git a/gnome-base/gnome-desktop/ChangeLog b/gnome-base/gnome-desktop/ChangeLog index 989c2ccb9f89..7c53695bf609 100644 --- a/gnome-base/gnome-desktop/ChangeLog +++ b/gnome-base/gnome-desktop/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gnome-base/gnome-desktop # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.281 2010/10/07 21:00:49 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.282 2010/10/08 23:30:29 eva Exp $ + + 08 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org> + -files/gnome-desktop-2.24.2-background.patch, + -gnome-desktop-2.24.3-r1.ebuild, -gnome-desktop-2.26.3.ebuild, + -gnome-desktop-2.28.1-r1.ebuild, -gnome-desktop-2.28.2.ebuild: + Clean up old revisions. 07 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> gnome-desktop-2.30.2.ebuild: diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-2.24.2-background.patch b/gnome-base/gnome-desktop/files/gnome-desktop-2.24.2-background.patch deleted file mode 100644 index 4c5fb8fdee16..000000000000 --- a/gnome-base/gnome-desktop/files/gnome-desktop-2.24.2-background.patch +++ /dev/null @@ -1,26 +0,0 @@ -# Do not load background if not needed -# -# https://bugs.gentoo.org/show_bug.cgi?id=251350 -# http://bugzilla.gnome.org/show_bug.cgi?id=564909 ---- a/libgnome-desktop/gnome-bg.c 2008-12-17 10:42:28.000000000 -0800 -+++ b/libgnome-desktop/gnome-bg.c 2008-12-17 10:44:33.000000000 -0800 -@@ -284,6 +284,7 @@ - GnomeBGColorType ctype; - GdkColor c1, c2; - GnomeBGPlacement placement; -+ gboolean enabled; - - g_return_if_fail (GNOME_IS_BG (bg)); - g_return_if_fail (client != NULL); -@@ -291,7 +292,9 @@ - /* Filename */ - filename = NULL; - tmp = gconf_client_get_string (client, BG_KEY_PICTURE_FILENAME, NULL); -- if (tmp != NULL && *tmp != '\0') { -+ enabled = gconf_client_get_bool (client, BG_KEY_DRAW_BACKGROUND, NULL); -+ -+ if (tmp != NULL && *tmp != '\0' && enabled) { - if (g_utf8_validate (tmp, -1, NULL) && - g_file_test (tmp, G_FILE_TEST_EXISTS)) { - filename = g_strdup (tmp); - diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.24.3-r1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.24.3-r1.ebuild deleted file mode 100644 index 8597f52b79c6..000000000000 --- a/gnome-base/gnome-desktop/gnome-desktop-2.24.3-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2010 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.24.3-r1.ebuild,v 1.10 2010/07/20 01:50:19 jer Exp $ - -inherit eutils autotools 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 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 - >=x11-libs/libXrandr-1.2 - >=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/libgnome-python-2.22" -DEPEND="${RDEPEND} - app-text/scrollkeeper - >=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 - gnome-base/gnome-common" -# 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" -} - -src_unpack() { - gnome2_src_unpack - - # Do not load background if not needed, bug #251350 - epatch "${FILESDIR}/${PN}-2.24.2-background.patch" - - # Broken intltool-0.40.6 used for 2.24.3, re-intltoolize - intltoolize --force --automake --copy || die "intltoolize failed" - eautomake -} - -pkg_postinst() { - ewarn - ewarn "If you are upgrading from <gnome-base/gnome-desktop-2.24, please" - ewarn "make sure you run revdep-rebuild at the end of the upgrade." -} diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.26.3.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.26.3.ebuild deleted file mode 100644 index e28662324eb1..000000000000 --- a/gnome-base/gnome-desktop/gnome-desktop-2.26.3.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2010 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.3.ebuild,v 1.11 2010/07/20 01:50:19 jer 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 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_preinst() { - gnome2_pkg_preinst - preserve_old_lib /usr/$(get_libdir)/libgnome-desktop-2.so.7 -} - -pkg_postinst() { - gnome2_pkg_postinst - preserve_old_lib_notify /usr/$(get_libdir)/libgnome-desktop-2.so.7 - 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." -} diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.28.1-r1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.28.1-r1.ebuild deleted file mode 100644 index 29782d4f1cbc..000000000000 --- a/gnome-base/gnome-desktop/gnome-desktop-2.28.1-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2010 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.28.1-r1.ebuild,v 1.3 2010/07/20 01:50:19 jer 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 ~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" - -# 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" -} diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.28.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.28.2.ebuild deleted file mode 100644 index 8fcfeee382cb..000000000000 --- a/gnome-base/gnome-desktop/gnome-desktop-2.28.2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2010 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.28.2.ebuild,v 1.3 2010/07/20 01:50:19 jer Exp $ - -EAPI="2" - -inherit 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 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" -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" - -# 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" -} - -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" -} |