Install TeX files in texmf-site; remove kpathsea workaround.

Package-Manager: portage-2.1.3.19

3 files changed, 29 insertions, 48 deletions

diff --git a/app-emacs/auctex/ChangeLog b/app-emacs/auctex/ChangeLog
index 4806c0029c80..650273265f4a 100644
--- a/app-emacs/auctex/ChangeLog
+++ b/app-emacs/auctex/ChangeLog
@@ -1,6 +1,9 @@
 # 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.71 2007/11/23 21:46:46 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/ChangeLog,v 1.72 2007/11/24 21:11:52 ulm Exp $
+
+  24 Nov 2007; Ulrich Mueller <ulm@gentoo.org> auctex-11.84-r3.ebuild:
+  Install TeX files in texmf-site; remove kpathsea workaround.
 
   23 Nov 2007; Markus Rothe <corsair@gentoo.org> auctex-11.84-r2.ebuild:
   Stable on ppc64; bug #199765
diff --git a/app-emacs/auctex/Manifest b/app-emacs/auctex/Manifest
index 69b571050ac0..1180f1953b05 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 157 RMD160 7202a2c54b556987219f81f7ca29c735946e1a90 SHA1 e2d6f1145b48286facadbe33cbbba2bcda53e8c9 SHA256 ee6df844f12c72a9865f10ca7c25daf06ef64125c302de670aa1ba250a569fe5
 MD5 484c00b8513e3f02f0903e4bb09ae034 files/50auctex-gentoo.el 157
 RMD160 7202a2c54b556987219f81f7ca29c735946e1a90 files/50auctex-gentoo.el 157
@@ -31,14 +34,14 @@ EBUILD auctex-11.84-r2.ebuild 3322 RMD160 e0a50a576888627f4363335cd94c315e129e4f
 MD5 99aba85b8e56d6bb017c9a73ecd71bf4 auctex-11.84-r2.ebuild 3322
 RMD160 e0a50a576888627f4363335cd94c315e129e4f61 auctex-11.84-r2.ebuild 3322
 SHA256 8ef6282238dd5dc186d30a34db161e21d90c92e9ca57915aa12c1605463911a2 auctex-11.84-r2.ebuild 3322
-EBUILD auctex-11.84-r3.ebuild 3396 RMD160 29757d7bc2a789f6a6cbf7179c6050a9a0e28ef0 SHA1 15eb745332238f530bfe3041289321350c270445 SHA256 5205e6f2a59f059b3a208fa35e008ea40f25e6b4198b1e9418045a03d98809c3
-MD5 fdd91fb0b3d3b5c6658e107b3cce95bb auctex-11.84-r3.ebuild 3396
-RMD160 29757d7bc2a789f6a6cbf7179c6050a9a0e28ef0 auctex-11.84-r3.ebuild 3396
-SHA256 5205e6f2a59f059b3a208fa35e008ea40f25e6b4198b1e9418045a03d98809c3 auctex-11.84-r3.ebuild 3396
-MISC ChangeLog 11182 RMD160 a423101201bb1125132a3028461f71f3ddc3109a SHA1 288a40aa0e48ec0390aa6e7056993a8dd8a1b8af SHA256 7ea3857c700d7ea488bca367cfee1d906417ec226350c887c4f98f24c7daac9c
-MD5 b914b558f00b3640684e2437c6e1cd97 ChangeLog 11182
-RMD160 a423101201bb1125132a3028461f71f3ddc3109a ChangeLog 11182
-SHA256 7ea3857c700d7ea488bca367cfee1d906417ec226350c887c4f98f24c7daac9c ChangeLog 11182
+EBUILD auctex-11.84-r3.ebuild 2021 RMD160 d80effd68117af056f93db3aea03e2f7651c101d SHA1 6b753021f462c3058ab955f9f25f95bcce762ff2 SHA256 88e142f8a9041f7f48eb406e463fd35d8380e898db60e08d1b52a1ec3cb1a488
+MD5 423d19380a48c409621d8b6b143da4f4 auctex-11.84-r3.ebuild 2021
+RMD160 d80effd68117af056f93db3aea03e2f7651c101d auctex-11.84-r3.ebuild 2021
+SHA256 88e142f8a9041f7f48eb406e463fd35d8380e898db60e08d1b52a1ec3cb1a488 auctex-11.84-r3.ebuild 2021
+MISC ChangeLog 11313 RMD160 7188455ad35e8e37277e19b37b8da9541cf6f83d SHA1 ba30b06abff0e59f4fa9643beb15cd54da528dc2 SHA256 2da64d3ce25cd53f58a414d70e738da5da5a73975e23c0cd0ff71df4f42e0241
+MD5 c95c108dce838ba1b6099718856aaf09 ChangeLog 11313
+RMD160 7188455ad35e8e37277e19b37b8da9541cf6f83d ChangeLog 11313
+SHA256 2da64d3ce25cd53f58a414d70e738da5da5a73975e23c0cd0ff71df4f42e0241 ChangeLog 11313
 MISC metadata.xml 175 RMD160 02f01e92a67d7710aaba396e841d532381b2eacb SHA1 43235866a53af449bf9cccd4cd9bb66220d8be73 SHA256 ed92147de58e8f114a4a5cda40f909fda97ac61411a5b613dd9d569ee1f099a4
 MD5 418979631f02d38fc0d46a6e95f9fede metadata.xml 175
 RMD160 02f01e92a67d7710aaba396e841d532381b2eacb metadata.xml 175
