Clean up old revisions.

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

5 files changed, 18 insertions, 333 deletions

diff --git a/gnome-extra/gnome-screensaver/ChangeLog b/gnome-extra/gnome-screensaver/ChangeLog
index a6a064161707..27faac25c5f2 100644
--- a/gnome-extra/gnome-screensaver/ChangeLog
+++ b/gnome-extra/gnome-screensaver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gnome-screensaver
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.128 2010/11/02 02:33:58 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.129 2010/11/23 17:32:53 eva Exp $
+
+  23 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-screensaver-2.26.1-r1.ebuild,
+  -files/gnome-screensaver-2.26.1-remove-inhibitors.patch,
+  -gnome-screensaver-2.28.3.ebuild:
+  Clean up old revisions.
 
   02 Nov 2010; Arun Raghavan <ford_prefect@gentoo.org>
   gnome-screensaver-2.30.2.ebuild:
diff --git a/gnome-extra/gnome-screensaver/Manifest b/gnome-extra/gnome-screensaver/Manifest
index 0ed2196053db..3da3c196a6bd 100644
--- a/gnome-extra/gnome-screensaver/Manifest
+++ b/gnome-extra/gnome-screensaver/Manifest
@@ -1,14 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gentoologo-floaters.desktop 414 RMD160 5a34dd8a7b083c1d94e4298c4644d23c7b7f5130 SHA1 a7a38434fd010a1b34d9f9951576752e9691a2b5 SHA256 d8ae7a179c24167d70bb7712eda48807f10b09bce0f32b7f521af21654b641f9
-AUX gnome-screensaver-2.26.1-remove-inhibitors.patch 3207 RMD160 88ebb0f695f7703f2d325e28d92052fb8e02eac3 SHA1 b04cfceb57bf6e01b1665156878cb35ea801012f SHA256 3949e6177b579809a59db6dfcbbcceea395ff1e38ff33678bc5aff768c375a85
 AUX xss-conversion-2.txt 1026 RMD160 5a1810d1f41999907ff39adf0e6396d1d6f5c5d7 SHA1 477743e8fd025cff16c1b2ed538a57ce9550a9cf SHA256 f1bcc5e85d45e53e6170d0cdf25dd3d10020aeef545cf2fdea5e3b4b30ec86c8
 DIST gentoo-logo.svg 13764 RMD160 62b740f670377486eb1350c4f180d9f0ab63948c SHA1 a81d7fb4be541547be78d648bbeb0d3c51f1a41e SHA256 ad81a212991cd24faaddbc260c806c805fd7a67f65b24655908a8971fa10794e
-DIST gnome-screensaver-2.26.1.tar.bz2 2031739 RMD160 0ed7655bc9c5a90e0959693cfa2fab119072d202 SHA1 a71f35aaa72d13f641fe30e8eb576e9c0d19eb76 SHA256 14b68dc59646b5a53487c311d770ccc8458581480c201faf003349119d340830
-DIST gnome-screensaver-2.28.3.tar.bz2 4787224 RMD160 d4f22b679fa5f41b9ad2a69125aaf6be0b616b87 SHA1 f62af733324ed6bed0f09ed48399952f8e61a647 SHA256 f2ffec4f637883c7db15fb94c3f85a7d59ade3cf1f0107ecebc01df13f0ad5c3
 DIST gnome-screensaver-2.30.0.tar.bz2 4803639 RMD160 672ccfec0c57fac4585d299977b9142a7acc1c8d SHA1 4ceb44d17d8c6ff132e6785e7e7c6f48d7039e1d SHA256 f653d3e4a872d435bce9d74ea8d14e54090c4c803521d5fe940e948c1dccc060
 DIST gnome-screensaver-2.30.2.tar.bz2 4814653 RMD160 1b13722f3bebca709b9f44c45e995d07ed6c2044 SHA1 f9d7c0df0efaa6916099ca56078da8b36f4c4935 SHA256 dd52ef278b23ec5abe5974548c2d576eeaeb5294c85e9f2efd6231ecc9ca09fa
