use system libpaper, part of bug #528214

Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 351 insertions, 5 deletions

diff --git a/app-text/texlive-core/ChangeLog b/app-text/texlive-core/ChangeLog
index a47badaf8548..4c4609aa3629 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/ChangeLog,v 1.216 2014/11/03 06:45:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/ChangeLog,v 1.217 2014/11/04 10:27:20 aballier Exp $
+
+*texlive-core-2014-r1 (04 Nov 2014)
+
+  04 Nov 2014; Alexis Ballier <aballier@gentoo.org>
+  +texlive-core-2014-r1.ebuild:
+  use system libpaper, part of bug #528214
 
 *texlive-core-2014 (03 Nov 2014)
 
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 935522daf928..4b846429505f 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -443,13 +443,14 @@ EBUILD texlive-core-2011-r7.ebuild 10581 SHA256 5e7508bc634fc97f5e7f1d55e07ba90f
 EBUILD texlive-core-2012-r1.ebuild 11179 SHA256 f53215ec4a23ad45e92af19b11a297e4e62a549c2fbf7862ea3aa8e5d77043ea SHA512 a72e74c4b9420797ae4b688899491f3e0d11b1268b3a06013de196cbe9463b1fbd549e080ab4a01e4c094fd36b42d6ac86deb833774f85f6f8901349adb2e9bb WHIRLPOOL 3cbac82ae6fe069af8fa38c46c020fccbdce90f333aa79025fb361e0d0c5ac45f412cd31b2fba548c600ad093f4b328f92ba6791c9689871541a7bba5f337be7
 EBUILD texlive-core-2012.ebuild 11140 SHA256 d0901aa92229f159fac7b9ebcecc12c7ffaf40114b7366cd7c53ad1ee9302410 SHA512 595bf082e0f55b061072ae6bdeffd90a512f971d4e2091a8689f09f3d028baa6d2e50ab5e0884e701872734185a28e2e3c10a5adeeb921b1f9049b128dcc237e WHIRLPOOL 30e44b26bf0ac4853d5e7dca61042a235c17c4afdf032d98faf457a5336ac3dd6ef39cc34cda4cad057683e461cb7003e2f74b97373d0902d1092b61941c8556
 EBUILD texlive-core-2013-r1.ebuild 11630 SHA256 6c0f1fd2ab68ca0b5cc1e99852d0c5d072ec75542bdc05fe5fad0e550881781d SHA512 e36652cbed625d8499b2feb034299a01e6fafc9ce2f269bffe53898550bcf95ce5258d2f5f60a865062c0db8f4a54300695ba4a6850104555635cd05d103dfb4 WHIRLPOOL 5d776018b3b3846a2f959e09f3979accf8327540a10b6354f8a169ba65e8b96294cb0bb03e69994b4ab56e16d32ed934cbf8619f283e99b835bd4e9f007f91f8
+EBUILD texlive-core-2014-r1.ebuild 11010 SHA256 f4dc0070805201d7100c7fd02af0866205de96d632a52fc0ead17c6f23ed55b5 SHA512 b6f50f664d6762e269b5cbf563de00ce419d55ba3652618045e1fa611e806f7747ea5b837d74cee156aca85c4b67a43340862227777a490a692b9dd2a5a192cf WHIRLPOOL 17f9a543ce5d0c5f3076ba78eff99e3b1d5d748e1c94d93d0bf9c39807af3589763622b1ef566dde4bf371e33fb9ca3d9e2cf97e06ddbf5fa7b0eabb5b63f9b2
 EBUILD texlive-core-2014.ebuild 10961 SHA256 114ee434dfae05bb8ceeb5c3f23ceaa9d8ea75222dfaa1454f3ec47b63db93ba SHA512 f9ec9b36b8d94ca498cfcc97fb2826e601e5defc00e601fdf53f4b07904e18d91435e51e2bd14cadc205bba0f94cd6702f6084f7d32a61627fb24890f152ac0e WHIRLPOOL b287b8db22418fb6b4df2bb508743f8d7901c50f6c36c84ab5e159d4caddf3182f33319c99991fc02fc94326d38cf0d41b3c223323f165030278863b6e71fa90
