From 12c4ca92d8ae996074449d73509bad68fa7e68f9 Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Thu, 21 Feb 2008 17:36:09 +0000 Subject: Make the gamma patch actually apply - revbump to make sure everyone has it (Portage version: 2.1.4.4) --- gnome-extra/gnome-screensaver/ChangeLog | 8 +- .../gnome-screensaver-2.20.0-r1.ebuild | 104 --------------------- .../gnome-screensaver-2.20.0-r2.ebuild | 104 +++++++++++++++++++++ 3 files changed, 111 insertions(+), 105 deletions(-) delete mode 100644 gnome-extra/gnome-screensaver/gnome-screensaver-2.20.0-r1.ebuild create mode 100644 gnome-extra/gnome-screensaver/gnome-screensaver-2.20.0-r2.ebuild (limited to 'gnome-extra/gnome-screensaver') diff --git a/gnome-extra/gnome-screensaver/ChangeLog b/gnome-extra/gnome-screensaver/ChangeLog index e8b332c196c9..22c9db9a5a27 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-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.63 2008/02/21 14:04:25 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.64 2008/02/21 17:36:09 leio Exp $ + +*gnome-screensaver-2.20.0-r2 (21 Feb 2008) + + 21 Feb 2008; Mart Raudsepp + -gnome-screensaver-2.20.0-r1.ebuild, +gnome-screensaver-2.20.0-r2.ebuild: + Make the gamma patch actually apply *gnome-screensaver-2.20.0-r1 (21 Feb 2008) diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.20.0-r1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.20.0-r1.ebuild deleted file mode 100644 index 94ca5aad8a14..000000000000 --- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.20.0-r1.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-r1.ebuild,v 1.2 2008/02/21 17:14:05 leio 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.20.0-r2.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.20.0-r2.ebuild new file mode 100644 index 000000000000..42be6f3dfff1 --- /dev/null +++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.20.0-r2.ebuild @@ -0,0 +1,104 @@ +# 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.1 2008/02/21 17:36:09 leio 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}" +} -- cgit v1.2.3-65-gdbad