Add upstream fix for bibtex crash, bug #264598

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

3 files changed, 349 insertions, 5 deletions

diff --git a/app-text/texlive-core/ChangeLog b/app-text/texlive-core/ChangeLog
index 529cc2a2bb3c..4cb869f5b995 100644
--- a/app-text/texlive-core/ChangeLog
+++ b/app-text/texlive-core/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/texlive-core
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/ChangeLog,v 1.109 2009/08/19 08:09:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/ChangeLog,v 1.110 2009/08/27 07:48:19 aballier Exp $
+
+*texlive-core-2008-r7 (27 Aug 2009)
+
+  27 Aug 2009; Alexis Ballier <aballier@gentoo.org>
+  +texlive-core-2008-r7.ebuild:
+  Add upstream fix for bibtex crash, bug #264598
 
   19 Aug 2009; Alexis Ballier <aballier@gentoo.org>
   texlive-core-2008-r5.ebuild, texlive-core-2008-r6.ebuild:
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 0b0b6d11d91f..4d9f093eb9f4 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -6,6 +6,7 @@ DIST texlive-core-2008-texmf.d-1.tar.lzma 9521 RMD160 df138c1f9cafa9f158bbf07c69
 DIST texlive-core-2008.tar.lzma 23175835 RMD160 629784b111c0d4bc9fac9f9131f63203d6e1dd38 SHA1 730986c628bd658b5062face9e400f61203d6b8d SHA256 60cf277a60311756ea51ed7e6c50b50d4069f4b4c007b11c114ca5c640e5a3c2
 DIST texlive-core-patches-13.tar.lzma 30047 RMD160 dbea99e6cee194ee58a9f68cb3d4ae551b325124 SHA1 f0a9fc2dcd19e5ff6199b37b554f59826427866b SHA256 887548874a5ef736576973f940068254b608357db48ef7570643f4dd6e2cf6b4
 DIST texlive-core-patches-14.tar.lzma 30229 RMD160 fc36a621b208838e56efbb3f0acc74dd4da9863c SHA1 d1bdd604f11aa7365a54c4ff7a7661be50f5761d SHA256 9949aa209b0911c5857946b834f1f77e4703a1a81622235670f61a7b89c47fc2
+DIST texlive-core-patches-15.tar.lzma 30872 RMD160 2e66f1a05432f447835e1dec95cddb830619c704 SHA1 48567742c5cc550d3282a11112948cb35b71bdf3 SHA256 7bc693d923a8f291bffea695df3d4945b692d1f8b71340048529b96acaafa9e1
 DIST texlive-module-a2ping-2008.tar.lzma 31077 RMD160 d9a156c3e063831bc66fe3bf444903e7a5344d03 SHA1 2c7cbfb771fcb6f3b522fe7879de6904b34bb602 SHA256 e69a466b698a3c08fbb0cd7e8edf3d591d4d50d81b1a213e0d614aff78c77697
 DIST texlive-module-a2ping.doc-2008.tar.lzma 17451 RMD160 09ab10c94617e5e52f06b45f159a187cdc542f05 SHA1 c0686da95317a2e1bd3dc78dba72ff825e7282cf SHA256 75eb1e8bddc5dcf2e08271a7a038332087103f99b21f5802378f0da28c6e19d7
 DIST texlive-module-bin-afm2pl-2008.tar.lzma 9559 RMD160 bc07ab11c6aefbd45c88dd305e81064f70880e80 SHA1 a9f1734314f4f0b4d6acdaa2e51de2d40d1bdfb4 SHA256 46d4b8000a940514bf246728b57d59c54065cbd6f85498aa5835b1532b30f6e8
@@ -94,12 +95,13 @@ DIST texlive-module-texlive.infra-2008.tar.lzma 105129 RMD160 9de08b79d943f830ce
 DIST texlive-module-texlive.infra.doc-2008.tar.lzma 743421 RMD160 7e7c0f5a0205306f2a4cd02d20306775cba1b5ff SHA1 c4ab6ac0f09572203b268db9318053c34cb36bed SHA256 334cc5ad29d289daee2e638005300cd6b67231f902804276e047b259cca37a7c
 EBUILD texlive-core-2008-r5.ebuild 11561 RMD160 d82e4bb2efa924e6d39ca5448a73da64186ac746 SHA1 6e78255cae50ffcb8c564437495ead7dbd20aa1f SHA256 13a9bdf01d2ed2e6f20860328afe647ba8ece799008834f3745e21cccfc73d2b
 EBUILD texlive-core-2008-r6.ebuild 11571 RMD160 4eae0674a9e1cbf30c2fe3953740a3611bcfc6f2 SHA1 e506d44f36ee057b349d78ad7002ee6e250a6702 SHA256 c9b5deb14a38ffa0c40fd4022a202065d3e1e0dc996b64bca04faa7b398e8ff8
