version bump, bug #153028, thanks to Gerard Vermeulen for the ebuild and wltjr for the help with java

Package-Manager: portage-2.1.3.16

4 files changed, 140 insertions, 9 deletions

diff --git a/dev-tex/tex4ht/ChangeLog b/dev-tex/tex4ht/ChangeLog
index e697a72fc568..f666b3677132 100644
--- a/dev-tex/tex4ht/ChangeLog
+++ b/dev-tex/tex4ht/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-tex/tex4ht
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/tex4ht/ChangeLog,v 1.11 2007/03/13 08:00:20 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/tex4ht/ChangeLog,v 1.12 2007/10/30 17:51:23 aballier Exp $
+
+*tex4ht-20071024_p0140 (30 Oct 2007)
+
+  30 Oct 2007; Alexis Ballier <aballier@gentoo.org>
+  +tex4ht-20071024_p0140.ebuild:
+  version bump, bug #153028, thanks to Gerard Vermeulen for the ebuild and
+  wltjr for the help with java
 
   13 Mar 2007; Alexandre Buisse <nattfodd@gentoo.org> metadata.xml:
   Replaced text-markup by tex as maintaining herd (text-markup split).
diff --git a/dev-tex/tex4ht/Manifest b/dev-tex/tex4ht/Manifest
index 253f0af2f8e4..bb3337e6750c 100644
--- a/dev-tex/tex4ht/Manifest
+++ b/dev-tex/tex4ht/Manifest
@@ -7,6 +7,7 @@ RMD160 5b1858ef986eee4d9cc353e2147bee99938d7529 files/50tex4ht.cnf 192
 SHA256 5c9659aad7091b763e4a1363d78629a1ad8e1fe5ba679c151b95c69f4de9d9c1 files/50tex4ht.cnf 192
 DIST tex4ht-1.0.2005_04_06_1623.tar.gz 1137268 RMD160 0f3e1ffd66e50540cae0e849c6d640ab572e098c SHA1 2846f28b9f0f32ffddb0cd6f54adb48507f8bd40 SHA256 f9a493a6473f8208b1cbe831a18eb3718d758f2a98bc96eaf6d5c1dfc221ed1e
 DIST tex4ht-1.0.2005_07_01_1825.tar.gz 1502237 RMD160 f516c83ef7c890d936761fe2e3156d07da906cbc SHA1 5f144eb120115169151d556757c92d2b3ea4a06f SHA256 85fc61befef44f9de7c7e06d0abd9645471aff5c9d3519e6da153b5bbd51c402
+DIST tex4ht-1.0.2007_10_24_0140.tar.gz 1946502 RMD160 3a6b35425c33c4430ab2ac344544bceb91ed7a9f SHA1 e4d2268aef585332b691ab14dfbda8c557610ac5 SHA256 e71b45195dc66d261b26ceb44a88890d4e87bdbebeaa0ca1f1ec10d55e4d0a44
 EBUILD tex4ht-20050406_p1623-r1.ebuild 1959 RMD160 42e0cc72df5c30e2df0664857b1c7d6c6b56bd12 SHA1 169b31da3999b1044360c1ae734a6e7ed7581cb0 SHA256 2f09b2ff81ed60f4a971bd1ea17688cbc612e0e16ce7792ec89bc67416258775
 MD5 37173a889d7dbd5892e2dd7f3cda64f0 tex4ht-20050406_p1623-r1.ebuild 1959
 RMD160 42e0cc72df5c30e2df0664857b1c7d6c6b56bd12 tex4ht-20050406_p1623-r1.ebuild 1959
@@ -15,10 +16,14 @@ EBUILD tex4ht-20050701_p1825.ebuild 1949 RMD160 df9cd912def0be87400c82aa47fbd4ab
 MD5 0f7d7d091d7b613fd6d917eea9c93942 tex4ht-20050701_p1825.ebuild 1949
 RMD160 df9cd912def0be87400c82aa47fbd4ab444e5aae tex4ht-20050701_p1825.ebuild 1949
 SHA256 6057d63e541c3f3e5af9e03338344b0707df046e8363f57d229841d431bc0787 tex4ht-20050701_p1825.ebuild 1949
