Fix texmf-update for Prefix, bug #482346c1

Package-Manager: portage-2.2.01.22288-prefix/cvs/Darwin i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

4 files changed, 182 insertions, 10 deletions

diff --git a/dev-libs/kpathsea/ChangeLog b/dev-libs/kpathsea/ChangeLog
index 6da98a51bad1..34ddd6a20487 100644
--- a/dev-libs/kpathsea/ChangeLog
+++ b/dev-libs/kpathsea/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/kpathsea
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/kpathsea/ChangeLog,v 1.42 2013/06/27 15:08:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/kpathsea/ChangeLog,v 1.43 2013/08/31 09:41:16 grobian Exp $
+
+  31 Aug 2013; Fabian Groffen <grobian@gentoo.org> +files/texmf-update-r1,
+  kpathsea-6.1.1_p20130530.ebuild:
+  Fix texmf-update for Prefix, bug #482346c1
 
 *kpathsea-6.1.1_p20130530 (27 Jun 2013)
 
diff --git a/dev-libs/kpathsea/Manifest b/dev-libs/kpathsea/Manifest
index 1f1596454eb7..f774926b4f42 100644
--- a/dev-libs/kpathsea/Manifest
+++ b/dev-libs/kpathsea/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX invocname.patch 800 SHA256 99d132726cf4d385fb53d230463f52c9f13b00e15a82ff3f6098dc3a3ce5474f SHA512 8c5e0d3fb8c4c97b4d0904a4cba985c4856f60625135a7289bd6ca9f99c331a8ab0dca9fdbdc4a1fd9377d0238ee4190f34ab8232a258030f844343e600024ba WHIRLPOOL 8c506d0102be0d9fc3efb917664b63850189a05c16ec370da32a36d857abef26934eb2cd8f0fe42b3e215e431fa81b629465624240dc2bed71f09e845af07f7f
 AUX texmf-update 5163 SHA256 b19566f0c8032a7f24ee0ead26d627e306ee360aa8a5948a1256bc2760f89856 SHA512 e89bb321b438a70c23db587ac092cb8a98c783157c42bf1df80dce00e10c58741b5a6c685a3ee5511b61f4a2a98b833faf3d6d8f8dc24ab2e4a4342875d8454c WHIRLPOOL c62b97abaadf95b1452851ac88a7575001ca09f4e26f8e582f6fffde0b90c5fdafc0d78f3ec030152bd34a7cec44e5ae2ad2bab46d978dabb90a69d4b6f95b41
+AUX texmf-update-r1 5941 SHA256 01010591ac42aaef54dd18d9f8cfde6bf0d198c75b5dc2097ed5e8b5904bacc2 SHA512 d8857deef2e90ccc89d688eeaa792cba712e0dc023cb9602c10b95f695c92ab43b96fff11f41a585a9a306baad9205c540cb4c9172c9c128406dbd249e0e87cd WHIRLPOOL a569996b3a59f0af2a99d177220bdc88853507bb4fec55f40829db6765f39f5ad16a058c908dbdce188083c0b09419385651a330350e959cdee119b15c9643f2
 DIST kpathsea-texmf.d-3.tar.xz 10540 SHA256 44e407b6daecd1a1943f650d2cb412d784b472fad26d3e9257bac8e8a741c706 SHA512 0b15274ac4d6eaddfac7ecd3396126f0448d29776614fbd8483c2a5cc44183871a17bcf887a42022fe4bf9b93da2d4175b4292bc1b8a516d900d19c5c5b1bc5a WHIRLPOOL a0e77c6b3539133ee60ca10a45c8622222ed92005c3451b3b541933b0dcc24612b0dd1f7947fd255a43cebbe84d77feba452be00fa9b73a30f1b862bd68f9398
 DIST kpathsea-texmf.d-4.tar.xz 11148 SHA256 d5cc455db13afb9a229892380f835e57e932aedf8d02c8f12895ce682888b88e SHA512 a2906e4f8ec0fdbe31d618878a0633ab52f8dc71ef31d7608190d1f37bf3003b6d2c204520edc249c0c49b8f7308f24a283ca9510033378442093a8194a7bea5 WHIRLPOOL ba1a9aec8f5c040f7124d0720d2600bdb9253d82c859249c871576ac1c5255b81d0b14c3cd381ff8b2e5aae021e694383f93fee3459603615f7187daef35ec2e
 DIST kpathsea-texmf.d-5.tar.xz 11180 SHA256 85d9e1ed697859952a3ba273314f8670454016f3cd1988f0ea17f0cab8630a19 SHA512 23e8134340ae6f10baddef91f642a34c9289d84ccf791bd66779e794cfeed4eeadebd8cb1062e2e545a042e9c64cc9121f893279ddf776aae11c30baffc7f3af WHIRLPOOL b432effa293c410d019b20fa9dc848f3e67b71bb66af27b4e41ed814df688b933ffb30831411358222e170f75c38d2733e671c8224025516cc9c2aed0be8599d