-MISC ChangeLog 18467 RMD160 0f8c1db4c6eb271c044d33ba80ad45f6e4e1c265 SHA1 d8e8f9b10c6e1952dd067a6313a2add8c585073c SHA256 0b07e97c695dd51a6de8efd77aa52be7195e6ed31ac9418d213773211fd70ab1
+EBUILD texlive-core-2008-r7.ebuild 11571 RMD160 859c1ff48730d2b71b1effed2bbcad0f4740b246 SHA1 854bcbd2cb933bf77f101c3235da873f394f8de1 SHA256 6b29a042e4e5cff614304e8b712bfbcb175a663a81b13601910bff93d77e4e58
+MISC ChangeLog 18638 RMD160 8ae4ca76c87bf56f62d6d94849b877a49cb16515 SHA1 580df585dac80f20174fe354b7600965b14df9ed SHA256 8cedd0e2d62d3b5b97046c7538fcfdd770e1e2699d712487f5b16087c25b5815
 MISC metadata.xml 327 RMD160 10186cf048d44753bf4cec722eed45d2ade12316 SHA1 0254321c012da0e8f80aec6f29a0fb5b17675d4d SHA256 e520223493249c261b48f7f7460ed7c262d35383484e730cfefba51fde1195be
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqLszcACgkQvFcC4BYPU0rxoACeKiQ0bMKrF5LqOldX4wu0ednJ
-PtUAnA1T+/6yDJOM7pGgwQQshMNz3GX0
-=1oiF
+iEYEARECAAYFAkqWOkkACgkQvFcC4BYPU0q5WwCgpoUX4WOCuZrfFgOHRMPtYGJU
+zvAAoIdaVTWFibDdDqnCc4NdTK4jNNZF
+=+2Y/
 -----END PGP SIGNATURE-----
