Fix preview PNG generation with ghostscript-gpl-9.00, bug 351774.

Package-Manager: portage-2.1.9.31/cvs/Linux x86_64

4 files changed, 126 insertions, 7 deletions

diff --git a/app-emacs/auctex/ChangeLog b/app-emacs/auctex/ChangeLog
index 981c202d7795..91d281af1587 100644
--- a/app-emacs/auctex/ChangeLog
+++ b/app-emacs/auctex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/auctex
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/ChangeLog,v 1.105 2010/12/12 15:43:51 fauli Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/ChangeLog,v 1.106 2011/01/17 08:13:52 ulm Exp $
+
+*auctex-11.86-r1 (17 Jan 2011)
+
+  17 Jan 2011; Ulrich Mueller <ulm@gentoo.org> +auctex-11.86-r1.ebuild,
+  +files/auctex-11.86-ghostscript9.patch:
+  Fix preview PNG generation with ghostscript-gpl-9.00, bug 351774.
 
   12 Dec 2010; Christian Faulhammer <fauli@gentoo.org> -auctex-11.85.ebuild:
   clean up
diff --git a/app-emacs/auctex/Manifest b/app-emacs/auctex/Manifest
index 023c7a15d4b9..d8125609a85a 100644
--- a/app-emacs/auctex/Manifest
+++ b/app-emacs/auctex/Manifest
@@ -3,14 +3,16 @@ Hash: SHA1
 
 AUX 50auctex-gentoo.el 157 RMD160 7202a2c54b556987219f81f7ca29c735946e1a90 SHA1 e2d6f1145b48286facadbe33cbbba2bcda53e8c9 SHA256 ee6df844f12c72a9865f10ca7c25daf06ef64125c302de670aa1ba250a569fe5
 AUX 60auctex-gentoo.el 97 RMD160 cc04b10807e70d84fec9eca5559ea46f899f44a4 SHA1 1ad858370d33d7212410e55db568ca4548ab14e6 SHA256 3ff24a51655c0c8966119a70a68814ad4590553750b5a6545c33ba18c042934a
+AUX auctex-11.86-ghostscript9.patch 1516 RMD160 89d1286f5e67e9c9f3f97ec70bdc32d6148c4390 SHA1 865094de51dbada01583e37e77b8935778da86ac SHA256 556cf848fcd35b1f4fa883bc597fd8ad16e556bf67bc68069441f56a3784f7f1
 DIST auctex-11.86.tar.gz 1179117 RMD160 48c84c8e0a9d7659aeb80f579dc6807dd8f654a6 SHA1 af3dd156f8b2db7764c86d9f7de8abd5811d888a SHA256 3fc2cdbc0c8be1d385061ccb2e8c920b57344ea40eb44e014faf501c5d20e43b
+EBUILD auctex-11.86-r1.ebuild 2037 RMD160 6736770dbee89d9ea0ea0d0387216806969d62b8 SHA1 95bbe89d74b9938dcad855acda8b646e92825746 SHA256 65f51a61c631e726c1f1824fda837757872dc57b9488d5895e201b9e9c90005f
 EBUILD auctex-11.86.ebuild 1953 RMD160 b0788c0e4cb8c0a8249ad9cc9c3eba577e45fd60 SHA1 4e51f47a246a4c9851f2c78f17cbe83c1aa17f5e SHA256 3781a1cf0744ce8a177876972495bcbc0adbdf5ba8848354e47cf0641c8374a2
