saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index e73f380c4d0cff8e1617b92fe70ebd9c5e7649a0..1fbc2df99e182d5897657121a52fbbac36cd505b 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -313,6 +313,19 @@ maybe chmod 0440 './config-archive/etc/sudoers.dist.new'
 maybe chmod 0755 './config-archive/etc/syslog-ng'
 maybe chmod 0644 './config-archive/etc/syslog-ng/syslog-ng.conf'
 maybe chmod 0644 './config-archive/etc/syslog-ng/syslog-ng.conf.dist.new'
+maybe chmod 0755 './config-archive/etc/texmf'
+maybe chmod 0755 './config-archive/etc/texmf/fmtutil.d'
+maybe chmod 0644 './config-archive/etc/texmf/fmtutil.d/format.texlive-context.cnf'
+maybe chmod 0644 './config-archive/etc/texmf/fmtutil.d/format.texlive-context.cnf.dist'
+maybe chmod 0644 './config-archive/etc/texmf/fmtutil.d/format.texlive-formatsextra.cnf'
+maybe chmod 0644 './config-archive/etc/texmf/fmtutil.d/format.texlive-formatsextra.cnf.dist'
+maybe chmod 0755 './config-archive/etc/texmf/language.dat.lua.d'
+maybe chmod 0644 './config-archive/etc/texmf/language.dat.lua.d/language.texlive-langcyrillic.dat.lua'
+maybe chmod 0644 './config-archive/etc/texmf/language.dat.lua.d/language.texlive-langcyrillic.dat.lua.dist'
+maybe chmod 0644 './config-archive/etc/texmf/language.dat.lua.d/language.texlive-langenglish.dat.lua'
+maybe chmod 0644 './config-archive/etc/texmf/language.dat.lua.d/language.texlive-langenglish.dat.lua.dist'
+maybe chmod 0644 './config-archive/etc/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua'
+maybe chmod 0644 './config-archive/etc/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua.dist'
 maybe chmod 0600 './config-archive/etc/ulogd.conf'
 maybe chmod 0600 './config-archive/etc/ulogd.conf.dist.new'
 maybe chown mail './courier'
@@ -1477,8 +1490,6 @@ maybe chmod 0755 './texmf/dvipdfm'
 maybe chmod 0755 './texmf/dvipdfm/config'
 maybe chmod 0755 './texmf/dvips.d'
 maybe chmod 0755 './texmf/fmtutil.d'
-maybe chmod 0644 './texmf/fmtutil.d/._cfg0000_format.texlive-context.cnf'
-maybe chmod 0644 './texmf/fmtutil.d/._cfg0000_format.texlive-formatsextra.cnf'
 maybe chmod 0644 './texmf/fmtutil.d/format.jadetex.cnf'
 maybe chmod 0644 './texmf/fmtutil.d/format.texlive-basic.cnf'
 maybe chmod 0644 './texmf/fmtutil.d/format.texlive-context.cnf'
@@ -1495,9 +1506,6 @@ maybe chmod 0644 './texmf/language.dat.d/language.texlive-langcyrillic.dat'
 maybe chmod 0644 './texmf/language.dat.d/language.texlive-langenglish.dat'
 maybe chmod 0644 './texmf/language.dat.d/language.texlive-langgerman.dat'
 maybe chmod 0755 './texmf/language.dat.lua.d'
-maybe chmod 0644 './texmf/language.dat.lua.d/._cfg0000_language.texlive-langcyrillic.dat.lua'
-maybe chmod 0644 './texmf/language.dat.lua.d/._cfg0000_language.texlive-langenglish.dat.lua'
-maybe chmod 0644 './texmf/language.dat.lua.d/._cfg0000_language.texlive-langgerman.dat.lua'
 maybe chmod 0644 './texmf/language.dat.lua.d/.keep_app-text_texlive-core-0'
 maybe chmod 0644 './texmf/language.dat.lua.d/language.texlive-langcyrillic.dat.lua'
 maybe chmod 0644 './texmf/language.dat.lua.d/language.texlive-langenglish.dat.lua'