-EBUILD gnome-screensaver-2.26.1-r1.ebuild 3550 RMD160 955a00e0903f7c085d63597000c772ec7518c692 SHA1 2302462f979ea220f0ecbbc314aa8f78633615c3 SHA256 ffaa3ecc63a619a34bbe5aaf90314398f5d6a499a558756b610240c954752505
-EBUILD gnome-screensaver-2.28.3.ebuild 3568 RMD160 0376d0a3b079860f54d873a69e9a8ec8477c2439 SHA1 2c13035a131c0443911c1f03a7a465d34a85e70b SHA256 14a9080eefc45e194dec13475bb5f15e9cfcca6e46693013696d6d6fbb10074d
 EBUILD gnome-screensaver-2.30.0.ebuild 3566 RMD160 014805247ba7553b005644ad03d67eda7649d8a4 SHA1 a4577d7c4ec32abc86ee93efa3acc0d5f4b49119 SHA256 e1b811eb28f1f13ba3743d35c9b28f2bfc15bcb9de3e655f92359a7ddc7d7574
 EBUILD gnome-screensaver-2.30.2.ebuild 3580 RMD160 059ab238876bf34e8287a56bf8e50a501068aae6 SHA1 0357b88264e17214be5ccd6c93c86adaab843af1 SHA256 f8f07f0bd1aa1398960effc135fd93a0fc7fbc57ac0e6e793990695015793cad
