added tetex dependency as it is not pulled in by dependencies above in any case; to prevent file collisions with app-text/tetex, TeX files for preview-latex are installed in TEXMFSITE (usually /usr/share/texmf-site/), see bug #155944, reported by Emiliano Vavassori <syntaxerrormmm@gmail.com>; added some quotes around variables

Package-Manager: portage-2.1.1-r2

3 files changed, 39 insertions, 13 deletions

diff --git a/app-emacs/auctex/ChangeLog b/app-emacs/auctex/ChangeLog
index ab16f1f489ad..d10666daa543 100644
--- a/app-emacs/auctex/ChangeLog
+++ b/app-emacs/auctex/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emacs/auctex
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/ChangeLog,v 1.47 2006/11/23 21:16:21 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/ChangeLog,v 1.48 2006/11/27 16:55:27 opfer Exp $
+
+  27 Nov 2006; Christian Faulhammer <opfer@gentoo.org>
+  auctex-11.83-r1.ebuild:
+  added tetex dependency as it is not pulled in by dependencies above in any
+  case; to prevent file collisions with app-text/tetex, TeX files for
+  preview-latex are installed in TEXMFSITE (usually /usr/share/texmf-site/),
+  see bug #155944, reported by Emiliano Vavassori <syntaxerrormmm@gmail.com>;
+  added some quotes around variables
 
   23 Nov 2006; Tobias Scherbaum <dertobi123@gentoo.org> auctex-11.83.ebuild:
   ppc stable, bug #154240
diff --git a/app-emacs/auctex/Manifest b/app-emacs/auctex/Manifest
index 81ba48c5c7cd..fbbae9a3ff5b 100644
--- a/app-emacs/auctex/Manifest
+++ b/app-emacs/auctex/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50auctex-gentoo.el 57 RMD160 21066761032c9ee7c0853c7f6cf7fa47c9827ca4 SHA1 86388c4c1fdc1cdc45e19a3c26b360556842b26c SHA256 cb40c131b3aa2fa3e994a6cb20ff67d79c7c0110093ec5840f2b6aef7bce7711
 MD5 07f98857b9cd7c49631f6b5cb42f9778 files/50auctex-gentoo.el 57
 RMD160 21066761032c9ee7c0853c7f6cf7fa47c9827ca4 files/50auctex-gentoo.el 57
@@ -41,18 +44,18 @@ EBUILD auctex-11.82.ebuild 1428 RMD160 e3e5370479c3bbb50508034cc3daad23b01e33c7
 MD5 24080e49d2d8bb2d64f4b19102d81823 auctex-11.82.ebuild 1428
 RMD160 e3e5370479c3bbb50508034cc3daad23b01e33c7 auctex-11.82.ebuild 1428
 SHA256 380094041ac62094961ce5e4727af8e3a0b52cbb30fbddd84760fd6bed44459c auctex-11.82.ebuild 1428
-EBUILD auctex-11.83-r1.ebuild 1479 RMD160 d843517caeef18e1d63451eb2c00b70276847365 SHA1 fff0d159151fb92d3fb67ee1c68e3789995944a9 SHA256 a37b9f904f2ec23ad4783c95036a3b4c1500884fc3cbabc0ebecf003d8d0eb77
-MD5 aa0f1d963622ee59a3286d4c54873831 auctex-11.83-r1.ebuild 1479
-RMD160 d843517caeef18e1d63451eb2c00b70276847365 auctex-11.83-r1.ebuild 1479
-SHA256 a37b9f904f2ec23ad4783c95036a3b4c1500884fc3cbabc0ebecf003d8d0eb77 auctex-11.83-r1.ebuild 1479
+EBUILD auctex-11.83-r1.ebuild 1794 RMD160 406cbc5050649f6c2fd823282271ad3b43765015 SHA1 5afde167d795760cd5d18c27cd7d6f611267f792 SHA256 a2f96713c5e56150e25b5771fc13b07a8e94cdb8b7cdf86734d89cb170029ec9
+MD5 1a2641519c2ac037bdc13da3db7f5b18 auctex-11.83-r1.ebuild 1794
+RMD160 406cbc5050649f6c2fd823282271ad3b43765015 auctex-11.83-r1.ebuild 1794
+SHA256 a2f96713c5e56150e25b5771fc13b07a8e94cdb8b7cdf86734d89cb170029ec9 auctex-11.83-r1.ebuild 1794
 EBUILD auctex-11.83.ebuild 1464 RMD160 294f425011c6ee1d5db69270a7536b0c9530733a SHA1 40bd6e0d860bc044ec5208b0dc220b99d13c77d7 SHA256 a7159ce6d3e01076f075f772953c4497ae01ba4b964d82cedaa84b39031b45e2
 MD5 d62b5e5dd4a399bbbf996786b8482c0a auctex-11.83.ebuild 1464
 RMD160 294f425011c6ee1d5db69270a7536b0c9530733a auctex-11.83.ebuild 1464
 SHA256 a7159ce6d3e01076f075f772953c4497ae01ba4b964d82cedaa84b39031b45e2 auctex-11.83.ebuild 1464