-MISC ChangeLog 34196 SHA256 92014d0972c39c08be9bf198e42f22a4b1f3a07ace291d3ac329f15e73b12881 SHA512 c080c0d36df9fc1649a93350a52f4230ea81711e9fbfbf249d3314f99e86d53051d09c38be3a824f739ad941c4c01e721838ea484f9bf6ab5ce3ef69f9bae74b WHIRLPOOL 9ad90b141a99e96389444b9495327a1e177599ca72244ad2f6f1ae2743d530d95d711c1318766161522a00a1d693fed0734fb0f401322b853683a85e07441911
+MISC ChangeLog 34361 SHA256 7f1855e1537c61765d3f051268d24afb70ad9f777201ed4d77caafe85e774ec0 SHA512 42d6cdded227ebfc1b9ee9876a96d71989221074298aa2e7bc91eb79316d70f00b25627b53a599853cf3103d769b79136c129f8cd882120b6b0c35a03b477e98 WHIRLPOOL cc165180a7a1245c587b946a51279cd3800b4600d8271692b1e01e41b5d763260538e223796a9e4dc9184b890a91ea3e3b053a61db6ac91653092e1c32752a3e
 MISC metadata.xml 448 SHA256 ddaca86e81c2eaf01ff5e7d613777a6c2231ed0f09646cb303e23b0e90c08d02 SHA512 c414f498afa7c6effabb5c21f85c1fca64271e9d8a429e15e86661c8b7f12adac0beb6b90c74a7309cfe9d20e639c818dc2a2045b4c315c0924583f0e71dca4b WHIRLPOOL d0537703ae9ac1a072795b05ee90b1e06d4f1dcb61b0e5adbac05f91db442a44846f909e63840518790d765c71b9a6314f58602d1489cb482ca7b7826cd88ee1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRXJJEACgkQvFcC4BYPU0ptnwCfU9+Nd3fb3e/vsdIZujS23KAb
-OfsAoKlKvsj5RycLbeAsz3/Q2pH0CZW7
-=xAuj
+iEYEAREIAAYFAlRYqgkACgkQvFcC4BYPU0rScgCfbmNWjlNXvDClEqrXOVlHy9Dw
+AesAnAmYqrvRymhCkT86sO8mJZ28f0rl
+=+2Wd
 -----END PGP SIGNATURE-----
