New tarball of tetex, also added two patchs. Should fix everything in bug #113024.

Package-Manager: portage-2.1_pre3-r1

6 files changed, 125 insertions, 19 deletions

diff --git a/app-text/tetex/ChangeLog b/app-text/tetex/ChangeLog
index e3eda1831add..c9e598ea3f5e 100644
--- a/app-text/tetex/ChangeLog
+++ b/app-text/tetex/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-text/tetex
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.96 2005/12/02 19:40:37 nattfodd Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.97 2006/01/13 19:52:31 nattfodd Exp $
+
+*tetex-3.0_p1 (13 Jan 2006)
+
+  13 Jan 2006; Alexandre Buisse <nattfodd@gentoo.org>
+  +files/tetex-3.0_p1-amd64-xdvik-wp.patch,
+  +files/tetex-3.0_p1-mptest.patch, +tetex-3.0_p1.ebuild:
+  Use a new tarball provided by upstream with regeneration of autotools files
+  with newer version. Corrects bug 113024 with libtool complaining about
+  missing --tag. Added a patch to correct a typo for amd64 and skip a broken
+  test with metapost (more investigation of that one is needed).
 
 *tetex-3.0-r4 (02 Dec 2005)
 *tetex-2.0.2-r7 (02 Dec 2005)
diff --git a/app-text/tetex/Manifest b/app-text/tetex/Manifest
index 7b926e172039..68a3479e615c 100644
--- a/app-text/tetex/Manifest
+++ b/app-text/tetex/Manifest
@@ -1,26 +1,30 @@
-MD5 1fe71bbc946829906e955a0380bbbcef tetex-3.0-r4.ebuild 1345
-MD5 8f27cd5e7c06b0c37851607799f69316 tetex-1.0.7-r13.ebuild 4770
-MD5 0f8500396bced0f297604c1919883bc6 tetex-2.0.2-r5.ebuild 1162
-MD5 d83cea94a74788901290e20dd375883e tetex-2.0.2-r7.ebuild 1272
-MD5 6d84991ef4fd00210a9eb68fdb393bd8 tetex-3.0-r3.ebuild 1272
-MD5 5ec3bbcf0526206f46edf6734f6305d6 tetex-2.0.2-r6.ebuild 1174
-MD5 c7bb62fac7e5ed7ea9eb387b5fbde27c ChangeLog 17005
-MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+MD5 7ab32cd548bf79b4bdcc958354dae1b4 ChangeLog 17484
+MD5 9179c455d1a594b0b06b670e0b051374 files/digest-tetex-1.0.7-r13 343
 MD5 ed2101fe2206c296c09f0d2b67759841 files/digest-tetex-2.0.2-r5 282
 MD5 ed2101fe2206c296c09f0d2b67759841 files/digest-tetex-2.0.2-r6 282
 MD5 ed2101fe2206c296c09f0d2b67759841 files/digest-tetex-2.0.2-r7 282
-MD5 b15d18a85d673070c4b9ac48ebc586ed files/tetex-3.0-epstopdf-wrong-rotation.patch 521
-MD5 77107ec8ba31c93b0e1bc35a9e4c9c4b files/xdvizilla.patch 912
-MD5 ce3900d8a86ef6eb7c20dc2d445f16ff files/tetex-2.0.2-epstopdf-wrong-rotation.patch 525
-MD5 0e727f58dac2997f22e90f51b2d79da3 files/tetex-3.0-kpathsea-pic.patch 1590
-MD5 41f87c91f8bb6ceeae3c1fb7ca0dce1c files/tetex-texdoctk-gentoo.patch 509
-MD5 362296e34a1a04a6e5e2a7d9e97547c6 files/xpdf2-underflow.patch 2363
 MD5 7184c72f1e38b2f0ddb843687cf80832 files/digest-tetex-3.0-r3 202
 MD5 7184c72f1e38b2f0ddb843687cf80832 files/digest-tetex-3.0-r4 202
