Add new version for Gnome 2.30

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 10 insertions, 250 deletions

diff --git a/gnome-extra/gnome-screensaver/ChangeLog b/gnome-extra/gnome-screensaver/ChangeLog
index d9adf0034374..f9f52dd0b150 100644
--- a/gnome-extra/gnome-screensaver/ChangeLog
+++ b/gnome-extra/gnome-screensaver/ChangeLog
@@ -1,6 +1,13 @@
 # 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.116 2010/06/04 20:34:29 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.117 2010/06/13 19:51:36 pacho Exp $
+
+*gnome-screensaver-2.30.0 (13 Jun 2010)
+
+  13 Jun 2010; Pacho Ramos <pacho@gentoo.org>
+  -gnome-screensaver-2.28.0-r1.ebuild, -gnome-screensaver-2.28.1.ebuild,
+  -gnome-screensaver-2.28.2.ebuild, +gnome-screensaver-2.30.0.ebuild:
+  Add new version for Gnome 2.30.
 
   04 Jun 2010; Markus Meier <maekke@gentoo.org>
   gnome-screensaver-2.28.3.ebuild:
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.0-r1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.0-r1.ebuild
deleted file mode 100644
index 9bde33089b7b..000000000000
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.0-r1.ebuild
+++ /dev/null
@@ -1,125 +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.0-r1.ebuild,v 1.2 2010/01/24 22:56:15 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 ~hppa ~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 screensaver not locking due inhibitors, upstream bug #600488
-	epatch "${FILESDIR}/${PN}-2.26.1-remove-inhibitors.patch"
-
-	# 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}"
-}
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.2.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.2.ebuild
deleted file mode 100644
index 9c927dd11c82..000000000000
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.2.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.2.ebuild,v 1.1 2010/02/08 18:15:05 mrpouet 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 ~hppa ~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}"
-}
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.0.ebuild
index a89473223825..b50d9616d29d 100644
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.1.ebuild
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.0.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.1 2010/02/02 13:22:59 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.0.ebuild,v 1.1 2010/06/13 19:51:37 pacho Exp $
 
 EAPI="2"
 
@@ -19,7 +19,7 @@ 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-desktop-2.29.0
 	>=gnome-base/gnome-menus-2.12
 	>=dev-libs/glib-2.15
 	>=gnome-base/libgnomekbd-0.1