more selective patterns for texmf-update to decide what to merge to texmf.cnf (*.cnf), fmtutil.cnf (*.cnf), updmap.cfg (*.cfg)

Package-Manager: portage-2.1.3.16

3 files changed, 30 insertions, 18 deletions

diff --git a/app-text/texlive-core/ChangeLog b/app-text/texlive-core/ChangeLog
index cae5dc6f8b49..9737dd2d168c 100644
--- a/app-text/texlive-core/ChangeLog
+++ b/app-text/texlive-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/texlive-core
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/ChangeLog,v 1.19 2007/10/28 18:26:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/ChangeLog,v 1.20 2007/10/28 18:43:32 aballier Exp $
+
+  28 Oct 2007; Alexis Ballier <aballier@gentoo.org> files/texmf-update:
+  more selective patterns for texmf-update to decide what to merge to
+  texmf.cnf (*.cnf), fmtutil.cnf (*.cnf), updmap.cfg (*.cfg)
 
   28 Oct 2007; Alexis Ballier <aballier@gentoo.org>
   texlive-core-2007-r2.ebuild:
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 1e1134f0e006..4182109600ca 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -49,10 +49,10 @@ AUX 2007/texmf.d/25misc.cnf 3189 RMD160 934dab4267d66e5652eb4a5bf2f243affe6c751c
 MD5 f9b20a8646e199fa04410c2dc82cb171 files/2007/texmf.d/25misc.cnf 3189
 RMD160 934dab4267d66e5652eb4a5bf2f243affe6c751c files/2007/texmf.d/25misc.cnf 3189
 SHA256 9c70635fbb40c8a70d0f7c1531630e788d6b7da38bed1ee8396278849de953dc files/2007/texmf.d/25misc.cnf 3189
-AUX texmf-update 2250 RMD160 ec13aea5ad1fc4f434e48aaa9b4253ad0737a82d SHA1 f84ba62d5eef3c1f1b75739f46e9404fc238a29d SHA256 edd78361be5cdb9d152fc32783cea5fdf485421b2b3c9a09c93e06ef3eecab99
-MD5 002a01c24f302ecf0cad92bfc3154fdb files/texmf-update 2250
-RMD160 ec13aea5ad1fc4f434e48aaa9b4253ad0737a82d files/texmf-update 2250
-SHA256 edd78361be5cdb9d152fc32783cea5fdf485421b2b3c9a09c93e06ef3eecab99 files/texmf-update 2250
+AUX texmf-update 2560 RMD160 5dfbf7738496e08305cc51375c1496ab74533a5b SHA1 8b4bda431b2696e3f5af0e781bb2bfc73641b739 SHA256 210f04e374c938e7fb3f08b8b70701f4911c21eca1ef0cd852b796a5cfaf2263
+MD5 aa4758afe15fd2366bc20795891db7a8 files/texmf-update 2560
+RMD160 5dfbf7738496e08305cc51375c1496ab74533a5b files/texmf-update 2560
+SHA256 210f04e374c938e7fb3f08b8b70701f4911c21eca1ef0cd852b796a5cfaf2263 files/texmf-update 2560
 DIST texlive-core-2007-updated-config.ps.bz2 2981 RMD160 af88bbda9227e718ebf69d007f424c8b985a0404 SHA1 56bbeba1c9566437ffbe138089bc5965d79dc312 SHA256 ff12f1f6a68e45ad8d8f960f5fe76aae159d64074507a4a650973e1e865c8acd
 DIST texlive-core-2007.tar.bz2 31078286 RMD160 496cb3fa3c5cd9b2ea5da3b0bced67a2b5afe7b9 SHA1 37286f7b962c18ec5234071a8d2dde1499d9ab71 SHA256 96c12147ea9717539553eb6b3be52c2df6163ca617dccc71282ccd39c2e5773b
 DIST texlive-module-bin-afm2pl-2007.zip 25453 RMD160 af1597b5ed9ed7bc9766139e3434f5e42b483087 SHA1 6600bf9d592b1e532835890f29b22465b0da3532 SHA256 9efc5a4306a43bf36d9c84ef05d213fcf1d62354b8403eddaf3e4e699a297d31
@@ -108,10 +108,10 @@ EBUILD texlive-core-2007-r2.ebuild 7807 RMD160 a89c19e0b156e16f9f1d863387577e5ff
 MD5 a31beedd634cb1eea6d2157585f0255a texlive-core-2007-r2.ebuild 7807
 RMD160 a89c19e0b156e16f9f1d863387577e5ffcc91bea texlive-core-2007-r2.ebuild 7807
 SHA256 0a5a83d69ba32da2ec1e639198883cea683c4702f05bb06a69bdca669c927372 texlive-core-2007-r2.ebuild 7807
