[gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-screensaver/

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

commit:     455eca9aa5c7eccfb45a94e40feb20f22519f453
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  8 18:09:29 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Mar  9 11:21:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=455eca9a

gnome-extra/gnome-screensaver: 2.91.90 → 2.91.91

---
 .../gnome-screensaver-2.91.90.ebuild               |  108 --------------------
 ...999.ebuild => gnome-screensaver-2.91.91.ebuild} |    2 +-
 .../gnome-screensaver-9999.ebuild                  |    2 +-
 3 files changed, 2 insertions(+), 110 deletions(-)

diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.91.90.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.91.90.ebuild
deleted file mode 100644
index fd2591c..0000000
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.91.90.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2011 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.2.ebuild,v 1.2 2010/11/02 02:33:58 ford_prefect 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"
-IUSE="branding debug doc opengl pam"
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
-
-RDEPEND="
-	>=dev-libs/glib-2.15
-	>=x11-libs/gtk+-2.99.3:3
-	>=gnome-base/gnome-desktop-2.91.5:3
-	>=gnome-base/gnome-menus-2.12
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=gnome-base/libgnomekbd-0.1
-	>=dev-libs/dbus-glib-0.71
-
-	sys-apps/dbus
-	x11-libs/libxklavier
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-
-	opengl? ( virtual/opengl )
-	pam? ( virtual/pam )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	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 opengl gl)
-		$(use_enable pam locking)
-		--with-pam-prefix=/etc
-		--with-xf86gamma-ext
-		--with-kbd-layout-indicator
-		--with-xscreensaverdir=/usr/share/xscreensaver/config
-		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
-		--disable-schemas-compile"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Install the conversion script in the documentation
-	dodoc "${S}/data/migrate-xscreensaver-config.sh" || die
-	dodoc "${S}/data/xscreensaver-config.xsl" || die
-
-	# Conversion information
-	sed -e "s:\${PF}:${PF}:" < "${FILESDIR}/xss-conversion-2.txt" \
-		> "${S}/xss-conversion.txt" || die "sed failed"
-	dodoc "${S}/xss-conversion.txt" || die
-
-	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-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-9999.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.91.91.ebuild
similarity index 98%
copy from gnome-extra/gnome-screensaver/gnome-screensaver-9999.ebuild
copy to gnome-extra/gnome-screensaver/gnome-screensaver-2.91.91.ebuild
index f298377..4559369 100644
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-9999.ebuild
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.91.91.ebuild
@@ -20,7 +20,7 @@ else
 fi
 
 RDEPEND="
-	>=dev-libs/glib-2.15
+	>=dev-libs/glib-2.25.6:2
 	>=x11-libs/gtk+-2.99.3:3
 	>=gnome-base/gnome-desktop-2.91.5:3
 	>=gnome-base/gnome-menus-2.12

diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-9999.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-9999.ebuild
index f298377..4559369 100644
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-9999.ebuild
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-9999.ebuild
@@ -20,7 +20,7 @@ else
 fi
 
 RDEPEND="
-	>=dev-libs/glib-2.15
+	>=dev-libs/glib-2.25.6:2
 	>=x11-libs/gtk+-2.99.3:3
 	>=gnome-base/gnome-desktop-2.91.5:3
 	>=gnome-base/gnome-menus-2.12