+MD5 ca5c96c960d2e8845588f273359e3dc9 files/digest-tetex-3.0_p1 207
+MD5 6f48f0b987b7ea33b02aea8ba198eeed files/iso-8859-7.def 4419
+MD5 ce3900d8a86ef6eb7c20dc2d445f16ff files/tetex-2.0.2-epstopdf-wrong-rotation.patch 525
+MD5 b15d18a85d673070c4b9ac48ebc586ed files/tetex-3.0-epstopdf-wrong-rotation.patch 521
+MD5 0e727f58dac2997f22e90f51b2d79da3 files/tetex-3.0-kpathsea-pic.patch 1590
+MD5 c7d5fd4cce846a7f7e5845ede7b839c9 files/tetex-3.0_p1-amd64-xdvik-wp.patch 847
+MD5 87ed2925ecec1c2a53cbfb5f5f32160d files/tetex-3.0_p1-mptest.patch 367
 MD5 1c3401dbbc9d478e94c98e44b9b68e38 files/tetex-no-readlink-manpage.diff 542
-MD5 9179c455d1a594b0b06b670e0b051374 files/digest-tetex-1.0.7-r13 343
+MD5 41f87c91f8bb6ceeae3c1fb7ca0dce1c files/tetex-texdoctk-gentoo.patch 509
+MD5 77107ec8ba31c93b0e1bc35a9e4c9c4b files/xdvizilla.patch 912
 MD5 5d40ba9d885af84bcc917ad17e2bf8e0 files/xpdf-3.00pl2-CAN-2004-1125.patch 1136
 MD5 c32a612ce419b9930ff273cf382558bf files/xpdf-3.00pl3-CAN-2005-0064.patch 346
-MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424
-MD5 6f48f0b987b7ea33b02aea8ba198eeed files/iso-8859-7.def 4419
 MD5 87d20c86d1451638e4b7adc2f7ac8067 files/xpdf-CESA-2004-007-xpdf2-newer.diff 2718
+MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424
+MD5 362296e34a1a04a6e5e2a7d9e97547c6 files/xpdf2-underflow.patch 2363
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+MD5 8f27cd5e7c06b0c37851607799f69316 tetex-1.0.7-r13.ebuild 4770
+MD5 0f8500396bced0f297604c1919883bc6 tetex-2.0.2-r5.ebuild 1162
+MD5 5ec3bbcf0526206f46edf6734f6305d6 tetex-2.0.2-r6.ebuild 1174
+MD5 d83cea94a74788901290e20dd375883e tetex-2.0.2-r7.ebuild 1272
+MD5 6d84991ef4fd00210a9eb68fdb393bd8 tetex-3.0-r3.ebuild 1272
+MD5 1fe71bbc946829906e955a0380bbbcef tetex-3.0-r4.ebuild 1345
+MD5 d140b2a9bcdb3c2b0776b12488a19065 tetex-3.0_p1.ebuild 1528
diff --git a/app-text/tetex/files/digest-tetex-3.0_p1 b/app-text/tetex/files/digest-tetex-3.0_p1
new file mode 100644
index 000000000000..d4a9cab73343
--- /dev/null
+++ b/app-text/tetex/files/digest-tetex-3.0_p1
@@ -0,0 +1,3 @@
+MD5 24568263880f911452936573211fa4e8 tetex-3.0_p1-gentoo.tar.gz 604
+MD5 0f82ade673335256226d0321e6c5e2cf tetex-src-3.0_p1.tar.gz 13357541
+MD5 11aa15c8d3e28ee7815e0d5fcdf43fd4 tetex-texmf-3.0.tar.gz 91762123
diff --git a/app-text/tetex/files/tetex-3.0_p1-amd64-xdvik-wp.patch b/app-text/tetex/files/tetex-3.0_p1-amd64-xdvik-wp.patch
new file mode 100644
index 000000000000..b8d006290d8e
--- /dev/null
+++ b/app-text/tetex/files/tetex-3.0_p1-amd64-xdvik-wp.patch
@@ -0,0 +1,26 @@
+--- tetex-src-3.0/texk/xdvik/x_util.c	2005-12-06 16:04:45.000000000 +0100
++++ tetex-src-3.0/texk/xdvik/x_util.c.new	2006-01-06 13:13:22.000000000 +0100
+@@ -205,15 +205,15 @@
+     w = (*((xuint32 *) window_p));
+ #else
+ # if WORDS_BIGENDIAN
+-    w = ((unsigned long)wp[0] << 24) |
+-	((unsigned long)wp[1] << 16) |
+-	((unsigned long)wp[2] << 8)  |
+-	(unsigned long)wp[3];
++    w = ((unsigned long)window_p[0] << 24) |
++	((unsigned long)window_p[1] << 16) |
++	((unsigned long)window_p[2] << 8)  |
++	(unsigned long)window_p[3];
+ # else
+-    w = ((unsigned long)wp[3] << 24) |
+-	((unsigned long)wp[2] << 16) |
+-	((unsigned long)wp[1] << 8)  |
+-	(unsigned long)wp[0];
++    w = ((unsigned long)window_p[3] << 24) |
++	((unsigned long)window_p[2] << 16) |
++	((unsigned long)window_p[1] << 8)  |
++	(unsigned long)window_p[0];
+ # endif
+ #endif
+     return w;
diff --git a/app-text/tetex/files/tetex-3.0_p1-mptest.patch b/app-text/tetex/files/tetex-3.0_p1-mptest.patch
new file mode 100644
index 000000000000..5b394dbf76ef
--- /dev/null
+++ b/app-text/tetex/files/tetex-3.0_p1-mptest.patch
@@ -0,0 +1,10 @@
+--- tetex-src-3.0/texk/web2c/tests/mptest.mp.old	2006-01-12 18:52:17.000000000 +0100
++++ tetex-src-3.0/texk/web2c/tests/mptest.mp	2006-01-12 18:52:42.000000000 +0100
+@@ -40,6 +40,6 @@
+ 
+ message("* Test for big numbers in btex...etex:");
+ picture q;
+-q = btex $2^{12} = 4096 \qquad 2^{15} = 32768$ etex;
++%q = btex $2^{12} = 4096 \qquad 2^{15} = 32768$ etex;
+ 
+ end.
diff --git a/app-text/tetex/tetex-3.0_p1.ebuild b/app-text/tetex/tetex-3.0_p1.ebuild
new file mode 100644
index 000000000000..46202aa3981c
--- /dev/null
+++ b/app-text/tetex/tetex-3.0_p1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-3.0_p1.ebuild,v 1.1 2006/01/13 19:52:31 nattfodd Exp $
+
+inherit tetex-3 flag-o-matic versionator
+
+SMALL_PV=$(get_version_component_range 1-2 ${PV})
+TETEX_TEXMF_PV=${SMALL_PV}
+S=${WORKDIR}/tetex-src-${SMALL_PV}
+
+TETEX_SRC="tetex-src-${PV}.tar.gz"
+TETEX_TEXMF="tetex-texmf-${TETEX_TEXMF_PV:-${TETEX_PV}}.tar.gz"
+#TETEX_TEXMF_SRC="tetex-texmfsrc-${TETEX_TEXMF_PV:-${TETEX_PV}}.tar.gz"
+TETEX_TEXMF_SRC=""
+
+DESCRIPTION="a complete TeX distribution"
+HOMEPAGE="http://tug.org/teTeX/"
+
+SRC_PATH_TETEX=ftp://cam.ctan.org/tex-archive/systems/unix/teTeX/current/distrib
+SRC_URI="http://dev.gentoo.org/~nattfodd/tetex/${TETEX_SRC}
+	${SRC_PATH_TETEX}/${TETEX_TEXMF}
+	http://dev.gentoo.org/~nattfodd/tetex/${P}-gentoo.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc ~x86"
+
+# these are defined in tetex.eclass and tetex-3.eclass
+IUSE=""
+DEPEND=""
+
+src_unpack() {
+	tetex-3_src_unpack
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-${SMALL_PV}-kpathsea-pic.patch
+
+	# bug 85404
+	epatch ${FILESDIR}/${PN}-${SMALL_PV}-epstopdf-wrong-rotation.patch
+
+	epatch ${FILESDIR}/${P}-amd64-xdvik-wp.patch
+	epatch ${FILESDIR}/${P}-mptest.patch
+}
+
+src_test() {
+	fmtutil --fmtdir "${S}/texk/web2c" --all
+	make check
+}
+
+src_install() {
+	tetex-3_src_install
+
+	# virtex was removed from tetex-3
+	dosym /usr/bin/tex /usr/bin/virtex
+	dosym /usr/bin/pdftex /usr/bin/pdfvirtex
+}