From: Alexis Ballier Date: Fri, 12 Mar 2010 10:56:42 +0000 (+0000) Subject: clean up the mess and make a new patchset tarball X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3919972a5bb2b1a5fe25248ca3e710b630d5a1a0;p=gentoo.git clean up the mess and make a new patchset tarball Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- 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 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 luatex-0.50.0-r1.ebuild, +files/luatex-0.50.0-m4-error.patch: diff --git a/dev-tex/luatex/Manifest b/dev-tex/luatex/Manifest index 71f3dd70c936..f2ad0a039abf 100644 --- a/dev-tex/luatex/Manifest +++ b/dev-tex/luatex/Manifest @@ -1,16 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX luatex-0.50.0-m4-error.patch 1988 RMD160 a22962413c92a307425f2a960f1b6219a71b4b33 SHA1 0cf09273734012b1e8f7b823d08b0bcb4459536b SHA256 c01caa7c5b2dd3cf6e261392f99afab1e3d0c44f4841644ce3f748709a8f552d DIST luatex-beta-0.50.0.tar.bz2 7384655 RMD160 ad8eb0c9452779905abdcc58a1056c7134de425a SHA1 9fd23438c546b27e6be725bb900cd083fa5b2056 SHA256 810bbd0249951fce48c5bc1115815f483e71c221f40549ccbbe6674d2756f80e -DIST luatex-patches-17.tar.bz2 2657 RMD160 0c0f042c51def26482edab69dfdcdf647ad72df3 SHA1 c4ad19e297e829ad1b4c26763282b9271e0987a0 SHA256 1933cd168c0b278699a0934f4cb1bd3c4f690fe4372a6a6a63ce308249407d31 -EBUILD luatex-0.50.0-r1.ebuild 4515 RMD160 36ca4c8ea047aadeb7bbd9b5fc584958c91b925d SHA1 89f7371ad1e54fc114c22c4d48f6f0941689547a SHA256 97212ed983450694198244be876583048799653898ea62d0587919a8ad1ef99e -MISC ChangeLog 8337 RMD160 04826f409a8ec7596a1558015d2fcb056913e9f4 SHA1 dd6e2f52eb44286e759bb45823029aa6f7fe1037 SHA256 e1fa503b8d5e21ddb6609d4409dcbce82023d3c8c0228181f3abaee6b0eb0411 +DIST luatex-patches-18.tar.bz2 3092 RMD160 8048cd97fde247510ae5d5dd6f4c4bcc200efbc0 SHA1 7f9495679dc723a4fed1e5ec42f417cf89fb803f SHA256 900a4cbf47ec19e8bb4369e63290e770b16d1b2b118587e3f180b79b101be23f +EBUILD luatex-0.50.0-r1.ebuild 4476 RMD160 63557326d20fd4d8fa7d393a304e2a25c55af66d SHA1 8a5c01b233652d74e4f022c2f3f94b86f21b81a8 SHA256 3c4c97f66eea746c8a24fcda387d27acd30632399367e6b721ec7d66c5d528bc +MISC ChangeLog 8508 RMD160 565dbcef111d8489c1729d0b8fe7850a055eb227 SHA1 9344680830a23a1ccabf333002eec3f887a0ab3b SHA256 65f4e53a1ede9698eacc479062810016c954255675a5fbc3b5e91c1f4a442523 MISC metadata.xml 336 RMD160 0ea7c1246551ffee8e6960e806a66a231e1d3cc7 SHA1 ca5b152307b89eb030607b9d4862c270d248dfa0 SHA256 126018a4822f911e52afe63656a10f2a7b0b938ea106f2a2caef00bdc18a845f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkuZh4wACgkQoeSe8B0zEfxEYQCeOEbP1Wz7s9A1dZSjI6+fRPv7 -i44An3/VZnb/SE48yykeKhJWb6UHkk/4 -=xm6P +iEYEARECAAYFAkuaHe8ACgkQvFcC4BYPU0pLDQCgrK8az+C9XH4mI75Q8GQbC/JA +wSYAnRnnitXLCBFcpnR0NKiD/MDNY/ig +=Hq14 -----END PGP SIGNATURE----- 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 }