Fixed modular X dependency. Block app-text/texlive. This closes bug #143851.

Package-Manager: portage-2.1.1

8 files changed, 122 insertions, 27 deletions

diff --git a/app-text/xdvik/ChangeLog b/app-text/xdvik/ChangeLog
index f6d7d9c61d33..cda2575356af 100644
--- a/app-text/xdvik/ChangeLog
+++ b/app-text/xdvik/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/xdvik
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.31 2006/10/29 18:14:42 exg Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.32 2006/11/06 16:23:10 usata Exp $
+
+  06 Nov 2006; Mamoru KOMACHI <usata@gentoo.org> +files/xdvi-xorg-7.0.patch,
+  +files/xdvik-22.40y-dvi-draw-conflicting-types.patch,
+  +files/xdvizilla.patch, xdvik-22.40y-r2.ebuild, xdvik-22.84.5.ebuild,
+  xdvik-22.84.10.ebuild:
+  Fixed modular X dependency. Block app-text/texlive. This closes bug #143851.
 
   29 Oct 2006; Emanuele Giaquinta <exg@gentoo.org> xdvik-22.84.10.ebuild:
   Block on virtual/tetex, not just app-text/tetex.
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index 7db500f0db8a..4d3dc198a6fb 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -1,29 +1,41 @@
+AUX xdvi-xorg-7.0.patch 605 RMD160 cc4f635af28d075ef0045a345c073696b1af64a0 SHA1 8639ea7574454eccde785bb6010d6c97ce4a8d70 SHA256 5a942a72a405fe1b638c69b2683e2cac8d0c9f55951e71f1f468a14578f79f6e
+MD5 7d244f102356573fea5a801509756ba6 files/xdvi-xorg-7.0.patch 605
+RMD160 cc4f635af28d075ef0045a345c073696b1af64a0 files/xdvi-xorg-7.0.patch 605
+SHA256 5a942a72a405fe1b638c69b2683e2cac8d0c9f55951e71f1f468a14578f79f6e files/xdvi-xorg-7.0.patch 605
+AUX xdvik-22.40y-dvi-draw-conflicting-types.patch 410 RMD160 8417f8ee01a46fe1c066d7fd2cd20c7f33ab0a52 SHA1 ff903e1b682d320eb10f17da49146e680953c02b SHA256 5f6a525bb57f25a722178716e142a6555058903be0ce3944263b424896941126
+MD5 912aea791088e715e491a7ccaa7eb25f files/xdvik-22.40y-dvi-draw-conflicting-types.patch 410
+RMD160 8417f8ee01a46fe1c066d7fd2cd20c7f33ab0a52 files/xdvik-22.40y-dvi-draw-conflicting-types.patch 410
+SHA256 5f6a525bb57f25a722178716e142a6555058903be0ce3944263b424896941126 files/xdvik-22.40y-dvi-draw-conflicting-types.patch 410
 AUX xdvik-asneeded.patch 372 RMD160 a010db47c3d0df947ed85c4ac7f4bd353efe8653 SHA1 46236ac9356639baff6d5c75ea3e06a24274fb87 SHA256 9f5edec7d73ad0a071c6be2ecfa80cf2092ae64bcb8d749e24f84c1400d00fc5
 MD5 ba72dd64eb696181b16cc27751e378eb files/xdvik-asneeded.patch 372
 RMD160 a010db47c3d0df947ed85c4ac7f4bd353efe8653 files/xdvik-asneeded.patch 372
 SHA256 9f5edec7d73ad0a071c6be2ecfa80cf2092ae64bcb8d749e24f84c1400d00fc5 files/xdvik-asneeded.patch 372
