From 8170db0774eb55290845c2dbc78eb6b752ec10af Mon Sep 17 00:00:00 2001 From: frank Date: Tue, 17 Jan 2012 14:28:25 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- .etckeeper | 18 ++++++--- .../fmtutil.d/format.texlive-context.cnf | 9 +++++ .../fmtutil.d/format.texlive-context.cnf.dist | 0 .../fmtutil.d/format.texlive-formatsextra.cnf | 7 ++++ .../format.texlive-formatsextra.cnf.dist | 0 .../language.texlive-langcyrillic.dat.lua | 23 +++++++++++ ...language.texlive-langcyrillic.dat.lua.dist | 0 .../language.texlive-langenglish.dat.lua | 14 +++++++ .../language.texlive-langenglish.dat.lua.dist | 0 .../language.texlive-langgerman.dat.lua | 40 +++++++++++++++++++ .../language.texlive-langgerman.dat.lua.dist | 0 make.conf | 4 +- motd | 3 +- portage/package.keywords | 3 ++ texmf/fmtutil.d/format.texlive-context.cnf | 1 - .../fmtutil.d/format.texlive-formatsextra.cnf | 2 - .../language.texlive-langcyrillic.dat.lua | 3 +- .../language.texlive-langenglish.dat.lua | 2 + .../language.texlive-langgerman.dat.lua | 3 -- 19 files changed, 115 insertions(+), 17 deletions(-) create mode 100644 config-archive/etc/texmf/fmtutil.d/format.texlive-context.cnf rename texmf/fmtutil.d/._cfg0000_format.texlive-context.cnf => config-archive/etc/texmf/fmtutil.d/format.texlive-context.cnf.dist (100%) create mode 100644 config-archive/etc/texmf/fmtutil.d/format.texlive-formatsextra.cnf rename texmf/fmtutil.d/._cfg0000_format.texlive-formatsextra.cnf => config-archive/etc/texmf/fmtutil.d/format.texlive-formatsextra.cnf.dist (100%) create mode 100644 config-archive/etc/texmf/language.dat.lua.d/language.texlive-langcyrillic.dat.lua rename texmf/language.dat.lua.d/._cfg0000_language.texlive-langcyrillic.dat.lua => config-archive/etc/texmf/language.dat.lua.d/language.texlive-langcyrillic.dat.lua.dist (100%) create mode 100644 config-archive/etc/texmf/language.dat.lua.d/language.texlive-langenglish.dat.lua rename texmf/language.dat.lua.d/._cfg0000_language.texlive-langenglish.dat.lua => config-archive/etc/texmf/language.dat.lua.d/language.texlive-langenglish.dat.lua.dist (100%) create mode 100644 config-archive/etc/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua rename texmf/language.dat.lua.d/._cfg0000_language.texlive-langgerman.dat.lua => config-archive/etc/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua.dist (100%) diff --git a/.etckeeper b/.etckeeper index e73f380c..1fbc2df9 100755 --- 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 index 00000000..81fe8e01 --- /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/texmf/fmtutil.d/._cfg0000_format.texlive-context.cnf b/config-archive/etc/texmf/fmtutil.d/format.texlive-context.cnf.dist similarity index 100% rename from texmf/fmtutil.d/._cfg0000_format.texlive-context.cnf rename to config-archive/etc/texmf/fmtutil.d/format.texlive-context.cnf.dist 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 index 00000000..8d3cda22 --- /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/texmf/fmtutil.d/._cfg0000_format.texlive-formatsextra.cnf b/config-archive/etc/texmf/fmtutil.d/format.texlive-formatsextra.cnf.dist similarity index 100% rename from texmf/fmtutil.d/._cfg0000_format.texlive-formatsextra.cnf rename to config-archive/etc/texmf/fmtutil.d/format.texlive-formatsextra.cnf.dist 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 index 00000000..00da8f34 --- /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/texmf/language.dat.lua.d/._cfg0000_language.texlive-langcyrillic.dat.lua b/config-archive/etc/texmf/language.dat.lua.d/language.texlive-langcyrillic.dat.lua.dist similarity index 100% rename from texmf/language.dat.lua.d/._cfg0000_language.texlive-langcyrillic.dat.lua rename to config-archive/etc/texmf/language.dat.lua.d/language.texlive-langcyrillic.dat.lua.dist 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 index 00000000..0bbb5d50 --- /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/texmf/language.dat.lua.d/._cfg0000_language.texlive-langenglish.dat.lua b/config-archive/etc/texmf/language.dat.lua.d/language.texlive-langenglish.dat.lua.dist similarity index 100% rename from texmf/language.dat.lua.d/._cfg0000_language.texlive-langenglish.dat.lua rename to config-archive/etc/texmf/language.dat.lua.d/language.texlive-langenglish.dat.lua.dist 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 index 00000000..54c702c7 --- /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/texmf/language.dat.lua.d/._cfg0000_language.texlive-langgerman.dat.lua b/config-archive/etc/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua.dist similarity index 100% rename from texmf/language.dat.lua.d/._cfg0000_language.texlive-langgerman.dat.lua rename to config-archive/etc/texmf/language.dat.lua.d/language.texlive-langgerman.dat.lua.dist diff --git a/make.conf b/make.conf index d2067214..6efbaaad 100644 --- 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 835c9ca9..1b02141b 100644 --- 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 b302eed2..4ba72dd4 100644 --- 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/format.texlive-context.cnf b/texmf/fmtutil.d/format.texlive-context.cnf index 81fe8e01..340573aa 100644 --- 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 8d3cda22..aafdb0cb 100644 --- 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/language.texlive-langcyrillic.dat.lua b/texmf/language.dat.lua.d/language.texlive-langcyrillic.dat.lua index 00da8f34..ecabb3eb 100644 --- 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 0bbb5d50..0216c837 100644 --- 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 54c702c7..96130469 100644 --- 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', }, -- 2.39.5