Added xf86miscproto to DEPEND (bug #158721) and other small fixes.

(Portage version: 2.1.1-r2)

2 files changed, 58 insertions, 38 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 <leonardop@gentoo.org>
+  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 <corsair@gentoo.org>
   gnome-screensaver-2.16.2.ebuild:
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.90 >=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."