Import upstream fix to build with kpathsea from TeX Live 2011 (without our api compatibility patch).

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 41 insertions, 6 deletions

diff --git a/dev-tex/metapost/ChangeLog b/dev-tex/metapost/ChangeLog
index a9bc75fcb42c..d64eb1f55f32 100644
--- a/dev-tex/metapost/ChangeLog
+++ b/dev-tex/metapost/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-tex/metapost
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/metapost/ChangeLog,v 1.2 2011/08/04 06:37:48 aballier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/metapost/ChangeLog,v 1.3 2012/07/26 11:10:39 aballier Exp $
+
+  26 Jul 2012; Alexis Ballier <aballier@gentoo.org> metapost-1.504.ebuild,
+  +files/invocname.patch:
+  Import upstream fix to build with kpathsea from TeX Live 2011 (without our
+  api compatibility patch).
 
 *metapost-1.504 (04 Aug 2011)
 
diff --git a/dev-tex/metapost/Manifest b/dev-tex/metapost/Manifest
index d491f93dafba..e5a6016258a9 100644
--- a/dev-tex/metapost/Manifest
+++ b/dev-tex/metapost/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX invocname.patch 603 SHA256 06e2ad08a9259bf54d6df7fd7ab95aa586f16afc9dfceb9c06154ec53713c42a SHA512 4187dc561e7ddc0616ebba240234910fc4ca20afefdbfb84fbbf8bf81c1fdec7a98e0f8da18aa3cd8e9f77407820b5ba18525f03ed119bce16f34f46e1a125c0 WHIRLPOOL 03c7e5e7dae37e87a24b7bc67628dad055c94e2262344185c47ab173bb711bbb96cc8f1ab6a3960db08f22a3ca71b4ac22943474e1c2ce56cdedba0edc8be6c8
 DIST metapost-1.212-src.tar.bz2 4862803 SHA256 bed4fa92cf86c668d4180f6c644f2a00a5cee17be3f0c00dcfc32c6ff842903a SHA512 ec66d756ff4505ce49d74b0a3fbdc715d4cf95eb3e3a3acd2f704310ae3d1bf3cb87bc75aaa2b1f74d32182ac6815ce658ece42a2f8c880d2d065f52c22fbe42 WHIRLPOOL 15c14f54511cbdebda5dfba8a90ff407d4779f2cd0bf341dfe3c80dac06c66d9d3b8963c54a8f531bce25a536455a03ca27ca6a3bb3b1ee502c5ccf4923b7987
 DIST metapost-beta-1.504-src.tar.bz2 4784579 SHA256 94d37e092c953141cf95c62f6fb441fdbdb786e6c0df5f6b5d6af41658e99562 SHA512 40bf7304df0de3d1df069ab48f5d08b9ddaa7bcba9332c6076dc9fed3a6371351c9bdc6504c297835d454d6c97db15b2f2620a629801089c1acffb9ea9c76771 WHIRLPOOL c62271ebb343d6dd43527f6bda7cbeb5ea9ead9580fc7ea65e343cd69317b2bb8b196b3016eb65a6435a463551ff9e2a45c9eb7d460e4b72973b86c5af02abd4
 EBUILD metapost-1.212.ebuild 2607 SHA256 5deb92372b76a6b4d6c46b45038877d5261b52d683b1c275a76b3220515dd048 SHA512 c677de50ff5ea945c53359ee686c7f3bcee2b7a05f438c7f3defbef2c66c5012abd40e17eee36522f4f94540697ce14a391f03bc469b79d575168c06d41740a1 WHIRLPOOL 7082ed1707b05ce910a9c1ae8efe10797ec50ca4aa82c13a2833873a15308d413bffa6ee6eb3f4ba98544c67cc91eb32549b4f3634c226d18898de1657d41252
