New version for GNOME 2.24. Various bug fixes and small visual improvments. Clean up old revisions.

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

4 files changed, 33 insertions, 129 deletions

diff --git a/gnome-extra/gnome-screensaver/ChangeLog b/gnome-extra/gnome-screensaver/ChangeLog
index 8ea87d99c085..1dea0c385052 100644
--- a/gnome-extra/gnome-screensaver/ChangeLog
+++ b/gnome-extra/gnome-screensaver/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/gnome-screensaver
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.83 2008/09/28 08:13:01 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.84 2008/11/09 00:59:45 eva Exp $
+
+*gnome-screensaver-2.24.0 (09 Nov 2008)
+
+  09 Nov 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-screensaver-2.20.0-r2.ebuild, -gnome-screensaver-2.22.0-r1.ebuild,
+  +gnome-screensaver-2.24.0.ebuild:
+  New version for GNOME 2.24. Various bug fixes and small visual
+  improvments.
 
   28 Sep 2008; Mart Raudsepp <leio@gentoo.org>
   +files/gnome-screensaver-2.22.2-fix-copy-themes-include.patch,
diff --git a/gnome-extra/gnome-screensaver/Manifest b/gnome-extra/gnome-screensaver/Manifest
index af9c9b0021f0..7903f75532a4 100644
--- a/gnome-extra/gnome-screensaver/Manifest
+++ b/gnome-extra/gnome-screensaver/Manifest
@@ -1,13 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-screensaver-2.20.0-fix-gamma.patch 1637 RMD160 1bda5b646edb2b38218c93ac05b6f592e1366bca SHA1 243191a5c59be9badbba440ef364483a83d69fae SHA256 20c5afb7c058e1a4acf308eee466bbf81fb01e2df9a238fc48b0e89384521005
 AUX gnome-screensaver-2.22.2-fix-copy-themes-include.patch 566 RMD160 ebcac26112014e9465a6b706d40ab345f1c40c73 SHA1 9d05b510248f71c3deee0cb98225eaed1f1d0f2e SHA256 bee314d9a2a6c0e7fdd7fd2c26ea7c8d8525e6fe14283e3db47ad34cc868f95a
 AUX gnome-screensaver-CVE-2008-0887.patch 7965 RMD160 9eade48b04e5a617ec427258f3e41d5c33ab750f SHA1 392a477755562b032d24928ac6c2100af7d7fca1 SHA256 71e9bb7735fbc373ee2f19f7740ba759c7eeff0e46bd50ab7401f9d6147a1666
 AUX xss-conversion-2.txt 1026 RMD160 5a1810d1f41999907ff39adf0e6396d1d6f5c5d7 SHA1 477743e8fd025cff16c1b2ed538a57ce9550a9cf SHA256 f1bcc5e85d45e53e6170d0cdf25dd3d10020aeef545cf2fdea5e3b4b30ec86c8
 DIST gnome-screensaver-2.20.0.tar.bz2 2013842 RMD160 ddea3d536366aab572462f4f66c72daabbeeb119 SHA1 0b99de04caf897642338c61edc12cb7cea27e0a4 SHA256 9ee744058d2c7139634543951a62828b2e1b69fe33cf0b5456737e9c5201dbb9
-DIST gnome-screensaver-2.22.0.tar.bz2 2038929 RMD160 3bd2884d3d676599c23d630893c448617243b4f9 SHA1 51bad55f043ff17e864a79ba24e1c0f6a80abd6c SHA256 e6d66ad1092babe5b9a1ded2a50464e21206fa42a922ea1de0c688e764e05bfb
 DIST gnome-screensaver-2.22.2.tar.bz2 2042396 RMD160 91f57c339fdc025588101b7fbab4d5095d392f0b SHA1 473b00fc6306742ada4e89520c991c31d1f79984 SHA256 a686d41f8623dbfc56c2c0bab5517a6380f538ed6ef7478ca51cfb9062e9f15b