-MISC ChangeLog 15149 RMD160 1a80c60abaa1fc37d74391edec17ffc2b99bfb08 SHA1 06f1293a6ceea277d274b6406bbb76957f68caf4 SHA256 6127cccb3c6bad36d92c9ffeaf198e446f3ee02aff52706937cf356ed23ba9a0
+MISC ChangeLog 15362 RMD160 1e50df3bbf5da936e7f43e4f4f2bd667b1e42a06 SHA1 b923301f56f9c5b4d07498de505c957bc1d5e854 SHA256 ecc1c71e4636dded8ad4e6fc91ab96df7ac83ed30a7c13b2010b8f49f0d3cce7
 MISC metadata.xml 732 RMD160 44b702f27e31280b8101aa173b16916ca9f52592 SHA1 8468553535733c806287ce3e1c236b819d76bc8b SHA256 5cd2a8eed95d63857b4af490dbd6a539f8745739e9f40fcda6f99811ceece380
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk0E7kEACgkQNQqtfCuFneM++QCfb+M6/szANp1XhuBPJXhynOXX
-juYAnijQhDKmoHdcShKGHcP4amoMkglO
-=WTQx
+iEYEARECAAYFAk0z+4EACgkQOeoy/oIi7uzFhQCgxvFJLIydqs+67GxUU+Z72DnF
+ENAAoOn9KwOpp2OZ9EhB9ijmyJ6F4stE
+=uAP/
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/auctex/auctex-11.86-r1.ebuild b/app-emacs/auctex/auctex-11.86-r1.ebuild
new file mode 100644
index 000000000000..acd0bffdbaad
--- /dev/null
+++ b/app-emacs/auctex/auctex-11.86-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/auctex-11.86-r1.ebuild,v 1.1 2011/01/17 08:13:52 ulm Exp $
+
+EAPI=3
+
+inherit elisp eutils 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.2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE="preview-latex"
+
+DEPEND="virtual/latex-base
+	preview-latex? ( !dev-tex/preview-latex
+		app-text/dvipng
+		app-text/ghostscript-gpl )"
+RDEPEND="${DEPEND}"
+
+ELISP_PATCHES="${P}-ghostscript9.patch"
+TEXMF="/usr/share/texmf-site"
+
+src_prepare() {
+	elisp_src_prepare
+}
+
+src_configure() {
+	# Remove broken Info file (will be recreated by the build system)
+	rm doc/auctex.info*
+
+	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) || die "econf failed"
+}
+
+src_compile() {
+	emake || die "emake failed"
+	cd doc; emake tex-ref.pdf || die "creation of tex-ref.pdf failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+	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
+	keepdir /var/lib/auctex
+	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.86-ghostscript9.patch b/app-emacs/auctex/files/auctex-11.86-ghostscript9.patch
new file mode 100644
index 000000000000..e8ca32b183d8
--- /dev/null
+++ b/app-emacs/auctex/files/auctex-11.86-ghostscript9.patch
@@ -0,0 +1,42 @@
+http://bugs.gentoo.org/351774
+Patch from upstream CVS
+
+--- auctex-11.86-orig/preview/preview.el
++++ auctex-11.86/preview/preview.el
+@@ -355,7 +355,7 @@
+   :group 'preview-gs
+   :type 'string)
+ 
+-(defcustom preview-gs-options '("-q" "-dSAFER" "-dNOPAUSE"
++(defcustom preview-gs-options '("-q" "-dDELAYSAFER" "-dNOPAUSE"
+ 				"-DNOPLATFONTS" "-dPrinted"
+ 				"-dTextAlphaBits=4"
+ 				"-dGraphicsAlphaBits=4")
+@@ -1066,14 +1066,21 @@
+ 
+ (defun preview-prepare-fast-conversion ()
+   "This fixes up all parameters for fast conversion."
+-  (let ((file (if (consp (car preview-ps-file))
+-		  (if (consp (caar preview-ps-file))
+-		      (car (last (caar preview-ps-file)))
+-		    (caar preview-ps-file))
+-		(car preview-ps-file))))
++  (let* ((file (if (consp (car preview-ps-file))
++		   (if (consp (caar preview-ps-file))
++		       (car (last (caar preview-ps-file)))
++		     (caar preview-ps-file))
++		 (car preview-ps-file)))
++	 (all-files (if (and (consp (car preview-ps-file))
++			     (consp (caar preview-ps-file)))
++			(caar preview-ps-file)
++		      (list file))))
+     (setq preview-gs-dsc (preview-dsc-parse file))
+     (setq preview-gs-init-string
+-	  (concat preview-gs-init-string
++	  (concat (format "{<</PermitFileReading[%s]>> setuserparams \
++.locksafe} stopped pop "
++			  (mapconcat 'preview-ps-quote-filename all-files ""))
++		  preview-gs-init-string
+ 		  (format "[%s(r)file]aload exch %s .runandhide aload pop "
+ 			  (preview-ps-quote-filename file)
+ 			  (preview-gs-dsc-cvx 0 preview-gs-dsc))))))