+AUX xdvizilla.patch 912 RMD160 79bf98f5b05cdc4e99147809e1ec6895e8843097 SHA1 3b8650a43b596beba305a9b9e3ed736ae6daf77f SHA256 cb7f0ca4758cd20d5a0a819dd87caa8f2d1df64aaac458e13b4bb3c43deb5204
+MD5 77107ec8ba31c93b0e1bc35a9e4c9c4b files/xdvizilla.patch 912
+RMD160 79bf98f5b05cdc4e99147809e1ec6895e8843097 files/xdvizilla.patch 912
+SHA256 cb7f0ca4758cd20d5a0a819dd87caa8f2d1df64aaac458e13b4bb3c43deb5204 files/xdvizilla.patch 912
 DIST xdvik-22.40y1-j1.21.patch.gz 166908 RMD160 4f84b62c418b2a7d3d07b7f9d60420ccbbfb479e SHA1 b952f94824c519df25a33c80347e6fa93309b6a6 SHA256 d7cd93e1b32e82dab39fbabdc0a67d0a06f291a854e82a29a1ee97f9f61bcf8f
 DIST xdvik-22.40y1.tar.gz 2256174 RMD160 c87f15c4077d869c81989b6eea8170fd1560998e SHA1 28065bad710a8bd2869d5e5a313384703b310b48 SHA256 47afcb4f45a30a6db1c03b89b0bf118a5af1c124f9f380b4312d7ccf4da95701
 DIST xdvik-22.84.10-j1.33.patch.gz 128939 RMD160 2c03aec8b23496b31fa59ddaac5d1bbf8626bd0b SHA1 40dfd0d2448a8d05fe1f4c71e8a349ed3b609869 SHA256 d9309df009f014cd617dc8ef3bc54d180c6df2dec34286e2c3ad01f65175c87b
 DIST xdvik-22.84.10.tar.gz 1910572 RMD160 2040cff601cb18324d922c18150ef8a9245907de SHA1 971924d849ba68f9d98599926d5cb0e03707dbd1 SHA256 51c14912fc31c6028dffb9555308f44de4cfc19f0e2ad91e27694d5798111eb6
 DIST xdvik-22.84.5-20041106-jp.diff.gz 123863 RMD160 945c7a337a6dad8f0060ce94c8ac2f6734acc68a SHA1 ed194144761dfcba7b07a6268ef935bd0f26fab6 SHA256 b96038971f2a922d01743a2d5e4f857d22acc5d3efd32882f208b85a2dd67b72
 DIST xdvik-22.84.5.tar.gz 1902252 RMD160 ff650febd48a39e5beab08e23853b27c12b28390 SHA1 d92dd6db22f18ac544813777a14069a7491d258a SHA256 bca7663ba3da4a3c866c9b62c143034295e0c56fb1ae29671b68580e9bbc367f
