Fix incompatibility with jit-lock in Emacs 24.4. Patch from upstream.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

4 files changed, 117 insertions, 12 deletions

diff --git a/app-emacs/auctex/ChangeLog b/app-emacs/auctex/ChangeLog
index b38a3d2fb2c9..4c144f6c8c31 100644
--- a/app-emacs/auctex/ChangeLog
+++ b/app-emacs/auctex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/auctex
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/ChangeLog,v 1.119 2014/03/25 19:01:39 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/ChangeLog,v 1.120 2014/05/23 18:00:37 ulm Exp $
+
+*auctex-11.87-r1 (23 May 2014)
+
+  23 May 2014; Ulrich Müller <ulm@gentoo.org> +auctex-11.87-r1.ebuild,
+  +files/auctex-11.87-jit-lock.patch:
+  Fix incompatibility with jit-lock in Emacs 24.4. Patch from upstream.
 
   25 Mar 2014; Ulrich Müller <ulm@gentoo.org> -auctex-11.86-r1.ebuild,
   -files/auctex-11.86-ghostscript9.patch:
diff --git a/app-emacs/auctex/Manifest b/app-emacs/auctex/Manifest
index b0127b48d4c0..fa66677dc8c5 100644
--- a/app-emacs/auctex/Manifest
+++ b/app-emacs/auctex/Manifest
@@ -3,21 +3,23 @@ Hash: SHA256
 
 AUX 50auctex-gentoo.el 157 SHA256 ee6df844f12c72a9865f10ca7c25daf06ef64125c302de670aa1ba250a569fe5 SHA512 7cfc10c95da1d920b3861eaa9950d5ddd2388af5086cb81457f084f9c094b15dae9638a8c1e9b662dedba90c2d3c33a972011b99d9e2d71d85f99003de5ebef2 WHIRLPOOL 08307e1235137ffa8f8d7b10c1f0d2820c74789f40b56137721931f2321f7c8527a017ce3354532fd23c675c495ee33f2e420a88144cb5445a1b98a7578845c9
 AUX 60auctex-gentoo.el 97 SHA256 3ff24a51655c0c8966119a70a68814ad4590553750b5a6545c33ba18c042934a SHA512 2cf945ac36ad5b25afd723d04223556522ac901a469bdd47d0c7562beb985401df957acc100222df6d97f4335b6d3e8d003f6b00b86780eec0a906ff0fc2ccb4 WHIRLPOOL 4a0cdc6178b7f01abc2bd5f4101b3e1ef34ba1ac924e15c6be5a709ad6a8140cf313c4fdbf81117bec1a1a14e0508dee423abce6b46e3da1584c1f029aad8486
+AUX auctex-11.87-jit-lock.patch 1221 SHA256 f48620f9b617ba912fea8e0790452c9497082a16cf98e60c730cba6e7e597b99 SHA512 14cfb51a5f94fe68b641490d406db274f2f48aecf4dc24eec4774655b2dfbcfa85e983f4b78e67db10670d2462412f9e8eafca70b0350a08f45565a7a71522b1 WHIRLPOOL 63450dfaa52d0703ddeb5804d524694a149b691e7f1075c2788cdbfebc39cce7274e26a1194370e267757af6454f52e760dabd02f902b63ca6624785301cf152
 DIST auctex-11.87.tar.gz 1206073 SHA256 63d57229e585dbf727f5545337615b997488bfdf475274da0718c90b77bd5cf2 SHA512 41a575a36ef2c111f214ad2e87a06c246751859a14ad3f8af77aaf180d8357a4c8d44c2f344b673404d2e011cdf4a193abda93f1b26ffff663f310ed430c5fa1 WHIRLPOOL d3bee56c1b940a2eb041a5b3b6e5ffe876b740e97c5793dd9295b42723abb5febd1fc40d9a0007df5d63f00547a5a59202eca2c102dfb878924ac07dac504eb0
