Fixed X-related dependencies (support for modular X).

(Portage version: 2.1_pre3-r1)

3 files changed, 24 insertions, 8 deletions

diff --git a/media-gfx/fbida/ChangeLog b/media-gfx/fbida/ChangeLog
index 0e6a4ab64322..2ebebc7be30a 100644
--- a/media-gfx/fbida/ChangeLog
+++ b/media-gfx/fbida/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/fbida
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.8 2006/01/10 11:00:37 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.9 2006/01/22 14:54:50 spock Exp $
+
+  22 Jan 2006; Michał Januszewski <spock@gentoo.org> fbida-2.03.ebuild,
+  fbida-2.03-r1.ebuild:
+  Fixed X-related dependencies (support for modular X).
 
   10 Jan 2006; ferringb@gentoo.org fbida-2.03.ebuild:
   remove the ungif choice due to bug 118386
diff --git a/media-gfx/fbida/fbida-2.03-r1.ebuild b/media-gfx/fbida/fbida-2.03-r1.ebuild
index 5e375edb298c..1dd3885c19ae 100644
--- a/media-gfx/fbida/fbida-2.03-r1.ebuild
+++ b/media-gfx/fbida/fbida-2.03-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/media-gfx/fbida/fbida-2.03-r1.ebuild,v 1.4 2005/12/03 13:34:21 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.03-r1.ebuild,v 1.5 2006/01/22 14:54:50 spock Exp $
 
 DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)."
 HOMEPAGE="http://linux.bytesex.org/fbida/"
@@ -11,18 +11,24 @@ SLOT="0"
 KEYWORDS="~ppc x86"
 IUSE="png jpeg gif tiff curl lirc X fbcon"
 
-DEPEND="jpeg? ( >=media-libs/jpeg-6b )
+RDEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	png? ( media-libs/libpng )
 	gif? ( media-libs/giflib )
 	tiff? ( media-libs/tiff )
 	curl? ( net-misc/curl )
 	lirc? ( app-misc/lirc )
-	X? ( virtual/x11 virtual/motif )
+	X? ( || ( ( x11-libs/libX11 x11-libs/libXt x11-libs/libXpm )
+			virtual/x11 )
+		virtual/motif )
 	!media-gfx/fbi
 	media-libs/libexif
 	>=media-libs/freetype-2.0
 	>=media-libs/fontconfig-2.2"
 
+DEPEND="${RDEPEND}
+	X? ( || ( ( x11-proto/xextproto x11-proto/xproto )
+			virtual/x11 ) )"
+
 src_unpack() {
 	unpack ${A}
 	sed -e 's/DGifOpenFileName,ungif/DGifOpenFileName,gif/' \
diff --git a/media-gfx/fbida/fbida-2.03.ebuild b/media-gfx/fbida/fbida-2.03.ebuild
index b371466996ca..2ebd053eebe0 100644
--- a/media-gfx/fbida/fbida-2.03.ebuild
+++ b/media-gfx/fbida/fbida-2.03.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.03.ebuild,v 1.4 2006/01/10 11:00:37 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.03.ebuild,v 1.5 2006/01/22 14:54:50 spock Exp $
 
 DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)."
 HOMEPAGE="http://linux.bytesex.org/fbida/"
@@ -11,16 +11,22 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE="png jpeg gif tiff curl lirc X fbcon"
 
-DEPEND="jpeg? ( >=media-libs/jpeg-6b )
+RDEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	png? ( media-libs/libpng )
 	gif? ( media-libs/giflib )
 	tiff? ( media-libs/tiff )
 	curl? ( net-misc/curl )
 	lirc? ( app-misc/lirc )
-	X? ( virtual/x11 virtual/motif )
+	X? ( || ( ( x11-libs/libX11 x11-libs/libXt x11-libs/libXpm )
+			virtual/x11 )
+		virtual/motif )
 	media-libs/libexif
 	!media-gfx/fbi"
 
+DEPEND="${RDEPEND}
+	X? ( || ( ( x11-proto/xextproto x11-proto/xproto )
+			virtual/x11 ) )"
+
 src_compile() {
 	# let autoconf do its job and then fix things to build fbida
 	# according to our specifications