diff --git a/config-archive/etc/texmf/fmtutil.d/format.texlive-context.cnf b/config-archive/etc/texmf/fmtutil.d/format.texlive-context.cnf
new file mode 100644 (file)
index 0000000..81fe8e0
--- /dev/null
+++ b/config-archive/etc/texmf/fmtutil.d/format.texlive-context.cnf
@@ -0,0 +1,9 @@
+# Generated for texlive-context by texlive-module.eclass
+#! cont-de     pdftex  cont-usr.tex    -8bit *cont-de.ini
+cont-en        pdftex  cont-usr.tex    -8bit *cont-en.ini
+cont-en        xetex   cont-usr.tex    -8bit *cont-en.ini
+#! cont-fr     pdftex  cont-usr.tex    -8bit *cont-fr.ini
+#! cont-it     pdftex  cont-usr.tex    -8bit *cont-it.ini
+#! cont-nl     pdftex  cont-usr.tex    -8bit *cont-nl.ini
+#! cont-ro     pdftex  cont-usr.tex    -8bit *cont-ro.ini
+metafun        mpost   -       metafun.mp

diff --git a/config-archive/etc/texmf/fmtutil.d/format.texlive-context.cnf.dist b/config-archive/etc/texmf/fmtutil.d/format.texlive-context.cnf.dist
new file mode 100644 (file)
index 0000000..340573a
--- /dev/null
+++ b/config-archive/etc/texmf/fmtutil.d/format.texlive-context.cnf.dist
@@ -0,0 +1,8 @@
+# Generated for texlive-context by texlive-module.eclass
+#! cont-de     pdftex  cont-usr.tex    -8bit *cont-de.ini
+cont-en        pdftex  cont-usr.tex    -8bit *cont-en.ini
+cont-en        xetex   cont-usr.tex    -8bit *cont-en.ini
+#! cont-fr     pdftex  cont-usr.tex    -8bit *cont-fr.ini
+#! cont-it     pdftex  cont-usr.tex    -8bit *cont-it.ini
+#! cont-nl     pdftex  cont-usr.tex    -8bit *cont-nl.ini
+#! cont-ro     pdftex  cont-usr.tex    -8bit *cont-ro.ini

diff --git a/config-archive/etc/texmf/fmtutil.d/format.texlive-formatsextra.cnf b/config-archive/etc/texmf/fmtutil.d/format.texlive-formatsextra.cnf
new file mode 100644 (file)
index 0000000..8d3cda2
--- /dev/null
+++ b/config-archive/etc/texmf/fmtutil.d/format.texlive-formatsextra.cnf
@@ -0,0 +1,7 @@
+# Generated for texlive-formatsextra by texlive-module.eclass
+eplain pdftex  language.dat    -translate-file=cp227.tcx *eplain.ini
+mllatex        pdftex  language.dat    -translate-file=cp227.tcx -mltex mllatex.ini
+mltex  pdftex  -       -translate-file=cp227.tcx -mltex mltex.ini
+physe  pdftex  -       physe.ini
+phyzzx pdftex  -       physe.ini
+texsis pdftex  -       -translate-file=cp227.tcx texsis.ini

diff --git a/config-archive/etc/texmf/fmtutil.d/format.texlive-formatsextra.cnf.dist b/config-archive/etc/texmf/fmtutil.d/format.texlive-formatsextra.cnf.dist
new file mode 100644 (file)
index 0000000..aafdb0c
--- /dev/null
+++ b/config-archive/etc/texmf/fmtutil.d/format.texlive-formatsextra.cnf.dist
@@ -0,0 +1,5 @@
+# Generated for texlive-formatsextra by texlive-module.eclass
+eplain pdftex  language.dat    -translate-file=cp227.tcx *eplain.ini
+mllatex        pdftex  language.dat    -translate-file=cp227.tcx -mltex mllatex.ini
+mltex  pdftex  -       -translate-file=cp227.tcx -mltex mltex.ini
+texsis pdftex  -       -translate-file=cp227.tcx texsis.ini

diff --git a/config-archive/etc/texmf/language.dat.lua.d/language.texlive-langcyrillic.dat.lua b/config-archive/etc/texmf/language.dat.lua.d/language.texlive-langcyrillic.dat.lua
new file mode 100644 (file)
index 0000000..00da8f3
--- /dev/null
+++ b/config-archive/etc/texmf/language.dat.lua.d/language.texlive-langcyrillic.dat.lua
@@ -0,0 +1,23 @@
+       ['bulgarian'] = {
+               loader = 'loadhyph-bg.tex',
+               lefthyphenmin = 2,
+               righthyphenmin = 2,
+               synonyms = { },
+               patterns = 'hyph-bg.pat.txt',
+               hyphenation = 'hyph-bg.hyp.txt',
+       },
+       ['russian'] = {
+               loader = 'loadhyph-ru.tex',
+               lefthyphenmin = 2,
+               righthyphenmin = 2,
+               synonyms = { },
+               patterns = 'hyph-ru.pat.txt',
+       },
+       ['ukrainian'] = {
+               loader = 'loadhyph-uk.tex',
+               lefthyphenmin = 2,
+               righthyphenmin = 2,
+               synonyms = { },
+               patterns = 'hyph-uk.pat.txt',
+               hyphenation = 'hyph-uk.hyp.txt',
+       },

