Add a blocker on tetex built with X.

Package-Manager: portage-2.1.2_pre2-r9

5 files changed, 42 insertions, 28 deletions

diff --git a/app-text/xdvik/ChangeLog b/app-text/xdvik/ChangeLog
index 6248409e9a89..44bc231ba020 100644
--- a/app-text/xdvik/ChangeLog
+++ b/app-text/xdvik/ChangeLog
@@ -1,6 +1,9 @@
 # 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.26 2006/10/09 18:17:38 exg Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.27 2006/10/13 15:51:42 exg Exp $
+
+  13 Oct 2006; Emanuele Giaquinta <exg@gentoo.org> xdvik-22.84.10.ebuild:
+  Add a blocker on tetex built with X.
 
   09 Oct 2006; Emanuele Giaquinta <exg@gentoo.org> xdvik-22.84.10.ebuild:
   Correct X11 deps.
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index 3875a1cb3fbf..b3259c32be5f 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -2,38 +2,38 @@ AUX xdvik-asneeded.patch 372 RMD160 a010db47c3d0df947ed85c4ac7f4bd353efe8653 SHA
 MD5 ba72dd64eb696181b16cc27751e378eb files/xdvik-asneeded.patch 372
 RMD160 a010db47c3d0df947ed85c4ac7f4bd353efe8653 files/xdvik-asneeded.patch 372
 SHA256 9f5edec7d73ad0a071c6be2ecfa80cf2092ae64bcb8d749e24f84c1400d00fc5 files/xdvik-asneeded.patch 372
-DIST xdvik-22.40y1-j1.21.patch.gz 166908
-DIST xdvik-22.40y1.tar.gz 2256174
+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
-DIST xdvik-22.84.5.tar.gz 1902252
+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 3608 RMD160 48a8496389dfe310f3dede3b5500f9a099b4e75f SHA1 f13a50cbcfd40c36850a518fc558f1e3e7b1826a SHA256 9631468c5c97e60208ec5ccf7c6a86022e2f1a192fd1e849611ca5177008bfff
-MD5 5351e6c35108fbdc898cceefadecd806 xdvik-22.84.10.ebuild 3608
-RMD160 48a8496389dfe310f3dede3b5500f9a099b4e75f xdvik-22.84.10.ebuild 3608
-SHA256 9631468c5c97e60208ec5ccf7c6a86022e2f1a192fd1e849611ca5177008bfff xdvik-22.84.10.ebuild 3608
+EBUILD xdvik-22.84.10.ebuild 3787 RMD160 f4ff420b79fbbff76c59247e02eaccc7150758a4 SHA1 227b66db7731724e1992622692ecf7d2e872c567 SHA256 69d069150427d852544827d0a670867e4926126d227ea61a3d2c44c817a64732
+MD5 809b0d30900fe80e3402761e5feaf3cd xdvik-22.84.10.ebuild 3787
+RMD160 f4ff420b79fbbff76c59247e02eaccc7150758a4 xdvik-22.84.10.ebuild 3787
+SHA256 69d069150427d852544827d0a670867e4926126d227ea61a3d2c44c817a64732 xdvik-22.84.10.ebuild 3787
 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 3607 RMD160 eff6bdab329379a6e4ebcf629dcd4a35d01a5033 SHA1 61803154e81c907a6599fb7f457c274f1ea0886b SHA256 05c8b4c12756ae45e46eec0f4c7b093b993ecda6229e1210015a59ca234c56bf
-MD5 90e9ced81c6ad1753bd6f5fab3d9be1a ChangeLog 3607
-RMD160 eff6bdab329379a6e4ebcf629dcd4a35d01a5033 ChangeLog 3607
-SHA256 05c8b4c12756ae45e46eec0f4c7b093b993ecda6229e1210015a59ca234c56bf ChangeLog 3607
+MISC ChangeLog 3721 RMD160 1dc1e6e16d7b6cd9f8d2f532d0d6239b40043a53 SHA1 3fd5a48dda8882375dca004dc33918ae0d7a49d7 SHA256 d986fe64a425cd8c643e1b8c887ea8e1c2d203d809747b189a659d8f84e63275
+MD5 f664caab8da537dc39fdf4a1d2d4ebb9 ChangeLog 3721
+RMD160 1dc1e6e16d7b6cd9f8d2f532d0d6239b40043a53 ChangeLog 3721
+SHA256 d986fe64a425cd8c643e1b8c887ea8e1c2d203d809747b189a659d8f84e63275 ChangeLog 3721
 MISC metadata.xml 525 RMD160 b4ad49e125ab92a6a32adf191a6be8dd25f6d424 SHA1 6fb6a71bce4b0f23d3f618a4aefed271ea549768 SHA256 337a8ba2008f759333024328f2725152a4c29cb649814c427d9dcab6fe79c795
 MD5 054c8b05f7a333f80202914d9b721790 metadata.xml 525
 RMD160 b4ad49e125ab92a6a32adf191a6be8dd25f6d424 metadata.xml 525
 SHA256 337a8ba2008f759333024328f2725152a4c29cb649814c427d9dcab6fe79c795 metadata.xml 525
