Remove zlib version check which breaks at every minor/micro bump in zlib, by Ulrich Müller, bug #310487

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

4 files changed, 162 insertions, 5 deletions

diff --git a/dev-tex/luatex/ChangeLog b/dev-tex/luatex/ChangeLog
index 5ded69a2f9be..b404cf1927a9 100644
--- a/dev-tex/luatex/ChangeLog
+++ b/dev-tex/luatex/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-tex/luatex
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/ChangeLog,v 1.102 2012/07/26 10:56:03 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/ChangeLog,v 1.103 2012/08/01 13:00:16 aballier Exp $
+
+*luatex-0.70.1-r1 (01 Aug 2012)
+
+  01 Aug 2012; Alexis Ballier <aballier@gentoo.org> +luatex-0.70.1-r1.ebuild,
+  +files/remove-zlib-version-check.patch:
+  Remove zlib version check which breaks at every minor/micro bump in zlib, by
+  Ulrich Müller, bug #310487
 
   26 Jul 2012; Alexis Ballier <aballier@gentoo.org> +files/kpathsea2012.patch,
   luatex-0.70.1.ebuild:
diff --git a/dev-tex/luatex/Manifest b/dev-tex/luatex/Manifest
index cf76525d57be..88ef61a9e48f 100644
--- a/dev-tex/luatex/Manifest
+++ b/dev-tex/luatex/Manifest
@@ -4,15 +4,17 @@ Hash: SHA256
 AUX kpathsea2012.patch 944 SHA256 afb87b3c1cb9317666a7f45b6ecd6ad1078896d56b91fca7bfe6aa1c75ada495 SHA512 d72bce55c2494622fd15703f483c058245c96c8b2aa03d6fa02b112be827ddfe8a0013ee0c3710bb3e1313b631bf436f70ce99d383f11f4d2b51915752c59960 WHIRLPOOL 39c93138b416d79a55d1e5a464afe8363c9902abff50397d88bad623ec298e970490fd93dd8ed4d4c1a8e9788da300f265da550bf2ab6149b41351027998b107
 AUX poppler018.patch 5041 SHA256 98317c41cab055cde67fd1eefa6c79fa8ec0ac2b36d93a094abe9eb8e834221c SHA512 e8b1660cb6674a8d2f68f29022d0ea33ca00795c8360a9656c5ad84776c86d3ab0a3c0895632957c5ed93fcab96e11e6bc7eb1a03df518122fcc3fa574b095ee WHIRLPOOL 0a14b110479acbe5d31a40642b53e0bcf03226acac19596f5dc885ff8a7a9c83895d8409044e96630bc66cf77ea915ce41f580a43dc48df423519dc0a9226335
 AUX poppler020.patch 2909 SHA256 ffec5fd2e311841ee355deabfe13b37fdaea781608e95a2a5ab037d1cdd04ea8 SHA512 9517efce4ede9b792f27647ec4ed95d447572a9cbb3ee58e089b658ccc55bbb6a7843768b5962a4535ed77ab364e73f4fd1248e92a5a480ce30429303664f385 WHIRLPOOL db89a3e07ace603aea4abf71a97cd26f0b16c60b939f0c361db77d8af22c03b0003440e38164a0052258a8fbaceb283bac401a8254fa0b42e71179b715151f06
+AUX remove-zlib-version-check.patch 938 SHA256 5c569bab0ccecc38e89f0bfeeaeabb921ce2fe38e17ecd0d7da11a75c0ed9d19 SHA512 1d19fb396af846a2ffa9ab7ffcf20d363956921cec92d6b03e499e26bac3802a8ca874b982c25ef99a560af48f0d85b0a36ac5786f7c3129abba3b8d9e38c780 WHIRLPOOL 2b06826e5f8bd2bc50b933a7636b5185bd21b44e2c5aad54e4e641bd39c74a29235928f3a6e36d551b679dac6ca2fa8c969447c520805807a487b6bd0b82c79c
 DIST luatex-beta-0.70.1-doc.tar.bz2 1048489 SHA256 4f1d24777725a606efbf5d7a59064245c46fb29b8066236c6b48fb423a595606 SHA512 eb4de91a80a6afccf5cca5cb05d5c1378a60ec35763e5ef5e9dbadaa2a276758a446e01d66e76a78e91442274778c10c73458b513af903e7221d90beb644afa9 WHIRLPOOL 97142a3a3c23d01f3b21963690f7362edf0c7f0de1ad77295361122a81c92459cb2ecd36baaea3588b7ad4f8b81c5dfa81d22df7a5529cb5b8b2b39fe6ce84be
 DIST luatex-beta-0.70.1.tar.bz2 8181155 SHA256 c641a4ba1535ede6ee8e2a958d8c4b436f5979c5be6f3f51d3dec5b4df6bb6ed SHA512 e04a9b96f349bf9036ef4c01746dee96ebf245cd4da6b719f546223e05cb98fb844e20878a64f80f42c77e220fac01ee2d97ad56939c1fb3af44faab53c603cb WHIRLPOOL 63dfdf182d3f1aadd6fc802e424b3791eda4df7eb8d707ad719d2ad0f97946b365316f6b9caed2362d5827280e9ddf2e750c8beeb61277dac72bffaed06a4fc9