-EBUILD xdvik-22.40y-r2.ebuild 1787 RMD160 c0f7f122de27967203c9dd258b410d315227e0e3 SHA1 3284e5159d78d8de902f6fbffe75cce9961233b0 SHA256 3850aadf6d35cc8afcba128591273ddfd48888ead263392d66f84a6c8affe41f
-MD5 48c49269d5aae05fac8a06d50aac6b27 xdvik-22.40y-r2.ebuild 1787
-RMD160 c0f7f122de27967203c9dd258b410d315227e0e3 xdvik-22.40y-r2.ebuild 1787
-SHA256 3850aadf6d35cc8afcba128591273ddfd48888ead263392d66f84a6c8affe41f xdvik-22.40y-r2.ebuild 1787
-EBUILD xdvik-22.84.10.ebuild 3573 RMD160 59f0dc94ed48ed9584c550e085219a8c79d5ce95 SHA1 0a59deb608f1fc9e61dd9f830fc2a85018b77e9a SHA256 b1a4af2945a7a7cf30a847471103154c789943338ea379246c246ec9340d916c
-MD5 beef1d83e6c7d89d7de5539523c86914 xdvik-22.84.10.ebuild 3573
-RMD160 59f0dc94ed48ed9584c550e085219a8c79d5ce95 xdvik-22.84.10.ebuild 3573
-SHA256 b1a4af2945a7a7cf30a847471103154c789943338ea379246c246ec9340d916c xdvik-22.84.10.ebuild 3573
-EBUILD xdvik-22.84.5.ebuild 3556 RMD160 3f453bc532fc27f7fe8e36b68ee5112f5c69a7ef SHA1 3dceebfb660990eb5c5d6568c835ef0fb444baa6 SHA256 115f11b78c2a35d2417eab6b2b3118d11254c184487d15716d4d06c996818a1c
-MD5 b56c6af34ad269a53ee19b489bfd7dc8 xdvik-22.84.5.ebuild 3556
-RMD160 3f453bc532fc27f7fe8e36b68ee5112f5c69a7ef xdvik-22.84.5.ebuild 3556
-SHA256 115f11b78c2a35d2417eab6b2b3118d11254c184487d15716d4d06c996818a1c xdvik-22.84.5.ebuild 3556
-MISC ChangeLog 4202 RMD160 4e8addf557566464a43a8054710d6293ef0fd446 SHA1 b8200c54510bb90dac7f35bdd8899131a815f07e SHA256 136e11b764c9d4b9ca8324f384405ea784853eb53e975cb95d485e6e11f40ed6
-MD5 ae1578ebe689c07ada6adb2d66c728e2 ChangeLog 4202
-RMD160 4e8addf557566464a43a8054710d6293ef0fd446 ChangeLog 4202
-SHA256 136e11b764c9d4b9ca8324f384405ea784853eb53e975cb95d485e6e11f40ed6 ChangeLog 4202
+EBUILD xdvik-22.40y-r2.ebuild 2001 RMD160 a65bae2b893ed631494bdb2912121f31eb01964f SHA1 7bcf1e8184ed95ba71b8f6ce2c14ab217ff2fdbd SHA256 db16c0804bfb8870e220ae172afbd9af689004f45bbd8618b46f7228d44586d9
+MD5 ed91234990fae31eb06baa2ba1f30956 xdvik-22.40y-r2.ebuild 2001
+RMD160 a65bae2b893ed631494bdb2912121f31eb01964f xdvik-22.40y-r2.ebuild 2001
+SHA256 db16c0804bfb8870e220ae172afbd9af689004f45bbd8618b46f7228d44586d9 xdvik-22.40y-r2.ebuild 2001
+EBUILD xdvik-22.84.10.ebuild 3594 RMD160 968d9a5c18550a89f0d35372d00fe2d141773c1d SHA1 472f9ce2451bf319b9e6e365ecf1b59ca2260cf4 SHA256 1eb768d42d27180c3d5654f13baa075d3521d5b156c2a1f6399ff6fbbd472fdf
+MD5 d927e3f2398f99658ab9a60cc989ecf9 xdvik-22.84.10.ebuild 3594
+RMD160 968d9a5c18550a89f0d35372d00fe2d141773c1d xdvik-22.84.10.ebuild 3594
+SHA256 1eb768d42d27180c3d5654f13baa075d3521d5b156c2a1f6399ff6fbbd472fdf xdvik-22.84.10.ebuild 3594
+EBUILD xdvik-22.84.5.ebuild 3631 RMD160 87f139a31a0042acd87aac42805025e24fb0b70c SHA1 0abf1a8b7f6b8479e340e407704cb303b039eccb SHA256 a01fe3f3649a7b18f6301e80c1fba02e61641e897f33217d436378ff2e957f80
+MD5 43e1354f8ef2f3bf35a49cc05ca065d0 xdvik-22.84.5.ebuild 3631
+RMD160 87f139a31a0042acd87aac42805025e24fb0b70c xdvik-22.84.5.ebuild 3631
+SHA256 a01fe3f3649a7b18f6301e80c1fba02e61641e897f33217d436378ff2e957f80 xdvik-22.84.5.ebuild 3631
+MISC ChangeLog 4514 RMD160 7d6837337a54570730da3aba63c83394963576c6 SHA1 e1fbfdef83b501b585661ed3c7fe61980be13d80 SHA256 c13176aced19a859950e9ef796cb1d8897b52cfff239483378fffa6fd888509e
+MD5 b39865f1fdefc6274f08678ceda3dfed ChangeLog 4514
+RMD160 7d6837337a54570730da3aba63c83394963576c6 ChangeLog 4514
+SHA256 c13176aced19a859950e9ef796cb1d8897b52cfff239483378fffa6fd888509e ChangeLog 4514
 MISC metadata.xml 525 RMD160 b4ad49e125ab92a6a32adf191a6be8dd25f6d424 SHA1 6fb6a71bce4b0f23d3f618a4aefed271ea549768 SHA256 337a8ba2008f759333024328f2725152a4c29cb649814c427d9dcab6fe79c795
 MD5 054c8b05f7a333f80202914d9b721790 metadata.xml 525
 RMD160 b4ad49e125ab92a6a32adf191a6be8dd25f6d424 metadata.xml 525
