Fixed DEPEND for modular X.

(Portage version: 2.1_pre3-r1)

7 files changed, 39 insertions, 64 deletions

diff --git a/x11-misc/xsnap/ChangeLog b/x11-misc/xsnap/ChangeLog
index 4602ba5c33f9..243a57d552e6 100644
--- a/x11-misc/xsnap/ChangeLog
+++ b/x11-misc/xsnap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xsnap
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/ChangeLog,v 1.20 2005/11/01 19:39:48 dertobi123 Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/ChangeLog,v 1.21 2006/01/21 18:45:37 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/xsnap-1.3-gentoo.patch, -xsnap-1.3.ebuild, xsnap-1.4.3-r1.ebuild:
+  Fixed DEPEND for modular X.
 
   01 Nov 2005; Tobias Scherbaum <dertobi123@gentoo.org>
   xsnap-1.4.3-r1.ebuild:
diff --git a/x11-misc/xsnap/files/digest-xsnap-1.3 b/x11-misc/xsnap/files/digest-xsnap-1.3
deleted file mode 100644
index cb2adc7312f9..000000000000
--- a/x11-misc/xsnap/files/digest-xsnap-1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a6dc88dc3f74d87d262b2051af879089 xsnap-1.3.tgz 18567
diff --git a/x11-misc/xsnap/files/xsnap-1.3-gentoo.patch b/x11-misc/xsnap/files/xsnap-1.3-gentoo.patch
deleted file mode 100644
index 8991e4df255a..000000000000
--- a/x11-misc/xsnap/files/xsnap-1.3-gentoo.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- xsnap-1.3/xsnap.c.orig	2004-04-23 00:00:48.323212832 +0200
-+++ xsnap-1.3/xsnap.c	2004-04-23 00:01:15.564071592 +0200
-@@ -17,6 +17,7 @@
-  */
- 
- #include <stdio.h> 
-+#include <stdlib.h>
- #include <unistd.h>
- #include <sys/stat.h>
- #include <X11/Xlib.h>
-@@ -693,7 +694,7 @@
- int i, notfound;
- struct stat buf;
- 
--    if (*filename = '?')
-+    if (*filename == '?')
-       {
-       i=0;
-       notfound=0;
diff --git a/x11-misc/xsnap/xsnap-1.3.ebuild b/x11-misc/xsnap/xsnap-1.3.ebuild
deleted file mode 100644
index 2822cfe7199e..000000000000
--- a/x11-misc/xsnap/xsnap-1.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/xsnap-1.3.ebuild,v 1.11 2005/11/01 13:46:07 nelchael Exp $
-
-inherit eutils
-
-DESCRIPTION="Program to interactively take a 'snapshot' of a region of
-the screen"
-SRC_URI="ftp://ftp.ac-grenoble.fr/ge/Xutils/${P}.tgz"
-HOMEPAGE="ftp://ftp.ac-grenoble.fr/ge/Xutils/"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="x86 ppc sparc amd64"
-IUSE=""
-
-DEPEND="virtual/x11"
-
-src_unpack() {
-	unpack ${A}
-	cd ${WORKDIR}
-	epatch ${FILESDIR}/${P}-gentoo.patch
-}
-
-src_compile() {
-	xmkmf || die
-	make || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	make DESTDIR=${D} install.man || die
-	dodoc README AUTHORS
-}
diff --git a/x11-misc/xsnap/xsnap-1.4.3-r1.ebuild b/x11-misc/xsnap/xsnap-1.4.3-r1.ebuild
index 9cc9c38a870d..f882f7fa212c 100644
--- a/x11-misc/xsnap/xsnap-1.4.3-r1.ebuild
+++ b/x11-misc/xsnap/xsnap-1.4.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/xsnap-1.4.3-r1.ebuild,v 1.7 2005/11/01 19:39:48 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/xsnap-1.4.3-r1.ebuild,v 1.8 2006/01/21 18:45:37 nelchael Exp $
 
 inherit eutils
 
@@ -13,7 +13,18 @@ LICENSE="as-is"
 KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )
+	media-libs/libpng
+	media-libs/jpeg"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xproto
+		x11-misc/imake )
+	virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-misc/xsnow/ChangeLog b/x11-misc/xsnow/ChangeLog
index bd2197b297ad..b6009d757329 100644
--- a/x11-misc/xsnow/ChangeLog
+++ b/x11-misc/xsnow/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/xsnow
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnow/ChangeLog,v 1.13 2004/11/12 19:02:51 blubb Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnow/ChangeLog,v 1.14 2006/01/21 18:49:21 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> xsnow-1.42.ebuild:
+  Fixed DEPEND for modular X.
 
   12 Nov 2004; Simon Stelling <blubb@gentoo.org> xsnow-1.42.ebuild:
   added ~amd64
diff --git a/x11-misc/xsnow/xsnow-1.42.ebuild b/x11-misc/xsnow/xsnow-1.42.ebuild
index 196bda7b4b7d..65759ea3f291 100644
--- a/x11-misc/xsnow/xsnow-1.42.ebuild
+++ b/x11-misc/xsnow/xsnow-1.42.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnow/xsnow-1.42.ebuild,v 1.15 2004/11/12 19:02:51 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnow/xsnow-1.42.ebuild,v 1.16 2006/01/21 18:49:21 nelchael Exp $
 
 DESCRIPTION="snow, reindeer, and santa on the root window"
 SRC_URI="http://www.euronet.nl/~rja/Xsnow/${P}.tar.gz"
@@ -11,7 +11,18 @@ KEYWORDS="x86 sparc ppc ppc64 ~amd64"
 LICENSE="as-is"
 IUSE=""
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-misc/imake
+		x11-proto/xextproto
+		x11-proto/xproto )
+	virtual/x11 )"
 
 src_compile() {
 	xmkmf || die