-EBUILD metapost-1.504.ebuild 2577 SHA256 6370e8c78876684e49eff84a4db263ce5ab435ad129c971f892cb22fbf734b6f SHA512 1a0691ad97159034d57ce3ccf4a93fa5a552f05b11be00a409d749b22e5eccd1960fe23b883bc9ed2f504f7ecba1f3b2f97c28b41977afd99f3d24a8e0278751 WHIRLPOOL 56f2b1bdb3ac5a093da364c6c9e53fc88ce7d83f5adec88a58bfa56cbb01fa81d26b7f48030dc7cfb0a9f49b035b56f0e45ea66254e63cb9073d01cd2c5f25a4
-MISC ChangeLog 554 SHA256 a51f2c4c751b39820482a37798aae59e9fa5e666f8744f1c015c9baaab61d1c4 SHA512 bde8d58b060791740325a9e6af6472eea49677f9beb1cdb447674da31bbbd50384fb2f7ff943d8b917160f4b321779f44ed32c9572cfab2357e9581045f3ad3d WHIRLPOOL 8a6a779ed83adc24cd2773877e6c622455dbd7cedb163fdcd0439792f72123f699678ee38c34f103520f2157d52b29da4ed953f84c73f8083467ee6999775dc6
+EBUILD metapost-1.504.ebuild 2650 SHA256 6a95c685fcc753871cd317463cf1092b1bdb2807d74da4cf368771d4514a248a SHA512 c998cac42ede35fda36706789c924ec9c0fbea00ddfdc4e706a34e353d050ad74a4da1ea37788d96acbf95d9569175a9f0b8bbbd4506feb5c4433dde8a502763 WHIRLPOOL d6b60a98255e0224d65ecdd735013437376a7732034320aed92ec44e5665cf6e02b7d41b81b0e1ceca55f4687baf73a81217010511b271d614acc945528d8bcd
+MISC ChangeLog 761 SHA256 253674a0a35880d9d58f8190c116c89252a220fd5a1fdf140e1405ed7baa6369 SHA512 2163d5aff57c1d9856866590bb135ecdd38ebe01968b206b0b9dc3f8d9d8bbf25590ecc65e53a6e5d7d5a87eaa77fc58b79385e8509cf35703f0ffacba4fbc12 WHIRLPOOL adee13e1190f0cb5d506319bcdc0b3fdf90c92a6d4d630f26f539af6766f4fff390cbfb84cbb700dcf1eaa31e51bc814efc64256c6238d37955ebcdc97b8a8fa
 MISC metadata.xml 156 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6 SHA512 cecee760dd314c182191a282255f2415e479a8cc6cab9cb664e5b82d52b700a3444aa0d33b30a721a756e432819decc8c92588c769ea6fd33dabe9adc16d75c0 WHIRLPOOL 88a15092b616df72dd0ae91d89c80d852ad49ab9fee8a9688f3a1be59c365cc3dc77e90be68b5c4ec9cc1dc9885e06e723abc96830df4d0628df8c97f8b2a332
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlARJbUACgkQvFcC4BYPU0piYACgkGfJN4w6jBrlyMsuKlgbvvxB
+GvwAoLQinRXPOhCR2wz45GWrxZGDxjPY
+=jpqZ
+-----END PGP SIGNATURE-----
diff --git a/dev-tex/metapost/files/invocname.patch b/dev-tex/metapost/files/invocname.patch
new file mode 100644
index 000000000000..f269957c2b2f
--- /dev/null
+++ b/dev-tex/metapost/files/invocname.patch
@@ -0,0 +1,13 @@
+Index: source/texk/web2c/lib/setupvar.c
+===================================================================
+--- source/texk/web2c/lib/setupvar.c	(revision 21623)
++++ source/texk/web2c/lib/setupvar.c	(revision 21624)
+@@ -23,7 +23,7 @@
+     if (conf_val < 0 || (conf_val == 0 && dflt > 0)) {
+       fprintf (stderr,
+                "%s: Bad value (%ld) in texmf.cnf for %s, keeping %ld.\n",
+-               program_invocation_name,
++               kpse_invocation_name,
+                (long) conf_val, var_name, (long) dflt);
+     } else {
+       *var = conf_val; /* We'll make further checks later.  */
diff --git a/dev-tex/metapost/metapost-1.504.ebuild b/dev-tex/metapost/metapost-1.504.ebuild
index 50fd54edbdbe..0ed8655936a2 100644
--- a/dev-tex/metapost/metapost-1.504.ebuild
+++ b/dev-tex/metapost/metapost-1.504.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/metapost/metapost-1.504.ebuild,v 1.1 2011/08/04 06:37:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/metapost/metapost-1.504.ebuild,v 1.2 2012/07/26 11:10:39 aballier Exp $
 
 EAPI=3
 
+inherit eutils
+
 MY_P=${PN}-beta-${PV}
 DESCRIPTION="System for producing graphics"
 HOMEPAGE="http://tug.org/metapost.html"
@@ -20,6 +22,10 @@ RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}/source/texk/web2c
 
+src_prepare() {
+	epatch "${FILESDIR}/invocname.patch"
+}
+
 src_configure() {
 	econf \
 		--enable-cxx-runtime-hack \