diff --git a/app-text/texlive-core/texlive-core-2014-r1.ebuild b/app-text/texlive-core/texlive-core-2014-r1.ebuild
new file mode 100644
index 000000000000..2f2740ed748e
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2014-r1.ebuild
@@ -0,0 +1,339 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2014-r1.ebuild,v 1.1 2014/11/04 10:27:20 aballier Exp $
+
+EAPI=5
+
+#TL_UPSTREAM_PATCHLEVEL="1"
+PATCHLEVEL="42"
+TL_SOURCE_VERSION=20140525
+
+inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="http://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c TeX"
+
+SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
+
+# Fetch patches
+SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
+#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
+
+TL_CORE_BINEXTRA_MODULES="
+	a2ping adhocfilelist asymptote bundledoc ctanify ctanupload ctie cweb
+	de-macro dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviljk dvipos findhyph
+	fragmaster hyphenex installfont lacheck latex-git-log latex2man
+	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext
+	match_parens mkjobtexmf patgen pdfcrop pdftools pfarrei pkfix pkfix-helper
+	purifyeps seetexk sty2dtx synctex texcount texdef texdiff texdirflatten
+	texdoc texliveonfly texloganalyser texware tie tpic2pdftex typeoutfileinfo
+	web collection-binextra
+	"
+TL_CORE_BINEXTRA_DOC_MODULES="
+	a2ping.doc adhocfilelist.doc asymptote.doc bundledoc.doc ctanify.doc
+	ctanupload.doc ctie.doc cweb.doc de-macro.doc dtxgen.doc dvi2tty.doc
+	dvicopy.doc	dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
+	installfont.doc	latex-git-log.doc latex2man.doc latexfileversion.doc
+	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
+	match_parens.doc mkjobtexmf.doc patgen.doc pdfcrop.doc pdftools.doc
+	pfarrei.doc pkfix.doc pkfix-helper.doc purifyeps.doc sty2dtx.doc synctex.doc
+	texcount.doc texdef.doc texdiff.doc texdirflatten.doc texdoc.doc
+	texliveonfly.doc texloganalyser.doc texware.doc tie.doc tpic2pdftex.doc
+	typeoutfileinfo.doc web.doc
+	"
+TL_CORE_BINEXTRA_SRC_MODULES="
+	adhocfilelist.source hyphenex.source listings-ext.source mkjobtexmf.source
+	pfarrei.source texdef.source
+	"
+
+TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
+
+for i in ${TL_CORE_EXTRA_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+SRC_URI="${SRC_URI} source? ( "
+for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="cjk X doc source tk xetex"
+
+TEXMF_PATH=/usr/share/texmf-dist
+
+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-2014
+	!<dev-texlive/texlive-metapost-2011
+	!app-text/dvibook
+	!dev-tex/luatex
+	!app-text/dvipdfm
+	!app-text/dvipdfmx
+	!app-text/xdvipdfmx
+	sys-libs/zlib
+	>=media-libs/libpng-1.2.43-r2:0=
+	>=app-text/poppler-0.12.3-r3:=
+	>=x11-libs/cairo-1.12
+	>=x11-libs/pixman-0.18
+	dev-libs/zziplib
+	app-text/libpaper
+	xetex? (
+		>=media-libs/harfbuzz-0.9.20[icu,graphite]
+		>=dev-libs/icu-50:=
+		app-text/teckit
+		media-libs/fontconfig
+		media-gfx/graphite2
+	)
+	media-libs/freetype:2
+	>=dev-libs/kpathsea-6.2.0
+	cjk? ( >=dev-libs/ptexenc-1.3.2_p20140525-r1 )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	sys-apps/ed
+	sys-devel/flex
+	app-arch/xz-utils"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ps2pkm-1.5_p20130530
+	>=app-text/dvipsk-5.993_p20130530
+	>=dev-tex/bibtexu-3.71_p20130530
+	virtual/perl-Getopt-Long
+	tk? ( dev-perl/perl-tk )"
+
+S="${WORKDIR}/${P}_build"
+B="${WORKDIR}/${MY_PV}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die "failed to create build dir"
+}
+
+RELOC_TARGET=texmf-dist
+
+src_prepare() {
+	cd "${WORKDIR}"
+	# From texlive-module.eclass.
+	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
+	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
+	for i in $(<"${T}/dirlist"); do
+		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
+	done
+	for i in $(<"${T}/reloclist"); do
+		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
+	done
+
+	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
+
+	cd "${B}"
+	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+	elibtoolize
+}
+
+src_configure() {
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# 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 RANLIB
+	ECONF_SOURCE="${B}" \
+		econf -C \
+		--bindir="${EPREFIX}"/usr/bin \
+		--datadir="${S}" \
+		--with-system-freetype2 \
+		--with-system-zlib \
+		--with-system-libpng \
+		--with-system-xpdf \
+		--with-system-poppler \
+		--with-system-teckit \
+		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
+		--with-system-kpathsea \
+		--with-kpathsea-includes="${EPREFIX}"/usr/include \
+		--with-system-icu \
+		--with-system-ptexenc \
+		--with-system-harfbuzz \
+		--with-system-icu \
+		--with-system-graphite2 \
+		--with-system-cairo \
+		--with-system-pixman \
+		--with-system-zziplib \
+		--with-system-libpaper \
+		--without-texinfo \
+		--disable-dialog \
+		--disable-multiplatform \
+		--enable-epsfwin \
+		--enable-mftalkwin \
+		--enable-regiswin \
+		--enable-tektronixwin \
+		--enable-unitermwin \
+		--with-ps=gs \
+		--disable-psutils \
+		--disable-t1utils \
+		--enable-ipc \
+		--disable-biber \
+		--disable-bibtex-x \
+		--disable-dvipng \
+		--disable-dvipsk \
+		--disable-chktex \
+		--disable-lcdf-typetools \
+		--disable-pdfopen \
+		--disable-ps2eps \
+		--disable-ps2pkm \
+		--disable-detex \
+		--disable-ttf2pk2 \
+		--disable-tex4htk \
+		--disable-cjkutils \
+		--disable-xdvik \
+		--disable-xindy \
+		--enable-luatex \
+		--disable-dvi2tty \
+		--disable-dvisvgm \
+		--disable-vlna \
+		--enable-shared \
+		--disable-native-texlive-build \
+		--disable-largefile \
+		$(use_enable xetex) \
+		$(use_enable cjk ptex) \
+		$(use_enable cjk eptex) \
+		$(use_enable cjk uptex) \
+		$(use_enable cjk euptex) \
+		$(use_enable cjk mendexk) \
+		$(use_enable cjk makejvf) \
+		$(use_enable tk texdoctk) \
+		$(use_with X x)
+}
+
+src_compile() {
+	tc-export CC CXX AR RANLIB
+	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist} || die "emake failed"
+
+	cd "${B}"
+	# Mimic updmap --syncwithtrees to enable only fonts installed
+	# Code copied from updmap script
+	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/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"
+		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+	} > "${T}/updmap_update2"
+	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
+		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
+}
+
+src_install() {
+	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
+	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install || die "install failed"
+
+	cd "${B}"
+	dodir /usr/share # just in case
+	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+
+	# 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 "${B}/texk"
+	dodoc ChangeLog README || die "failed to install texk docs"
+
+	docinto dviljk
+	cd "${B}/texk/dviljk"
+	dodoc ChangeLog README NEWS || die "failed to install dviljk docs"
+
+	docinto makeindexk
+	cd "${B}/texk/makeindexk"
+	dodoc ChangeLog NOTES README || die "failed to install makeindexk docs"
+
+	docinto web2c
+	cd "${B}/texk/web2c"
+	dodoc ChangeLog NEWS PROJECTS README || die "failed to install web2c docs"
+
+	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
+
+	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"' > "${ED}/etc/env.d/98texlive"
+	# populate /etc/texmf
+	keepdir /etc/texmf/web2c
+
+	# take care of updmap.cfg and language.d files
+	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
+
+	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
+
+	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+	# by texmf-update
+	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
+	# Remove bundled and invalid updmap.cfg
+	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
+
+	texlive-common_handle_config_files
+
+	keepdir /usr/share/texmf-site
+
+	# 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
+
+	# Rename mpost to leave room for mplib
+	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}"
+	dosym "mpost-${P}" /usr/bin/mpost
+
+	# Ditto for pdftex
+	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}"
+	dosym "pdftex-${P}" /usr/bin/pdftex
+}
+
+pkg_postinst() {
+	etexmf-update
+
+	elog
+	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
+	elog "please update them and run ${EPREFIX}/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
+}