Version bump. Various fixes and translation updates.

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

3 files changed, 135 insertions, 5 deletions

diff --git a/gnome-extra/gnome-screensaver/ChangeLog b/gnome-extra/gnome-screensaver/ChangeLog
index 0b1fe81f9e01..bf0db97cc1eb 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.123 2010/09/11 18:51:14 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.124 2010/09/28 21:54:41 eva Exp $
+
+*gnome-screensaver-2.30.1 (28 Sep 2010)
+
+  28 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-screensaver-2.30.1.ebuild:
+  Version bump. Various fixes and translation updates.
 
   11 Sep 2010; Joseph Jezak <josejx@gentoo.org>
   gnome-screensaver-2.30.0.ebuild:
diff --git a/gnome-extra/gnome-screensaver/Manifest b/gnome-extra/gnome-screensaver/Manifest
index 2f2194365be7..69ac12a7047e 100644
--- a/gnome-extra/gnome-screensaver/Manifest
+++ b/gnome-extra/gnome-screensaver/Manifest
@@ -8,15 +8,17 @@ DIST gentoo-logo.svg 13764 RMD160 62b740f670377486eb1350c4f180d9f0ab63948c SHA1
 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.1.tar.bz2 4814620 RMD160 251ecfa0b6b18e2aca7ed0c9b316e03789783764 SHA1 4e211f467734415d1076bbe045ae3f12336ffc72 SHA256 5c311f6ec6e0fc6cc927c4abc1cecff7970407c06dd358000f1c9dad25fcefda
 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 3569 RMD160 cdb5b06635898405b8f701851bef71e6f0f5158a SHA1 ca15e1d88456970a475e5cd0f4191b1145d86662 SHA256 febcc0a9adfca4a4403afa48b53017e09d390dd38e24e2ea51eafbcd42407d7d
-MISC ChangeLog 19707 RMD160 54a42b0d3167243320eaf689c9baa8989a471baf SHA1 7178880b82391ff292d4c6dacf5cd93cf1da71e3 SHA256 a94f86012eba54c456ab1e612cb57151f4db6f237e3f6f802d6dd4078dd94db6
+EBUILD gnome-screensaver-2.30.1.ebuild 3569 RMD160 102367a25384430d11f825afae6d0f00cf76076d SHA1 5f3f42501fac60030eac4cd5a71a7250fa9a9c29 SHA256 e72732b6f72e89dffce06b5b0569c84620dc12841befe8addf986304edc43e1e
+MISC ChangeLog 19891 RMD160 f450f91abcd6ecc55de6395b22d8d30477ccbe43 SHA1 4a39a229b88a0400ab008b836d3654c4e8aa6cb0 SHA256 ad49eaaade19637202bddbff9e7f27abdd11d8d4f3ef9e2f27922ee46db49f76
 MISC metadata.xml 371 RMD160 dfd5191336607cf3a6693f63252b562406e1a356 SHA1 b44c1782c057b3258bb13f9e5cfe1bc5235edac1 SHA256 082f57713bdf91aa34c880c0172500802e78dde1c461d88478e957691f4b7699
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyLzrUACgkQcsIHjyDViGRnqACdEtaVJU/2qO7q87meGnjlmmT2
-7F0AoOVjkriSI+zKNtCW9va4kpGjoupI
-=I6zL
+iEYEARECAAYFAkyiZCYACgkQ1fmVwcYIWAag7gCgxhRvC1+ybsBxOMlJ3FlGpoWE
+bLgAnA290EblmE8XOe/tpbAZ66LD82Rp
+=MI41
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.1.ebuild
new file mode 100644
index 000000000000..0a0e7b1a3d2c
--- /dev/null
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.1.ebuild
@@ -0,0 +1,122 @@
+# 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.30.1.ebuild,v 1.1 2010/09/28 21:54:41 eva 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.29.0
+	>=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}"
+}