diff --git a/app-text/texlive-core/texlive-core-2008-r7.ebuild b/app-text/texlive-core/texlive-core-2008-r7.ebuild
new file mode 100644
index 000000000000..c0d9fe19c641
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2008-r7.ebuild
@@ -0,0 +1,336 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2008-r7.ebuild,v 1.1 2009/08/27 07:48:19 aballier Exp $
+
+EAPI=1
+
+inherit eutils flag-o-matic toolchain-funcs libtool autotools texlive-common
+
+PATCHLEVEL="15"
+TEXMFD_VERSION="1"
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="http://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c"
+
+TEXLIVE_BASICBIN_CONTENTS="bin-bibtex bin-dialog bin-dvipdfmx bin-dvipsk bin-getnonfreefonts bin-gsftopk bin-kpathsea bin-makeindex bin-mfware bin-tetex bin-texlive bin-texconfig dvipdfmx-def glyphlist texlive.infra collection-basicbin"
+TEXLIVE_BASICBIN_DOC_CONTENTS="bin-bibtex.doc bin-dialog.doc bin-dvipsk.doc bin-getnonfreefonts.doc bin-gsftopk.doc bin-kpathsea.doc bin-makeindex.doc bin-mfware.doc bin-tetex.doc bin-texlive.doc bin-texconfig.doc texlive.infra.doc"
+
+TEXLIVE_FONTBIN_CONTENTS="fontinst mft bin-afm2pl bin-fontware bin-ps2pkm collection-fontbin"
+TEXLIVE_FONTBIN_DOC_CONTENTS="fontinst.doc bin-afm2pl.doc bin-fontware.doc"
+TEXLIVE_FONTBIN_SRC_CONTENTS="fontinst.source"
+
+TEXLIVE_BINEXTRA_CONTENTS="a2ping bin-bibtex8 bin-ctie bin-cweb bin-dtl bin-dvicopy bin-dvidvi bin-dviljk bin-dvipos bin-lacheck bin-patgen bin-pdftools bin-seetexk bin-texdoc bin-texware bin-tie bin-tpic2pdftex bin-web cweb dviasm hyphenex mkind-english mkjobtexmf pdfcrop synctex texcount collection-binextra"
+TEXLIVE_BINEXTRA_DOC_CONTENTS="a2ping.doc bin-bibtex8.doc bin-ctie.doc bin-cweb.doc bin-dvicopy.doc bin-dviljk.doc bin-dvipos.doc bin-patgen.doc bin-pdftools.doc bin-texdoc.doc bin-texware.doc bin-tie.doc bin-tpic2pdftex.doc bin-web.doc cweb.doc mkjobtexmf.doc pdfcrop.doc synctex.doc texcount.doc"
+TEXLIVE_BINEXTRA_SRC_CONTENTS="hyphenex.source mkjobtexmf.source"
+
+TEXLIVE_CORE_INCLUDED_TEXMF="${TEXLIVE_BASICBIN_CONTENTS} ${TEXLIVE_FONTBIN_CONTENTS} ${TEXLIVE_BINEXTRA_CONTENTS}"
+TEXLIVE_CORE_INCLUDED_DOC_TEXMF="${TEXLIVE_BASICBIN_DOC_CONTENTS} ${TEXLIVE_FONTBIN_DOC_CONTENTS} ${TEXLIVE_BINEXTRA_DOC_CONTENTS}"
+TEXLIVE_CORE_INCLUDED_SRC_TEXMF="${TEXLIVE_FONTBIN_SRC_CONTENTS} ${TEXLIVE_BINEXTRA_SRC_CONTENTS}"
+
+SRC_URI="mirror://gentoo/${P}.tar.lzma"
+
+for i in ${TEXLIVE_CORE_INCLUDED_TEXMF}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.lzma"
+done
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${TEXLIVE_CORE_INCLUDED_DOC_TEXMF}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.lzma"
+done
+SRC_URI="${SRC_URI} )"
+SRC_URI="${SRC_URI} source? ( "
+for i in ${TEXLIVE_CORE_INCLUDED_SRC_TEXMF}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.lzma"
+done
+SRC_URI="${SRC_URI} )"
+
+# Fetch patches
+SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.lzma
+	mirror://gentoo/${PN}-2008-texmf.d-${TEXMFD_VERSION}.tar.lzma"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="X doc source tk"
+
+MODULAR_X_DEPEND="X? (
+				x11-libs/libXmu
+				x11-libs/libXp
+				x11-libs/libXpm
+				x11-libs/libICE
+				x11-libs/libSM
+				x11-libs/libXaw
+				x11-libs/libXfont
+	)"
+
+COMMON_DEPEND="${MODULAR_X_DEPEND}
+	!app-text/ptex
+	!app-text/tetex
+	!<app-text/texlive-2007
+	!app-text/xetex
+	!=dev-texlive/texlive-basic-2007*
+	!app-text/xdvipdfmx
+	!app-text/dvibook
+	sys-libs/zlib
+	>=media-libs/libpng-1.2.1
+	media-libs/freetype:2
+	media-libs/fontconfig"
+
+DEPEND="${COMMON_DEPEND}
+	sys-apps/ed
+	sys-devel/flex
+	|| ( app-arch/xz-utils app-arch/lzma-utils )"
+
+RDEPEND="${COMMON_DEPEND}
+	tk? ( dev-perl/perl-tk )"
+
+# texdoc needs luatex.
+PDEPEND="dev-tex/luatex"
+
+S="${WORKDIR}/texlive-20080816-source"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	mv "${WORKDIR}"/texmf* "${S}" || die "failed to move texmf files"
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+	elibtoolize
+
+	cd libs/teckit
+	AT_M4DIR="." eautoreconf
+}
+
+src_compile() {
+	# Too many regexps use A-Z a-z constructs, what causes problems with locales
+	# that don't have the same alphabetical order than ascii. Bug #242430
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+	tc-export CC CXX AR
+	econf \
+		--bindir=/usr/bin \
+		--datadir="${S}" \
+		--with-system-freetype2 \
+		--with-freetype2-include=/usr/include \
+		--with-system-zlib \
+		--with-system-pnglib \
+		--without-texinfo \
+		--without-dialog \
+		--without-texi2html \
+		--disable-multiplatform \
+		--with-epsfwin \
+		--with-mftalkwin \
+		--with-regiswin \
+		--with-tektronixwin \
+		--with-unitermwin \
+		--with-ps=gs \
+		--without-psutils \
+		--without-sam2p \
+		--without-t1utils \
+		--enable-ipc \
+		--without-etex \
+		--with-xetex \
+		--without-dvipng \
+		--without-dvipdfm \
+		--without-dvipdfmx \
+		--with-xdvipdfmx \
+		--without-lcdf-typetools \
+		--without-pdfopen \
+		--without-ps2eps \
+		--without-detex \
+		--without-ttf2pk \
+		--without-tex4htk \
+		--without-cjkutils \
+		--without-xdvik --without-oxdvik \
+		--without-xindy \
+		--without-luatex \
+		--without-dvi2tty \
+		--without-vlna \
+		--disable-largefile \
+		--enable-shared \
+		$(use_with X x) \
+
+	emake texmf=${TEXMF_PATH:-/usr/share/texmf} || die "emake failed"
+
+	# Mimic updmap --syncwithtrees to enable only fonts installed
+	# Code copied from updmap script
+	for i in `egrep '^(Mixed)?Map' "texmf/web2c/updmap.cfg" | sed 's@.* @@'`; do
+		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
+	done > "${T}/updmap_update"
+	{
+		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+	} > "${T}/updmap_update2"
+	sed -f "${T}/updmap_update2" "texmf/web2c/updmap.cfg" >	"${T}/updmap_update3"\
+		&& cat "${T}/updmap_update3" > "texmf/web2c/updmap.cfg"
+}
+
+src_test() {
+	ewarn "Due to modular layout of texlive ebuilds,"
+	ewarn "It would not make much sense to use tests into the ebuild"
+	ewarn "And tests would fail anyway"
+	ewarn "Alternatively you can try to compile any tex file"
+	ewarn "Tex warnings should be considered as errors and reported"
+	ewarn "You can also run fmtutil-sys --all and check for errors/warnings there"
+}
+
+src_install() {
+	insinto /usr/share
+	doins -r texmf texmf-dist || die "failed to install texmf trees"
+	if use source ; then
+		doins -r "${WORKDIR}"/tlpkg || die "failed to install tlpkg files"
+	fi
+
+	dodir ${TEXMF_PATH:-/usr/share/texmf}/web2c
+	einstall bindir="${D}/usr/bin" texmf="${D}${TEXMF_PATH:-/usr/share/texmf}" run_texlinks="true" run_mktexlsr="true" || die "einstall failed"
+
+	newsbin "${FILESDIR}/texmf-update2008" texmf-update
+
+	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
+	# exist. Instead, it is called mf, so we symlink it to please everything.
+	use X || dosym mf /usr/bin/mf-nowin
+
+	docinto texk
+	cd "${S}/texk"
+	dodoc ChangeLog README || die "failed to install texk docs"
+
+	docinto kpathsea
+	cd "${S}/texk/kpathsea"
+	dodoc BUGS ChangeLog NEWS PROJECTS README || die "failed to install kpathsea docs"
+
+	docinto dviljk
+	cd "${S}/texk/dviljk"
+	dodoc ChangeLog README NEWS || die "failed to install dviljk docs"
+
+	docinto dvipsk
+	cd "${S}/texk/dvipsk"
+	dodoc ChangeLog README || die "failed to install dvipsk docs"
+
+	docinto makeindexk
+	cd "${S}/texk/makeindexk"
+	dodoc ChangeLog NEWS NOTES README || die "failed to install makeindexk docs"
+
+	docinto ps2pkm
+	cd "${S}/texk/ps2pkm"
+	dodoc ChangeLog README README.14m || die "failed to install ps2pkm docs"
+
+	docinto web2c
+	cd "${S}/texk/web2c"
+	dodoc ChangeLog NEWS PROJECTS README || die "failed to install web2c docs"
+
+	use doc || rm -rf "${D}/usr/share/texmf/doc"
+	use doc || rm -rf "${D}/usr/share/texmf-dist/doc"
+
+	dodir /var/cache/fonts
+	# The default configuration expects it to be world writable, bug #266680
+	# People can still change it with texconfig though.
+	fperms 1777 /var/cache/fonts
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${D}/etc/env.d/98texlive"
+	# populate /etc/texmf
+	keepdir /etc/texmf/web2c
+
+	# take care of updmap.cfg, fmtutil.cnf and texmf.cnf
+	dodir /etc/texmf/{updmap.d,fmtutil.d,texmf.d,language.dat.d,language.def.d}
+
+	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+	# by texmf-update
+	rm -f "${D}${TEXMF_PATH}/web2c/fmtutil.cnf"
+
+	# Remove default texmf.cnf to ship our own, greatly based on texlive dvd's
+	# texmf.cnf
+	# It will also be generated from /etc/texmf/texmf.d files by texmf-update
+	rm -f "${D}${TEXMF_PATH}/web2c/texmf.cnf"
+
+	insinto /etc/texmf/texmf.d
+	doins "${S}/texmf.d/"*.cnf || die "failed to install texmf.d configuration files"
+
+	mv "${D}${TEXMF_PATH}/web2c/updmap.cfg"	"${D}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
+
+	# dvips config file
+	keepdir /etc/texmf/dvips/config
+	dodir /etc/texmf/dvips.d
+	mv "${D}${TEXMF_PATH}/dvips/config/config.ps" "${D}/etc/texmf/dvips.d/00${PN}-config.ps" || die "moving config.ps failed"
+
+	# Create symlinks from format to engines
+	# This will avoid having to call texlinks in texmf-update
+	cd "${S}"
+	for i in texmf/fmtutil/format*.cnf; do
+		[ -f "${i}" ] && etexlinks "${i}"
+	done
+
+	texlive-common_handle_config_files
+
+	keepdir /usr/share/texmf-site
+
+	dosym /etc/texmf/web2c/fmtutil.cnf ${TEXMF_PATH}/web2c/fmtutil.cnf
+	dosym /etc/texmf/web2c/texmf.cnf ${TEXMF_PATH}/web2c/texmf.cnf
+	dosym /etc/texmf/web2c/updmap.cfg ${TEXMF_PATH}/web2c/updmap.cfg
+	dosym /etc/texmf/dvips/config/config.ps ${TEXMF_PATH}/dvips/config/config.ps
+
+	# the virtex symlink is not installed
+	# The links has to be relative, since the targets
+	# is not present at this stage and MacOS doesn't
+	# like non-existing targets
+	dosym tex /usr/bin/virtex
+	dosym pdftex /usr/bin/pdfvirtex
+
+	# Keep it as that's where the formats will go
+	keepdir /var/lib/texmf
+
+	# Remove texdoctk if we don't want it
+	if ! use tk ; then
+		rm -f "${D}/usr/bin/texdoctk" "${D}/usr/share/texmf/scripts/tetex/texdoctk.pl" "${D}/usr/share/man/man1/texdoctk.1" || die "failed to remove texdoc tk!"
+	fi
+
+	# Rename mpost to leave room for mplib
+	mv "${D}/usr/bin/mpost" "${D}/usr/bin/mpost-${P}"
+	dosym "mpost-${P}" /usr/bin/mpost
+
+	# Ditto for pdftex
+	mv "${D}/usr/bin/pdftex" "${D}/usr/bin/pdftex-${P}"
+	dosym "pdftex-${P}" /usr/bin/pdftex
+}
+
+pkg_preinst() {
+	# Remove stray files to keep the upgrade path sane
+	if has_version =app-text/texlive-core-2007* ; then
+		for i in pdftex/pdflatex aleph/aleph aleph/lamed omega/lambda omega/omega xetex/xetex xetex/xelatex tex/tex pdftex/etex pdftex/pdftex pdftex/pdfetex ; do
+			for j in log fmt ; do
+				local file="${ROOT}/var/lib/texmf/web2c/${i}.${j}"
+				if [ -f "${file}" ] ; then
+					elog "Removing stray ${file} from TeXLive 2007 install."
+					rm -f "${file}"
+				fi
+			done
+		done
+		for j in base log ; do
+			local file="${ROOT}/var/lib/texmf/web2c/metafont/mf.${j}"
+			if [ -f "${file}" ] ; then
+				elog "Removing stray ${file} from TeXLive 2007 install."
+				rm -f "${file}"
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	if [ "$ROOT" = "/" ] ; then
+		/usr/sbin/texmf-update
+	fi
+
+	elog
+	elog "If you have configuration files in /etc/texmf to merge,"
+	elog "please update them and run /usr/sbin/texmf-update."
+	elog
+	ewarn "If you are migrating from an older TeX distribution"
+	ewarn "Please make sure you have read:"
+	ewarn "http://www.gentoo.org/proj/en/tex/texlive-migration-guide.xml"
+	ewarn "in order to avoid possible problems"
+	elog
+	elog "TeXLive has been split in various ebuilds. If you are missing a"
+	elog "package to process your TeX documents, you can install"
+	elog "dev-tex/texmfind to easily search for them."
+	elog
+}