@@ -52,3 +55,10 @@ SHA256 9f0fded779310d40f2aa923f5819df3e46de92d6dddeee0b8b7316a425af55bd files/di
 MD5 815c11804f6af4382e3bfc36dc160c4f files/digest-auctex-11.84-r3 238
 RMD160 8e9361ff87c5c5809898f7771c2617fb99da9ad6 files/digest-auctex-11.84-r3 238
 SHA256 9f0fded779310d40f2aa923f5819df3e46de92d6dddeee0b8b7316a425af55bd files/digest-auctex-11.84-r3 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHSJOtOeoy/oIi7uwRAnYRAJ4uCE7FklkE4mXnxsZPoCExwZB9XgCdE4oY
+YEZTQWzwgUH5lcJscsESSXE=
+=MCgq
+-----END PGP SIGNATURE-----
diff --git a/app-emacs/auctex/auctex-11.84-r3.ebuild b/app-emacs/auctex/auctex-11.84-r3.ebuild
index 9bb3b5027807..e7f0317ebe8a 100644
--- a/app-emacs/auctex/auctex-11.84-r3.ebuild
+++ b/app-emacs/auctex/auctex-11.84-r3.ebuild
@@ -1,6 +1,6 @@
 # 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-r3.ebuild,v 1.1 2007/11/23 16:16:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/auctex-11.84-r3.ebuild,v 1.2 2007/11/24 21:11:52 ulm Exp $
 
 inherit elisp eutils latex-package
 
@@ -18,6 +18,10 @@ DEPEND="virtual/tetex
 		app-text/dvipng
 		virtual/ghostscript )"
 
+# Don't install in the main tree, as this causes file collisions
+# with app-text/tetex, see bug #155944
+TEXMF="/usr/share/texmf-site"
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -30,49 +34,12 @@ src_unpack() {
 }
 
 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="/var/lib/auctex" \
 		--with-lispdir="${SITELISP}/${PN}" \
 		--with-packagelispdir="${SITELISP}/${PN}" \
 		--with-packagedatadir="/usr/share/emacs/etc/${PN}" \
-		--with-texmf-dir="${PREVIEW_TEXMFDIR}" \
+		--with-texmf-dir="${TEXMF}" \
 		$(use_enable preview-latex preview) || die "econf failed"
 	emake || die "emake failed"
 	cd doc; emake tex-ref.pdf || die "creation of tex-ref.pdf failed"
@@ -84,6 +51,7 @@ src_install() {
 	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* doc/tex-ref.pdf
 }