Revision bump with updated default config files so that we can search in global font cache even if VARTEXFONTS is overridden to tell it to write fonts somewhere else

Package-Manager: portage-2.1.5_rc10

3 files changed, 298 insertions, 2 deletions

diff --git a/app-text/texlive-core/ChangeLog b/app-text/texlive-core/ChangeLog
index 47fea4e6c0ec..29bff3c23052 100644
--- a/app-text/texlive-core/ChangeLog
+++ b/app-text/texlive-core/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/texlive-core
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/ChangeLog,v 1.59 2008/05/12 18:48:03 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/ChangeLog,v 1.60 2008/05/13 21:23:32 aballier Exp $
+
+*texlive-core-2007-r13 (13 May 2008)
+
+  13 May 2008; Alexis Ballier <aballier@gentoo.org>
+  +texlive-core-2007-r13.ebuild:
+  Revision bump with updated default config files so that we can search in
+  global font cache even if VARTEXFONTS is overridden to tell it to write
+  fonts somewhere else
 
   12 May 2008; nixnut <nixnut@gentoo.org> texlive-core-2007-r12.ebuild:
   Stable on ppc wrt bug 220651
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index f605d8a79f70..5aeb3552f688 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX texmf-update 2753 RMD160 3324cd39e2773784b27fd8d04bbb00d927556aa1 SHA1 4138004647d7b875c88628bf85546bea0eb13c5c SHA256 da1aa3dda03a6a26049e7cf581709c1ad3d4a99763511139d633199e9d3e8575
 DIST texlive-core-2007-texmf.d-1.tar.bz2 9517 RMD160 7ba4cc2800151ad56b3553fe30dbe893a9a71f68 SHA1 634f63b7c3acd561e8cf3c258aa75a23d32c5b75 SHA256 0dac69a452a2e333684be762f9ea146fb81eec33912f2ea3ccc9b981bfe46090
+DIST texlive-core-2007-texmf.d-2.tar.bz2 9595 RMD160 b047ac85c935e6e01a2f4b985a9492d094d5fd4a SHA1 e358e98fbc337b5e4c0a20f0611c3fd6fdc5ef40 SHA256 442b29264edfcf9ff1a09458699e2815fa57ebe8bedacfecedb4fa7fa86cbed7
 DIST texlive-core-2007-updated-config.ps.bz2 2981 RMD160 af88bbda9227e718ebf69d007f424c8b985a0404 SHA1 56bbeba1c9566437ffbe138089bc5965d79dc312 SHA256 ff12f1f6a68e45ad8d8f960f5fe76aae159d64074507a4a650973e1e865c8acd
 DIST texlive-core-2007.tar.bz2 31078286 RMD160 496cb3fa3c5cd9b2ea5da3b0bced67a2b5afe7b9 SHA1 37286f7b962c18ec5234071a8d2dde1499d9ab71 SHA256 96c12147ea9717539553eb6b3be52c2df6163ca617dccc71282ccd39c2e5773b
 DIST texlive-core-patches-6.tar.bz2 20901 RMD160 70b78099143b942dd0d15ea41ede670f593f5357 SHA1 b018ae257b6b93ebd063f559fac1c3a996511952 SHA256 e9cbfe038874ef55facb276c6625c9e2d0859e4d1f63b52a657ed2e3b5649959
@@ -50,5 +54,13 @@ DIST texlive-module-lib-zlib-2007.zip 1221 RMD160 c2dc6572cd09ef2494a8b299334b90
 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-r12.ebuild 8234 RMD160 2dabfd8cabaf3ae1f4c8fddd18e1407b12e898fe SHA1 a3627cb262d0779ad9d0e52cf634cd0fc1b0116f SHA256 eb6bb17c9444d40d34a71d20f4fe081b29b4de3e6ffeaca7d2f646be86681a4b