diff --git a/config-archive/etc/texmf/language.dat.lua.d/language.texlive-langcyrillic.dat.lua.dist b/config-archive/etc/texmf/language.dat.lua.d/language.texlive-langcyrillic.dat.lua.dist
new file mode 100644 (file)
index 0000000..ecabb3e
--- /dev/null
+++ b/config-archive/etc/texmf/language.dat.lua.d/language.texlive-langcyrillic.dat.lua.dist
@@ -0,0 +1,22 @@
+       ['bulgarian'] = {
+               loader = 'loadhyph-bg.tex',
+               lefthyphenmin = 2,
+               righthyphenmin = 2,
+               synonyms = { },
+               patterns = 'hyph-bg.pat.txt',
+       },
+       ['russian'] = {
+               loader = 'loadhyph-ru.tex',
+               lefthyphenmin = 2,
+               righthyphenmin = 2,
+               synonyms = { },
+               patterns = 'hyph-ru.pat.txt',
+               hyphenation = 'hyph-ru.hyp.txt',
+       },
+       ['ukrainian'] = {
+               loader = 'loadhyph-uk.tex',
+               lefthyphenmin = 2,
+               righthyphenmin = 2,
+               synonyms = { },
+               patterns = 'hyph-uk.pat.txt',
+       },

diff --git a/config-archive/etc/texmf/language.dat.lua.d/language.texlive-langenglish.dat.lua b/config-archive/etc/texmf/language.dat.lua.d/language.texlive-langenglish.dat.lua
new file mode 100644 (file)
index 0000000..0bbb5d5
--- /dev/null
+++ b/config-archive/etc/texmf/language.dat.lua.d/language.texlive-langenglish.dat.lua
@@ -0,0 +1,14 @@
+       ['ukenglish'] = {
+               loader = 'loadhyph-en-gb.tex',
+               lefthyphenmin = 2,
+               righthyphenmin = 3,
+               synonyms = { 'british', 'UKenglish' },
+               patterns = 'hyph-en-gb.pat.txt',
+       },
+       ['usenglishmax'] = {
+               loader = 'loadhyph-en-us.tex',
+               lefthyphenmin = 2,
+               righthyphenmin = 3,
+               synonyms = { },
+               patterns = 'hyph-en-us.pat.txt',
+       },

diff --git a/config-archive/etc/texmf/language.dat.lua.d/language.texlive-langenglish.dat.lua.dist b/config-archive/etc/texmf/language.dat.lua.d/language.texlive-langenglish.dat.lua.dist
new file mode 100644 (file)
index 0000000..0216c83
--- /dev/null
+++ b/config-archive/etc/texmf/language.dat.lua.d/language.texlive-langenglish.dat.lua.dist
@@ -0,0 +1,16 @@
+       ['ukenglish'] = {
+               loader = 'loadhyph-en-gb.tex',
+               lefthyphenmin = 2,
+               righthyphenmin = 3,
+               synonyms = { 'british', 'UKenglish' },
+               patterns = 'hyph-en-gb.pat.txt',
+               hyphenation = 'hyph-en-gb.hyp.txt',
+       },
+       ['usenglishmax'] = {
+               loader = 'loadhyph-en-us.tex',
+               lefthyphenmin = 2,
+               righthyphenmin = 3,
+               synonyms = { },
+               patterns = 'hyph-en-us.pat.txt',
+               hyphenation = 'hyph-en-us.hyp.txt',
+       },

