Modular X deps

(Portage version: 2.0.53_rc7)

4 files changed, 47 insertions, 30 deletions

diff --git a/app-text/ghostscript/ChangeLog b/app-text/ghostscript/ChangeLog
index 5294820e4686..23eacae458b3 100644
--- a/app-text/ghostscript/ChangeLog
+++ b/app-text/ghostscript/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/ghostscript
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ChangeLog,v 1.110 2005/11/04 10:04:16 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ChangeLog,v 1.111 2005/11/08 03:58:01 dang Exp $
+
+  08 Nov 2005; <dang@gentoo.org> ghostscript-7.07.1-r10.ebuild:
+  Modular X deps
 
   04 Nov 2005; Fabian Groffen <grobian@gentoo.org>
   ghostscript-7.07.1-r10.ebuild:
diff --git a/app-text/ghostscript/Manifest b/app-text/ghostscript/Manifest
index 7bc9d23dd3da..aa057ef58e43 100644
--- a/app-text/ghostscript/Manifest
+++ b/app-text/ghostscript/Manifest
@@ -1,34 +1,34 @@
-MD5 5549f4b5fd84d1d6ec7b79b82f175981 ghostscript-7.07.1-r10.ebuild 5926
-MD5 e5c681abcdd4309829734a5f91ab007b ghostscript-7.07.1-r7.ebuild 4288
 MD5 fcd5851f8f79335790fcf67c439daceb ChangeLog 17743
-MD5 0adb31bdf1827f38952f2f0dd249e926 ghostscript-7.07.1-r8.ebuild 5491
-MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 212a5ece7d789ef9d04e15fd7d36eea3 files/gs-osx-unix-dll.patch 1930
+MD5 db00eb9aaf23133f903513fea669954f files/digest-ghostscript-7.07.1-r10 212
+MD5 b7ca313a24a8adf4c527c0a097354f60 files/digest-ghostscript-7.07.1-r7 212
+MD5 b7ca313a24a8adf4c527c0a097354f60 files/digest-ghostscript-7.07.1-r8 212
+MD5 fd34b2b7a029f19eab4ba3f69afe295e files/ghostscript-7.05.6.man.patch 1231
 MD5 f834d056ca972c457a2ff3b1e839e562 files/ghostscript-7.07-bigposttable.patch 1257
-MD5 b2ca914ffcff3e5296d6b5acc7fac182 files/gs7.07.1-ps2ps.patch 244
+MD5 55146a1eafc4ad3a26d99121ae0777fe files/ghostscript-7.07-coverage-glyphcount.patch 3100
+MD5 c73ad916d49df447de59358ffdc495eb files/ghostscript-7.07-fix_cidfontname_Encoding_CIDToGIDMap_DW_W.patch 6462
+MD5 e0da7576378dc87fa53a16dfd1774789 files/ghostscript-7.07-fix_rename_font_gs_cidfn.ps.patch 1611
+MD5 b37c0dc9f85205da6e8675d4a8bfd21a files/ghostscript-7.07-gsublookuptable.patch 3808
+MD5 5b476654e84a9748e3d56d86f264b277 files/ghostscript-7.07.1-64bit-cmyk.patch 1777
 MD5 8c6a3d7e8897b4297ef853dbd89e408b files/gs-fix-gc.patch 5627
-MD5 343b6a60e15e35d0c5f825b4f361fd29 files/gs7.05.6-cjk.diff.bz2 3287
-MD5 5f1b04ca58928a339b749703e067e2ba files/gs7.05.6-kochi-substitute.patch 3774
-MD5 51736590c7ec64f9029fa9524e1ab50c files/gs7.07.1-destdir.patch 12261
 MD5 186fc94fd3208e808026580e7436dbdc files/gs-osx-ijs.patch 1566
-MD5 acda8ddfde1efeaf451cb28a67dcc773 files/gs7.07.1-krgb.patch.gz 5569
+MD5 212a5ece7d789ef9d04e15fd7d36eea3 files/gs-osx-unix-dll.patch 1930
 MD5 291c8895063b8ecee12b68d45a705ab4 files/gs7.05-gdevhl12.c.bz2 7406
-MD5 b7ca313a24a8adf4c527c0a097354f60 files/digest-ghostscript-7.07.1-r7 212
-MD5 b7ca313a24a8adf4c527c0a097354f60 files/digest-ghostscript-7.07.1-r8 212
-MD5 370d4bcd16d8acd03190ba84e2f61a41 files/gs7.07.1-ijsdestdir.patch 1418
+MD5 343b6a60e15e35d0c5f825b4f361fd29 files/gs7.05.6-cjk.diff.bz2 3287
+MD5 68fa21d11a860c222c8ba89c39ce578e files/gs7.05.6-gdevpx.patch 402
+MD5 5f1b04ca58928a339b749703e067e2ba files/gs7.05.6-kochi-substitute.patch 3774
+MD5 d3f26c93b9fb75b509c375cbf841da9a files/gs7.05.6-tempfile.patch 2763
 MD5 16ff6a37a0a334e97f712d8ed530ec6c files/gs7.07.1-cjk.diff 7264
+MD5 06fe485954243190f4f0f4d8e1542f92 files/gs7.07.1-cjk.diff.bz2 3055
+MD5 51736590c7ec64f9029fa9524e1ab50c files/gs7.07.1-destdir.patch 12261
 MD5 0cb94835c5d49c5eeeba6e11b2cd65ed files/gs7.07.1-fontconfig-rh.patch.2.bz2 6113