-MISC ChangeLog 6564 RMD160 c357518d1ec1f0b80a75c62d56ac597440536e5a SHA1 791dc43c5f50a368fc2041010d8ac6a2c2916e7a SHA256 cc739ed10c9c25df65e179180ab6146de0a8b6dfc1e32e94adacbdfe3f6ad872
-MD5 1da94c2aff65654700ee6ced23cbee0b ChangeLog 6564
-RMD160 c357518d1ec1f0b80a75c62d56ac597440536e5a ChangeLog 6564
-SHA256 cc739ed10c9c25df65e179180ab6146de0a8b6dfc1e32e94adacbdfe3f6ad872 ChangeLog 6564
+MISC ChangeLog 6980 RMD160 7bc11e569b27ce45d1b923c7b748166274a5bcd2 SHA1 449774eadc71fa3af6df2e338f6dc81ef647f063 SHA256 80179d090bc96c56ace804a38fbe704c722923d785e5e2212206d5c76310f6f4
+MD5 d3ed6bb783d3b951fd718e63e0678db2 ChangeLog 6980
+RMD160 7bc11e569b27ce45d1b923c7b748166274a5bcd2 ChangeLog 6980
+SHA256 80179d090bc96c56ace804a38fbe704c722923d785e5e2212206d5c76310f6f4 ChangeLog 6980
 MISC metadata.xml 183 RMD160 9036888055eed0a94ba8f96d506d4de97196dc66 SHA1 906c09951178010c79d12091bf0d56bf725af494 SHA256 486d1bdcc654f29f327cb9f227b5f4bd5ab32522b75b6be4e27255cbb7ee17b9
 MD5 58f3ddc03b5e54563fc8a9764e687dd5 metadata.xml 183
 RMD160 9036888055eed0a94ba8f96d506d4de97196dc66 metadata.xml 183
@@ -69,3 +72,10 @@ SHA256 37a219af82e2eb1a1fa7cdd01016ed769bed0c311e3160e1e73e432dcf3d6bef files/di
 MD5 28365c5cd5146157b3d376e196bc7bc0 files/digest-auctex-11.83-r1 238
 RMD160 6eddee9e632bce7826b8afbc3254c02b573fb02a files/digest-auctex-11.83-r1 238
 SHA256 37a219af82e2eb1a1fa7cdd01016ed769bed0c311e3160e1e73e432dcf3d6bef files/digest-auctex-11.83-r1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFaxiKNQqtfCuFneMRApZcAJ9M4dknuQzSeA3sKW2c2L/G9pVhugCfXxN4
+bzSvgRPi/nrtrpFdT+g4Cno=
+=h61I
+-----END PGP SIGNATURE-----
diff --git a/app-emacs/auctex/auctex-11.83-r1.ebuild b/app-emacs/auctex/auctex-11.83-r1.ebuild
index efe90ec376bd..aa17defaae84 100644
--- a/app-emacs/auctex/auctex-11.83-r1.ebuild
+++ b/app-emacs/auctex/auctex-11.83-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/auctex-11.83-r1.ebuild,v 1.1 2006/11/22 07:57:41 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/auctex-11.83-r1.ebuild,v 1.2 2006/11/27 16:55:27 opfer Exp $
 
 inherit elisp eutils latex-package autotools
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="preview-latex"
 
-DEPEND="preview-latex? ( !dev-tex/preview-latex
+DEPEND="virtual/tetex
+	preview-latex? ( !dev-tex/preview-latex
 		app-text/dvipng
 		virtual/ghostscript )"
 
@@ -26,9 +27,16 @@ src_unpack() {
 }
 
 src_compile() {
+	# Don't install in the main tree, as this causes file collisions
+	# with app-text/tetex, see bug #155944
+	# Does no harm when used with USE=-preview-latex 
+	local PREVIEW_TEXMFDIR="${D}`kpsewhich -var-value=TEXMFSITE`"
+	mkdir -p "${PREVIEW_TEXMFDIR}"
+
 	econf --disable-build-dir-test \
-		--with-auto-dir=${D}/var/lib/auctex \
-		--with-lispdir=${D}/usr/share/emacs/site-lisp \
+		--with-auto-dir="${D}/var/lib/auctex" \
+		--with-lispdir="${D}/usr/share/emacs/site-lisp" \
+		--with-texmf-dir="${PREVIEW_TEXMFDIR}" \
 		$(use_enable preview-latex preview) || die "econf failed"
 	emake || die
 }