diff options
| -rw-r--r-- | dev-tex/luatex/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-tex/luatex/files/luatex-0.50.0-m4-error.patch | 45 | ||||
| -rw-r--r-- | dev-tex/luatex/luatex-0.50.0-r1.ebuild | 5 |
3 files changed, 7 insertions, 49 deletions
diff --git a/dev-tex/luatex/ChangeLog b/dev-tex/luatex/ChangeLog index 34c853149f3f..c2366491c1fc 100644 --- a/dev-tex/luatex/ChangeLog +++ b/dev-tex/luatex/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-tex/luatex # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/ChangeLog,v 1.63 2010/03/12 00:14:59 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/ChangeLog,v 1.64 2010/03/12 10:56:41 aballier Exp $ + + 12 Mar 2010; Alexis Ballier <aballier@gentoo.org> luatex-0.50.0-r1.ebuild, + -files/luatex-0.50.0-m4-error.patch: + clean up the mess and make a new patchset tarball 12 Mar 2010; Doug Goldstein <cardoe@gentoo.org> luatex-0.50.0-r1.ebuild, +files/luatex-0.50.0-m4-error.patch: diff --git a/dev-tex/luatex/files/luatex-0.50.0-m4-error.patch b/dev-tex/luatex/files/luatex-0.50.0-m4-error.patch deleted file mode 100644 index 99a833a755bb..000000000000 --- a/dev-tex/luatex/files/luatex-0.50.0-m4-error.patch +++ /dev/null @@ -1,45 +0,0 @@ -Fixes bootstrap with =m4-1.4.14 -retaining compatibility with previous versions - -http://bugs.gentoo.org/308337 - ---- luatex-beta-0.50.0/source/m4/kpse-web2c.m4 -+++ luatex-beta-0.50.0/source/m4/kpse-web2c.m4 -@@ -20,7 +20,7 @@ - AS_HELP_STRING([--]m4_if($2, [yes], [dis], [en])[able-$1-default], - m4_if($2, [yes], - [do not ])[run $1 if $3 missing], -- kpse_indent_26+2))[]dnl -+ m4_eval(kpse_indent_26+2)))[]dnl - AS_CASE([$enable_$1_default], [yes|no], , - [enable_$1_default=$2])[] - ]) # KPSE_WITH_MKTEX -@@ -44,7 +44,7 @@ - AS_HELP_STRING([--]m4_if($2, [yes], [dis], [en])[able-$1], - m4_if($2, [yes], - [do not ])[compile and install $4], -- kpse_indent_26+2))[]dnl -+ m4_eval(kpse_indent_26+2)))[]dnl - AS_CASE([$enable_$1], [yes|no], , - [enable_$1=$2])[] - m4_ifval([$5], [ -@@ -69,7 +69,7 @@ - [AC_ARG_ENABLE([$1win], - AS_HELP_STRING([--enable-$1win], - [include $3 window support], -- kpse_indent_26+2))[]dnl -+ m4_eval(kpse_indent_26+2)))[]dnl - ]) # KPSE_WITH_MFWIN - - # KPSE_MFWIN_DEFINE(WINDOW, DEFINE, TEXT) ---- luatex-beta-0.50.0/source/texk/web2c/ac/web2c.ac -+++ luatex-beta-0.50.0/source/texk/web2c/ac/web2c.ac -@@ -47,7 +47,7 @@ - AC_ARG_ENABLE([mf-nowin], - AS_HELP_STRING([--disable-mf-nowin], - [do not build a separate non-windows-capable METAFONT], -- kpse_indent_26+2))[]dnl -+ m4_eval(kpse_indent_26+2)))[]dnl - AC_ARG_WITH([mf-x-toolkit], - AS_HELP_STRING([--without-mf-x-toolkit], - [do not use X toolkit for METAFONT]))[]dnl diff --git a/dev-tex/luatex/luatex-0.50.0-r1.ebuild b/dev-tex/luatex/luatex-0.50.0-r1.ebuild index aeff6e5aab77..5c3b2c4288fa 100644 --- a/dev-tex/luatex/luatex-0.50.0-r1.ebuild +++ b/dev-tex/luatex/luatex-0.50.0-r1.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/luatex-0.50.0-r1.ebuild,v 1.9 2010/03/12 00:14:59 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/luatex-0.50.0-r1.ebuild,v 1.10 2010/03/12 10:56:41 aballier Exp $ EAPI="2" inherit libtool multilib eutils toolchain-funcs autotools -PATCHLEVEL="17" +PATCHLEVEL="18" DESCRIPTION="An extended version of pdfTeX using Lua as an embedded scripting language." HOMEPAGE="http://www.luatex.org/" @@ -34,7 +34,6 @@ kpathsea_extraconf="--disable-shared --disable-largefile" src_prepare() { EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" - epatch "${FILESDIR}"/${P}-m4-error.patch eautoreconf elibtoolize } |