-EBUILD gnome-screensaver-2.20.0-r2.ebuild 2975 RMD160 7cfec93dc5eb9ee7b125c96fd114b6cbbd24340f SHA1 3a1e8dc73d7545ff875f31cdc837ed9527c4150d SHA256 ff550c8d12af56aaead39dfa95c77ab9bca39af56180bb588fa404a15d1d3791
+DIST gnome-screensaver-2.24.0.tar.bz2 2058094 RMD160 34d418258a65325b97ae7a46c32b987ad3566709 SHA1 ed7871c8a004801717e6a7897b07b80386256ce8 SHA256 ca79b46000f0ce76e9e2c97b59bffbc1e2ef7db83d77cdc9fdf38ab050d6a480
 EBUILD gnome-screensaver-2.20.0-r3.ebuild 3064 RMD160 e540f2068f42fdc67df6453b3626bf0135ba39fe SHA1 fae8399b77b851e02088236d49b88ba42db194ef SHA256 ec59d2bd23d9bd57c976ccb9f3d0165d815ec1fd8deaa7d4de18071f75162a64
-EBUILD gnome-screensaver-2.22.0-r1.ebuild 3082 RMD160 6da07d4f6dda3b76062c2adc10cd0ad41d1bd218 SHA1 ffd6ae9a512045a5e7a5298a49bd05cdb007aba8 SHA256 9eb68484814a06adb1e483a5b4e78f60d292b99b0786c48b85bd97809db216fe
 EBUILD gnome-screensaver-2.22.2.ebuild 3155 RMD160 06b09a67788564eec38877b62da4835e20def4ac SHA1 af25a55fd25a9ab3a73f1fb0f0eb67b6c51bf353 SHA256 4b14dfb40ecf9dad55fd85bef97fe09fdc80fc1636d6e217e51d3ecab3b8c6d3
-MISC ChangeLog 13047 RMD160 58ad0b9660df92ac26e714aa19517f1b7b2eeb44 SHA1 77ea8ca1a1d306f9c3ff9e4bcefb99abdc53eb23 SHA256 6cc4cef37df959fbf632e3a30326798f7d6d187dce5540c0ecb170c561e5998b
+EBUILD gnome-screensaver-2.24.0.ebuild 2820 RMD160 d80612e8a6f5b52979a7f019ea0e7414babaf49e SHA1 1b070055f59906b567c0820b671a7320c6167d5a SHA256 b3f063a03c2a403fd9a489e6cfab4c1543c875e66c9e6bbdc9c0ac606d13a10f
+MISC ChangeLog 13334 RMD160 2feb5aa7995c1504bcca4c8c3f01ba34fc543709 SHA1 b66185f92cce9e258bba0290b89cfda20c4b07de SHA256 4ef30be3961bcde94172c98f04970694de515084c27ecfa7b03b9f3edd734e03
 MISC metadata.xml 472 RMD160 3fe1221d0cb389cf1be040c98fa9c40dbf3c07e5 SHA1 18913172dba9d94ca5952b7f8bfb2aa13808bb67 SHA256 e70be8f69acbda81bd1e90c1bd3a57a0b5ccb5fa09c7a6f04427ef888e1872bc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkWNgkACgkQ1fmVwcYIWAZuBgCcD8MsZWJkjKr+273OBZBiXOpI