+EBUILD auctex-11.87-r1.ebuild 1776 SHA256 cfe741f0fedba5dc79a73a7bdd21596cff57894fb0645d4a0cd98a9d8cd85e43 SHA512 b773d77ef080099483eb02446df5b71ac707ed01f8a41e14fcf50ea2372780e2d01a97816b5a51b0e8370ccd0b87b4df5591c5600fe502b8b4dfcd80f79aaacf WHIRLPOOL 9d031d787e455596635e20b3599985f03b23a3512ee57f1528cc535b32a4a281f3a6d1ae4cdc5e8695a1c50c3d5bd473a1ad859ffa82112aa9161520f7265c06
 EBUILD auctex-11.87.ebuild 1695 SHA256 0d539b15eff56f41aaaf1b03bba917a165238e54892e4254e9e171d1ec0a6f55 SHA512 570c80f35e0a6d40cfe32d7e5a0a0ba613dfe0d4534ec6bb5b2a3211aaf0bbedc2d73bd4c160cac57e8fcce1c32ee8a445f5a02b2bf0244ea6202b161fb1217d WHIRLPOOL c23f49bac85b1d428641026972d0a0ffeb8c9a1f511ed584f1754a945a4f15bd0c4030dabc1d013e8af1e0b0de3f11d1f6ddf53dd627f66fbaa693b7d1e34277
-MISC ChangeLog 16827 SHA256 81d1cacd99d6aaf3106f7c7612417c8576126252200e2b9f2f7c53d074e46f7d SHA512 5ff37d914ee338b32fdceebbdf3cd4d32cd912a0c3652f46aad3b566032ee53baf66f277ae6467e9cc22e2cd55b6a801e7cbe45d32d51359489ac562b144ed0d WHIRLPOOL 5f8f64cfa5a730512cad6c5b12ddd13a8c14fd347984f73b3a3195299ac51820ca20ac2e3552e4706192a58007a114ac0bb4738e1315e7f5f2bc0e8f1d13b9f5
+MISC ChangeLog 17042 SHA256 f799026ebcc3263b0c38040361e04e87f28e9aacd422fe07c3ece139fe984eec SHA512 eea2a790f4040ede7527fbfcab2705695bfeb8c729bc18310d420228317ed828b1e905ab57a2b19b5f0345cdc8216b7bb591da0d3c68bff137fe92012f540e8a WHIRLPOOL 9207bbeacd24d6781c7ca8f1d20570f88ddc8b7f218abb7ca76d692c90a91541a40dcaa9cc93413453e75a114211c1a35ae111e4d296838ff610e2c737ca8c3e
 MISC metadata.xml 732 SHA256 5cd2a8eed95d63857b4af490dbd6a539f8745739e9f40fcda6f99811ceece380 SHA512 d2a8a78522ca7eada1b40dd3223c53d6ff96385f8c7f9bd516e23917b28b93936d73f1b52b5fa938d3d5dfcddbe9a90b699b7020f2407e8412cce5d621f03f37 WHIRLPOOL cfcd1fb442ef929a95c2270c9e4564ce309e1ca41413437842c37cd5d973162905c13fe94c6c548d3a890958b9e205d2ab764f79fcfd912e0686847c0e216f9f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQGcBAEBCAAGBQJTMdQqAAoJEJQzkH1pP7W4M5UL/1zj6YcmTvnLpZTI9oBJYVnO