@@ -17,13 +18,13 @@ DIST texlive-module-kpathsea.doc-2012.tar.xz 1092220 SHA256 df92d722d168a527669e
 DIST texlive-module-kpathsea.doc-2013.tar.xz 1086956 SHA256 2697dd13f35e0c51254c0857fecc4cf480d7ab1799325e4996e7a39380b77b38 SHA512 8bab0f70815b0298c62be560974d213c2e29b95bf06181598d976c962e1ecb66da5a3d6facd711adfd70dc1bdb64228b2916cdac568c1165324e348b0adda678 WHIRLPOOL b6ca6dd58b8b4216f4bb256aef4f206b8413afec911d42365ddfc59f10a62b4ef342eeea56ede962236fc90cd4e2a08e27f4705e892b32f8b4b427ecc8d03a4a
 EBUILD kpathsea-6.0.1_p20110705.ebuild 3190 SHA256 cdf68bd5c046f710b1844f83526569425e8fbdb43686d8b488f60b4a6b1ea195 SHA512 031162c17518b88a1bed2ebc44259b5d05795e2619fb6b76733236c7b0cce359d9de8ba20f75241790e65ff8177bedad6d69883a13f18f5651bf58a67ff29b33 WHIRLPOOL d272a91be02c0f8262ea83ada66027fbbee4939c54e411595658739d88edd922612f9c9aa6898a7ae67da5e82387e78e821670b536dbf851162a1c904e2d6ae7
 EBUILD kpathsea-6.1.0_p20120701.ebuild 3213 SHA256 bda76422c6558e2bada9b0282c021feceae2274d5406434aec7e9991df862677 SHA512 1fecb050de02b966189c0390c1a3fa638f93c630625cf3ea0bb33e682459ccfb927917d0df63f2a9822987fc59c99b55c6495f7c45956fba6d834d499ccc8303 WHIRLPOOL b7fc5cea811282526dd73cb6b50f4d1635a5c29ad4f90d0bc99bff23af8df2365e6e6c2407757035bca63a195003da8de726713ef8970a338bb83fa3177f68f3
