Clean up old revision.

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

3 files changed, 16 insertions, 107 deletions

diff --git a/gnome-extra/gnome-screensaver/ChangeLog b/gnome-extra/gnome-screensaver/ChangeLog
index db08b4eb287c..289345cf34a3 100644
--- a/gnome-extra/gnome-screensaver/ChangeLog
+++ b/gnome-extra/gnome-screensaver/ChangeLog
@@ -1,6 +1,10 @@
 # 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.121 2010/08/14 17:54:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.122 2010/08/22 19:41:00 eva Exp $
+
+  22 Aug 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-screensaver-2.26.1.ebuild:
+  Clean up old revision.
 
   14 Aug 2010; Raúl Porcel <armin76@gentoo.org>
   gnome-screensaver-2.28.3.ebuild:
diff --git a/gnome-extra/gnome-screensaver/Manifest b/gnome-extra/gnome-screensaver/Manifest
index b682337bc746..f1a317091ccb 100644
--- a/gnome-extra/gnome-screensaver/Manifest
+++ b/gnome-extra/gnome-screensaver/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -6,8 +9,14 @@ DIST gnome-screensaver-2.26.1.tar.bz2 2031739 RMD160 0ed7655bc9c5a90e0959693cfa2
 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
 EBUILD gnome-screensaver-2.26.1-r1.ebuild 3550 RMD160 955a00e0903f7c085d63597000c772ec7518c692 SHA1 2302462f979ea220f0ecbbc314aa8f78633615c3 SHA256 ffaa3ecc63a619a34bbe5aaf90314398f5d6a499a558756b610240c954752505
-EBUILD gnome-screensaver-2.26.1.ebuild 3050 RMD160 5066ccdd9488e1988a9975516ab23491db451586 SHA1 307d5eea004544bcb00a4f38fe73ed8c60079c1a SHA256 050728c19d4ae3c787d3a2e2d1dafaff7922f76ac53796468b5d97f1d5866152
 EBUILD gnome-screensaver-2.28.3.ebuild 3568 RMD160 0376d0a3b079860f54d873a69e9a8ec8477c2439 SHA1 2c13035a131c0443911c1f03a7a465d34a85e70b SHA256 14a9080eefc45e194dec13475bb5f15e9cfcca6e46693013696d6d6fbb10074d
 EBUILD gnome-screensaver-2.30.0.ebuild 3569 RMD160 fadfaee3893f083b744f15cc9200a874d8cce4bf SHA1 b31b8a16968406f9f37fbcc351866e138f8db4be SHA256 a0970f70035b09c51d07b75648251899d8896cd56c0014f308b9ff8cc1d2e103
-MISC ChangeLog 19478 RMD160 5f55774ed5854f82dc0dc05a35a5fa31e1771566 SHA1 df7ad2c589a82d5767c56fc6671d2dfd0c0e5e9b SHA256 0f2858b9d5749e5774bd6048bfc7d771fed6369453e55b70845f2a1a51363030
+MISC ChangeLog 19590 RMD160 67ad69c04fc5c57b435b6148b8c6248585c85c3e SHA1 b5b00fe4d1620a97aac0b4965454b7a18f18aa84 SHA256 c9bd98f9ecb5aa010409efb4d431fe2c592cb3d95f395f7611e44c2fc6f39e98
 MISC metadata.xml 371 RMD160 dfd5191336607cf3a6693f63252b562406e1a356 SHA1 b44c1782c057b3258bb13f9e5cfe1bc5235edac1 SHA256 082f57713bdf91aa34c880c0172500802e78dde1c461d88478e957691f4b7699
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkxxfVIACgkQ1fmVwcYIWAZOlgCfXYFpGfPBY8NsmwjYEHCDGVGG
+cEoAoOyrXfaAjRi2KSK+O1SLeHcAhi4K
+=kmgK
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.26.1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.26.1.ebuild
deleted file mode 100644
index 44cc895a92d5..000000000000
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.26.1.ebuild
+++ /dev/null
@@ -1,104 +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.ebuild,v 1.8 2010/07/20 02:18:16 jer Exp $
-
-inherit eutils gnome2 multilib
-
-DESCRIPTION="Replaces xscreensaver, integrating with the desktop."
-HOMEPAGE="http://live.gnome.org/GnomeScreensaver"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-KERNEL_IUSE="kernel_linux"
-IUSE="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_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
-}
-
-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}"
-}