version bump, fixing bug #236369

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.3 x86_64

3 files changed, 126 insertions, 5 deletions

diff --git a/dev-tex/tex4ht/ChangeLog b/dev-tex/tex4ht/ChangeLog
index 364fc5c60a70..c7f013f0b46d 100644
--- a/dev-tex/tex4ht/ChangeLog
+++ b/dev-tex/tex4ht/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tex/tex4ht
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/tex4ht/ChangeLog,v 1.31 2008/09/01 06:54:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/tex4ht/ChangeLog,v 1.32 2008/09/03 06:09:28 aballier Exp $
+
+*tex4ht-20080902_p1753 (03 Sep 2008)
+
+  03 Sep 2008; Alexis Ballier <aballier@gentoo.org>
+  +tex4ht-20080902_p1753.ebuild:
+  version bump, fixing bug #236369
 
 *tex4ht-20080829_p0203 (01 Sep 2008)
 
diff --git a/dev-tex/tex4ht/Manifest b/dev-tex/tex4ht/Manifest
index 8398c3d7b57a..20364899e96a 100644
--- a/dev-tex/tex4ht/Manifest
+++ b/dev-tex/tex4ht/Manifest
@@ -5,15 +5,17 @@ AUX 50tex4ht.cnf 192 RMD160 5b1858ef986eee4d9cc353e2147bee99938d7529 SHA1 6e7e56
 DIST tex4ht-1.0.2007_10_24_0140.tar.gz 1946502 RMD160 3a6b35425c33c4430ab2ac344544bceb91ed7a9f SHA1 e4d2268aef585332b691ab14dfbda8c557610ac5 SHA256 e71b45195dc66d261b26ceb44a88890d4e87bdbebeaa0ca1f1ec10d55e4d0a44
 DIST tex4ht-1.0.2008_08_07_1635.tar.gz 2466688 RMD160 00abfd8c615bf1bb20b2fd342652da101133620c SHA1 f90708fa0f3312f4cc9836a169babb525334a853 SHA256 049304574cc8da234eced1396ea4f27abd3e2ff6067070618db855268fa4c182
 DIST tex4ht-1.0.2008_08_29_0203.tar.gz 2501082 RMD160 7534924789dade3f1943bd7cffe7c17514fd2b46 SHA1 6346a37bb772f277ffa885adde21a48ba318c7f9 SHA256 36e26048a41bae2ecb508451f856463db98f1b254752141348b2007601889ac0
+DIST tex4ht-1.0.2008_09_02_1753.tar.gz 2501246 RMD160 4cf4dd38c267cbc7f9b52781f3da4874245dcd40 SHA1 65b2d6986e4c135c4f676ce83c4868dde1b47efb SHA256 dd6cbde0ba9b4e395d8c0c32f35b2e81042ffa365352b112363f143b81d510eb
 EBUILD tex4ht-20071024_p0140.ebuild 3283 RMD160 67d5e810196ac27179ff573ccf1985bd8a47b5dd SHA1 bd8f73410997c65a52eea188fc255ca8c4994d25 SHA256 acc9d8e1b22b048872de4060f0f35534402d4dd70f418896d98960ebfe32ba15
 EBUILD tex4ht-20080807_p1635.ebuild 3352 RMD160 ba62e7f3f8936e94c1307ed0d884c9f4080a82fb SHA1 55cb27dd5bb28c1438114e6a0ad35e90dad995fa SHA256 db63f7dda4aaf50f41e6feebf2769d78807621aae207822bba65eda416c20c8c
 EBUILD tex4ht-20080829_p0203.ebuild 3352 RMD160 6953d6fe9a37adca7a2e5d51f7ff1e92f40d3b05 SHA1 e829757f56352d27bc0ba16b2089d16cdfe7a92f SHA256 c1a7f278b76720c78a6c2a58fdaa099deccafe3818e1afad7fd647278a578caa
-MISC ChangeLog 4819 RMD160 17d28ba1bd30f04d7bd83c658901bf1bfece6692 SHA1 33ca5fe6b5c28f087a757f793412fddfd5c21a06 SHA256 5f653fc9692b291339865bec879efdc10a0f14e262bdc127bef65f1d734c122a
+EBUILD tex4ht-20080902_p1753.ebuild 3352 RMD160 f0eff8af54a205e67bab180b8bb033a732100c75 SHA1 d1b39d9437b7ff9b127a49b95eaeeea423e23eba SHA256 984d2a5b159d7bd6c88a962084b6094f68bdc31fe6888f78c1e3eb316fd6f385
+MISC ChangeLog 4978 RMD160 6a1b63937960dd46928de9ff81f536cc83353461 SHA1 ae4f1c175e3f1911cd1b937cbf8bb6b5902487d7 SHA256 484be89d3e99ed3daf74023d804bb813abc6e1d06e84fdfb9d262aec8e40bd3b
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAki7kcMACgkQvFcC4BYPU0r03ACdGfxzc96sXrNgugZhCwS0adwF
-t/MAn0EI09bOoTTNg17Ilggatx1L59ha
-=GxqY
+iEYEARECAAYFAki+Kh8ACgkQvFcC4BYPU0od9gCfQDn/nas6TcckaovaouGXWixZ
+P9MAoMzt0xEfr48en97KRZvFRWIK+ZnS
+=jKEr
 -----END PGP SIGNATURE-----
diff --git a/dev-tex/tex4ht/tex4ht-20080902_p1753.ebuild b/dev-tex/tex4ht/tex4ht-20080902_p1753.ebuild
new file mode 100644
index 000000000000..0dc0c30b3639
--- /dev/null
+++ b/dev-tex/tex4ht/tex4ht-20080902_p1753.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/tex4ht/tex4ht-20080902_p1753.ebuild,v 1.1 2008/09/03 06:09:28 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 ~hppa ~ia64 ~ppc ~ppc64 ~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
+
+	# Rename ht script to avoid collisions with app-editors/hteditor
+	# Bug #197213
+	mv "${S}/bin/ht/unix/ht" "${S}/bin/ht/unix/ht.tex4ht" || die
+}
+
+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/ht/unix/* || die
+	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
+}
+
+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'"
+}