From: Christian Faulhammer Date: Sun, 4 Mar 2007 11:24:38 +0000 (+0000) Subject: added patch to allow compilation of Japanese (La)TeX files, fix taken from auctex... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ea9f7fa2282d66d59dd1b01593464e256bafbdd9;p=gentoo.git added patch to allow compilation of Japanese (La)TeX files, fix taken from auctex' CVS, fixes bug 169114 reported by MATSUI Tetsushi Package-Manager: portage-2.1.2-r9 --- diff --git a/app-emacs/auctex/ChangeLog b/app-emacs/auctex/ChangeLog index db0b2335b6c7..0b051fd5ca85 100644 --- a/app-emacs/auctex/ChangeLog +++ b/app-emacs/auctex/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-emacs/auctex # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/ChangeLog,v 1.53 2007/02/22 15:05:39 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/ChangeLog,v 1.54 2007/03/04 11:24:38 opfer Exp $ + +*auctex-11.84-r1 (04 Mar 2007) + + 04 Mar 2007; Christian Faulhammer + +files/auctex-11.84-japanes.patch, +auctex-11.84-r1.ebuild: + added patch to allow compilation of Japanese (La)TeX files, fix taken from + auctex' CVS, fixes bug 169114 reported by MATSUI Tetsushi + 22 Feb 2007; Christian Faulhammer auctex-11.84.ebuild: refined the checks for TEXMFSITE further. A non existing directory now lets diff --git a/app-emacs/auctex/Manifest b/app-emacs/auctex/Manifest index 745f82ab4f37..3ff9153bdf5a 100644 --- a/app-emacs/auctex/Manifest +++ b/app-emacs/auctex/Manifest @@ -33,6 +33,10 @@ AUX auctex-11.84-configure.diff 2883 RMD160 2bc1ab0ba1dba43ef7febc8de7274d8b1997 MD5 4cd69722910f9aff41d13de91cd8d593 files/auctex-11.84-configure.diff 2883 RMD160 2bc1ab0ba1dba43ef7febc8de7274d8b1997870c files/auctex-11.84-configure.diff 2883 SHA256 46728241b3149562e87b6479e7e30690578fb060a93f023872c22dba09f054be files/auctex-11.84-configure.diff 2883 +AUX auctex-11.84-japanes.patch 1175 RMD160 5b1d47cfc6a126d4872506311e0c09b4d891baa4 SHA1 914a8d17031b2efee5e58444b90261bb117d927f SHA256 8248e5a47d5d595ff372b231b4cd108a68985dc97a13b68acb942b814a8de180 +MD5 8c669aa8ae8b43ef7a884f30c28cd550 files/auctex-11.84-japanes.patch 1175 +RMD160 5b1d47cfc6a126d4872506311e0c09b4d891baa4 files/auctex-11.84-japanes.patch 1175 +SHA256 8248e5a47d5d595ff372b231b4cd108a68985dc97a13b68acb942b814a8de180 files/auctex-11.84-japanes.patch 1175 DIST auctex-11.55.tar.gz 536057 RMD160 9b3cd0cac9bb90205a0bc2be8638c2440434a03e SHA1 4a492753babbad06cf9b7c240595afffaf57b240 SHA256 db0e5a3ac6fbfc1154ddd8cf78fd84d511cfd8221577c1cbf9ec0dd2375189d2 DIST auctex-11.82.tar.gz 873084 RMD160 baeeb39ce7638edbfd12eee24fb58bf1c8673e4c SHA1 30362e622bb085a4b593088b5084f329111c4d4a SHA256 ace57b463b1c561caf5c676b2a0404138cd91ca4cfb902198963c5218fccf4c6 DIST auctex-11.83.tar.gz 889524 RMD160 3329c1910b00a699e19779fbf00035ce0c059d95 SHA1 c8f60579d07c34b1a364494d8a16f450b1322a7a SHA256 c5ee529d40574bfdce880e0d347cdf255a34cd5ff0a7f178dfdb238e621ef53d @@ -53,14 +57,18 @@ EBUILD auctex-11.83.ebuild 1460 RMD160 55a99bb64d0cf4f813d8d29128c60c1b165efca3 MD5 3967ccfcd8c6ab15c30a11dc4500619a auctex-11.83.ebuild 1460 RMD160 55a99bb64d0cf4f813d8d29128c60c1b165efca3 auctex-11.83.ebuild 1460 SHA256 e1245b381d9b75633c163b63ca816d4f48d12ab5e8effd5b1bb320033bb342f3 auctex-11.83.ebuild 1460 +EBUILD auctex-11.84-r1.ebuild 3193 RMD160 6b8292632516e72622c5fbd4f6cd648b766bc90f SHA1 638bc1e55b3d289b2d788706ea72a068151e8de1 SHA256 d75884264a5354268c8b8190e69d868436ea661476cda3c530176e7c535a5bd5 +MD5 7792ade4523ff50c1d8a362859765518 auctex-11.84-r1.ebuild 3193 +RMD160 6b8292632516e72622c5fbd4f6cd648b766bc90f auctex-11.84-r1.ebuild 3193 +SHA256 d75884264a5354268c8b8190e69d868436ea661476cda3c530176e7c535a5bd5 auctex-11.84-r1.ebuild 3193 EBUILD auctex-11.84.ebuild 3050 RMD160 02205c83171e5895a039d85e60fc4c4f46d33039 SHA1 b28499adb1365e0d1d2c35271a5b498d3ac89faf SHA256 0524c12aca6a8597b14837d22cd6db98dfc7c1290a61771bf70034daf8363180 MD5 adf71fe92bb98d68bd777de75df23668 auctex-11.84.ebuild 3050 RMD160 02205c83171e5895a039d85e60fc4c4f46d33039 auctex-11.84.ebuild 3050 SHA256 0524c12aca6a8597b14837d22cd6db98dfc7c1290a61771bf70034daf8363180 auctex-11.84.ebuild 3050 -MISC ChangeLog 8197 RMD160 fb878545abe4e747118309bfa59e4b2e24ea63d9 SHA1 a7fc0cbd899b5a964520e8a5bb165bff31f19b19 SHA256 d313b77b162de008d7a6c0451a5846d7eb5c8931a19e04441098533252344472 -MD5 a9eeebc90b30ab8c7c2a0880139784ee ChangeLog 8197 -RMD160 fb878545abe4e747118309bfa59e4b2e24ea63d9 ChangeLog 8197 -SHA256 d313b77b162de008d7a6c0451a5846d7eb5c8931a19e04441098533252344472 ChangeLog 8197 +MISC ChangeLog 8509 RMD160 5a9ccbaee88b2f0dded5300121fe5d6a336cd531 SHA1 bd258784b2d6b1d5b26f444cb0d5776e91ae4afa SHA256 63da122416a25871e918b2e53a6b7e5bbd84d58980a48130b1bcc11d175c0c67 +MD5 399a9d730fdeca43fb71b1b627d0c66a ChangeLog 8509 +RMD160 5a9ccbaee88b2f0dded5300121fe5d6a336cd531 ChangeLog 8509 +SHA256 63da122416a25871e918b2e53a6b7e5bbd84d58980a48130b1bcc11d175c0c67 ChangeLog 8509 MISC metadata.xml 183 RMD160 9036888055eed0a94ba8f96d506d4de97196dc66 SHA1 906c09951178010c79d12091bf0d56bf725af494 SHA256 486d1bdcc654f29f327cb9f227b5f4bd5ab32522b75b6be4e27255cbb7ee17b9 MD5 58f3ddc03b5e54563fc8a9764e687dd5 metadata.xml 183 RMD160 9036888055eed0a94ba8f96d506d4de97196dc66 metadata.xml 183 @@ -80,10 +88,13 @@ SHA256 37a219af82e2eb1a1fa7cdd01016ed769bed0c311e3160e1e73e432dcf3d6bef files/di MD5 815c11804f6af4382e3bfc36dc160c4f files/digest-auctex-11.84 238 RMD160 8e9361ff87c5c5809898f7771c2617fb99da9ad6 files/digest-auctex-11.84 238 SHA256 9f0fded779310d40f2aa923f5819df3e46de92d6dddeee0b8b7316a425af55bd files/digest-auctex-11.84 238 +MD5 815c11804f6af4382e3bfc36dc160c4f files/digest-auctex-11.84-r1 238 +RMD160 8e9361ff87c5c5809898f7771c2617fb99da9ad6 files/digest-auctex-11.84-r1 238 +SHA256 9f0fded779310d40f2aa923f5819df3e46de92d6dddeee0b8b7316a425af55bd files/digest-auctex-11.84-r1 238 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFF3bERNQqtfCuFneMRAiIaAKCMmL3GGa/NgVSfUmV2jd+dail8uwCfVPCt -Xjpk5IpcUQjO5uq6NKlL5Uo= -=IiEU +iD8DBQFF6qw7NQqtfCuFneMRAov+AKCdAeurC0zAAcZLvxSfgEqn1nR/iQCeISGN +rMYYQ8CtRHhpUiP0ADkaNdI= +=R7JA -----END PGP SIGNATURE----- diff --git a/app-emacs/auctex/auctex-11.84-r1.ebuild b/app-emacs/auctex/auctex-11.84-r1.ebuild new file mode 100644 index 000000000000..6e89859d833b --- /dev/null +++ b/app-emacs/auctex/auctex-11.84-r1.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/auctex-11.84-r1.ebuild,v 1.1 2007/03/04 11:24:38 opfer Exp $ + +inherit elisp eutils latex-package autotools + +DESCRIPTION="An extensible package that supports writing and formatting TeX files" +HOMEPAGE="http://www.gnu.org/software/auctex/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="preview-latex" + +DEPEND="virtual/tetex + preview-latex? ( !dev-tex/preview-latex + app-text/dvipng + virtual/ghostscript )" + +src_unpack() { + unpack ${A} + cd "${S}" + + # skip XEmacs detection. this is a workaround for emacs23 + epatch "${FILESDIR}/${P}-configure.diff" + # allow compilation of Japanese TeX files, fixed in upstream's CVS + # not needed for next release + epatch "${FILESDIR}/${P}-japanes.patch" +} + +src_compile() { + # Don't install in the main tree, as this causes file collisions + # with app-text/tetex, see bug #155944 + if use preview-latex; then + local TEXMFPATH="$(kpsewhich -var-value=TEXMFSITE)" + local TEXMFCONFIGFILE="$(kpsewhich texmf.cnf)" + + if [ -z "${TEXMFPATH}" ]; then + eerror "You haven't defined the TEXMFSITE variable in your TeX config." + eerror "Please do so in the file ${TEXMFCONFIGFILE:-/var/lib/texmf/web2c/texmf.cnf}" + die "Define TEXMFSITE in TeX configuration!" + else + # go through the colon separated list of directories (maybe only one) provided in the variable + # TEXMFPATH (generated from TEXMFSITE from TeX's config) and choose only the first entry. + # All entries are separated by colons, even when defined with semi-colons, kpsewhich changes + # the output to a generic format, so IFS has to be redefined. + local IFS="${IFS}:" + + for strippedpath in ${TEXMFPATH} + do + if [ -d ${strippedpath} ]; then + local PREVIEW_TEXMFDIR="${strippedpath}" + break + fi + done + + # verify if an existing path was chosen to prevent from installing into the wrong directory + if [ -z ${PREVIEW_TEXMFDIR} ]; then + eerror "TEXMFSITE does not contain any existing directory." + eerror "Please define an existing directory in your TeX config file" + eerror "${TEXMFCONFIGFILE:-/var/lib/texmf/web2c/texmf.cnf} or create at least one of the there specified directories" + die "TEXMFSITE variable did not contain an existing directory" + fi + + dodir "${PREVIEW_TEXMFDIR}" + fi + fi + + econf --disable-build-dir-test \ + --with-auto-dir="${D}/var/lib/auctex" \ + --with-lispdir="${D}/usr/share/emacs/site-lisp" \ + --with-texmf-dir="${D}/${PREVIEW_TEXMFDIR}" \ + $(use_enable preview-latex preview) || die "econf failed" + emake || die +} + +src_install() { + einstall || die + dosed ${SITELISP}/tex-site.el || die + elisp-site-file-install "${FILESDIR}/52auctex-gentoo.el" + if use preview-latex; then + elisp-site-file-install "${FILESDIR}/60auctex-gentoo.el" + fi + dodoc ChangeLog CHANGES README RELEASE TODO FAQ INSTALL* +} + +pkg_postinst() { + # rebuild TeX-inputfiles-database + use preview-latex && latex-package_pkg_postinst + elisp-site-regen +} + +pkg_postrm(){ + use preview-latex && latex-package_pkg_postrm + elisp-site-regen +} diff --git a/app-emacs/auctex/files/auctex-11.84-japanes.patch b/app-emacs/auctex/files/auctex-11.84-japanes.patch new file mode 100644 index 000000000000..197de6dc7b1e --- /dev/null +++ b/app-emacs/auctex/files/auctex-11.84-japanes.patch @@ -0,0 +1,20 @@ +--- tex-jp.el 7 Jun 2006 20:26:51 -0000 5.91 ++++ tex-jp.el 17 Jan 2007 01:32:02 -0000 5.92 +@@ -52,13 +52,13 @@ + ;; Changed to double quotes for Windows afflicted people. I don't + ;; use the %(latex) and %(tex) shorthands here because I have not + ;; clue whether Omega-related versions exist. --dak +- '(("jTeX" "%(PDF)jtex %S%(PDFout) \"%(mode)\\input %t\"" ++ '(("jTeX" "%(PDF)jtex %`%S%(PDFout)%(mode)%' %t" + TeX-run-TeX nil (plain-tex-mode) :help "Run NTT jTeX") +- ("jLaTeX" "%(PDF)jlatex %S%(PDFout) \"%(mode)\\input{%t}\"" ++ ("jLaTeX" "%(PDF)jlatex %`%S%(PDFout)%(mode)%' %t" + TeX-run-TeX nil (latex-mode) :help "Run NTT jLaTeX") +- ("pTeX" "%(PDF)ptex %S%(PDFout) \"%(mode)\\input %t\"" ++ ("pTeX" "%(PDF)ptex %`%S%(PDFout)%(mode)%' %t" + TeX-run-TeX nil (plain-tex-mode) :help "Run ASCII pTeX") +- ("pLaTeX" "%(PDF)platex %S%(PDFout) \"%(mode)\\input{%t}\"" ++ ("pLaTeX" "%(PDF)platex %`%S%(PDFout)%(mode)%' %t" + TeX-run-TeX nil (latex-mode) :help "Run ASCII pLaTeX") + ("Mendex" "mendex %s" TeX-run-command nil t :help "Create index file with mendex") + ("jBibTeX" "jbibtex %s" TeX-run-BibTeX nil t :help "Run jBibTeX")) \ No newline at end of file diff --git a/app-emacs/auctex/files/digest-auctex-11.84-r1 b/app-emacs/auctex/files/digest-auctex-11.84-r1 new file mode 100644 index 000000000000..c88a621c6913 --- /dev/null +++ b/app-emacs/auctex/files/digest-auctex-11.84-r1 @@ -0,0 +1,3 @@ +MD5 73970c51221524442c11cde13d0584e9 auctex-11.84.tar.gz 927517 +RMD160 305f5327eac1bfe7f2770deb6617a50926c65f4f auctex-11.84.tar.gz 927517 +SHA256 3f25e99ddecc21422bbddf27ecbfcab49b187eb00f69788aaba1cf818fe557d1 auctex-11.84.tar.gz 927517