-MISC ChangeLog 3942 RMD160 55fefb2722f5c41dff7394ba64315f0f07119fed SHA1 2014153176458faa8c4829ef4b41a6fdff781fe8 SHA256 19c23d198d4e88811dd04095b668d81326a9d8efbd20b3cdcd6c15dab855275a
-MD5 a5a0dab861a5565bec89b8a766f19fe4 ChangeLog 3942
-RMD160 55fefb2722f5c41dff7394ba64315f0f07119fed ChangeLog 3942
-SHA256 19c23d198d4e88811dd04095b668d81326a9d8efbd20b3cdcd6c15dab855275a ChangeLog 3942
+MISC ChangeLog 4146 RMD160 79f343dc02ebae42411d1c3fb4a851fdab389c50 SHA1 ae010a9980190d49060aa89b1e39210744165634 SHA256 add6864f9e4407ff52dd95c80a66127ffd71e811e005327c5f311e2f70775c05
+MD5 504b5ccc8e965fdcbaeb10b941a699fa ChangeLog 4146
+RMD160 79f343dc02ebae42411d1c3fb4a851fdab389c50 ChangeLog 4146
+SHA256 add6864f9e4407ff52dd95c80a66127ffd71e811e005327c5f311e2f70775c05 ChangeLog 4146
 MISC metadata.xml 327 RMD160 10186cf048d44753bf4cec722eed45d2ade12316 SHA1 0254321c012da0e8f80aec6f29a0fb5b17675d4d SHA256 e520223493249c261b48f7f7460ed7c262d35383484e730cfefba51fde1195be
 MD5 10ddcc0c6d2a7a76dd92dffa01ca03ca metadata.xml 327
 RMD160 10186cf048d44753bf4cec722eed45d2ade12316 metadata.xml 327
@@ -122,7 +122,7 @@ SHA256 0c39adc060801faf2cc080c98e2ff1ab4999001fdbf4214c83aa9e14cbf2b65d files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHJNR3vFcC4BYPU0oRAk0OAKDMLAAOtnKESeIGGsAsry15wg79oQCePHoD
-fygDHfmSM/PWIQTwrIclyYw=
-=55lQ
+iD8DBQFHJNhgvFcC4BYPU0oRAi/cAJ4+ldzGs0xBu/VkmdthSeN6MpviWgCfRbJS
+ZXXKtvcSOZGRFZd54RI9plA=
+=yqgd
 -----END PGP SIGNATURE-----
diff --git a/app-text/texlive-core/files/texmf-update b/app-text/texlive-core/files/texmf-update
index 0122a327524c..db6ea04c1d9d 100644
--- a/app-text/texlive-core/files/texmf-update
+++ b/app-text/texlive-core/files/texmf-update
@@ -36,12 +36,20 @@ if [ "$TEXINPUTS" ]; then
 	fi
 fi
 
-for conf in texmf.cnf fmtutil.cnf updmap.cfg; do
-	if [ -d "/etc/texmf/${conf/.*/.d}" ] ; then
-		echo "Generating /etc/texmf/web2c/${conf} from /etc/texmf/${conf/.*/.d} ..."
-		cat /etc/texmf/${conf/.*/.d}/* > "/etc/texmf/web2c/${conf}"
-	fi
-done
+if [ -d /etc/texmf/texmf.d ]; then
+    echo "Generating /etc/texmf/web2c/texmf.cnf from /etc/texmf/texmf.d ..."
+    cat /etc/texmf/texmf.d/*.cnf > "/etc/texmf/web2c/texmf.cnf"
+fi
+
+if [ -d /etc/texmf/fmtutil.d ]; then
+    echo "Generating /etc/texmf/web2c/fmtutil.cnf from /etc/texmf/fmtutil.d ..."
+    cat /etc/texmf/fmtutil.d/*.cnf > "/etc/texmf/web2c/fmtutil.cnf"
+fi
+
+if [ -d /etc/texmf/updmap.d ]; then
+    echo "Generating /etc/texmf/web2c/updmap.cfg from /etc/texmf/updmap.d ..."
+    cat /etc/texmf/updmap.d/*.cfg > "/etc/texmf/web2c/updmap.cfg"
+fi
 
 echo "Generating ls-R files"
 mktexlsr &>/dev/null