switch ptex and texlive-core deps in the || dep, so that it is more consistent with latex-base virtual

Package-Manager: portage-2.1.3.16

3 files changed, 19 insertions, 15 deletions

diff --git a/app-text/xdvik/ChangeLog b/app-text/xdvik/ChangeLog
index 48a43feef601..ecc948fc278c 100644
--- a/app-text/xdvik/ChangeLog
+++ b/app-text/xdvik/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/xdvik
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.42 2007/10/26 17:35:38 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.43 2007/10/31 10:43:22 aballier Exp $
+
+  31 Oct 2007; Alexis Ballier <aballier@gentoo.org> xdvik-22.84.10.ebuild:
+  switch ptex and texlive-core deps in the || dep, so that it is more
+  consistent with latex-base virtual
 
   26 Oct 2007; Ulrich Mueller <ulm@gentoo.org> xdvik-22.84.10.ebuild:
   Delete spurious parentheses in elog message, bug #184259.
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index ca2375e812ef..d3f242443dd9 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -27,18 +27,18 @@ EBUILD xdvik-22.40y-r2.ebuild 2011 RMD160 05167aae4e235e1a7602c215338c46e086cf0e
 MD5 5ca48566c84e71c727b6bd134965e737 xdvik-22.40y-r2.ebuild 2011
 RMD160 05167aae4e235e1a7602c215338c46e086cf0e09 xdvik-22.40y-r2.ebuild 2011
 SHA256 ac7d879e9019e66587c7471d485773c4a8adc2b2ee879a1fa2a8cab8bd18247f xdvik-22.40y-r2.ebuild 2011
-EBUILD xdvik-22.84.10.ebuild 3862 RMD160 d41a04868a0cfea3bd3434951955e75595d6b5f6 SHA1 ff72f9dcd9bdf3f24033eec68b90c522486b099d SHA256 b5d4593cec7e8ec511d40e5faf1dc41be7680fa2c83ca1a1127b8cdc5f5fe40f
-MD5 2006e1aad6566f7d65a984bcf7a0e180 xdvik-22.84.10.ebuild 3862
-RMD160 d41a04868a0cfea3bd3434951955e75595d6b5f6 xdvik-22.84.10.ebuild 3862
-SHA256 b5d4593cec7e8ec511d40e5faf1dc41be7680fa2c83ca1a1127b8cdc5f5fe40f xdvik-22.84.10.ebuild 3862
+EBUILD xdvik-22.84.10.ebuild 3867 RMD160 c6d0a10531121bc39c942ec46eb7abc92887ef86 SHA1 7664eb9f557fdcba94a2c71fd25b33dc0cc64c01 SHA256 3e9b1929ebe31674605ff7b7cc3a23e4138425fbc91564b8b211207d178ab933
+MD5 b65f869e007954c122891e9ae9ef27a2 xdvik-22.84.10.ebuild 3867
+RMD160 c6d0a10531121bc39c942ec46eb7abc92887ef86 xdvik-22.84.10.ebuild 3867
+SHA256 3e9b1929ebe31674605ff7b7cc3a23e4138425fbc91564b8b211207d178ab933 xdvik-22.84.10.ebuild 3867
 EBUILD xdvik-22.84.5.ebuild 3583 RMD160 f3a1ad99dcf133c4db0350c41119f88bd054ae65 SHA1 b3ec7677288a245c2ff71eb1c815fcd7853e7b16 SHA256 207fc4c2fb7739ea76ec57b3e55d626ef6a9d968f5c9347bf33a16b12376a17b
 MD5 c7dffbcccd5fc9f9d682803367c1b952 xdvik-22.84.5.ebuild 3583
 RMD160 f3a1ad99dcf133c4db0350c41119f88bd054ae65 xdvik-22.84.5.ebuild 3583
 SHA256 207fc4c2fb7739ea76ec57b3e55d626ef6a9d968f5c9347bf33a16b12376a17b xdvik-22.84.5.ebuild 3583
