install scripts in the texmf tree, tell people to use mk4ht, this fixes a bunche of collision problems

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

3 files changed, 133 insertions, 2 deletions

diff --git a/dev-tex/tex4ht/ChangeLog b/dev-tex/tex4ht/ChangeLog
index 6b98e226908e..69473fe733a5 100644
--- a/dev-tex/tex4ht/ChangeLog
+++ b/dev-tex/tex4ht/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-tex/tex4ht
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/tex4ht/ChangeLog,v 1.63 2009/10/17 14:58:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/tex4ht/ChangeLog,v 1.64 2009/10/22 16:13:48 aballier Exp $
+
+*tex4ht-20090611_p1038-r1 (22 Oct 2009)
+
+  22 Oct 2009; Alexis Ballier <aballier@gentoo.org>
+  +tex4ht-20090611_p1038-r1.ebuild:
+  install scripts in the texmf tree, tell people to use mk4ht, this fixes a
+  bunche of collision problems
 
   17 Oct 2009; Raúl Porcel <armin76@gentoo.org>
   tex4ht-20090611_p1038.ebuild:
diff --git a/dev-tex/tex4ht/Manifest b/dev-tex/tex4ht/Manifest
index e979a73f2d18..598a7cc8f98f 100644
--- a/dev-tex/tex4ht/Manifest
+++ b/dev-tex/tex4ht/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50tex4ht.cnf 192 RMD160 5b1858ef986eee4d9cc353e2147bee99938d7529 SHA1 6e7e561eb5bbf86dcd32b058e55cd5947e59e783 SHA256 5c9659aad7091b763e4a1363d78629a1ad8e1fe5ba679c151b95c69f4de9d9c1
 DIST tex4ht-1.0.2008_11_03_0302.tar.gz 2516092 RMD160 c0241500e36acbec6c98c11045d79e4f430571bb SHA1 80eaac979b9e5925467a3919233e7a2904bc05b5 SHA256 a2eebdf464a7c6a6f6e3907bb3f3249f2425591be5089ff995b56ad9785e0ae3
 DIST tex4ht-1.0.2009_05_13_1511.tar.gz 2575254 RMD160 5ee0775befa633645e987e50e491789ddd3da75c SHA1 2a14cce707b1cd412f81fc77a1f295abd05d4f00 SHA256 a87e0be8e6bc7ee119984755e943d2ab323d326b449c52f8fe1f2fd01df0574a
 DIST tex4ht-1.0.2009_06_11_1038.tar.gz 2576719 RMD160 09bce74e23058d02bc251305632cea4a4ee6595d SHA1 7d46488059316dec3234b6478cd0d2ca8f4d110f SHA256 9f3e259641bb7d5f32b8efaa85cb7c1a9f1a17f5fc6a859c81449d9984ec91a3
 EBUILD tex4ht-20081103_p0302.ebuild 3355 RMD160 d1a735b139b105b476eba66ced8386380a6f611d SHA1 9a90bb929b267969a6dc1c0c19a98be498b2ed73 SHA256 1f85e7cda5c0815bcf718cf75f888e6469282f060eca2290bc3f54b62ac54b14
 EBUILD tex4ht-20090513_p1511.ebuild 3355 RMD160 0f7f746f2248bc82fe87ebf8fdad1b9c79f15160 SHA1 6ba1e5f4b677bad3f86a6310912a168fe45e7f0d SHA256 d7e5b5c5142837d68943883e34aff2f9f7be7aeff559154c3c66eb52d1f673b4
+EBUILD tex4ht-20090611_p1038-r1.ebuild 3357 RMD160 23dec2c3d68770c6744807573ea8c3f27f6a462b SHA1 20bf858e13af2a77f25c09625beab1ef0a2f8b26 SHA256 b653ce9761fddca73c2d93f43f0ff1c04f4b5e5a5b06c8b14d5b628244d3ce81
 EBUILD tex4ht-20090611_p1038.ebuild 3357 RMD160 13bfe9c022c19bf81e721054b40c6bd38a2d96a1 SHA1 68ac9e48bd7fc96e42a2c550e2e3bf6c4fc3565d SHA256 5be0701056adae9424b2ac94e75b3e4f14dc0198cda2197dbef76ac5526d8283