-MISC ChangeLog 2188 RMD160 f1a0f4a29f9413130830c9455de62e219a7db67a SHA1 37ca931c0d6681e45b7ce65ad4259e9620aadeae SHA256 ec9b0fd84d8ad3fbb55ee84d222524458cdfd9c536bef163bc56609b28079593
-MD5 f9024c834304142a3716224c4c2c6109 ChangeLog 2188
-RMD160 f1a0f4a29f9413130830c9455de62e219a7db67a ChangeLog 2188
-SHA256 ec9b0fd84d8ad3fbb55ee84d222524458cdfd9c536bef163bc56609b28079593 ChangeLog 2188
+EBUILD tex4ht-20071024_p0140.ebuild 3264 RMD160 ea02478e3544c553277f8eab7642af89e639c6b3 SHA1 8d08222ff8f2940500b4bc1fa239a7a11ef478d0 SHA256 1268fd207b3eebee3de29014204b4dd85ce3409674869ba37901f5d1ce125dc7
+MD5 617f1a607ed713dfe81c805e1afba1f9 tex4ht-20071024_p0140.ebuild 3264
+RMD160 ea02478e3544c553277f8eab7642af89e639c6b3 tex4ht-20071024_p0140.ebuild 3264
+SHA256 1268fd207b3eebee3de29014204b4dd85ce3409674869ba37901f5d1ce125dc7 tex4ht-20071024_p0140.ebuild 3264
+MISC ChangeLog 2418 RMD160 da66541668ae2108a3f36ee35cbe0f7ce22adde8 SHA1 50d5f5810512395ad9e5061e1970adce1f91c329 SHA256 7d990142f66625234b96de0db4dedb1770bdfbc24c76d13e40bdb19911384d1f
+MD5 943f71f2fdda8a3c4759052c0d1f5ef5 ChangeLog 2418
+RMD160 da66541668ae2108a3f36ee35cbe0f7ce22adde8 ChangeLog 2418
+SHA256 7d990142f66625234b96de0db4dedb1770bdfbc24c76d13e40bdb19911384d1f ChangeLog 2418
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
 MD5 504d11dd034a4ba8f06e8e7c633d13ba metadata.xml 156
 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 metadata.xml 156
@@ -29,10 +34,13 @@ SHA256 d3a2e2e775678cd765fb05b851954857ca863354b3928e311a593b8008ec2edc files/di
 MD5 d8bdd802181054cbf67cb39c52f5e0ac files/digest-tex4ht-20050701_p1825 283
 RMD160 e89089b7c6e03a328cc6c23ab405bc92ab73e249 files/digest-tex4ht-20050701_p1825 283
 SHA256 87e26bf248439faa6329944c65e5564aac59fff41e8d8c62259bc871d48b77d0 files/digest-tex4ht-20050701_p1825 283
+MD5 dc1bb5b84b6cfa25ab80c577047704ad files/digest-tex4ht-20071024_p0140 283
+RMD160 5e93287bf2bf19b88c572fc9b0a06dc1b1794c7a files/digest-tex4ht-20071024_p0140 283
+SHA256 a3e1eea90235b9228eca3680853e31b2d2aec9acbdf6bc6cdf3515c2610aec67 files/digest-tex4ht-20071024_p0140 283
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFF9lrxwx9vvAARv2sRAoPoAKDUJ264IZ/SBCjozz8rL1EQIlvCMgCeOKYS
-GdX+J7wxRYQq9er9XPwUYfM=
-=FPh3
+iD8DBQFHJ28mvFcC4BYPU0oRAg3CAKCZNJX67j1rGMa2Hl4uDL1FPStoCwCgpSPB
+gC9Q496CduwdkO+oTbONZlw=
+=97PJ
 -----END PGP SIGNATURE-----
diff --git a/dev-tex/tex4ht/files/digest-tex4ht-20071024_p0140 b/dev-tex/tex4ht/files/digest-tex4ht-20071024_p0140
new file mode 100644
index 000000000000..8dd6e52e5d68
--- /dev/null
+++ b/dev-tex/tex4ht/files/digest-tex4ht-20071024_p0140
@@ -0,0 +1,3 @@
+MD5 8ad8cd2f9e4ea92ce5a87ef7a80e91b9 tex4ht-1.0.2007_10_24_0140.tar.gz 1946502
+RMD160 3a6b35425c33c4430ab2ac344544bceb91ed7a9f tex4ht-1.0.2007_10_24_0140.tar.gz 1946502
+SHA256 e71b45195dc66d261b26ceb44a88890d4e87bdbebeaa0ca1f1ec10d55e4d0a44 tex4ht-1.0.2007_10_24_0140.tar.gz 1946502
diff --git a/dev-tex/tex4ht/tex4ht-20071024_p0140.ebuild b/dev-tex/tex4ht/tex4ht-20071024_p0140.ebuild
new file mode 100644
index 000000000000..b90a319b30f3
--- /dev/null
+++ b/dev-tex/tex4ht/tex4ht-20071024_p0140.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/tex4ht/tex4ht-20071024_p0140.ebuild,v 1.1 2007/10/30 17:51:23 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="~x86 ~sparc ~ppc ~amd64"
+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
+
+	# Rename ht script to avoid collisions with app-editors/hteditor
+	# Bug #197213
+	mv "${S}/bin/unix/ht" "${S}/bin/unix/ht.tex4ht"
+}
+
+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/*
+
+	# install the .4ht scripts
+	insinto /usr/share/texmf/tex/generic/tex4ht
+	doins "${S}"/texmf/tex/generic/tex4ht/*
+
+	# install the special htf fonts
+	insinto /usr/share/texmf/tex4ht
+	doins -r "${S}/texmf/tex4ht/ht-fonts"
+
+	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"
+	doins -r "${S}/texmf/tex4ht/xttl"
+
+	# install the env file
+	insinto /usr/share/texmf/tex4ht/base
+	newins "${S}/texmf/tex4ht/base/unix/tex4ht.env" tex4ht.env
+
+	if latex-package_has_tetex_3 ; then
+		insinto /etc/texmf/texmf.d
+		doins "${FILESDIR}/50tex4ht.cnf" || die
+	fi
+}
+
+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 app-editors/hteditor"
+	elog "The helper script 'ht' has been renamed to 'ht.tex4ht'"
+}