diff --git a/app-text/xdvik/files/xdvi-xorg-7.0.patch b/app-text/xdvik/files/xdvi-xorg-7.0.patch
new file mode 100644
index 000000000000..493a39854c29
--- /dev/null
+++ b/app-text/xdvik/files/xdvi-xorg-7.0.patch
@@ -0,0 +1,17 @@
+diff -urN texk.orig/xdvik/xdvi.h texk/xdvik/xdvi.h
+--- texk.orig/xdvik/xdvi.h	2006-10-23 18:12:27.000000000 +0900
++++ texk/xdvik/xdvi.h	2006-10-23 18:20:51.000000000 +0900
+@@ -236,6 +236,13 @@
+ /* only use definitions with prototypes now */
+ #define	ARGS(x)	x
+ 
++/* Since xorg-7.0, NeedWidePrototypes in X11/Xfoncproto.h has been
++ * undefined by default. However, xdvi needs to be built with 
++ * NeedWidePrototypes to display Japanese. Then we defined it in
++ * texk/xdvi/xdvi.h
++ */
++#define NeedWidePrototypes	1
++
+ #ifndef	NeedWidePrototypes
+ #define	NeedWidePrototypes	NeedFunctionPrototypes
+ #endif
diff --git a/app-text/xdvik/files/xdvik-22.40y-dvi-draw-conflicting-types.patch b/app-text/xdvik/files/xdvik-22.40y-dvi-draw-conflicting-types.patch
new file mode 100644
index 000000000000..c38a8e01bc71
--- /dev/null
+++ b/app-text/xdvik/files/xdvik-22.40y-dvi-draw-conflicting-types.patch
@@ -0,0 +1,11 @@
+--- tetex-src-2.0.2.old/texk/xdvik/dvi-draw.c      2003-01-25 05:16:33.000000000 -0500
++++ tetex-src-2.0.2/texk/xdvik/dvi-draw.c  2006-01-08 04:52:44.000000000 -0500
+@@ -518,7 +518,7 @@
+
+ #endif /* T1LIB */
+
+-extern void home();  /* from events.c */
++extern void home(wide_bool scrl);  /* from events.c */
+ extern int fallbacktfm; /* from tfmload.c */
+
+ static struct frame frame0;    /* dummy head of list */
diff --git a/app-text/xdvik/files/xdvizilla.patch b/app-text/xdvik/files/xdvizilla.patch
new file mode 100644
index 000000000000..bc925280a198
--- /dev/null
+++ b/app-text/xdvik/files/xdvizilla.patch
@@ -0,0 +1,30 @@
+--- tetex-bin-2.0.2/texk/xdvik/xdvizilla	2002-10-12 15:28:50.000000000 +0200
++++ tetex-bin-2.0.2.new/texk/xdvik/xdvizilla	2004-12-23 12:58:35.010332504 +0100
+@@ -33,7 +33,7 @@
+ case "$FILETYPE" in
+ 
+   *"gzip compressed data"*)
+-    FILE=/tmp/xdvizilla$$
++    FILE=`mktemp -t xdvizilla.XXXXXX` || exit 1
+     gunzip -c "$1" > $FILE
+     [ -n "$NO_RM" ] || rm -f -- "$1"
+     NO_RM=
+@@ -41,7 +41,7 @@
+     ;;
+ 
+   *"compressed data"* | *"compress'd data"*)
+-    FILE=/tmp/xdvizilla$$
++    FILE=`mktemp -t xdvizilla.XXXXXX` || exit 1
+     uncompress -c "$1" > $FILE
+     [ -n "$NO_RM" ] || rm -f -- "$1"
+     NO_RM=
+@@ -60,8 +60,7 @@
+ case "$FILETYPE" in
+ 
+   *" tar archive")
+-    TARDIR=/tmp/xdvitar$$
+-    mkdir $TARDIR
++    TARDIR=`mktemp -t -d xdvitar.XXXXXX` || exit 1
+     cat "$FILE" | (cd $TARDIR; tar xf -)
+     DVINAME=`tar tf "$FILE" | grep '\.dvi$' | head -1`
+     [ -n "$NO_RM" ] || rm -f -- "$FILE"
diff --git a/app-text/xdvik/xdvik-22.40y-r2.ebuild b/app-text/xdvik/xdvik-22.40y-r2.ebuild
index 621844ad9ce5..fe88a4b8fa3a 100644
--- a/app-text/xdvik/xdvik-22.40y-r2.ebuild
+++ b/app-text/xdvik/xdvik-22.40y-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/app-text/xdvik/xdvik-22.40y-r2.ebuild,v 1.13 2005/01/01 16:42:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.40y-r2.ebuild,v 1.14 2006/11/06 16:23:10 usata Exp $
 
 inherit eutils
 