-MISC ChangeLog 5772 RMD160 5ac635ad01d96420b505f95071476785a84b83b3 SHA1 9aa5b6d1b4ccdb9528784e6c39a16e4433242d91 SHA256 cc0fa6c656b963b8f37779e71d4ff27b816b29c5455f026f98c182c0baa9d812
-MD5 7b063ec02eccba7c756be0fc5a07096e ChangeLog 5772
-RMD160 5ac635ad01d96420b505f95071476785a84b83b3 ChangeLog 5772
-SHA256 cc0fa6c656b963b8f37779e71d4ff27b816b29c5455f026f98c182c0baa9d812 ChangeLog 5772
+MISC ChangeLog 5960 RMD160 0522d67e5a96db6d8ecb1529a89ac3d4ac25bb0f SHA1 10a1a669bf603e7292d471f0fb4d407f90b9f8f2 SHA256 be80129768ecd0a444742efc39d1aad566026dabba8230f0cf12382ca4fa09d3
+MD5 8dd63b88315b37a685ac6c6fa63ee945 ChangeLog 5960
+RMD160 0522d67e5a96db6d8ecb1529a89ac3d4ac25bb0f ChangeLog 5960
+SHA256 be80129768ecd0a444742efc39d1aad566026dabba8230f0cf12382ca4fa09d3 ChangeLog 5960
 MISC metadata.xml 407 RMD160 8e35df61682becc8460802429f23940b565120bf SHA1 eaea7a4d1e393780c3e672c1e3065052fa29e55c SHA256 037fb14955d7842ad7c7bfaa5fad22fe4f1fd17c54508a468c378b53f864bffd
 MD5 e35cf25c112b5830f5f2c5f968c07177 metadata.xml 407
 RMD160 8e35df61682becc8460802429f23940b565120bf metadata.xml 407
@@ -53,9 +53,9 @@ MD5 119e2e604c463314320df77eec6e9ed6 files/digest-xdvik-22.84.5 524
 RMD160 a44d655768bd3fba08e17cde4b644e88825bb815 files/digest-xdvik-22.84.5 524
 SHA256 0ec210cef61a9693d1ee4724b6f1f7bef013b539785dd11eeef3939eff6d6934 files/digest-xdvik-22.84.5 524
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHIiZEOeoy/oIi7uwRAkI+AKDmD80kr5ZzlfNZdxHuLEuegcoKbgCcDrvB
-sX8tknse3Ci8FeL5V1J3MoY=
-=d1PL
+iD8DBQFHKFxRvFcC4BYPU0oRAmOvAJ9rg/0JZTvGwiIbPabsGmn1Tzod8wCgqo+d
+Tjpc/G2VaTXQM8nn5Fv7TL0=
+=ByGC
 -----END PGP SIGNATURE-----
diff --git a/app-text/xdvik/xdvik-22.84.10.ebuild b/app-text/xdvik/xdvik-22.84.10.ebuild
index f7209c7cda4c..eccb1272bb8b 100644
--- a/app-text/xdvik/xdvik-22.84.10.ebuild
+++ b/app-text/xdvik/xdvik-22.84.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.84.10.ebuild,v 1.17 2007/10/26 17:38:54 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.84.10.ebuild,v 1.18 2007/10/31 10:43:22 aballier Exp $
 
 WANT_AUTOCONF=2.1
 
@@ -25,7 +25,7 @@ RDEPEND=">=media-libs/t1lib-5.0.2
 	motif? ( virtual/motif )
 	!motif? ( neXt? ( x11-libs/neXtaw )
 		!neXt? ( Xaw3d? ( x11-libs/Xaw3d ) ) )
-	cjk? ( || ( app-text/ptex app-text/texlive-core )
+	cjk? ( || ( app-text/texlive-core app-text/ptex )
 		>=media-libs/freetype-2
 		>=media-fonts/kochi-substitute-20030809-r3 )
 	!cjk? ( virtual/latex-base )