-6jYf+iAw4vMEL8QwpJW4zvbGQ+c3zx1J1MqH7ORu3o1IDN6KzOgasTb4wij+yGlM
-o3x5RMpxLltYix8gjKaS70FgHDp4Tj2EJWQffKruvqnJkAsVA7kSS3lStIs7goVs
-4Q9xcjvItrzKwilCCN+9ri9JcDpVClkEzsbANA0CEclM3VobljHpsBk+bHg0GoU9
-1D4Hs5Yyvjaoj6z+TQ5v1sWnrPvXVVsHTPOeOQWmhixzOzOXpfoR/40hEBARVrqF
-adLwca84d+03VN7omEEdVb3t6xzkWCQx0YkluSm5183TZ+a1E+Em1IuFS30CKaAs
-KLxQBrvjbayIUS5mRqbGeBY6r9YRToEGbbtuuciovuObD6eu3n4ogL6+y2aDB1la
-fPPRErzX9KHFUkMhORktxljYXbVSx17luJ88qshaFzPHBsBIc0iCtW3FoSxqZoOi
-pTODV/cXxeWustCBaC3h4q8ZgS7Cosq4UoIiT/0emA==
-=NFFI
+iQGcBAEBCAAGBQJTf4zwAAoJEJQzkH1pP7W4eLQL/AtwPy7FzG+06WFFPj1rCKuV
+bucYjVNfJYBCGZTZ+T7zb+F6gYJL7ZCebBgCjr9Ztb+gLfQy080oxH3Vc1HXnsmS
+uDri+Ocy+vjnMf3waOdYUIi+WPhkZTu+OBojUHT3UcOXRCR4uUiuqfK3YwYdRIUK
+wlSeijlhzry2Rdu8VwnbAHkbFgXKUwAFGS5ZOADx5PFa36YKtnUoM8v5zKifYDHV
+zvqdr2NhbYs2HbLBVx8BHZyTXWHz+0rCbWUujCXW/PfsMUXVZLDdFYqnuYvIf9Xb
+2Y8K32U84YOB+m9aNseEXapxUy5f/tgSOnDwQ9YDjbMMNNBONtMK9uXYOG1cGfOL
+ULCccQUQEcxc30233bGSDtWvzGkvZy/PDdPL/2uTlqTxInnNJl48vAIuYRO1FIkm
+lJUd+H8BAQth1G9f2gYjd9riqQ/dHXRCUHUd+97cug0a3sawrfk3ZbdGUIcqAQJB
+uEGnQSHbgZ9LzTmRwzs/hXAgMNBrzl1dDScALDdQRw==
+=M4fX
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/auctex/auctex-11.87-r1.ebuild b/app-emacs/auctex/auctex-11.87-r1.ebuild
new file mode 100644
index 000000000000..2fea6e3619df
--- /dev/null
+++ b/app-emacs/auctex/auctex-11.87-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/auctex-11.87-r1.ebuild,v 1.1 2014/05/23 18:00:37 ulm Exp $
+
+EAPI=5
+
+inherit elisp latex-package
+
+DESCRIPTION="Extended support for writing, formatting and using (La)TeX, Texinfo and BibTeX files"
+HOMEPAGE="http://www.gnu.org/software/auctex/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE="preview-latex"
+
+DEPEND="virtual/latex-base
+	preview-latex? (
+		app-text/dvipng
+		app-text/ghostscript-gpl
+	)"
+RDEPEND="${DEPEND}"
+
+ELISP_PATCHES="${P}-jit-lock.patch"
+TEXMF="/usr/share/texmf-site"
+
+src_prepare() {
+	elisp_src_prepare
+}
+
+src_configure() {
+	EMACS_NAME=emacs EMACS_FLAVOUR=emacs econf --disable-build-dir-test \
+		--with-auto-dir="${EPREFIX}/var/lib/auctex" \
+		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		--with-packagelispdir="${EPREFIX}${SITELISP}/${PN}" \
+		--with-packagedatadir="${EPREFIX}${SITEETC}/${PN}" \
+		--with-texmf-dir="${EPREFIX}${TEXMF}" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable preview-latex preview)
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}"/fonts
+	emake
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" || die
+	if use preview-latex; then
+		elisp-site-file-install "${FILESDIR}/60${PN}-gentoo.el" || die
+	fi
+	dodoc ChangeLog CHANGES FAQ INSTALL README RELEASE TODO
+}
+
+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.87-jit-lock.patch b/app-emacs/auctex/files/auctex-11.87-jit-lock.patch
new file mode 100644
index 000000000000..5063a2f8d408
--- /dev/null
+++ b/app-emacs/auctex/files/auctex-11.87-jit-lock.patch
@@ -0,0 +1,31 @@
+commit 5b5ef6eeb0468c273a329a05d31b3788fd46b5d7
+Author: Mosè Giordano <giordano.mose@libero.it>
+Date:   Sun May 12 12:01:37 2013 +0200
+
+    Temporary fix for font-latex-jit-lock-force-redisplay.
+    
+    * font-latex.el (font-latex-jit-lock-force-redisplay): Don't rely
+    on existing `jit-lock-force-redisplay' because recent bzr Emacs
+    broke compatibility changing the number of arguments.  Reported by
+    Robert Goldman.
+
+--- auctex-11.87-orig/font-latex.el
++++ auctex-11.87/font-latex.el
+@@ -1220,8 +1220,6 @@
+ 
+ (defun font-latex-jit-lock-force-redisplay (buf start end)
+   "Compatibility for Emacsen not offering `jit-lock-force-redisplay'."
+-  (if (fboundp 'jit-lock-force-redisplay)
+-      (jit-lock-force-redisplay buf start end)
+     ;; The following block is an expansion of `jit-lock-force-redisplay'
+     ;; and involved macros taken from CVS Emacs on 2007-04-28.
+     (with-current-buffer buf
+@@ -1236,7 +1234,7 @@
+ 		  buffer-file-truename)
+ 	      (put-text-property start end 'fontified t))
+ 	  (unless modified
+-	    (restore-buffer-modified-p nil)))))))
++	    (restore-buffer-modified-p nil))))))
+ 
+ (defun font-latex-fontify-region (beg end &optional loudly)
+   "Fontify region from BEG to END.