diff --git a/config-archive/etc/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua b/config-archive/etc/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua
new file mode 100644 (file)
index 0000000..54c702c
--- /dev/null
+++ b/config-archive/etc/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua
@@ -0,0 +1,40 @@
+       ['german-x-2009-06-19'] = {
+               loader = 'dehypht-x-2009-06-19.tex',
+               lefthyphenmin = 2,
+               righthyphenmin = 2,
+               synonyms = { 'german-x-latest' },
+               patterns = 'hyph-de-1901.pat.txt',
+               hyphenation = 'hyph-de-1901.hyp.txt',
+       },
+       ['ngerman-x-2009-06-19'] = {
+               loader = 'dehyphn-x-2009-06-19.tex',
+               lefthyphenmin = 2,
+               righthyphenmin = 2,
+               synonyms = { 'ngerman-x-latest' },
+               patterns = 'hyph-de-1996.pat.txt',
+               hyphenation = 'hyph-de-1996.hyp.txt',
+       },
+       ['german'] = {
+               loader = 'loadhyph-de-1901.tex',
+               lefthyphenmin = 2,
+               righthyphenmin = 2,
+               synonyms = { },
+               patterns = 'hyph-de-1901.pat.txt',
+               hyphenation = 'hyph-de-1901.hyp.txt',
+       },
+       ['ngerman'] = {
+               loader = 'loadhyph-de-1996.tex',
+               lefthyphenmin = 2,
+               righthyphenmin = 2,
+               synonyms = { },
+               patterns = 'hyph-de-1996.pat.txt',
+               hyphenation = 'hyph-de-1996.hyp.txt',
+       },
+       ['swissgerman'] = {
+               loader = 'loadhyph-de-ch-1901.tex',
+               lefthyphenmin = 2,
+               righthyphenmin = 2,
+               synonyms = { },
+               patterns = 'hyph-de-ch-1901.pat.txt',
+               hyphenation = 'hyph-de-ch-1901.hyp.txt',
+       },

diff --git a/config-archive/etc/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua.dist b/config-archive/etc/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua.dist
new file mode 100644 (file)
index 0000000..9613046
--- /dev/null
+++ b/config-archive/etc/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua.dist
@@ -0,0 +1,37 @@
+       ['german-x-2009-06-19'] = {
+               loader = 'dehypht-x-2009-06-19.tex',
+               lefthyphenmin = 2,
+               righthyphenmin = 2,
+               synonyms = { 'german-x-latest' },
+               patterns = 'hyph-de-1901.pat.txt',
+               hyphenation = 'hyph-de-1901.hyp.txt',
+       },
+       ['ngerman-x-2009-06-19'] = {
+               loader = 'dehyphn-x-2009-06-19.tex',
+               lefthyphenmin = 2,
+               righthyphenmin = 2,
+               synonyms = { 'ngerman-x-latest' },
+               patterns = 'hyph-de-1996.pat.txt',
+               hyphenation = 'hyph-de-1996.hyp.txt',
+       },
+       ['german'] = {
+               loader = 'loadhyph-de-1901.tex',
+               lefthyphenmin = 2,
+               righthyphenmin = 2,
+               synonyms = { },
+               patterns = 'hyph-de-1901.pat.txt',
+       },
+       ['ngerman'] = {
+               loader = 'loadhyph-de-1996.tex',
+               lefthyphenmin = 2,
+               righthyphenmin = 2,
+               synonyms = { },
+               patterns = 'hyph-de-1996.pat.txt',
+       },
+       ['swissgerman'] = {
+               loader = 'loadhyph-de-ch-1901.tex',
+               lefthyphenmin = 2,
+               righthyphenmin = 2,
+               synonyms = { },
+               patterns = 'hyph-de-ch-1901.pat.txt',
+       },

diff --git a/make.conf b/make.conf
index d206721473e57b6e7cb1df7b34ef4a1f12f384a1..6efbaaad0dcab50cb546270d3ecd0fa454a6f62d 100644 (file)
--- a/make.conf
+++ b/make.conf
@@ -8,8 +8,8 @@ CXXFLAGS="${CFLAGS}"
 # Please consult http://www.gentoo.org/doc/en/change-chost.xml before changing.
 CHOST="x86_64-pc-linux-gnu"
 
-#MAKEOPTS="-j7"
-MAKEOPTS="-j1"
+MAKEOPTS="-j7"
+#MAKEOPTS="-j1"
 
 GENTOO_MIRRORS="http://linux.rz.ruhr-uni-bochum.de/download/gentoo-mirror/ http://ftp.snt.utwente.nl/pub/os/linux/gentoo http://mirrors.sec.informatik.tu-darmstadt.de/gentoo/"
 #GENTOO_MIRRORS="http://gentoo.mirror.web4u.cz/ ftp://ftp.wh2.tu-dresden.de/pub/mirrors/gentoo ftp://gentoo.mirror.dkm.cz/pub/gentoo/ ftp://mirror.bytemark.co.uk/gentoo/"