-MD5 ef28316e4f45cb7762b5ec33efe38f61 files/digest-xdvik-22.40y-r2 139
-RMD160 c11fb846a6a7db8fad50a1747ba2845ea132b34f files/digest-xdvik-22.40y-r2 139
-SHA256 89d7ceaf58524fa38cacc4b330072aed4313539f7d05ef897a6dc19b30f3206a files/digest-xdvik-22.40y-r2 139
+MD5 c94768948a6859d98da9c5996e283ced files/digest-xdvik-22.40y-r2 509
+RMD160 dfe2ba94b1306e29597997a0939485c67bb5262c files/digest-xdvik-22.40y-r2 509
+SHA256 050c528958735084eae516d45f5281a73eadcc52c566965e15fd8edadbb009ba files/digest-xdvik-22.40y-r2 509
 MD5 ffaa352936130ed9489a7c00888bcdce files/digest-xdvik-22.84.10 515
 RMD160 0a6429e5fb597a85f782145874b5380dd56970f7 files/digest-xdvik-22.84.10 515
 SHA256 ce8b4970c86008796c5ce67cbced4e0b3f77d3d37a56d557a04dff1556d3af01 files/digest-xdvik-22.84.10 515
-MD5 2957e3b202cbb3d7a5dc43a68ffd2ef0 files/digest-xdvik-22.84.5 144
-RMD160 9cb530bb3157137680ff6943ae42e02b8dbdf8c9 files/digest-xdvik-22.84.5 144
-SHA256 55cb3f410ce5ddd587e9884909f22c9b33165ad3670e11906d777e7484887d99 files/digest-xdvik-22.84.5 144
+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
diff --git a/app-text/xdvik/files/digest-xdvik-22.40y-r2 b/app-text/xdvik/files/digest-xdvik-22.40y-r2
index 9c66bb81b763..bb9b34878917 100644
--- a/app-text/xdvik/files/digest-xdvik-22.40y-r2
+++ b/app-text/xdvik/files/digest-xdvik-22.40y-r2
@@ -1,2 +1,6 @@
-MD5 ab9083c9580e215715dc0369db3c028b xdvik-22.40y1.tar.gz 2256174
 MD5 9ce0615764079502f3b76692127a068a xdvik-22.40y1-j1.21.patch.gz 166908
+RMD160 4f84b62c418b2a7d3d07b7f9d60420ccbbfb479e xdvik-22.40y1-j1.21.patch.gz 166908
+SHA256 d7cd93e1b32e82dab39fbabdc0a67d0a06f291a854e82a29a1ee97f9f61bcf8f xdvik-22.40y1-j1.21.patch.gz 166908
+MD5 ab9083c9580e215715dc0369db3c028b xdvik-22.40y1.tar.gz 2256174
+RMD160 c87f15c4077d869c81989b6eea8170fd1560998e xdvik-22.40y1.tar.gz 2256174
+SHA256 47afcb4f45a30a6db1c03b89b0bf118a5af1c124f9f380b4312d7ccf4da95701 xdvik-22.40y1.tar.gz 2256174
diff --git a/app-text/xdvik/files/digest-xdvik-22.84.5 b/app-text/xdvik/files/digest-xdvik-22.84.5
index 800826af0935..5a468dddd914 100644
--- a/app-text/xdvik/files/digest-xdvik-22.84.5
+++ b/app-text/xdvik/files/digest-xdvik-22.84.5
@@ -1,2 +1,6 @@
-MD5 5180b6ba158f29e9880549d18fe8381d xdvik-22.84.5.tar.gz 1902252
 MD5 af4869cfe65ae0b01d41a02871410223 xdvik-22.84.5-20041106-jp.diff.gz 123863
+RMD160 945c7a337a6dad8f0060ce94c8ac2f6734acc68a xdvik-22.84.5-20041106-jp.diff.gz 123863
+SHA256 b96038971f2a922d01743a2d5e4f857d22acc5d3efd32882f208b85a2dd67b72 xdvik-22.84.5-20041106-jp.diff.gz 123863
+MD5 5180b6ba158f29e9880549d18fe8381d xdvik-22.84.5.tar.gz 1902252
+RMD160 ff650febd48a39e5beab08e23853b27c12b28390 xdvik-22.84.5.tar.gz 1902252
+SHA256 bca7663ba3da4a3c866c9b62c143034295e0c56fb1ae29671b68580e9bbc367f xdvik-22.84.5.tar.gz 1902252
diff --git a/app-text/xdvik/xdvik-22.84.10.ebuild b/app-text/xdvik/xdvik-22.84.10.ebuild
index b8c4cf0caa1e..6536a6fb527d 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.3 2006/10/09 18:17:38 exg Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.84.10.ebuild,v 1.4 2006/10/13 15:51:42 exg Exp $
 
 WANT_AUTOCONF=2.1
 
@@ -34,8 +34,16 @@ RDEPEND=">=media-libs/t1lib-5.0.2
 	!cjk? ( virtual/tetex )"
 DEPEND="${RDEPEND}"
 
-src_unpack () {
+pkg_setup () {
+	if has_version app-text/tetex && built_with_use app-text/tetex X ; then
+		eerror "tetex provides xdvik when built with the X flag."
+		eerror "To install this version of xdvik re-install tetex"
+		eerror "without the X flag."
+		die "xdvik collides with tetex built with the X flag"
+	fi
+}
 
+src_unpack () {
 	unpack ${P}.tar.gz
 	cd "${S}"
 	if use cjk ; then
@@ -68,11 +76,6 @@ src_compile () {
 	local TEXMF_PATH=$(kpsewhich --expand-var='$TEXMFMAIN')
 	local myconf toolkit
 
-	if use cjk ; then
-		 export CPPFLAGS="${CPPFLAGS} -I/usr/include/freetype2"
-		 myconf="${myconf} --with-vflib=vf2ft"
-	fi
-
 	if use motif ; then
 		if use lesstif ; then
 			append-ldflags -L/usr/X11R6/lib/lesstif -R/usr/X11R6/lib/lesstif