Added modular X dependencies (bug #120934, Herve Roussain).

(Portage version: 2.1_pre4-r1)

4 files changed, 42 insertions, 17 deletions

diff --git a/media-gfx/xfig/ChangeLog b/media-gfx/xfig/ChangeLog
index ca04c71a0566..82b87876032a 100644
--- a/media-gfx/xfig/ChangeLog
+++ b/media-gfx/xfig/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/xfig
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/ChangeLog,v 1.21 2006/01/17 13:33:24 corsair Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/ChangeLog,v 1.22 2006/02/11 16:36:56 joshuabaergen Exp $
+
+  11 Feb 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xfig-3.2.4-r1.ebuild, xfig-3.2.4-r2.ebuild, xfig-3.2.5_alpha5.ebuild:
+  Added modular X dependencies (bug #120934, Herve Roussain).
 
   08 Dec 2005; Marcus D. Hanwell <cryos@gentoo.org>
   +files/xfig-3.2.4-gcc4.patch, xfig-3.2.4-r2.ebuild:
diff --git a/media-gfx/xfig/xfig-3.2.4-r1.ebuild b/media-gfx/xfig/xfig-3.2.4-r1.ebuild
index dcdf5f1f48ee..f70236d56acb 100644
--- a/media-gfx/xfig/xfig-3.2.4-r1.ebuild
+++ b/media-gfx/xfig/xfig-3.2.4-r1.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/media-gfx/xfig/xfig-3.2.4-r1.ebuild,v 1.10 2004/11/01 20:17:28 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.4-r1.ebuild,v 1.11 2006/02/11 16:36:56 joshuabaergen Exp $
 
 inherit eutils
 
@@ -16,13 +16,20 @@ SLOT="0"
 KEYWORDS="x86 ppc ~sparc alpha ~hppa amd64 ~ppc64"
 IUSE=""
 
-DEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libXaw
+				x11-libs/libXp )
+			virtual/x11 )
 	x11-libs/Xaw3d
 	media-libs/jpeg
-	media-libs/libpng"
-RDEPEND="${DEPEND}
+	media-libs/libpng
 	media-gfx/transfig
 	media-libs/netpbm"
+DEPEND="${RDEPEND}
+	|| ( ( x11-misc/imake
+			app-text/rman
+			x11-proto/xproto
+			x11-proto/inputproto )
+		virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-gfx/xfig/xfig-3.2.4-r2.ebuild b/media-gfx/xfig/xfig-3.2.4-r2.ebuild
index 90cda631a936..b5dfd5b9ec16 100644
--- a/media-gfx/xfig/xfig-3.2.4-r2.ebuild
+++ b/media-gfx/xfig/xfig-3.2.4-r2.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/xfig/xfig-3.2.4-r2.ebuild,v 1.5 2005/12/08 20:40:46 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.4-r2.ebuild,v 1.6 2006/02/11 16:36:56 joshuabaergen Exp $
 
 inherit eutils
 
@@ -19,13 +19,20 @@ SLOT="0"
 KEYWORDS="alpha ~amd64 ~hppa ~ppc ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libXaw
+				x11-libs/libXp )
+			virtual/x11 )
 	x11-libs/Xaw3d
 	media-libs/jpeg
-	media-libs/libpng"
-RDEPEND="${DEPEND}
+	media-libs/libpng
 	media-gfx/transfig
 	media-libs/netpbm"
+DEPEND="${RDEPEND}
+	|| ( ( x11-misc/imake
+			app-text/rman
+			x11-proto/xproto
+			x11-proto/inputproto )
+		virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-gfx/xfig/xfig-3.2.5_alpha5.ebuild b/media-gfx/xfig/xfig-3.2.5_alpha5.ebuild
index f5830d4ffc42..755a10109663 100644
--- a/media-gfx/xfig/xfig-3.2.5_alpha5.ebuild
+++ b/media-gfx/xfig/xfig-3.2.5_alpha5.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/xfig/xfig-3.2.5_alpha5.ebuild,v 1.1 2005/09/24 21:31:55 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.5_alpha5.ebuild,v 1.2 2006/02/11 16:36:56 joshuabaergen Exp $
 
 inherit eutils
 
@@ -16,13 +16,20 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libXaw
+				x11-libs/libXp )
+			virtual/x11 )
 	x11-libs/Xaw3d
 	media-libs/jpeg
-	media-libs/libpng"
-RDEPEND="${DEPEND}
+	media-libs/libpng
 	media-gfx/transfig
 	media-libs/netpbm"
+DEPEND="${RDEPEND}
+	|| ( ( x11-misc/imake
+			app-text/rman
+			x11-proto/xproto
+			x11-proto/inputproto )
+		virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}