From 625143bf42609d3db08d8d78afe002982f7e608e Mon Sep 17 00:00:00 2001 From: Leonardo Boshell Date: Fri, 22 Dec 2006 03:08:32 +0000 Subject: [PATCH] Added xf86miscproto to DEPEND (bug #158721) and other small fixes. Package-Manager: portage-2.1.1-r2 --- gnome-extra/gnome-screensaver/ChangeLog | 10 ++- gnome-extra/gnome-screensaver/Manifest | 16 ++-- .../gnome-screensaver-2.16.2.ebuild | 86 +++++++++++-------- 3 files changed, 66 insertions(+), 46 deletions(-) diff --git a/gnome-extra/gnome-screensaver/ChangeLog b/gnome-extra/gnome-screensaver/ChangeLog index 0980e13c821a..9308443ce276 100644 --- a/gnome-extra/gnome-screensaver/ChangeLog +++ b/gnome-extra/gnome-screensaver/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for gnome-extra/gnome-screensaver # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.29 2006/12/21 13:21:27 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.30 2006/12/22 03:08:32 leonardop Exp $ + + 22 Dec 2006; Leonardo Boshell + gnome-screensaver-2.16.2.ebuild: + Added xf86miscproto to DEPEND, as noticed by Chris Gianelloni on bug + #158721. Moved other x11-proto packages from RDEPEND to DEPEND. Sanitise + spaces. Fix the implementation of the 'doc' USE flag. Removed 'eutils' + from the inherit call. Make sure gnome2_pkg_postinst() is called to + enforce the loading of Gconf schemas. 21 Dec 2006; Markus Rothe gnome-screensaver-2.16.2.ebuild: diff --git a/gnome-extra/gnome-screensaver/Manifest b/gnome-extra/gnome-screensaver/Manifest index 422911589f4c..d955f544f91d 100644 --- a/gnome-extra/gnome-screensaver/Manifest +++ b/gnome-extra/gnome-screensaver/Manifest @@ -8,14 +8,14 @@ EBUILD gnome-screensaver-2.14.2.ebuild 2786 RMD160 5c81c4bd29678d8c778dce884be09 MD5 ee63f1f091b3dc6fab6e26dd8d847d15 gnome-screensaver-2.14.2.ebuild 2786 RMD160 5c81c4bd29678d8c778dce884be094e371f2ad49 gnome-screensaver-2.14.2.ebuild 2786 SHA256 af82a17b704aa4048e9b4164cacb7cad36648ee07f15524df71cc8c2c1fc8985 gnome-screensaver-2.14.2.ebuild 2786 -EBUILD gnome-screensaver-2.16.2.ebuild 2669 RMD160 42792bc600f9c991817ecb99f64fbb9b433268f8 SHA1 49e28cfd36e5fabe12b250bf946a16760cd54066 SHA256 724bb909efdab5f8fffafa6eeec7f293e2d5955d28cdeb5cd14ab64c6ef27301 -MD5 7621cefcb89680715632c59541625cbd gnome-screensaver-2.16.2.ebuild 2669 -RMD160 42792bc600f9c991817ecb99f64fbb9b433268f8 gnome-screensaver-2.16.2.ebuild 2669 -SHA256 724bb909efdab5f8fffafa6eeec7f293e2d5955d28cdeb5cd14ab64c6ef27301 gnome-screensaver-2.16.2.ebuild 2669 -MISC ChangeLog 4092 RMD160 591781abe044d6d77716be8d241bed9b5b8770c7 SHA1 b64f8d32381b4aad1390ddb29bd189eec3fc7428 SHA256 1d5e0a40c7b634a658af513bdcaa286fdf7b27c7391247cfb15691329468cd9a -MD5 1dff144ebcafbf5c00d8ca7debc839da ChangeLog 4092 -RMD160 591781abe044d6d77716be8d241bed9b5b8770c7 ChangeLog 4092 -SHA256 1d5e0a40c7b634a658af513bdcaa286fdf7b27c7391247cfb15691329468cd9a ChangeLog 4092 +EBUILD gnome-screensaver-2.16.2.ebuild 2716 RMD160 d5ae277e613f83a192253dcee8a3551a956f3326 SHA1 5f578631bc466b447970465caece7d7aaba7988c SHA256 33afc510ac2ad5116b52cce2e7becda31a06c83ed75474ffe1482cb520b99d8b +MD5 eebc87e15d1f4575ddcb6d82fa1d06b0 gnome-screensaver-2.16.2.ebuild 2716 +RMD160 d5ae277e613f83a192253dcee8a3551a956f3326 gnome-screensaver-2.16.2.ebuild 2716 +SHA256 33afc510ac2ad5116b52cce2e7becda31a06c83ed75474ffe1482cb520b99d8b gnome-screensaver-2.16.2.ebuild 2716 +MISC ChangeLog 4514 RMD160 731e3fa5b731018e0077282d27981283f463de69 SHA1 cdbda04fad5e66cd2dabcb37d35f4c6f65747c1d SHA256 327a7c4a0491a9221a8767898826006c7d3178c092b5dc247d6efebb0f9da911 +MD5 15c96013cba99832a5fdff3b6f4bc3e8 ChangeLog 4514 +RMD160 731e3fa5b731018e0077282d27981283f463de69 ChangeLog 4514 +SHA256 327a7c4a0491a9221a8767898826006c7d3178c092b5dc247d6efebb0f9da911 ChangeLog 4514 MISC metadata.xml 472 RMD160 3fe1221d0cb389cf1be040c98fa9c40dbf3c07e5 SHA1 18913172dba9d94ca5952b7f8bfb2aa13808bb67 SHA256 e70be8f69acbda81bd1e90c1bd3a57a0b5ccb5fa09c7a6f04427ef888e1872bc MD5 77f62dae0c1bc21d5cf698695368d2d8 metadata.xml 472 RMD160 3fe1221d0cb389cf1be040c98fa9c40dbf3c07e5 metadata.xml 472 diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.16.2.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.16.2.ebuild index 63c53bba9ba3..bd4012da4e2b 100644 --- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.16.2.ebuild +++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.16.2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 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.16.2.ebuild,v 1.6 2006/12/21 13:21:27 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.16.2.ebuild,v 1.7 2006/12/22 03:08:32 leonardop Exp $ -inherit eutils gnome2 +inherit gnome2 DESCRIPTION="Replaces xscreensaver, integrating with the desktop." HOMEPAGE="http://live.gnome.org/GnomeScreensaver" @@ -13,39 +13,45 @@ KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86" IUSE="debug doc xinerama opengl pam" RDEPEND=">=gnome-base/gconf-2.6.1 - >=x11-libs/gtk+-2.8 - >=gnome-base/gnome-vfs-2.12 - >=gnome-base/libgnomeui-2.12 - >=gnome-base/libglade-2.5.0 - >=gnome-base/gnome-menus-2.12 - >=media-libs/libexif-0.6.12 - >=dev-libs/glib-2.8 - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrandr - x11-libs/libXScrnSaver - x11-proto/xextproto - x11-proto/randrproto - x11-proto/scrnsaverproto - || ( - >=dev-libs/dbus-glib-0.71 - ( =sys-apps/dbus-0.35.2 ) - ) - opengl? ( virtual/opengl ) - xinerama? ( - x11-libs/libXinerama - x11-proto/xineramaproto - ) - pam? ( sys-libs/pam ) - !pam? ( sys-apps/shadow )" + >=x11-libs/gtk+-2.8 + >=gnome-base/gnome-vfs-2.12 + >=gnome-base/libgnomeui-2.12 + >=gnome-base/libglade-2.5.0 + >=gnome-base/gnome-menus-2.12 + >=media-libs/libexif-0.6.12 + >=dev-libs/glib-2.8 + || ( + >=dev-libs/dbus-glib-0.71 + ~sys-apps/dbus-0.62 ) + opengl? ( virtual/opengl ) + xinerama? ( + x11-libs/libXinerama + x11-proto/xineramaproto ) + pam? ( sys-libs/pam ) + !pam? ( sys-apps/shadow ) + + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrandr + x11-libs/libXScrnSaver" DEPEND="${RDEPEND} - sys-devel/gettext - dev-util/pkgconfig - >=dev-util/intltool-0.35" + 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() { if use pam ; then G2CONF="--enable-pam" @@ -53,13 +59,17 @@ pkg_setup() { G2CONF="--with-shadow" fi - G2CONF="${G2CONF} $(use_enable doc) $(use_enable debug) \ - $(use_enable xinerama) $(use_with opengl gl)" - - G2CONF="${G2CONF} --enable-locking --with-libexif --with-dpms-ext \ - --with-gdm-config=/usr/share/gdm/defaults.conf \ - --with-xscreensaverdir=/usr/share/xscreensaver/config \ - --with-xscreensaverhackdir=/usr/lib/misc/xscreensaver " + G2CONF="${G2CONF} \ + $(use_enable doc docbook-docs) \ + $(use_enable debug) \ + $(use_enable xinerama) \ + $(use_with opengl gl) \ + --enable-locking \ + --with-libexif \ + --with-dpms-ext \ + --with-gdm-config=/usr/share/gdm/defaults.conf \ + --with-xscreensaverdir=/usr/share/xscreensaver/config \ + --with-xscreensaverhackdir=/usr/lib/misc/xscreensaver" } src_install() { @@ -82,6 +92,8 @@ src_install() { } 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." -- 2.26.2