@@ -20,16 +20,27 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND=">=media-libs/t1lib-1.3
-	virtual/x11
+	|| (
+		(
+			x11-libs/libXpm
+			x11-libs/libXmu
+		)
+		virtual/x11
+	)
 	virtual/tetex
 	cjk? ( >=media-libs/freetype-2 )
-	libwww? ( >=net-libs/libwww-5.3.2-r1 )"
+	libwww? ( >=net-libs/libwww-5.3.2-r1 )
+	!app-text/texlive"
 
 src_unpack () {
 
 	unpack ${MY_P}.tar.gz
+	cd ${S}
+	epatch ${FILESDIR}/xdvi-xorg-7.0.patch
+	epatch ${FILESDIR}/xdvizilla.patch
 	if use cjk ; then
 		epatch ${DISTDIR}/${XDVIK_JP}.patch.gz
+		epatch ${FILESDIR}/${P}-dvi-draw-conflicting-types.patch
 		sed -i -e "/\/usr\/local/s:^:%:g" \
 			-e "/kochi-.*-subst/s:%::g" \
 			-e "s:/usr/local:/usr:g" \
diff --git a/app-text/xdvik/xdvik-22.84.10.ebuild b/app-text/xdvik/xdvik-22.84.10.ebuild
index 4b8e441f5170..8c26b6b672f7 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-2006 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.8 2006/10/29 18:14:42 exg Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.84.10.ebuild,v 1.9 2006/11/06 16:23:10 usata Exp $
 
 WANT_AUTOCONF=2.1
 
@@ -30,7 +30,8 @@ RDEPEND=">=media-libs/t1lib-5.0.2
 	cjk? ( app-text/ptex
 		>=media-libs/freetype-2
 		>=media-fonts/kochi-substitute-20030809-r3 )
-	!cjk? ( virtual/tetex )"
+	!cjk? ( virtual/tetex )
+	!app-text/texlive"
 DEPEND="${RDEPEND}"
 
 pkg_setup () {
diff --git a/app-text/xdvik/xdvik-22.84.5.ebuild b/app-text/xdvik/xdvik-22.84.5.ebuild
index e4d8da874872..c0f96d402319 100644
--- a/app-text/xdvik/xdvik-22.84.5.ebuild
+++ b/app-text/xdvik/xdvik-22.84.5.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/xdvik/xdvik-22.84.5.ebuild,v 1.3 2005/06/12 22:33:27 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.84.5.ebuild,v 1.4 2006/11/06 16:23:10 usata Exp $
 
 inherit eutils flag-o-matic elisp-common
 
@@ -19,7 +19,13 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND=">=media-libs/t1lib-5.0.2
-	virtual/x11
+	|| (
+		(
+			x11-libs/libXmu
+			x11-libs/libXpm
+		)
+		virtual/x11
+	)
 	motif? ( lesstif? ( x11-libs/lesstif )
 		!lesstif? ( x11-libs/openmotif ) )
 	!motif? ( neXt? ( x11-libs/neXtaw )
@@ -28,7 +34,8 @@ DEPEND=">=media-libs/t1lib-5.0.2
 	cjk? ( app-text/ptex
 		>=media-libs/freetype-2
 		>=media-fonts/kochi-substitute-20030809-r3 )
-	!cjk? ( virtual/tetex )"
+	!cjk? ( virtual/tetex )
+	!app-text/texlive"
 
 src_unpack () {