-EBUILD kpathsea-6.1.1_p20130530.ebuild 3322 SHA256 b83dc5cf6fb93e59628cb739f57b1777518124646f82d2d22809766b242017f2 SHA512 dafae37ab1f0cd57f339c059a1f85e4b3226fce94d2a11bd1533d2c8cc315b4926f85e2440b762ae009b3ba4a96b31a0fd4d6d52176c03422a3ffdc9e653cbb1 WHIRLPOOL e8531d96ea70eb5a62e6217e9ad8f2b0f6b6f6dd534b6a0fc63d4ea7cd9f610c52d5b304e6b0d0c180333ad451acdc92c96c7ee0839dd2c2434b9dd65a4b06f4
-MISC ChangeLog 6024 SHA256 9fe315a6b032df0fb7a849972aa2d130068d869986dd7bc5d692c25c172579a6 SHA512 cf7931407ff016715a66d8356246e5d4de45a3cad6773300bd593055b9ae18c6f50b8b2b945e0f12933ef8f84161ecdf06839b9c82cb84fe4f740bd3f82138f4 WHIRLPOOL c99af2af2e9958e80d18fa2dc2a54eb094d8010b2284ef197ae5a320be85d6d5014c5df57623c37ab943b77675d72aec1679f4dca59f002667e1c1f0097fd1ee
+EBUILD kpathsea-6.1.1_p20130530.ebuild 3407 SHA256 2c898b52a3aeeda6c819422ecc9be5e25f94f2c4c66942bb4aa38779d48d0ce7 SHA512 0d08473c72883a213deaaa1276c338c5bdd375a9584eb142713537f055f40e4f49d0bad656cf9163577ae380215d4202242f1616252ab16ad2ac7c9b41c27171 WHIRLPOOL a777304ad1700321da37645193822fbf83d9d3e5981fc9ab948ac1e6bdc003436d88e975dd12ea951f40c762240095c34268ed4a55c7ac06d05b8dc12e197882
+MISC ChangeLog 6179 SHA256 34d0125b3c9418525f7e1519d5441048b5e4b6882a96364fb8f4964cfc4baf30 SHA512 300db6d136bebbba382a7b184299dd45a41dbf7579786de5d9b5e2b92540ffc27615baeea7d65ec03b6f390d7a3073af5dc269c1d23603b9a4f59d9201a26801 WHIRLPOOL de2a494485149f8615fa56de55850d0fc6680fde3c64fd83b01db63e9424a4b555b5b50b3e4db5a8939c0c88439b061a901ef5f5af5a1e2a7a54c5cd70ad81c2
 MISC metadata.xml 254 SHA256 78294df0a1d0e815b05f968bb43c4272d420e3025a38ea2d4fe6193a918a8e10 SHA512 1d0e4d92def0b0187a09480fb289fecf98812c95736ef3772e0763a1572181f6f31ae558b1dd9bdcfad3bf3768440122ee774ec56f1a9d4b18103a8a8efcb6d0 WHIRLPOOL c033be17e138d0533bd36185df412dc39ed32269b8875e53417f9e320461e7dcf9133479f2497cbaa3ef579dd65b7ac25490976c7c9a3250fc606e5448415268
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (Darwin)
 
