Fixed DEPEND for modular X.

(Portage version: 2.1_pre3-r1)

6 files changed, 37 insertions, 41 deletions

diff --git a/x11-misc/xnc/ChangeLog b/x11-misc/xnc/ChangeLog
index 3787489cd4f0..783e81583c5e 100644
--- a/x11-misc/xnc/ChangeLog
+++ b/x11-misc/xnc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xnc
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnc/ChangeLog,v 1.10 2005/11/01 15:10:44 nelchael Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnc/ChangeLog,v 1.11 2006/01/21 18:11:32 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> -xnc-5.0.2.ebuild,
+  xnc-5.0.4.ebuild:
+  Fixed DEPEND for modular X.
 
   01 Nov 2005; Krzysiek Pawlik <nelchael@gentoo.org> xnc-5.0.2.ebuild,
   xnc-5.0.4.ebuild:
diff --git a/x11-misc/xnc/files/digest-xnc-5.0.2 b/x11-misc/xnc/files/digest-xnc-5.0.2
deleted file mode 100644
index cf57484c69a2..000000000000
--- a/x11-misc/xnc/files/digest-xnc-5.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d702945813df0e483bf4c0630cfc355a xnc-5.0.2.src.tar.gz 2028953
diff --git a/x11-misc/xnc/xnc-5.0.2.ebuild b/x11-misc/xnc/xnc-5.0.2.ebuild
deleted file mode 100644
index 1659e102ba17..000000000000
--- a/x11-misc/xnc/xnc-5.0.2.ebuild
+++ /dev/null
@@ -1,30 +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/xnc/xnc-5.0.2.ebuild,v 1.4 2005/11/01 15:10:44 nelchael Exp $
-
-DESCRIPTION="file manager for X Window system very similar to Norton Commander"
-HOMEPAGE="http://xnc.dubna.su/"
-SRC_URI="http://xnc.dubna.su/src-5/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="nls"
-
-DEPEND="virtual/x11"
-
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		`use_enable nls` \
-		|| die "./configure failed"
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog LICENSE README TODO
-}
diff --git a/x11-misc/xnc/xnc-5.0.4.ebuild b/x11-misc/xnc/xnc-5.0.4.ebuild
index 6acdcc146c5a..1e0b4dd93a64 100644
--- a/x11-misc/xnc/xnc-5.0.4.ebuild
+++ b/x11-misc/xnc/xnc-5.0.4.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/xnc/xnc-5.0.4.ebuild,v 1.8 2005/11/01 15:10:44 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnc/xnc-5.0.4.ebuild,v 1.9 2006/01/21 18:11:32 nelchael Exp $
 
 DESCRIPTION="file manager for X Window system very similar to Norton Commander"
 HOMEPAGE="http://xnc.dubna.su/"
@@ -11,7 +11,19 @@ SLOT="0"
 KEYWORDS="x86 ppc ~sparc ~amd64"
 IUSE="nls"
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext )
+	virtual/x11 )
+	media-libs/libpng
+	media-libs/tiff
+	media-libs/jpeg"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xextproto
+		x11-proto/xproto )
+	virtual/x11 )"
 
 src_compile() {
 	./configure \
diff --git a/x11-misc/xnview/ChangeLog b/x11-misc/xnview/ChangeLog
index 50279a291030..dffcbf47cf00 100644
--- a/x11-misc/xnview/ChangeLog
+++ b/x11-misc/xnview/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/xnview
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnview/ChangeLog,v 1.18 2005/12/29 22:25:49 nelchael Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnview/ChangeLog,v 1.19 2006/01/21 18:15:50 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> xnview-1.70-r1.ebuild:
+  Fixed DEPEND for modular X.
 
   29 Dec 2005; Krzysiek Pawlik <nelchael@gentoo.org> xnview-1.70-r1.ebuild:
   Added missing DEPEND on sys-libs/glibc.
diff --git a/x11-misc/xnview/xnview-1.70-r1.ebuild b/x11-misc/xnview/xnview-1.70-r1.ebuild
index 74c2122fef8f..7bed9451a14b 100644
--- a/x11-misc/xnview/xnview-1.70-r1.ebuild
+++ b/x11-misc/xnview/xnview-1.70-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/xnview/xnview-1.70-r1.ebuild,v 1.3 2005/12/29 22:25:49 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnview/xnview-1.70-r1.ebuild,v 1.4 2006/01/21 18:15:50 nelchael Exp $
 
 DESCRIPTION="XnView image viewer/converter"
 HOMEPAGE="http://www.xnview.com/"
@@ -11,7 +11,15 @@ LICENSE="free-noncomm as-is"
 KEYWORDS="x86 -*"
 IUSE=""
 
-DEPEND="virtual/x11
+RDEPEND="|| ( (
+		x11-libs/libXau
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXp
+		x11-libs/libXdmcp )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
 		sys-libs/glibc"
 
 S="${WORKDIR}/XnView-1.70-x86-unknown-linux2.x-static-fc4"