+EBUILD luatex-0.70.1-r1.ebuild 3999 SHA256 c86d2b22ef92f1119274d2e9480b7243cbe29ff221bfa8279b30cd681135cd41 SHA512 b4a044ed0cdf94e7e8c8206562de7279b13df2af9e4ff83b870745cd1a69a0479a757af8dc43f6aaae1674548138dc04c475e5f3c978c2b3f07f3bb602d549ab WHIRLPOOL 9815dd7455ac6acce1cb92aa36a3dbcd30bf5e2239ea130c163237c2800e168148653dcc2bd2dba04e4b4558ac1a90b53909dd2733082c4fe27330e877fb24bd
 EBUILD luatex-0.70.1.ebuild 3936 SHA256 41d34bac949635fc65c23b6c6f58a7ccaf39115fd5bd0287596e73e494461de9 SHA512 a6321da552ef12c384f415152588f698e8b7a16e415b695be532ee226d370dbb829263edd058ba1b55bae12eb6f66d34532a2837f1c52f692d7747ddef32dd00 WHIRLPOOL d2400d3f34413ea51c2d84faa930620059f39a8d48dacb9b474593c94112094507bf9ac4077e769de284a9e7a6ead2333c678190585782cd5dfdfba14ae4b840
-MISC ChangeLog 12834 SHA256 c32c10a2cd05125c09ca85d6eb216ac774dd99a6ae4b42c48a45e8f9c1f60d1f SHA512 bac891d5ba77cc4ea9038c227807c247f043359c646ba1232170e391ba17cee083ffdbd4c66e83e05f44b9ee8098fc17248edcddc348488c74f0d7b227260d99 WHIRLPOOL 39cec3281f8f75b4c3b591dcea681eb792306222b83a93010b073ae7ece69c80bc2c93020987c409031903f073acd00a009faa4df3bf07700681c8710d40ffe2
+MISC ChangeLog 13097 SHA256 1a29d6a0295be9f9cd85d62ab89957def190f75013544f00307f09e946646049 SHA512 f32d5e7e3c37598b44842eba7773139dfb458a4dbccb87644b4b69d75e8c1e68755ae2d8b1ac2f2549aa2e75f650e7e6cdf3d5d4b3adb560d222f97606e5e84f WHIRLPOOL e0e608897c9b17e7d4968e159111a8df888b464f0dd9e2190c0e1c81c5d7a40aebfa467e33a5b0bc4c1175513ed4b11a694e9d9550e28ea6d5ccd5666755659a
 MISC metadata.xml 336 SHA256 126018a4822f911e52afe63656a10f2a7b0b938ea106f2a2caef00bdc18a845f SHA512 d998dbfe23cbb7f60db7b876e8ac3d039281ad9568aeb45a494774eb65468392523cdfc1b5cc8b621fc9a2f2f7f33dc3e351d1cf902f9ecf3f122534ef4767e0 WHIRLPOOL 3350c9964adc178cb58ee77019669fa51899cd71734ae1ff8f4646d1f9e141973c9f686f43e5995f1a7258d92bd173176dc0d9c3d8bcc09b96c37a0b7a0fb4a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlARIkgACgkQvFcC4BYPU0qlWgCfYJwkwbFvu5aLpZV2f4ROgmV2
-g48AnR8T8qvPU+4kiddxGGQwRMSt1qnW
-=Z8jp
+iEYEAREIAAYFAlAZKGYACgkQvFcC4BYPU0r/DgCgyyothHrz0uTr7eb4+/24aYeq
+qk8AoJWN1XoK2VYvDWphAAlwWkOvM4xU
+=L3Lx
 -----END PGP SIGNATURE-----