-MISC ChangeLog 11009 RMD160 067f0e247a1bc1899d06bde8f9a4a61aad96bb03 SHA1 27dfd98ec8426457f6b28c22d192364857d46fec SHA256 ad06d646776e0173ef61dc5d0e3ebdb640e097bdb0ac55f7109c8ccd26ca4ef4
+EBUILD texlive-core-2007-r13.ebuild 8243 RMD160 13cc221a2c234560ce86682b67fd08779afb390d SHA1 8930d257e7eb59f5724e71e976455d8147c9f1e2 SHA256 64df3110dc8933cd3658f39667b87a5a75c74dfd651a83dd69876a4d8cc3ad15
+MISC ChangeLog 11307 RMD160 5570ab15ea5c03b4ba6f62b101a9eae8b954b763 SHA1 2961ae5457053d1b9aeac45354b3613070f42a93 SHA256 a118dba7a853f4adb1088fa54825999a9859c7491a60430377607e21374097be
 MISC metadata.xml 327 RMD160 10186cf048d44753bf4cec722eed45d2ade12316 SHA1 0254321c012da0e8f80aec6f29a0fb5b17675d4d SHA256 e520223493249c261b48f7f7460ed7c262d35383484e730cfefba51fde1195be
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgqBugACgkQvFcC4BYPU0oNIACdFcuyu3arHT2YXEjjC8gUH/9a
+E1MAn2mM8yXN/4DzwGM0+VOPpKbZuOJC
+=w8s6
+-----END PGP SIGNATURE-----
diff --git a/app-text/texlive-core/texlive-core-2007-r13.ebuild b/app-text/texlive-core/texlive-core-2007-r13.ebuild
new file mode 100644
index 000000000000..362aca0e93ff
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2007-r13.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2008 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-r13.ebuild,v 1.1 2008/05/13 21:23:32 aballier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs libtool autotools texlive-common
+
+PATCHLEVEL="6"
+TEXMFD_VERSION="2"
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="http://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c"
+
+TEXLIVE_BASICBIN_CONTENTS="bin-bibtex bin-dvipsk bin-etex bin-getnonfreefonts bin-gsftopk bin-kpathsea bin-makeindex bin-metafont bin-mfware bin-pdftex bin-tetex bin-tex bin-texconfig lib-regex lib-zlib"
+
+TEXLIVE_BINEXTRA_CONTENTS="bin-bibtex8 bin-chktex bin-ctie bin-cweb bin-dtl bin-dvi2tty bin-dvicopy bin-dvidvi bin-dviljk bin-lacheck bin-patgen bin-pdftools bin-seetexk bin-texdoc bin-texware bin-thumbpdf bin-tie bin-tpic2pdftex bin-vpe bin-web bin-xpdf cweb mkind-english"
+
+TEXLIVE_FONTBIN_CONTENTS="bin-afm2pl bin-fontware bin-ps2pkm fontinst mft"
+
+TEXLIVE_CORE_EXTRA_BUILT_BINARIES="bin-xetex bin-aleph bin-omega"
+
+TEXLIVE_CORE_INCLUDED_TEXMF="${TEXLIVE_BASICBIN_CONTENTS} ${TEXLIVE_FONTBIN_CONTENTS} ${TEXLIVE_BINEXTRA_CONTENTS} ${TEXLIVE_CORE_EXTRA_BUILT_BINARIES}"
+
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+for i in ${TEXLIVE_CORE_INCLUDED_TEXMF}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.zip"
+done
+
+# Ship an updated config.ps, see bug #195815 comment 51
+# Or alternatively: http://tug.org/texlive/bugs.html
+SRC_URI="${SRC_URI} mirror://gentoo/${P}-updated-config.ps.bz2"
+
+# Fetch patches
+SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2
+	mirror://gentoo/${P}-texmf.d-${TEXMFD_VERSION}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="X doc"
+
+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
+	)"
+
+RDEPEND="${MODULAR_X_DEPEND}
+	!app-text/ptex
+	!app-text/tetex
+	!<app-text/texlive-2007
+	!app-text/xetex
+	!dev-tex/xmltex
+	!dev-tex/vntex
+	sys-libs/zlib
+	>=media-libs/libpng-1.2.1
+	=media-libs/freetype-2*
+	media-libs/fontconfig"
+
+DEPEND="${RDEPEND}
+	sys-apps/ed
+	sys-devel/flex
+	app-arch/unzip"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+	sed -i -e "/mktexlsr/,+3d" -e "s/\(updmap-sys\)/\1 --nohash/" \
+		Makefile.in || die "sed failed"
+
+	elibtoolize
+
+	cd libs/teckit
+	eautoreconf
+
+# Ship an updated config.ps, see bug #195815 comment 51
+# Or alternatively: http://tug.org/texlive/bugs.html
+	cp -f "${WORKDIR}/${P}-updated-config.ps" "${S}/texmf/dvips/config/config.ps"
+}
+
+src_compile() {
+	local my_conf
+
+	export LC_ALL=C
+	tc-export CC CXX
+
+	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 \
+		--without-xdvipdfmx \
+		--without-lcdf-typetools \
+		--without-pdfopen \
+		--without-ps2eps \
+		--without-detex \
+		--without-ttf2pk \
+		--without-tex4htk \
+		--without-cjkutils \
+		--without-xdvik --without-oxdvik \
+		--enable-shared \
+		$(use_with X x) \
+		${my_conf} || die "econf failed"
+
+	cd "${S}/libs/icu-xetex"
+	emake -j1 texmf=${TEXMF_PATH:-/usr/share/texmf} || die "emake of icu-xetex failed"
+	cd "${S}"
+	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
+
+	dodir ${TEXMF_PATH:-/usr/share/texmf}/web2c
+	einstall bindir="${D}/usr/bin" texmf="${D}${TEXMF_PATH:-/usr/share/texmf}" || die "einstall failed"
+
+	dosbin "${FILESDIR}/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
+
+	docinto kpathesa
+	cd "${S}/texk/kpathsea"
+	dodoc BUGS ChangeLog NEWS PROJECTS README
+
+	docinto dviljk
+	cd "${S}/texk/dviljk"
+	dodoc ChangeLog README NEWS
+
+	docinto dvipsk
+	cd "${S}/texk/dvipsk"
+	dodoc ChangeLog README
+
+	docinto makeindexk
+	cd "${S}/texk/makeindexk"
+	dodoc ChangeLog NEWS NOTES README
+
+	docinto ps2pkm
+	cd "${S}/texk/ps2pkm"
+	dodoc ChangeLog README README.14m
+
+	docinto web2c
+	cd "${S}/texk/web2c"
+	dodoc ChangeLog NEWS PROJECTS README
+
+	use doc || rm -rf "${D}/usr/share/texmf/doc"
+	use doc || rm -rf "${D}/usr/share/texmf-dist/doc"
+
+	dodir /var/cache/fonts
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c"' > "${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}
+
+	# 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 "${WORKDIR}/texmf.d/"*.cnf
+
+	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
+}
+
+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
+}