diff --git a/motd b/motd
index 835c9ca9ab579fad4d8e9cfe4ef930f0fb914f97..1b02141b14705d31a6003ada618427cb971b6910 100644 (file)
--- a/motd
+++ b/motd
@@ -7,8 +7,7 @@ Gentoo Base System release 2.0.3
 |____/|_|   \__,_|_| |_|_|
                           
 
-Alles hat man herausgefunden, nur nicht wie man lebt.
-               -- Jean-Paul Sartre
+Früh arbeiten macht nur früh müde.
 
 Today is Boomtime, the 17th day of Chaos in the YOLD 3178
 

diff --git a/portage/package.keywords b/portage/package.keywords
index b302eed22832237cc87e01dd4adaf716a9e37a91..4ba72dd47d1f587d496e4c4a0a3fb47caee57e33 100644 (file)
--- a/portage/package.keywords
+++ b/portage/package.keywords
@@ -10,6 +10,9 @@ net-im/skype
 
 ~sys-apps/etckeeper-0.58
 
+~x11-apps/desktopnova-0.7.4
+~x11-apps/desktopnova-0.8.1
+
 ~x11-plugins/wmcalendar-0.5.2
 ~x11-plugins/wmmixer-1.5       **
 

diff --git a/texmf/fmtutil.d/._cfg0000_format.texlive-context.cnf b/texmf/fmtutil.d/._cfg0000_format.texlive-context.cnf
deleted file mode 100644 (file)
index 340573a..0000000
--- a/texmf/fmtutil.d/._cfg0000_format.texlive-context.cnf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Generated for texlive-context by texlive-module.eclass
-#! cont-de     pdftex  cont-usr.tex    -8bit *cont-de.ini
-cont-en        pdftex  cont-usr.tex    -8bit *cont-en.ini
-cont-en        xetex   cont-usr.tex    -8bit *cont-en.ini
-#! cont-fr     pdftex  cont-usr.tex    -8bit *cont-fr.ini
-#! cont-it     pdftex  cont-usr.tex    -8bit *cont-it.ini
-#! cont-nl     pdftex  cont-usr.tex    -8bit *cont-nl.ini
-#! cont-ro     pdftex  cont-usr.tex    -8bit *cont-ro.ini

diff --git a/texmf/fmtutil.d/._cfg0000_format.texlive-formatsextra.cnf b/texmf/fmtutil.d/._cfg0000_format.texlive-formatsextra.cnf
deleted file mode 100644 (file)
index aafdb0c..0000000
--- a/texmf/fmtutil.d/._cfg0000_format.texlive-formatsextra.cnf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Generated for texlive-formatsextra by texlive-module.eclass
-eplain pdftex  language.dat    -translate-file=cp227.tcx *eplain.ini
-mllatex        pdftex  language.dat    -translate-file=cp227.tcx -mltex mllatex.ini
-mltex  pdftex  -       -translate-file=cp227.tcx -mltex mltex.ini
-texsis pdftex  -       -translate-file=cp227.tcx texsis.ini

diff --git a/texmf/fmtutil.d/format.texlive-context.cnf b/texmf/fmtutil.d/format.texlive-context.cnf
index 81fe8e019dbe982b851e19d7b5e69b9b7ed8c151..340573aa86d3d0713c35992741b1ae24b37d87ad 100644 (file)
--- a/texmf/fmtutil.d/format.texlive-context.cnf
+++ b/texmf/fmtutil.d/format.texlive-context.cnf
@@ -6,4 +6,3 @@ cont-en xetex   cont-usr.tex    -8bit *cont-en.ini
 #! cont-it     pdftex  cont-usr.tex    -8bit *cont-it.ini
 #! cont-nl     pdftex  cont-usr.tex    -8bit *cont-nl.ini
 #! cont-ro     pdftex  cont-usr.tex    -8bit *cont-ro.ini
-metafun        mpost   -       metafun.mp

