block tex4ht, texlive provides it

Package-Manager: portage-2.1.3.13

3 files changed, 25 insertions, 10 deletions

diff --git a/app-text/texlive-core/ChangeLog b/app-text/texlive-core/ChangeLog
index f8ac0c5015fb..32646a37b779 100644
--- a/app-text/texlive-core/ChangeLog
+++ b/app-text/texlive-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/texlive-core
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/ChangeLog,v 1.1 2007/10/14 07:56:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/ChangeLog,v 1.2 2007/10/15 21:30:07 aballier Exp $
+
+  15 Oct 2007; Alexis Ballier <aballier@gentoo.org>
+  texlive-core-2007.ebuild:
+  block tex4ht, texlive provides it
 
 *texlive-core-2007 (14 Oct 2007)
 
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index aa2668b48974..449e5d8639e8 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2007/tetex-3.0-CVE-2007-0650.patch 2615 RMD160 3e3f55a17e35e3da3a6f77d62939ed66d8ae5222 SHA1 28208eb13f493c1c9c6538f254f04fc0c2aaff1e SHA256 9cb5525070bc4ea0685ac8a2f87df1dbbd2dcee4989e7b22c9897acfe6b67628
 MD5 8c2f3c2c87a5ec82869059df57af27c8 files/2007/tetex-3.0-CVE-2007-0650.patch 2615
 RMD160 3e3f55a17e35e3da3a6f77d62939ed66d8ae5222 files/2007/tetex-3.0-CVE-2007-0650.patch 2615
@@ -76,14 +79,14 @@ DIST texlive-module-lib-regex-2007.zip 873 RMD160 1525034c3434b534a238b90730fe56
 DIST texlive-module-lib-zlib-2007.zip 1221 RMD160 c2dc6572cd09ef2494a8b299334b902df6567f4c SHA1 2c2a4814b2eaba74da4ae35521b521f83f688ab8 SHA256 9f9ab01c861946667c218e0e2ebea7bbb74a65e94ce9cb699b99cfd51fbcfd5a
 DIST texlive-module-mft-2007.zip 9083 RMD160 a07d22432636f38a7639a5385ed3e96626041e45 SHA1 fc5585b86daf583779dacc9e25d0e615ba6519e4 SHA256 6d4a52492a03b41fdfc50532a9061ad94723c67ec5ded1d0ea549ee4978511a4
 DIST texlive-module-mkind-english-2007.zip 2264 RMD160 c2d9e9164ed10f55bda56247e94d9bf63adf93e6 SHA1 6660cefd619df95f80f63146f0501cc8dc02e344 SHA256 333fb0b1b4b12764fb16a93ced43721a781202cf0fcb71c5eed4a4903dca5d5c
-EBUILD texlive-core-2007.ebuild 6839 RMD160 8ee02cd2e61e92101ef0a183eacb893f3a056190 SHA1 3f760a23b9d01911cbbd457c7c906d6d8ea1857a SHA256 73e732b68b12baaa66d4f31d558de16a17bdc5743c223c14133661b5253074b1
-MD5 25cc45bbc88214625d3725a0d50c7667 texlive-core-2007.ebuild 6839
-RMD160 8ee02cd2e61e92101ef0a183eacb893f3a056190 texlive-core-2007.ebuild 6839
-SHA256 73e732b68b12baaa66d4f31d558de16a17bdc5743c223c14133661b5253074b1 texlive-core-2007.ebuild 6839
-MISC ChangeLog 705 RMD160 eb1a13a6b222b619016251cf3c799bdb07598b1d SHA1 9d803ddab4b292af344b36186999096fa5281690 SHA256 6f16fd8254547743c101222470b902d28c13f5fab76b600218d0553ec28f0be3
-MD5 a12a86aaabd6cfaee4deb6b0df6f4e80 ChangeLog 705
-RMD160 eb1a13a6b222b619016251cf3c799bdb07598b1d ChangeLog 705
-SHA256 6f16fd8254547743c101222470b902d28c13f5fab76b600218d0553ec28f0be3 ChangeLog 705
+EBUILD texlive-core-2007.ebuild 6855 RMD160 7face8c5f7a639c6485373ed14e4421c78c9f3c9 SHA1 8e7b30278747be866b84b799854735c85864bb45 SHA256 2777ef563b6f40680e0c0a67eb96c3e71dfb116c1a284ff415b3da60cc0452af
+MD5 0171c2b76ea77a07a250c51c69f9d240 texlive-core-2007.ebuild 6855
+RMD160 7face8c5f7a639c6485373ed14e4421c78c9f3c9 texlive-core-2007.ebuild 6855
+SHA256 2777ef563b6f40680e0c0a67eb96c3e71dfb116c1a284ff415b3da60cc0452af texlive-core-2007.ebuild 6855
+MISC ChangeLog 822 RMD160 bd532f87f7257c2461c0a8f08e3c227751a26f74 SHA1 dd083f10b9c5afbef66b99f3965e380d86f954fd SHA256 dc6e2bb3cae9ee00ac094fea5acbd04fa34a207c4fe24ec6d5eff8ff7de371c3
+MD5 285c1369f9b737dc2e194dbc3a54fbef ChangeLog 822
+RMD160 bd532f87f7257c2461c0a8f08e3c227751a26f74 ChangeLog 822
+SHA256 dc6e2bb3cae9ee00ac094fea5acbd04fa34a207c4fe24ec6d5eff8ff7de371c3 ChangeLog 822
 MISC metadata.xml 327 RMD160 10186cf048d44753bf4cec722eed45d2ade12316 SHA1 0254321c012da0e8f80aec6f29a0fb5b17675d4d SHA256 e520223493249c261b48f7f7460ed7c262d35383484e730cfefba51fde1195be
 MD5 10ddcc0c6d2a7a76dd92dffa01ca03ca metadata.xml 327
 RMD160 10186cf048d44753bf4cec722eed45d2ade12316 metadata.xml 327
@@ -91,3 +94,10 @@ SHA256 e520223493249c261b48f7f7460ed7c262d35383484e730cfefba51fde1195be metadata
 MD5 ce038c7eaf6971f7bb7aa8af4e1992eb files/digest-texlive-core-2007 13910
 RMD160 a35861ced4172658b14517c8880d2a193f876372 files/digest-texlive-core-2007 13910
 SHA256 b5566af1308a9159c3e2bf536780a99f874ed08617817776d3a0b89ec93494f2 files/digest-texlive-core-2007 13910
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHE9whvFcC4BYPU0oRAj7cAKCMLTHICxk2x29u1nfYGuU8x+8CmACgtZnY
+7l0iAIQssJXv71VYa7PVqEU=
+=tO5v
+-----END PGP SIGNATURE-----
diff --git a/app-text/texlive-core/texlive-core-2007.ebuild b/app-text/texlive-core/texlive-core-2007.ebuild
index 6afdb2361d5f..716e69b76026 100644
--- a/app-text/texlive-core/texlive-core-2007.ebuild
+++ b/app-text/texlive-core/texlive-core-2007.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/texlive-core/texlive-core-2007.ebuild,v 1.2 2007/10/15 01:15:49 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2007.ebuild,v 1.3 2007/10/15 21:30:07 aballier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs libtool autotools texlive-common
 
@@ -46,6 +46,7 @@ DEPEND="${MODULAR_X_DEPEND}
 	!app-text/xetex
 	!dev-tex/xmltex
 	!dev-tex/vntex
+	!dev-tex/tex4ht
 	sys-apps/ed
 	sys-libs/zlib
 	>=media-libs/libpng-1.2.1