-iEYEAREIAAYFAlHMVXEACgkQvFcC4BYPU0rJDwCgjigF8cJY8Zpz1W5jp7PJX1tq
-21oAnRzoxoLUKayb5e8NGEUj9Z3B/uQ7
-=uZ7e
+iEYEAREIAAYFAlIhulcACgkQX3X2B8XHTomNTgCeJPZpEbaikoUvc1GIKDJ8S+dp
+QGMAoIJ09M6/Qy9VdiKdwBF2MHdORPRn
+=PWu9
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/kpathsea/files/texmf-update-r1 b/dev-libs/kpathsea/files/texmf-update-r1
new file mode 100644
index 000000000000..f97d527c720f
--- /dev/null
+++ b/dev-libs/kpathsea/files/texmf-update-r1
@@ -0,0 +1,165 @@
+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
+#
+# Utility to update Gentoo TeXLive distribution configuration files
+#
+
+echo "Configuring TeXLive ..."
+
+PATH="@GENTOO_PORTAGE_EPREFIX@"/bin:"@GENTOO_PORTAGE_EPREFIX@"/usr/bin
+
+# Fix for all those with altered umask for root
+umask 022
+
+# Make sure we have a correct environment, bug #30432
+# The list of env. vars is taken from the INSTALL file
+for texvar in AFMFONTS BIBINPUTS BSTINPUTS DVILJFONTS DVIPSFONTS \
+	DVIPSHEADERS GFFONTS GLYPHFONTS INDEXSTYLE MFBASES MFINPUTS \
+	MFPOOL MFTINPUTS MPINPUTS MPMEMS MPPOOL MPSUPPORT OCPINPUTS \
+	OFMFONTS OPLFONTS OTPINPUTS OVFFONTS OVPFONTS PKFONTS PSHEADERS \
+	T1FONTS T1INPUTS TEXBIB TEXCONFIG TEXDOCS TEXFONTMAPS TEXFONTS \
+	TEXFORMATS TEXINDEXSTYLE TEXINPUTS TEXMFCNF TEXMFDBS TEXMFINI \
+	TEXPICTS TEXPKS TEXPOOL TEXPSHEADERS TEXSOURCES TFMFONTS TRFONTS \
+	VFFONTS XDVIFONTS XDVIVFS ; do
+
+	if [ "${!texvar}" ]; then
+		if ! $(echo ${!texvar} | grep '^:\|::\|:$' &>/dev/null) ; then
+			export ${texvar}="${!texvar}:"
+		fi
+	fi
+done
+
+if [ "$TEXINPUTS" ]; then
+	if $(echo ${TEXINPUTS} | grep '@GENTOO_PORTAGE_EPREFIX@/usr/share/texmf' &>/dev/null) ; then
+		export TEXINPUTS=$(echo ${TEXINPUTS} | sed -e 's|@GENTOO_PORTAGE_EPREFIX@/usr/share/texmf/*:\?||g')
+	elif $(echo ${TEXINPUTS} | grep '@GENTOO_PORTAGE_EPREFIX@/var/lib/texmf' &>/dev/null) ; then
+		export TEXINPUTS=$(echo ${TEXINPUTS} | sed -e 's|@GENTOO_PORTAGE_EPREFIX@/var/lib/texmf/*:\?||g')
+	fi
+fi
+
+MKTEMP_COMMAND="mktemp -t tmp.XXXXXXXXXX"
+DIFF_COMMAND="cmp -s"
+TEMP_FILE="`${MKTEMP_COMMAND}`"
+
+if [ -z "${TEMP_FILE}" ]; then
+    exit
+fi
+
+# check whether config files for fmtutil and updmap have changed
+STATUS_FMTUTIL="0"
+STATUS_UPDMAP="0"
+
+if [ -d "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/texmf.d ]; then
+    echo "Generating @GENTOO_PORTAGE_EPREFIX@/etc/texmf/web2c/texmf.cnf from @GENTOO_PORTAGE_EPREFIX@/etc/texmf/texmf.d ..."
+    cat "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/texmf.d/*.cnf > "@GENTOO_PORTAGE_EPREFIX@/etc/texmf/web2c/texmf.cnf"
+fi
+
+if [ -d "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/fmtutil.d ]; then
+    echo "Generating @GENTOO_PORTAGE_EPREFIX@/etc/texmf/web2c/fmtutil.cnf from @GENTOO_PORTAGE_EPREFIX@/etc/texmf/fmtutil.d ..."
+    if [ -f "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/web2c/fmtutil.cnf ]; then
+	cp -f "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/web2c/fmtutil.cnf ${TEMP_FILE}
+    else
+	touch ${TEMP_FILE}
+    fi
+    cat "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/fmtutil.d/*.cnf > "@GENTOO_PORTAGE_EPREFIX@/etc/texmf/web2c/fmtutil.cnf"
+    ${DIFF_COMMAND} "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/web2c/fmtutil.cnf ${TEMP_FILE}
+    STATUS_FMTUTIL="${STATUS_FMTUTIL}$?"
+else
+# if no regeneration took place:
+# always regenerate the formats to be on the safe side
+    STATUS_FMTUTIL="${STATUS_FMTUTIL}3"
+fi
+
+if [ -d "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/updmap.d ]; then
+    if [ -f "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/web2c/updmap.cfg ]; then
+	cp -f "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/web2c/updmap.cfg ${TEMP_FILE}
+    else
+	touch ${TEMP_FILE}
+    fi
+    echo "Generating @GENTOO_PORTAGE_EPREFIX@/etc/texmf/web2c/updmap.cfg from @GENTOO_PORTAGE_EPREFIX@/etc/texmf/updmap.d ..."
+    cat "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/updmap.d/*.cfg > "@GENTOO_PORTAGE_EPREFIX@/etc/texmf/web2c/updmap.cfg"
+    ${DIFF_COMMAND} "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/web2c/updmap.cfg ${TEMP_FILE}
+    STATUS_UPDMAP="${STATUS_UPDMAP}$?"
+else
+# if no regeneration could be done:
+# always regenerate the maps to be on the safe side
+    STATUS_UPDMAP="${STATUS_UPDMAP}3"
+fi
+
+echo "Generating ls-R files"
+mktexlsr &>/dev/null
+
+# Generate language.dat file, from texlive install-pkg.sh
+X=`kpsewhich language.dat`
+Z=`dirname $X`
+if [ -n "$X" -a -f "$Z/language.dat" -a -f "$Z/language.us" ] ; then
+    echo "Generating language.dat file"
+
+    # Save the old one, we will check if it has changed
+    cp -f "$Z/language.dat" "${TEMP_FILE}"
+
+    cat "$Z/language.us" > "$Z/language.dat"
+    for i in "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/language.dat.d/language.*.dat; do
+            [ -f "$i" ] && cat "$i" >> "$Z/language.dat"
+    done
+
+    ${DIFF_COMMAND} "$Z/language.dat" "${TEMP_FILE}"
+    STATUS_FMTUTIL="${STATUS_FMTUTIL}$?"
+fi
+
+# Generate language.def file.
+if [ -n "$X" -a -f "$Z/language.def" -a -f "$Z/language.us.def" ] ; then
+    echo "Generating language.def file"
+
+    # Save the old one, we will check if it has changed
+    cp -f "$Z/language.def" "${TEMP_FILE}"
+
+    cat "$Z/language.us.def" > "$Z/language.def"
+    for i in "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/language.def.d/language.*.def; do
+            [ -f "$i" ] && cat "$i" >> "$Z/language.def"
+    done
+    cat << EOF >> "$Z/language.def"
+%%% No changes may be made beyond this point.
+
+\uselanguage {USenglish}             %%% This MUST be the last line of the file.
+EOF
+
+    ${DIFF_COMMAND} "$Z/language.def" "${TEMP_FILE}"
+    STATUS_FMTUTIL="${STATUS_FMTUTIL}$?"
+fi
+
+# Generate language.dat.lua file.
+if [ -n "$X" -a -f "$Z/language.dat.lua" -a -f "$Z/language.us.lua" ] ; then
+    echo "Generating language.dat.lua file"
+
+    # Save the old one, we will check if it has changed
+    cp -f "$Z/language.dat.lua" "${TEMP_FILE}"
+
+    cat "$Z/language.us.lua" > "$Z/language.dat.lua"
+    for i in "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/language.dat.lua.d/language.*.dat.lua; do
+            [ -f "$i" ] && cat "$i" >> "$Z/language.dat.lua"
+    done
+    printf "}\n" >> "$Z/language.dat.lua"
+
+    ${DIFF_COMMAND} "$Z/language.dat.lua" "${TEMP_FILE}"
+    STATUS_FMTUTIL="${STATUS_FMTUTIL}$?"
+fi
+
+if [ "${STATUS_FMTUTIL}" -ne 0 ] ; then
+    echo "Generating format files ..."
+    fmtutil-sys --all &>/dev/null
+else
+    echo "Skipping format files, since they are unchanged"
+fi
+
+if [ "${STATUS_UPDMAP}" -ne 0 ] ; then
+    echo "Generating font maps..."
+    updmap-sys &>/dev/null
+else
+    echo "Skipping font maps, since they are unchanged"
+fi
+
+rm -f ${TEMP_FILE}
+
+echo
+echo "Use 'texconfig font ro'(rw) to disable (enable) font generation for users"
+echo
diff --git a/dev-libs/kpathsea/kpathsea-6.1.1_p20130530.ebuild b/dev-libs/kpathsea/kpathsea-6.1.1_p20130530.ebuild
index 77e270f97a53..b31c348ddc18 100644
--- a/dev-libs/kpathsea/kpathsea-6.1.1_p20130530.ebuild
+++ b/dev-libs/kpathsea/kpathsea-6.1.1_p20130530.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/kpathsea/kpathsea-6.1.1_p20130530.ebuild,v 1.1 2013/06/27 15:08:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/kpathsea/kpathsea-6.1.1_p20130530.ebuild,v 1.2 2013/08/31 09:41:16 grobian Exp $
 
 EAPI=5
 
-inherit texlive-common eutils libtool
+inherit texlive-common eutils libtool prefix
 
 TEXMFD_VERSION="5"
 
@@ -43,6 +43,8 @@ TEXMF_PATH=/usr/share/texmf-dist
 src_prepare() {
 	cd "${WORKDIR}/texlive-${PV#*_p}-source"
 	S="${WORKDIR}/texlive-${PV#*_p}-source" elibtoolize #sane .so versionning on gfbsd
+	cp "${FILESDIR}/texmf-update-r1" "${S}"/texmf-update
+	eprefixify "${S}"/texmf-update
 }
 
 src_configure() {
@@ -91,7 +93,7 @@ src_install() {
 	dosym /etc/texmf/web2c/fmtutil.cnf ${TEXMF_PATH}/web2c/fmtutil.cnf
 	dosym /etc/texmf/web2c/texmf.cnf ${TEXMF_PATH}/web2c/texmf.cnf
 
-	newsbin "${FILESDIR}/texmf-update" texmf-update
+	newsbin "${S}/texmf-update" texmf-update
 
 	# Keep it as that's where the formats will go
 	keepdir /var/lib/texmf