diff --git a/texmf/fmtutil.d/format.texlive-formatsextra.cnf b/texmf/fmtutil.d/format.texlive-formatsextra.cnf
index 8d3cda22b18c1be90759b2820d72599e37c43f77..aafdb0cb102576c27e47b272b49f36de1c3d49fd 100644 (file)
--- a/texmf/fmtutil.d/format.texlive-formatsextra.cnf
+++ b/texmf/fmtutil.d/format.texlive-formatsextra.cnf
@@ -2,6 +2,4 @@
 eplain pdftex  language.dat    -translate-file=cp227.tcx *eplain.ini
 mllatex        pdftex  language.dat    -translate-file=cp227.tcx -mltex mllatex.ini
 mltex  pdftex  -       -translate-file=cp227.tcx -mltex mltex.ini
-physe  pdftex  -       physe.ini
-phyzzx pdftex  -       physe.ini
 texsis pdftex  -       -translate-file=cp227.tcx texsis.ini

diff --git a/texmf/language.dat.lua.d/._cfg0000_language.texlive-langcyrillic.dat.lua b/texmf/language.dat.lua.d/._cfg0000_language.texlive-langcyrillic.dat.lua
deleted file mode 100644 (file)
index ecabb3e..0000000
--- a/texmf/language.dat.lua.d/._cfg0000_language.texlive-langcyrillic.dat.lua
+++ /dev/null
@@ -1,22 +0,0 @@
-       ['bulgarian'] = {
-               loader = 'loadhyph-bg.tex',
-               lefthyphenmin = 2,
-               righthyphenmin = 2,
-               synonyms = { },
-               patterns = 'hyph-bg.pat.txt',
-       },
-       ['russian'] = {
-               loader = 'loadhyph-ru.tex',
-               lefthyphenmin = 2,
-               righthyphenmin = 2,
-               synonyms = { },
-               patterns = 'hyph-ru.pat.txt',
-               hyphenation = 'hyph-ru.hyp.txt',
-       },
-       ['ukrainian'] = {
-               loader = 'loadhyph-uk.tex',
-               lefthyphenmin = 2,
-               righthyphenmin = 2,
-               synonyms = { },
-               patterns = 'hyph-uk.pat.txt',
-       },

diff --git a/texmf/language.dat.lua.d/._cfg0000_language.texlive-langenglish.dat.lua b/texmf/language.dat.lua.d/._cfg0000_language.texlive-langenglish.dat.lua
deleted file mode 100644 (file)
index 0216c83..0000000
--- a/texmf/language.dat.lua.d/._cfg0000_language.texlive-langenglish.dat.lua
+++ /dev/null
@@ -1,16 +0,0 @@
-       ['ukenglish'] = {
-               loader = 'loadhyph-en-gb.tex',
-               lefthyphenmin = 2,
-               righthyphenmin = 3,
-               synonyms = { 'british', 'UKenglish' },
-               patterns = 'hyph-en-gb.pat.txt',
-               hyphenation = 'hyph-en-gb.hyp.txt',
-       },
-       ['usenglishmax'] = {
-               loader = 'loadhyph-en-us.tex',
-               lefthyphenmin = 2,
-               righthyphenmin = 3,
-               synonyms = { },
-               patterns = 'hyph-en-us.pat.txt',
-               hyphenation = 'hyph-en-us.hyp.txt',
-       },

diff --git a/texmf/language.dat.lua.d/._cfg0000_language.texlive-langgerman.dat.lua b/texmf/language.dat.lua.d/._cfg0000_language.texlive-langgerman.dat.lua
deleted file mode 100644 (file)
index 9613046..0000000
--- a/texmf/language.dat.lua.d/._cfg0000_language.texlive-langgerman.dat.lua
+++ /dev/null
@@ -1,37 +0,0 @@
-       ['german-x-2009-06-19'] = {
-               loader = 'dehypht-x-2009-06-19.tex',
-               lefthyphenmin = 2,
-               righthyphenmin = 2,
-               synonyms = { 'german-x-latest' },
-               patterns = 'hyph-de-1901.pat.txt',
-               hyphenation = 'hyph-de-1901.hyp.txt',
-       },
-       ['ngerman-x-2009-06-19'] = {
-               loader = 'dehyphn-x-2009-06-19.tex',
-               lefthyphenmin = 2,
-               righthyphenmin = 2,
-               synonyms = { 'ngerman-x-latest' },
-               patterns = 'hyph-de-1996.pat.txt',
-               hyphenation = 'hyph-de-1996.hyp.txt',
-       },
-       ['german'] = {
-               loader = 'loadhyph-de-1901.tex',
-               lefthyphenmin = 2,
-               righthyphenmin = 2,
-               synonyms = { },
-               patterns = 'hyph-de-1901.pat.txt',
-       },
-       ['ngerman'] = {
-               loader = 'loadhyph-de-1996.tex',
-               lefthyphenmin = 2,
-               righthyphenmin = 2,
-               synonyms = { },
-               patterns = 'hyph-de-1996.pat.txt',
-       },
-       ['swissgerman'] = {
-               loader = 'loadhyph-de-ch-1901.tex',
-               lefthyphenmin = 2,
-               righthyphenmin = 2,
-               synonyms = { },
-               patterns = 'hyph-de-ch-1901.pat.txt',
-       },