-MISC ChangeLog 8820 RMD160 367427fbb2035a0f25893853c0caa0b952e437d7 SHA1 e6402d0e47901caa270ab065fde31e46002c8d72 SHA256 1d340ac713cc5285201f5bba9315b0f4f578e3272e7ee6d6d428f54a38b91b3d
+MISC ChangeLog 9058 RMD160 e4733956fa2547a64bd3a03187cffadde7e34b85 SHA1 c51e0f6e014107cf9fa24d3aeb15528d8dfb6e68 SHA256 6aceb87abfd8a8d763b37790f02497ba3bbe3b7321f14df12d02c42f49544a4c
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAkrghMEACgkQvFcC4BYPU0rxCQCgnxoAcpf0+7mYfwUCVE9Da0uV
+VmcAoI236R3ctJUUr1Dsj4sb9xexcIuh
+=p78S
+-----END PGP SIGNATURE-----
diff --git a/dev-tex/tex4ht/tex4ht-20090611_p1038-r1.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038-r1.ebuild
new file mode 100644
index 000000000000..509014e1f831
--- /dev/null
+++ b/dev-tex/tex4ht/tex4ht-20090611_p1038-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/tex4ht/tex4ht-20090611_p1038-r1.ebuild,v 1.1 2009/10/22 16:13:48 aballier Exp $
+
+inherit latex-package toolchain-funcs java-pkg-opt-2
+
+IUSE=""
+
+# tex4ht-20050331_p2350 -> tex4ht-1.0.2005_03_31_2350
+MY_P="${PN}-1.0.${PV:0:4}_${PV:4:2}_${PV:6:2}_${PV/*_p/}"
+
+DESCRIPTION="Converts (La)TeX to (X)HTML, XML and OO.org"
+HOMEPAGE="http://www.cse.ohio-state.edu/~gurari/TeX4ht/
+	http://www.cse.ohio-state.edu/~gurari/TeX4ht/bugfixes.html"
+SRC_URI="http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/${MY_P}.tar.gz"
+
+LICENSE="LPPL-1.2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+SLOT="0"
+
+DEPEND=">=sys-apps/sed-4
+	java? ( >=virtual/jdk-1.5 )"
+
+RDEPEND="virtual/ghostscript
+	media-gfx/imagemagick
+	java? ( >=virtual/jre-1.5 )"
+
+IUSE="java"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}/texmf/tex4ht/base/unix"
+	sed -i -e \
+	's#~/tex4ht.dir#/usr/share#' tex4ht.env || die
+	sed -i -e \
+	's#tpath/tex/texmf/fonts/tfm/!#t/usr/share/texmf/fonts/tfm/!\nt/usr/local/share/texmf/fonts/tfm/!\nt/var/cache/fonts/tfm/!#' tex4ht.env || die
+	sed -i -e \
+	's#%%~/texmf-dist#/usr/share/texmf#g' tex4ht.env || die
+
+	einfo "Removing precompiled java stuff"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -print -delete
+}
+
+src_compile() {
+	cd "${S}/src/"
+	einfo "Compiling postprocessor sources..."
+	for f in tex4ht t4ht htcmd ; do
+		$(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o $f $f.c \
+			-DENVFILE='"/usr/share/texmf/tex4ht/base/tex4ht.env"' \
+			-DHAVE_DIRENT_H -DKPATHSEA -lkpathsea \
+			|| die "Compiling $f failed"
+	done
+	if use java; then
+		einfo "Compiling java files..."
+		cd java
+		ejavac *.java */*.java */*/*.java -d ../../texmf/tex4ht/bin
+		cd "${S}/texmf/tex4ht/bin"
+		# Create the jar needed by oolatex
+		jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
+	fi
+}
+
+src_install () {
+	# install the binaries
+	dobin "${S}/src/tex4ht" "${S}/src/t4ht" "${S}/src/htcmd"
+	# install the scripts
+	if ! use java; then
+		rm -f "${S}"/bin/unix/oo*
+		rm -f "${S}"/bin/unix/jh*
+	fi
+	dobin "${S}"/bin/unix/mk4ht || die
+
+	# install the .4ht scripts
+	insinto /usr/share/texmf/tex/generic/tex4ht
+	doins "${S}"/texmf/tex/generic/tex4ht/* || die
+
+	# install the special htf fonts
+	insinto /usr/share/texmf/tex4ht
+	doins -r "${S}/texmf/tex4ht/ht-fonts" || die
+
+	if use java; then
+		# install the java files
+		doins -r "${S}/texmf/tex4ht/bin"
+		java-pkg_jarinto /usr/share/texmf/tex4ht/bin
+		java-pkg_dojar "${S}/${PN}.jar"
+	fi
+
+	# install the .4xt files
+	doins -r "${S}/texmf/tex4ht/xtpipes" || die
+
+	# install the env file
+	insinto /usr/share/texmf/tex4ht/base
+	newins "${S}/texmf/tex4ht/base/unix/tex4ht.env" tex4ht.env || die
+
+	if latex-package_has_tetex_3 ; then
+		insinto /etc/texmf/texmf.d
+		doins "${FILESDIR}/50tex4ht.cnf" || die
+	fi
+
+	insinto /usr/share/texmf/tex/generic/${PN}
+	insopts -m755
+	doins "${S}"/bin/ht/unix/* || die
+}
+
+pkg_postinst() {
+	use java ||	elog 'ODF converters (oolatex & friends) require the java use flag'
+	latex-package_pkg_postinst
+	elog "In order to avoid collisions with multiple packages"
+	elog "We are not installing the scripts in /usr/bin anymore"
+	elog "If you want to use, say, htlatex, you can use 'mk4ht htlatex file'"
+}