refined the checks for TEXMFSITE further. A non existing directory now lets the...

Package-Manager: portage-2.1.2-r9

diff --git a/app-emacs/auctex/ChangeLog b/app-emacs/auctex/ChangeLog
index d42bf1880ef995543c3b200b3df86d4c45670f98..db0b2335b6c791a48574493dcd834dd7840e5368 100644 (file)
--- a/app-emacs/auctex/ChangeLog
+++ b/app-emacs/auctex/ChangeLog
@@ -1,6 +1,11 @@
 # 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.52 2007/02/22 12:49:55 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/ChangeLog,v 1.53 2007/02/22 15:05:39 opfer Exp $
+
+  22 Feb 2007; Christian Faulhammer <opfer@gentoo.org> auctex-11.84.ebuild:
+  refined the checks for TEXMFSITE further. A non existing directory now lets
+  the emerge process fail to prevent installing TeX files into weird
+  directories
 
   22 Feb 2007; Christian Faulhammer <opfer@gentoo.org> auctex-11.84.ebuild:
   applied better checks for the contents of TEXMFSITE: if it is defined at all

diff --git a/app-emacs/auctex/Manifest b/app-emacs/auctex/Manifest
index 3b05e6552cbf3593f56108533c3516af54fef7e2..745f82ab4f3732f42729bd9344044ad906c96a51 100644 (file)
--- a/app-emacs/auctex/Manifest
+++ b/app-emacs/auctex/Manifest
@@ -53,14 +53,14 @@ 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.ebuild 2378 RMD160 a81e362ba699606b319ce2f05dff13771dd147f0 SHA1 bf4894c6a90141134877e231dc7fb1c2dd1518b2 SHA256 0618397be65802309c750e9dfbb3eb5002d5daaa86352a1140796d0ce9b4650e
-MD5 237b835691c4a10e312f9bbffa71c834 auctex-11.84.ebuild 2378
-RMD160 a81e362ba699606b319ce2f05dff13771dd147f0 auctex-11.84.ebuild 2378
-SHA256 0618397be65802309c750e9dfbb3eb5002d5daaa86352a1140796d0ce9b4650e auctex-11.84.ebuild 2378
-MISC ChangeLog 7959 RMD160 94a585514e50d3b76e465b849d3097a0f2306f72 SHA1 31bf6d0b087cb3574185bc7f8fd51124d89d4a60 SHA256 f8d843251d8056f31bb9d0956c6dcfce7c3ae81d67b12026c5b77ad32b58f3fb
-MD5 5e67293b18ad3caef0f4e80584400939 ChangeLog 7959
-RMD160 94a585514e50d3b76e465b849d3097a0f2306f72 ChangeLog 7959
-SHA256 f8d843251d8056f31bb9d0956c6dcfce7c3ae81d67b12026c5b77ad32b58f3fb ChangeLog 7959
+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 metadata.xml 183 RMD160 9036888055eed0a94ba8f96d506d4de97196dc66 SHA1 906c09951178010c79d12091bf0d56bf725af494 SHA256 486d1bdcc654f29f327cb9f227b5f4bd5ab32522b75b6be4e27255cbb7ee17b9
 MD5 58f3ddc03b5e54563fc8a9764e687dd5 metadata.xml 183
 RMD160 9036888055eed0a94ba8f96d506d4de97196dc66 metadata.xml 183
@@ -83,7 +83,7 @@ SHA256 9f0fded779310d40f2aa923f5819df3e46de92d6dddeee0b8b7316a425af55bd files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFF3ZFTNQqtfCuFneMRAmdoAJ9GhqyD+R88N/AiPBCJQQuW/PyH8ACglunq
-vf81X/TrGphXydwDQqvbs2A=
-=1BLk
+iD8DBQFF3bERNQqtfCuFneMRAiIaAKCMmL3GGa/NgVSfUmV2jd+dail8uwCfVPCt
+Xjpk5IpcUQjO5uq6NKlL5Uo=
+=IiEU
 -----END PGP SIGNATURE-----

diff --git a/app-emacs/auctex/auctex-11.84.ebuild b/app-emacs/auctex/auctex-11.84.ebuild
index fab3716e5d3c265bb223468996ad3487a7769e5f..58b776ed6694e486535eb6bb7b31dcc5b29ecfdc 100644 (file)
--- a/app-emacs/auctex/auctex-11.84.ebuild
+++ b/app-emacs/auctex/auctex-11.84.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.ebuild,v 1.2 2007/02/22 12:49:55 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/auctex-11.84.ebuild,v 1.3 2007/02/22 15:05:39 opfer Exp $
 
 inherit elisp eutils latex-package autotools
 
@@ -31,24 +31,35 @@ src_compile() {
        # 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
-                       local TEXMFCONFIGFILE="$(kpsewhich texmf.cnf)"
-
                        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
+                       # 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
-                               local PREVIEW_TEXMFDIR="${D}/${strippedpath}"
-                               break
+                               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
@@ -56,7 +67,7 @@ src_compile() {
        econf --disable-build-dir-test \
                --with-auto-dir="${D}/var/lib/auctex" \
                --with-lispdir="${D}/usr/share/emacs/site-lisp" \
-               --with-texmf-dir="${PREVIEW_TEXMFDIR}" \
+               --with-texmf-dir="${D}/${PREVIEW_TEXMFDIR}" \
                $(use_enable preview-latex preview) || die "econf failed"
        emake || die
 }