diff --git a/texmf/language.dat.lua.d/language.texlive-langcyrillic.dat.lua b/texmf/language.dat.lua.d/language.texlive-langcyrillic.dat.lua
index 00da8f34a536538a60de824b57cd0ae596312d69..ecabb3eb2bf2a613843dff7a1337183ecd055617 100644 (file)
--- a/texmf/language.dat.lua.d/language.texlive-langcyrillic.dat.lua
+++ b/texmf/language.dat.lua.d/language.texlive-langcyrillic.dat.lua
@@ -4,7 +4,6 @@
                righthyphenmin = 2,
                synonyms = { },
                patterns = 'hyph-bg.pat.txt',
-               hyphenation = 'hyph-bg.hyp.txt',
        },
        ['russian'] = {
                loader = 'loadhyph-ru.tex',
@@ -12,6 +11,7 @@
                righthyphenmin = 2,
                synonyms = { },
                patterns = 'hyph-ru.pat.txt',
+               hyphenation = 'hyph-ru.hyp.txt',
        },
        ['ukrainian'] = {
                loader = 'loadhyph-uk.tex',
@@ -19,5 +19,4 @@
                righthyphenmin = 2,
                synonyms = { },
                patterns = 'hyph-uk.pat.txt',
-               hyphenation = 'hyph-uk.hyp.txt',
        },

diff --git a/texmf/language.dat.lua.d/language.texlive-langenglish.dat.lua b/texmf/language.dat.lua.d/language.texlive-langenglish.dat.lua
index 0bbb5d50a589673068d1f3f6b14f7592d49dd30c..0216c83783a0bc46e3ee87b1400c6c8c5d1b4ca3 100644 (file)
--- a/texmf/language.dat.lua.d/language.texlive-langenglish.dat.lua
+++ b/texmf/language.dat.lua.d/language.texlive-langenglish.dat.lua
@@ -4,6 +4,7 @@
                righthyphenmin = 3,
                synonyms = { 'british', 'UKenglish' },
                patterns = 'hyph-en-gb.pat.txt',
+               hyphenation = 'hyph-en-gb.hyp.txt',
        },
        ['usenglishmax'] = {
                loader = 'loadhyph-en-us.tex',
@@ -11,4 +12,5 @@
                righthyphenmin = 3,
                synonyms = { },
                patterns = 'hyph-en-us.pat.txt',
+               hyphenation = 'hyph-en-us.hyp.txt',
        },

diff --git a/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua b/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua
index 54c702c7e87f82cd69facda4ed17dd895470dc08..961304696e3d63c47c110aaabb6d28ea27ace7fd 100644 (file)
--- a/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua
+++ b/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua
@@ -20,7 +20,6 @@
                righthyphenmin = 2,
                synonyms = { },
                patterns = 'hyph-de-1901.pat.txt',
-               hyphenation = 'hyph-de-1901.hyp.txt',
        },
        ['ngerman'] = {
                loader = 'loadhyph-de-1996.tex',
@@ -28,7 +27,6 @@
                righthyphenmin = 2,
                synonyms = { },
                patterns = 'hyph-de-1996.pat.txt',
-               hyphenation = 'hyph-de-1996.hyp.txt',
        },
        ['swissgerman'] = {
                loader = 'loadhyph-de-ch-1901.tex',
@@ -36,5 +34,4 @@
                righthyphenmin = 2,
                synonyms = { },
                patterns = 'hyph-de-ch-1901.pat.txt',
-               hyphenation = 'hyph-de-ch-1901.hyp.txt',
        },