diff --git a/dev-tex/luatex/files/remove-zlib-version-check.patch b/dev-tex/luatex/files/remove-zlib-version-check.patch
new file mode 100644
index 000000000000..985085012511
--- /dev/null
+++ b/dev-tex/luatex/files/remove-zlib-version-check.patch
@@ -0,0 +1,23 @@
+Let soname dictate the ABI and do not check for minor/micro which requires
+needless rebuilds after every zlib update. By Ulrich Müller.
+
+https://bugs.gentoo.org/show_bug.cgi?id=310487
+http://www.ntg.nl/pipermail/dev-luatex/2012-July/004534.html
+
+--- luatex-beta-0.70.1-orig/source/texk/web2c/luatexdir/luazlib/lzlib.c
++++ luatex-beta-0.70.1/source/texk/web2c/luatexdir/luazlib/lzlib.c
+@@ -549,14 +549,6 @@
+ 
+     /* ====================================================================== */
+ 
+-    /* make sure header and library version are consistent */
+-    const char* version = zlibVersion();
+-    if (strncmp(version, ZLIB_VERSION, 5))
+-    {
+-        lua_pushfstring(L, "zlib library version does not match - header: %s, library: %s", ZLIB_VERSION, version);
+-        lua_error(L);
+-    }
+-
+     /* create new metatable for zlib compression structures */
+     luaL_newmetatable(L, ZSTREAMMETA);
+     lua_pushliteral(L, "__index");
diff --git a/dev-tex/luatex/luatex-0.70.1-r1.ebuild b/dev-tex/luatex/luatex-0.70.1-r1.ebuild
new file mode 100644
index 000000000000..17edc910a260
--- /dev/null
+++ b/dev-tex/luatex/luatex-0.70.1-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/luatex-0.70.1-r1.ebuild,v 1.1 2012/08/01 13:00:16 aballier Exp $
+
+EAPI=4
+
+inherit libtool eutils
+
+DESCRIPTION="An extended version of pdfTeX using Lua as an embedded scripting language."
+HOMEPAGE="http://www.luatex.org/"
+SRC_URI="http://foundry.supelec.fr/gf/download/frsrelease/392/1730/${PN}-beta-${PV}.tar.bz2
+	http://foundry.supelec.fr/gf/download/frsrelease/392/1732/${PN}-beta-${PV}-doc.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+RDEPEND="dev-libs/zziplib
+	>=media-libs/libpng-1.4
+	>=app-text/poppler-0.12.3-r3[xpdf-headers]
+	sys-libs/zlib
+	>=dev-libs/kpathsea-6.0.1_p20110627"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-beta-${PV}/source"
+PRELIBS="libs/obsdcompat"
+#texk/kpathsea"
+#kpathsea_extraconf="--disable-shared --disable-largefile"
+
+src_prepare() {
+	has_version '>=app-text/poppler-0.18.0:0' && epatch "${FILESDIR}/poppler018.patch"
+	has_version '>=app-text/poppler-0.20.0:0' && epatch "${FILESDIR}/poppler020.patch"
+	epatch "${FILESDIR}/kpathsea2012.patch" \
+		"${FILESDIR}/remove-zlib-version-check.patch"
+	S="${S}/build-aux" elibtoolize --shallow
+}
+
+src_configure() {
+	# 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 #244619
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+
+	local myconf
+	myconf=""
+	#has_version '>=app-text/texlive-core-2009' && myconf="--with-system-kpathsea"
+
+	cd "${S}/texk/web2c"
+	econf \
+		--disable-cxx-runtime-hack \
+		--disable-all-pkgs	\
+		--disable-mp		\
+		--disable-ptex		\
+		--disable-tex		\
+		--disable-mf		\
+	    --disable-largefile \
+		--disable-ipc		\
+		--disable-shared	\
+		--enable-luatex		\
+		--enable-dump-share	\
+		--without-mf-x-toolkit \
+		--without-x			\
+	    --with-system-kpathsea	\
+	    --with-kpathsea-includes="${EPREFIX}"/usr/include \
+	    --with-system-gd	\
+	    --with-system-libpng	\
+	    --with-system-teckit \
+	    --with-system-zlib \
+	    --with-system-t1lib \
+		--with-system-xpdf \
+		--with-system-poppler \
+		--with-system-zziplib \
+	    --disable-multiplatform \
+
+	for i in ${PRELIBS} ; do
+		einfo "Configuring $i"
+		local j=$(basename $i)_extraconf
+		local myconf
+		eval myconf=\${$j}
+		cd "${S}/${i}"
+		econf ${myconf}
+	done
+}
+
+src_compile() {
+	texk/web2c/luatexdir/getluatexsvnversion.sh || die
+	for i in ${PRELIBS} ; do
+		cd "${S}/${i}"
+		emake || die "failed to build ${i}"
+	done
+	cd "${WORKDIR}/${PN}-beta-${PV}/source/texk/web2c"
+	emake luatex || die "failed to build luatex"
+}
+
+src_install() {
+	cd "${WORKDIR}/${PN}-beta-${PV}/source/texk/web2c"
+	emake DESTDIR="${D}" bin_PROGRAMS="luatex" SUBDIRS="" nodist_man_MANS="" \
+		install-exec-am || die
+
+	dodoc "${WORKDIR}/${PN}-beta-${PV}/README" || die
+	doman "${WORKDIR}/texmf/doc/man/man1/"*.1 || die
+	if use doc ; then
+		dodoc "${WORKDIR}/${PN}-beta-${PV}/manual/"*.pdf || die
+		dodoc "${WORKDIR}/texmf/doc/man/man1/"*.pdf || die
+	fi
+}
+
+pkg_postinst() {
+	if ! has_version '>=dev-texlive/texlive-basic-2008' ; then
+		elog "Please note that this package does not install much files, mainly the"
+		elog "${PN} executable that will need other files in order to be useful.."
+		elog "Please consider installing a recent TeX distribution"
+		elog "like TeX Live 2008 to get the full power of ${PN}"
+	fi
+	if [ "$ROOT" = "/" ] && [ -x "${EPREFIX}"/usr/bin/fmtutil-sys ] ; then
+		einfo "Rebuilding formats"
+		"${EPREFIX}"/usr/bin/fmtutil-sys --all &> /dev/null
+	else
+		ewarn "Cannot run fmtutil-sys for some reason."
+		ewarn "Your formats might be inconsistent with your installed ${PN} version"
+		ewarn "Please try to figure what has happened"
+	fi
+}