From: Christian Faulhammer Date: Thu, 22 Feb 2007 12:49:55 +0000 (+0000) Subject: applied better checks for the contents of TEXMFSITE: if it is defined at all (emerge... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b2b9cf520153a8a803f464a4ae113a5474cd03de;p=gentoo.git applied better checks for the contents of TEXMFSITE: if it is defined at all (emerge process fails then), to choose an entry if several paths are in it and use the dodir function instead of an manual mkdir command Package-Manager: portage-2.1.2-r9 --- diff --git a/app-emacs/auctex/ChangeLog b/app-emacs/auctex/ChangeLog index edcc128006c9..d42bf1880ef9 100644 --- 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.51 2007/02/20 21:45:33 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/ChangeLog,v 1.52 2007/02/22 12:49:55 opfer Exp $ + + 22 Feb 2007; Christian Faulhammer auctex-11.84.ebuild: + applied better checks for the contents of TEXMFSITE: if it is defined at all + (emerge process fails then), to choose an entry if several paths are in it + and use the dodir function instead of an manual mkdir command 20 Feb 2007; Christian Faulhammer files/52auctex-gentoo.el: diff --git a/app-emacs/auctex/Manifest b/app-emacs/auctex/Manifest index bd44d4f40fe7..3b05e6552cbf 100644 --- 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 1774 RMD160 557786944d302e31c9dbe8986fb13bfaa633da4b SHA1 e9fdeddaa8bd6ee1dcebabc8fd38e67de37997ee SHA256 2ecbc3b8eaab2628a9dc5b18b165e77ed44945a619b5e7330a8c5b4520185262 -MD5 616e4189b6d00efbac3c4150e63d5c4f auctex-11.84.ebuild 1774 -RMD160 557786944d302e31c9dbe8986fb13bfaa633da4b auctex-11.84.ebuild 1774 -SHA256 2ecbc3b8eaab2628a9dc5b18b165e77ed44945a619b5e7330a8c5b4520185262 auctex-11.84.ebuild 1774 -MISC ChangeLog 7662 RMD160 e2f3d090f76ba8ff951d2f96176dc66a3e46bdaa SHA1 6205725cbdc984289d6f859068633eed272711fe SHA256 377a65cc60b9bec2539f4f6bdf6445170b7791488f90e81a7f5228176ba9049e -MD5 0e4dd545d30182c04d54a2cd9ae1d16f ChangeLog 7662 -RMD160 e2f3d090f76ba8ff951d2f96176dc66a3e46bdaa ChangeLog 7662 -SHA256 377a65cc60b9bec2539f4f6bdf6445170b7791488f90e81a7f5228176ba9049e ChangeLog 7662 +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 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) -iD8DBQFF22vWNQqtfCuFneMRAjyFAJ9IsHYXaBG8fLXy026WpItbCdhaFACgh7tM -GPAQBIZL8rpaGHfHCMLCggw= -=6jVY +iD8DBQFF3ZFTNQqtfCuFneMRAmdoAJ9GhqyD+R88N/AiPBCJQQuW/PyH8ACglunq +vf81X/TrGphXydwDQqvbs2A= +=1BLk -----END PGP SIGNATURE----- diff --git a/app-emacs/auctex/auctex-11.84.ebuild b/app-emacs/auctex/auctex-11.84.ebuild index f3f105049ceb..fab3716e5d3c 100644 --- 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.1 2007/01/15 10:13:43 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/auctex-11.84.ebuild,v 1.2 2007/02/22 12:49:55 opfer Exp $ inherit elisp eutils latex-package autotools @@ -29,9 +29,29 @@ 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}" + if use preview-latex; then + local TEXMFPATH="$(kpsewhich -var-value=TEXMFSITE)" + + 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 + local IFS="${IFS}:" + + for strippedpath in ${TEXMFPATH} + do + local PREVIEW_TEXMFDIR="${D}/${strippedpath}" + break + done + + dodir "${PREVIEW_TEXMFDIR}" + fi + fi econf --disable-build-dir-test \ --with-auto-dir="${D}/var/lib/auctex" \