-MD5 92fa24960f2c7802749ce6908aeaf60d files/gs7.07.1-nogtk2.patch 1419
-MD5 c73ad916d49df447de59358ffdc495eb files/ghostscript-7.07-fix_cidfontname_Encoding_CIDToGIDMap_DW_W.patch 6462
-MD5 d3f26c93b9fb75b509c375cbf841da9a files/gs7.05.6-tempfile.patch 2763
-MD5 55146a1eafc4ad3a26d99121ae0777fe files/ghostscript-7.07-coverage-glyphcount.patch 3100
-MD5 1d5618d793799f7247d624ced0dea493 files/gs7.07.1-tempfile.patch 3123
-MD5 b7ca313a24a8adf4c527c0a097354f60 files/digest-ghostscript-7.07.1-r10 212
-MD5 fd34b2b7a029f19eab4ba3f69afe295e files/ghostscript-7.05.6.man.patch 1231
-MD5 5b476654e84a9748e3d56d86f264b277 files/ghostscript-7.07.1-64bit-cmyk.patch 1777
 MD5 3d1cdf07dabc4a05bde9a2dc6f7da2de files/gs7.07.1-fontconfig-rh.patch.bz2 6121
-MD5 e0da7576378dc87fa53a16dfd1774789 files/ghostscript-7.07-fix_rename_font_gs_cidfn.ps.patch 1611
-MD5 68fa21d11a860c222c8ba89c39ce578e files/gs7.05.6-gdevpx.patch 402
-MD5 b37c0dc9f85205da6e8675d4a8bfd21a files/ghostscript-7.07-gsublookuptable.patch 3808
 MD5 ac6af6bf67095500ea043aea27062d62 files/gs7.07.1-ijs.patch 401
-MD5 06fe485954243190f4f0f4d8e1542f92 files/gs7.07.1-cjk.diff.bz2 3055
+MD5 370d4bcd16d8acd03190ba84e2f61a41 files/gs7.07.1-ijsdestdir.patch 1418
+MD5 acda8ddfde1efeaf451cb28a67dcc773 files/gs7.07.1-krgb.patch.gz 5569
+MD5 92fa24960f2c7802749ce6908aeaf60d files/gs7.07.1-nogtk2.patch 1419
+MD5 b2ca914ffcff3e5296d6b5acc7fac182 files/gs7.07.1-ps2ps.patch 244
+MD5 1d5618d793799f7247d624ced0dea493 files/gs7.07.1-tempfile.patch 3123
+MD5 006fdefe15b50f1adbcdd98421a96bfd ghostscript-7.07.1-r10.ebuild 6184
+MD5 e5c681abcdd4309829734a5f91ab007b ghostscript-7.07.1-r7.ebuild 4288
+MD5 0adb31bdf1827f38952f2f0dd249e926 ghostscript-7.07.1-r8.ebuild 5491
+MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
diff --git a/app-text/ghostscript/files/digest-ghostscript-7.07.1-r10 b/app-text/ghostscript/files/digest-ghostscript-7.07.1-r10
index 86d2854e2bfc..65b5bad2acb0 100644
--- a/app-text/ghostscript/files/digest-ghostscript-7.07.1-r10
+++ b/app-text/ghostscript/files/digest-ghostscript-7.07.1-r10
@@ -1,3 +1,3 @@
-MD5 d30bf5c09f2c7caa8291f6305cf03044 espgs-7.07.1-source.tar.bz2 5400198
-MD5 a3bf430a7e21cd82401258a2ec3b8afb adobe-cmaps-200204.tar.gz 4360486
 MD5 2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz 631653
+MD5 a3bf430a7e21cd82401258a2ec3b8afb adobe-cmaps-200204.tar.gz 4360486
+MD5 d30bf5c09f2c7caa8291f6305cf03044 espgs-7.07.1-source.tar.bz2 5400198
diff --git a/app-text/ghostscript/ghostscript-7.07.1-r10.ebuild b/app-text/ghostscript/ghostscript-7.07.1-r10.ebuild
index 981565548950..e9bb876f15a4 100644
--- a/app-text/ghostscript/ghostscript-7.07.1-r10.ebuild
+++ b/app-text/ghostscript/ghostscript-7.07.1-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.07.1-r10.ebuild,v 1.3 2005/11/04 10:04:16 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.07.1-r10.ebuild,v 1.4 2005/11/08 03:58:01 dang Exp $
 
 inherit flag-o-matic eutils toolchain-funcs libtool
 
@@ -19,7 +19,10 @@ DEP="virtual/libc
 	>=media-libs/jpeg-6b
 	>=media-libs/libpng-1.2.1
 	>=sys-libs/zlib-1.1.4
-	X? ( virtual/x11 )
+	X? ( || ( ( 
+			x11-libs/libX11
+			x11-libs/libXt )
+		virtual/x11 ) )
 	gtk? ( >=x11-libs/gtk+-2.0 )
 	cups? ( net-print/cups )
 	!virtual/ghostscript"
@@ -28,9 +31,20 @@ RDEPEND="${DEP}
 	cjk? ( media-fonts/arphicfonts
 		media-fonts/kochi-substitute
 		media-fonts/baekmuk-fonts )
+	X? ( || ( ( 
+			x11-proto/libXt
+			x11-proto/libXt
+			x11-proto/libSM
+			x11-proto/libICE
+			x11-proto/libXau
+			x11-proto/libXdmcp )
+		virtual/x11 ) )
 	media-fonts/gnu-gs-fonts-std"
 
 DEPEND="${DEP}
+	X? ( || ( ( 
+			x11-proto/xproto )
+		virtual/x11 ) )
 	gtk? ( dev-util/pkgconfig )"
 
 #	media-libs/fontconfig"