-MISC ChangeLog 20499 RMD160 8c4cc081746d7693d81ee6a528da1c5b077234ba SHA1 80e91d2d37c18c8784ce5996bcce6810fc15bb75 SHA256 3d1e0e3753218bb665c5cfe0a5404de82c3eced434fa6531bff1d3f31b6e9638
+MISC ChangeLog 20705 RMD160 79c564a58b2caa8e0ae18809275891cc0c7a3a57 SHA1 105d67a2e2716721a670349bc9e8ec903415df73 SHA256 dfcc9a3757245511ca5d862669a5ac315490829d714d491cb39f15396c64526c
 MISC metadata.xml 371 RMD160 dfd5191336607cf3a6693f63252b562406e1a356 SHA1 b44c1782c057b3258bb13f9e5cfe1bc5235edac1 SHA256 082f57713bdf91aa34c880c0172500802e78dde1c461d88478e957691f4b7699
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzr+tQACgkQ1fmVwcYIWAbaPACgm5Yh3oCdGVshnZfvC8EXLh4a
+XE4AoKdo8VYvGbhtbDBTFELebojM31gd
+=2Pya
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.26.1-remove-inhibitors.patch b/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.26.1-remove-inhibitors.patch
deleted file mode 100644
index dbe67042ff20..000000000000
--- a/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.26.1-remove-inhibitors.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 284c9924969a49dbf2d5fae1d680d3310c4df4a3 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Mon, 02 Nov 2009 23:15:13 +0000
-Subject: Remove session inhibitors if the originator falls of the bus
-
-This fixes a problem where totem leaves inhibitors behind, see
-bug 600488.
----
-diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
-index e7690a5..7bd3a62 100644
---- a/src/gs-listener-dbus.c
-+++ b/src/gs-listener-dbus.c
-@@ -986,47 +986,40 @@ listener_dbus_remove_ref_entry (GSListener     *listener,
- }
- 
- static gboolean
--listener_ref_entry_has_connection (gpointer key,
--                                   gpointer value,
--                                   gpointer user_data)
--{
--        GSListenerRefEntry *entry;
--        const char         *connection;
--        gboolean            matches;
--
--        entry = (GSListenerRefEntry *)value;
--        connection = (const char *) user_data;
--
--        matches = FALSE;
--        if (connection != NULL && entry->connection != NULL) {
--                matches = (strcmp (connection, entry->connection) == 0);
--                if (matches) {
--                        gs_debug ("removing %s from %s for reason '%s' on connection %s",
--                                  get_name_for_entry_type (entry->entry_type),
--                                  entry->application,
--                                  entry->reason,
--                                  entry->connection);
--                }
--        }
--
--        return matches;
--}
--
--static gboolean
- listener_ref_entry_remove_for_connection (GSListener  *listener,
-                                           int          entry_type,
-                                           const char  *connection)
- {
-         gboolean    removed;
--        guint       n_removed;
-         GHashTable *hash;
-+        GHashTableIter iter;
-+        GSListenerRefEntry *entry;
-+
-+        if (connection == NULL)
-+                return FALSE;
- 
-         hash = get_hash_for_entry_type (listener, entry_type);
- 
-         removed = FALSE;
--        n_removed = g_hash_table_foreach_remove (hash, listener_ref_entry_has_connection, (gpointer)connection);
-+        g_hash_table_iter_init (&iter, hash);
-+        while (g_hash_table_iter_next (&iter, NULL, (gpointer *)&entry)) {
-+                if (entry->connection != NULL &&
-+                    strcmp (connection, entry->connection) == 0) {
-+                        gs_debug ("removing %s from %s for reason '%s' on connection %s",
-+                                  get_name_for_entry_type (entry->entry_type),
-+                                  entry->application,
-+                                  entry->reason,
-+                                  entry->connection);
-+
-+                        if (entry->entry_type == REF_ENTRY_TYPE_INHIBIT) {
-+                                /* remove inhibit from gnome session */
-+                                remove_session_inhibit (listener, entry);
-+                        }
- 
--        removed = (n_removed > 0);
-+                        g_hash_table_iter_remove (&iter);
-+                        removed = TRUE;
-+                }
-+        }
- 
-         return removed;
- }
---
-cgit v0.8.3.1
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.26.1-r1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.26.1-r1.ebuild
deleted file mode 100644
index 4b626160d20d..000000000000
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.26.1-r1.ebuild
+++ /dev/null
@@ -1,119 +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-screensaver/gnome-screensaver-2.26.1-r1.ebuild,v 1.8 2010/07/20 02:18:17 jer Exp $
-
-inherit eutils gnome2 multilib
-
-DESCRIPTION="Replaces xscreensaver, integrating with the desktop."
-HOMEPAGE="http://live.gnome.org/GnomeScreensaver"
-SRC_URI="${SRC_URI}
-	branding? ( http://www.gentoo.org/images/gentoo-logo.svg )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-KERNEL_IUSE="kernel_linux"
-IUSE="branding debug doc libnotify opengl pam $KERNEL_IUSE"
-
-RDEPEND=">=gnome-base/gconf-2.6.1
-	>=x11-libs/gtk+-2.14.0
-	>=gnome-base/libglade-2.5.0
-	>=gnome-base/gnome-desktop-2.23.2
-	>=gnome-base/gnome-menus-2.12
-	>=dev-libs/glib-2.15
-	>=gnome-base/libgnomekbd-0.1
-	>=dev-libs/dbus-glib-0.71
-	libnotify? ( x11-libs/libnotify )
-	opengl? ( virtual/opengl )
-	pam? ( virtual/pam )
-	!pam? ( kernel_linux? ( sys-apps/shadow ) )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	doc? (
-		app-text/xmlto
-		~app-text/docbook-xml-dtd-4.1.2
-		~app-text/docbook-xml-dtd-4.4 )
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable doc docbook-docs)
-		$(use_enable debug)
-		$(use_with libnotify)
-		$(use_with opengl libgl)
-		$(use_enable pam)
-		--enable-locking
-		--with-xf86gamma-ext
-		--with-kbd-layout-indicator
-		--with-xscreensaverdir=/usr/share/xscreensaver/config
-		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-	# Fix screensaver not locking due inhibitors, upstream bug #600488
-	epatch "${FILESDIR}/${PN}-2.26.1-remove-inhibitors.patch"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Install the conversion script in the documentation
-	dodoc "${S}/data/migrate-xscreensaver-config.sh"
-	dodoc "${S}/data/xscreensaver-config.xsl"
-
-	# Conversion information
-	sed -e "s:\${PF}:${PF}:" \
-		< "${FILESDIR}/xss-conversion-2.txt" > "${S}/xss-conversion.txt"
-
-	dodoc "${S}/xss-conversion.txt"
-
-	# Non PAM users will need this suid to read the password hashes.
-	# OpenPAM users will probably need this too when
-	# http://bugzilla.gnome.org/show_bug.cgi?id=370847
-	# is fixed.
-	if ! use pam ; then
-		fperms u+s /usr/libexec/gnome-screensaver-dialog
-	fi
-
-	if use branding ; then
-		insinto /usr/share/pixmaps/
-		doins "${DISTDIR}/gentoo-logo.svg" || die "doins 1 failed"
-		insinto /usr/share/applications/screensavers/
-		doins "${FILESDIR}/gentoologo-floaters.desktop" || die "doins 2 failed"
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if has_version "<x11-base/xorg-server-1.5.3-r4" ; then
-		ewarn "You have a too old xorg-server installation. This will cause"
-		ewarn "gnome-screensaver to eat up your CPU. Please consider upgrading."
-		echo
-	fi
-
-	if has_version "<x11-misc/xscreensaver-4.22-r2" ; then
-		ewarn "You have xscreensaver installed, you probably want to disable it."
-		ewarn "To prevent a duplicate screensaver entry in the menu, you need to"
-		ewarn "build xscreensaver with -gnome in the USE flags."
-		ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
-
-		echo
-	fi
-
-	elog "Information for converting screensavers is located in "
-	elog "/usr/share/doc/${PF}/xss-conversion.txt.${PORTAGE_COMPRESS}"
-}
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.3.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.3.ebuild
deleted file mode 100644
index c0ddd6a66456..000000000000
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.3.ebuild
+++ /dev/null
@@ -1,122 +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-screensaver/gnome-screensaver-2.28.3.ebuild,v 1.5 2010/08/14 17:54:16 armin76 Exp $
-
-EAPI="2"
-
-inherit eutils gnome2 multilib
-
-DESCRIPTION="Replaces xscreensaver, integrating with the desktop."
-HOMEPAGE="http://live.gnome.org/GnomeScreensaver"
-SRC_URI="${SRC_URI}
-	branding? ( http://www.gentoo.org/images/gentoo-logo.svg )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd"
-KERNEL_IUSE="kernel_linux"
-IUSE="branding debug doc libnotify opengl pam $KERNEL_IUSE"
-
-RDEPEND=">=gnome-base/gconf-2.6.1
-	>=x11-libs/gtk+-2.14.0
-	>=gnome-base/gnome-desktop-2.23.2
-	>=gnome-base/gnome-menus-2.12
-	>=dev-libs/glib-2.15
-	>=gnome-base/libgnomekbd-0.1
-	>=dev-libs/dbus-glib-0.71
-	libnotify? ( x11-libs/libnotify )
-	opengl? ( virtual/opengl )
-	pam? ( virtual/pam )
-	!pam? ( kernel_linux? ( sys-apps/shadow ) )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	doc? (
-		app-text/xmlto
-		~app-text/docbook-xml-dtd-4.1.2
-		~app-text/docbook-xml-dtd-4.4 )
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable doc docbook-docs)
-		$(use_enable debug)
-		$(use_with libnotify)
-		$(use_with opengl gl)
-		$(use_enable pam)
-		--enable-locking
-		--with-xf86gamma-ext
-		--with-kbd-layout-indicator
-		--with-xscreensaverdir=/usr/share/xscreensaver/config
-		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver"
-}
-
-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"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Install the conversion script in the documentation
-	dodoc "${S}/data/migrate-xscreensaver-config.sh"
-	dodoc "${S}/data/xscreensaver-config.xsl"
-
-	# Conversion information
-	sed -e "s:\${PF}:${PF}:" < "${FILESDIR}/xss-conversion-2.txt" \
-		> "${S}/xss-conversion.txt" || die "sed failed"
-
-	dodoc "${S}/xss-conversion.txt"
-
-	# Non PAM users will need this suid to read the password hashes.
-	# OpenPAM users will probably need this too when
-	# http://bugzilla.gnome.org/show_bug.cgi?id=370847
-	# is fixed.
-	if ! use pam ; then
-		fperms u+s /usr/libexec/gnome-screensaver-dialog
-	fi
-
-	if use branding ; then
-		insinto /usr/share/pixmaps/
-		doins "${DISTDIR}/gentoo-logo.svg" || die "doins 1 failed"
-		insinto /usr/share/applications/screensavers/
-		doins "${FILESDIR}/gentoologo-floaters.desktop" || die "doins 2 failed"
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if has_version "<x11-base/xorg-server-1.5.3-r4" ; then
-		ewarn "You have a too old xorg-server installation. This will cause"
-		ewarn "gnome-screensaver to eat up your CPU. Please consider upgrading."
-		echo
-	fi
-
-	if has_version "<x11-misc/xscreensaver-4.22-r2" ; then
-		ewarn "You have xscreensaver installed, you probably want to disable it."
-		ewarn "To prevent a duplicate screensaver entry in the menu, you need to"
-		ewarn "build xscreensaver with -gnome in the USE flags."
-		ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
-
-		echo
-	fi
-
-	elog "Information for converting screensavers is located in "
-	elog "/usr/share/doc/${PF}/xss-conversion.txt.${PORTAGE_COMPRESS}"
-}