+DlMAoJv5bLGL+TWVw4+HQJZDuXS5Pyub
+=bNfZ
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.20.0-r2.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.20.0-r2.ebuild
deleted file mode 100644
index 04708ee01d70..000000000000
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.20.0-r2.ebuild
+++ /dev/null
@@ -1,104 +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-screensaver/gnome-screensaver-2.20.0-r2.ebuild,v 1.7 2008/03/22 03:51:30 dang Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Replaces xscreensaver, integrating with the desktop."
-HOMEPAGE="http://live.gnome.org/GnomeScreensaver"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-KERNEL_IUSE="kernel_linux"
-IUSE="debug doc libnotify opengl pam xinerama $KERNEL_IUSE"
-
-RDEPEND=">=gnome-base/gconf-2.6.1
-	>=x11-libs/gtk+-2.11.5
-	>=gnome-base/gnome-vfs-2.12
-	>=gnome-base/libglade-2.5.0
-	>=gnome-base/gnome-menus-2.12
-	>=dev-libs/glib-2.8
-	>=gnome-base/libgnomekbd-0.1
-	>=dev-libs/dbus-glib-0.71
-	libnotify? ( x11-libs/libnotify )
-	opengl?	( virtual/opengl )
-	xinerama?	(
-					x11-libs/libXinerama
-					x11-proto/xineramaproto
-				)
-	pam? ( virtual/pam )
-	!pam? ( kernel_linux? ( sys-apps/shadow ) )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	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) \
-		$(use_enable xinerama) \
-		--enable-locking \
-		--with-kbd-layout-indicator \
-		--with-gdm-config=/usr/share/gdm/defaults.conf \
-		--with-xscreensaverdir=/usr/share/xscreensaver/config \
-		--with-xscreensaverhackdir=/usr/lib/misc/xscreensaver"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-	epatch "${FILESDIR}/${P}-fix-gamma.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
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	ewarn "If 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
-	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.22.0-r1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.24.0.ebuild
index d96aab99d398..e233d1c03de9 100644
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.22.0-r1.ebuild
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.24.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.22.0-r1.ebuild,v 1.1 2008/04/02 14:03:31 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.24.0.ebuild,v 1.1 2008/11/09 00:59:45 eva Exp $
 
 inherit eutils gnome2
 
@@ -11,18 +11,18 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 KERNEL_IUSE="kernel_linux"
-IUSE="debug doc libnotify opengl pam xinerama $KERNEL_IUSE"
+IUSE="debug doc libnotify opengl pam $KERNEL_IUSE"
 
 RDEPEND=">=gnome-base/gconf-2.6.1
-	>=x11-libs/gtk+-2.11.5
+	>=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 )
-	xinerama? ( x11-libs/libXinerama )
+	opengl? ( virtual/opengl )
 	pam? ( virtual/pam )
 	!pam? ( kernel_linux? ( sys-apps/shadow ) )
 	x11-libs/libX11
@@ -32,7 +32,6 @@ RDEPEND=">=gnome-base/gconf-2.6.1
 	x11-libs/libXxf86misc
 	x11-libs/libXxf86vm"
 DEPEND="${RDEPEND}
-	sys-devel/gettext
 	>=dev-util/pkgconfig-0.9
 	>=dev-util/intltool-0.35
 	doc? (
@@ -43,8 +42,7 @@ DEPEND="${RDEPEND}
 	x11-proto/xextproto
 	x11-proto/randrproto
 	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
-	xinerama? ( x11-proto/xineramaproto )"
+	x11-proto/xf86miscproto"
 
 DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
 
@@ -55,22 +53,13 @@ pkg_setup() {
 		$(use_with libnotify)
 		$(use_with opengl libgl)
 		$(use_enable pam)
-		$(use_enable xinerama)
 		--enable-locking
 		--with-xf86gamma-ext
 		--with-kbd-layout-indicator
-		--with-gdm-config=/usr/share/gdm/defaults.conf
 		--with-xscreensaverdir=/usr/share/xscreensaver/config
 		--with-xscreensaverhackdir=/usr/lib/misc/xscreensaver"
 }
 
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix CVE-2008-0887, bug #213940
-	epatch "${FILESDIR}/${PN}-CVE-2008-0887.patch"
-}
-
 src_install() {
 	gnome2_src_install
 
@@ -82,7 +71,7 @@ src_install() {
 	sed -e "s:\${PF}:${PF}:" \
 		< "${FILESDIR}/xss-conversion-2.txt" > "${S}/xss-conversion.txt"
 
-	dodoc "${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
@@ -98,11 +87,13 @@ pkg_postinst() {
 
 	if has_version x11-misc/xscreensaver ; 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 "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
-	echo
+
 	elog "Information for converting screensavers is located in "
 	elog "/usr/share/doc/${PF}/xss-conversion.txt.${PORTAGE_COMPRESS}"
 }