modular X depends thanks to Rohan McGovern <rohan.pm@gmail.com> in bug 117524

Package-Manager: portage-2.1_pre3-r1

5 files changed, 62 insertions, 22 deletions

diff --git a/app-text/gv/ChangeLog b/app-text/gv/ChangeLog
index 287917d1cffd..7f994b6a4b8e 100644
--- a/app-text/gv/ChangeLog
+++ b/app-text/gv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/gv
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gv/ChangeLog,v 1.36 2005/12/01 04:41:14 tgall Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/gv/ChangeLog,v 1.37 2006/01/03 09:57:25 genstef Exp $
+
+  03 Jan 2006; Stefan Schweizer <genstef@gentoo.org> gv-3.5.8-r4.ebuild,
+  gv-3.6.1.ebuild, gv-3.6.1-r1.ebuild:
+  modular X depends thanks to Rohan McGovern <rohan.pm@gmail.com> in bug 117524
 
   30 Nov 2005; Tom Gall <tgall@gentoo.org> gv-3.5.8-r4.ebuild:
   stable on ppc64
diff --git a/app-text/gv/Manifest b/app-text/gv/Manifest
index f997876409a1..1e00f3c2d13c 100644
--- a/app-text/gv/Manifest
+++ b/app-text/gv/Manifest
@@ -1,8 +1,4 @@
-MD5 3b42ff32c2685bbe8a2745c0a00dbc8c ChangeLog 4337
-MD5 942b6fd603d2d7393fa7ced6efa001c0 gv-3.5.8-r4.ebuild 1538
-MD5 fd30209d8424318a0041b7917d22e329 gv-3.6.1-r1.ebuild 1118
-MD5 69769f2545f1bce60ba3860cf5f8bf0a gv-3.6.1.ebuild 1074
-MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
+MD5 b195e7c290a8fdfe8ad647101976c339 ChangeLog 4532
 MD5 8f60d24f315a2d3035f0fd78c06a3f9c files/3.5.8-gcc3.patch 490
 MD5 ed8bb15a47bee7c6c61f5b8f419391a1 files/digest-gv-3.5.8-r4 60
 MD5 05a9505958dac0203a0c43462f7e9ce2 files/digest-gv-3.6.1 123
@@ -15,3 +11,7 @@ MD5 cdda43ebb8ee0fa1525767cd36b0aa81 files/gv-3.6.1-a0.patch 2429
 MD5 4dda8a392fb59b4a5e3c0f25ad773b34 files/gv-3.6.1-landscape.patch 464
 MD5 365f92dfb8a1d598913847341e8fec7f files/gv-3.6.1-scrollbar.patch 395
 MD5 8d217b566c2eeae39312f35d950610bb files/gv-3.6.1-setenv.patch 378
+MD5 5a27675b9e6c5bae1c82aac1133f3283 gv-3.5.8-r4.ebuild 1695
+MD5 651cc5e733968fbada1acd5c6daf9fe5 gv-3.6.1-r1.ebuild 1272
+MD5 a23958c6c1ce1c30e492bb849ff7ecd7 gv-3.6.1.ebuild 1228
+MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
diff --git a/app-text/gv/gv-3.5.8-r4.ebuild b/app-text/gv/gv-3.5.8-r4.ebuild
index a3a9914ad793..ad33f4e22cd1 100644
--- a/app-text/gv/gv-3.5.8-r4.ebuild
+++ b/app-text/gv/gv-3.5.8-r4.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/app-text/gv/gv-3.5.8-r4.ebuild,v 1.14 2005/12/01 04:41:14 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gv/gv-3.5.8-r4.ebuild,v 1.15 2006/01/03 09:57:25 genstef Exp $
 
 inherit eutils
 
@@ -13,11 +13,23 @@ SLOT="0"
 KEYWORDS="x86 ppc alpha sparc amd64 ~mips ~ppc-macos ppc64"
 IUSE=""
 
-# There's probably more, but ghostscript also depends on it,
-# so I can't identify it
-DEPEND="virtual/x11
+RDEPEND="|| ( (
+			x11-libs/libXmu
+			x11-libs/libXpm
+			x11-libs/libXp
+		) virtual/x11
+	)
 	x11-libs/Xaw3d
 	virtual/ghostscript"
+
+# There's probably more, but ghostscript also depends on it,
+# so I can't identify it
+DEPEND="${RDEPEND}
+	|| ( (
+			x11-misc/imake
+			x11-libs/libXt
+		) virtual/x11
+	)"
 PROVIDE="virtual/pdfviewer
 	virtual/psviewer"
 
diff --git a/app-text/gv/gv-3.6.1-r1.ebuild b/app-text/gv/gv-3.6.1-r1.ebuild
index 6c609384cc46..4fe65bc737f1 100644
--- a/app-text/gv/gv-3.6.1-r1.ebuild
+++ b/app-text/gv/gv-3.6.1-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/app-text/gv/gv-3.6.1-r1.ebuild,v 1.1 2005/11/03 00:07:17 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gv/gv-3.6.1-r1.ebuild,v 1.2 2006/01/03 09:57:25 genstef Exp $
 
 inherit eutils
 
@@ -14,11 +14,23 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64 ~mips ~ppc-macos ~ppc64"
 IUSE=""
 
-# There's probably more, but ghostscript also depends on it,
-# so I can't identify it
-DEPEND="virtual/x11
+RDEPEND="|| ( (
+			x11-libs/libXmu
+			x11-libs/libXpm
+			x11-libs/libXp
+		) virtual/x11
+	)
 	x11-libs/Xaw3d
 	virtual/ghostscript"
+
+# There's probably more, but ghostscript also depends on it,
+# so I can't identify it
+DEPEND="${RDEPEND}
+	|| ( (
+			x11-misc/imake
+			x11-libs/libXt
+		) virtual/x11
+	)"
 PROVIDE="virtual/pdfviewer
 	virtual/psviewer"
 
diff --git a/app-text/gv/gv-3.6.1.ebuild b/app-text/gv/gv-3.6.1.ebuild
index 5efe3a48b0b4..fd0b1a4fc854 100644
--- a/app-text/gv/gv-3.6.1.ebuild
+++ b/app-text/gv/gv-3.6.1.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/app-text/gv/gv-3.6.1.ebuild,v 1.2 2005/11/03 00:07:17 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gv/gv-3.6.1.ebuild,v 1.3 2006/01/03 09:57:25 genstef Exp $
 
 inherit eutils
 
@@ -14,11 +14,23 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64 ~mips ~ppc-macos ~ppc64"
 IUSE=""
 
-# There's probably more, but ghostscript also depends on it,
-# so I can't identify it
-DEPEND="virtual/x11
+RDEPEND="|| ( (
+			x11-libs/libXmu
+			x11-libs/libXpm
+			x11-libs/libXp
+		) virtual/x11
+	)
 	x11-libs/Xaw3d
 	virtual/ghostscript"
+
+# There's probably more, but ghostscript also depends on it,
+# so I can't identify it
+DEPEND="${RDEPEND}
+	|| ( (
+			x11-misc/imake
+			x11-libs/libXt
+		) virtual/x11
+	)"
 PROVIDE="virtual/pdfviewer
 	virtual/psviewer"