From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PxHff-0002pN-Hp for garchives@archives.gentoo.org; Wed, 09 Mar 2011 11:35:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F13DCE0459; Wed, 9 Mar 2011 11:34:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A686EE0654 for ; Wed, 9 Mar 2011 11:34:43 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5E00A2AC035 for ; Wed, 9 Mar 2011 11:34:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B30CE8006A for ; Wed, 9 Mar 2011 11:34:42 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <455eca9aa5c7eccfb45a94e40feb20f22519f453.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-screensaver/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-extra/gnome-screensaver/gnome-screensaver-2.91.90.ebuild gnome-extra/gnome-screensaver/gnome-screensaver-2.91.91.ebuild gnome-extra/gnome-screensaver/gnome-screensaver-9999.ebuild X-VCS-Directories: gnome-extra/gnome-screensaver/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 455eca9aa5c7eccfb45a94e40feb20f22519f453 Date: Wed, 9 Mar 2011 11:34:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 893c6184b65c26bac91b230249bf53b3 commit: 455eca9aa5c7eccfb45a94e40feb20f22519f453 Author: Nirbheek Chauhan gentoo org> AuthorDate: Tue Mar 8 18:09:29 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Wed Mar 9 11:21:35 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D455eca9a gnome-extra/gnome-screensaver: 2.91.90 =E2=86=92 2.91.91 --- .../gnome-screensaver-2.91.90.ebuild | 108 --------------= ------ ...999.ebuild =3D> 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.ebui= ld 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-s= creensaver-2.30.2.ebuild,v 1.2 2010/11/02 02:33:58 ford_prefect Exp $ - -EAPI=3D"2" - -inherit eutils gnome2 multilib - -DESCRIPTION=3D"Replaces xscreensaver, integrating with the desktop." -HOMEPAGE=3D"http://live.gnome.org/GnomeScreensaver" -SRC_URI=3D"${SRC_URI} - branding? ( http://www.gentoo.org/images/gentoo-logo.svg )" - -LICENSE=3D"GPL-2" -SLOT=3D"0" -IUSE=3D"branding debug doc opengl pam" -if [[ ${PV} =3D 9999 ]]; then - inherit gnome2-live - KEYWORDS=3D"" -else - KEYWORDS=3D"~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -fi - -RDEPEND=3D" - >=3Ddev-libs/glib-2.15 - >=3Dx11-libs/gtk+-2.99.3:3 - >=3Dgnome-base/gnome-desktop-2.91.5:3 - >=3Dgnome-base/gnome-menus-2.12 - >=3Dgnome-base/gsettings-desktop-schemas-0.1.7 - >=3Dgnome-base/libgnomekbd-0.1 - >=3Ddev-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=3D"${RDEPEND} - >=3Ddev-util/pkgconfig-0.9 - >=3Ddev-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=3D"AUTHORS ChangeLog HACKING NEWS README TODO" - -pkg_setup() { - G2CONF=3D"${G2CONF} - $(use_enable doc docbook-docs) - $(use_enable debug) - $(use_with opengl gl) - $(use_enable pam locking) - --with-pam-prefix=3D/etc - --with-xf86gamma-ext - --with-kbd-layout-indicator - --with-xscreensaverdir=3D/usr/share/xscreensaver/config - --with-xscreensaverhackdir=3D/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" ||=C2=A0die "doins 2 f= ailed" - fi -} - -pkg_postinst() { - gnome2_pkg_postinst - - if has_version "> /etc/portage/package.u= se" - - 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 =20 RDEPEND=3D" - >=3Ddev-libs/glib-2.15 + >=3Ddev-libs/glib-2.25.6:2 >=3Dx11-libs/gtk+-2.99.3:3 >=3Dgnome-base/gnome-desktop-2.91.5:3 >=3Dgnome-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 =20 RDEPEND=3D" - >=3Ddev-libs/glib-2.15 + >=3Ddev-libs/glib-2.25.6:2 >=3Dx11-libs/gtk+-2.99.3:3 >=3Dgnome-base/gnome-desktop-2.91.5:3 >=3Dgnome-base/gnome-menus-2.12