From 8597283b896b1b8e5b42625f700c88ffd56d0b49 Mon Sep 17 00:00:00 2001
From: root <root@sandbox.local.calculate.ru>
Date: Tue, 17 Jan 2012 01:21:17 +0400
Subject: [PATCH] Sync with portage [Tue Jan 17 01:21:16 MSK 2012].

---
 .../eselect-oodict-20100228.ebuild            |   4 +-
 .../rsyslog/files/5-stable/rsyslog.initd      |   6 +-
 app-admin/rsyslog/rsyslog-5.8.6.ebuild        |  14 +-
 app-arch/sharutils/sharutils-4.11.1.ebuild    |   4 +-
 app-editors/emacs/Manifest                    |   1 -
 app-editors/emacs/emacs-23.3-r2.ebuild        | 330 ------------------
 app-editors/emacs/emacs-23.3-r4.ebuild        |   4 +-
 app-emacs/emacs-common-gentoo/Manifest        |   1 -
 .../emacs-common-gentoo-1.2-r2.ebuild         | 137 --------
 .../emacs-common-gentoo-1.3.ebuild            |   4 +-
 app-misc/tomboy/metadata.xml                  |   2 -
 app-misc/tomboy/tomboy-1.4.2-r1.ebuild        |  11 +-
 app-misc/tomboy/tomboy-1.6.1.ebuild           |  11 +-
 app-misc/tomboy/tomboy-1.8.3.ebuild           |  11 +-
 app-office/imposter/imposter-0.3.ebuild       |   6 +-
 .../libreoffice-l10n-3.4.5-r1.ebuild          |   4 +-
 .../libreoffice/libreoffice-3.4.5.2.ebuild    |   4 +-
 app-portage/eix/Manifest                      |   1 +
 app-portage/eix/eix-0.23.6.ebuild             |  43 +++
 app-portage/esearch/esearch-1.0-r2.ebuild     |   4 +-
 .../dvipsk/dvipsk-5.991_p20110705-r1.ebuild   |   6 +-
 .../lcdf-typetools/lcdf-typetools-2.91.ebuild |   4 +-
 .../libexttextcat/libexttextcat-3.2.0.ebuild  |   6 +-
 app-text/mythes/mythes-1.2.2.ebuild           |   6 +-
 app-text/ps2pkm/ps2pkm-1.5_p20110705.ebuild   |   6 +-
 .../texlive-core/texlive-core-2011-r5.ebuild  |   6 +-
 app-text/texlive/texlive-2011.ebuild          |   6 +-
 dev-embedded/srecord/Manifest                 |   1 -
 .../srecord/files/srecord-1.42-gcc44.patch    | 101 ------
 dev-embedded/srecord/srecord-1.42.ebuild      |  41 ---
 dev-embedded/u-boot-tools/Manifest            |   2 -
 .../u-boot-tools/u-boot-tools-2010.06.ebuild  |  44 ---
 .../u-boot-tools/u-boot-tools-2010.12.ebuild  |  38 --
 dev-lang/swi-prolog/Manifest                  |   2 +-
 .../swi-prolog/swi-prolog-5.10.5-r1.ebuild    |   6 +-
 dev-libs/hyphen/hyphen-2.8.3.ebuild           |   6 +-
 dev-libs/jemalloc/jemalloc-2.2.5.ebuild       |   6 +-
 dev-libs/libexplain/Manifest                  |   7 +-
 dev-libs/libexplain/libexplain-0.40.ebuild    |  38 --
 dev-libs/libexplain/libexplain-0.42.ebuild    |  38 --
 dev-libs/libexplain/libexplain-0.46.ebuild    |  49 ---
 dev-libs/libexplain/libexplain-0.47.ebuild    |  50 ---
 ...ain-0.45.ebuild => libexplain-0.50.ebuild} |  31 +-
 dev-libs/libxml2/libxml2-2.7.8-r4.ebuild      |   4 +-
 dev-libs/ppl/ppl-0.11.2-r1.ebuild             |   4 +-
 .../ptexenc/ptexenc-1.2.0_p20110705.ebuild    |   6 +-
 dev-perl/XML-RSS/XML-RSS-1.490.0.ebuild       |   4 +-
 dev-php/PEAR-Cache/PEAR-Cache-1.5.6.ebuild    |   6 +-
 .../PEAR-Cache_Lite-1.7.12.ebuild             |   6 +-
 dev-php/PEAR-File/PEAR-File-1.4.0.ebuild      |   6 +-
 .../PEAR-HTML_Template_Flexy-1.3.12.ebuild    |   6 +-
 .../PEAR-HTML_TreeMenu-1.2.2.ebuild           |   6 +-
 .../PEAR-Image_Canvas-0.3.3.ebuild            |   6 +-
 dev-php/PEAR-Log/PEAR-Log-1.12.7.ebuild       |   6 +-
 .../PEAR-Net_DIME/PEAR-Net_DIME-1.0.2.ebuild  |   6 +-
 .../PEAR-Net_FTP/PEAR-Net_FTP-1.3.7-r1.ebuild |   6 +-
 .../PEAR-Net_UserAgent_Detect-2.5.2.ebuild    |   6 +-
 .../PEAR-Numbers_Words-0.16.2.ebuild          |   6 +-
 dev-python/pypy/pypy-1.7.ebuild               |   4 +-
 dev-ruby/barby/barby-0.5.0-r1.ebuild          | 151 ++++++++
 dev-ruby/json/json-1.5.4.ebuild               |   4 +-
 dev-ruby/sary-ruby/sary-ruby-1.2.0-r2.ebuild  |   4 +-
 dev-tex/bibtexu/bibtexu-3.71_p20110705.ebuild |   6 +-
 dev-tex/mh/mh-20111011.ebuild                 |   6 +-
 .../texlive-basic-2011-r1.ebuild              |   6 +-
 .../texlive-bibtexextra-2011.ebuild           |   6 +-
 .../texlive-context-2011.ebuild               |   6 +-
 .../texlive-documentation-arabic-2011.ebuild  |   6 +-
 .../texlive-documentation-base-2011.ebuild    |   6 +-
 ...exlive-documentation-bulgarian-2011.ebuild |   6 +-
 .../texlive-documentation-chinese-2011.ebuild |   6 +-
 ...live-documentation-czechslovak-2011.ebuild |   6 +-
 .../texlive-documentation-dutch-2011.ebuild   |   6 +-
 .../texlive-documentation-english-2011.ebuild |   6 +-
 .../texlive-documentation-finnish-2011.ebuild |   6 +-
 .../texlive-documentation-french-2011.ebuild  |   6 +-
 .../texlive-documentation-german-2011.ebuild  |   6 +-
 .../texlive-documentation-italian-2011.ebuild |   6 +-
 ...texlive-documentation-japanese-2011.ebuild |   6 +-
 .../texlive-documentation-korean-2011.ebuild  |   6 +-
 ...exlive-documentation-mongolian-2011.ebuild |   6 +-
 .../texlive-documentation-polish-2011.ebuild  |   6 +-
 ...xlive-documentation-portuguese-2011.ebuild |   6 +-
 .../texlive-documentation-russian-2011.ebuild |   6 +-
 .../texlive-documentation-serbian-2011.ebuild |   6 +-
 ...exlive-documentation-slovenian-2011.ebuild |   6 +-
 .../texlive-documentation-spanish-2011.ebuild |   6 +-
 .../texlive-documentation-thai-2011.ebuild    |   6 +-
 .../texlive-documentation-turkish-2011.ebuild |   6 +-
 ...exlive-documentation-ukrainian-2011.ebuild |   6 +-
 ...xlive-documentation-vietnamese-2011.ebuild |   6 +-
 .../texlive-fontsextra-2011.ebuild            |   6 +-
 .../texlive-fontsrecommended-2011.ebuild      |   6 +-
 .../texlive-fontutils-2011.ebuild             |   6 +-
 .../texlive-formatsextra-2011.ebuild          |   6 +-
 .../texlive-games/texlive-games-2011.ebuild   |   6 +-
 .../texlive-genericextra-2011.ebuild          |   6 +-
 .../texlive-genericrecommended-2011.ebuild    |   6 +-
 .../texlive-htmlxml-2011.ebuild               |   6 +-
 .../texlive-humanities-2011.ebuild            |   6 +-
 .../texlive-langafrican-2011.ebuild           |   6 +-
 .../texlive-langarabic-2011.ebuild            |   6 +-
 .../texlive-langarmenian-2011.ebuild          |   6 +-
 .../texlive-langcjk-2011.ebuild               |   6 +-
 .../texlive-langcroatian-2011.ebuild          |   6 +-
 .../texlive-langcyrillic-2011.ebuild          |   6 +-
 .../texlive-langczechslovak-2011.ebuild       |   6 +-
 .../texlive-langdanish-2011.ebuild            |   6 +-
 .../texlive-langdutch-2011.ebuild             |   6 +-
 .../texlive-langenglish-2011.ebuild           |   6 +-
 .../texlive-langfinnish-2011.ebuild           |   6 +-
 .../texlive-langfrench-2011.ebuild            |   6 +-
 .../texlive-langgerman-2011.ebuild            |   6 +-
 .../texlive-langgreek-2011.ebuild             |   6 +-
 .../texlive-langhebrew-2011.ebuild            |   6 +-
 .../texlive-langhungarian-2011.ebuild         |   6 +-
 .../texlive-langindic-2011.ebuild             |   6 +-
 .../texlive-langitalian-2011.ebuild           |   6 +-
 .../texlive-langlatin-2011.ebuild             |   6 +-
 .../texlive-langlatvian-2011.ebuild           |   6 +-
 .../texlive-langlithuanian-2011.ebuild        |   6 +-
 .../texlive-langmongolian-2011.ebuild         |   6 +-
 .../texlive-langnorwegian-2011.ebuild         |   6 +-
 .../texlive-langother-2011.ebuild             |   6 +-
 .../texlive-langpolish-2011.ebuild            |   6 +-
 .../texlive-langportuguese-2011.ebuild        |   6 +-
 .../texlive-langspanish-2011.ebuild           |   6 +-
 .../texlive-langswedish-2011.ebuild           |   6 +-
 .../texlive-langtibetan-2011.ebuild           |   6 +-
 .../texlive-langturkmen-2011.ebuild           |   6 +-
 .../texlive-langvietnamese-2011.ebuild        |   6 +-
 .../texlive-latex/texlive-latex-2011.ebuild   |   6 +-
 .../texlive-latexextra-2011-r2.ebuild         |   6 +-
 .../texlive-latexrecommended-2011.ebuild      |   6 +-
 .../texlive-luatex/texlive-luatex-2011.ebuild |   6 +-
 .../texlive-mathextra-2011.ebuild             |   6 +-
 .../texlive-metapost-2011.ebuild              |   6 +-
 .../texlive-music/texlive-music-2011.ebuild   |   6 +-
 .../texlive-omega/texlive-omega-2011.ebuild   |   6 +-
 .../texlive-pictures-2011.ebuild              |   6 +-
 .../texlive-plainextra-2011.ebuild            |   6 +-
 .../texlive-pstricks-2011.ebuild              |   6 +-
 .../texlive-publishers-2011.ebuild            |   6 +-
 .../texlive-science-2011.ebuild               |   6 +-
 .../texlive-texinfo-2011.ebuild               |   6 +-
 .../texlive-xetex/texlive-xetex-2011.ebuild   |   6 +-
 dev-util/patchutils/patchutils-0.3.2.ebuild   |   4 +-
 dev-util/systemtap/systemtap-1.6.ebuild       |   6 +-
 kde-misc/kcheckgmail/Manifest                 |   1 -
 kde-misc/kcheckgmail/kcheckgmail-0.6.0.ebuild |  18 -
 kde-misc/kcheckgmail/metadata.xml             |   5 -
 licenses/Emacs-23-CEDET-grammars              |  20 --
 licenses/dbgphp                               |  19 -
 mail-mta/postfix/Manifest                     |   2 +-
 ....ebuild => postfix-2.9_pre20120115.ebuild} |   2 +-
 media-libs/sampleicc/sampleicc-1.6.4.ebuild   |   6 +-
 media-sound/mpc/mpc-0.21.ebuild               |   4 +-
 media-sound/rhythmbox/Manifest                |   2 +-
 ...rhythmbox-2.95-fix-db-dbus-interface.patch |  58 +++
 ...rhythmbox-2.95-port-im-status-plugin.patch | 247 +++++++++++++
 ...x-2.95-port-rb-set-rating-py-example.patch |  42 +++
 ...e20111001.ebuild => rhythmbox-2.95.ebuild} |  77 ++--
 media-video/dvdrip/dvdrip-0.98.11-r1.ebuild   |   6 +-
 .../cache/app-admin/eselect-oodict-20100228   |   2 +-
 metadata/cache/app-admin/rsyslog-5.8.6        |   6 +-
 metadata/cache/app-arch/sharutils-4.11.1      |   2 +-
 metadata/cache/app-editors/emacs-23.3-r2      |  22 --
 metadata/cache/app-editors/emacs-23.3-r4      |   2 +-
 .../app-emacs/emacs-common-gentoo-1.2-r2      |  22 --
 .../cache/app-emacs/emacs-common-gentoo-1.3   |   2 +-
 metadata/cache/app-misc/tomboy-1.4.2-r1       |   6 +-
 metadata/cache/app-misc/tomboy-1.6.1          |   6 +-
 metadata/cache/app-misc/tomboy-1.8.3          |   6 +-
 metadata/cache/app-office/imposter-0.3        |   2 +-
 metadata/cache/app-office/libreoffice-3.4.5.2 |   2 +-
 .../app-office/libreoffice-l10n-3.4.5-r1      |   2 +-
 metadata/cache/app-portage/eix-0.23.6         |  22 ++
 metadata/cache/app-portage/esearch-1.0-r2     |   2 +-
 .../cache/app-text/dvipsk-5.991_p20110705-r1  |   2 +-
 metadata/cache/app-text/lcdf-typetools-2.91   |   2 +-
 metadata/cache/app-text/libexttextcat-3.2.0   |   2 +-
 metadata/cache/app-text/mythes-1.2.2          |   2 +-
 metadata/cache/app-text/ps2pkm-1.5_p20110705  |   2 +-
 metadata/cache/app-text/texlive-2011          |   2 +-
 metadata/cache/app-text/texlive-core-2011-r5  |   2 +-
 metadata/cache/dev-embedded/srecord-1.42      |  22 --
 .../cache/dev-embedded/u-boot-tools-2010.06   |  22 --
 .../cache/dev-embedded/u-boot-tools-2010.12   |  22 --
 metadata/cache/dev-lang/swi-prolog-5.10.5-r1  |   2 +-
 metadata/cache/dev-libs/hyphen-2.8.3          |   2 +-
 metadata/cache/dev-libs/jemalloc-2.2.5        |   2 +-
 metadata/cache/dev-libs/libexplain-0.42       |  22 --
 metadata/cache/dev-libs/libexplain-0.45       |  22 --
 metadata/cache/dev-libs/libexplain-0.46       |  22 --
 metadata/cache/dev-libs/libexplain-0.47       |  22 --
 .../{libexplain-0.40 => libexplain-0.50}      |   8 +-
 metadata/cache/dev-libs/libxml2-2.7.8-r4      |   2 +-
 metadata/cache/dev-libs/ppl-0.11.2-r1         |   2 +-
 .../cache/dev-libs/ptexenc-1.2.0_p20110705    |   2 +-
 metadata/cache/dev-perl/XML-RSS-1.490.0       |   2 +-
 metadata/cache/dev-php/PEAR-Cache-1.5.6       |   2 +-
 metadata/cache/dev-php/PEAR-Cache_Lite-1.7.12 |   2 +-
 metadata/cache/dev-php/PEAR-File-1.4.0        |   2 +-
 .../dev-php/PEAR-HTML_Template_Flexy-1.3.12   |   2 +-
 .../cache/dev-php/PEAR-HTML_TreeMenu-1.2.2    |   2 +-
 .../cache/dev-php/PEAR-Image_Canvas-0.3.3     |   2 +-
 metadata/cache/dev-php/PEAR-Log-1.12.7        |   2 +-
 metadata/cache/dev-php/PEAR-Net_DIME-1.0.2    |   2 +-
 metadata/cache/dev-php/PEAR-Net_FTP-1.3.7-r1  |   2 +-
 .../dev-php/PEAR-Net_UserAgent_Detect-2.5.2   |   2 +-
 .../cache/dev-php/PEAR-Numbers_Words-0.16.2   |   2 +-
 metadata/cache/dev-ruby/barby-0.5.0-r1        |  22 ++
 metadata/cache/dev-ruby/json-1.5.4            |   2 +-
 metadata/cache/dev-ruby/sary-ruby-1.2.0-r2    |   2 +-
 metadata/cache/dev-tex/bibtexu-3.71_p20110705 |   2 +-
 metadata/cache/dev-tex/mh-20111011            |   2 +-
 .../cache/dev-texlive/texlive-basic-2011-r1   |   2 +-
 .../dev-texlive/texlive-bibtexextra-2011      |   2 +-
 .../cache/dev-texlive/texlive-context-2011    |   2 +-
 .../texlive-documentation-arabic-2011         |   2 +-
 .../texlive-documentation-base-2011           |   2 +-
 .../texlive-documentation-bulgarian-2011      |   2 +-
 .../texlive-documentation-chinese-2011        |   2 +-
 .../texlive-documentation-czechslovak-2011    |   2 +-
 .../texlive-documentation-dutch-2011          |   2 +-
 .../texlive-documentation-english-2011        |   2 +-
 .../texlive-documentation-finnish-2011        |   2 +-
 .../texlive-documentation-french-2011         |   2 +-
 .../texlive-documentation-german-2011         |   2 +-
 .../texlive-documentation-italian-2011        |   2 +-
 .../texlive-documentation-japanese-2011       |   2 +-
 .../texlive-documentation-korean-2011         |   2 +-
 .../texlive-documentation-mongolian-2011      |   2 +-
 .../texlive-documentation-polish-2011         |   2 +-
 .../texlive-documentation-portuguese-2011     |   2 +-
 .../texlive-documentation-russian-2011        |   2 +-
 .../texlive-documentation-serbian-2011        |   2 +-
 .../texlive-documentation-slovenian-2011      |   2 +-
 .../texlive-documentation-spanish-2011        |   2 +-
 .../texlive-documentation-thai-2011           |   2 +-
 .../texlive-documentation-turkish-2011        |   2 +-
 .../texlive-documentation-ukrainian-2011      |   2 +-
 .../texlive-documentation-vietnamese-2011     |   2 +-
 .../cache/dev-texlive/texlive-fontsextra-2011 |   2 +-
 .../dev-texlive/texlive-fontsrecommended-2011 |   2 +-
 .../cache/dev-texlive/texlive-fontutils-2011  |   2 +-
 .../dev-texlive/texlive-formatsextra-2011     |   2 +-
 metadata/cache/dev-texlive/texlive-games-2011 |   2 +-
 .../dev-texlive/texlive-genericextra-2011     |   2 +-
 .../texlive-genericrecommended-2011           |   2 +-
 .../cache/dev-texlive/texlive-htmlxml-2011    |   2 +-
 .../cache/dev-texlive/texlive-humanities-2011 |   2 +-
 .../dev-texlive/texlive-langafrican-2011      |   2 +-
 .../cache/dev-texlive/texlive-langarabic-2011 |   2 +-
 .../dev-texlive/texlive-langarmenian-2011     |   2 +-
 .../cache/dev-texlive/texlive-langcjk-2011    |   2 +-
 .../dev-texlive/texlive-langcroatian-2011     |   2 +-
 .../dev-texlive/texlive-langcyrillic-2011     |   2 +-
 .../dev-texlive/texlive-langczechslovak-2011  |   2 +-
 .../cache/dev-texlive/texlive-langdanish-2011 |   2 +-
 .../cache/dev-texlive/texlive-langdutch-2011  |   2 +-
 .../dev-texlive/texlive-langenglish-2011      |   2 +-
 .../dev-texlive/texlive-langfinnish-2011      |   2 +-
 .../cache/dev-texlive/texlive-langfrench-2011 |   2 +-
 .../cache/dev-texlive/texlive-langgerman-2011 |   2 +-
 .../cache/dev-texlive/texlive-langgreek-2011  |   2 +-
 .../cache/dev-texlive/texlive-langhebrew-2011 |   2 +-
 .../dev-texlive/texlive-langhungarian-2011    |   2 +-
 .../cache/dev-texlive/texlive-langindic-2011  |   2 +-
 .../dev-texlive/texlive-langitalian-2011      |   2 +-
 .../cache/dev-texlive/texlive-langlatin-2011  |   2 +-
 .../dev-texlive/texlive-langlatvian-2011      |   2 +-
 .../dev-texlive/texlive-langlithuanian-2011   |   2 +-
 .../dev-texlive/texlive-langmongolian-2011    |   2 +-
 .../dev-texlive/texlive-langnorwegian-2011    |   2 +-
 .../cache/dev-texlive/texlive-langother-2011  |   2 +-
 .../cache/dev-texlive/texlive-langpolish-2011 |   2 +-
 .../dev-texlive/texlive-langportuguese-2011   |   2 +-
 .../dev-texlive/texlive-langspanish-2011      |   2 +-
 .../dev-texlive/texlive-langswedish-2011      |   2 +-
 .../dev-texlive/texlive-langtibetan-2011      |   2 +-
 .../dev-texlive/texlive-langturkmen-2011      |   2 +-
 .../dev-texlive/texlive-langvietnamese-2011   |   2 +-
 metadata/cache/dev-texlive/texlive-latex-2011 |   2 +-
 .../dev-texlive/texlive-latexextra-2011-r2    |   2 +-
 .../dev-texlive/texlive-latexrecommended-2011 |   2 +-
 .../cache/dev-texlive/texlive-luatex-2011     |   2 +-
 .../cache/dev-texlive/texlive-mathextra-2011  |   2 +-
 .../cache/dev-texlive/texlive-metapost-2011   |   2 +-
 metadata/cache/dev-texlive/texlive-music-2011 |   2 +-
 metadata/cache/dev-texlive/texlive-omega-2011 |   2 +-
 .../cache/dev-texlive/texlive-pictures-2011   |   2 +-
 .../cache/dev-texlive/texlive-plainextra-2011 |   2 +-
 .../cache/dev-texlive/texlive-pstricks-2011   |   2 +-
 .../cache/dev-texlive/texlive-publishers-2011 |   2 +-
 .../cache/dev-texlive/texlive-science-2011    |   2 +-
 .../cache/dev-texlive/texlive-texinfo-2011    |   2 +-
 metadata/cache/dev-texlive/texlive-xetex-2011 |   2 +-
 metadata/cache/dev-util/patchutils-0.3.2      |   2 +-
 metadata/cache/dev-util/systemtap-1.6         |   2 +-
 metadata/cache/kde-misc/kcheckgmail-0.6.0     |  22 --
 ....9_pre20120114 => postfix-2.9_pre20120115} |   2 +-
 metadata/cache/media-libs/sampleicc-1.6.4     |   2 +-
 metadata/cache/media-sound/mpc-0.21           |   2 +-
 .../media-sound/rhythmbox-2.90.1_pre20111001  |  22 --
 metadata/cache/media-sound/rhythmbox-2.95     |  22 ++
 metadata/cache/media-video/dvdrip-0.98.11-r1  |   2 +-
 .../cache/net-analyzer/hping-3_pre20051105-r3 |   2 +-
 .../cache/net-dns/{knot-0.8.1 => knot-0.9}    |   2 +-
 metadata/cache/net-fs/nfs-utils-1.2.5         |   4 +-
 metadata/cache/net-im/empathy-2.34.0-r2       |   2 +-
 metadata/cache/net-libs/gssdp-0.7.2           |   2 +-
 metadata/cache/net-misc/dahdi-2.5.0.2-r2      |  22 ++
 metadata/cache/sys-apps/netkit-base-0.17-r9   |   2 +-
 metadata/cache/sys-apps/pkgcore-0.7.7.6       |  22 ++
 metadata/cache/sys-boot/unetbootin-565        |   2 +-
 metadata/cache/sys-devel/autogen-5.12         |   2 +-
 metadata/cache/sys-libs/glibc-2.15            |   2 +-
 metadata/dtd/timestamp.chk                    |   2 +-
 metadata/glsa/timestamp.chk                   |   2 +-
 metadata/news/timestamp.chk                   |   2 +-
 metadata/timestamp                            |   2 +-
 metadata/timestamp.chk                        |   2 +-
 metadata/timestamp.x                          |   2 +-
 .../hping/hping-3_pre20051105-r3.ebuild       |   4 +-
 net-dns/knot/Manifest                         |   2 +-
 .../{knot-0.8.1.ebuild => knot-0.9.ebuild}    |   4 +-
 net-fs/nfs-utils/nfs-utils-1.2.5.ebuild       |   8 +-
 net-im/empathy/empathy-2.34.0-r2.ebuild       |   6 +-
 net-libs/gssdp/gssdp-0.7.2.ebuild             |   6 +-
 net-misc/aria2/aria2-1.14.1.ebuild            |   6 +-
 net-misc/dahdi/Manifest                       |   2 +
 net-misc/dahdi/dahdi-2.5.0.2-r2.ebuild        |  69 ++++
 profiles/license_groups                       |   4 +-
 profiles/package.mask                         |  17 +-
 profiles/use.local.desc                       |   1 -
 .../netkit-base/netkit-base-0.17-r9.ebuild    |   4 +-
 sys-apps/pkgcore/Manifest                     |   1 +
 sys-apps/pkgcore/pkgcore-0.7.7.6.ebuild       |  52 +++
 sys-boot/unetbootin/unetbootin-565.ebuild     |   6 +-
 sys-devel/autogen/autogen-5.12.ebuild         |   4 +-
 sys-libs/glibc/Manifest                       |   2 +-
 sys-libs/glibc/glibc-2.15.ebuild              |   6 +-
 343 files changed, 1393 insertions(+), 1849 deletions(-)
 delete mode 100644 app-editors/emacs/emacs-23.3-r2.ebuild
 delete mode 100644 app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.2-r2.ebuild
 create mode 100644 app-portage/eix/eix-0.23.6.ebuild
 delete mode 100644 dev-embedded/srecord/files/srecord-1.42-gcc44.patch
 delete mode 100644 dev-embedded/srecord/srecord-1.42.ebuild
 delete mode 100644 dev-embedded/u-boot-tools/u-boot-tools-2010.06.ebuild
 delete mode 100644 dev-embedded/u-boot-tools/u-boot-tools-2010.12.ebuild
 delete mode 100644 dev-libs/libexplain/libexplain-0.40.ebuild
 delete mode 100644 dev-libs/libexplain/libexplain-0.42.ebuild
 delete mode 100644 dev-libs/libexplain/libexplain-0.46.ebuild
 delete mode 100644 dev-libs/libexplain/libexplain-0.47.ebuild
 rename dev-libs/libexplain/{libexplain-0.45.ebuild => libexplain-0.50.ebuild} (68%)
 create mode 100644 dev-ruby/barby/barby-0.5.0-r1.ebuild
 delete mode 100644 kde-misc/kcheckgmail/Manifest
 delete mode 100644 kde-misc/kcheckgmail/kcheckgmail-0.6.0.ebuild
 delete mode 100644 kde-misc/kcheckgmail/metadata.xml
 delete mode 100644 licenses/Emacs-23-CEDET-grammars
 delete mode 100644 licenses/dbgphp
 rename mail-mta/postfix/{postfix-2.9_pre20120114.ebuild => postfix-2.9_pre20120115.ebuild} (99%)
 create mode 100644 media-sound/rhythmbox/files/rhythmbox-2.95-fix-db-dbus-interface.patch
 create mode 100644 media-sound/rhythmbox/files/rhythmbox-2.95-port-im-status-plugin.patch
 create mode 100644 media-sound/rhythmbox/files/rhythmbox-2.95-port-rb-set-rating-py-example.patch
 rename media-sound/rhythmbox/{rhythmbox-2.90.1_pre20111001.ebuild => rhythmbox-2.95.ebuild} (72%)
 delete mode 100644 metadata/cache/app-editors/emacs-23.3-r2
 delete mode 100644 metadata/cache/app-emacs/emacs-common-gentoo-1.2-r2
 create mode 100644 metadata/cache/app-portage/eix-0.23.6
 delete mode 100644 metadata/cache/dev-embedded/srecord-1.42
 delete mode 100644 metadata/cache/dev-embedded/u-boot-tools-2010.06
 delete mode 100644 metadata/cache/dev-embedded/u-boot-tools-2010.12
 delete mode 100644 metadata/cache/dev-libs/libexplain-0.42
 delete mode 100644 metadata/cache/dev-libs/libexplain-0.45
 delete mode 100644 metadata/cache/dev-libs/libexplain-0.46
 delete mode 100644 metadata/cache/dev-libs/libexplain-0.47
 rename metadata/cache/dev-libs/{libexplain-0.40 => libexplain-0.50} (61%)
 create mode 100644 metadata/cache/dev-ruby/barby-0.5.0-r1
 delete mode 100644 metadata/cache/kde-misc/kcheckgmail-0.6.0
 rename metadata/cache/mail-mta/{postfix-2.9_pre20120114 => postfix-2.9_pre20120115} (96%)
 delete mode 100644 metadata/cache/media-sound/rhythmbox-2.90.1_pre20111001
 create mode 100644 metadata/cache/media-sound/rhythmbox-2.95
 rename metadata/cache/net-dns/{knot-0.8.1 => knot-0.9} (88%)
 create mode 100644 metadata/cache/net-misc/dahdi-2.5.0.2-r2
 create mode 100644 metadata/cache/sys-apps/pkgcore-0.7.7.6
 rename net-dns/knot/{knot-0.8.1.ebuild => knot-0.9.ebuild} (84%)
 create mode 100644 net-misc/dahdi/dahdi-2.5.0.2-r2.ebuild
 create mode 100644 sys-apps/pkgcore/pkgcore-0.7.7.6.ebuild

diff --git a/app-admin/eselect-oodict/eselect-oodict-20100228.ebuild b/app-admin/eselect-oodict/eselect-oodict-20100228.ebuild
index 0e545adedb4f..d93f89411293 100644
--- a/app-admin/eselect-oodict/eselect-oodict-20100228.ebuild
+++ b/app-admin/eselect-oodict/eselect-oodict-20100228.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-oodict/eselect-oodict-20100228.ebuild,v 1.2 2012/01/15 15:37:56 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-oodict/eselect-oodict-20100228.ebuild,v 1.3 2012/01/16 14:50:34 ago Exp $
 
 DESCRIPTION="Manages configuration of dictionaries for OpenOffice.Org."
 HOMEPAGE="http://www.gentoo.org/"
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/oodict.eselect-${PVR}.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.2"
diff --git a/app-admin/rsyslog/files/5-stable/rsyslog.initd b/app-admin/rsyslog/files/5-stable/rsyslog.initd
index 98dee94b5fb8..0794d5cb56d3 100644
--- a/app-admin/rsyslog/files/5-stable/rsyslog.initd
+++ b/app-admin/rsyslog/files/5-stable/rsyslog.initd
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd,v 1.2 2011/09/05 09:25:41 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd,v 1.3 2012/01/16 07:57:47 scarabeus Exp $
 
-opts="reload"
+extra_started_commands="reload"
 
 depend() {
 	provide logger
diff --git a/app-admin/rsyslog/rsyslog-5.8.6.ebuild b/app-admin/rsyslog/rsyslog-5.8.6.ebuild
index fd97c03ec539..e41a5c8db92d 100644
--- a/app-admin/rsyslog/rsyslog-5.8.6.ebuild
+++ b/app-admin/rsyslog/rsyslog-5.8.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.8.6.ebuild,v 1.1 2011/12/28 12:00:25 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.8.6.ebuild,v 1.2 2012/01/16 07:57:47 scarabeus Exp $
 
 EAPI=4
 
@@ -14,17 +14,17 @@ SRC_URI="http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
 LICENSE="GPL-3 LGPL-3"
 KEYWORDS="~amd64 ~arm ~hppa ~sparc ~x86"
 SLOT="0"
-IUSE="dbi debug doc extras gnutls kerberos mysql oracle postgres relp snmp static-libs zeromq zlib"
+IUSE="dbi debug doc extras kerberos mysql oracle postgres relp snmp ssl static-libs zeromq zlib"
 
 RDEPEND="dbi? ( dev-db/libdbi )
 	extras? ( net-libs/libnet )
-	gnutls? ( net-libs/gnutls )
 	kerberos? ( virtual/krb5 )
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql-base )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	relp? ( >=dev-libs/librelp-0.1.3 )
 	snmp? ( net-analyzer/net-snmp )
+	ssl? ( net-libs/gnutls )
 	zeromq? ( net-libs/zeromq )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
@@ -90,7 +90,7 @@ src_configure() {
 		$(use_enable dbi libdbi)
 		$(use_enable postgres pgsql)
 		$(use_enable oracle oracle)
-		$(use_enable gnutls)
+		$(use_enable ssl gnutls)
 		$(use_enable kerberos gssapi-krb5)
 		$(use_enable relp)
 		$(use_enable snmp)
@@ -158,9 +158,9 @@ pkg_postinst() {
 }
 
 pkg_config() {
-	if ! use gnutls ; then
+	if ! use ssl ; then
 		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=gnutls to build it."
+		einfo "used USE=ssl to build it."
 		return 0
 	fi
 
diff --git a/app-arch/sharutils/sharutils-4.11.1.ebuild b/app-arch/sharutils/sharutils-4.11.1.ebuild
index d78baf7ec701..5cebc9ab2909 100644
--- a/app-arch/sharutils/sharutils-4.11.1.ebuild
+++ b/app-arch/sharutils/sharutils-4.11.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.11.1.ebuild,v 1.4 2012/01/15 15:42:48 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.11.1.ebuild,v 1.5 2012/01/16 03:06:39 jer Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 DEPEND="sys-apps/texinfo
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index eefc7683a87b..869a62c3d216 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -5,7 +5,6 @@ DIST emacs-21.4-patches-12.tar.bz2 13207 RMD160 1a35ce8b479ab783b3bf2d827bbae98c
 DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a SHA1 cdb33731180fe4a912838af805dd35e3f55394d4 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216
 DIST emacs-22.3-patches-8.tar.bz2 5974 RMD160 a17c6e291b6c0d246d30a27baceaa882b12a1250 SHA1 fbb03538973be5f416edbffebc567f6346caef4b SHA256 72a68bd14ce2efd52b0425c56649d735f4b3c0e630de73e0eb51ddf947d56ff7
 DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 SHA1 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16
-DIST emacs-23.3-patches-2.tar.bz2 1936 RMD160 c1cbe26f05e68efe0768445a3918892e995a59dd SHA1 3f55305dab83084b01f8958371d4e0fd4114b88b SHA256 403f88c0b814817734f275e6ee6ff4c8f27858a2429ea7d0a029c2d89ebaa5de
 DIST emacs-23.3-patches-4.tar.bz2 19275 RMD160 9a5d61bcf60422efd44efc5f206d9baf8e742bd6 SHA1 695d786f1d43ddbc0c269c780a43cfed9aeb35f0 SHA256 0d4393e221b78bd97c39a10f6e4206d2dbbcee7062e9626d37a3a45c72b34636
 DIST emacs-23.3a.tar.bz2 38748283 RMD160 21f201714bca420c3a8fed8c92058cec786e724e SHA1 795bdfa372e42b9589a80f6dcb2ad8fed65b90e4 SHA256 9f4beee3bf4987914d57851c0aac017cb92a1410c2b31ba313265c64a38cc6ba
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
diff --git a/app-editors/emacs/emacs-23.3-r2.ebuild b/app-editors/emacs/emacs-23.3-r2.ebuild
deleted file mode 100644
index 3bb1fbcc15e7..000000000000
--- a/app-editors/emacs/emacs-23.3-r2.ebuild
+++ /dev/null
@@ -1,330 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r2.ebuild,v 1.16 2012/01/06 16:40:00 halcy0n Exp $
-
-EAPI=4
-WANT_AUTOMAKE="none"
-
-inherit autotools elisp-common eutils flag-o-matic multilib
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}a.tar.bz2
-	mirror://gentoo/${P}-patches-2.tar.bz2"
-
-LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2 Emacs-23-CEDET-grammars"
-SLOT="23"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="alsa aqua athena dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
-REQUIRED_USE="aqua? ( !X )"
-
-RDEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-1.2
-	net-libs/liblockfile
-	hesiod? ( net-dns/hesiod )
-	kerberos? ( virtual/krb5 )
-	alsa? ( media-libs/alsa-lib )
-	gpm? ( sys-libs/gpm )
-	dbus? ( sys-apps/dbus )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gif? ( media-libs/giflib )
-		jpeg? ( virtual/jpeg )
-		png? ( >=media-libs/libpng-1.4:0 )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff )
-		xpm? ( x11-libs/libXpm )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? ( x11-libs/gtk+:2 )
-		!gtk? (
-			Xaw3d? ( x11-libs/libXaw3d )
-			!Xaw3d? (
-				athena? ( x11-libs/libXaw )
-				!athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-RDEPEND="${RDEPEND}
-	!<app-editors/emacs-vcs-${PV}
-	>=app-emacs/emacs-common-gentoo-1[X?]"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-# FULL_VERSION keeps the full version number, which is needed in
-# order to determine some path information correctly for copy/move
-# operations later on
-FULL_VERSION="${PV%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-
-src_prepare() {
-	EPATCH_SUFFIX=patch epatch
-	epatch_user
-
-	sed -i \
-		-e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
-		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
-		"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
-
-	if ! use alsa; then
-		# ALSA is detected even if not requested by its USE flag.
-		# Suppress it by supplying pkg-config with a wrong library name.
-		sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-	if ! use gzip-el; then
-		# Emacs' build system automatically detects the gzip binary and
-		# compresses el files. We don't want that so confuse it with a
-		# wrong binary name
-		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	ALLOWED_FLAGS=""
-	strip-flags
-	filter-flags -fstrict-aliasing
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	if use sh; then
-		replace-flags -O[1-9] -O0		#262359
-	elif use ia64; then
-		replace-flags -O[2-9] -O1		#325373
-	else
-		replace-flags -O[3-9] -O2
-	fi
-
-	local myconf
-
-	if use alsa && ! use sound; then
-		einfo "Although sound USE flag is disabled you chose to have alsa,"
-		einfo "so sound is switched on anyway."
-		myconf="${myconf} --with-sound"
-	else
-		myconf="${myconf} $(use_with sound)"
-	fi
-
-	if use X; then
-		myconf="${myconf} --with-x --without-ns"
-		myconf="${myconf} $(use_with gconf)"
-		myconf="${myconf} $(use_with toolkit-scroll-bars)"
-		myconf="${myconf} $(use_with gif) $(use_with jpeg)"
-		myconf="${myconf} $(use_with png) $(use_with svg rsvg)"
-		myconf="${myconf} $(use_with tiff) $(use_with xpm)"
-
-		if use xft; then
-			myconf="${myconf} --with-xft"
-			myconf="${myconf} $(use_with m17n-lib libotf)"
-			myconf="${myconf} $(use_with m17n-lib m17n-flt)"
-		else
-			myconf="${myconf} --without-xft"
-			myconf="${myconf} --without-libotf --without-m17n-flt"
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		# GTK+ is the default toolkit if USE=gtk is chosen with other
-		# possibilities. Emacs upstream thinks this should be standard
-		# policy on all distributions
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			myconf="${myconf} --with-x-toolkit=gtk"
-		elif use Xaw3d || use athena; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf="${myconf} --with-x-toolkit=motif"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf="${myconf} --with-x-toolkit=no"
-		fi
-
-		local f tk=
-		for f in gtk Xaw3d athena motif; do
-			use ${f} || continue
-			[[ ${tk} ]] \
-				&& ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
-			tk="${tk}${tk:+ }${f}"
-		done
-	elif use aqua; then
-		einfo "Configuring to build with Cocoa support"
-		myconf="${myconf} --with-ns --disable-ns-self-contained"
-		myconf="${myconf} --without-x"
-	else
-		myconf="${myconf} --without-x --without-ns"
-	fi
-
-	# According to configure, this option is only used for GNU/Linux
-	# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
-	# out the location because $(get_libdir) does not necessarily return
-	# something that matches the host OS's libdir naming (e.g. RHEL).
-	local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
-	crtdir=${crtdir%/*}
-
-	econf \
-		--program-suffix=-${EMACS_SUFFIX} \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--with-crt-dir="${crtdir}" \
-		--with-gameuser="${GAMES_USER_DED:-games}" \
-		$(use_with hesiod) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with gpm) \
-		$(use_with dbus) \
-		${myconf}
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	# set last component of emacs-version to (package revision + 1)
-	touch src/emacs-${FULL_VERSION}.${PR#r}
-	emake CC="$(tc-getCC)"
-}
-
-src_install () {
-	local i m
-
-	emake install DESTDIR="${D}"
-
-	rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
-		|| die "removing duplicate emacs executable failed"
-	mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
-		|| die "moving Emacs executable failed"
-
-	# move man pages to the correct place
-	for m in "${ED}"/usr/share/man/man1/* ; do
-		mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
-	done
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{applications,icons}
-	rm "${ED}"/var/lib/games/emacs/{snake,tetris}-scores
-	keepdir /var/lib/games/emacs
-
-	local c=";;"
-	if use source; then
-		insinto /usr/share/emacs/${FULL_VERSION}/src
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-		doins -r src/{m,s}
-		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c
-		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
-		c=""
-	fi
-
-	sed 's/^X//' >"${T}/${SITEFILE}" <<-EOF
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	X  ${c}(setq find-function-C-source-directory
-	X  ${c}      "${EPREFIX}/usr/share/emacs/${FULL_VERSION}/src")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-		elog "Emacs${EMACS_SUFFIX#emacs}.app is in ${EPREFIX}/Applications/Gentoo."
-		elog "You may want to copy or symlink it into /Applications by yourself."
-	fi
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [[ -f ${ED}${infodir}/dir.orig ]]; then
-		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	else
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${ED}"${infodir}/dir{,.*}
-		for f in "${ED}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${ED}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	local f
-	for f in "${EROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
-		[[ -e ${f} ]] || touch "${f}"
-	done
-	chown "${GAMES_USER_DED:-games}" "${EROOT}"/var/lib/games/emacs
-
-	elisp-site-regen
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
-
-	if use X; then
-		elog "You need to install some fonts for Emacs."
-		elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
-		elog "machine would satisfy basic Emacs requirements under X11."
-		elog "See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml"
-		elog "for how to enable anti-aliased fonts."
-		elog
-	fi
-
-	elog "You can set the version to be started by /usr/bin/emacs through"
-	elog "the Emacs eselect module, which also redirects man and info pages."
-	elog "Therefore, several Emacs versions can be installed at the same time."
-	elog "\"man emacs.eselect\" for details."
-	elog
-	elog "If you upgrade from a previous major version of Emacs, then it is"
-	elog "strongly recommended that you use app-admin/emacs-updater to rebuild"
-	elog "all byte-compiled elisp files of the installed Emacs packages."
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-23.3-r4.ebuild b/app-editors/emacs/emacs-23.3-r4.ebuild
index 9ccd5ff2503d..08cf64b25113 100644
--- a/app-editors/emacs/emacs-23.3-r4.ebuild
+++ b/app-editors/emacs/emacs-23.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r4.ebuild,v 1.5 2012/01/15 19:14:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r4.ebuild,v 1.6 2012/01/16 03:00:17 jer Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/emacs/${P}a.tar.bz2
 
 LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
 SLOT="23"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="alsa aqua athena dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
 REQUIRED_USE="aqua? ( !X )"
 
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index 8445b2d668ba..52522f3797cf 100644
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -1,2 +1 @@
-DIST emacs-common-gentoo-1.2.tar.gz 46622 RMD160 88c923d05286b53687e1099294fb579a2f4f5d39 SHA1 4712b6186d4620aaa5258236367d3228f515f341 SHA256 d15f9654214b10e9efc9e38fe45b4e08c3f0cc1c975de34058e4d360d3053108
 DIST emacs-common-gentoo-1.3.tar.gz 46819 RMD160 40c12dd355c3fd80ad65d45190c4f3c7f2134ad6 SHA1 ff743a4646d493dd14ed1e812d3adfd6323498e9 SHA256 c874088b1d9833432e1da9c3e3f79e7891cb3af41bcdecb02aa299d207c0218d
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.2-r2.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.2-r2.ebuild
deleted file mode 100644
index 06a8fd01b81c..000000000000
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.2-r2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.2-r2.ebuild,v 1.9 2011/07/15 14:29:24 xarthisius Exp $
-
-EAPI=4
-
-inherit elisp-common eutils fdo-mime gnome2-utils
-
-DESCRIPTION="Common files needed by all GNU Emacs versions"
-HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="X emacs22icons"
-
-PDEPEND="virtual/emacs"
-
-pkg_setup() {
-	if [ -e "${EROOT}${SITELISP}/subdirs.el" ] \
-		&& ! has_version ">=${CATEGORY}/${PN}-1"
-	then
-		ewarn "Removing orphan subdirs.el (installed by old Emacs ebuilds)"
-		rm -f "${EROOT}${SITELISP}/subdirs.el"
-	fi
-}
-
-src_install() {
-	elisp-install . subdirs.el || die
-
-	if use X; then
-		local i
-		domenu emacs.desktop emacsclient.desktop || die
-		newicon icons/sink.png emacs-sink.png || die
-		if use emacs22icons; then
-			newicon icons/emacs22_48.png emacs.png || die
-			for i in 16 24 32 48; do
-				insinto /usr/share/icons/hicolor/${i}x${i}/apps
-				newins icons/emacs22_${i}.png emacs.png
-			done
-		else
-			newicon icons/emacs_48.png emacs.png || die
-			for i in 16 24 32 48 128; do
-				insinto /usr/share/icons/hicolor/${i}x${i}/apps
-				newins icons/emacs_${i}.png emacs.png
-			done
-			insinto /usr/share/icons/hicolor/scalable/apps
-			doins icons/emacs.svg
-		fi
-		gnome2_icon_savelist
-	fi
-}
-
-make-site-start() {
-	ebegin "Creating default ${SITELISP}/site-start.el"
-	cat <<-EOF >"${T}/site-start.el"
-	;;; site-start.el			-*- no-byte-compile: t -*-
-
-	;;; Commentary:
-	;; This default site startup file for Emacs was created by package
-	;; ${CATEGORY}/${PF}. You may modify this file, replace
-	;; it by your own site initialisation, or even remove it completely.
-
-	;;; Code:
-	;; Load site initialisation for Gentoo installed packages.
-	(require 'site-gentoo)
-
-	;;; site-start.el ends here
-	EOF
-	mv "${T}/site-start.el" "${EROOT}${SITELISP}/site-start.el"
-	eend $? "Installation of site-start.el failed"
-}
-
-pkg_config() {
-	# make sure that site-gentoo.el exists since site-start.el requires it
-	elisp-site-regen
-
-	if [ ! -e "${EROOT}${SITELISP}/site-start.el" ]; then
-		echo
-		einfo "Press ENTER to create a default site-start.el file"
-		einfo "for GNU Emacs, or Control-C to abort now ..."
-		read
-		make-site-start
-	else
-		einfo "site-start.el for GNU Emacs already exists."
-	fi
-}
-
-pkg_postinst() {
-	if use X; then
-		fdo-mime_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-
-	# make sure that site-gentoo.el exists since site-start.el requires it
-	elisp-site-regen
-
-	if [ ! -e "${EROOT}${SITELISP}/site-start.el" ]; then
-		local line
-		echo
-		while read line; do elog "${line:- }"; done <<-EOF
-		All site initialisation for Gentoo-installed packages is added to
-		/usr/share/emacs/site-lisp/site-gentoo.el. In order for this site
-		initialisation to be loaded for all users automatically, a default
-		site-start.el is created in the same directory. You are responsible
-		for all further maintenance of this file.
-
-		Alternatively, individual users can add the following command:
-
-		(require 'site-gentoo)
-
-		to their ~/.emacs initialisation files, or, for greater flexibility,
-		users may load single package-specific initialisation files from
-		/usr/share/emacs/site-lisp/site-gentoo.d/.
-		EOF
-		echo
-
-		if [ -z "${REPLACING_VERSIONS}" ]; then
-			# This is a new install. Create default site-start.el, so that
-			# Gentoo packages will work.
-			make-site-start
-		else
-			# This package was already installed, but site-start.el does
-			# not exist. Give a hint how to (re-)create it.
-			elog "If this is a new install, you may want to run:"
-			elog "emerge --config =${CATEGORY}/${PF}"
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if use X; then
-		fdo-mime_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild
index 92b3ae3449d5..e301509c88d8 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild,v 1.6 2012/01/15 19:11:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild,v 1.7 2012/01/16 02:59:27 jer Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="X emacs22icons"
 
 PDEPEND="virtual/emacs"
diff --git a/app-misc/tomboy/metadata.xml b/app-misc/tomboy/metadata.xml
index 7edb5202ca7b..9c0427602fd3 100644
--- a/app-misc/tomboy/metadata.xml
+++ b/app-misc/tomboy/metadata.xml
@@ -3,8 +3,6 @@
 <pkgmetadata>
 <herd>dotnet</herd>
 <use>
-	<flag name="applet">Enable tomboy applet for
-		<pkg>gnome-base/gnome-panel</pkg></flag>
 	<flag name='galago'>Add support for the galago desktop presence framework
 		(<pkg>dev-dotnet/galago-sharp</pkg>)</flag>
 </use>
diff --git a/app-misc/tomboy/tomboy-1.4.2-r1.ebuild b/app-misc/tomboy/tomboy-1.4.2-r1.ebuild
index 1fe1de8ca881..20fe5f48ae6f 100644
--- a/app-misc/tomboy/tomboy-1.4.2-r1.ebuild
+++ b/app-misc/tomboy/tomboy-1.4.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-1.4.2-r1.ebuild,v 1.8 2011/10/27 06:02:25 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-1.4.2-r1.ebuild,v 1.9 2012/01/16 12:55:01 ssuominen Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://projects.gnome.org/tomboy/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="+applet eds galago"
+IUSE="eds galago"
 
 RDEPEND=">=dev-lang/mono-2
 	>=dev-dotnet/gtk-sharp-2.12.6-r1:2
@@ -26,9 +26,6 @@ RDEPEND=">=dev-lang/mono-2
 	>=dev-libs/atk-1.2.4
 	>=gnome-base/gconf-2:2
 	>=app-text/gtkspell-2.0.9:2
-	applet? (
-		|| ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 )
-		>=dev-dotnet/gnome-panel-sharp-2.24.0:2 )
 	eds? ( dev-libs/gmime:2.4[mono] )
 	galago? ( =dev-dotnet/galago-sharp-0.5* )"
 DEPEND="${RDEPEND}
@@ -41,7 +38,7 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	G2CONF="${G2CONF}
-		$(use_enable applet panel-applet)
+		--disable-panel-applet
 		$(use_enable eds evolution)
 		$(use_enable galago)
 		--disable-update-mimedb"
diff --git a/app-misc/tomboy/tomboy-1.6.1.ebuild b/app-misc/tomboy/tomboy-1.6.1.ebuild
index 7ab5dd4fd7e8..7fc82ac121fe 100644
--- a/app-misc/tomboy/tomboy-1.6.1.ebuild
+++ b/app-misc/tomboy/tomboy-1.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-1.6.1.ebuild,v 1.5 2011/10/27 06:02:25 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-1.6.1.ebuild,v 1.6 2012/01/16 12:55:01 ssuominen Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -15,7 +15,7 @@ HOMEPAGE="http://projects.gnome.org/tomboy/"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE="+applet eds galago"
+IUSE="eds galago"
 
 RDEPEND="app-text/gtkspell:2
 	dev-dotnet/gconf-sharp:2
@@ -27,9 +27,6 @@ RDEPEND="app-text/gtkspell:2
 	dev-libs/atk
 	gnome-base/gconf:2
 	x11-libs/gtk+:2
-	applet? ( dev-dotnet/gnome-sharp:2
-		dev-dotnet/gnome-panel-sharp:2
-		gnome-base/gnome-panel[bonobo] )
 	eds? ( dev-libs/gmime:2.4[mono] )
 	galago? ( dev-dotnet/galago-sharp )"
 DEPEND="${RDEPEND}
@@ -41,7 +38,7 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	G2CONF="${G2CONF}
-		$(use_enable applet panel-applet)
+		--disable-panel-applet
 		$(use_enable eds evolution)
 		$(use_enable galago)
 		--disable-update-mimedb"
diff --git a/app-misc/tomboy/tomboy-1.8.3.ebuild b/app-misc/tomboy/tomboy-1.8.3.ebuild
index 9d4331681a40..cedc9003b84f 100644
--- a/app-misc/tomboy/tomboy-1.8.3.ebuild
+++ b/app-misc/tomboy/tomboy-1.8.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-1.8.3.ebuild,v 1.1 2011/11/20 16:16:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-1.8.3.ebuild,v 1.2 2012/01/16 12:55:01 ssuominen Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="http://projects.gnome.org/tomboy/"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+applet eds test"
+IUSE="eds test"
 # galago support dropped due upstream bug #660244
 
 RDEPEND="app-text/gtkspell:2
@@ -27,9 +27,6 @@ RDEPEND="app-text/gtkspell:2
 	dev-libs/atk
 	gnome-base/gconf:2
 	x11-libs/gtk+:2
-	applet? ( dev-dotnet/gnome-sharp:2
-		dev-dotnet/gnome-panel-sharp:2
-		gnome-base/gnome-panel[bonobo] )
 	eds? ( dev-libs/gmime:2.4[mono] )"
 #	galago? ( dev-dotnet/galago-sharp )"
 DEPEND="${RDEPEND}
@@ -41,7 +38,7 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	G2CONF="${G2CONF}
-		$(use_enable applet panel-applet)
+		--disable-panel-applet
 		$(use_enable eds evolution)
 		$(use_enable test tests)
 		--disable-galago
diff --git a/app-office/imposter/imposter-0.3.ebuild b/app-office/imposter/imposter-0.3.ebuild
index 15cba77675db..cf95cfe5db1a 100644
--- a/app-office/imposter/imposter-0.3.ebuild
+++ b/app-office/imposter/imposter-0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/imposter/imposter-0.3.ebuild,v 1.6 2011/03/13 19:54:43 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/imposter/imposter-0.3.ebuild,v 1.7 2012/01/16 11:19:22 ago Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="iksemel nls"
 
 RDEPEND=">=x11-libs/gtk+-2.4:2
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-3.4.5-r1.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-3.4.5-r1.ebuild
index bbd49fb547f6..82ce107cafe0 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-3.4.5-r1.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-3.4.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.4.5-r1.ebuild,v 1.2 2012/01/11 17:31:11 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.4.5-r1.ebuild,v 1.3 2012/01/16 11:53:47 ago Exp $
 
 EAPI=4
 
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.libreoffice.org"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="offlinehelp templates"
 
 LANGUAGES_HELP="bg bn bo bs ca_XV ca cs da de dz el en_GB en en_ZA eo es et eu
diff --git a/app-office/libreoffice/libreoffice-3.4.5.2.ebuild b/app-office/libreoffice/libreoffice-3.4.5.2.ebuild
index ae2c15f1bf69..ad648874975d 100644
--- a/app-office/libreoffice/libreoffice-3.4.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild,v 1.3 2012/01/11 14:52:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild,v 1.4 2012/01/16 11:52:51 ago Exp $
 
 EAPI=4
 
@@ -72,7 +72,7 @@ gstreamer gtk jemalloc kde mysql nsplugin odk opengl pdfimport python
 test +vba webdav"
 LICENSE="LGPL-3"
 SLOT="0"
-[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+[[ ${PV} == *9999* ]] || KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	app-arch/zip
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 0b52f604f0df..8d69b64e73ae 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,3 +1,4 @@
 DIST eix-0.22.11.tar.xz 438672 RMD160 8b6496d7409bf2347f736acc998142aee4397165 SHA1 94e9a9c290ef4e6d4668b165a52bddd3860d6a4c SHA256 48e78234b4c0233b1e4532f77f941300b41dba892835738ad3c17a463564606d
 DIST eix-0.23.3.tar.xz 443364 RMD160 ad7b6842ceeaa4d93bdf7fa6fcdc85f773b54970 SHA1 55d9a6ef2ebf07ba4293b9b2b78443658c47b12f SHA256 c9525a4f8605250469600667e364e2d9325d7964b3476653bb8908f28cccb828
 DIST eix-0.23.5.tar.xz 435444 RMD160 acef319cb179a5b2db8e5c625609192746b83bf3 SHA1 2cf6eb11da4fd0fc3cd5437d5f98093b8de7d92b SHA256 bfb885812317fcd96161d4cd33b7f2095b68cec2ef6b525f18c97343f807514a
+DIST eix-0.23.6.tar.xz 435896 RMD160 8e8206061caf8012b6c9d7060cb5122c3ba1e378 SHA1 e63aa2d593b2855657d8efc832d7912bfee5da6a SHA256 cb94d417874ced2d219aeb4bc06b2669a34473bfd12731db41610a9678acd9c6
diff --git a/app-portage/eix/eix-0.23.6.ebuild b/app-portage/eix/eix-0.23.6.ebuild
new file mode 100644
index 000000000000..ab7adc20212b
--- /dev/null
+++ b/app-portage/eix/eix-0.23.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.23.6.ebuild,v 1.1 2012/01/16 02:58:56 darkside Exp $
+
+EAPI=4
+
+inherit multilib bash-completion-r1
+
+DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
+HOMEPAGE="http://eix.berlios.de"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="debug doc nls optimization security strong-optimization sqlite tools zsh-completion"
+
+RDEPEND="sqlite? ( >=dev-db/sqlite-3 )
+	nls? ( virtual/libintl )
+	zsh-completion? ( !!<app-shells/zsh-completion-20091203-r1 )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+src_configure() {
+	econf $(use_with sqlite) $(use_with doc extra-doc) \
+		$(use_with zsh-completion) \
+		$(use_enable nls) $(use_enable tools separate-tools) \
+		$(use_enable security) $(use_enable optimization) \
+		$(use_enable strong-optimization) $(use_enable debug debugging) \
+		$(use_with prefix always-accept-keywords) \
+		--without-bzip2 \
+		--with-ebuild-sh-default="/usr/$(get_libdir)/portage/bin/ebuild.sh" \
+		--with-portage-rootpath="${ROOTPATH}" \
+		--with-eprefix-default="${EPREFIX}" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+}
diff --git a/app-portage/esearch/esearch-1.0-r2.ebuild b/app-portage/esearch/esearch-1.0-r2.ebuild
index cce1533290c8..514193d4e640 100644
--- a/app-portage/esearch/esearch-1.0-r2.ebuild
+++ b/app-portage/esearch/esearch-1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-1.0-r2.ebuild,v 1.2 2012/01/07 11:28:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-1.0-r2.ebuild,v 1.3 2012/01/16 03:34:14 jer Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="linguas_fr linguas_it"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 
 DEPEND="sys-apps/portage"
 RDEPEND="${DEPEND}"
diff --git a/app-text/dvipsk/dvipsk-5.991_p20110705-r1.ebuild b/app-text/dvipsk/dvipsk-5.991_p20110705-r1.ebuild
index 9bdb40a14339..8fc94ae14e1d 100644
--- a/app-text/dvipsk/dvipsk-5.991_p20110705-r1.ebuild
+++ b/app-text/dvipsk/dvipsk-5.991_p20110705-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dvipsk/dvipsk-5.991_p20110705-r1.ebuild,v 1.2 2011/12/28 04:29:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvipsk/dvipsk-5.991_p20110705-r1.ebuild,v 1.3 2012/01/16 13:15:04 ago Exp $
 
 EAPI=3
 
@@ -29,7 +29,7 @@ SRC_URI="${SRC_URI} ) "
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source"
 
 DEPEND=">=dev-libs/kpathsea-6.0.1_p20110627"
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.91.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.91.ebuild
index a6bc19ef2bbc..538aa5d68e42 100644
--- a/app-text/lcdf-typetools/lcdf-typetools-2.91.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.91.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/lcdf-typetools/lcdf-typetools-2.91.ebuild,v 1.5 2012/01/15 15:27:57 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/lcdf-typetools/lcdf-typetools-2.91.ebuild,v 1.6 2012/01/16 03:01:56 jer Exp $
 
 EAPI=2
 
 DESCRIPTION="Font utilities for eg manipulating OTF"
 SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
 HOMEPAGE="http://www.lcdf.org/type/#typetools"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="+kpathsea"
diff --git a/app-text/libexttextcat/libexttextcat-3.2.0.ebuild b/app-text/libexttextcat/libexttextcat-3.2.0.ebuild
index 5697bdd19472..195eb6086cc6 100644
--- a/app-text/libexttextcat/libexttextcat-3.2.0.ebuild
+++ b/app-text/libexttextcat/libexttextcat-3.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libexttextcat/libexttextcat-3.2.0.ebuild,v 1.1 2011/11/14 09:05:54 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libexttextcat/libexttextcat-3.2.0.ebuild,v 1.2 2012/01/16 11:54:24 ago Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/app-text/mythes/mythes-1.2.2.ebuild b/app-text/mythes/mythes-1.2.2.ebuild
index 13c521f2a149..6fee16af3723 100644
--- a/app-text/mythes/mythes-1.2.2.ebuild
+++ b/app-text/mythes/mythes-1.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mythes/mythes-1.2.2.ebuild,v 1.1 2011/12/22 10:59:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mythes/mythes-1.2.2.ebuild,v 1.2 2012/01/16 11:55:01 ago Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/hunspell/MyThes/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="app-text/hunspell"
diff --git a/app-text/ps2pkm/ps2pkm-1.5_p20110705.ebuild b/app-text/ps2pkm/ps2pkm-1.5_p20110705.ebuild
index 81f3a2d2c633..1520f9281775 100644
--- a/app-text/ps2pkm/ps2pkm-1.5_p20110705.ebuild
+++ b/app-text/ps2pkm/ps2pkm-1.5_p20110705.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ps2pkm/ps2pkm-1.5_p20110705.ebuild,v 1.2 2011/12/28 04:27:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ps2pkm/ps2pkm-1.5_p20110705.ebuild,v 1.3 2012/01/16 13:15:49 ago Exp $
 
 EAPI=3
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-libs/kpathsea-6.0.1_p20110627"
diff --git a/app-text/texlive-core/texlive-core-2011-r5.ebuild b/app-text/texlive-core/texlive-core-2011-r5.ebuild
index bdc7d5e53939..1e8e62bb4872 100644
--- a/app-text/texlive-core/texlive-core-2011-r5.ebuild
+++ b/app-text/texlive-core/texlive-core-2011-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2011-r5.ebuild,v 1.2 2011/12/28 04:31:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2011-r5.ebuild,v 1.3 2012/01/16 13:14:23 ago Exp $
 
 EAPI=3
 
@@ -61,7 +61,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
 done
 SRC_URI="${SRC_URI} )"
 
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="cjk X doc source tk xetex"
 
 MODULAR_X_DEPEND="X? (
diff --git a/app-text/texlive/texlive-2011.ebuild b/app-text/texlive/texlive-2011.ebuild
index 9bc23bc51307..d378a587f66d 100644
--- a/app-text/texlive/texlive-2011.ebuild
+++ b/app-text/texlive/texlive-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/texlive/texlive-2011.ebuild,v 1.5 2011/12/28 05:59:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive/texlive-2011.ebuild,v 1.6 2012/01/16 13:13:26 ago Exp $
 
 EAPI="2"
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk context detex doc dvi2tty dvipdfm extra games graphics
 	humanities jadetex luatex music omega pdfannotextractor png pstricks publishers science tex4ht
 	truetype xetex xindy xml X"
diff --git a/dev-embedded/srecord/Manifest b/dev-embedded/srecord/Manifest
index 9e7079eb8b43..42e53490b12c 100644
--- a/dev-embedded/srecord/Manifest
+++ b/dev-embedded/srecord/Manifest
@@ -1,3 +1,2 @@
-DIST srecord-1.42.tar.gz 476871 RMD160 708aa6ff5815502dde53ec00cdf5eb186194e689 SHA1 76001868ce6da65e3f7232fd5ec39313471776ae SHA256 55c3783ec1775e38bcc2c18befaf204c782f1f496df1c2e2d45367ce53a64d21
 DIST srecord-1.57.tar.gz 860771 RMD160 7484c001645f25c46e5d80b6ec75283d0323920a SHA1 a29e5141c354e65488435b99afc7748c5b8b6e17 SHA256 bd6031b5463b77fd15062452fc5fd582a1d4efea2f42275653b3989c4b642feb
 DIST srecord-1.58.tar.gz 885087 RMD160 6bd075c0b05a41f6c8412699a40d7c7943a485e2 SHA1 874be40c330ec09165f199aaec1f079e196156f0 SHA256 aab04a1a9f3d921f9c88a86354719bfaeb3ee0bf0b6970979c96ecfc726351e1
diff --git a/dev-embedded/srecord/files/srecord-1.42-gcc44.patch b/dev-embedded/srecord/files/srecord-1.42-gcc44.patch
deleted file mode 100644
index 392037dc4209..000000000000
--- a/dev-embedded/srecord/files/srecord-1.42-gcc44.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -ur srecord-1.42.orig/lib/arglex.cc srecord-1.42/lib/arglex.cc
---- srecord-1.42.orig/lib/arglex.cc	2008-06-02 01:38:46.000000000 +0300
-+++ srecord-1.42/lib/arglex.cc	2009-07-25 21:58:48.000000000 +0300
-@@ -16,6 +16,7 @@
- // along with this program. If not, see <http://www.gnu.org/licenses/>.
- //
- 
-+#include <cstdio>
- #include <cctype>
- #include <cstring>
- #include <cstdlib>
-diff -ur srecord-1.42.orig/lib/interval.cc srecord-1.42/lib/interval.cc
---- srecord-1.42.orig/lib/interval.cc	2008-06-02 01:38:46.000000000 +0300
-+++ srecord-1.42/lib/interval.cc	2009-07-25 22:01:00.000000000 +0300
-@@ -18,6 +18,8 @@
- //
- 
- 
-+#include <cstdio>
-+
- #include <lib/interval.h>
- #include <iostream>
- using namespace std;
-diff -ur srecord-1.42.orig/lib/quit/normal.cc srecord-1.42/lib/quit/normal.cc
---- srecord-1.42.orig/lib/quit/normal.cc	2008-06-02 01:38:46.000000000 +0300
-+++ srecord-1.42/lib/quit/normal.cc	2009-07-25 22:01:57.000000000 +0300
-@@ -17,6 +17,7 @@
- //      <http://www.gnu.org/licenses/>.
- //
- 
-+#include <cstdio>
- #include <cstdarg>
- #include <cstdlib>
- #include <cstring>
-diff -ur srecord-1.42.orig/lib/srec/input/file.cc srecord-1.42/lib/srec/input/file.cc
---- srecord-1.42.orig/lib/srec/input/file.cc	2008-06-02 01:38:46.000000000 +0300
-+++ srecord-1.42/lib/srec/input/file.cc	2009-07-25 22:03:08.000000000 +0300
-@@ -17,6 +17,7 @@
- //      <http://www.gnu.org/licenses/>.
- //
- 
-+#include <cstdio>
- 
- #include <errno.h>
- #include <iostream>
-diff -ur srecord-1.42.orig/lib/srec/input/generator/constant.cc srecord-1.42/lib/srec/input/generator/constant.cc
---- srecord-1.42.orig/lib/srec/input/generator/constant.cc	2008-06-02 01:38:46.000000000 +0300
-+++ srecord-1.42/lib/srec/input/generator/constant.cc	2009-07-25 22:04:11.000000000 +0300
-@@ -17,6 +17,8 @@
- //      <http://www.gnu.org/licenses/>.
- //
- 
-+#include <cstdio>
-+
- #include <lib/srec/input/generator/constant.h>
- 
- 
-diff -ur srecord-1.42.orig/lib/srec/output/file/asm.cc srecord-1.42/lib/srec/output/file/asm.cc
---- srecord-1.42.orig/lib/srec/output/file/asm.cc	2008-06-02 01:38:46.000000000 +0300
-+++ srecord-1.42/lib/srec/output/file/asm.cc	2009-07-25 22:08:49.000000000 +0300
-@@ -17,6 +17,7 @@
- //      <http://www.gnu.org/licenses/>.
- //
- 
-+#include <cstdio>
- #include <cstring>
- 
- #include <lib/interval.h>
-diff -ur srecord-1.42.orig/lib/srec/output/file/basic.cc srecord-1.42/lib/srec/output/file/basic.cc
---- srecord-1.42.orig/lib/srec/output/file/basic.cc	2008-06-02 01:38:46.000000000 +0300
-+++ srecord-1.42/lib/srec/output/file/basic.cc	2009-07-25 22:14:36.000000000 +0300
-@@ -17,6 +17,7 @@
- //      <http://www.gnu.org/licenses/>.
- //
- 
-+#include <cstdio>
- #include <cstring>
- 
- #include <lib/interval.h>
-diff -ur srecord-1.42.orig/lib/srec/output/file.cc srecord-1.42/lib/srec/output/file.cc
---- srecord-1.42.orig/lib/srec/output/file.cc	2008-06-02 01:38:46.000000000 +0300
-+++ srecord-1.42/lib/srec/output/file.cc	2009-07-25 22:07:17.000000000 +0300
-@@ -17,6 +17,7 @@
- //      <http://www.gnu.org/licenses/>.
- //
- 
-+#include <cstdio>
- 
- #include <errno.h>
- #include <iostream>
-diff -ur srecord-1.42.orig/lib/srec/output.cc srecord-1.42/lib/srec/output.cc
---- srecord-1.42.orig/lib/srec/output.cc	2008-06-02 01:38:46.000000000 +0300
-+++ srecord-1.42/lib/srec/output.cc	2009-07-25 22:05:56.000000000 +0300
-@@ -17,6 +17,7 @@
- //      <http://www.gnu.org/licenses/>.
- //
- 
-+#include <cstdio>
- #include <cerrno>
- #include <cstring>
- 
diff --git a/dev-embedded/srecord/srecord-1.42.ebuild b/dev-embedded/srecord/srecord-1.42.ebuild
deleted file mode 100644
index a86ab49c86d4..000000000000
--- a/dev-embedded/srecord/srecord-1.42.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/srecord/srecord-1.42.ebuild,v 1.2 2009/07/25 19:21:34 ssuominen Exp $
-
-inherit eutils
-
-DESCRIPTION="A collection of powerful tools for manipulating EPROM load files."
-HOMEPAGE="http://srecord.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="test"
-
-DEPEND="dev-libs/boost
-	test? ( app-arch/sharutils )"
-RDEPEND=""
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-	sed -i \
-		-e 's/(SOELIM) -I. -Ietc man\/man1/(SOELIM) -I. -Ietc -Iman\/man1 man\/man1/' \
-		-e 's/(SOELIM) -I. -Ietc man\/man5/(SOELIM) -I. -Ietc -Iman\/man5 man\/man5/' \
-		-e '/\$(mandir)\/man1\/srec_license.1 \\/d' \
-		"${S}"/Makefile.in || die "Patching failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-	dodoc "${S}"/README
-	insinto /usr/share/doc/${PF}
-	doins "${S}"/etc/reference.ps
-}
-
-src_test() {
-	make sure || die "Tests failed"
-}
diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest
index 0250e46a60bd..6a32465a4687 100644
--- a/dev-embedded/u-boot-tools/Manifest
+++ b/dev-embedded/u-boot-tools/Manifest
@@ -1,5 +1,3 @@
-DIST u-boot-2010.06.tar.bz2 8971985 RMD160 937931a38a8275c11469052ae2194192e34d1d21 SHA1 55bc16d8345a7c228dfa633f47184714e3fb733e SHA256 790ccb12d99fc527a8b8d20dfdf491795d30f87aa0902f8cbda196583aa20bc8
-DIST u-boot-2010.12.tar.bz2 8238700 RMD160 81e43f941b72711cb326cf3e256dbf83235db55b SHA1 ba848b6762b79c25d61b8b4641944ec0ada56507 SHA256 1705772db7a18635693676abb8818542167cb131921c456a1edd0ed47e6b77fe
 DIST u-boot-2011.06.tar.bz2 8469694 RMD160 7b97de43be54c225ee430f6a505d282421738737 SHA1 8362a83c72607f506a796f955f9e07cba5f92fff SHA256 362ddb935885da98cf461eba08f31e3e59d0c4ada6cb2fa15596f43af310ba8b
 DIST u-boot-2011.09.tar.bz2 8430168 RMD160 30a56bae6615b1e70c928e0f93a0676d1ee98a1d SHA1 9cd450c74f7c572df3b28701e641b03b42393d10 SHA256 6223d0141d2451dde6a9bfb8abbbdbc3696e1c3d289744d1918296561306ab4b
 DIST u-boot-2011.12.tar.bz2 8610390 RMD160 32b1ec30833f150e2995a5292d0d8b1e847aa9c8 SHA1 c7ee40c932cec042909862abdfe7b6855493ab0b SHA256 41820d65eb848411f71b9222957b3532607be0a754da916067876194148b907c
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2010.06.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2010.06.ebuild
deleted file mode 100644
index f6495ecbd30c..000000000000
--- a/dev-embedded/u-boot-tools/u-boot-tools-2010.06.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/u-boot-tools/u-boot-tools-2010.06.ebuild,v 1.4 2011/03/07 11:33:22 armin76 Exp $
-
-inherit toolchain-funcs
-
-MY_P="u-boot-${PV/_/-}"
-DESCRIPTION="utilities for working with Das U-Boot"
-HOMEPAGE="http://www.denx.de/wiki/U-Boot/WebHome"
-SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-domake() {
-	emake \
-		HOSTSTRIP=echo \
-		HOSTCC="$(tc-getCC)" \
-		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
-		HOSTLDFLAGS="${LDFLAGS}" \
-		"$@"
-}
-
-src_compile() {
-	rm -f include/config.mk
-	domake CONFIG_CMD_LOADS=y tools-all || die
-	touch include/config.mk
-	domake -C tools/easylogo TOPDIR=$PWD SRCTREE=$PWD obj=$PWD/tools/easylogo/ || die
-	domake env || die
-}
-
-src_install() {
-	cd tools
-	dobin bmp_logo gen_eth_addr img2srec mkimage || die
-	dobin easylogo/easylogo || die
-	dobin env/fw_printenv || die
-	dosym fw_printenv /usr/bin/fw_setenv || die
-	insinto /etc
-	doins env/fw_env.config || die
-}
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2010.12.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2010.12.ebuild
deleted file mode 100644
index 8b8ef83d2eb2..000000000000
--- a/dev-embedded/u-boot-tools/u-boot-tools-2010.12.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/u-boot-tools/u-boot-tools-2010.12.ebuild,v 1.1 2011/03/14 23:00:56 radhermit Exp $
-
-EAPI=4
-
-inherit toolchain-funcs
-
-MY_P="u-boot-${PV/_/-}"
-DESCRIPTION="utilities for working with Das U-Boot"
-HOMEPAGE="http://www.denx.de/wiki/U-Boot/WebHome"
-SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	emake \
-		HOSTSTRIP=echo \
-		HOSTCC="$(tc-getCC)" \
-		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
-		HOSTLDFLAGS="${LDFLAGS}" \
-		tools-all
-}
-
-src_install() {
-	cd tools
-	dobin bmp_logo gen_eth_addr img2srec mkimage
-	dobin easylogo/easylogo
-	dobin env/fw_printenv
-	dosym fw_printenv /usr/bin/fw_setenv
-	insinto /etc
-	doins env/fw_env.config
-}
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 28278d990fc2..23ac5c5abe83 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -5,7 +5,7 @@ DIST pl-5.11.35.tar.gz 13461875 RMD160 4f8e6738eabda36f325c507a8dafb73cc6a24382
 DIST pl-5.11.36.tar.gz 13459439 RMD160 ddcf1487b44f6f5f85c7c74da93ff90a38cfbd8e SHA1 6d5c4ac0658fdea6065035a19e25afe2eec2a1f8 SHA256 cfec85653a2acf24d6f19ebd841a5885ab0034ddb409e64702a53384776f8f7f
 DIST swi-prolog-5.10.4-gentoo-patchset-3.tar.gz 9770 RMD160 6bf3af5c57da54407f260db9ee5203ee6fa8c032 SHA1 3fc7483226a7ea5363ee083105bcf1d81d645b1e SHA256 8745a67d34f83afdbb1ed852606d40fadfe7de7bca00c8a88690efb65aace21b
 DIST swi-prolog-5.10.5-gentoo-patchset-0.tar.gz 5860 RMD160 ec0c8237fecf838101602875a9e4eb64a1c84271 SHA1 57b97c3284158e0fad2c0371479284bf79e85654 SHA256 a20cb42ed5385076a2ba759898f44b82fe0d40b5f2f16063535f1635763c6aa6
-DIST swi-prolog-5.10.5-gentoo-patchset-4.tar.gz 9587 RMD160 1867f6320810bfb7f356716e6006c40e77507006 SHA1 79a27dc241e6fe1c6e86c5769eba16a5b984f6cd SHA256 0f00bb91ed0039fc861c7f60251a752a836b8ef18d2fdd920bb5fcb88f64f653
+DIST swi-prolog-5.10.5-gentoo-patchset-5.tar.gz 10284 RMD160 42b868f886c639fd612e4c03cbabceb4a70b603a SHA1 26275151c36fb0322f60ec4eadfe0852e02f0b71 SHA256 7f7817602dd844cbd587a665164c85a9d0d8a00b09cfce50f9784119563c11ef
 DIST swi-prolog-5.11.34-gentoo-patchset-0.tar.gz 4126 RMD160 5dd7a6d95a90fe87886b9c52f59a0b1a9acd6ed9 SHA1 4003e2101d148ed70a516dee079ab25c956231cb SHA256 a902e81d819055e365916a6c5e01b13b9bbc2477f00de192f6b751b0efc2cc99
 DIST swi-prolog-5.11.35-gentoo-patchset-0.tar.gz 5009 RMD160 11bf91da332023963625d9951b742c0412603aee SHA1 1479822638cdeed72387b768aa34c9daec651aae SHA256 13feae1275699fdd8b644f5eddf6f5ba058febb23400825e2e60eee4b91ba417
 DIST swi-prolog-5.11.36-gentoo-patchset-0.tar.gz 4098 RMD160 7851a7a1d53a5e548280da1ea2d6a1782d2748bd SHA1 c1ace0ffe8c0840d898185fca257a89f6243cb8b SHA256 867f437055dfc91a3b27ebbb349842874b9d40bf9f05f112b646ced90dac21f7
diff --git a/dev-lang/swi-prolog/swi-prolog-5.10.5-r1.ebuild b/dev-lang/swi-prolog/swi-prolog-5.10.5-r1.ebuild
index 92234c2b4b8d..276fb32cf9d2 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.10.5-r1.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.10.5-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.10.5-r1.ebuild,v 1.4 2011/11/12 23:07:01 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.10.5-r1.ebuild,v 1.5 2012/01/16 08:18:48 keri Exp $
 
 EAPI=2
 
 inherit eutils flag-o-matic java-pkg-opt-2
 
-PATCHSET_VER="4"
+PATCHSET_VER="5"
 
 DESCRIPTION="free, small, and standard compliant Prolog compiler"
 HOMEPAGE="http://www.swi-prolog.org/"
diff --git a/dev-libs/hyphen/hyphen-2.8.3.ebuild b/dev-libs/hyphen/hyphen-2.8.3.ebuild
index cf83c462db6f..ea715c222731 100644
--- a/dev-libs/hyphen/hyphen-2.8.3.ebuild
+++ b/dev-libs/hyphen/hyphen-2.8.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/hyphen/hyphen-2.8.3.ebuild,v 1.2 2011/12/11 21:51:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/hyphen/hyphen-2.8.3.ebuild,v 1.3 2012/01/16 11:55:44 ago Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/hunspell/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="app-text/hunspell"
diff --git a/dev-libs/jemalloc/jemalloc-2.2.5.ebuild b/dev-libs/jemalloc/jemalloc-2.2.5.ebuild
index b2d9a600e9b8..634e40e31ee0 100644
--- a/dev-libs/jemalloc/jemalloc-2.2.5.ebuild
+++ b/dev-libs/jemalloc/jemalloc-2.2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/jemalloc-2.2.5.ebuild,v 1.1 2011/11/20 19:30:06 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/jemalloc-2.2.5.ebuild,v 1.2 2012/01/16 11:56:23 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.canonware.com/download/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 
 IUSE="debug stats"
 
diff --git a/dev-libs/libexplain/Manifest b/dev-libs/libexplain/Manifest
index 44c9f54d4300..76f6038e98b7 100644
--- a/dev-libs/libexplain/Manifest
+++ b/dev-libs/libexplain/Manifest
@@ -1,7 +1,2 @@
-DIST libexplain-0.40.D001.tar.gz 4275947 RMD160 67d73a151b5ace539fe7d57a67056d7a2e09d6c4 SHA1 f206457459233fc42e93f6fd2b73cc87220f54bf SHA256 fe028ccb0ae77d89175c2e53b97b27bec5d2ae65463afc09084337f8d6a4d7d5
-DIST libexplain-0.42.D001.tar.gz 4299924 RMD160 22cce35bf94f627176be7dd52097a400077ed490 SHA1 de558f0c8cd2054fe130d79696a7493bd4dca76f SHA256 608e06093920c1669a641fe629546050559f7ac80a89f268b9bad1e37b5b597a
-DIST libexplain-0.45.D001.tar.gz 4410036 RMD160 f01df997b47f9fa0d534b3b65b44d66402255aae SHA1 76940c3c3160065cac6c182d32a1a7df9f9e2f22 SHA256 e1e456a98361815d4fc55e086eb0e234b57d68418b659fdcf40a6e77900b5ecd
-DIST libexplain-0.46.D001.tar.gz 4441159 RMD160 756888ec6697b9742f5076f6901cee0980ad19d2 SHA1 83de82d7607d46bcb8ee873f9d3e4076fea645c3 SHA256 33afd58a2912ce81d6c431ecb7ddd73ceb808a679df4d6b6470f66325b8d967a
-DIST libexplain-0.47-parallel-make.patch.gz 8946 RMD160 6d1989327c1842367776d6a1bfbc3c0ed3e2e537 SHA1 b7ece95b603dcad04b3e9bec6765fd5a2ef4f707 SHA256 99b4f229523ac0bb96421c061ed8665dcff84ae804edfde92c30717bea3eab50
-DIST libexplain-0.47.D001.tar.gz 4451254 RMD160 d0725757e008846fc9e705b70f262035a2ff14c6 SHA1 40398d8a4467ddd9330f8dcfc06d5c6be5238f8e SHA256 4593ceff892a7c611969ad18706b12583c1110dc0db0056fa4c5ce6fe00500e8
 DIST libexplain-0.49.D001.tar.gz 4477127 RMD160 e71bf8854bbcd7ba3e94de8434557e5192060fe8 SHA1 93aba2641ad61810b62eccd2d58f762d880edde7 SHA256 c6792f1ddf304cf1af2f7aaf03340ec4aee6d73a97b52a066e153bd967fbbedb
+DIST libexplain-0.50.D001.tar.gz 4484874 RMD160 80f90e363f12e0f9aaa04f4cd7639b478dc1c057 SHA1 dcf3a7a92370195810b96ae033f08b6e5794cf99 SHA256 7ffbf63ed820becdc26ed43f9299978f80a1edf617768b37cbdf99c80b57aaa6
diff --git a/dev-libs/libexplain/libexplain-0.40.ebuild b/dev-libs/libexplain/libexplain-0.40.ebuild
deleted file mode 100644
index 4a2f124da79d..000000000000
--- a/dev-libs/libexplain/libexplain-0.40.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libexplain/libexplain-0.40.ebuild,v 1.7 2011/06/28 12:02:45 jlec Exp $
-
-EAPI=4
-
-MY_P="${P}.D001"
-
-DESCRIPTION="Library which may be used to explain Unix and Linux system call errors"
-HOMEPAGE="http://libexplain.sourceforge.net/"
-#SRC_URI="http://libexplain.sourceforge.net/${MY_P}.tar.gz"
-SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-3"
-IUSE=""
-
-DEPEND="
-	>=sys-kernel/linux-headers-2.6.35
-	sys-libs/libcap
-	>=sys-libs/glibc-2.11"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	# Portage incompatible test
-	sed \
-		-e '/t0524a/d' \
-		-e '/t0363a/d' \
-		-i Makefile.in || die
-}
-
-src_install() {
-	MAKEOPTS+=" -j1"
-	default
-}
diff --git a/dev-libs/libexplain/libexplain-0.42.ebuild b/dev-libs/libexplain/libexplain-0.42.ebuild
deleted file mode 100644
index cb2d7a30cfe2..000000000000
--- a/dev-libs/libexplain/libexplain-0.42.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libexplain/libexplain-0.42.ebuild,v 1.2 2011/06/28 12:02:45 jlec Exp $
-
-EAPI=4
-
-MY_P="${P}.D001"
-
-DESCRIPTION="Library which may be used to explain Unix and Linux system call errors"
-HOMEPAGE="http://libexplain.sourceforge.net/"
-SRC_URI="http://libexplain.sourceforge.net/${MY_P}.tar.gz"
-#SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-3"
-IUSE=""
-
-DEPEND="
-	>=sys-kernel/linux-headers-2.6.35
-	sys-libs/libcap
-	>=sys-libs/glibc-2.11"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	# Portage incompatible test
-	sed \
-		-e '/t0524a/d' \
-		-e '/t0363a/d' \
-		-i Makefile.in || die
-}
-
-src_install() {
-	MAKEOPTS+=" -j1"
-	default
-}
diff --git a/dev-libs/libexplain/libexplain-0.46.ebuild b/dev-libs/libexplain/libexplain-0.46.ebuild
deleted file mode 100644
index 9642d4128f37..000000000000
--- a/dev-libs/libexplain/libexplain-0.46.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libexplain/libexplain-0.46.ebuild,v 1.2 2011/11/27 17:01:06 jlec Exp $
-
-EAPI=4
-inherit autotools eutils
-
-MY_P="${P}.D001"
-
-DESCRIPTION="Library which may be used to explain Unix and Linux system call errors"
-HOMEPAGE="http://libexplain.sourceforge.net/"
-SRC_URI="http://libexplain.sourceforge.net/${MY_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-3"
-IUSE="static-libs"
-
-DEPEND="
-	>=sys-kernel/linux-headers-2.6.35
-	sys-libs/libcap
-	>=sys-libs/glibc-2.11"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	# Portage incompatible test
-	sed \
-		-e '/t0524a/d' \
-		-e '/t0363a/d' \
-		-i Makefile.in || die
-
-	cp "${S}"/etc/configure.ac "${S}"
-	epatch "${FILESDIR}"/${PN}-0.45-configure.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	MAKEOPTS+=" -j1"
-	default
-
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/dev-libs/libexplain/libexplain-0.47.ebuild b/dev-libs/libexplain/libexplain-0.47.ebuild
deleted file mode 100644
index babb54906054..000000000000
--- a/dev-libs/libexplain/libexplain-0.47.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libexplain/libexplain-0.47.ebuild,v 1.2 2011/11/27 17:01:06 jlec Exp $
-
-EAPI=4
-inherit autotools eutils
-
-MY_P="${P}.D001"
-
-DESCRIPTION="Library which may be used to explain Unix and Linux system call errors"
-HOMEPAGE="http://libexplain.sourceforge.net/"
-SRC_URI="http://libexplain.sourceforge.net/${MY_P}.tar.gz
-	http://dev.gentoo.org/~radhermit/distfiles/${P}-parallel-make.patch.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-3"
-IUSE="static-libs"
-
-DEPEND="
-	>=sys-kernel/linux-headers-2.6.35
-	sys-libs/libcap
-	>=sys-libs/glibc-2.11"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	# Portage incompatible test
-	sed \
-		-e '/t0524a/d' \
-		-e '/t0363a/d' \
-		-i Makefile.in || die
-
-	cp "${S}"/etc/configure.ac "${S}"
-	epatch "${FILESDIR}"/${PN}-0.45-configure.patch \
-		"${WORKDIR}"/${P}-parallel-make.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/dev-libs/libexplain/libexplain-0.45.ebuild b/dev-libs/libexplain/libexplain-0.50.ebuild
similarity index 68%
rename from dev-libs/libexplain/libexplain-0.45.ebuild
rename to dev-libs/libexplain/libexplain-0.50.ebuild
index f498fc7c2001..40039ab45090 100644
--- a/dev-libs/libexplain/libexplain-0.45.ebuild
+++ b/dev-libs/libexplain/libexplain-0.50.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libexplain/libexplain-0.45.ebuild,v 1.2 2011/11/27 17:01:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libexplain/libexplain-0.50.ebuild,v 1.1 2012/01/16 04:46:04 radhermit Exp $
 
 EAPI=4
-inherit autotools eutils
+inherit autotools-utils
 
 MY_P="${P}.D001"
 
@@ -22,7 +22,15 @@ DEPEND="
 	>=sys-libs/glibc-2.11"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"/${MY_P}
+S=${WORKDIR}/${MY_P}
+
+DOCS=( README )
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.45-configure.patch
+)
 
 src_prepare() {
 	# Portage incompatible test
@@ -32,18 +40,7 @@ src_prepare() {
 		-i Makefile.in || die
 
 	cp "${S}"/etc/configure.ac "${S}"
-	epatch "${FILESDIR}"/${P}-configure.patch
-	eautoreconf
-}
 
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	MAKEOPTS+=" -j1"
-	default
-
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
+	autotools-utils_src_prepare
+	eautoreconf
 }
diff --git a/dev-libs/libxml2/libxml2-2.7.8-r4.ebuild b/dev-libs/libxml2/libxml2-2.7.8-r4.ebuild
index da0bf665516d..0a8761feb5e0 100644
--- a/dev-libs/libxml2/libxml2-2.7.8-r4.ebuild
+++ b/dev-libs/libxml2/libxml2-2.7.8-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.8-r4.ebuild,v 1.5 2012/01/14 18:03:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.8-r4.ebuild,v 1.6 2012/01/16 02:59:51 jer Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples icu ipv6 python readline static-libs test"
 
 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
diff --git a/dev-libs/ppl/ppl-0.11.2-r1.ebuild b/dev-libs/ppl/ppl-0.11.2-r1.ebuild
index d09fca3a6ed0..df05499a8174 100644
--- a/dev-libs/ppl/ppl-0.11.2-r1.ebuild
+++ b/dev-libs/ppl/ppl-0.11.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ppl/ppl-0.11.2-r1.ebuild,v 1.4 2012/01/15 15:41:43 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ppl/ppl-0.11.2-r1.ebuild,v 1.5 2012/01/16 03:30:54 jer Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.cs.unipr.it/ppl/Download/ftp/releases/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
 IUSE="doc lpsol pch static-libs test watchdog"
 
 RDEPEND=">=dev-libs/gmp-4.1.3[cxx]
diff --git a/dev-libs/ptexenc/ptexenc-1.2.0_p20110705.ebuild b/dev-libs/ptexenc/ptexenc-1.2.0_p20110705.ebuild
index 4f724fe15336..289654a45977 100644
--- a/dev-libs/ptexenc/ptexenc-1.2.0_p20110705.ebuild
+++ b/dev-libs/ptexenc/ptexenc-1.2.0_p20110705.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ptexenc/ptexenc-1.2.0_p20110705.ebuild,v 1.4 2011/12/28 04:26:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ptexenc/ptexenc-1.2.0_p20110705.ebuild,v 1.5 2012/01/16 13:16:29 ago Exp $
 
 EAPI=3
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
 IUSE="iconv static-libs"
 
 DEPEND="iconv? ( virtual/libiconv )
diff --git a/dev-perl/XML-RSS/XML-RSS-1.490.0.ebuild b/dev-perl/XML-RSS/XML-RSS-1.490.0.ebuild
index 110458b3725d..8dce1248dee0 100644
--- a/dev-perl/XML-RSS/XML-RSS-1.490.0.ebuild
+++ b/dev-perl/XML-RSS/XML-RSS-1.490.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-RSS/XML-RSS-1.490.0.ebuild,v 1.3 2012/01/15 17:46:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-RSS/XML-RSS-1.490.0.ebuild,v 1.4 2012/01/16 14:53:27 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ DESCRIPTION="a basic framework for creating and maintaining RSS files"
 HOMEPAGE="http://perl-rss.sourceforge.net/"
 
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
 IUSE="test"
 
 SRC_TEST="do"
diff --git a/dev-php/PEAR-Cache/PEAR-Cache-1.5.6.ebuild b/dev-php/PEAR-Cache/PEAR-Cache-1.5.6.ebuild
index 3f731ec25b6d..f63b7f969ea4 100644
--- a/dev-php/PEAR-Cache/PEAR-Cache-1.5.6.ebuild
+++ b/dev-php/PEAR-Cache/PEAR-Cache-1.5.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Cache/PEAR-Cache-1.5.6.ebuild,v 1.1 2011/12/12 10:48:16 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Cache/PEAR-Cache-1.5.6.ebuild,v 1.2 2012/01/16 12:42:35 ago Exp $
 
 inherit php-pear-r1
 
@@ -8,7 +8,7 @@ DESCRIPTION="Framework for caching of arbitrary data"
 
 LICENSE="PHP-2.02"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 DEPEND=">=dev-php/PEAR-PEAR-1.7.0"
diff --git a/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.7.12.ebuild b/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.7.12.ebuild
index 27c0202235a0..32bfd558f054 100644
--- a/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.7.12.ebuild
+++ b/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.7.12.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.7.12.ebuild,v 1.1 2011/12/12 10:46:27 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.7.12.ebuild,v 1.2 2012/01/16 12:40:38 ago Exp $
 
 inherit php-pear-r1
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 DESCRIPTION="Fast and safe little cache system."
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-php/PEAR-File/PEAR-File-1.4.0.ebuild b/dev-php/PEAR-File/PEAR-File-1.4.0.ebuild
index 1a3a62b8f8da..48685ef5c3f4 100644
--- a/dev-php/PEAR-File/PEAR-File-1.4.0.ebuild
+++ b/dev-php/PEAR-File/PEAR-File-1.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-File/PEAR-File-1.4.0.ebuild,v 1.1 2011/03/19 09:55:13 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-File/PEAR-File-1.4.0.ebuild,v 1.2 2012/01/16 14:51:34 ago Exp $
 
 EAPI="2"
 
@@ -10,7 +10,7 @@ DESCRIPTION="Common file and directory routines"
 
 LICENSE="PHP-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 RDEPEND="|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )"
diff --git a/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.3.12.ebuild b/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.3.12.ebuild
index d88d2e4fa39d..4972e196c987 100644
--- a/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.3.12.ebuild
+++ b/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.3.12.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.3.12.ebuild,v 1.1 2011/12/12 10:39:21 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.3.12.ebuild,v 1.2 2012/01/16 12:46:20 ago Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="An extremely powerful Tokenizer driven Template engine"
 LICENSE="PHP-2.02"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="minimal"
 RDEPEND="!minimal? ( >=dev-php/PEAR-HTML_Javascript-1.1.0-r1
 	dev-php/PEAR-File_Gettext
diff --git a/dev-php/PEAR-HTML_TreeMenu/PEAR-HTML_TreeMenu-1.2.2.ebuild b/dev-php/PEAR-HTML_TreeMenu/PEAR-HTML_TreeMenu-1.2.2.ebuild
index d117fb4dafae..a1158cc073c7 100644
--- a/dev-php/PEAR-HTML_TreeMenu/PEAR-HTML_TreeMenu-1.2.2.ebuild
+++ b/dev-php/PEAR-HTML_TreeMenu/PEAR-HTML_TreeMenu-1.2.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTML_TreeMenu/PEAR-HTML_TreeMenu-1.2.2.ebuild,v 1.1 2011/12/12 10:41:40 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTML_TreeMenu/PEAR-HTML_TreeMenu-1.2.2.ebuild,v 1.2 2012/01/16 11:03:27 ago Exp $
 
 inherit php-pear-r1
 
 DESCRIPTION="Provides an API to create a HTML tree."
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
diff --git a/dev-php/PEAR-Image_Canvas/PEAR-Image_Canvas-0.3.3.ebuild b/dev-php/PEAR-Image_Canvas/PEAR-Image_Canvas-0.3.3.ebuild
index 0a9a495e58ea..848e0e6d081b 100644
--- a/dev-php/PEAR-Image_Canvas/PEAR-Image_Canvas-0.3.3.ebuild
+++ b/dev-php/PEAR-Image_Canvas/PEAR-Image_Canvas-0.3.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Image_Canvas/PEAR-Image_Canvas-0.3.3.ebuild,v 1.1 2011/12/06 12:16:06 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Image_Canvas/PEAR-Image_Canvas-0.3.3.ebuild,v 1.2 2012/01/16 12:45:24 ago Exp $
 
 inherit php-pear-r1 depend.php
 
@@ -9,7 +9,7 @@ DESCRIPTION="Provides a common interface to image drawing, making image source c
 # see http://pear.php.net/bugs/bug.php?id=9699 wrt LICENSE
 LICENSE="PHP-2.02 || ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 RDEPEND=">=dev-php/PEAR-Image_Color-1.0.0"
 
diff --git a/dev-php/PEAR-Log/PEAR-Log-1.12.7.ebuild b/dev-php/PEAR-Log/PEAR-Log-1.12.7.ebuild
index 428e24b1c9f2..e6b1d9b107e6 100644
--- a/dev-php/PEAR-Log/PEAR-Log-1.12.7.ebuild
+++ b/dev-php/PEAR-Log/PEAR-Log-1.12.7.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Log/PEAR-Log-1.12.7.ebuild,v 1.1 2011/12/12 10:35:48 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Log/PEAR-Log-1.12.7.ebuild,v 1.2 2012/01/16 12:44:30 ago Exp $
 
 EAPI="2"
 inherit php-pear-r1 depend.php eutils
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 DESCRIPTION="The Log framework provides an abstracted logging system.@"
 LICENSE="PHP-3.01"
diff --git a/dev-php/PEAR-Net_DIME/PEAR-Net_DIME-1.0.2.ebuild b/dev-php/PEAR-Net_DIME/PEAR-Net_DIME-1.0.2.ebuild
index d908ea2ea908..9724fb6fe0bf 100644
--- a/dev-php/PEAR-Net_DIME/PEAR-Net_DIME-1.0.2.ebuild
+++ b/dev-php/PEAR-Net_DIME/PEAR-Net_DIME-1.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_DIME/PEAR-Net_DIME-1.0.2.ebuild,v 1.1 2011/12/06 12:14:27 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_DIME/PEAR-Net_DIME-1.0.2.ebuild,v 1.2 2012/01/16 12:47:13 ago Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,5 @@ DESCRIPTION="The PEAR::Net_DIME class implements DIME encoding"
 
 LICENSE="PHP-2.02"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
diff --git a/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.3.7-r1.ebuild b/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.3.7-r1.ebuild
index d241aa9f7979..ade08f2b44f0 100644
--- a/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.3.7-r1.ebuild
+++ b/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.3.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.3.7-r1.ebuild,v 1.1 2010/09/19 12:00:22 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.3.7-r1.ebuild,v 1.2 2012/01/16 14:52:32 ago Exp $
 
 EAPI="3"
 
@@ -10,7 +10,7 @@ DESCRIPTION="Provides an OO interface to the PHP FTP functions"
 
 LICENSE="PHP-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 RDEPEND="dev-lang/php[ftp]"
diff --git a/dev-php/PEAR-Net_UserAgent_Detect/PEAR-Net_UserAgent_Detect-2.5.2.ebuild b/dev-php/PEAR-Net_UserAgent_Detect/PEAR-Net_UserAgent_Detect-2.5.2.ebuild
index 9beef48f80a9..22746325217c 100644
--- a/dev-php/PEAR-Net_UserAgent_Detect/PEAR-Net_UserAgent_Detect-2.5.2.ebuild
+++ b/dev-php/PEAR-Net_UserAgent_Detect/PEAR-Net_UserAgent_Detect-2.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_UserAgent_Detect/PEAR-Net_UserAgent_Detect-2.5.2.ebuild,v 1.1 2011/12/06 12:21:27 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_UserAgent_Detect/PEAR-Net_UserAgent_Detect-2.5.2.ebuild,v 1.2 2012/01/16 12:43:29 ago Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,5 @@ DESCRIPTION="Net_UserAgent_Detect determines the Web browser, version, and platf
 
 LICENSE="PHP-2.02"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
diff --git a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.16.2.ebuild b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.16.2.ebuild
index fc3bcc473fc9..9d3d3de217a7 100644
--- a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.16.2.ebuild
+++ b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.16.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.16.2.ebuild,v 1.1 2011/12/12 10:19:20 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.16.2.ebuild,v 1.2 2012/01/16 12:41:32 ago Exp $
 
 inherit php-pear-r1
 
@@ -8,5 +8,5 @@ DESCRIPTION="Provides methods for spelling numerals in words."
 
 LICENSE="PHP-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
diff --git a/dev-python/pypy/pypy-1.7.ebuild b/dev-python/pypy/pypy-1.7.ebuild
index 9c69c34b338b..b9be16e09d61 100644
--- a/dev-python/pypy/pypy-1.7.ebuild
+++ b/dev-python/pypy/pypy-1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.7.ebuild,v 1.4 2012/01/15 22:07:18 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.7.ebuild,v 1.5 2012/01/16 05:26:31 mr_bones_ Exp $
 
 EAPI="4"
 
@@ -31,7 +31,7 @@ S="${WORKDIR}/${PN}-pypy-release-${PV}"
 
 DOC="README LICENSE"
 
-pkg_pretend() {	
+pkg_pretend() {
 	CHECKREQS_MEMORY="1250M"
 	use amd64 && CHECKREQS_MEMORY="2500M"
 	check-reqs_pkg_pretend
diff --git a/dev-ruby/barby/barby-0.5.0-r1.ebuild b/dev-ruby/barby/barby-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..f81ff47a563e
--- /dev/null
+++ b/dev-ruby/barby/barby-0.5.0-r1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/barby/barby-0.5.0-r1.ebuild,v 1.1 2012/01/16 05:30:01 flameeyes Exp $
+
+EAPI=4
+
+USE_RUBY="ruby18 ree18 jruby"
+
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_DOCDIR="site"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby barcode generator that doesn't rely on 3rd party libraries."
+HOMEPAGE="http://toretore.eu/barby/"
+
+GITHUB_USER="toretore"
+SRC_URI="https://github.com/${GITHUB_USER}/${PN}/tarball/v${PV} -> ${P}.tgz"
+RUBY_S="${GITHUB_USER}-${PN}-*"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test datamatrix pdf-writer qrcode rmagick prawn png cairo"
+
+USE_RUBY="ruby18 ree18" \
+	ruby_add_rdepend "
+		datamatrix? ( dev-ruby/semacode )
+		pdf-writer? ( dev-ruby/pdf-writer )"
+
+# ruby19 as well, if it worked
+USE_RUBY="ruby18 ree18" \
+	ruby_add_rdepend "
+		rmagick? ( dev-ruby/rmagick )
+		cairo? ( dev-ruby/rcairo )"
+
+USE_RUBY="ruby18 ree18 jruby" \
+	ruby_add_rdepend "prawn? ( dev-ruby/prawn )"
+
+ruby_add_rdepend "qrcode? ( dev-ruby/rqrcode )
+	png? ( dev-ruby/chunky_png )"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+# prawn breaks tests for some reasons, needs to be investigated; code
+# still works though.
+RESTRICT="prawn? ( test )"
+
+all_ruby_prepare() {
+	sed -i -e '/[bB]undler/s:^:#:' test/test_helper.rb
+}
+
+each_ruby_prepare() {
+	if use datamatrix; then
+		sed -i -e '/^end/i s.add_dependency "semacode"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/barcode/data_matrix.rb \
+			test/data_matrix_test.rb
+	fi
+
+	if use pdf-writer; then
+		sed -i -e '/^end/i s.add_dependency "pdf-writer"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/outputter/pdfwriter_outputter.rb \
+			test/outputter/pdfwriter_outputter_test.rb
+	fi
+
+	if use qrcode; then
+		sed -i -e '/^end/i s.add_dependency "rqrcode"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/barcode/qr_code.rb \
+			test/qr_code_test.rb
+	fi
+
+	if use rmagick; then
+		sed -i -e '/^end/i s.add_dependency "rmagick"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/outputter/rmagick_outputter.rb \
+			test/outputter/rmagick_outputter_test.rb
+	fi
+
+	if use prawn; then
+		sed -i -e '/^end/i s.add_dependency "prawn"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/outputter/prawn_outputter.rb \
+			test/outputter/prawn_outputter_test.rb
+	fi
+
+	if use png; then
+		sed -i -e '/^end/i s.add_dependency "chunky_png"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/outputter/png_outputter.rb \
+			test/outputter/png_outputter_test.rb
+	fi
+
+	if use cairo; then
+		sed -i -e '/^end/i s.add_dependency "cairo"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/outputter/cairo_outputter.rb \
+			test/outputter/cairo_outputter_test.rb
+	fi
+
+	case ${RUBY} in
+		*/ruby19)
+			rm -f \
+				lib/barby/barcode/data_matrix.rb \
+				test/data_matrix_test.rb \
+				lib/barby/outputter/pdfwriter_outputter.rb \
+				test/outputter/pdfwriter_outputter_test.rb \
+				lib/barby/outputter/prawn_outputter.rb \
+				test/outputter/prawn_outputter_test.rb
+
+			sed -i \
+				-e '/semacode/d' \
+				-e '/pdf-writer/d' \
+				-e '/prawn/d' \
+				${RUBY_FAKEGEM_GEMSPEC}
+			;;
+		*/jruby)
+			rm -f \
+				lib/barby/barcode/data_matrix.rb \
+				test/data_matrix_test.rb \
+				lib/barby/outputter/pdfwriter_outputter.rb \
+				test/outputter/pdfwriter_outputter_test.rb \
+				lib/barby/outputter/rmagick_outputter.rb \
+				test/outputter/rmagick_outputter_test.rb \
+				lib/barby/outputter/cairo_outputter.rb \
+				test/outputter/cairo_outputter_test.rb
+
+			sed -i \
+				-e '/semacode/d' \
+				-e '/pdf-writer/d' \
+				-e '/rmagick/d' \
+				-e '/cairo/d' \
+				${RUBY_FAKEGEM_GEMSPEC}
+			;;
+	esac
+}
diff --git a/dev-ruby/json/json-1.5.4.ebuild b/dev-ruby/json/json-1.5.4.ebuild
index cfd9b8e0f388..a8be4cbe52f8 100644
--- a/dev-ruby/json/json-1.5.4.ebuild
+++ b/dev-ruby/json/json-1.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.5.4.ebuild,v 1.3 2012/01/15 10:22:27 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.5.4.ebuild,v 1.4 2012/01/16 10:52:43 ago Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18 jruby"
@@ -15,7 +15,7 @@ DESCRIPTION="A JSON implementation as a Ruby extension."
 HOMEPAGE="http://json.rubyforge.org/"
 LICENSE="|| ( Ruby GPL-2 )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/sary-ruby/sary-ruby-1.2.0-r2.ebuild b/dev-ruby/sary-ruby/sary-ruby-1.2.0-r2.ebuild
index 4eca2fd1ea2a..33a82f153559 100644
--- a/dev-ruby/sary-ruby/sary-ruby-1.2.0-r2.ebuild
+++ b/dev-ruby/sary-ruby/sary-ruby-1.2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sary-ruby/sary-ruby-1.2.0-r2.ebuild,v 1.5 2012/01/01 18:29:48 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sary-ruby/sary-ruby-1.2.0-r2.ebuild,v 1.6 2012/01/16 03:10:55 jer Exp $
 
 EAPI="2"
 # jruby: mkmf issue
@@ -12,7 +12,7 @@ HOMEPAGE="http://sary.sourceforge.net/"
 SRC_URI="http://sary.sourceforge.net/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-tex/bibtexu/bibtexu-3.71_p20110705.ebuild b/dev-tex/bibtexu/bibtexu-3.71_p20110705.ebuild
index ed5ec79a36dc..ff9952d3da2c 100644
--- a/dev-tex/bibtexu/bibtexu-3.71_p20110705.ebuild
+++ b/dev-tex/bibtexu/bibtexu-3.71_p20110705.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/bibtexu/bibtexu-3.71_p20110705.ebuild,v 1.2 2011/12/28 04:30:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/bibtexu/bibtexu-3.71_p20110705.ebuild,v 1.3 2012/01/16 13:17:15 ago Exp $
 
 EAPI=3
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/kpathsea-6.0.1_p20110627
diff --git a/dev-tex/mh/mh-20111011.ebuild b/dev-tex/mh/mh-20111011.ebuild
index 7e5be0f6ef6e..a9ad88d5c434 100644
--- a/dev-tex/mh/mh-20111011.ebuild
+++ b/dev-tex/mh/mh-20111011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/mh/mh-20111011.ebuild,v 1.2 2011/12/28 04:58:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/mh/mh-20111011.ebuild,v 1.3 2012/01/16 13:17:57 ago Exp $
 
 inherit latex-package
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.zip"
 LICENSE="LPPL-1.3"
 SLOT="0"
 IUSE="doc"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="dev-tex/xcolor
 	|| ( >=dev-texlive/texlive-latexrecommended-2011 >=dev-texlive/texlive-latex3-2008 )"
diff --git a/dev-texlive/texlive-basic/texlive-basic-2011-r1.ebuild b/dev-texlive/texlive-basic/texlive-basic-2011-r1.ebuild
index fd90085035e1..afe12591788b 100644
--- a/dev-texlive/texlive-basic/texlive-basic-2011-r1.ebuild
+++ b/dev-texlive/texlive-basic/texlive-basic-2011-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-basic/texlive-basic-2011-r1.ebuild,v 1.2 2011/12/28 04:35:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-basic/texlive-basic-2011-r1.ebuild,v 1.3 2012/01/16 13:18:41 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Essential programs and files"
 
 LICENSE="GPL-2 as-is GPL-1 GPL-2 LPPL-1.3 OFL TeX "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 >=dev-tex/luatex-0.70
diff --git a/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2011.ebuild b/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2011.ebuild
index f77bce3de2e6..fb69bbdfda06 100644
--- a/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2011.ebuild
+++ b/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2011.ebuild,v 1.2 2011/12/28 04:47:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2011.ebuild,v 1.3 2012/01/16 13:19:28 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Extra BibTeX styles"
 
 LICENSE="GPL-2 Artistic as-is GPL-1 LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2011
 !=dev-texlive/texlive-latexextra-2007*
diff --git a/dev-texlive/texlive-context/texlive-context-2011.ebuild b/dev-texlive/texlive-context/texlive-context-2011.ebuild
index e7f07265b60c..a7c49de129a3 100644
--- a/dev-texlive/texlive-context/texlive-context-2011.ebuild
+++ b/dev-texlive/texlive-context/texlive-context-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-context/texlive-context-2011.ebuild,v 1.2 2011/12/28 05:12:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-context/texlive-context-2011.ebuild,v 1.3 2012/01/16 13:20:19 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive ConTeXt format"
 
 LICENSE="GPL-2 as-is GPL-1 GPL-2 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 >=dev-texlive/texlive-latex-2010
diff --git a/dev-texlive/texlive-documentation-arabic/texlive-documentation-arabic-2011.ebuild b/dev-texlive/texlive-documentation-arabic/texlive-documentation-arabic-2011.ebuild
index 269c280874bc..4696f22e4833 100644
--- a/dev-texlive/texlive-documentation-arabic/texlive-documentation-arabic-2011.ebuild
+++ b/dev-texlive/texlive-documentation-arabic/texlive-documentation-arabic-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-arabic/texlive-documentation-arabic-2011.ebuild,v 1.2 2011/12/28 05:21:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-arabic/texlive-documentation-arabic-2011.ebuild,v 1.3 2012/01/16 13:21:01 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Arabic documentation"
 
 LICENSE="GPL-2 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-base/texlive-documentation-base-2011.ebuild b/dev-texlive/texlive-documentation-base/texlive-documentation-base-2011.ebuild
index 9cdcc5ad63af..3d75306f7817 100644
--- a/dev-texlive/texlive-documentation-base/texlive-documentation-base-2011.ebuild
+++ b/dev-texlive/texlive-documentation-base/texlive-documentation-base-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-base/texlive-documentation-base-2011.ebuild,v 1.2 2011/12/28 04:34:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-base/texlive-documentation-base-2011.ebuild,v 1.3 2012/01/16 13:21:43 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive TeX Live documentation"
 
 LICENSE="GPL-2 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=""
 RDEPEND="${DEPEND} "
diff --git a/dev-texlive/texlive-documentation-bulgarian/texlive-documentation-bulgarian-2011.ebuild b/dev-texlive/texlive-documentation-bulgarian/texlive-documentation-bulgarian-2011.ebuild
index 8abd51dabfdb..7f975678febe 100644
--- a/dev-texlive/texlive-documentation-bulgarian/texlive-documentation-bulgarian-2011.ebuild
+++ b/dev-texlive/texlive-documentation-bulgarian/texlive-documentation-bulgarian-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-bulgarian/texlive-documentation-bulgarian-2011.ebuild,v 1.2 2011/12/28 05:22:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-bulgarian/texlive-documentation-bulgarian-2011.ebuild,v 1.3 2012/01/16 13:22:25 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Bulgarian documentation"
 
 LICENSE="GPL-2 FDL-1.1 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-chinese/texlive-documentation-chinese-2011.ebuild b/dev-texlive/texlive-documentation-chinese/texlive-documentation-chinese-2011.ebuild
index 4ad02ae23daf..38e19ec6e69d 100644
--- a/dev-texlive/texlive-documentation-chinese/texlive-documentation-chinese-2011.ebuild
+++ b/dev-texlive/texlive-documentation-chinese/texlive-documentation-chinese-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-chinese/texlive-documentation-chinese-2011.ebuild,v 1.2 2011/12/28 05:22:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-chinese/texlive-documentation-chinese-2011.ebuild,v 1.3 2012/01/16 13:23:07 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Chinese documentation"
 
 LICENSE="GPL-2 FDL-1.1 GPL-1 LGPL-2 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-czechslovak/texlive-documentation-czechslovak-2011.ebuild b/dev-texlive/texlive-documentation-czechslovak/texlive-documentation-czechslovak-2011.ebuild
index 4c5775d4ce04..54a915639074 100644
--- a/dev-texlive/texlive-documentation-czechslovak/texlive-documentation-czechslovak-2011.ebuild
+++ b/dev-texlive/texlive-documentation-czechslovak/texlive-documentation-czechslovak-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-czechslovak/texlive-documentation-czechslovak-2011.ebuild,v 1.2 2011/12/28 05:23:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-czechslovak/texlive-documentation-czechslovak-2011.ebuild,v 1.3 2012/01/16 13:23:48 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Czech/Slovak documentation"
 
 LICENSE="GPL-2 GPL-1 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-dutch/texlive-documentation-dutch-2011.ebuild b/dev-texlive/texlive-documentation-dutch/texlive-documentation-dutch-2011.ebuild
index 773b2056d3ca..0b0af48336d5 100644
--- a/dev-texlive/texlive-documentation-dutch/texlive-documentation-dutch-2011.ebuild
+++ b/dev-texlive/texlive-documentation-dutch/texlive-documentation-dutch-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-dutch/texlive-documentation-dutch-2011.ebuild,v 1.2 2011/12/28 05:24:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-dutch/texlive-documentation-dutch-2011.ebuild,v 1.3 2012/01/16 13:24:31 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Dutch documentation"
 
 LICENSE="GPL-2 GPL-1 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-english/texlive-documentation-english-2011.ebuild b/dev-texlive/texlive-documentation-english/texlive-documentation-english-2011.ebuild
index 5125faf9e454..242e72cc797b 100644
--- a/dev-texlive/texlive-documentation-english/texlive-documentation-english-2011.ebuild
+++ b/dev-texlive/texlive-documentation-english/texlive-documentation-english-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-english/texlive-documentation-english-2011.ebuild,v 1.2 2011/12/28 05:24:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-english/texlive-documentation-english-2011.ebuild,v 1.3 2012/01/16 13:25:21 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive English documentation"
 
 LICENSE="GPL-2 as-is FDL-1.1 GPL-1 GPL-2 LPPL-1.3 public-domain TeX "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-finnish/texlive-documentation-finnish-2011.ebuild b/dev-texlive/texlive-documentation-finnish/texlive-documentation-finnish-2011.ebuild
index fd526691d0af..c71be8575e25 100644
--- a/dev-texlive/texlive-documentation-finnish/texlive-documentation-finnish-2011.ebuild
+++ b/dev-texlive/texlive-documentation-finnish/texlive-documentation-finnish-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-finnish/texlive-documentation-finnish-2011.ebuild,v 1.2 2011/12/28 05:25:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-finnish/texlive-documentation-finnish-2011.ebuild,v 1.3 2012/01/16 13:26:04 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Finnish documentation"
 
 LICENSE="GPL-2 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-french/texlive-documentation-french-2011.ebuild b/dev-texlive/texlive-documentation-french/texlive-documentation-french-2011.ebuild
index d9292ca91e01..8a9a563b6388 100644
--- a/dev-texlive/texlive-documentation-french/texlive-documentation-french-2011.ebuild
+++ b/dev-texlive/texlive-documentation-french/texlive-documentation-french-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-french/texlive-documentation-french-2011.ebuild,v 1.2 2011/12/28 05:25:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-french/texlive-documentation-french-2011.ebuild,v 1.3 2012/01/16 13:26:46 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive French documentation"
 
 LICENSE="GPL-2 FDL-1.1 GPL-1 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-german/texlive-documentation-german-2011.ebuild b/dev-texlive/texlive-documentation-german/texlive-documentation-german-2011.ebuild
index 2a033beb07ce..5c5eee51de68 100644
--- a/dev-texlive/texlive-documentation-german/texlive-documentation-german-2011.ebuild
+++ b/dev-texlive/texlive-documentation-german/texlive-documentation-german-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-german/texlive-documentation-german-2011.ebuild,v 1.2 2011/12/28 05:26:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-german/texlive-documentation-german-2011.ebuild,v 1.3 2012/01/16 13:27:29 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive German documentation"
 
 LICENSE="GPL-2 as-is FDL-1.1 GPL-1 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-italian/texlive-documentation-italian-2011.ebuild b/dev-texlive/texlive-documentation-italian/texlive-documentation-italian-2011.ebuild
index 157ba13106ae..c2d0bf355079 100644
--- a/dev-texlive/texlive-documentation-italian/texlive-documentation-italian-2011.ebuild
+++ b/dev-texlive/texlive-documentation-italian/texlive-documentation-italian-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-italian/texlive-documentation-italian-2011.ebuild,v 1.2 2011/12/28 05:27:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-italian/texlive-documentation-italian-2011.ebuild,v 1.3 2012/01/16 13:28:11 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Italian documentation"
 
 LICENSE="GPL-2 as-is GPL-1 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-japanese/texlive-documentation-japanese-2011.ebuild b/dev-texlive/texlive-documentation-japanese/texlive-documentation-japanese-2011.ebuild
index 0ec50f3a73d6..361468fc951f 100644
--- a/dev-texlive/texlive-documentation-japanese/texlive-documentation-japanese-2011.ebuild
+++ b/dev-texlive/texlive-documentation-japanese/texlive-documentation-japanese-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-japanese/texlive-documentation-japanese-2011.ebuild,v 1.2 2011/12/28 05:28:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-japanese/texlive-documentation-japanese-2011.ebuild,v 1.3 2012/01/16 13:28:53 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Japanese documentation"
 
 LICENSE="GPL-2 GPL-1 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-korean/texlive-documentation-korean-2011.ebuild b/dev-texlive/texlive-documentation-korean/texlive-documentation-korean-2011.ebuild
index e0c33cb28982..e83e6fa8d372 100644
--- a/dev-texlive/texlive-documentation-korean/texlive-documentation-korean-2011.ebuild
+++ b/dev-texlive/texlive-documentation-korean/texlive-documentation-korean-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-korean/texlive-documentation-korean-2011.ebuild,v 1.2 2011/12/28 05:29:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-korean/texlive-documentation-korean-2011.ebuild,v 1.3 2012/01/16 13:29:45 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Korean documentation"
 
 LICENSE="GPL-2 FDL-1.1 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-mongolian/texlive-documentation-mongolian-2011.ebuild b/dev-texlive/texlive-documentation-mongolian/texlive-documentation-mongolian-2011.ebuild
index 05fd1f0c5db6..6c880583f5e7 100644
--- a/dev-texlive/texlive-documentation-mongolian/texlive-documentation-mongolian-2011.ebuild
+++ b/dev-texlive/texlive-documentation-mongolian/texlive-documentation-mongolian-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-mongolian/texlive-documentation-mongolian-2011.ebuild,v 1.2 2011/12/28 05:30:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-mongolian/texlive-documentation-mongolian-2011.ebuild,v 1.3 2012/01/16 13:30:27 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Mongolian documentation"
 
 LICENSE="GPL-2 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-polish/texlive-documentation-polish-2011.ebuild b/dev-texlive/texlive-documentation-polish/texlive-documentation-polish-2011.ebuild
index 825fa231f5f0..6ebae116e6cf 100644
--- a/dev-texlive/texlive-documentation-polish/texlive-documentation-polish-2011.ebuild
+++ b/dev-texlive/texlive-documentation-polish/texlive-documentation-polish-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-polish/texlive-documentation-polish-2011.ebuild,v 1.2 2011/12/28 05:31:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-polish/texlive-documentation-polish-2011.ebuild,v 1.3 2012/01/16 13:31:10 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Polish documentation"
 
 LICENSE="GPL-2 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-portuguese/texlive-documentation-portuguese-2011.ebuild b/dev-texlive/texlive-documentation-portuguese/texlive-documentation-portuguese-2011.ebuild
index bdca0d2526a5..b8c88aacb0c5 100644
--- a/dev-texlive/texlive-documentation-portuguese/texlive-documentation-portuguese-2011.ebuild
+++ b/dev-texlive/texlive-documentation-portuguese/texlive-documentation-portuguese-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-portuguese/texlive-documentation-portuguese-2011.ebuild,v 1.2 2011/12/28 05:31:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-portuguese/texlive-documentation-portuguese-2011.ebuild,v 1.3 2012/01/16 13:31:52 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Portuguese documentation"
 
 LICENSE="GPL-2 GPL-1 LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-russian/texlive-documentation-russian-2011.ebuild b/dev-texlive/texlive-documentation-russian/texlive-documentation-russian-2011.ebuild
index 468655583c11..d7b0e01164ae 100644
--- a/dev-texlive/texlive-documentation-russian/texlive-documentation-russian-2011.ebuild
+++ b/dev-texlive/texlive-documentation-russian/texlive-documentation-russian-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-russian/texlive-documentation-russian-2011.ebuild,v 1.2 2011/12/28 05:34:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-russian/texlive-documentation-russian-2011.ebuild,v 1.3 2012/01/16 13:32:39 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Russian documentation"
 
 LICENSE="GPL-2 as-is GPL-1 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-serbian/texlive-documentation-serbian-2011.ebuild b/dev-texlive/texlive-documentation-serbian/texlive-documentation-serbian-2011.ebuild
index f7d7a0f5a8ff..d5f01913a5df 100644
--- a/dev-texlive/texlive-documentation-serbian/texlive-documentation-serbian-2011.ebuild
+++ b/dev-texlive/texlive-documentation-serbian/texlive-documentation-serbian-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-serbian/texlive-documentation-serbian-2011.ebuild,v 1.2 2011/12/28 05:34:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-serbian/texlive-documentation-serbian-2011.ebuild,v 1.3 2012/01/16 13:33:20 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Serbian documentation"
 
 LICENSE="GPL-2 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-slovenian/texlive-documentation-slovenian-2011.ebuild b/dev-texlive/texlive-documentation-slovenian/texlive-documentation-slovenian-2011.ebuild
index 0e4626cd5363..c9e723f34c1c 100644
--- a/dev-texlive/texlive-documentation-slovenian/texlive-documentation-slovenian-2011.ebuild
+++ b/dev-texlive/texlive-documentation-slovenian/texlive-documentation-slovenian-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-slovenian/texlive-documentation-slovenian-2011.ebuild,v 1.2 2011/12/28 05:35:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-slovenian/texlive-documentation-slovenian-2011.ebuild,v 1.3 2012/01/16 13:34:07 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Slovenian documentation"
 
 LICENSE="GPL-2 GPL-1 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-spanish/texlive-documentation-spanish-2011.ebuild b/dev-texlive/texlive-documentation-spanish/texlive-documentation-spanish-2011.ebuild
index 8aea2118784c..3572b9a5d89e 100644
--- a/dev-texlive/texlive-documentation-spanish/texlive-documentation-spanish-2011.ebuild
+++ b/dev-texlive/texlive-documentation-spanish/texlive-documentation-spanish-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-spanish/texlive-documentation-spanish-2011.ebuild,v 1.2 2011/12/28 05:35:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-spanish/texlive-documentation-spanish-2011.ebuild,v 1.3 2012/01/16 13:34:49 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Spanish documentation"
 
 LICENSE="GPL-2 as-is LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-thai/texlive-documentation-thai-2011.ebuild b/dev-texlive/texlive-documentation-thai/texlive-documentation-thai-2011.ebuild
index 7179fd560f5d..72ec18f3faa5 100644
--- a/dev-texlive/texlive-documentation-thai/texlive-documentation-thai-2011.ebuild
+++ b/dev-texlive/texlive-documentation-thai/texlive-documentation-thai-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-thai/texlive-documentation-thai-2011.ebuild,v 1.2 2011/12/28 05:36:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-thai/texlive-documentation-thai-2011.ebuild,v 1.3 2012/01/16 13:35:30 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Thai documentation"
 
 LICENSE="GPL-2 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-turkish/texlive-documentation-turkish-2011.ebuild b/dev-texlive/texlive-documentation-turkish/texlive-documentation-turkish-2011.ebuild
index 85280a40b589..736996d544e6 100644
--- a/dev-texlive/texlive-documentation-turkish/texlive-documentation-turkish-2011.ebuild
+++ b/dev-texlive/texlive-documentation-turkish/texlive-documentation-turkish-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-turkish/texlive-documentation-turkish-2011.ebuild,v 1.2 2011/12/28 05:36:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-turkish/texlive-documentation-turkish-2011.ebuild,v 1.3 2012/01/16 13:36:13 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Turkish documentation"
 
 LICENSE="GPL-2 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-ukrainian/texlive-documentation-ukrainian-2011.ebuild b/dev-texlive/texlive-documentation-ukrainian/texlive-documentation-ukrainian-2011.ebuild
index 3bba01ece767..076923c44fab 100644
--- a/dev-texlive/texlive-documentation-ukrainian/texlive-documentation-ukrainian-2011.ebuild
+++ b/dev-texlive/texlive-documentation-ukrainian/texlive-documentation-ukrainian-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-ukrainian/texlive-documentation-ukrainian-2011.ebuild,v 1.2 2011/12/28 05:37:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-ukrainian/texlive-documentation-ukrainian-2011.ebuild,v 1.3 2012/01/16 13:37:05 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Ukrainian documentation"
 
 LICENSE="GPL-2 as-is "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-documentation-vietnamese/texlive-documentation-vietnamese-2011.ebuild b/dev-texlive/texlive-documentation-vietnamese/texlive-documentation-vietnamese-2011.ebuild
index 502d0232395d..38dee9a9937d 100644
--- a/dev-texlive/texlive-documentation-vietnamese/texlive-documentation-vietnamese-2011.ebuild
+++ b/dev-texlive/texlive-documentation-vietnamese/texlive-documentation-vietnamese-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-vietnamese/texlive-documentation-vietnamese-2011.ebuild,v 1.2 2011/12/28 05:37:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-vietnamese/texlive-documentation-vietnamese-2011.ebuild,v 1.3 2012/01/16 13:37:46 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Vietnamese documentation"
 
 LICENSE="GPL-2 LGPL-2 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-documentation-base-2011
 "
diff --git a/dev-texlive/texlive-fontsextra/texlive-fontsextra-2011.ebuild b/dev-texlive/texlive-fontsextra/texlive-fontsextra-2011.ebuild
index c54756e09398..f34bc29ed798 100644
--- a/dev-texlive/texlive-fontsextra/texlive-fontsextra-2011.ebuild
+++ b/dev-texlive/texlive-fontsextra/texlive-fontsextra-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-fontsextra/texlive-fontsextra-2011.ebuild,v 1.2 2011/12/28 04:49:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-fontsextra/texlive-fontsextra-2011.ebuild,v 1.3 2012/01/16 13:38:40 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Extra fonts"
 
 LICENSE="GPL-2 as-is BSD GPL-1 GPL-2 GPL-3 LPPL-1.3 OFL public-domain TeX "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 !=dev-texlive/texlive-langpolish-2007*
diff --git a/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2011.ebuild b/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2011.ebuild
index fe63497bb941..041c3cc9ccab 100644
--- a/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2011.ebuild
+++ b/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2011.ebuild,v 1.2 2011/12/28 04:39:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2011.ebuild,v 1.3 2012/01/16 13:39:27 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Recommended fonts"
 
 LICENSE="GPL-2 as-is GPL-1 LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 !=dev-texlive/texlive-basic-2007*
diff --git a/dev-texlive/texlive-fontutils/texlive-fontutils-2011.ebuild b/dev-texlive/texlive-fontutils/texlive-fontutils-2011.ebuild
index f29bf8e0964b..8728edd7e279 100644
--- a/dev-texlive/texlive-fontutils/texlive-fontutils-2011.ebuild
+++ b/dev-texlive/texlive-fontutils/texlive-fontutils-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-fontutils/texlive-fontutils-2011.ebuild,v 1.2 2011/12/28 04:36:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-fontutils/texlive-fontutils-2011.ebuild,v 1.3 2012/01/16 13:40:11 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive TeX and Outline font utilities"
 
 LICENSE="GPL-2 as-is GPL-1 LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 !dev-texlive/texlive-psutils
diff --git a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2011.ebuild b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2011.ebuild
index 86c290c9144a..7072c209a1f5 100644
--- a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2011.ebuild
+++ b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-formatsextra/texlive-formatsextra-2011.ebuild,v 1.2 2011/12/28 04:49:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-formatsextra/texlive-formatsextra-2011.ebuild,v 1.3 2012/01/16 13:40:54 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Extra formats"
 
 LICENSE="GPL-2 GPL-2 LPPL-1.3 public-domain TeX "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 >=dev-texlive/texlive-latex-2008
diff --git a/dev-texlive/texlive-games/texlive-games-2011.ebuild b/dev-texlive/texlive-games/texlive-games-2011.ebuild
index 58f55e782626..4ef2b3bb8b43 100644
--- a/dev-texlive/texlive-games/texlive-games-2011.ebuild
+++ b/dev-texlive/texlive-games/texlive-games-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-games/texlive-games-2011.ebuild,v 1.2 2011/12/28 05:16:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-games/texlive-games-2011.ebuild,v 1.3 2012/01/16 13:41:37 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Games typesetting"
 
 LICENSE="GPL-2 as-is GPL-1 LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2011
 !<dev-texlive/texlive-latexextra-2009
diff --git a/dev-texlive/texlive-genericextra/texlive-genericextra-2011.ebuild b/dev-texlive/texlive-genericextra/texlive-genericextra-2011.ebuild
index 08f13159f3eb..d35cadf712d9 100644
--- a/dev-texlive/texlive-genericextra/texlive-genericextra-2011.ebuild
+++ b/dev-texlive/texlive-genericextra/texlive-genericextra-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-genericextra/texlive-genericextra-2011.ebuild,v 1.2 2011/12/28 04:50:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-genericextra/texlive-genericextra-2011.ebuild,v 1.3 2012/01/16 13:42:26 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Extra generic packages"
 
 LICENSE="GPL-2 as-is GPL-1 GPL-2 LPPL-1.3 public-domain TeX "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-genericrecommended/texlive-genericrecommended-2011.ebuild b/dev-texlive/texlive-genericrecommended/texlive-genericrecommended-2011.ebuild
index 16c867f43016..17bff1b08e6c 100644
--- a/dev-texlive/texlive-genericrecommended/texlive-genericrecommended-2011.ebuild
+++ b/dev-texlive/texlive-genericrecommended/texlive-genericrecommended-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-genericrecommended/texlive-genericrecommended-2011.ebuild,v 1.2 2011/12/28 04:46:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-genericrecommended/texlive-genericrecommended-2011.ebuild,v 1.3 2012/01/16 13:43:19 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Recommended generic packages"
 
 LICENSE="GPL-2 as-is GPL-1 LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 !=dev-texlive/texlive-basic-2007*
diff --git a/dev-texlive/texlive-htmlxml/texlive-htmlxml-2011.ebuild b/dev-texlive/texlive-htmlxml/texlive-htmlxml-2011.ebuild
index c7c45b58fe2e..4494c4462d4d 100644
--- a/dev-texlive/texlive-htmlxml/texlive-htmlxml-2011.ebuild
+++ b/dev-texlive/texlive-htmlxml/texlive-htmlxml-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-htmlxml/texlive-htmlxml-2011.ebuild,v 1.2 2011/12/28 05:19:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-htmlxml/texlive-htmlxml-2011.ebuild,v 1.3 2012/01/16 13:44:07 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive HTML/SGML/XML support"
 
 LICENSE="GPL-2 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 >=dev-texlive/texlive-fontsrecommended-2011
diff --git a/dev-texlive/texlive-humanities/texlive-humanities-2011.ebuild b/dev-texlive/texlive-humanities/texlive-humanities-2011.ebuild
index 6afda8373997..466917e6d7e5 100644
--- a/dev-texlive/texlive-humanities/texlive-humanities-2011.ebuild
+++ b/dev-texlive/texlive-humanities/texlive-humanities-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-humanities/texlive-humanities-2011.ebuild,v 1.2 2011/12/28 05:17:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-humanities/texlive-humanities-2011.ebuild,v 1.3 2012/01/16 13:44:56 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Humanities packages"
 
 LICENSE="GPL-2 GPL-1 LPPL-1.2 LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2011
 !dev-tex/lineno
diff --git a/dev-texlive/texlive-langafrican/texlive-langafrican-2011.ebuild b/dev-texlive/texlive-langafrican/texlive-langafrican-2011.ebuild
index b75deb6b4bce..36b83b7fef14 100644
--- a/dev-texlive/texlive-langafrican/texlive-langafrican-2011.ebuild
+++ b/dev-texlive/texlive-langafrican/texlive-langafrican-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langafrican/texlive-langafrican-2011.ebuild,v 1.2 2011/12/28 05:39:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langafrican/texlive-langafrican-2011.ebuild,v 1.3 2012/01/16 13:45:39 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive African scripts"
 
 LICENSE="GPL-2 GPL-1 GPL-2 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langarabic/texlive-langarabic-2011.ebuild b/dev-texlive/texlive-langarabic/texlive-langarabic-2011.ebuild
index bcbbff76d2a2..befb7457feea 100644
--- a/dev-texlive/texlive-langarabic/texlive-langarabic-2011.ebuild
+++ b/dev-texlive/texlive-langarabic/texlive-langarabic-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langarabic/texlive-langarabic-2011.ebuild,v 1.2 2011/12/28 05:40:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langarabic/texlive-langarabic-2011.ebuild,v 1.3 2012/01/16 13:46:21 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Arabic"
 
 LICENSE="GPL-2 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 !dev-texlive/texlive-langarab
diff --git a/dev-texlive/texlive-langarmenian/texlive-langarmenian-2011.ebuild b/dev-texlive/texlive-langarmenian/texlive-langarmenian-2011.ebuild
index 7c6ee32b45d3..1b151cbca4c0 100644
--- a/dev-texlive/texlive-langarmenian/texlive-langarmenian-2011.ebuild
+++ b/dev-texlive/texlive-langarmenian/texlive-langarmenian-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langarmenian/texlive-langarmenian-2011.ebuild,v 1.2 2011/12/28 05:42:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langarmenian/texlive-langarmenian-2011.ebuild,v 1.3 2012/01/16 13:47:03 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Armenian"
 
 LICENSE="GPL-2 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langcjk/texlive-langcjk-2011.ebuild b/dev-texlive/texlive-langcjk/texlive-langcjk-2011.ebuild
index 41c2edf1e548..7eef212345bd 100644
--- a/dev-texlive/texlive-langcjk/texlive-langcjk-2011.ebuild
+++ b/dev-texlive/texlive-langcjk/texlive-langcjk-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langcjk/texlive-langcjk-2011.ebuild,v 1.4 2011/12/28 05:42:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langcjk/texlive-langcjk-2011.ebuild,v 1.5 2012/01/16 13:47:47 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Chinese, Japanese, Korean"
 
 LICENSE="GPL-2 as-is BSD LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 >=app-text/texlive-core-2010[cjk]
diff --git a/dev-texlive/texlive-langcroatian/texlive-langcroatian-2011.ebuild b/dev-texlive/texlive-langcroatian/texlive-langcroatian-2011.ebuild
index bfc355b627fb..637eda7818c8 100644
--- a/dev-texlive/texlive-langcroatian/texlive-langcroatian-2011.ebuild
+++ b/dev-texlive/texlive-langcroatian/texlive-langcroatian-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langcroatian/texlive-langcroatian-2011.ebuild,v 1.2 2011/12/28 05:43:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langcroatian/texlive-langcroatian-2011.ebuild,v 1.3 2012/01/16 13:48:35 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Croatian"
 
 LICENSE="GPL-2 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2011.ebuild b/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2011.ebuild
index 52e69277a62b..24f4dd371215 100644
--- a/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2011.ebuild
+++ b/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2011.ebuild,v 1.2 2011/12/28 05:43:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2011.ebuild,v 1.3 2012/01/16 13:49:18 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Cyrillic"
 
 LICENSE="GPL-2 as-is LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 >=dev-texlive/texlive-latex-2011
diff --git a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2011.ebuild b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2011.ebuild
index 82dc11c6232d..30b7e1dea8a0 100644
--- a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2011.ebuild
+++ b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2011.ebuild,v 1.2 2011/12/28 05:44:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2011.ebuild,v 1.3 2012/01/16 13:50:01 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Czech/Slovak"
 
 LICENSE="GPL-2 as-is GPL-1 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 >=dev-texlive/texlive-latex-2011
diff --git a/dev-texlive/texlive-langdanish/texlive-langdanish-2011.ebuild b/dev-texlive/texlive-langdanish/texlive-langdanish-2011.ebuild
index 255978bfc248..9356870ca6ed 100644
--- a/dev-texlive/texlive-langdanish/texlive-langdanish-2011.ebuild
+++ b/dev-texlive/texlive-langdanish/texlive-langdanish-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langdanish/texlive-langdanish-2011.ebuild,v 1.2 2011/12/28 05:45:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langdanish/texlive-langdanish-2011.ebuild,v 1.3 2012/01/16 13:50:48 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Danish"
 
 LICENSE="GPL-2 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langdutch/texlive-langdutch-2011.ebuild b/dev-texlive/texlive-langdutch/texlive-langdutch-2011.ebuild
index f9f547d29e28..2ef311cc0bd3 100644
--- a/dev-texlive/texlive-langdutch/texlive-langdutch-2011.ebuild
+++ b/dev-texlive/texlive-langdutch/texlive-langdutch-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langdutch/texlive-langdutch-2011.ebuild,v 1.2 2011/12/28 05:45:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langdutch/texlive-langdutch-2011.ebuild,v 1.3 2012/01/16 13:51:36 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Dutch"
 
 LICENSE="GPL-2 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langenglish/texlive-langenglish-2011.ebuild b/dev-texlive/texlive-langenglish/texlive-langenglish-2011.ebuild
index 6286a4b252a2..8714c0860a4d 100644
--- a/dev-texlive/texlive-langenglish/texlive-langenglish-2011.ebuild
+++ b/dev-texlive/texlive-langenglish/texlive-langenglish-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langenglish/texlive-langenglish-2011.ebuild,v 1.2 2011/12/28 05:46:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langenglish/texlive-langenglish-2011.ebuild,v 1.3 2012/01/16 13:52:17 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive US and UK English"
 
 LICENSE="GPL-2 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langfinnish/texlive-langfinnish-2011.ebuild b/dev-texlive/texlive-langfinnish/texlive-langfinnish-2011.ebuild
index fb660192ebc3..d147b0006abe 100644
--- a/dev-texlive/texlive-langfinnish/texlive-langfinnish-2011.ebuild
+++ b/dev-texlive/texlive-langfinnish/texlive-langfinnish-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langfinnish/texlive-langfinnish-2011.ebuild,v 1.2 2011/12/28 05:47:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langfinnish/texlive-langfinnish-2011.ebuild,v 1.3 2012/01/16 13:53:05 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Finnish"
 
 LICENSE="GPL-2 as-is public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langfrench/texlive-langfrench-2011.ebuild b/dev-texlive/texlive-langfrench/texlive-langfrench-2011.ebuild
index 24bbb9c2f20e..d3ec0614b38f 100644
--- a/dev-texlive/texlive-langfrench/texlive-langfrench-2011.ebuild
+++ b/dev-texlive/texlive-langfrench/texlive-langfrench-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langfrench/texlive-langfrench-2011.ebuild,v 1.2 2011/12/28 05:47:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langfrench/texlive-langfrench-2011.ebuild,v 1.3 2012/01/16 13:53:47 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive French"
 
 LICENSE="GPL-2 as-is GPL-1 LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langgerman/texlive-langgerman-2011.ebuild b/dev-texlive/texlive-langgerman/texlive-langgerman-2011.ebuild
index cc6dc93b21c9..224562781225 100644
--- a/dev-texlive/texlive-langgerman/texlive-langgerman-2011.ebuild
+++ b/dev-texlive/texlive-langgerman/texlive-langgerman-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langgerman/texlive-langgerman-2011.ebuild,v 1.2 2011/12/28 05:48:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langgerman/texlive-langgerman-2011.ebuild,v 1.3 2012/01/16 13:54:31 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive German"
 
 LICENSE="GPL-2 as-is GPL-1 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 !<dev-texlive/texlive-latexextra-2009
diff --git a/dev-texlive/texlive-langgreek/texlive-langgreek-2011.ebuild b/dev-texlive/texlive-langgreek/texlive-langgreek-2011.ebuild
index e559b4640ffa..88a75dbd9d16 100644
--- a/dev-texlive/texlive-langgreek/texlive-langgreek-2011.ebuild
+++ b/dev-texlive/texlive-langgreek/texlive-langgreek-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langgreek/texlive-langgreek-2011.ebuild,v 1.2 2011/12/28 05:48:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langgreek/texlive-langgreek-2011.ebuild,v 1.3 2012/01/16 13:55:14 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Greek"
 
 LICENSE="GPL-2 as-is GPL-1 GPL-2 LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langhebrew/texlive-langhebrew-2011.ebuild b/dev-texlive/texlive-langhebrew/texlive-langhebrew-2011.ebuild
index a0228357a63a..a22b3017da35 100644
--- a/dev-texlive/texlive-langhebrew/texlive-langhebrew-2011.ebuild
+++ b/dev-texlive/texlive-langhebrew/texlive-langhebrew-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langhebrew/texlive-langhebrew-2011.ebuild,v 1.2 2011/12/28 05:48:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langhebrew/texlive-langhebrew-2011.ebuild,v 1.3 2012/01/16 13:55:56 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Hebrew"
 
 LICENSE="GPL-2 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langhungarian/texlive-langhungarian-2011.ebuild b/dev-texlive/texlive-langhungarian/texlive-langhungarian-2011.ebuild
index 9f8930ceb336..32ffc0ef51ea 100644
--- a/dev-texlive/texlive-langhungarian/texlive-langhungarian-2011.ebuild
+++ b/dev-texlive/texlive-langhungarian/texlive-langhungarian-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langhungarian/texlive-langhungarian-2011.ebuild,v 1.2 2011/12/28 05:49:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langhungarian/texlive-langhungarian-2011.ebuild,v 1.3 2012/01/16 13:56:38 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Hungarian"
 
 LICENSE="GPL-2 GPL-1 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langindic/texlive-langindic-2011.ebuild b/dev-texlive/texlive-langindic/texlive-langindic-2011.ebuild
index 7885df450b13..4d085eb55197 100644
--- a/dev-texlive/texlive-langindic/texlive-langindic-2011.ebuild
+++ b/dev-texlive/texlive-langindic/texlive-langindic-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langindic/texlive-langindic-2011.ebuild,v 1.2 2011/12/28 05:49:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langindic/texlive-langindic-2011.ebuild,v 1.3 2012/01/16 13:57:29 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Indic scripts"
 
 LICENSE="GPL-2 as-is GPL-1 GPL-2 LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langitalian/texlive-langitalian-2011.ebuild b/dev-texlive/texlive-langitalian/texlive-langitalian-2011.ebuild
index 9afeab4bf9ba..777e8e568cfb 100644
--- a/dev-texlive/texlive-langitalian/texlive-langitalian-2011.ebuild
+++ b/dev-texlive/texlive-langitalian/texlive-langitalian-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langitalian/texlive-langitalian-2011.ebuild,v 1.2 2011/12/28 05:50:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langitalian/texlive-langitalian-2011.ebuild,v 1.3 2012/01/16 13:58:11 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Italian"
 
 LICENSE="GPL-2 LGPL-2 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langlatin/texlive-langlatin-2011.ebuild b/dev-texlive/texlive-langlatin/texlive-langlatin-2011.ebuild
index e5106d8b3d71..bb8d572a040f 100644
--- a/dev-texlive/texlive-langlatin/texlive-langlatin-2011.ebuild
+++ b/dev-texlive/texlive-langlatin/texlive-langlatin-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langlatin/texlive-langlatin-2011.ebuild,v 1.2 2011/12/28 05:51:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langlatin/texlive-langlatin-2011.ebuild,v 1.3 2012/01/16 13:58:54 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Latin"
 
 LICENSE="GPL-2 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langlatvian/texlive-langlatvian-2011.ebuild b/dev-texlive/texlive-langlatvian/texlive-langlatvian-2011.ebuild
index 885097e05510..d579a3611000 100644
--- a/dev-texlive/texlive-langlatvian/texlive-langlatvian-2011.ebuild
+++ b/dev-texlive/texlive-langlatvian/texlive-langlatvian-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langlatvian/texlive-langlatvian-2011.ebuild,v 1.2 2011/12/28 05:51:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langlatvian/texlive-langlatvian-2011.ebuild,v 1.3 2012/01/16 13:59:36 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Latvian"
 
 LICENSE="GPL-2 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langlithuanian/texlive-langlithuanian-2011.ebuild b/dev-texlive/texlive-langlithuanian/texlive-langlithuanian-2011.ebuild
index 7f3c8ac9602b..4d2840085180 100644
--- a/dev-texlive/texlive-langlithuanian/texlive-langlithuanian-2011.ebuild
+++ b/dev-texlive/texlive-langlithuanian/texlive-langlithuanian-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langlithuanian/texlive-langlithuanian-2011.ebuild,v 1.2 2011/12/28 05:52:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langlithuanian/texlive-langlithuanian-2011.ebuild,v 1.3 2012/01/16 14:00:20 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Lithuanian"
 
 LICENSE="GPL-2 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langmongolian/texlive-langmongolian-2011.ebuild b/dev-texlive/texlive-langmongolian/texlive-langmongolian-2011.ebuild
index 5c9109d41c36..f825548e8e23 100644
--- a/dev-texlive/texlive-langmongolian/texlive-langmongolian-2011.ebuild
+++ b/dev-texlive/texlive-langmongolian/texlive-langmongolian-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langmongolian/texlive-langmongolian-2011.ebuild,v 1.2 2011/12/28 05:52:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langmongolian/texlive-langmongolian-2011.ebuild,v 1.3 2012/01/16 14:01:18 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Mongolian"
 
 LICENSE="GPL-2 GPL-1 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 !=dev-texlive/texlive-langmanju-2007*
diff --git a/dev-texlive/texlive-langnorwegian/texlive-langnorwegian-2011.ebuild b/dev-texlive/texlive-langnorwegian/texlive-langnorwegian-2011.ebuild
index 6d1710f4216b..867f044d6f43 100644
--- a/dev-texlive/texlive-langnorwegian/texlive-langnorwegian-2011.ebuild
+++ b/dev-texlive/texlive-langnorwegian/texlive-langnorwegian-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langnorwegian/texlive-langnorwegian-2011.ebuild,v 1.2 2011/12/28 05:53:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langnorwegian/texlive-langnorwegian-2011.ebuild,v 1.3 2012/01/16 14:02:02 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Norwegian"
 
 LICENSE="GPL-2 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langother/texlive-langother-2011.ebuild b/dev-texlive/texlive-langother/texlive-langother-2011.ebuild
index 8e66541112c7..66303942c919 100644
--- a/dev-texlive/texlive-langother/texlive-langother-2011.ebuild
+++ b/dev-texlive/texlive-langother/texlive-langother-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langother/texlive-langother-2011.ebuild,v 1.2 2011/12/28 05:55:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langother/texlive-langother-2011.ebuild,v 1.3 2012/01/16 14:02:54 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Other hyphenation patterns"
 
 LICENSE="GPL-2 as-is GPL-1 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 !<dev-texlive/texlive-basic-2009
diff --git a/dev-texlive/texlive-langpolish/texlive-langpolish-2011.ebuild b/dev-texlive/texlive-langpolish/texlive-langpolish-2011.ebuild
index 83c0b9fe2277..7fd2c107b0d8 100644
--- a/dev-texlive/texlive-langpolish/texlive-langpolish-2011.ebuild
+++ b/dev-texlive/texlive-langpolish/texlive-langpolish-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langpolish/texlive-langpolish-2011.ebuild,v 1.2 2011/12/28 05:56:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langpolish/texlive-langpolish-2011.ebuild,v 1.3 2012/01/16 14:03:37 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Polish"
 
 LICENSE="GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2011
 >=dev-texlive/texlive-basic-2011
diff --git a/dev-texlive/texlive-langportuguese/texlive-langportuguese-2011.ebuild b/dev-texlive/texlive-langportuguese/texlive-langportuguese-2011.ebuild
index 37555bf1d3e1..076ebdd3447c 100644
--- a/dev-texlive/texlive-langportuguese/texlive-langportuguese-2011.ebuild
+++ b/dev-texlive/texlive-langportuguese/texlive-langportuguese-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langportuguese/texlive-langportuguese-2011.ebuild,v 1.2 2011/12/28 05:57:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langportuguese/texlive-langportuguese-2011.ebuild,v 1.3 2012/01/16 14:04:19 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Portuguese"
 
 LICENSE="GPL-2 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langspanish/texlive-langspanish-2011.ebuild b/dev-texlive/texlive-langspanish/texlive-langspanish-2011.ebuild
index ff40fe1db377..6d2bbcd3994b 100644
--- a/dev-texlive/texlive-langspanish/texlive-langspanish-2011.ebuild
+++ b/dev-texlive/texlive-langspanish/texlive-langspanish-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langspanish/texlive-langspanish-2011.ebuild,v 1.2 2011/12/28 05:57:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langspanish/texlive-langspanish-2011.ebuild,v 1.3 2012/01/16 14:05:06 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Spanish"
 
 LICENSE="GPL-2 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langswedish/texlive-langswedish-2011.ebuild b/dev-texlive/texlive-langswedish/texlive-langswedish-2011.ebuild
index 5689fbb29b67..650111351732 100644
--- a/dev-texlive/texlive-langswedish/texlive-langswedish-2011.ebuild
+++ b/dev-texlive/texlive-langswedish/texlive-langswedish-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langswedish/texlive-langswedish-2011.ebuild,v 1.2 2011/12/28 05:58:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langswedish/texlive-langswedish-2011.ebuild,v 1.3 2012/01/16 14:05:48 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Swedish"
 
 LICENSE="GPL-2 LPPL-1.2 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langtibetan/texlive-langtibetan-2011.ebuild b/dev-texlive/texlive-langtibetan/texlive-langtibetan-2011.ebuild
index c992576da9dc..76471a1f14de 100644
--- a/dev-texlive/texlive-langtibetan/texlive-langtibetan-2011.ebuild
+++ b/dev-texlive/texlive-langtibetan/texlive-langtibetan-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langtibetan/texlive-langtibetan-2011.ebuild,v 1.2 2011/12/28 05:58:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langtibetan/texlive-langtibetan-2011.ebuild,v 1.3 2012/01/16 14:06:30 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Tibetan"
 
 LICENSE="GPL-2 GPL-1 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langturkmen/texlive-langturkmen-2011.ebuild b/dev-texlive/texlive-langturkmen/texlive-langturkmen-2011.ebuild
index 320215664438..0aff2f9ec45d 100644
--- a/dev-texlive/texlive-langturkmen/texlive-langturkmen-2011.ebuild
+++ b/dev-texlive/texlive-langturkmen/texlive-langturkmen-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langturkmen/texlive-langturkmen-2011.ebuild,v 1.2 2011/12/28 05:59:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langturkmen/texlive-langturkmen-2011.ebuild,v 1.3 2012/01/16 14:07:11 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Turkmen"
 
 LICENSE="GPL-2 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-langvietnamese/texlive-langvietnamese-2011.ebuild b/dev-texlive/texlive-langvietnamese/texlive-langvietnamese-2011.ebuild
index 5da22da2bb40..a8a76aa9d05c 100644
--- a/dev-texlive/texlive-langvietnamese/texlive-langvietnamese-2011.ebuild
+++ b/dev-texlive/texlive-langvietnamese/texlive-langvietnamese-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langvietnamese/texlive-langvietnamese-2011.ebuild,v 1.2 2011/12/28 05:59:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langvietnamese/texlive-langvietnamese-2011.ebuild,v 1.3 2012/01/16 14:07:59 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Vietnamese"
 
 LICENSE="GPL-2 as-is "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-latex/texlive-latex-2011.ebuild b/dev-texlive/texlive-latex/texlive-latex-2011.ebuild
index ce6b35e7e712..166463f1e0cb 100644
--- a/dev-texlive/texlive-latex/texlive-latex-2011.ebuild
+++ b/dev-texlive/texlive-latex/texlive-latex-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-latex/texlive-latex-2011.ebuild,v 1.3 2011/12/28 04:40:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-latex/texlive-latex-2011.ebuild,v 1.4 2012/01/16 14:08:43 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Basic LaTeX packages"
 
 LICENSE="GPL-2 GPL-2 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 >=dev-tex/luatex-0.45
diff --git a/dev-texlive/texlive-latexextra/texlive-latexextra-2011-r2.ebuild b/dev-texlive/texlive-latexextra/texlive-latexextra-2011-r2.ebuild
index 946ff6d24d68..e410f0ccba58 100644
--- a/dev-texlive/texlive-latexextra/texlive-latexextra-2011-r2.ebuild
+++ b/dev-texlive/texlive-latexextra/texlive-latexextra-2011-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-latexextra/texlive-latexextra-2011-r2.ebuild,v 1.2 2011/12/28 04:56:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-latexextra/texlive-latexextra-2011-r2.ebuild,v 1.3 2012/01/16 14:11:16 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive LaTeX supplementary packages"
 
 LICENSE="GPL-2 Apache-2.0 as-is GPL-1 GPL-2 GPL-3 LGPL-2 LPPL-1.2 LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2011
 >=dev-texlive/texlive-pictures-2011
diff --git a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2011.ebuild b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2011.ebuild
index 92905a6d2e7e..33ff6828734f 100644
--- a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2011.ebuild
+++ b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2011.ebuild,v 1.3 2011/12/28 04:43:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2011.ebuild,v 1.4 2012/01/16 14:12:47 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive LaTeX recommended packages"
 
 LICENSE="GPL-2 as-is GPL-1 LPPL-1.2 LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2011
 >=dev-texlive/texlive-latex-2011
diff --git a/dev-texlive/texlive-luatex/texlive-luatex-2011.ebuild b/dev-texlive/texlive-luatex/texlive-luatex-2011.ebuild
index 018309d81879..5c7c29b3b59d 100644
--- a/dev-texlive/texlive-luatex/texlive-luatex-2011.ebuild
+++ b/dev-texlive/texlive-luatex/texlive-luatex-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-luatex/texlive-luatex-2011.ebuild,v 1.2 2011/12/28 04:42:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-luatex/texlive-luatex-2011.ebuild,v 1.3 2012/01/16 14:13:31 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive LuaTeX packages"
 
 LICENSE="GPL-2 FDL-1.1 GPL-2 LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 >=dev-tex/luatex-0.45
diff --git a/dev-texlive/texlive-mathextra/texlive-mathextra-2011.ebuild b/dev-texlive/texlive-mathextra/texlive-mathextra-2011.ebuild
index 096f732a3005..be7833e4985c 100644
--- a/dev-texlive/texlive-mathextra/texlive-mathextra-2011.ebuild
+++ b/dev-texlive/texlive-mathextra/texlive-mathextra-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-mathextra/texlive-mathextra-2011.ebuild,v 1.2 2011/12/28 04:59:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-mathextra/texlive-mathextra-2011.ebuild,v 1.3 2012/01/16 14:14:22 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Advanced math typesetting"
 
 LICENSE="GPL-2 as-is BSD GPL-1 GPL-3 LGPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-fontsrecommended-2011
 >=dev-texlive/texlive-latex-2011
diff --git a/dev-texlive/texlive-metapost/texlive-metapost-2011.ebuild b/dev-texlive/texlive-metapost/texlive-metapost-2011.ebuild
index cac6252cf51a..8feed90302dd 100644
--- a/dev-texlive/texlive-metapost/texlive-metapost-2011.ebuild
+++ b/dev-texlive/texlive-metapost/texlive-metapost-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-metapost/texlive-metapost-2011.ebuild,v 1.2 2011/12/28 04:45:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-metapost/texlive-metapost-2011.ebuild,v 1.3 2012/01/16 14:15:09 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive MetaPost (and Metafont) drawing packages"
 
 LICENSE="GPL-2 as-is GPL-1 LGPL-2 LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-music/texlive-music-2011.ebuild b/dev-texlive/texlive-music/texlive-music-2011.ebuild
index 7fcf01d4b9c6..f3e15d55a274 100644
--- a/dev-texlive/texlive-music/texlive-music-2011.ebuild
+++ b/dev-texlive/texlive-music/texlive-music-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-music/texlive-music-2011.ebuild,v 1.2 2011/12/28 05:08:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-music/texlive-music-2011.ebuild,v 1.3 2012/01/16 14:15:54 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Music typesetting"
 
 LICENSE="GPL-2 GPL-1 LGPL-2.1 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2011
 !<app-text/texlive-core-2011
diff --git a/dev-texlive/texlive-omega/texlive-omega-2011.ebuild b/dev-texlive/texlive-omega/texlive-omega-2011.ebuild
index ba13f71a9dff..5cda4c6064fd 100644
--- a/dev-texlive/texlive-omega/texlive-omega-2011.ebuild
+++ b/dev-texlive/texlive-omega/texlive-omega-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-omega/texlive-omega-2011.ebuild,v 1.2 2011/12/28 05:10:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-omega/texlive-omega-2011.ebuild,v 1.3 2012/01/16 14:16:37 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Omega"
 
 LICENSE="GPL-2 as-is GPL-1 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 >=dev-texlive/texlive-latex-2011
diff --git a/dev-texlive/texlive-pictures/texlive-pictures-2011.ebuild b/dev-texlive/texlive-pictures/texlive-pictures-2011.ebuild
index 9f308be7730e..6a0a9c3be255 100644
--- a/dev-texlive/texlive-pictures/texlive-pictures-2011.ebuild
+++ b/dev-texlive/texlive-pictures/texlive-pictures-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-pictures/texlive-pictures-2011.ebuild,v 1.2 2011/12/28 04:55:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-pictures/texlive-pictures-2011.ebuild,v 1.3 2012/01/16 14:17:25 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Graphics packages and programs"
 
 LICENSE="GPL-2 Apache-2.0 as-is GPL-1 GPL-3 LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 !<dev-texlive/texlive-latexextra-2009
diff --git a/dev-texlive/texlive-plainextra/texlive-plainextra-2011.ebuild b/dev-texlive/texlive-plainextra/texlive-plainextra-2011.ebuild
index a14be251afe6..11b76478e5c8 100644
--- a/dev-texlive/texlive-plainextra/texlive-plainextra-2011.ebuild
+++ b/dev-texlive/texlive-plainextra/texlive-plainextra-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-plainextra/texlive-plainextra-2011.ebuild,v 1.2 2011/12/28 05:01:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-plainextra/texlive-plainextra-2011.ebuild,v 1.3 2012/01/16 14:18:19 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Plain TeX supplementary packages"
 
 LICENSE="GPL-2 as-is LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 !<dev-texlive/texlive-langvietnamese-2009
diff --git a/dev-texlive/texlive-pstricks/texlive-pstricks-2011.ebuild b/dev-texlive/texlive-pstricks/texlive-pstricks-2011.ebuild
index 7ef58a2da7db..4ecc36879c6e 100644
--- a/dev-texlive/texlive-pstricks/texlive-pstricks-2011.ebuild
+++ b/dev-texlive/texlive-pstricks/texlive-pstricks-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-pstricks/texlive-pstricks-2011.ebuild,v 1.2 2011/12/28 05:09:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-pstricks/texlive-pstricks-2011.ebuild,v 1.3 2012/01/16 14:19:10 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive PSTricks packages"
 
 LICENSE="GPL-2 GPL-1 LGPL-2 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 >=dev-texlive/texlive-genericrecommended-2011
diff --git a/dev-texlive/texlive-publishers/texlive-publishers-2011.ebuild b/dev-texlive/texlive-publishers/texlive-publishers-2011.ebuild
index 977600cbed06..895bee0ece92 100644
--- a/dev-texlive/texlive-publishers/texlive-publishers-2011.ebuild
+++ b/dev-texlive/texlive-publishers/texlive-publishers-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-publishers/texlive-publishers-2011.ebuild,v 1.3 2011/12/28 05:06:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-publishers/texlive-publishers-2011.ebuild,v 1.4 2012/01/16 14:20:12 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Support for publishers, theses, standards, conferences, etc
 
 LICENSE="GPL-2 Apache-2.0 as-is GPL-1 GPL-3 LPPL-1.2 LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2011
 !<dev-texlive/texlive-latexextra-2011
diff --git a/dev-texlive/texlive-science/texlive-science-2011.ebuild b/dev-texlive/texlive-science/texlive-science-2011.ebuild
index 6f41ca4feb1f..9ad9ab04ada8 100644
--- a/dev-texlive/texlive-science/texlive-science-2011.ebuild
+++ b/dev-texlive/texlive-science/texlive-science-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-science/texlive-science-2011.ebuild,v 1.2 2011/12/28 05:03:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-science/texlive-science-2011.ebuild,v 1.3 2012/01/16 14:21:06 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Typesetting for natural and computer sciences"
 
 LICENSE="GPL-2 as-is GPL-1 LGPL-2 LPPL-1.2 LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2011
 !dev-tex/SIunits
diff --git a/dev-texlive/texlive-texinfo/texlive-texinfo-2011.ebuild b/dev-texlive/texlive-texinfo/texlive-texinfo-2011.ebuild
index f6201e9b6f1c..3ad8a24ac494 100644
--- a/dev-texlive/texlive-texinfo/texlive-texinfo-2011.ebuild
+++ b/dev-texlive/texlive-texinfo/texlive-texinfo-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-texinfo/texlive-texinfo-2011.ebuild,v 1.2 2011/12/28 04:38:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-texinfo/texlive-texinfo-2011.ebuild,v 1.3 2012/01/16 14:21:54 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive GNU Texinfo"
 
 LICENSE="GPL-2 GPL-1 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 "
diff --git a/dev-texlive/texlive-xetex/texlive-xetex-2011.ebuild b/dev-texlive/texlive-xetex/texlive-xetex-2011.ebuild
index 1de6556cd5bd..767d83e0fe6d 100644
--- a/dev-texlive/texlive-xetex/texlive-xetex-2011.ebuild
+++ b/dev-texlive/texlive-xetex/texlive-xetex-2011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-xetex/texlive-xetex-2011.ebuild,v 1.2 2011/12/28 05:02:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-xetex/texlive-xetex-2011.ebuild,v 1.3 2012/01/16 14:23:03 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive XeTeX packages"
 
 LICENSE="GPL-2 Apache-2.0 GPL-1 LPPL-1.3 OFL public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2011
 !=app-text/texlive-core-2007*
diff --git a/dev-util/patchutils/patchutils-0.3.2.ebuild b/dev-util/patchutils/patchutils-0.3.2.ebuild
index 6d72ae36e7e0..2c7edd5ffa40 100644
--- a/dev-util/patchutils/patchutils-0.3.2.ebuild
+++ b/dev-util/patchutils/patchutils-0.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/patchutils/patchutils-0.3.2.ebuild,v 1.3 2012/01/15 15:43:47 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/patchutils/patchutils-0.3.2.ebuild,v 1.4 2012/01/16 03:11:41 jer Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-util/systemtap/systemtap-1.6.ebuild b/dev-util/systemtap/systemtap-1.6.ebuild
index 4f84ec34a1f5..9fc1f3721b54 100644
--- a/dev-util/systemtap/systemtap-1.6.ebuild
+++ b/dev-util/systemtap/systemtap-1.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/systemtap-1.6.ebuild,v 1.4 2011/12/18 20:02:37 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/systemtap-1.6.ebuild,v 1.5 2012/01/16 14:59:04 klausman Exp $
 
 EAPI="2"
 
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips x86"
+KEYWORDS="~alpha amd64 ~mips x86"
 IUSE="sqlite"
 
 DEPEND=">=dev-libs/elfutils-0.142
diff --git a/kde-misc/kcheckgmail/Manifest b/kde-misc/kcheckgmail/Manifest
deleted file mode 100644
index 2775d717819c..000000000000
--- a/kde-misc/kcheckgmail/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kcheckgmail-0.6.0.tar.bz2 130878 RMD160 33db80906dd25fa58b56a51478fd85de1d6d24b2 SHA1 b1424244a27bc1b770a74d12aaeef7b4be51056d SHA256 63fa3706b8597f31cf0ea2aec8c75c4178735c47d5efe6f35b5fcdedc187bb7f
diff --git a/kde-misc/kcheckgmail/kcheckgmail-0.6.0.ebuild b/kde-misc/kcheckgmail/kcheckgmail-0.6.0.ebuild
deleted file mode 100644
index 18067320ca86..000000000000
--- a/kde-misc/kcheckgmail/kcheckgmail-0.6.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kcheckgmail/kcheckgmail-0.6.0.ebuild,v 1.3 2011/10/18 18:18:52 scarabeus Exp $
-
-EAPI=4
-KDE_LINGUAS="ar ca cs da de el es et fr hu it ko lt pl pt_BR pt ru sk sv tr wa zh_CN"
-inherit kde4-base
-
-DESCRIPTION="A systray application that notifies when new email is received in a Gmail account"
-HOMEPAGE="http://kcheckgmail.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DOCS=( AUTHORS README TODO )
diff --git a/kde-misc/kcheckgmail/metadata.xml b/kde-misc/kcheckgmail/metadata.xml
deleted file mode 100644
index 8d1e86a9cefb..000000000000
--- a/kde-misc/kcheckgmail/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-</pkgmetadata>
diff --git a/licenses/Emacs-23-CEDET-grammars b/licenses/Emacs-23-CEDET-grammars
deleted file mode 100644
index 88dd7cd8ddeb..000000000000
--- a/licenses/Emacs-23-CEDET-grammars
+++ /dev/null
@@ -1,20 +0,0 @@
-Correcting legal consequences of our mistake in Emacs 23.2 and 23.3
-http://lists.gnu.org/archive/html/info-gnu-emacs/2011-08/msg00003.html
-
-The FSF hereby grants permission to distribute the old Emacs 23.2 and
-23.3 releases, notwithstanding the absence therein of the real source
-files for the CEDET parsers (the grammar files).  This permission
-extends to versions with unrelated modifications, provided those
-versions comply with GNU GPL version 3 in all other respects.
-
-Thanks to some of the improvements in GPL version 3, we don't need to
-explicitly forgive past violations caused by redistributing Emacs 23.2
-and 23.3, because those violations would only have consequences for
-the redistributors if the FSF were to complain about them to the
-redistributors within 60 days of such redistribution.  The FSF commits
-not to complain about this problem.
-
-The FSF urges all redistributors to upgrade as soon as possible to the
-revised Emacs 23.2 and 23.3 releases, now in ftp.gnu.org, which do not
-have this problem.  The corrected files have 23.2a and 23.3a in their
-names.
diff --git a/licenses/dbgphp b/licenses/dbgphp
deleted file mode 100644
index 994743625914..000000000000
--- a/licenses/dbgphp
+++ /dev/null
@@ -1,19 +0,0 @@
-The DBG License, version 1.01
-Copyright (c) 2000, 2001, Dmitri Dmitrienko.
-All rights reserved.
-
-
-Redistribution and use in source and binary forms, with or without modification, is permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 
-  2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-  3. The name "DBG" must not be used to endorse or promote products derived from this software without prior permission from the Author.  
-  4. Author may publish revised and/or new versions of the license from time to time. Each version will be given a distinguishing version number. Once covered code has been published under a particular version of the license, you may always continue to use it under the terms of that version. You may also choose to use such covered code under the terms of any subsequent version of the license published by the Author. No one other than the Author has the right to modify the terms applicable to covered code created under this License.
-  5. Redistributions of any form whatsoever must retain the following    acknowledgment: "This product includes DBG, freely available from http://dd.cron.ru/dbg/"
-
-THIS SOFTWARE IS PROVIDED BY DMITRI DMITRIENKO ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DMITRI DMITRIENKO OR HIS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-Author of DBG can be contacted via Email at dd@cron.ru. For more information the DBG project, please see Web site http://dd.cron.ru/dbg/ 
-
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 5020272e659d..2659bf52635d 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -7,7 +7,7 @@ DIST postfix-2.8.4.tar.gz 3646391 RMD160 fbeb785c5ed08febf5cf71ea375b10120c1f62b
 DIST postfix-2.8.5.tar.gz 3647010 RMD160 db4761f14b146c233426fa1afe49782e64f0c9e0 SHA1 49ef711c80b5a3434258ab24ae00940932503e80 SHA256 f8ed6c98bf5058c363da936a8034c64cee38ca67110e9212491de862116e1c17
 DIST postfix-2.8.6.tar.gz 3647498 RMD160 1f85ff0e9432109342436144f6963d39b79910e1 SHA1 32613ad01cad10ae04aad626f9a69ac9126b3d28 SHA256 8b427a5dfe95da98918fcafce4032bac5d6190603fbc090da3c5c3a22c74dae5
 DIST postfix-2.8.7.tar.gz 3647643 RMD160 ab0700f8f340fad11bf2a294a36ff1d70a1a8783 SHA1 81c87aceff4d9af67a304354bab9c99ac98fc8a0 SHA256 5c13465ab47414e9aa2e857851eff1a3f020cebd056e0dde6094ece3552806e5
-DIST postfix-2.9-20120114.tar.gz 3759555 RMD160 a5853325274e2c1e025949e3949b1536f6b23940 SHA1 0632b44bcd27f16f27530146c40a10594dcee386 SHA256 893a828e15e826a3b4ae9c91989388aea095ab2f7907a839810bda13d0686707
+DIST postfix-2.9-20120115.tar.gz 3760369 RMD160 cc5beafdb6f338e20f187217e8887f193c344c78 SHA1 6c308bdbfebbe664b8f9fbf0fe857b8a3d82866b SHA256 634742998f5e8d6402b1717afdfd6aa3bc908a7db93afc47a0f14aea644f644f
 DIST postfix-vda-2.7.2.patch 59667 RMD160 ebec1fa4a4c6b3c0160407b09aacf8357c936148 SHA1 ac712922f45856965118fa7b8551ece1ccb524db SHA256 f9b12376983833ef9305f7696e9792b62058f242ff2630aeb0866cf686f0a14b
 DIST postfix-vda-v10-2.8.1.patch 56777 RMD160 42f6351d645cc7a211aea86cc35e1f3b10b50da1 SHA1 6b36480be036e7b7aa834fd904a2aa57c537cd40 SHA256 13ca7430b68dc19e21ee26c1c1109e1527a656777fa2f224cd3ce2d594435f12
 DIST postfix-vda-v10-2.8.3.patch 56777 RMD160 ce30005d590d884c589612e65dbd34cbdbf84a31 SHA1 c27217b9af33c86a44bbb4469b7ebd4203210f7a SHA256 02599bdf16e7d77fe6043d1dac972daecdd40c4b2758579200d6ccb11e83acaa
diff --git a/mail-mta/postfix/postfix-2.9_pre20120114.ebuild b/mail-mta/postfix/postfix-2.9_pre20120115.ebuild
similarity index 99%
rename from mail-mta/postfix/postfix-2.9_pre20120114.ebuild
rename to mail-mta/postfix/postfix-2.9_pre20120115.ebuild
index 7b64dbd54a1b..89acc9b2bfca 100644
--- a/mail-mta/postfix/postfix-2.9_pre20120114.ebuild
+++ b/mail-mta/postfix/postfix-2.9_pre20120115.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.9_pre20120114.ebuild,v 1.1 2012/01/15 07:44:28 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.9_pre20120115.ebuild,v 1.1 2012/01/16 12:08:58 eras Exp $
 
 EAPI=4
 
diff --git a/media-libs/sampleicc/sampleicc-1.6.4.ebuild b/media-libs/sampleicc/sampleicc-1.6.4.ebuild
index 466bb82789c7..90a106e558d8 100644
--- a/media-libs/sampleicc/sampleicc-1.6.4.ebuild
+++ b/media-libs/sampleicc/sampleicc-1.6.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sampleicc/sampleicc-1.6.4.ebuild,v 1.2 2011/11/30 12:39:50 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sampleicc/sampleicc-1.6.4.ebuild,v 1.3 2012/01/16 11:57:03 ago Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/SampleICC-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND="media-libs/tiff"
diff --git a/media-sound/mpc/mpc-0.21.ebuild b/media-sound/mpc/mpc-0.21.ebuild
index 94c3e6e220c5..4e7ce8ba95e9 100644
--- a/media-sound/mpc/mpc-0.21.ebuild
+++ b/media-sound/mpc/mpc-0.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpc/mpc-0.21.ebuild,v 1.8 2012/01/15 15:29:29 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpc/mpc-0.21.ebuild,v 1.9 2012/01/16 03:02:42 jer Exp $
 
 EAPI=4
 inherit bash-completion-r1
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
 IUSE="iconv"
 
 RDEPEND=">=media-libs/libmpdclient-2.2
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 37c31884dfce..41022b380909 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,3 +1,3 @@
 DIST rhythmbox-0.12.8.tar.bz2 5358950 RMD160 072d4fa06408ebc181b40147db1575d0ef4c99fe SHA1 5d27923cc29b81d7bfbc73d867d7976a5295f964 SHA256 1752fab135808aa78a9afde78448e992020c58c07701f43c989fbabfc6352213
 DIST rhythmbox-0.13.3.tar.bz2 9978135 RMD160 f6f155768ce9c87d844ee47f7f1cc4f167d05052 SHA1 1c6e83972dcd7de8fc1a71586843e29092a0c706 SHA256 ad6532864bb4df30f1014ec81ddc0d2d3f69241235627f46abe5578cf629052a
-DIST rhythmbox-2.90.1_pre20111001.tar.xz 5630728 RMD160 a0feae3fd5b449e17783a3143d7b05162909bbd9 SHA1 d5aa06613a919f01ba348bd91b0b8783a57802da SHA256 092379718e17e81d0f9a35802489f091d7bb4b675da592dc4e90b11a41c7413f
+DIST rhythmbox-2.95.tar.xz 5942124 RMD160 aeaba12c053ec10dd2247704df4badc2a67d9fc5 SHA1 2730e58c970ed9dae8806243ce6a1a1b3651750b SHA256 12cab95c89514b5c01a2daf9d6bdf74c8652b35e49625e2906d51b487bc68c06
diff --git a/media-sound/rhythmbox/files/rhythmbox-2.95-fix-db-dbus-interface.patch b/media-sound/rhythmbox/files/rhythmbox-2.95-fix-db-dbus-interface.patch
new file mode 100644
index 000000000000..fc73aba43757
--- /dev/null
+++ b/media-sound/rhythmbox/files/rhythmbox-2.95-fix-db-dbus-interface.patch
@@ -0,0 +1,58 @@
+Patch by moch, will enter upstream trunk soon
+
+diff --git a/rhythmdb/rhythmdb-dbus.c b/rhythmdb/rhythmdb-dbus.c
+index bf982ce..d31486e 100644
+--- a/rhythmdb/rhythmdb-dbus.c
++++ b/rhythmdb/rhythmdb-dbus.c
+@@ -111,19 +111,28 @@ rhythmdb_method_call (GDBusConnection *connection,
+ 			GVariant *v;
+ 
+ 			value = value_ptr;
++			v = NULL;
+ 			if (G_VALUE_HOLDS_STRING (value)) {
+-				v = g_variant_new_string (g_value_get_string (value));
++				if (g_value_get_string (value) != NULL) {
++					v = g_variant_new_string (g_value_get_string (value));
++				}
+ 			} else if (G_VALUE_HOLDS_ULONG (value)) {
+ 				v = g_variant_new_uint32 (g_value_get_ulong (value));
+ 			} else if (G_VALUE_HOLDS_DOUBLE (value)) {
+ 				v = g_variant_new_double (g_value_get_double (value));
++			} else if (G_VALUE_HOLDS_BOOLEAN (value)) {
++				v = g_variant_new_boolean (g_value_get_boolean (value));
++			} else if (G_VALUE_HOLDS_UINT64 (value)) {
++				v = g_variant_new_uint64 (g_value_get_uint64 (value));
+ 			} else {
+ 				g_assert_not_reached ();
+ 			}
+-			g_variant_builder_add (builder,
+-					       "{sv}",
+-					       (const char *)name_ptr,
+-					       v);
++			if (v != NULL) {
++				g_variant_builder_add (builder,
++						       "{sv}",
++						       (const char *)name_ptr,
++						       v);
++			}
+ 			count++;
+ 		}
+ 		g_hash_table_destroy (prop_hash);
+@@ -133,7 +142,8 @@ rhythmdb_method_call (GDBusConnection *connection,
+ 			g_variant_builder_add (builder, "{sv}", "", g_variant_new_string (""));
+ 		}
+ 
+-		g_dbus_method_invocation_return_value (invocation, g_variant_builder_end (builder));
++		g_dbus_method_invocation_return_value (invocation,
++						       g_variant_new ("(a{sv})", builder));
+ 		g_variant_builder_unref (builder);
+ 
+ 	} else if (g_strcmp0 (method_name, "SetEntryProperties") == 0) {
+@@ -183,6 +193,7 @@ rhythmdb_method_call (GDBusConnection *connection,
+ 			g_value_unset (&v);
+ 		}
+ 
++		g_dbus_method_invocation_return_value (invocation, NULL);
+ 	} else {
+ 		g_dbus_method_invocation_return_error (invocation,
+ 						       G_DBUS_ERROR,
diff --git a/media-sound/rhythmbox/files/rhythmbox-2.95-port-im-status-plugin.patch b/media-sound/rhythmbox/files/rhythmbox-2.95-port-im-status-plugin.patch
new file mode 100644
index 000000000000..f8453c084083
--- /dev/null
+++ b/media-sound/rhythmbox/files/rhythmbox-2.95-port-im-status-plugin.patch
@@ -0,0 +1,247 @@
+From ed98714cb111d2befbeebbfceeeb60fcf8dcdc1d Mon Sep 17 00:00:00 2001
+From: Nirbheek Chauhan <nirbheek@gentoo.org>
+Date: Sun, 15 Jan 2012 16:13:38 +0530
+Subject: [PATCH 1/2] Port im-status python plugin to Gio/GDBus
+
+Also drop Gossip support since it's a dead project with no way to test for it.
+---
+ plugins/im-status/im-status.py |  157 ++++++++++++++--------------------------
+ 1 files changed, 53 insertions(+), 104 deletions(-)
+
+diff --git a/plugins/im-status/im-status.py b/plugins/im-status/im-status.py
+index 17bcb2d..6bb5b89 100644
+--- a/plugins/im-status/im-status.py
++++ b/plugins/im-status/im-status.py
+@@ -2,6 +2,7 @@
+ # vim: set et sw=2:
+ # 
+ # Copyright (C) 2007-2008 - Vincent Untz
++# Copyright (C) 2012 - Nirbheek Chauhan <nirbheek@gentoo.org>
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -26,19 +27,10 @@
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
+ 
+ import rb
+-from gi.repository import GObject, Peas
++import gi
++from gi.repository import Gio, GLib, GObject, Peas
+ from gi.repository import RB
+ 
+-try:
+-  import dbus
+-  use_gossip = True
+-  use_mc5 = True
+-  use_purple = True
+-except ImportError:
+-  use_gossip = False
+-  use_mc5 = False
+-  use_purple = False
+-
+ import gettext
+ gettext.install('rhythmbox', RB.locale_dir(), unicode=True)
+ 
+@@ -49,10 +41,6 @@ STREAM_SONG_ARTIST = 'rb:stream-song-artist'
+ STREAM_SONG_TITLE  = 'rb:stream-song-title'
+ STREAM_SONG_ALBUM  = 'rb:stream-song-album'
+ 
+-GOSSIP_BUS_NAME = 'org.gnome.Gossip'
+-GOSSIP_OBJ_PATH = '/org/gnome/Gossip'
+-GOSSIP_IFACE_NAME = 'org.gnome.Gossip'
+-
+ PROPERTIES_IFACE_NAME = 'org.freedesktop.DBus.Properties'
+ MC5_BUS_NAME = 'org.freedesktop.Telepathy.MissionControl5'
+ MC5_AM_OBJ_PATH = '/org/freedesktop/Telepathy/AccountManager'
+@@ -70,6 +58,17 @@ class IMStatusPlugin (GObject.Object, Peas.Activatable):
+   def __init__ (self):
+     GObject.Object.__init__ (self)
+ 
++  def _init_dbus_proxies(self):
++    self.proxies = {}
++    bus_type = Gio.BusType.SESSION
++    flags = 0
++    iface_info = None
++    # Creating proxies doesn't do any blocking I/O, and never fails
++    self.proxies["purple"] = Gio.DBusProxy.new_for_bus_sync(bus_type, flags, iface_info,
++                               PURPLE_BUS_NAME, PURPLE_OBJ_PATH, PURPLE_IFACE_NAME, None)
++    self.proxies["mc5_props"] = Gio.DBusProxy.new_for_bus_sync(bus_type, flags, iface_info,
++                               MC5_BUS_NAME, MC5_AM_OBJ_PATH, PROPERTIES_IFACE_NAME, None)
++
+   def do_activate (self):
+     shell = self.object
+     sp = shell.props.shell_player
+@@ -85,6 +84,7 @@ class IMStatusPlugin (GObject.Object, Peas.Activatable):
+     self.current_title = None
+     self.current_album = None
+ 
++    self._init_dbus_proxies ()
+     self.save_status ()
+ 
+     if sp.get_playing ():
+@@ -185,124 +185,73 @@ class IMStatusPlugin (GObject.Object, Peas.Activatable):
+     else:
+       new_status = _(u"♫ Listening to music... ♫")
+ 
+-    self.set_gossip_status (new_status)
+     self.set_mc5_status (new_status)
+     self.set_purple_status (new_status)
+ 
+   def save_status (self):
+-    self.saved_gossip = self.get_gossip_status ()
+     self.saved_mc5 = self.get_mc5_status ()
+     self.saved_purple = self.get_purple_status ()
+ 
+   def restore_status (self):
+-    if self.saved_gossip != None:
+-      self.set_gossip_status (self.saved_gossip)
+     if self.saved_mc5 != None:
+       self.set_mc5_status (self.saved_mc5)
+     if self.saved_purple != None:
+       self.set_purple_status (self.saved_purple)
+ 
+-  def set_gossip_status (self, new_status):
+-    if not use_gossip:
+-      return
+-
+-    try:
+-      bus = dbus.SessionBus ()
+-      gossip_obj = bus.get_object (GOSSIP_BUS_NAME, GOSSIP_OBJ_PATH)
+-      gossip = dbus.Interface (gossip_obj, GOSSIP_IFACE_NAME)
+-
+-      state, status = gossip.GetPresence ("")
+-      gossip.SetPresence (state, new_status)
+-    except dbus.DBusException:
+-      pass
+-
+-  def get_gossip_status (self):
+-    if not use_gossip:
+-      return
+-
+-    try:
+-      bus = dbus.SessionBus ()
+-      gossip_obj = bus.get_object (GOSSIP_BUS_NAME, GOSSIP_OBJ_PATH)
+-      gossip = dbus.Interface (gossip_obj, GOSSIP_IFACE_NAME)
+-
+-      state, status = gossip.GetPresence ("")
+-      return status
+-    except dbus.DBusException:
+-      return None
+-
+   def set_mc5_status (self, new_status):
+-    if not use_mc5:
+-      return
+-
+     try:
+-      bus = dbus.SessionBus ()
+-      am_obj = bus.get_object (MC5_BUS_NAME, MC5_AM_OBJ_PATH)
+-      am = dbus.Interface (am_obj, PROPERTIES_IFACE_NAME)
+-
+-      for acct in am.Get (MC5_AM_IFACE_NAME, "ValidAccounts"):
+-        acct_obj = bus.get_object (MC5_BUS_NAME, acct)
+-        acct_iface = dbus.Interface (acct_obj, PROPERTIES_IFACE_NAME)
+-        status = acct_iface.Get (MC5_ACCT_IFACE_NAME, "RequestedPresence")
+-        acct_iface.Set (MC5_ACCT_IFACE_NAME, "RequestedPresence", (status[0], status[1], new_status))
+-
+-    except dbus.DBusException, e:
+-      print "dbus exception while setting status: " + str(e)
+-
++      proxy = self.proxies["mc5_props"]
++      for acct_obj_path in proxy.Get("(ss)", MC5_AM_IFACE_NAME, "ValidAccounts"):
++        # Create a new proxy connected to acct_obj_path
++        acct_proxy = Gio.DBusProxy.new_for_bus_sync(Gio.BusType.SESSION, 0, None,
++                                                    MC5_BUS_NAME, acct_obj_path,
++                                                    PROPERTIES_IFACE_NAME, None)
++        # status = (state, status, status_message)
++        status = acct_proxy.Get("(ss)", MC5_ACCT_IFACE_NAME, "RequestedPresence")
++        # Create the (uss) GVariant to set the new status message
++        vstatus = GLib.Variant("(uss)", (status[0], status[1], new_status))
++        # Set the status!
++        acct_proxy.Set("(ssv)", MC5_ACCT_IFACE_NAME, "RequestedPresence", vstatus)
++    except gi._glib.GError as e:
++      print ("GError while setting status: " + str(e))
+ 
+   def get_mc5_status (self):
+-    if not use_mc5:
+-      return
+-
+     try:
+-      bus = dbus.SessionBus ()
+-      am_obj = bus.get_object (MC5_BUS_NAME, MC5_AM_OBJ_PATH)
+-      am = dbus.Interface (am_obj, PROPERTIES_IFACE_NAME)
++      proxy = self.proxies["mc5_props"]
+       got_status = False
+-
+       # a bit awful: this just returns the status text from the first account
+       # that has one.
+-      for acct in am.Get (MC5_AM_IFACE_NAME, "ValidAccounts"):
+-        acct_obj = bus.get_object (MC5_BUS_NAME, acct)
+-        acct_iface = dbus.Interface (acct_obj, PROPERTIES_IFACE_NAME)
+-        status = acct_iface.Get (MC5_ACCT_IFACE_NAME, "RequestedPresence")
++      for acct_obj_path in proxy.Get("(ss)", MC5_AM_IFACE_NAME, "ValidAccounts"):
++        # Create a new proxy connected to acct_obj_path
++        acct_proxy = Gio.DBusProxy.new_for_bus_sync (Gio.BusType.SESSION, 0, None,
++                                                     MC5_BUS_NAME, acct_obj_path,
++                                                     PROPERTIES_IFACE_NAME, None)
++        # Get (state, status, status_message)
++        ret = acct_proxy.Get("(ss)", MC5_ACCT_IFACE_NAME, "RequestedPresence")
+         got_status = True
+-        if status[2] != "":
+-          return status[2]
+-
++        if ret[2] != "":
++          return ret[2]
+       # if all accounts have empty status, return that
+       if got_status:
+         return ""
+-    except dbus.DBusException, e:
+-      print "dbus exception while getting status: " + str(e)
+-
++    except gi._glib.GError as e:
++      print ("GError while setting status: " + str(e))
+     return None
+ 
+   def set_purple_status (self, new_status):
+-    if not use_purple:
+-      return
+-
+     try:
+-      bus = dbus.SessionBus ()
+-      purple_obj = bus.get_object (PURPLE_BUS_NAME, PURPLE_OBJ_PATH)
+-      purple = dbus.Interface (purple_obj, PURPLE_IFACE_NAME)
+-
+-      status = purple.PurpleSavedstatusGetCurrent ()
+-      purple.PurpleSavedstatusSetMessage (status, new_status)
+-      purple.PurpleSavedstatusActivate (status)
+-    except dbus.DBusException:
+-      pass
++      proxy = self.proxies["purple"]
++      status = proxy.PurpleSavedstatusGetCurrent()
++      proxy.PurpleSavedstatusSetMessage("(is)", status, new_status)
++      proxy.PurpleSavedstatusActivate("(i)", status)
++    except gi._glib.GError as e:
++      print ("GError while setting status: " + str(e))
+ 
+   def get_purple_status (self):
+-    if not use_purple:
+-      return
+-
+     try:
+-      bus = dbus.SessionBus ()
+-      purple_obj = bus.get_object (PURPLE_BUS_NAME, PURPLE_OBJ_PATH)
+-      purple = dbus.Interface (purple_obj, PURPLE_IFACE_NAME)
+-
+-      current = purple.PurpleSavedstatusGetCurrent ()
+-      status = purple.PurpleSavedstatusGetMessage (current)
+-      return status
+-    except dbus.DBusException:
+-      return None
++      proxy = self.proxies["purple"]
++      status = proxy.PurpleSavedstatusGetCurrent()
++      return proxy.PurpleSavedstatusGetMessage("(i)", status)
++    except gi._glib.GError as e:
++      print ("GError while setting status: " + str(e))
++    return None
+-- 
+1.7.3.4
+
diff --git a/media-sound/rhythmbox/files/rhythmbox-2.95-port-rb-set-rating-py-example.patch b/media-sound/rhythmbox/files/rhythmbox-2.95-port-rb-set-rating-py-example.patch
new file mode 100644
index 000000000000..2a34868ab4ba
--- /dev/null
+++ b/media-sound/rhythmbox/files/rhythmbox-2.95-port-rb-set-rating-py-example.patch
@@ -0,0 +1,42 @@
+From a9e3286eec99cdd9d229aa0d9bcab925cc381889 Mon Sep 17 00:00:00 2001
+From: Nirbheek Chauhan <nirbheek@gentoo.org>
+Date: Mon, 16 Jan 2012 06:56:21 +0530
+Subject: [PATCH 2/2] Port the rb-set-rating.py example script to PyGI/GDBus
+
+---
+ remote/dbus/rb-set-rating.py |   19 ++++++++++++++-----
+ 1 files changed, 14 insertions(+), 5 deletions(-)
+
+diff --git a/remote/dbus/rb-set-rating.py b/remote/dbus/rb-set-rating.py
+index 82264d5..9fdd0d5 100755
+--- a/remote/dbus/rb-set-rating.py
++++ b/remote/dbus/rb-set-rating.py
+@@ -1,11 +1,20 @@
+ #!/usr/bin/python
++# vim: set sts=2 sw=2 et :
+ # Set the rating for a URI
+ 
+-import dbus, sys
++import sys
+ 
+-bus = dbus.SessionBus()
+-rbshellobj = bus.get_object('org.gnome.Rhythmbox', '/org/gnome/Rhythmbox/Shell')
+-rbshell = dbus.Interface(rbshellobj, 'org.gnome.Rhythmbox.Shell')
++from gi.repository import GLib, Gio
+ 
+-rbshell.setSongProperty(sys.argv[1], "rating", dbus.Double(float(sys.argv[2])))
++bus_type = Gio.BusType.SESSION
++flags = 0
++iface_info = None
++proxy = Gio.DBusProxy.new_for_bus_sync(bus_type, flags, iface_info,
++                                       "org.gnome.Rhythmbox3",
++                                       "/org/gnome/Rhythmbox3/RhythmDB",
++                                       "org.gnome.Rhythmbox3.RhythmDB", None)
+ 
++entry_uri = sys.argv[1]
++rating = float(sys.argv[2])
++vrating = GLib.Variant("u", rating)
++proxy.SetEntryProperties("(sa{sv})", entry_uri, {"rating": vrating})
+-- 
+1.7.3.4
+
diff --git a/media-sound/rhythmbox/rhythmbox-2.90.1_pre20111001.ebuild b/media-sound/rhythmbox/rhythmbox-2.95.ebuild
similarity index 72%
rename from media-sound/rhythmbox/rhythmbox-2.90.1_pre20111001.ebuild
rename to media-sound/rhythmbox/rhythmbox-2.95.ebuild
index 65315afb14fd..791413c05b43 100644
--- a/media-sound/rhythmbox/rhythmbox-2.90.1_pre20111001.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-2.95.ebuild
@@ -1,30 +1,34 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-2.90.1_pre20111001.ebuild,v 1.2 2012/01/05 06:38:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-2.95.ebuild,v 1.1 2012/01/16 03:47:24 nirbheek Exp $
 
-EAPI="3"
+EAPI="4"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.5"
 PYTHON_USE_WITH="xml"
 PYTHON_USE_WITH_OPT="python"
 
-inherit autotools gnome2 python multilib virtualx
+inherit eutils gnome2 python multilib virtualx
 
 DESCRIPTION="Music management and playback software for GNOME"
 HOMEPAGE="http://www.rhythmbox.org/"
-# Git snapshot
-SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="cdr clutter daap dbus doc gnome-keyring html ipod +lastfm libnotify lirc
-musicbrainz mtp nsplugin python test udev upnp webkit"
+musicbrainz mtp nsplugin +python test +udev upnp webkit"
 # vala
 KEYWORDS="~amd64 ~x86"
 
+REQUIRED_USE="
+	ipod? ( udev )
+	mtp? ( udev )
+	dbus? ( python )
+	gnome-keyring? ( python )
+	webkit? ( python )"
+
 # FIXME: double check what to do with fm-radio plugin
 # FIXME: Zeitgeist python plugin
-# NOTE: Rhythmbox uses both gdbus and dbus-python right now
 # NOTE: gst-python is still needed because gstreamer introspection is incomplete
 COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
 	dev-libs/libxml2:2
@@ -37,6 +41,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
 	>=net-libs/libsoup-gnome-2.26:2.4
 	>=media-libs/gst-plugins-base-0.10.32:0.10
 	>=media-libs/gstreamer-0.10.32:0.10[introspection]
+	>=sys-libs/tdb-1.2.6
 
 	clutter? (
 		>=media-libs/clutter-1.2:1.0
@@ -55,7 +60,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
 	musicbrainz? (
 		media-libs/musicbrainz:3
 		gnome-base/gconf:2 )
-	python? ( >=dev-python/pygobject-2.28:2[introspection] )
+	python? ( dev-python/pygobject:3 )
 	udev? (
 		ipod? ( >=media-libs/libgpod-0.7.92[udev] )
 		mtp? ( >=media-libs/libmtp-0.3 )
@@ -79,7 +84,7 @@ RDEPEND="${COMMON_DEPEND}
 		x11-libs/gtk+:3[introspection]
 		x11-libs/pango[introspection]
 
-		dbus? ( dev-python/dbus-python )
+		dbus? ( sys-apps/dbus )
 		gnome-keyring? ( dev-python/gnome-keyring-python )
 		webkit? (
 			dev-python/mako
@@ -87,12 +92,10 @@ RDEPEND="${COMMON_DEPEND}
 "
 # gtk-doc-am needed for eautoreconf
 #	dev-util/gtk-doc-am
-# gtk-doc is needed for gtkdocize
 DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig
 	>=dev-util/intltool-0.35
 	app-text/scrollkeeper
-	dev-util/gtk-doc
 	>=app-text/gnome-doc-utils-0.9.1
 	doc? ( >=dev-util/gtk-doc-1.4 )
 	test? ( dev-libs/check )"
@@ -107,47 +110,11 @@ pkg_setup() {
 		G2CONF="${G2CONF} PYTHON=$(PYTHON -2)"
 	fi
 
-	if ! use udev; then
-		if use ipod; then
-			ewarn "ipod support requires udev support.  Please"
-			ewarn "re-emerge with USE=udev to enable ipod support"
-			G2CONF="${G2CONF} --without-ipod"
-		fi
-
-		if use mtp; then
-			ewarn "MTP support requires udev support.  Please"
-			ewarn "re-emerge with USE=udev to enable MTP support"
-			G2CONF="${G2CONF} --without-mtp"
-		fi
-	else
-		G2CONF="${G2CONF} $(use_with ipod) $(use_with mtp)"
-	fi
-
-	if ! use cdr ; then
-		ewarn "You have cdr USE flag disabled."
-		ewarn "You will not be able to burn CDs."
-	fi
-
-	if ! use python; then
-		if use dbus; then
-			ewarn "You need python support to use the im-status plugin"
-		fi
-
-		if use webkit; then
-			ewarn "You need python support in addition to webkit to be able to use"
-			ewarn "the context panel plugin."
-		fi
-	fi
-
-	if use gnome-keyring && ! use python; then
-		ewarn "The magnatune plugin requires USE='python gnome-keyring'"
-	fi
-
 	# --enable-vala just installs the sample vala plugin, and the configure
 	# checks are broken, so don't enable it
 	G2CONF="${G2CONF}
 		MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins
-		VALAC=$(type -P valac-0.12)
+		VALAC=$(type -P valac-0.14)
 		--enable-mmkeys
 		--disable-more-warnings
 		--disable-scrollkeeper
@@ -178,15 +145,13 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
-	# Git snapshot, remove for release
-	# make dist wasn't working, so no proper snapshot tarball
-	gtkdocize || die
-	gnome-doc-common || die
-	gnome-doc-prepare --automake || die
-	intltoolize --force || die
-	eautoreconf
+	# Not needed for next release
+	# https://bugzilla.gnome.org/show_bug.cgi?id=667980
+	epatch "${FILESDIR}/${P}-port-im-status-plugin.patch"
+	epatch "${FILESDIR}/${P}-port-rb-set-rating-py-example.patch"
+	epatch "${FILESDIR}/${P}-fix-db-dbus-interface.patch"
 
-	# disable pyc compiling
+	# Disable pyc compiling
 	echo > py-compile
 }
 
diff --git a/media-video/dvdrip/dvdrip-0.98.11-r1.ebuild b/media-video/dvdrip/dvdrip-0.98.11-r1.ebuild
index 301ea836667e..fb7d3fcdffe9 100644
--- a/media-video/dvdrip/dvdrip-0.98.11-r1.ebuild
+++ b/media-video/dvdrip/dvdrip-0.98.11-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/dvdrip-0.98.11-r1.ebuild,v 1.2 2011/07/08 19:20:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/dvdrip-0.98.11-r1.ebuild,v 1.3 2012/01/16 10:48:21 ago Exp $
 
 EAPI=2
 inherit eutils flag-o-matic perl-module
@@ -11,7 +11,7 @@ SRC_URI="http://www.exit1.org/dvdrip/dist/${P}.tar.gz"
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ffmpeg fping mplayer ogg subtitles vcd vorbis xine xvid"
 
 DEPEND=">=dev-perl/Event-ExecFlow-0.64
diff --git a/metadata/cache/app-admin/eselect-oodict-20100228 b/metadata/cache/app-admin/eselect-oodict-20100228
index b987ac0fca7b..cb7e2b3e42d0 100644
--- a/metadata/cache/app-admin/eselect-oodict-20100228
+++ b/metadata/cache/app-admin/eselect-oodict-20100228
@@ -6,7 +6,7 @@ mirror://gentoo/oodict.eselect-20100228.bz2
 http://www.gentoo.org/
 GPL-2
 Manages configuration of dictionaries for OpenOffice.Org.
-~amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 
 
 
diff --git a/metadata/cache/app-admin/rsyslog-5.8.6 b/metadata/cache/app-admin/rsyslog-5.8.6
index 42e45c976ec3..8d213efe0073 100644
--- a/metadata/cache/app-admin/rsyslog-5.8.6
+++ b/metadata/cache/app-admin/rsyslog-5.8.6
@@ -1,5 +1,5 @@
-dbi? ( dev-db/libdbi ) extras? ( net-libs/libnet ) gnutls? ( net-libs/gnutls ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) relp? ( >=dev-libs/librelp-0.1.3 ) snmp? ( net-analyzer/net-snmp ) zeromq? ( net-libs/zeromq ) zlib? ( sys-libs/zlib ) dev-util/pkgconfig !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
-dbi? ( dev-db/libdbi ) extras? ( net-libs/libnet ) gnutls? ( net-libs/gnutls ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) relp? ( >=dev-libs/librelp-0.1.3 ) snmp? ( net-analyzer/net-snmp ) zeromq? ( net-libs/zeromq ) zlib? ( sys-libs/zlib )
+dbi? ( dev-db/libdbi ) extras? ( net-libs/libnet ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) relp? ( >=dev-libs/librelp-0.1.3 ) snmp? ( net-analyzer/net-snmp ) ssl? ( net-libs/gnutls ) zeromq? ( net-libs/zeromq ) zlib? ( sys-libs/zlib ) dev-util/pkgconfig !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
+dbi? ( dev-db/libdbi ) extras? ( net-libs/libnet ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) relp? ( >=dev-libs/librelp-0.1.3 ) snmp? ( net-analyzer/net-snmp ) ssl? ( net-libs/gnutls ) zeromq? ( net-libs/zeromq ) zlib? ( sys-libs/zlib )
 0
 http://www.rsyslog.com/files/download/rsyslog/rsyslog-5.8.6.tar.gz zeromq? ( https://github.com/aggregateknowledge/rsyslog-zeromq/tarball/44b551abc29dd5b541884bd51b45b413855a93d8 -> rsyslog-zeromq.tar.gz )
 test
@@ -8,7 +8,7 @@ GPL-3 LGPL-3
 An enhanced multi-threaded syslogd with database support and more.
 ~amd64 ~arm ~hppa ~sparc ~x86
 autotools autotools-utils eutils libtool multilib portability systemd toolchain-funcs user
-dbi debug doc extras gnutls kerberos mysql oracle postgres relp snmp static-libs zeromq zlib
+dbi debug doc extras kerberos mysql oracle postgres relp snmp ssl static-libs zeromq zlib
 
 
 
diff --git a/metadata/cache/app-arch/sharutils-4.11.1 b/metadata/cache/app-arch/sharutils-4.11.1
index bd79f504da99..adea20379631 100644
--- a/metadata/cache/app-arch/sharutils-4.11.1
+++ b/metadata/cache/app-arch/sharutils-4.11.1
@@ -6,7 +6,7 @@ mirror://gnu/sharutils/sharutils-4.11.1.tar.bz2
 http://www.gnu.org/software/sharutils/
 GPL-3
 Tools to deal with shar archives
-~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 eutils multilib portability toolchain-funcs user
 nls
 
diff --git a/metadata/cache/app-editors/emacs-23.3-r2 b/metadata/cache/app-editors/emacs-23.3-r2
deleted file mode 100644
index 2d2aef7ee74e..000000000000
--- a/metadata/cache/app-editors/emacs-23.3-r2
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-libs/ncurses >=app-admin/eselect-emacs-1.2 net-libs/liblockfile hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4:0 ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff ) xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) !athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) ) ) ) dev-util/pkgconfig gzip-el? ( app-arch/gzip ) >=sys-devel/autoconf-2.61 sys-devel/libtool
-sys-libs/ncurses >=app-admin/eselect-emacs-1.2 net-libs/liblockfile hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4:0 ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff ) xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) !athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) ) ) ) !<app-editors/emacs-vcs-23.3 >=app-emacs/emacs-common-gentoo-1[X?]
-23
-mirror://gnu/emacs/emacs-23.3a.tar.bz2 mirror://gentoo/emacs-23.3-patches-2.tar.bz2
-
-http://www.gnu.org/software/emacs/
-GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2 Emacs-23-CEDET-grammars
-The extensible, customizable, self-documenting real-time display editor
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-autotools elisp-common eutils flag-o-matic libtool multilib portability toolchain-funcs user
-alsa aqua athena dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm
-aqua? ( !X )
-
-
-4
-
-compile configure install postinst postrm preinst prepare
-
-
-
-
-
diff --git a/metadata/cache/app-editors/emacs-23.3-r4 b/metadata/cache/app-editors/emacs-23.3-r4
index 099f896e48d8..e68642feb5a3 100644
--- a/metadata/cache/app-editors/emacs-23.3-r4
+++ b/metadata/cache/app-editors/emacs-23.3-r4
@@ -6,7 +6,7 @@ mirror://gnu/emacs/emacs-23.3a.tar.bz2 mirror://gentoo/emacs-23.3-patches-4.tar.
 http://www.gnu.org/software/emacs/
 GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2
 The extensible, customizable, self-documenting real-time display editor
-alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 autotools elisp-common eutils flag-o-matic libtool multilib portability toolchain-funcs user
 alsa aqua athena dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm
 aqua? ( !X )
diff --git a/metadata/cache/app-emacs/emacs-common-gentoo-1.2-r2 b/metadata/cache/app-emacs/emacs-common-gentoo-1.2-r2
deleted file mode 100644
index 091fc5b16811..000000000000
--- a/metadata/cache/app-emacs/emacs-common-gentoo-1.2-r2
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4
-
-0
-mirror://gentoo/emacs-common-gentoo-1.2.tar.gz
-
-http://www.gentoo.org/proj/en/lisp/emacs/
-GPL-3
-Common files needed by all GNU Emacs versions
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-elisp-common eutils fdo-mime gnome2-utils multilib portability toolchain-funcs user
-X emacs22icons
-
-virtual/emacs
-
-4
-
-config install postinst postrm setup
-
-
-
-
-
diff --git a/metadata/cache/app-emacs/emacs-common-gentoo-1.3 b/metadata/cache/app-emacs/emacs-common-gentoo-1.3
index 72bfbb8e497f..5264b68bddc0 100644
--- a/metadata/cache/app-emacs/emacs-common-gentoo-1.3
+++ b/metadata/cache/app-emacs/emacs-common-gentoo-1.3
@@ -6,7 +6,7 @@ mirror://gentoo/emacs-common-gentoo-1.3.tar.gz
 http://www.gentoo.org/proj/en/lisp/emacs/
 GPL-3
 Common files needed by all GNU Emacs versions
-alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 elisp-common eutils fdo-mime gnome2-utils multilib portability toolchain-funcs user
 X emacs22icons
 
diff --git a/metadata/cache/app-misc/tomboy-1.4.2-r1 b/metadata/cache/app-misc/tomboy-1.4.2-r1
index 1de4a5f0970a..024514d4478c 100644
--- a/metadata/cache/app-misc/tomboy-1.4.2-r1
+++ b/metadata/cache/app-misc/tomboy-1.4.2-r1
@@ -1,5 +1,5 @@
->=dev-lang/mono-2 >=dev-dotnet/gtk-sharp-2.12.6-r1:2 >=dev-dotnet/gconf-sharp-2.24.0:2 >=dev-dotnet/gnome-sharp-2.24.0:2 >=dev-dotnet/ndesk-dbus-0.4 >=dev-dotnet/ndesk-dbus-glib-0.3 >=dev-dotnet/mono-addins-0.3[gtk] >=x11-libs/gtk+-2.12.0:2 >=dev-libs/atk-1.2.4 >=gnome-base/gconf-2:2 >=app-text/gtkspell-2.0.9:2 applet? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) >=dev-dotnet/gnome-panel-sharp-2.24.0:2 ) eds? ( dev-libs/gmime:2.4[mono] ) galago? ( =dev-dotnet/galago-sharp-0.5* ) >=app-text/gnome-doc-utils-0.17.3 app-text/rarian dev-libs/libxml2:2[python] sys-devel/gettext dev-util/pkgconfig >=dev-util/intltool-0.35 >=sys-apps/sed-4
->=dev-lang/mono-2 >=dev-dotnet/gtk-sharp-2.12.6-r1:2 >=dev-dotnet/gconf-sharp-2.24.0:2 >=dev-dotnet/gnome-sharp-2.24.0:2 >=dev-dotnet/ndesk-dbus-0.4 >=dev-dotnet/ndesk-dbus-glib-0.3 >=dev-dotnet/mono-addins-0.3[gtk] >=x11-libs/gtk+-2.12.0:2 >=dev-libs/atk-1.2.4 >=gnome-base/gconf-2:2 >=app-text/gtkspell-2.0.9:2 applet? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) >=dev-dotnet/gnome-panel-sharp-2.24.0:2 ) eds? ( dev-libs/gmime:2.4[mono] ) galago? ( =dev-dotnet/galago-sharp-0.5* )
+>=dev-lang/mono-2 >=dev-dotnet/gtk-sharp-2.12.6-r1:2 >=dev-dotnet/gconf-sharp-2.24.0:2 >=dev-dotnet/gnome-sharp-2.24.0:2 >=dev-dotnet/ndesk-dbus-0.4 >=dev-dotnet/ndesk-dbus-glib-0.3 >=dev-dotnet/mono-addins-0.3[gtk] >=x11-libs/gtk+-2.12.0:2 >=dev-libs/atk-1.2.4 >=gnome-base/gconf-2:2 >=app-text/gtkspell-2.0.9:2 eds? ( dev-libs/gmime:2.4[mono] ) galago? ( =dev-dotnet/galago-sharp-0.5* ) >=app-text/gnome-doc-utils-0.17.3 app-text/rarian dev-libs/libxml2:2[python] sys-devel/gettext dev-util/pkgconfig >=dev-util/intltool-0.35 >=sys-apps/sed-4
+>=dev-lang/mono-2 >=dev-dotnet/gtk-sharp-2.12.6-r1:2 >=dev-dotnet/gconf-sharp-2.24.0:2 >=dev-dotnet/gnome-sharp-2.24.0:2 >=dev-dotnet/ndesk-dbus-0.4 >=dev-dotnet/ndesk-dbus-glib-0.3 >=dev-dotnet/mono-addins-0.3[gtk] >=x11-libs/gtk+-2.12.0:2 >=dev-libs/atk-1.2.4 >=gnome-base/gconf-2:2 >=app-text/gtkspell-2.0.9:2 eds? ( dev-libs/gmime:2.4[mono] ) galago? ( =dev-dotnet/galago-sharp-0.5* )
 0
 mirror://gnome/sources/tomboy/1.4/tomboy-1.4.2.tar.bz2
 
@@ -8,7 +8,7 @@ GPL-2
 Desktop note-taking application
 amd64 ppc x86
 eutils fdo-mime gnome.org gnome2 gnome2-utils libtool mono multilib portability toolchain-funcs user versionator
-+applet eds galago
+eds galago
 
 
 
diff --git a/metadata/cache/app-misc/tomboy-1.6.1 b/metadata/cache/app-misc/tomboy-1.6.1
index 613721cb1101..6685887d6df3 100644
--- a/metadata/cache/app-misc/tomboy-1.6.1
+++ b/metadata/cache/app-misc/tomboy-1.6.1
@@ -1,5 +1,5 @@
-app-text/gtkspell:2 dev-dotnet/gconf-sharp:2 dev-dotnet/gtk-sharp:2 dev-dotnet/mono-addins[gtk] dev-dotnet/ndesk-dbus dev-dotnet/ndesk-dbus-glib dev-lang/mono dev-libs/atk gnome-base/gconf:2 x11-libs/gtk+:2 applet? ( dev-dotnet/gnome-sharp:2 dev-dotnet/gnome-panel-sharp:2 gnome-base/gnome-panel[bonobo] ) eds? ( dev-libs/gmime:2.4[mono] ) galago? ( dev-dotnet/galago-sharp ) app-text/gnome-doc-utils app-text/rarian dev-util/intltool dev-util/pkgconfig sys-devel/gettext >=sys-apps/sed-4
-app-text/gtkspell:2 dev-dotnet/gconf-sharp:2 dev-dotnet/gtk-sharp:2 dev-dotnet/mono-addins[gtk] dev-dotnet/ndesk-dbus dev-dotnet/ndesk-dbus-glib dev-lang/mono dev-libs/atk gnome-base/gconf:2 x11-libs/gtk+:2 applet? ( dev-dotnet/gnome-sharp:2 dev-dotnet/gnome-panel-sharp:2 gnome-base/gnome-panel[bonobo] ) eds? ( dev-libs/gmime:2.4[mono] ) galago? ( dev-dotnet/galago-sharp )
+app-text/gtkspell:2 dev-dotnet/gconf-sharp:2 dev-dotnet/gtk-sharp:2 dev-dotnet/mono-addins[gtk] dev-dotnet/ndesk-dbus dev-dotnet/ndesk-dbus-glib dev-lang/mono dev-libs/atk gnome-base/gconf:2 x11-libs/gtk+:2 eds? ( dev-libs/gmime:2.4[mono] ) galago? ( dev-dotnet/galago-sharp ) app-text/gnome-doc-utils app-text/rarian dev-util/intltool dev-util/pkgconfig sys-devel/gettext >=sys-apps/sed-4
+app-text/gtkspell:2 dev-dotnet/gconf-sharp:2 dev-dotnet/gtk-sharp:2 dev-dotnet/mono-addins[gtk] dev-dotnet/ndesk-dbus dev-dotnet/ndesk-dbus-glib dev-lang/mono dev-libs/atk gnome-base/gconf:2 x11-libs/gtk+:2 eds? ( dev-libs/gmime:2.4[mono] ) galago? ( dev-dotnet/galago-sharp )
 0
 mirror://gnome/sources/tomboy/1.6/tomboy-1.6.1.tar.bz2
 
@@ -8,7 +8,7 @@ LGPL-2.1
 Desktop note-taking application
 amd64 ~ppc x86
 eutils fdo-mime gnome.org gnome2 gnome2-utils libtool mono multilib portability toolchain-funcs user versionator
-+applet eds galago
+eds galago
 
 
 
diff --git a/metadata/cache/app-misc/tomboy-1.8.3 b/metadata/cache/app-misc/tomboy-1.8.3
index ab7a5bebc96f..5833a8ea9391 100644
--- a/metadata/cache/app-misc/tomboy-1.8.3
+++ b/metadata/cache/app-misc/tomboy-1.8.3
@@ -1,5 +1,5 @@
-app-text/gtkspell:2 dev-dotnet/gconf-sharp:2 dev-dotnet/gtk-sharp:2 dev-dotnet/mono-addins[gtk] dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib dev-lang/mono dev-libs/atk gnome-base/gconf:2 x11-libs/gtk+:2 applet? ( dev-dotnet/gnome-sharp:2 dev-dotnet/gnome-panel-sharp:2 gnome-base/gnome-panel[bonobo] ) eds? ( dev-libs/gmime:2.4[mono] ) app-text/gnome-doc-utils app-text/rarian dev-util/intltool dev-util/pkgconfig sys-devel/gettext app-arch/xz-utils >=sys-apps/sed-4
-app-text/gtkspell:2 dev-dotnet/gconf-sharp:2 dev-dotnet/gtk-sharp:2 dev-dotnet/mono-addins[gtk] dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib dev-lang/mono dev-libs/atk gnome-base/gconf:2 x11-libs/gtk+:2 applet? ( dev-dotnet/gnome-sharp:2 dev-dotnet/gnome-panel-sharp:2 gnome-base/gnome-panel[bonobo] ) eds? ( dev-libs/gmime:2.4[mono] )
+app-text/gtkspell:2 dev-dotnet/gconf-sharp:2 dev-dotnet/gtk-sharp:2 dev-dotnet/mono-addins[gtk] dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib dev-lang/mono dev-libs/atk gnome-base/gconf:2 x11-libs/gtk+:2 eds? ( dev-libs/gmime:2.4[mono] ) app-text/gnome-doc-utils app-text/rarian dev-util/intltool dev-util/pkgconfig sys-devel/gettext app-arch/xz-utils >=sys-apps/sed-4
+app-text/gtkspell:2 dev-dotnet/gconf-sharp:2 dev-dotnet/gtk-sharp:2 dev-dotnet/mono-addins[gtk] dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib dev-lang/mono dev-libs/atk gnome-base/gconf:2 x11-libs/gtk+:2 eds? ( dev-libs/gmime:2.4[mono] )
 0
 mirror://gnome/sources/tomboy/1.8/tomboy-1.8.3.tar.xz
 
@@ -8,7 +8,7 @@ LGPL-2.1
 Desktop note-taking application
 ~amd64 ~ppc ~x86
 eutils fdo-mime gnome.org gnome2 gnome2-utils libtool mono multilib portability toolchain-funcs user versionator
-+applet eds test
+eds test
 
 
 
diff --git a/metadata/cache/app-office/imposter-0.3 b/metadata/cache/app-office/imposter-0.3
index e1b478894c45..f46ce0079cb9 100644
--- a/metadata/cache/app-office/imposter-0.3
+++ b/metadata/cache/app-office/imposter-0.3
@@ -6,7 +6,7 @@ mirror://sourceforge/imposter/imposter-0.3.tar.gz
 http://imposter.sourceforge.net
 GPL-2
 Imposter is a standalone viewer for the presentations created by OpenOffice.org Impress software
-~amd64 ppc x86
+amd64 ppc x86
 eutils multilib portability toolchain-funcs user
 iksemel nls
 
diff --git a/metadata/cache/app-office/libreoffice-3.4.5.2 b/metadata/cache/app-office/libreoffice-3.4.5.2
index 377434bb91de..6d34e5255786 100644
--- a/metadata/cache/app-office/libreoffice-3.4.5.2
+++ b/metadata/cache/app-office/libreoffice-3.4.5.2
@@ -6,7 +6,7 @@ test
 http://www.libreoffice.org
 LGPL-3
 LibreOffice, a full office productivity suite.
-~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 autotools base bash-completion-r1 check-reqs eutils fdo-mime flag-o-matic gnome2-utils java-pkg-opt-2 java-utils-2 kde4-base kde4-functions libtool multilib nsplugins pax-utils portability prefix python toolchain-funcs user versionator virtualx
 binfilter +branding custom-cflags dbus debug eds gnome graphite gstreamer gtk jemalloc kde mysql nsplugin odk opengl pdfimport python test +vba webdav elibc_FreeBSD java aqua kde kdeenablefinal
 gnome? ( gtk ) nsplugin? ( gtk ) eds? ( gnome )
diff --git a/metadata/cache/app-office/libreoffice-l10n-3.4.5-r1 b/metadata/cache/app-office/libreoffice-l10n-3.4.5-r1
index 2a0e369e0bd1..e9d7485327ff 100644
--- a/metadata/cache/app-office/libreoffice-l10n-3.4.5-r1
+++ b/metadata/cache/app-office/libreoffice-l10n-3.4.5-r1
@@ -6,7 +6,7 @@ strip
 http://www.libreoffice.org
 LGPL-3
 Translations for the Libreoffice suite.
-~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 eutils multilib office-ext portability rpm toolchain-funcs user versionator
 offlinehelp templates linguas_bg linguas_bn linguas_bo linguas_bs linguas_ca_XV linguas_ca linguas_cs linguas_da linguas_de linguas_dz linguas_el linguas_en_GB linguas_en linguas_en_ZA linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_km linguas_ko linguas_mk linguas_nb linguas_ne linguas_nl linguas_nn linguas_om linguas_pl linguas_pt_BR linguas_pt linguas_ru linguas_si linguas_sk linguas_sl linguas_sq linguas_sv linguas_tg linguas_tr linguas_ug linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW linguas_af linguas_ar linguas_as linguas_ast linguas_be linguas_br linguas_brx linguas_cy linguas_dgo linguas_fa linguas_ga linguas_gd linguas_kk linguas_kn linguas_kok linguas_ks linguas_ku linguas_lo linguas_lt linguas_lv linguas_mai linguas_ml linguas_mn linguas_mni linguas_mr linguas_my linguas_nr linguas_nso linguas_oc linguas_or linguas_pa_IN linguas_ro linguas_rw linguas_sa_IN linguas_sat linguas_sd linguas_sh linguas_sr linguas_ss linguas_st linguas_sw_TZ linguas_ta linguas_te linguas_th linguas_tn linguas_ts linguas_uz linguas_ve linguas_xh linguas_zu
 
diff --git a/metadata/cache/app-portage/eix-0.23.6 b/metadata/cache/app-portage/eix-0.23.6
new file mode 100644
index 000000000000..fadd8f701f1f
--- /dev/null
+++ b/metadata/cache/app-portage/eix-0.23.6
@@ -0,0 +1,22 @@
+sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) zsh-completion? ( !!<app-shells/zsh-completion-20091203-r1 ) app-arch/xz-utils nls? ( sys-devel/gettext )
+sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) zsh-completion? ( !!<app-shells/zsh-completion-20091203-r1 )
+0
+mirror://berlios/eix/eix-0.23.6.tar.xz
+
+http://eix.berlios.de
+GPL-2
+Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+bash-completion-r1 multilib toolchain-funcs
+debug doc nls optimization security strong-optimization sqlite tools zsh-completion
+
+
+
+4
+
+configure install
+
+
+
+
+
diff --git a/metadata/cache/app-portage/esearch-1.0-r2 b/metadata/cache/app-portage/esearch-1.0-r2
index 067404407159..2c384af4e5ab 100644
--- a/metadata/cache/app-portage/esearch-1.0-r2
+++ b/metadata/cache/app-portage/esearch-1.0-r2
@@ -6,7 +6,7 @@ mirror://github/fuzzyray/esearch/esearch-1.0.tar.gz
 http://david-peter.de/esearch.html
 GPL-2
 Replacement for 'emerge --search' with search-index
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 base distutils eutils multilib portability python toolchain-funcs user
 linguas_fr linguas_it
 
diff --git a/metadata/cache/app-text/dvipsk-5.991_p20110705-r1 b/metadata/cache/app-text/dvipsk-5.991_p20110705-r1
index 52dd13131586..b445072547f4 100644
--- a/metadata/cache/app-text/dvipsk-5.991_p20110705-r1
+++ b/metadata/cache/app-text/dvipsk-5.991_p20110705-r1
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-20110705-source.tar.xz mirror://gentoo/texlive-core-upst
 http://tug.org/texlive/
 GPL-2
 DVI-to-PostScript translator
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 eutils multilib portability texlive-common toolchain-funcs user
 doc source
 
diff --git a/metadata/cache/app-text/lcdf-typetools-2.91 b/metadata/cache/app-text/lcdf-typetools-2.91
index 2a8bf98bf13b..0980b6ea3a9d 100644
--- a/metadata/cache/app-text/lcdf-typetools-2.91
+++ b/metadata/cache/app-text/lcdf-typetools-2.91
@@ -6,7 +6,7 @@ http://www.lcdf.org/type/lcdf-typetools-2.91.tar.gz
 http://www.lcdf.org/type/#typetools
 GPL-2
 Font utilities for eg manipulating OTF
-~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 
 +kpathsea
 
diff --git a/metadata/cache/app-text/libexttextcat-3.2.0 b/metadata/cache/app-text/libexttextcat-3.2.0
index 30a0f80a9e1a..78aa90166e3d 100644
--- a/metadata/cache/app-text/libexttextcat-3.2.0
+++ b/metadata/cache/app-text/libexttextcat-3.2.0
@@ -6,7 +6,7 @@ http://dev-www.libreoffice.org/src/libexttextcat/libexttextcat-3.2.0.tar.xz
 http://software.wise-guys.nl/libtextcat/
 BSD-2
 Library implementing N-gram-based text categorization
-~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 
 static-libs
 
diff --git a/metadata/cache/app-text/mythes-1.2.2 b/metadata/cache/app-text/mythes-1.2.2
index 8edb26533d61..3b7d04fee42d 100644
--- a/metadata/cache/app-text/mythes-1.2.2
+++ b/metadata/cache/app-text/mythes-1.2.2
@@ -6,7 +6,7 @@ mirror://sourceforge/hunspell/MyThes/1.2.2/mythes-1.2.2.tar.gz
 http://hunspell.sourceforge.net/
 MIT
 A simple thesaurus for Libreoffice
-~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 
 static-libs
 
diff --git a/metadata/cache/app-text/ps2pkm-1.5_p20110705 b/metadata/cache/app-text/ps2pkm-1.5_p20110705
index 657c3e35930f..3a97184dca5b 100644
--- a/metadata/cache/app-text/ps2pkm-1.5_p20110705
+++ b/metadata/cache/app-text/ps2pkm-1.5_p20110705
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-20110705-source.tar.xz
 http://tug.org/texlive/
 MIT
 Tool that converts a PostScript type1 font into a corresponding TeX PK font
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 
 
 
diff --git a/metadata/cache/app-text/texlive-2011 b/metadata/cache/app-text/texlive-2011
index 4ef746a5d2d7..b7c724ac62f0 100644
--- a/metadata/cache/app-text/texlive-2011
+++ b/metadata/cache/app-text/texlive-2011
@@ -6,7 +6,7 @@
 http://tug.org/texlive/
 GPL-2
 A complete TeX distribution
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 
 cjk context detex doc dvi2tty dvipdfm extra games graphics humanities jadetex luatex music omega pdfannotextractor png pstricks publishers science tex4ht truetype xetex xindy xml X linguas_af linguas_ar linguas_as linguas_bg linguas_bn linguas_bo linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hsb linguas_hu linguas_hy linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_ko linguas_kn linguas_la linguas_lo linguas_lt linguas_lv linguas_ml linguas_mn linguas_mr linguas_nb linguas_nl linguas_nn linguas_no linguas_or linguas_pa linguas_pl linguas_pt linguas_ro linguas_ru linguas_sa_IN linguas_sk linguas_sl linguas_sr linguas_sv linguas_ta linguas_te linguas_th linguas_tk linguas_tr linguas_uk linguas_vi linguas_zh
 
diff --git a/metadata/cache/app-text/texlive-core-2011-r5 b/metadata/cache/app-text/texlive-core-2011-r5
index f1844f60d396..bef594399e2c 100644
--- a/metadata/cache/app-text/texlive-core-2011-r5
+++ b/metadata/cache/app-text/texlive-core-2011-r5
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-20110705-source.tar.xz mirror://gentoo/texlive-core-patc
 http://tug.org/texlive/
 GPL-2 LPPL-1.3c TeX
 A complete TeX distribution
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 eutils flag-o-matic libtool multilib portability texlive-common toolchain-funcs user
 cjk X doc source tk xetex
 
diff --git a/metadata/cache/dev-embedded/srecord-1.42 b/metadata/cache/dev-embedded/srecord-1.42
deleted file mode 100644
index 06a889422d56..000000000000
--- a/metadata/cache/dev-embedded/srecord-1.42
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/boost test? ( app-arch/sharutils )
-
-0
-mirror://sourceforge/srecord/srecord-1.42.tar.gz
-
-http://srecord.sourceforge.net/
-GPL-3
-A collection of powerful tools for manipulating EPROM load files.
-~amd64 ~sparc ~x86
-eutils multilib portability toolchain-funcs user
-test
-
-
-
-
-
-install test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-embedded/u-boot-tools-2010.06 b/metadata/cache/dev-embedded/u-boot-tools-2010.06
deleted file mode 100644
index f2b168826f85..000000000000
--- a/metadata/cache/dev-embedded/u-boot-tools-2010.06
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-0
-ftp://ftp.denx.de/pub/u-boot/u-boot-2010.06.tar.bz2
-
-http://www.denx.de/wiki/U-Boot/WebHome
-GPL-2
-utilities for working with Das U-Boot
-amd64 arm x86
-multilib toolchain-funcs
-
-
-
-
-
-
-compile install
-
-
-
-
-
diff --git a/metadata/cache/dev-embedded/u-boot-tools-2010.12 b/metadata/cache/dev-embedded/u-boot-tools-2010.12
deleted file mode 100644
index 85b3dc98c191..000000000000
--- a/metadata/cache/dev-embedded/u-boot-tools-2010.12
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-0
-ftp://ftp.denx.de/pub/u-boot/u-boot-2010.12.tar.bz2
-
-http://www.denx.de/wiki/U-Boot/WebHome
-GPL-2
-utilities for working with Das U-Boot
-~amd64 ~arm ~x86
-multilib toolchain-funcs
-
-
-
-
-4
-
-compile install
-
-
-
-
-
diff --git a/metadata/cache/dev-lang/swi-prolog-5.10.5-r1 b/metadata/cache/dev-lang/swi-prolog-5.10.5-r1
index 3dbf50d6db38..aba41bec3236 100644
--- a/metadata/cache/dev-lang/swi-prolog-5.10.5-r1
+++ b/metadata/cache/dev-lang/swi-prolog-5.10.5-r1
@@ -1,7 +1,7 @@
 sys-libs/ncurses zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) X? ( x11-proto/xproto ) java? ( test? ( =dev-java/junit-3.8* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
 sys-libs/ncurses zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
-http://www.swi-prolog.org/download/stable/src/pl-5.10.5.tar.gz mirror://gentoo/swi-prolog-5.10.5-gentoo-patchset-4.tar.gz
+http://www.swi-prolog.org/download/stable/src/pl-5.10.5.tar.gz mirror://gentoo/swi-prolog-5.10.5-gentoo-patchset-5.tar.gz
 
 http://www.swi-prolog.org/
 LGPL-2.1
diff --git a/metadata/cache/dev-libs/hyphen-2.8.3 b/metadata/cache/dev-libs/hyphen-2.8.3
index b19516b22373..2b1c286107ca 100644
--- a/metadata/cache/dev-libs/hyphen-2.8.3
+++ b/metadata/cache/dev-libs/hyphen-2.8.3
@@ -6,7 +6,7 @@ mirror://sourceforge/hunspell/hyphen-2.8.3.tar.gz
 http://hunspell.sf.net
 GPL-2 LGPL-2.1 MPL-1.1
 ALTLinux hyphenation library
-~amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 
 static-libs
 
diff --git a/metadata/cache/dev-libs/jemalloc-2.2.5 b/metadata/cache/dev-libs/jemalloc-2.2.5
index a244150ed61f..d6a99d4c4759 100644
--- a/metadata/cache/dev-libs/jemalloc-2.2.5
+++ b/metadata/cache/dev-libs/jemalloc-2.2.5
@@ -6,7 +6,7 @@ http://www.canonware.com/download/jemalloc/jemalloc-2.2.5.tar.bz2
 http://www.canonware.com/jemalloc/
 BSD
 Jemalloc is a general-purpose scalable concurrent allocator
-~amd64 ~ppc ~ppc64 ~x86
+amd64 ~ppc ~ppc64 ~x86
 autotools eutils libtool multilib portability toolchain-funcs user
 debug stats
 
diff --git a/metadata/cache/dev-libs/libexplain-0.42 b/metadata/cache/dev-libs/libexplain-0.42
deleted file mode 100644
index 29d345211c9e..000000000000
--- a/metadata/cache/dev-libs/libexplain-0.42
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-kernel/linux-headers-2.6.35 sys-libs/libcap >=sys-libs/glibc-2.11
->=sys-kernel/linux-headers-2.6.35 sys-libs/libcap >=sys-libs/glibc-2.11
-0
-http://libexplain.sourceforge.net/libexplain-0.42.D001.tar.gz
-
-http://libexplain.sourceforge.net/
-GPL-3
-Library which may be used to explain Unix and Linux system call errors
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-
-
-
-
-
-4
-
-install prepare
-
-
-
-
-
diff --git a/metadata/cache/dev-libs/libexplain-0.45 b/metadata/cache/dev-libs/libexplain-0.45
deleted file mode 100644
index 8d7493bc3763..000000000000
--- a/metadata/cache/dev-libs/libexplain-0.45
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-kernel/linux-headers-2.6.35 sys-libs/libcap >=sys-libs/glibc-2.11 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
->=sys-kernel/linux-headers-2.6.35 sys-libs/libcap >=sys-libs/glibc-2.11
-0
-http://libexplain.sourceforge.net/libexplain-0.45.D001.tar.gz
-
-http://libexplain.sourceforge.net/
-GPL-3
-Library which may be used to explain Unix and Linux system call errors
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-autotools eutils libtool multilib portability toolchain-funcs user
-static-libs
-
-
-
-4
-
-configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/dev-libs/libexplain-0.46 b/metadata/cache/dev-libs/libexplain-0.46
deleted file mode 100644
index 66a79efac5d8..000000000000
--- a/metadata/cache/dev-libs/libexplain-0.46
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-kernel/linux-headers-2.6.35 sys-libs/libcap >=sys-libs/glibc-2.11 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
->=sys-kernel/linux-headers-2.6.35 sys-libs/libcap >=sys-libs/glibc-2.11
-0
-http://libexplain.sourceforge.net/libexplain-0.46.D001.tar.gz
-
-http://libexplain.sourceforge.net/
-GPL-3
-Library which may be used to explain Unix and Linux system call errors
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-autotools eutils libtool multilib portability toolchain-funcs user
-static-libs
-
-
-
-4
-
-configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/dev-libs/libexplain-0.47 b/metadata/cache/dev-libs/libexplain-0.47
deleted file mode 100644
index 00aadfd1b156..000000000000
--- a/metadata/cache/dev-libs/libexplain-0.47
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-kernel/linux-headers-2.6.35 sys-libs/libcap >=sys-libs/glibc-2.11 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
->=sys-kernel/linux-headers-2.6.35 sys-libs/libcap >=sys-libs/glibc-2.11
-0
-http://libexplain.sourceforge.net/libexplain-0.47.D001.tar.gz http://dev.gentoo.org/~radhermit/distfiles/libexplain-0.47-parallel-make.patch.gz
-
-http://libexplain.sourceforge.net/
-GPL-3
-Library which may be used to explain Unix and Linux system call errors
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-autotools eutils libtool multilib portability toolchain-funcs user
-static-libs
-
-
-
-4
-
-configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/dev-libs/libexplain-0.40 b/metadata/cache/dev-libs/libexplain-0.50
similarity index 61%
rename from metadata/cache/dev-libs/libexplain-0.40
rename to metadata/cache/dev-libs/libexplain-0.50
index 1712cf054c0f..cad7fd6350a2 100644
--- a/metadata/cache/dev-libs/libexplain-0.40
+++ b/metadata/cache/dev-libs/libexplain-0.50
@@ -1,20 +1,20 @@
 >=sys-kernel/linux-headers-2.6.35 sys-libs/libcap >=sys-libs/glibc-2.11
 >=sys-kernel/linux-headers-2.6.35 sys-libs/libcap >=sys-libs/glibc-2.11
 0
-mirror://sourceforge/project/libexplain/0.40/libexplain-0.40.D001.tar.gz
+http://libexplain.sourceforge.net/libexplain-0.50.D001.tar.gz
 
 http://libexplain.sourceforge.net/
 GPL-3
 Library which may be used to explain Unix and Linux system call errors
 ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-
-
+autotools autotools-utils eutils libtool multilib portability toolchain-funcs user
+static-libs
 
 
 
 4
 
-install prepare
+compile configure install prepare test
 
 
 
diff --git a/metadata/cache/dev-libs/libxml2-2.7.8-r4 b/metadata/cache/dev-libs/libxml2-2.7.8-r4
index bf4ed3c05f91..2e4e28b88515 100644
--- a/metadata/cache/dev-libs/libxml2-2.7.8-r4
+++ b/metadata/cache/dev-libs/libxml2-2.7.8-r4
@@ -6,7 +6,7 @@ ftp://xmlsoft.org/libxml2/libxml2-2.7.8.tar.gz test? ( http://www.w3.org/XML/200
 http://www.xmlsoft.org/
 MIT
 Version 2 of the library to manipulate XML files
-alpha amd64 arm ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools eutils flag-o-matic libtool multilib portability prefix python toolchain-funcs user
 debug doc examples icu ipv6 python readline static-libs test
 
diff --git a/metadata/cache/dev-libs/ppl-0.11.2-r1 b/metadata/cache/dev-libs/ppl-0.11.2-r1
index 01b22fc495f4..c874656731f9 100644
--- a/metadata/cache/dev-libs/ppl-0.11.2-r1
+++ b/metadata/cache/dev-libs/ppl-0.11.2-r1
@@ -6,7 +6,7 @@ http://www.cs.unipr.it/ppl/Download/ftp/releases/0.11.2/ppl-0.11.2.tar.bz2
 http://www.cs.unipr.it/ppl/
 GPL-3
 The Parma Polyhedra Library provides numerical abstractions for analysis of complex systems
-~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris
 eutils multilib portability toolchain-funcs user
 doc lpsol pch static-libs test watchdog
 
diff --git a/metadata/cache/dev-libs/ptexenc-1.2.0_p20110705 b/metadata/cache/dev-libs/ptexenc-1.2.0_p20110705
index ea2d9cde1523..70fbb05c394e 100644
--- a/metadata/cache/dev-libs/ptexenc-1.2.0_p20110705
+++ b/metadata/cache/dev-libs/ptexenc-1.2.0_p20110705
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-20110705-source.tar.xz
 http://tutimura.ath.cx/ptexlive/?ptexenc
 BSD
 Library for Japanese pTeX providing a better way of handling character encodings
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos
 
 iconv static-libs
 
diff --git a/metadata/cache/dev-perl/XML-RSS-1.490.0 b/metadata/cache/dev-perl/XML-RSS-1.490.0
index 021751a8f89e..e8f486eb5215 100644
--- a/metadata/cache/dev-perl/XML-RSS-1.490.0
+++ b/metadata/cache/dev-perl/XML-RSS-1.490.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/S/SH/SHLOMIF/XML-RSS-1.49.tar.gz
 http://perl-rss.sourceforge.net/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 a basic framework for creating and maintaining RSS files
-alpha ~amd64 ~arm ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-solaris
+alpha amd64 ~arm ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-solaris
 base eutils multilib perl-module portability toolchain-funcs user
 test
 
diff --git a/metadata/cache/dev-php/PEAR-Cache-1.5.6 b/metadata/cache/dev-php/PEAR-Cache-1.5.6
index c4efabaf3651..224485623b1c 100644
--- a/metadata/cache/dev-php/PEAR-Cache-1.5.6
+++ b/metadata/cache/dev-php/PEAR-Cache-1.5.6
@@ -6,7 +6,7 @@ http://pear.php.net/get/Cache-1.5.6.tgz
 http://pear.php.net/Cache
 PHP-2.02
 Framework for caching of arbitrary data
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 multilib php-pear-r1 toolchain-funcs
 
 
diff --git a/metadata/cache/dev-php/PEAR-Cache_Lite-1.7.12 b/metadata/cache/dev-php/PEAR-Cache_Lite-1.7.12
index ac2e8f53e7ee..7b85e5ff2c72 100644
--- a/metadata/cache/dev-php/PEAR-Cache_Lite-1.7.12
+++ b/metadata/cache/dev-php/PEAR-Cache_Lite-1.7.12
@@ -6,7 +6,7 @@ http://pear.php.net/get/Cache_Lite-1.7.12.tgz
 http://pear.php.net/Cache_Lite
 LGPL-2.1
 Fast and safe little cache system.
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 multilib php-pear-r1 toolchain-funcs
 
 
diff --git a/metadata/cache/dev-php/PEAR-File-1.4.0 b/metadata/cache/dev-php/PEAR-File-1.4.0
index 4c523f2f5331..8eebf407e3ef 100644
--- a/metadata/cache/dev-php/PEAR-File-1.4.0
+++ b/metadata/cache/dev-php/PEAR-File-1.4.0
@@ -6,7 +6,7 @@ http://pear.php.net/get/File-1.4.0.tgz
 http://pear.php.net/File
 PHP-3
 Common file and directory routines
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 multilib php-pear-r1 toolchain-funcs
 
 
diff --git a/metadata/cache/dev-php/PEAR-HTML_Template_Flexy-1.3.12 b/metadata/cache/dev-php/PEAR-HTML_Template_Flexy-1.3.12
index e76d473bef2d..caf2ae6c6969 100644
--- a/metadata/cache/dev-php/PEAR-HTML_Template_Flexy-1.3.12
+++ b/metadata/cache/dev-php/PEAR-HTML_Template_Flexy-1.3.12
@@ -6,7 +6,7 @@ http://pear.php.net/get/HTML_Template_Flexy-1.3.12.tgz
 http://pear.php.net/HTML_Template_Flexy
 PHP-2.02
 An extremely powerful Tokenizer driven Template engine
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 multilib php-pear-r1 toolchain-funcs
 minimal
 
diff --git a/metadata/cache/dev-php/PEAR-HTML_TreeMenu-1.2.2 b/metadata/cache/dev-php/PEAR-HTML_TreeMenu-1.2.2
index 189d95f3c37a..fd6d1456d666 100644
--- a/metadata/cache/dev-php/PEAR-HTML_TreeMenu-1.2.2
+++ b/metadata/cache/dev-php/PEAR-HTML_TreeMenu-1.2.2
@@ -6,7 +6,7 @@ http://pear.php.net/get/HTML_TreeMenu-1.2.2.tgz
 http://pear.php.net/HTML_TreeMenu
 BSD
 Provides an API to create a HTML tree.
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 multilib php-pear-r1 toolchain-funcs
 
 
diff --git a/metadata/cache/dev-php/PEAR-Image_Canvas-0.3.3 b/metadata/cache/dev-php/PEAR-Image_Canvas-0.3.3
index db8355fe3cae..b33ba2c63e22 100644
--- a/metadata/cache/dev-php/PEAR-Image_Canvas-0.3.3
+++ b/metadata/cache/dev-php/PEAR-Image_Canvas-0.3.3
@@ -6,7 +6,7 @@ http://pear.php.net/get/Image_Canvas-0.3.3.tgz
 http://pear.php.net/Image_Canvas
 PHP-2.02 || ( LGPL-2.1 LGPL-3 )
 Provides a common interface to image drawing, making image source code independent on the library used.
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 depend.php eutils multilib php-pear-r1 phpconfutils portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-php/PEAR-Log-1.12.7 b/metadata/cache/dev-php/PEAR-Log-1.12.7
index 67a165750d4f..184cf1ce4470 100644
--- a/metadata/cache/dev-php/PEAR-Log-1.12.7
+++ b/metadata/cache/dev-php/PEAR-Log-1.12.7
@@ -6,7 +6,7 @@ http://pear.php.net/get/Log-1.12.7.tgz
 http://pear.php.net/Log
 PHP-3.01
 The Log framework provides an abstracted logging system.@
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 depend.php eutils multilib php-pear-r1 phpconfutils portability toolchain-funcs user
 minimal
 
diff --git a/metadata/cache/dev-php/PEAR-Net_DIME-1.0.2 b/metadata/cache/dev-php/PEAR-Net_DIME-1.0.2
index 85ca5b643a6f..aca61850a0d8 100644
--- a/metadata/cache/dev-php/PEAR-Net_DIME-1.0.2
+++ b/metadata/cache/dev-php/PEAR-Net_DIME-1.0.2
@@ -6,7 +6,7 @@ http://pear.php.net/get/Net_DIME-1.0.2.tgz
 http://pear.php.net/Net_DIME
 PHP-2.02
 The PEAR::Net_DIME class implements DIME encoding
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 multilib php-pear-r1 toolchain-funcs
 
 
diff --git a/metadata/cache/dev-php/PEAR-Net_FTP-1.3.7-r1 b/metadata/cache/dev-php/PEAR-Net_FTP-1.3.7-r1
index f3c11aa81419..e436c48763ae 100644
--- a/metadata/cache/dev-php/PEAR-Net_FTP-1.3.7-r1
+++ b/metadata/cache/dev-php/PEAR-Net_FTP-1.3.7-r1
@@ -6,7 +6,7 @@ http://pear.php.net/get/Net_FTP-1.3.7.tgz
 http://pear.php.net/Net_FTP
 PHP-3
 Provides an OO interface to the PHP FTP functions
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 multilib php-pear-r1 toolchain-funcs
 
 
diff --git a/metadata/cache/dev-php/PEAR-Net_UserAgent_Detect-2.5.2 b/metadata/cache/dev-php/PEAR-Net_UserAgent_Detect-2.5.2
index 4fafc9941626..9c53a7532db1 100644
--- a/metadata/cache/dev-php/PEAR-Net_UserAgent_Detect-2.5.2
+++ b/metadata/cache/dev-php/PEAR-Net_UserAgent_Detect-2.5.2
@@ -6,7 +6,7 @@ http://pear.php.net/get/Net_UserAgent_Detect-2.5.2.tgz
 http://pear.php.net/Net_UserAgent_Detect
 PHP-2.02
 Net_UserAgent_Detect determines the Web browser, version, and platform from an HTTP user agent string.
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 multilib php-pear-r1 toolchain-funcs
 
 
diff --git a/metadata/cache/dev-php/PEAR-Numbers_Words-0.16.2 b/metadata/cache/dev-php/PEAR-Numbers_Words-0.16.2
index bb2f466671af..03f76d1ab17e 100644
--- a/metadata/cache/dev-php/PEAR-Numbers_Words-0.16.2
+++ b/metadata/cache/dev-php/PEAR-Numbers_Words-0.16.2
@@ -6,7 +6,7 @@ http://pear.php.net/get/Numbers_Words-0.16.2.tgz
 http://pear.php.net/Numbers_Words
 PHP-3
 Provides methods for spelling numerals in words.
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 multilib php-pear-r1 toolchain-funcs
 
 
diff --git a/metadata/cache/dev-ruby/barby-0.5.0-r1 b/metadata/cache/dev-ruby/barby-0.5.0-r1
new file mode 100644
index 000000000000..8d2c5d4a001f
--- /dev/null
+++ b/metadata/cache/dev-ruby/barby-0.5.0-r1
@@ -0,0 +1,22 @@
+test? ( ruby_targets_ruby18? ( datamatrix? ( dev-ruby/semacode[ruby_targets_ruby18] ) pdf-writer? ( dev-ruby/pdf-writer[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( datamatrix? ( dev-ruby/semacode[ruby_targets_ree18] ) pdf-writer? ( dev-ruby/pdf-writer[ruby_targets_ree18] ) ) ) test? ( ruby_targets_ruby18? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby18] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ree18] ) cairo? ( dev-ruby/rcairo[ruby_targets_ree18] ) ) ) test? ( ruby_targets_ruby18? ( prawn? ( dev-ruby/prawn[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( prawn? ( dev-ruby/prawn[ruby_targets_ree18] ) ) ruby_targets_jruby? ( prawn? ( dev-ruby/prawn[ruby_targets_jruby] ) ) ) test? ( ruby_targets_ruby18? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby18] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ree18] ) png? ( dev-ruby/chunky_png[ruby_targets_ree18] ) ) ruby_targets_jruby? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_jruby] ) png? ( dev-ruby/chunky_png[ruby_targets_jruby] ) ) ) ruby_targets_ruby18? ( test? ( dev-ruby/minitest[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/minitest[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/minitest[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+ruby_targets_ruby18? ( datamatrix? ( dev-ruby/semacode[ruby_targets_ruby18] ) pdf-writer? ( dev-ruby/pdf-writer[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( datamatrix? ( dev-ruby/semacode[ruby_targets_ree18] ) pdf-writer? ( dev-ruby/pdf-writer[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby18] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ree18] ) cairo? ( dev-ruby/rcairo[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( prawn? ( dev-ruby/prawn[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( prawn? ( dev-ruby/prawn[ruby_targets_ree18] ) ) ruby_targets_jruby? ( prawn? ( dev-ruby/prawn[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby18] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ree18] ) png? ( dev-ruby/chunky_png[ruby_targets_ree18] ) ) ruby_targets_jruby? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_jruby] ) png? ( dev-ruby/chunky_png[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+0
+https://github.com/toretore/barby/tarball/v0.5.0 -> barby-0.5.0.tgz
+prawn? ( test )
+http://toretore.eu/barby/
+MIT
+Ruby barcode generator that doesn't rely on 3rd party libraries.
+~amd64
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
+test datamatrix pdf-writer qrcode rmagick prawn png cairo test test test test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby doc doc test test
+|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby )
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/json-1.5.4 b/metadata/cache/dev-ruby/json-1.5.4
index 86932a55bc4d..b01c4e915393 100644
--- a/metadata/cache/dev-ruby/json-1.5.4
+++ b/metadata/cache/dev-ruby/json-1.5.4
@@ -6,7 +6,7 @@ mirror://rubygems/json-1.5.4.gem
 http://json.rubyforge.org/
 || ( Ruby GPL-2 )
 A JSON implementation as a Ruby extension.
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
 elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby doc doc test test
 
diff --git a/metadata/cache/dev-ruby/sary-ruby-1.2.0-r2 b/metadata/cache/dev-ruby/sary-ruby-1.2.0-r2
index 4765f645b602..6323147fed9f 100644
--- a/metadata/cache/dev-ruby/sary-ruby-1.2.0-r2
+++ b/metadata/cache/dev-ruby/sary-ruby-1.2.0-r2
@@ -6,7 +6,7 @@ http://sary.sourceforge.net/sary-ruby-1.2.0.tar.gz
 http://sary.sourceforge.net/
 LGPL-2.1
 Ruby Binding of Sary
-alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 eutils java-utils-2 multilib portability ruby-ng toolchain-funcs user versionator
 elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18
 
diff --git a/metadata/cache/dev-tex/bibtexu-3.71_p20110705 b/metadata/cache/dev-tex/bibtexu-3.71_p20110705
index 7f4ec731fce0..16f447e5bfaa 100644
--- a/metadata/cache/dev-tex/bibtexu-3.71_p20110705
+++ b/metadata/cache/dev-tex/bibtexu-3.71_p20110705
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-20110705-source.tar.xz
 http://tug.org/texlive/
 GPL-2
 8-bit Implementation of BibTeX 0.99 with a Very Large Capacity
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 
 
 
diff --git a/metadata/cache/dev-tex/mh-20111011 b/metadata/cache/dev-tex/mh-20111011
index c03f33e03e4b..79deef37e5d7 100644
--- a/metadata/cache/dev-tex/mh-20111011
+++ b/metadata/cache/dev-tex/mh-20111011
@@ -6,7 +6,7 @@ mirror://gentoo/mh-20111011.zip
 http://www.ctan.org/tex-archive/macros/latex/contrib/mh/
 LPPL-1.3
 Additional LaTeX math tools.
-~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 base eutils latex-package multilib portability toolchain-funcs user
 doc
 
diff --git a/metadata/cache/dev-texlive/texlive-basic-2011-r1 b/metadata/cache/dev-texlive/texlive-basic-2011-r1
index 590693d1965d..71cb61185e8b 100644
--- a/metadata/cache/dev-texlive/texlive-basic-2011-r1
+++ b/metadata/cache/dev-texlive/texlive-basic-2011-r1
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-amsfonts-2011.tar.xz mirror://gentoo/texlive-modu
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 GPL-2 LPPL-1.3 OFL TeX
 TeXLive Essential programs and files
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-bibtexextra-2011 b/metadata/cache/dev-texlive/texlive-bibtexextra-2011
index 70d45ef087ea..f09c3d1956fe 100644
--- a/metadata/cache/dev-texlive/texlive-bibtexextra-2011
+++ b/metadata/cache/dev-texlive/texlive-bibtexextra-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-aichej-2011.tar.xz mirror://gentoo/texlive-module
 http://www.tug.org/texlive/
 GPL-2 Artistic as-is GPL-1 LPPL-1.3 public-domain
 TeXLive Extra BibTeX styles
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-context-2011 b/metadata/cache/dev-texlive/texlive-context-2011
index 802452567dba..055d918cb564 100644
--- a/metadata/cache/dev-texlive/texlive-context-2011
+++ b/metadata/cache/dev-texlive/texlive-context-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-context-2011.tar.xz mirror://gentoo/texlive-modul
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 GPL-2 public-domain
 TeXLive ConTeXt format
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-arabic-2011 b/metadata/cache/dev-texlive/texlive-documentation-arabic-2011
index bf505fee5d79..1714dd0c4e60 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-arabic-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-arabic-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lshort-persian-2011.tar.xz mirror://gentoo/texliv
 http://www.tug.org/texlive/
 GPL-2 public-domain
 TeXLive Arabic documentation
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-base-2011 b/metadata/cache/dev-texlive/texlive-documentation-base-2011
index 921bb0b70893..e249ba679218 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-base-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-base-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-texlive-common-2011.tar.xz mirror://gentoo/texliv
 http://www.tug.org/texlive/
 GPL-2
 TeXLive TeX Live documentation
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-bulgarian-2011 b/metadata/cache/dev-texlive/texlive-documentation-bulgarian-2011
index 1db3869a7514..d7766d74e339 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-bulgarian-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-bulgarian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lshort-bulgarian-2011.tar.xz mirror://gentoo/texl
 http://www.tug.org/texlive/
 GPL-2 FDL-1.1 public-domain
 TeXLive Bulgarian documentation
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-chinese-2011 b/metadata/cache/dev-texlive/texlive-documentation-chinese-2011
index e5a89cc7307a..df8834539f1e 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-chinese-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-chinese-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-asymptote-faq-zh-cn-2011.tar.xz mirror://gentoo/t
 http://www.tug.org/texlive/
 GPL-2 FDL-1.1 GPL-1 LGPL-2 LPPL-1.3
 TeXLive Chinese documentation
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-czechslovak-2011 b/metadata/cache/dev-texlive/texlive-documentation-czechslovak-2011
index 340388ea1bce..7534aa06bf06 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-czechslovak-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-czechslovak-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lshort-czech-2011.tar.xz mirror://gentoo/texlive-
 http://www.tug.org/texlive/
 GPL-2 GPL-1 LPPL-1.3
 TeXLive Czech/Slovak documentation
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-dutch-2011 b/metadata/cache/dev-texlive/texlive-documentation-dutch-2011
index 38e25cfe247f..ad188be82e5a 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-dutch-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-dutch-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lshort-dutch-2011.tar.xz mirror://gentoo/texlive-
 http://www.tug.org/texlive/
 GPL-2 GPL-1
 TeXLive Dutch documentation
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-english-2011 b/metadata/cache/dev-texlive/texlive-documentation-english-2011
index acad2786e588..5d84dcba8b68 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-english-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-english-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-FAQ-en-2011.tar.xz mirror://gentoo/texlive-module
 http://www.tug.org/texlive/
 GPL-2 as-is FDL-1.1 GPL-1 GPL-2 LPPL-1.3 public-domain TeX
 TeXLive English documentation
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-finnish-2011 b/metadata/cache/dev-texlive/texlive-documentation-finnish-2011
index d0512ba4e816..cb45ab88e3dc 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-finnish-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-finnish-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lshort-finnish-2011.tar.xz mirror://gentoo/texliv
 http://www.tug.org/texlive/
 GPL-2 public-domain
 TeXLive Finnish documentation
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-french-2011 b/metadata/cache/dev-texlive/texlive-documentation-french-2011
index 66e73b6ac55a..f6504144675e 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-french-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-french-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-apprends-latex-2011.tar.xz mirror://gentoo/texliv
 http://www.tug.org/texlive/
 GPL-2 FDL-1.1 GPL-1 LPPL-1.3
 TeXLive French documentation
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-german-2011 b/metadata/cache/dev-texlive/texlive-documentation-german-2011
index b42565ce9924..d6a03c61460c 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-german-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-german-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-kopka-2011.tar.xz mirror://gentoo/texlive-module-
 http://www.tug.org/texlive/
 GPL-2 as-is FDL-1.1 GPL-1 LPPL-1.3
 TeXLive German documentation
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-italian-2011 b/metadata/cache/dev-texlive/texlive-documentation-italian-2011
index 8bbcdae4e4c9..a06377bce6dd 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-italian-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-italian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-amsldoc-it-2011.tar.xz mirror://gentoo/texlive-mo
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 LPPL-1.3
 TeXLive Italian documentation
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-japanese-2011 b/metadata/cache/dev-texlive/texlive-documentation-japanese-2011
index ea6fd5d706e6..b03f4252326b 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-japanese-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-japanese-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lshort-japanese-2011.tar.xz mirror://gentoo/texli
 http://www.tug.org/texlive/
 GPL-2 GPL-1
 TeXLive Japanese documentation
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-korean-2011 b/metadata/cache/dev-texlive/texlive-documentation-korean-2011
index 4b17456f6820..59b837930a2a 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-korean-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-korean-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lshort-korean-2011.tar.xz mirror://gentoo/texlive
 http://www.tug.org/texlive/
 GPL-2 FDL-1.1
 TeXLive Korean documentation
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-mongolian-2011 b/metadata/cache/dev-texlive/texlive-documentation-mongolian-2011
index b5a276807f14..69eaef2e5520 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-mongolian-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-mongolian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lshort-mongol-2011.tar.xz mirror://gentoo/texlive
 http://www.tug.org/texlive/
 GPL-2 LPPL-1.3
 TeXLive Mongolian documentation
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-polish-2011 b/metadata/cache/dev-texlive/texlive-documentation-polish-2011
index b4e9cc2b77a6..7d737f60b49c 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-polish-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-polish-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lshort-polish-2011.tar.xz mirror://gentoo/texlive
 http://www.tug.org/texlive/
 GPL-2 public-domain
 TeXLive Polish documentation
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-portuguese-2011 b/metadata/cache/dev-texlive/texlive-documentation-portuguese-2011
index ad9555d403e8..bc63b9a7a974 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-portuguese-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-portuguese-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-beamer-tut-pt-2011.tar.xz mirror://gentoo/texlive
 http://www.tug.org/texlive/
 GPL-2 GPL-1 LPPL-1.3 public-domain
 TeXLive Portuguese documentation
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-russian-2011 b/metadata/cache/dev-texlive/texlive-documentation-russian-2011
index d5cdfc029fcf..a5ef6434e033 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-russian-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-russian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lshort-russian-2011.tar.xz mirror://gentoo/texliv
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1
 TeXLive Russian documentation
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-serbian-2011 b/metadata/cache/dev-texlive/texlive-documentation-serbian-2011
index 555a8a9d7d57..3a82c0b21396 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-serbian-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-serbian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-texlive-sr-2011.tar.xz mirror://gentoo/texlive-mo
 http://www.tug.org/texlive/
 GPL-2
 TeXLive Serbian documentation
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-slovenian-2011 b/metadata/cache/dev-texlive/texlive-documentation-slovenian-2011
index 8f3569c3c0ba..0bbf5389e91a 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-slovenian-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-slovenian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lshort-slovenian-2011.tar.xz mirror://gentoo/texl
 http://www.tug.org/texlive/
 GPL-2 GPL-1
 TeXLive Slovenian documentation
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-spanish-2011 b/metadata/cache/dev-texlive/texlive-documentation-spanish-2011
index a070d3f6b304..d1db2420952b 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-spanish-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-spanish-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-es-tex-faq-2011.tar.xz mirror://gentoo/texlive-mo
 http://www.tug.org/texlive/
 GPL-2 as-is LPPL-1.3 public-domain
 TeXLive Spanish documentation
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-thai-2011 b/metadata/cache/dev-texlive/texlive-documentation-thai-2011
index e714be2d4883..89668604b178 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-thai-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-thai-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lshort-thai-2011.tar.xz mirror://gentoo/texlive-m
 http://www.tug.org/texlive/
 GPL-2 public-domain
 TeXLive Thai documentation
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-turkish-2011 b/metadata/cache/dev-texlive/texlive-documentation-turkish-2011
index dfd521f5c8ac..651816e33a53 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-turkish-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-turkish-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lshort-turkish-2011.tar.xz mirror://gentoo/texliv
 http://www.tug.org/texlive/
 GPL-2 public-domain
 TeXLive Turkish documentation
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-ukrainian-2011 b/metadata/cache/dev-texlive/texlive-documentation-ukrainian-2011
index bb734638233a..33f3c1714362 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-ukrainian-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-ukrainian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lshort-ukr-2011.tar.xz mirror://gentoo/texlive-mo
 http://www.tug.org/texlive/
 GPL-2 as-is
 TeXLive Ukrainian documentation
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-documentation-vietnamese-2011 b/metadata/cache/dev-texlive/texlive-documentation-vietnamese-2011
index b635d58a0e1a..855a7e2f315c 100644
--- a/metadata/cache/dev-texlive/texlive-documentation-vietnamese-2011
+++ b/metadata/cache/dev-texlive/texlive-documentation-vietnamese-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-amsldoc-vn-2011.tar.xz mirror://gentoo/texlive-mo
 http://www.tug.org/texlive/
 GPL-2 LGPL-2 LPPL-1.3
 TeXLive Vietnamese documentation
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source
 
diff --git a/metadata/cache/dev-texlive/texlive-fontsextra-2011 b/metadata/cache/dev-texlive/texlive-fontsextra-2011
index 3d83c330dbdd..c4b6fc4b9248 100644
--- a/metadata/cache/dev-texlive/texlive-fontsextra-2011
+++ b/metadata/cache/dev-texlive/texlive-fontsextra-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-Asana-Math-2011.tar.xz mirror://gentoo/texlive-mo
 http://www.tug.org/texlive/
 GPL-2 as-is BSD GPL-1 GPL-2 GPL-3 LPPL-1.3 OFL public-domain TeX
 TeXLive Extra fonts
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-fontsrecommended-2011 b/metadata/cache/dev-texlive/texlive-fontsrecommended-2011
index 2f87e63613c7..f636b3dfae00 100644
--- a/metadata/cache/dev-texlive/texlive-fontsrecommended-2011
+++ b/metadata/cache/dev-texlive/texlive-fontsrecommended-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-avantgar-2011.tar.xz mirror://gentoo/texlive-modu
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 LPPL-1.3 public-domain
 TeXLive Recommended fonts
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-fontutils-2011 b/metadata/cache/dev-texlive/texlive-fontutils-2011
index e91419487f12..27339fe27cd8 100644
--- a/metadata/cache/dev-texlive/texlive-fontutils-2011
+++ b/metadata/cache/dev-texlive/texlive-fontutils-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-accfonts-2011.tar.xz mirror://gentoo/texlive-modu
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 LPPL-1.3 public-domain
 TeXLive TeX and Outline font utilities
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-formatsextra-2011 b/metadata/cache/dev-texlive/texlive-formatsextra-2011
index 47d931f2398c..e31ddf1f5da6 100644
--- a/metadata/cache/dev-texlive/texlive-formatsextra-2011
+++ b/metadata/cache/dev-texlive/texlive-formatsextra-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-edmac-2011.tar.xz mirror://gentoo/texlive-module-
 http://www.tug.org/texlive/
 GPL-2 GPL-2 LPPL-1.3 public-domain TeX
 TeXLive Extra formats
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-games-2011 b/metadata/cache/dev-texlive/texlive-games-2011
index 0b5537fbf650..94441929c4b0 100644
--- a/metadata/cache/dev-texlive/texlive-games-2011
+++ b/metadata/cache/dev-texlive/texlive-games-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-bartel-chess-fonts-2011.tar.xz mirror://gentoo/te
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 LPPL-1.3 public-domain
 TeXLive Games typesetting
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-genericextra-2011 b/metadata/cache/dev-texlive/texlive-genericextra-2011
index f8df4d315b42..e17c679a8a83 100644
--- a/metadata/cache/dev-texlive/texlive-genericextra-2011
+++ b/metadata/cache/dev-texlive/texlive-genericextra-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-abbr-2011.tar.xz mirror://gentoo/texlive-module-a
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 GPL-2 LPPL-1.3 public-domain TeX
 TeXLive Extra generic packages
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-genericrecommended-2011 b/metadata/cache/dev-texlive/texlive-genericrecommended-2011
index 9cb685d96cba..2429af7bbba2 100644
--- a/metadata/cache/dev-texlive/texlive-genericrecommended-2011
+++ b/metadata/cache/dev-texlive/texlive-genericrecommended-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-epsf-2011.tar.xz mirror://gentoo/texlive-module-f
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 LPPL-1.3 public-domain
 TeXLive Recommended generic packages
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-htmlxml-2011 b/metadata/cache/dev-texlive/texlive-htmlxml-2011
index 2306c8db0eea..8b911f293de0 100644
--- a/metadata/cache/dev-texlive/texlive-htmlxml-2011
+++ b/metadata/cache/dev-texlive/texlive-htmlxml-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-xmlplay-2011.tar.xz mirror://gentoo/texlive-modul
 http://www.tug.org/texlive/
 GPL-2 public-domain
 TeXLive HTML/SGML/XML support
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-humanities-2011 b/metadata/cache/dev-texlive/texlive-humanities-2011
index 7ee8caed144a..366f2b49ab0c 100644
--- a/metadata/cache/dev-texlive/texlive-humanities-2011
+++ b/metadata/cache/dev-texlive/texlive-humanities-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-alnumsec-2011.tar.xz mirror://gentoo/texlive-modu
 http://www.tug.org/texlive/
 GPL-2 GPL-1 LPPL-1.2 LPPL-1.3 public-domain
 TeXLive Humanities packages
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langafrican-2011 b/metadata/cache/dev-texlive/texlive-langafrican-2011
index 41efcb28423c..671d31dab593 100644
--- a/metadata/cache/dev-texlive/texlive-langafrican-2011
+++ b/metadata/cache/dev-texlive/texlive-langafrican-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-ethiop-2011.tar.xz mirror://gentoo/texlive-module
 http://www.tug.org/texlive/
 GPL-2 GPL-1 GPL-2
 TeXLive African scripts
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langarabic-2011 b/metadata/cache/dev-texlive/texlive-langarabic-2011
index bbd32db5ffea..46859302819c 100644
--- a/metadata/cache/dev-texlive/texlive-langarabic-2011
+++ b/metadata/cache/dev-texlive/texlive-langarabic-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-arabi-2011.tar.xz mirror://gentoo/texlive-module-
 http://www.tug.org/texlive/
 GPL-2 LPPL-1.3
 TeXLive Arabic
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langarmenian-2011 b/metadata/cache/dev-texlive/texlive-langarmenian-2011
index f1661e1518d9..761ad092ddd0 100644
--- a/metadata/cache/dev-texlive/texlive-langarmenian-2011
+++ b/metadata/cache/dev-texlive/texlive-langarmenian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-collection-langarmenian-2011.tar.xz
 http://www.tug.org/texlive/
 GPL-2
 TeXLive Armenian
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langcjk-2011 b/metadata/cache/dev-texlive/texlive-langcjk-2011
index bd36bef36b73..8ecc47086aa8 100644
--- a/metadata/cache/dev-texlive/texlive-langcjk-2011
+++ b/metadata/cache/dev-texlive/texlive-langcjk-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-adobemapping-2011.tar.xz mirror://gentoo/texlive-
 http://www.tug.org/texlive/
 GPL-2 as-is BSD LPPL-1.3
 TeXLive Chinese, Japanese, Korean
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langcroatian-2011 b/metadata/cache/dev-texlive/texlive-langcroatian-2011
index 5a168a8bd8f8..664c2cafeb1f 100644
--- a/metadata/cache/dev-texlive/texlive-langcroatian-2011
+++ b/metadata/cache/dev-texlive/texlive-langcroatian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-hrlatex-2011.tar.xz mirror://gentoo/texlive-modul
 http://www.tug.org/texlive/
 GPL-2 LPPL-1.3
 TeXLive Croatian
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langcyrillic-2011 b/metadata/cache/dev-texlive/texlive-langcyrillic-2011
index 1dccc1ebaed8..a593f948ce24 100644
--- a/metadata/cache/dev-texlive/texlive-langcyrillic-2011
+++ b/metadata/cache/dev-texlive/texlive-langcyrillic-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-cmcyr-2011.tar.xz mirror://gentoo/texlive-module-
 http://www.tug.org/texlive/
 GPL-2 as-is LPPL-1.3 public-domain
 TeXLive Cyrillic
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langczechslovak-2011 b/metadata/cache/dev-texlive/texlive-langczechslovak-2011
index d259ff1e0ee0..f62aac87ed90 100644
--- a/metadata/cache/dev-texlive/texlive-langczechslovak-2011
+++ b/metadata/cache/dev-texlive/texlive-langczechslovak-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-cs-2011.tar.xz mirror://gentoo/texlive-module-csb
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 LPPL-1.3
 TeXLive Czech/Slovak
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langdanish-2011 b/metadata/cache/dev-texlive/texlive-langdanish-2011
index a95af355f978..b774274b88b6 100644
--- a/metadata/cache/dev-texlive/texlive-langdanish-2011
+++ b/metadata/cache/dev-texlive/texlive-langdanish-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-hyphen-danish-2011.tar.xz mirror://gentoo/texlive
 http://www.tug.org/texlive/
 GPL-2 LPPL-1.3
 TeXLive Danish
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langdutch-2011 b/metadata/cache/dev-texlive/texlive-langdutch-2011
index b8c91af483ed..9da344e21ea4 100644
--- a/metadata/cache/dev-texlive/texlive-langdutch-2011
+++ b/metadata/cache/dev-texlive/texlive-langdutch-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-hyphen-dutch-2011.tar.xz mirror://gentoo/texlive-
 http://www.tug.org/texlive/
 GPL-2
 TeXLive Dutch
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langenglish-2011 b/metadata/cache/dev-texlive/texlive-langenglish-2011
index 98ee8032dfb1..86184c64f957 100644
--- a/metadata/cache/dev-texlive/texlive-langenglish-2011
+++ b/metadata/cache/dev-texlive/texlive-langenglish-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-hyphen-english-2011.tar.xz mirror://gentoo/texliv
 http://www.tug.org/texlive/
 GPL-2
 TeXLive US and UK English
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langfinnish-2011 b/metadata/cache/dev-texlive/texlive-langfinnish-2011
index 32bdae7dcda0..a07e3196dbbb 100644
--- a/metadata/cache/dev-texlive/texlive-langfinnish-2011
+++ b/metadata/cache/dev-texlive/texlive-langfinnish-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-finbib-2011.tar.xz mirror://gentoo/texlive-module
 http://www.tug.org/texlive/
 GPL-2 as-is public-domain
 TeXLive Finnish
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langfrench-2011 b/metadata/cache/dev-texlive/texlive-langfrench-2011
index 38bad4028369..92ce9f9e3521 100644
--- a/metadata/cache/dev-texlive/texlive-langfrench-2011
+++ b/metadata/cache/dev-texlive/texlive-langfrench-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-aeguill-2011.tar.xz mirror://gentoo/texlive-modul
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 LPPL-1.3 public-domain
 TeXLive French
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langgerman-2011 b/metadata/cache/dev-texlive/texlive-langgerman-2011
index 5201b031efb9..7929f51b0d5e 100644
--- a/metadata/cache/dev-texlive/texlive-langgerman-2011
+++ b/metadata/cache/dev-texlive/texlive-langgerman-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-bibleref-german-2011.tar.xz mirror://gentoo/texli
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 LPPL-1.3
 TeXLive German
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langgreek-2011 b/metadata/cache/dev-texlive/texlive-langgreek-2011
index b1fc7ccda5b6..4d8d4aeccbc0 100644
--- a/metadata/cache/dev-texlive/texlive-langgreek-2011
+++ b/metadata/cache/dev-texlive/texlive-langgreek-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-betababel-2011.tar.xz mirror://gentoo/texlive-mod
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 GPL-2 LPPL-1.3 public-domain
 TeXLive Greek
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langhebrew-2011 b/metadata/cache/dev-texlive/texlive-langhebrew-2011
index 1486c01f5946..3327beccf0ab 100644
--- a/metadata/cache/dev-texlive/texlive-langhebrew-2011
+++ b/metadata/cache/dev-texlive/texlive-langhebrew-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-cjhebrew-2011.tar.xz mirror://gentoo/texlive-modu
 http://www.tug.org/texlive/
 GPL-2 LPPL-1.3
 TeXLive Hebrew
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langhungarian-2011 b/metadata/cache/dev-texlive/texlive-langhungarian-2011
index 0560cc7d88ed..e55f889bc4fb 100644
--- a/metadata/cache/dev-texlive/texlive-langhungarian-2011
+++ b/metadata/cache/dev-texlive/texlive-langhungarian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-magyar-2011.tar.xz mirror://gentoo/texlive-module
 http://www.tug.org/texlive/
 GPL-2 GPL-1 LPPL-1.3
 TeXLive Hungarian
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langindic-2011 b/metadata/cache/dev-texlive/texlive-langindic-2011
index 1beb1dfb2d25..58ccaa57519b 100644
--- a/metadata/cache/dev-texlive/texlive-langindic-2011
+++ b/metadata/cache/dev-texlive/texlive-langindic-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-bangtex-2011.tar.xz mirror://gentoo/texlive-modul
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 GPL-2 LPPL-1.3 public-domain
 TeXLive Indic scripts
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langitalian-2011 b/metadata/cache/dev-texlive/texlive-langitalian-2011
index 8c86df1f961f..5a9b145ef78b 100644
--- a/metadata/cache/dev-texlive/texlive-langitalian-2011
+++ b/metadata/cache/dev-texlive/texlive-langitalian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-hyphen-italian-2011.tar.xz mirror://gentoo/texliv
 http://www.tug.org/texlive/
 GPL-2 LGPL-2 LPPL-1.3
 TeXLive Italian
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langlatin-2011 b/metadata/cache/dev-texlive/texlive-langlatin-2011
index ab774d762db0..67545513810b 100644
--- a/metadata/cache/dev-texlive/texlive-langlatin-2011
+++ b/metadata/cache/dev-texlive/texlive-langlatin-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-hyphen-latin-2011.tar.xz mirror://gentoo/texlive-
 http://www.tug.org/texlive/
 GPL-2 LPPL-1.3
 TeXLive Latin
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langlatvian-2011 b/metadata/cache/dev-texlive/texlive-langlatvian-2011
index a9585ddeee31..1b34892532ee 100644
--- a/metadata/cache/dev-texlive/texlive-langlatvian-2011
+++ b/metadata/cache/dev-texlive/texlive-langlatvian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-hyphen-latvian-2011.tar.xz mirror://gentoo/texliv
 http://www.tug.org/texlive/
 GPL-2
 TeXLive Latvian
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langlithuanian-2011 b/metadata/cache/dev-texlive/texlive-langlithuanian-2011
index d31ea449c542..13031f1e7f73 100644
--- a/metadata/cache/dev-texlive/texlive-langlithuanian-2011
+++ b/metadata/cache/dev-texlive/texlive-langlithuanian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-lithuanian-2011.tar.xz mirror://gentoo/texlive-mo
 http://www.tug.org/texlive/
 GPL-2 LPPL-1.3
 TeXLive Lithuanian
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langmongolian-2011 b/metadata/cache/dev-texlive/texlive-langmongolian-2011
index 722ba9d8a20b..33c45ac93f11 100644
--- a/metadata/cache/dev-texlive/texlive-langmongolian-2011
+++ b/metadata/cache/dev-texlive/texlive-langmongolian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-hyphen-mongolian-2011.tar.xz mirror://gentoo/texl
 http://www.tug.org/texlive/
 GPL-2 GPL-1 LPPL-1.3
 TeXLive Mongolian
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langnorwegian-2011 b/metadata/cache/dev-texlive/texlive-langnorwegian-2011
index 0ae439656a83..1dc01d636f81 100644
--- a/metadata/cache/dev-texlive/texlive-langnorwegian-2011
+++ b/metadata/cache/dev-texlive/texlive-langnorwegian-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-hyphen-norwegian-2011.tar.xz mirror://gentoo/texl
 http://www.tug.org/texlive/
 GPL-2
 TeXLive Norwegian
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langother-2011 b/metadata/cache/dev-texlive/texlive-langother-2011
index 57cb8815f53c..9cd5a8433e30 100644
--- a/metadata/cache/dev-texlive/texlive-langother-2011
+++ b/metadata/cache/dev-texlive/texlive-langother-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-hyphen-afrikaans-2011.tar.xz mirror://gentoo/texl
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 LPPL-1.3
 TeXLive Other hyphenation patterns
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langpolish-2011 b/metadata/cache/dev-texlive/texlive-langpolish-2011
index d46b19abf97b..ecdab0fa3e96 100644
--- a/metadata/cache/dev-texlive/texlive-langpolish-2011
+++ b/metadata/cache/dev-texlive/texlive-langpolish-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-cc-pl-2011.tar.xz mirror://gentoo/texlive-module-
 http://www.tug.org/texlive/
 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX
 TeXLive Polish
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langportuguese-2011 b/metadata/cache/dev-texlive/texlive-langportuguese-2011
index 183b3e0b26a1..79acc2561d5e 100644
--- a/metadata/cache/dev-texlive/texlive-langportuguese-2011
+++ b/metadata/cache/dev-texlive/texlive-langportuguese-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-ordinalpt-2011.tar.xz mirror://gentoo/texlive-mod
 http://www.tug.org/texlive/
 GPL-2 LPPL-1.3
 TeXLive Portuguese
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langspanish-2011 b/metadata/cache/dev-texlive/texlive-langspanish-2011
index cc87e878f3bb..044d0c77ed91 100644
--- a/metadata/cache/dev-texlive/texlive-langspanish-2011
+++ b/metadata/cache/dev-texlive/texlive-langspanish-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-hyphen-spanish-2011.tar.xz mirror://gentoo/texliv
 http://www.tug.org/texlive/
 GPL-2 LPPL-1.3
 TeXLive Spanish
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langswedish-2011 b/metadata/cache/dev-texlive/texlive-langswedish-2011
index b453ed83de23..74c181422301 100644
--- a/metadata/cache/dev-texlive/texlive-langswedish-2011
+++ b/metadata/cache/dev-texlive/texlive-langswedish-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-swebib-2011.tar.xz mirror://gentoo/texlive-module
 http://www.tug.org/texlive/
 GPL-2 LPPL-1.2
 TeXLive Swedish
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langtibetan-2011 b/metadata/cache/dev-texlive/texlive-langtibetan-2011
index 4323b40836f7..cbb06521c856 100644
--- a/metadata/cache/dev-texlive/texlive-langtibetan-2011
+++ b/metadata/cache/dev-texlive/texlive-langtibetan-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-ctib-2011.tar.xz mirror://gentoo/texlive-module-o
 http://www.tug.org/texlive/
 GPL-2 GPL-1
 TeXLive Tibetan
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langturkmen-2011 b/metadata/cache/dev-texlive/texlive-langturkmen-2011
index 0ff9d0d9198e..88c57f2cc65e 100644
--- a/metadata/cache/dev-texlive/texlive-langturkmen-2011
+++ b/metadata/cache/dev-texlive/texlive-langturkmen-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-turkmen-2011.tar.xz mirror://gentoo/texlive-modul
 http://www.tug.org/texlive/
 GPL-2 LPPL-1.3
 TeXLive Turkmen
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-langvietnamese-2011 b/metadata/cache/dev-texlive/texlive-langvietnamese-2011
index 5a2463744775..d78b62d6872f 100644
--- a/metadata/cache/dev-texlive/texlive-langvietnamese-2011
+++ b/metadata/cache/dev-texlive/texlive-langvietnamese-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-vntex-2011.tar.xz mirror://gentoo/texlive-module-
 http://www.tug.org/texlive/
 GPL-2 as-is
 TeXLive Vietnamese
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-latex-2011 b/metadata/cache/dev-texlive/texlive-latex-2011
index 05a8bd7631eb..3455c138c78f 100644
--- a/metadata/cache/dev-texlive/texlive-latex-2011
+++ b/metadata/cache/dev-texlive/texlive-latex-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-ae-2011.tar.xz mirror://gentoo/texlive-module-ams
 http://www.tug.org/texlive/
 GPL-2 GPL-2 LPPL-1.3
 TeXLive Basic LaTeX packages
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-latexextra-2011-r2 b/metadata/cache/dev-texlive/texlive-latexextra-2011-r2
index 56dfbdd75bef..0dfe1c283398 100644
--- a/metadata/cache/dev-texlive/texlive-latexextra-2011-r2
+++ b/metadata/cache/dev-texlive/texlive-latexextra-2011-r2
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-2up-2011.tar.xz mirror://gentoo/texlive-module-Ak
 http://www.tug.org/texlive/
 GPL-2 Apache-2.0 as-is GPL-1 GPL-2 GPL-3 LGPL-2 LPPL-1.2 LPPL-1.3 public-domain
 TeXLive LaTeX supplementary packages
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-latexrecommended-2011 b/metadata/cache/dev-texlive/texlive-latexrecommended-2011
index 1bd03b40eb52..ad45350a13ed 100644
--- a/metadata/cache/dev-texlive/texlive-latexrecommended-2011
+++ b/metadata/cache/dev-texlive/texlive-latexrecommended-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-anysize-2011.tar.xz mirror://gentoo/texlive-modul
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 LPPL-1.2 LPPL-1.3 public-domain
 TeXLive LaTeX recommended packages
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-luatex-2011 b/metadata/cache/dev-texlive/texlive-luatex-2011
index d01598189012..a6a453368bb5 100644
--- a/metadata/cache/dev-texlive/texlive-luatex-2011
+++ b/metadata/cache/dev-texlive/texlive-luatex-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-luacode-2011.tar.xz mirror://gentoo/texlive-modul
 http://www.tug.org/texlive/
 GPL-2 FDL-1.1 GPL-2 LPPL-1.3 public-domain
 TeXLive LuaTeX packages
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-mathextra-2011 b/metadata/cache/dev-texlive/texlive-mathextra-2011
index 25887a7f48ad..b842452750ff 100644
--- a/metadata/cache/dev-texlive/texlive-mathextra-2011
+++ b/metadata/cache/dev-texlive/texlive-mathextra-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-12many-2011.tar.xz mirror://gentoo/texlive-module
 http://www.tug.org/texlive/
 GPL-2 as-is BSD GPL-1 GPL-3 LGPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX
 TeXLive Advanced math typesetting
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-metapost-2011 b/metadata/cache/dev-texlive/texlive-metapost-2011
index de77ce3fbbb2..06c8b49cc90b 100644
--- a/metadata/cache/dev-texlive/texlive-metapost-2011
+++ b/metadata/cache/dev-texlive/texlive-metapost-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-automata-2011.tar.xz mirror://gentoo/texlive-modu
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 LGPL-2 LPPL-1.3 public-domain
 TeXLive MetaPost (and Metafont) drawing packages
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-music-2011 b/metadata/cache/dev-texlive/texlive-music-2011
index d8ca084ce312..60e2994b1499 100644
--- a/metadata/cache/dev-texlive/texlive-music-2011
+++ b/metadata/cache/dev-texlive/texlive-music-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-abc-2011.tar.xz mirror://gentoo/texlive-module-fi
 http://www.tug.org/texlive/
 GPL-2 GPL-1 LGPL-2.1 LPPL-1.3
 TeXLive Music typesetting
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-omega-2011 b/metadata/cache/dev-texlive/texlive-omega-2011
index 54ece54c630c..59ce85ee7fe1 100644
--- a/metadata/cache/dev-texlive/texlive-omega-2011
+++ b/metadata/cache/dev-texlive/texlive-omega-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-antomega-2011.tar.xz mirror://gentoo/texlive-modu
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 LPPL-1.3
 TeXLive Omega
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-pictures-2011 b/metadata/cache/dev-texlive/texlive-pictures-2011
index e9b75eed6beb..7e14cc702ec9 100644
--- a/metadata/cache/dev-texlive/texlive-pictures-2011
+++ b/metadata/cache/dev-texlive/texlive-pictures-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-adjustbox-2011.tar.xz mirror://gentoo/texlive-mod
 http://www.tug.org/texlive/
 GPL-2 Apache-2.0 as-is GPL-1 GPL-3 LPPL-1.3 public-domain
 TeXLive Graphics packages and programs
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-plainextra-2011 b/metadata/cache/dev-texlive/texlive-plainextra-2011
index 44e0f8f15be2..1ca889f97a31 100644
--- a/metadata/cache/dev-texlive/texlive-plainextra-2011
+++ b/metadata/cache/dev-texlive/texlive-plainextra-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-figflow-2011.tar.xz mirror://gentoo/texlive-modul
 http://www.tug.org/texlive/
 GPL-2 as-is LPPL-1.3 public-domain
 TeXLive Plain TeX supplementary packages
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-pstricks-2011 b/metadata/cache/dev-texlive/texlive-pstricks-2011
index 153e52bbf593..53f7b54f1486 100644
--- a/metadata/cache/dev-texlive/texlive-pstricks-2011
+++ b/metadata/cache/dev-texlive/texlive-pstricks-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-auto-pst-pdf-2011.tar.xz mirror://gentoo/texlive-
 http://www.tug.org/texlive/
 GPL-2 GPL-1 LGPL-2 LPPL-1.3
 TeXLive PSTricks packages
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-publishers-2011 b/metadata/cache/dev-texlive/texlive-publishers-2011
index 1bb742f67ae0..e0a641bf7bf5 100644
--- a/metadata/cache/dev-texlive/texlive-publishers-2011
+++ b/metadata/cache/dev-texlive/texlive-publishers-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-ANUfinalexam-2011.tar.xz mirror://gentoo/texlive-
 http://www.tug.org/texlive/
 GPL-2 Apache-2.0 as-is GPL-1 GPL-3 LPPL-1.2 LPPL-1.3 public-domain
 TeXLive Support for publishers, theses, standards, conferences, etc.
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-science-2011 b/metadata/cache/dev-texlive/texlive-science-2011
index a8869d60ca18..9b869606d380 100644
--- a/metadata/cache/dev-texlive/texlive-science-2011
+++ b/metadata/cache/dev-texlive/texlive-science-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-SIstyle-2011.tar.xz mirror://gentoo/texlive-modul
 http://www.tug.org/texlive/
 GPL-2 as-is GPL-1 LGPL-2 LPPL-1.2 LPPL-1.3 public-domain
 TeXLive Typesetting for natural and computer sciences
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-texinfo-2011 b/metadata/cache/dev-texlive/texlive-texinfo-2011
index 7db2636d5db6..2117e29718e1 100644
--- a/metadata/cache/dev-texlive/texlive-texinfo-2011
+++ b/metadata/cache/dev-texlive/texlive-texinfo-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-texinfo-2011.tar.xz mirror://gentoo/texlive-modul
 http://www.tug.org/texlive/
 GPL-2 GPL-1
 TeXLive GNU Texinfo
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib portability texlive-common texlive-module toolchain-funcs user
 source doc
 
diff --git a/metadata/cache/dev-texlive/texlive-xetex-2011 b/metadata/cache/dev-texlive/texlive-xetex-2011
index a35a8a04ca05..6deeea0f4dd7 100644
--- a/metadata/cache/dev-texlive/texlive-xetex-2011
+++ b/metadata/cache/dev-texlive/texlive-xetex-2011
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-module-arabxetex-2011.tar.xz mirror://gentoo/texlive-mod
 http://www.tug.org/texlive/
 GPL-2 Apache-2.0 GPL-1 LPPL-1.3 OFL public-domain
 TeXLive XeTeX packages
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils font multilib portability texlive-common texlive-module toolchain-funcs user
 X source doc
 
diff --git a/metadata/cache/dev-util/patchutils-0.3.2 b/metadata/cache/dev-util/patchutils-0.3.2
index 0e4fc3562263..95d3813948c0 100644
--- a/metadata/cache/dev-util/patchutils-0.3.2
+++ b/metadata/cache/dev-util/patchutils-0.3.2
@@ -6,7 +6,7 @@ http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.3.2.tar.bz2
 http://cyberelk.net/tim/patchutils/
 GPL-2
 A collection of tools that operate on patch files
-~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 
 test
 
diff --git a/metadata/cache/dev-util/systemtap-1.6 b/metadata/cache/dev-util/systemtap-1.6
index f421ab590d0f..cc9f95617423 100644
--- a/metadata/cache/dev-util/systemtap-1.6
+++ b/metadata/cache/dev-util/systemtap-1.6
@@ -6,7 +6,7 @@ http://sources.redhat.com/systemtap/ftp/releases/systemtap-1.6.tar.gz
 http://sourceware.org/systemtap/
 GPL-2
 A linux trace/probe tool
-amd64 ~mips x86
+~alpha amd64 ~mips x86
 eutils linux-info multilib portability toolchain-funcs user versionator
 sqlite
 
diff --git a/metadata/cache/kde-misc/kcheckgmail-0.6.0 b/metadata/cache/kde-misc/kcheckgmail-0.6.0
deleted file mode 100644
index a232ef0ff50d..000000000000
--- a/metadata/cache/kde-misc/kcheckgmail-0.6.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
->=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_wa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_wa(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-4
-mirror://sourceforge/kcheckgmail/kcheckgmail-0.6.0.tar.bz2
-
-http://kcheckgmail.sourceforge.net/
-GPL-2
-A systray application that notifies when new email is received in a Gmail account
-amd64 x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-debug +handbook linguas_ar linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_et linguas_fr linguas_hu linguas_it linguas_ko linguas_lt linguas_pl linguas_pt_BR linguas_pt linguas_ru linguas_sk linguas_sv linguas_tr linguas_wa linguas_zh_CN aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/mail-mta/postfix-2.9_pre20120114 b/metadata/cache/mail-mta/postfix-2.9_pre20120115
similarity index 96%
rename from metadata/cache/mail-mta/postfix-2.9_pre20120114
rename to metadata/cache/mail-mta/postfix-2.9_pre20120115
index b56d3bb2b03d..3a221ec935d1 100644
--- a/metadata/cache/mail-mta/postfix-2.9_pre20120114
+++ b/metadata/cache/mail-mta/postfix-2.9_pre20120115
@@ -1,7 +1,7 @@
 >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) ssl? ( dev-libs/openssl )
 >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) dovecot-sasl? ( net-mail/dovecot ) net-mail/mailbase selinux? ( sec-policy/selinux-postfix ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward
 0
-ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-2.9-20120114.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v10-2.8.5.patch )
+ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-2.9-20120115.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v10-2.8.5.patch )
 
 http://www.postfix.org/
 IBM
diff --git a/metadata/cache/media-libs/sampleicc-1.6.4 b/metadata/cache/media-libs/sampleicc-1.6.4
index cd95b9c1f14c..ee75e7e3a3f4 100644
--- a/metadata/cache/media-libs/sampleicc-1.6.4
+++ b/metadata/cache/media-libs/sampleicc-1.6.4
@@ -6,7 +6,7 @@ mirror://sourceforge/sampleicc/SampleICC-1.6.4.tar.gz
 http://sampleicc.sourceforge.net/
 BSD-2
 C++ library for reading, writing, manipulating, and applying ICC profiles
-~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 
 static-libs
 
diff --git a/metadata/cache/media-sound/mpc-0.21 b/metadata/cache/media-sound/mpc-0.21
index bdae0c7359b0..10090d8977aa 100644
--- a/metadata/cache/media-sound/mpc-0.21
+++ b/metadata/cache/media-sound/mpc-0.21
@@ -6,7 +6,7 @@ mirror://sourceforge/musicpd/mpc-0.21.tar.bz2
 http://www.musicpd.org
 GPL-2
 A commandline client for Music Player Daemon (media-sound/mpd)
-amd64 arm ~hppa ppc ppc64 sparc x86
+amd64 arm hppa ppc ppc64 sparc x86
 bash-completion-r1
 iconv
 
diff --git a/metadata/cache/media-sound/rhythmbox-2.90.1_pre20111001 b/metadata/cache/media-sound/rhythmbox-2.90.1_pre20111001
deleted file mode 100644
index 017341905294..000000000000
--- a/metadata/cache/media-sound/rhythmbox-2.90.1_pre20111001
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/glib-2.26.0:2 dev-libs/libxml2:2 >=x11-libs/gtk+-2.91.4:3[introspection] >=x11-libs/gdk-pixbuf-2.18.0:2 >=dev-libs/gobject-introspection-0.10.0 >=dev-libs/libpeas-0.7.3[gtk,python?] >=dev-libs/totem-pl-parser-2.32.1 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 >=media-libs/gst-plugins-base-0.10.32:0.10 >=media-libs/gstreamer-0.10.32:0.10[introspection] clutter? ( >=media-libs/clutter-1.2:1.0 >=media-libs/clutter-gst-1.0:1.0 >=media-libs/clutter-gtk-1.0:1.0 >=x11-libs/mx-1.0.1:1.0 ) cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.11:3.0 >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) html? ( >=net-libs/webkit-gtk-1.3.9:3 ) lastfm? ( dev-libs/json-glib ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 gnome-base/gconf:2 ) python? ( >=dev-python/pygobject-2.28:2[introspection] ) udev? ( ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) dev-util/pkgconfig >=dev-util/intltool-0.35 app-text/scrollkeeper dev-util/gtk-doc >=app-text/gnome-doc-utils-0.9.1 doc? ( >=dev-util/gtk-doc-1.4 ) test? ( dev-libs/check ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) python? ( || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
->=dev-libs/glib-2.26.0:2 dev-libs/libxml2:2 >=x11-libs/gtk+-2.91.4:3[introspection] >=x11-libs/gdk-pixbuf-2.18.0:2 >=dev-libs/gobject-introspection-0.10.0 >=dev-libs/libpeas-0.7.3[gtk,python?] >=dev-libs/totem-pl-parser-2.32.1 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 >=media-libs/gst-plugins-base-0.10.32:0.10 >=media-libs/gstreamer-0.10.32:0.10[introspection] clutter? ( >=media-libs/clutter-1.2:1.0 >=media-libs/clutter-gst-1.0:1.0 >=media-libs/clutter-gtk-1.0:1.0 >=x11-libs/mx-1.0.1:1.0 ) cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.11:3.0 >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) html? ( >=net-libs/webkit-gtk-1.3.9:3 ) lastfm? ( dev-libs/json-glib ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 gnome-base/gconf:2 ) python? ( >=dev-python/pygobject-2.28:2[introspection] ) udev? ( ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) >=media-plugins/gst-plugins-soup-0.10 >=media-plugins/gst-plugins-libmms-0.10 || ( >=media-plugins/gst-plugins-cdparanoia-0.10 >=media-plugins/gst-plugins-cdio-0.10 ) >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-taglib-0.10.6 upnp? ( >=media-libs/grilo-0.1.17 >=media-plugins/grilo-plugins-0.1.17[upnp] ) python? ( >=dev-python/gst-python-0.10.8 x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] dbus? ( dev-python/dbus-python ) gnome-keyring? ( dev-python/gnome-keyring-python ) webkit? ( dev-python/mako >=net-libs/webkit-gtk-1.3.9:3[introspection] ) ) >=app-admin/eselect-python-20091230 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) python? ( || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] ) )
-0
-mirror://gentoo/rhythmbox-2.90.1_pre20111001.tar.xz
-
-http://www.rhythmbox.org/
-GPL-2
-Music management and playback software for GNOME
-~amd64 ~x86
-autotools eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability python toolchain-funcs user versionator virtualx
-cdr clutter daap dbus doc gnome-keyring html ipod +lastfm libnotify lirc musicbrainz mtp nsplugin python test udev upnp webkit debug test
-
-
-
-3
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/media-sound/rhythmbox-2.95 b/metadata/cache/media-sound/rhythmbox-2.95
new file mode 100644
index 000000000000..1059855ef9c5
--- /dev/null
+++ b/metadata/cache/media-sound/rhythmbox-2.95
@@ -0,0 +1,22 @@
+>=dev-libs/glib-2.26.0:2 dev-libs/libxml2:2 >=x11-libs/gtk+-2.91.4:3[introspection] >=x11-libs/gdk-pixbuf-2.18.0:2 >=dev-libs/gobject-introspection-0.10.0 >=dev-libs/libpeas-0.7.3[gtk,python?] >=dev-libs/totem-pl-parser-2.32.1 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 >=media-libs/gst-plugins-base-0.10.32:0.10 >=media-libs/gstreamer-0.10.32:0.10[introspection] >=sys-libs/tdb-1.2.6 clutter? ( >=media-libs/clutter-1.2:1.0 >=media-libs/clutter-gst-1.0:1.0 >=media-libs/clutter-gtk-1.0:1.0 >=x11-libs/mx-1.0.1:1.0 ) cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.11:3.0 >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) html? ( >=net-libs/webkit-gtk-1.3.9:3 ) lastfm? ( dev-libs/json-glib ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 gnome-base/gconf:2 ) python? ( dev-python/pygobject:3 ) udev? ( ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) dev-util/pkgconfig >=dev-util/intltool-0.35 app-text/scrollkeeper >=app-text/gnome-doc-utils-0.9.1 doc? ( >=dev-util/gtk-doc-1.4 ) test? ( dev-libs/check ) app-arch/xz-utils >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) python? ( || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-libs/glib-2.26.0:2 dev-libs/libxml2:2 >=x11-libs/gtk+-2.91.4:3[introspection] >=x11-libs/gdk-pixbuf-2.18.0:2 >=dev-libs/gobject-introspection-0.10.0 >=dev-libs/libpeas-0.7.3[gtk,python?] >=dev-libs/totem-pl-parser-2.32.1 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 >=media-libs/gst-plugins-base-0.10.32:0.10 >=media-libs/gstreamer-0.10.32:0.10[introspection] >=sys-libs/tdb-1.2.6 clutter? ( >=media-libs/clutter-1.2:1.0 >=media-libs/clutter-gst-1.0:1.0 >=media-libs/clutter-gtk-1.0:1.0 >=x11-libs/mx-1.0.1:1.0 ) cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.11:3.0 >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) html? ( >=net-libs/webkit-gtk-1.3.9:3 ) lastfm? ( dev-libs/json-glib ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 gnome-base/gconf:2 ) python? ( dev-python/pygobject:3 ) udev? ( ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) >=media-plugins/gst-plugins-soup-0.10 >=media-plugins/gst-plugins-libmms-0.10 || ( >=media-plugins/gst-plugins-cdparanoia-0.10 >=media-plugins/gst-plugins-cdio-0.10 ) >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-taglib-0.10.6 upnp? ( >=media-libs/grilo-0.1.17 >=media-plugins/grilo-plugins-0.1.17[upnp] ) python? ( >=dev-python/gst-python-0.10.8 x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] dbus? ( sys-apps/dbus ) gnome-keyring? ( dev-python/gnome-keyring-python ) webkit? ( dev-python/mako >=net-libs/webkit-gtk-1.3.9:3[introspection] ) ) >=app-admin/eselect-python-20091230 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) python? ( || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] ) )
+0
+mirror://gnome/sources/rhythmbox/2.95/rhythmbox-2.95.tar.xz
+
+http://www.rhythmbox.org/
+GPL-2
+Music management and playback software for GNOME
+~amd64 ~x86
+eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability python toolchain-funcs user versionator virtualx
+cdr clutter daap dbus doc gnome-keyring html ipod +lastfm libnotify lirc musicbrainz mtp nsplugin +python test +udev upnp webkit debug test
+ipod? ( udev ) mtp? ( udev ) dbus? ( python ) gnome-keyring? ( python ) webkit? ( python )
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/media-video/dvdrip-0.98.11-r1 b/metadata/cache/media-video/dvdrip-0.98.11-r1
index f02bbbfa88ed..935e3b339398 100644
--- a/metadata/cache/media-video/dvdrip-0.98.11-r1
+++ b/metadata/cache/media-video/dvdrip-0.98.11-r1
@@ -6,7 +6,7 @@ http://www.exit1.org/dvdrip/dist/dvdrip-0.98.11.tar.gz
 http://www.exit1.org/dvdrip/
 || ( Artistic GPL-2 )
 dvd::rip is a graphical frontend for transcode
-~amd64 ~ppc ~ppc64 ~sparc ~x86
+amd64 ~ppc ~ppc64 ~sparc ~x86
 base eutils flag-o-matic multilib perl-module portability toolchain-funcs user
 ffmpeg fping mplayer ogg subtitles vcd vorbis xine xvid
 
diff --git a/metadata/cache/net-analyzer/hping-3_pre20051105-r3 b/metadata/cache/net-analyzer/hping-3_pre20051105-r3
index ada44a627e89..e11ffecf78b8 100644
--- a/metadata/cache/net-analyzer/hping-3_pre20051105-r3
+++ b/metadata/cache/net-analyzer/hping-3_pre20051105-r3
@@ -6,7 +6,7 @@ http://www.hping.org/hping3-20051105.tar.gz
 http://www.hping.org
 GPL-2
 A ping-like TCP/IP packet assembler/analyzer
-alpha amd64 ~arm ~hppa ia64 ~mips ~ppc sparc x86
+alpha amd64 ~arm hppa ia64 ~mips ~ppc sparc x86
 eutils multilib portability toolchain-funcs user
 tcl
 
diff --git a/metadata/cache/net-dns/knot-0.8.1 b/metadata/cache/net-dns/knot-0.9
similarity index 88%
rename from metadata/cache/net-dns/knot-0.8.1
rename to metadata/cache/net-dns/knot-0.9
index a118e9b904ac..b06ba0b7a745 100644
--- a/metadata/cache/net-dns/knot-0.8.1
+++ b/metadata/cache/net-dns/knot-0.9
@@ -1,7 +1,7 @@
 dev-libs/openssl dev-libs/userspace-rcu dev-util/pkgconfig sys-devel/flex virtual/yacc || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
 dev-libs/openssl dev-libs/userspace-rcu
 0
-http://public.nic.cz/files/knot-dns/knot-0.8.1.tar.gz
+http://public.nic.cz/files/knot-dns/knot-0.9.tar.gz
 
 http://www.knot-dns.cz/
 GPL-3
diff --git a/metadata/cache/net-fs/nfs-utils-1.2.5 b/metadata/cache/net-fs/nfs-utils-1.2.5
index dd6ffdbc8d18..79bb3aa67eab 100644
--- a/metadata/cache/net-fs/nfs-utils-1.2.5
+++ b/metadata/cache/net-fs/nfs-utils-1.2.5
@@ -1,5 +1,5 @@
-tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsprogs-libs net-nds/rpcbind net-libs/libtirpc nfsv4? ( >=dev-libs/libevent-1.0b >=net-libs/libnfsidmap-0.21-r1 kerberos? ( net-libs/librpcsecgss >=net-libs/libgssglue-0.3 net-libs/libtirpc[kerberos] app-crypt/mit-krb5 ) nfsidmap? ( >=net-libs/libnfsidmap-0.24 sys-apps/keyutils ) ) selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind ) dev-util/pkgconfig !<sys-apps/util-linux-2.12r-r7 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
-tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsprogs-libs net-nds/rpcbind net-libs/libtirpc nfsv4? ( >=dev-libs/libevent-1.0b >=net-libs/libnfsidmap-0.21-r1 kerberos? ( net-libs/librpcsecgss >=net-libs/libgssglue-0.3 net-libs/libtirpc[kerberos] app-crypt/mit-krb5 ) nfsidmap? ( >=net-libs/libnfsidmap-0.24 sys-apps/keyutils ) ) selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind ) !net-nds/portmap
+tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsprogs-libs net-nds/rpcbind net-libs/libtirpc nfsv4? ( >=dev-libs/libevent-1.0b >=net-libs/libnfsidmap-0.21-r1 kerberos? ( net-libs/librpcsecgss >=net-libs/libgssglue-0.3 net-libs/libtirpc[kerberos] app-crypt/mit-krb5 ) nfsidmap? ( >=net-libs/libnfsidmap-0.24 sys-apps/keyutils ) ) nfsv41? ( sys-fs/lvm2 ) selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind ) dev-util/pkgconfig !<sys-apps/util-linux-2.12r-r7 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsprogs-libs net-nds/rpcbind net-libs/libtirpc nfsv4? ( >=dev-libs/libevent-1.0b >=net-libs/libnfsidmap-0.21-r1 kerberos? ( net-libs/librpcsecgss >=net-libs/libgssglue-0.3 net-libs/libtirpc[kerberos] app-crypt/mit-krb5 ) nfsidmap? ( >=net-libs/libnfsidmap-0.24 sys-apps/keyutils ) ) nfsv41? ( sys-fs/lvm2 ) selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind ) !net-nds/portmap
 0
 mirror://sourceforge/nfs/nfs-utils-1.2.5.tar.bz2
 test
diff --git a/metadata/cache/net-im/empathy-2.34.0-r2 b/metadata/cache/net-im/empathy-2.34.0-r2
index 9d50a8d9687f..4b376e5e1b3b 100644
--- a/metadata/cache/net-im/empathy-2.34.0-r2
+++ b/metadata/cache/net-im/empathy-2.34.0-r2
@@ -6,7 +6,7 @@ mirror://gnome/sources/empathy/2.34/empathy-2.34.0.tar.bz2
 http://live.gnome.org/Empathy
 GPL-2
 Telepathy client and library using GTK+
-~alpha amd64 ~ia64 ppc ~sparc x86 ~x86-linux
+alpha amd64 ~ia64 ppc ~sparc x86 ~x86-linux
 eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability python toolchain-funcs user versionator
 eds map nautilus networkmanager spell test webkit debug
 
diff --git a/metadata/cache/net-libs/gssdp-0.7.2 b/metadata/cache/net-libs/gssdp-0.7.2
index 9de8c9c08aac..40e8810cadfa 100644
--- a/metadata/cache/net-libs/gssdp-0.7.2
+++ b/metadata/cache/net-libs/gssdp-0.7.2
@@ -6,7 +6,7 @@ http://gupnp.org/sources/gssdp/gssdp-0.7.2.tar.gz
 http://gupnp.org/
 LGPL-2
 A GObject-based API for handling resource discovery and announcement over SSDP.
-~alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
+alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
 
 +introspection
 
diff --git a/metadata/cache/net-misc/dahdi-2.5.0.2-r2 b/metadata/cache/net-misc/dahdi-2.5.0.2-r2
new file mode 100644
index 000000000000..ac3f85701a0a
--- /dev/null
+++ b/metadata/cache/net-misc/dahdi-2.5.0.2-r2
@@ -0,0 +1,22 @@
+kernel_linux? ( sys-apps/module-init-tools ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+kernel_linux? ( sys-apps/module-init-tools )
+0
+http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-2.5.0.2.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.11.0.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz mirror://gentoo/gentoo-dahdi-patchset-1.0.tar.bz2 http://www.junghanns.net/downloads/jnet-dahdi-drivers-1.0.13.tar.gz
+test
+http://www.asterisk.org
+LGPL-2.1
+Kernel modules for Digium compatible hardware (formerly known as Zaptel).
+~amd64 ~x86
+base eutils flag-o-matic linux-info linux-mod multilib portability toolchain-funcs user versionator
+flash kernel_linux
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-apps/netkit-base-0.17-r9 b/metadata/cache/sys-apps/netkit-base-0.17-r9
index 084b0afe9cfb..cc8ad944d68f 100644
--- a/metadata/cache/sys-apps/netkit-base-0.17-r9
+++ b/metadata/cache/sys-apps/netkit-base-0.17-r9
@@ -6,7 +6,7 @@ ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-base-0.17.tar.gz
 ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
 BSD
 Old-style inetd
-alpha amd64 ~hppa ia64 ~mips ppc ~ppc64 sparc x86
+alpha amd64 hppa ia64 ~mips ppc ~ppc64 sparc x86
 eutils multilib portability toolchain-funcs user
 
 
diff --git a/metadata/cache/sys-apps/pkgcore-0.7.7.6 b/metadata/cache/sys-apps/pkgcore-0.7.7.6
new file mode 100644
index 000000000000..e0d5642d68bf
--- /dev/null
+++ b/metadata/cache/sys-apps/pkgcore-0.7.7.6
@@ -0,0 +1,22 @@
+>=dev-lang/python-2.4 >=dev-python/snakeoil-0.4.5 || ( >=dev-lang/python-2.5 dev-python/pycrypto ) doc? ( dev-python/sphinx dev-python/pyparsing ) >=app-admin/eselect-python-20091230 dev-lang/python
+>=dev-lang/python-2.4 >=dev-python/snakeoil-0.4.5 || ( >=dev-lang/python-2.5 dev-python/pycrypto ) >=app-admin/eselect-python-20091230 dev-lang/python
+0
+http://pkgcore.googlecode.com/files/pkgcore-0.7.7.6.tar.bz2
+
+http://pkgcore.googlecode.com/
+GPL-2
+pkgcore package manager
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+distutils eutils multilib portability python toolchain-funcs user
+-doc build
+
+
+
+3
+
+compile install postinst postrm prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/sys-boot/unetbootin-565 b/metadata/cache/sys-boot/unetbootin-565
index fcdc497b446c..40daef11eb26 100644
--- a/metadata/cache/sys-boot/unetbootin-565
+++ b/metadata/cache/sys-boot/unetbootin-565
@@ -6,7 +6,7 @@ mirror://sourceforge/unetbootin/unetbootin-source-565.tar.gz
 http://unetbootin.sourceforge.net/
 GPL-2
 Universal Netboot Installer creates Live USB systems for various OS distributions.
-~amd64 ~x86
+amd64 ~x86
 base eutils multilib portability qt4-r2 toolchain-funcs user
 linguas_am linguas_ar linguas_ast linguas_be linguas_bg linguas_bn linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fo linguas_fr linguas_gl linguas_he linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_lt linguas_lv linguas_ml linguas_ms linguas_nan linguas_nb linguas_nl linguas_nn linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_sw linguas_tr linguas_uk linguas_ur linguas_vi linguas_zh_CN linguas_zh_TW
 
diff --git a/metadata/cache/sys-devel/autogen-5.12 b/metadata/cache/sys-devel/autogen-5.12
index 5fa6a1cb01b3..908de4b7df51 100644
--- a/metadata/cache/sys-devel/autogen-5.12
+++ b/metadata/cache/sys-devel/autogen-5.12
@@ -6,7 +6,7 @@ mirror://gnu/autogen/rel5.12/autogen-5.12.tar.bz2
 http://www.gnu.org/software/autogen/
 GPL-2
 Program and text file generation
-alpha amd64 arm ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
+alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
 eutils multilib portability toolchain-funcs user
 
 
diff --git a/metadata/cache/sys-libs/glibc-2.15 b/metadata/cache/sys-libs/glibc-2.15
index 82d1dba494ff..8af9f7ff6a4d 100644
--- a/metadata/cache/sys-libs/glibc-2.15
+++ b/metadata/cache/sys-libs/glibc-2.15
@@ -1,7 +1,7 @@
 >=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers nls? ( sys-devel/gettext ) !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 !<sys-devel/patch-2.6 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig
 !sys-kernel/ps3-sources nls? ( sys-devel/gettext ) selinux? ( sys-libs/libselinux ) vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
 2.2
-mirror://gnu/glibc/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.15.tar.xz mirror://gentoo/glibc-2.15.tar.xz mirror://gnu/glibc/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-2.15-patches-2.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.15-patches-2.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.15-patches-2.tar.bz2
+mirror://gnu/glibc/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.15.tar.xz mirror://gentoo/glibc-2.15.tar.xz mirror://gnu/glibc/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-2.15-patches-3.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.15-patches-3.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.15-patches-3.tar.bz2
 strip
 http://www.gnu.org/software/libc/libc.html
 LGPL-2
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 8dffd432e781..31d81de77aa3 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 16 Jan 2012 01:06:47 +0000
+Mon, 16 Jan 2012 15:06:48 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 8dffd432e781..31d81de77aa3 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 16 Jan 2012 01:06:47 +0000
+Mon, 16 Jan 2012 15:06:48 +0000
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 309f34ecb258..94a8727c91c1 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 16 Jan 2012 01:06:48 +0000
+Mon, 16 Jan 2012 15:06:50 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 1252ca13e181..30df26de0f08 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Jan 16 01:06:46 UTC 2012
+Mon Jan 16 15:06:48 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d0012f3039f2..a8176b36ab24 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 16 Jan 2012 01:30:01 +0000
+Mon, 16 Jan 2012 15:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 96c1901c8f76..0a96656ebc91 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1326675901 Mon Jan 16 01:05:01 2012 UTC
+1326726301 Mon Jan 16 15:05:01 2012 UTC
diff --git a/net-analyzer/hping/hping-3_pre20051105-r3.ebuild b/net-analyzer/hping/hping-3_pre20051105-r3.ebuild
index 18f2894e2222..6ac80a06f210 100644
--- a/net-analyzer/hping/hping-3_pre20051105-r3.ebuild
+++ b/net-analyzer/hping/hping-3_pre20051105-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/hping-3_pre20051105-r3.ebuild,v 1.5 2012/01/15 18:57:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/hping-3_pre20051105-r3.ebuild,v 1.6 2012/01/16 03:21:48 jer Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.hping.org/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ~ppc sparc x86"
 IUSE="tcl"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index ade4b3b9df21..62500f861d9c 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -1 +1 @@
-DIST knot-0.8.1.tar.gz 970697 RMD160 1fa721d2b01bdaa073e23281aef65e4b2d06951d SHA1 54e3bd81376fc900cc2fc575dd8e55e8a91f4f3c SHA256 5bc13cc8fb879008be5f14b238e1799853d149136cafe5f2c4b1bb59ca720d06
+DIST knot-0.9.tar.gz 984418 RMD160 0f9505fe3c2f57df328b36ffa8210b4928c13acf SHA1 428633829044393f1078967c0dcf50324f9a430d SHA256 8d4ab745216b1076c5190ecf3048db8a49aa7e37d99bd0174b4f2f2c99fc388a
diff --git a/net-dns/knot/knot-0.8.1.ebuild b/net-dns/knot/knot-0.9.ebuild
similarity index 84%
rename from net-dns/knot/knot-0.8.1.ebuild
rename to net-dns/knot/knot-0.9.ebuild
index 5d42288d8c3d..36371c691b72 100644
--- a/net-dns/knot/knot-0.8.1.ebuild
+++ b/net-dns/knot/knot-0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/knot/knot-0.8.1.ebuild,v 1.2 2011/12/29 11:08:19 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/knot/knot-0.9.ebuild,v 1.1 2012/01/16 09:14:49 scarabeus Exp $
 
 EAPI=4
 
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.5.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.5.ebuild
index bf421cefda62..d474e3d55b28 100644
--- a/net-fs/nfs-utils/nfs-utils-1.2.5.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.5.ebuild,v 1.2 2012/01/14 22:34:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.5.ebuild,v 1.4 2012/01/16 12:21:26 jlec Exp $
 
 EAPI="4"
 
@@ -39,6 +39,9 @@ DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers )
 			sys-apps/keyutils
 		)
 	)
+	nfsv41? (
+		sys-fs/lvm2
+	)
 	selinux? (
 		sec-policy/selinux-rpc
 		sec-policy/selinux-rpcbind
@@ -70,7 +73,8 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${ED}" install
+	emake DESTDIR="${D}" install
+	rm linux-nfs/Makefile* || die
 	dodoc -r linux-nfs ChangeLog README
 
 	# Don't overwrite existing xtab/etab, install the original
diff --git a/net-im/empathy/empathy-2.34.0-r2.ebuild b/net-im/empathy/empathy-2.34.0-r2.ebuild
index 525f3380739f..587ccc622243 100644
--- a/net-im/empathy/empathy-2.34.0-r2.ebuild
+++ b/net-im/empathy/empathy-2.34.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.34.0-r2.ebuild,v 1.5 2011/11/22 01:01:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.34.0-r2.ebuild,v 1.6 2012/01/16 14:10:09 klausman Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -15,7 +15,7 @@ HOMEPAGE="http://live.gnome.org/Empathy"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~sparc x86 ~x86-linux"
+KEYWORDS="alpha amd64 ~ia64 ppc ~sparc x86 ~x86-linux"
 # FIXME: Add location support once geoclue stops being idiotic with automagic deps
 IUSE="eds map nautilus networkmanager spell test webkit"
 
diff --git a/net-libs/gssdp/gssdp-0.7.2.ebuild b/net-libs/gssdp/gssdp-0.7.2.ebuild
index 9c8208182632..b57fb2504e23 100644
--- a/net-libs/gssdp/gssdp-0.7.2.ebuild
+++ b/net-libs/gssdp/gssdp-0.7.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gssdp/gssdp-0.7.2.ebuild,v 1.7 2010/11/20 12:19:56 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gssdp/gssdp-0.7.2.ebuild,v 1.8 2012/01/16 14:26:09 klausman Exp $
 
 EAPI=2
 
@@ -10,7 +10,7 @@ SRC_URI="http://gupnp.org/sources/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="+introspection"
 
 RDEPEND=">=dev-libs/glib-2.18:2
diff --git a/net-misc/aria2/aria2-1.14.1.ebuild b/net-misc/aria2/aria2-1.14.1.ebuild
index e3ec9271584f..69a6ec8002a8 100644
--- a/net-misc/aria2/aria2-1.14.1.ebuild
+++ b/net-misc/aria2/aria2-1.14.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/aria2-1.14.1.ebuild,v 1.2 2012/01/15 14:13:50 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/aria2-1.14.1.ebuild,v 1.3 2012/01/16 08:05:31 dev-zero Exp $
 
 EAPI="4"
 
@@ -55,9 +55,9 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf="--without-gnutls --without-openssl"
+	local myconf="--without-gnutls --without-libgcrypt --without-openssl"
 	use ssl && \
-		myconf="$(use_with gnutls) $(use_with !gnutls openssl)"
+		myconf="$(use_with gnutls) $(use_with gnutls libgcrypt) $(use_with !gnutls openssl)"
 
 	local xmllib="--without-libexpat --without-libxml2"
 	if use metalink || use xmlrpc ; then
diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index 36a553fb45a5..675fe2bf15d3 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -2,6 +2,7 @@ DIST dahdi-fw-hx8-2.06.tar.gz 29252 RMD160 b039d046a029dd9ed0dd32df4d8560809429d
 DIST dahdi-fw-oct6114-064-1.05.01.tar.gz 165869 RMD160 bef97e3741c4d5b21d1e728a08984dc1f0431eb0 SHA1 2fb8e5f4f7aedb285ffa21632efd45af877eacd4 SHA256 56bac1f2024c76ecf9b6f40992eeea29a1fbee676bb2a37a058179bacfbb1c91
 DIST dahdi-fw-oct6114-128-1.05.01.tar.gz 165849 RMD160 3c31b6d4ab7d3455eda75e42f5447880ea491b71 SHA1 bcf07434f4589d07d9b5f67f7b3a8fb115aa9229 SHA256 e1146749d205c41603b9b76852c3f8104dac233d0025d700db24504d10c99775
 DIST dahdi-fw-tc400m-MR6.12.tar.gz 1750035 RMD160 8181ffd4bc861122c338e1eb2748e797210f3150 SHA1 9206abda4c9cf192e8cae7e707f2e4e65beb8f87 SHA256 11dd8d009809e41fc9a3a36766f59ff73d29075eede5b8724331d9a6e5259774
+DIST dahdi-fw-vpmoct032-1.11.0.tar.gz 443984 RMD160 a6fcd0fb100a2c4edc6c2e50ffa23824aa472cf5 SHA1 26ceb87ff86b79e34df70306c497e298bd794323 SHA256 ba050ccbdd31d8b2ac682ad559f2122250c75473c079ef082a758691db705064
 DIST dahdi-fw-vpmoct032-1.8.0.tar.gz 443665 RMD160 a1ec32a19f3fd191e09a49724a33541b4814871d SHA1 4568ef1bcef9b5648ef8e71caf5872dff43588c2 SHA256 9ba13f96f4fb0f65564699c23777b28f144235bd4362c4a760d8009a8f248465
 DIST dahdi-fwload-vpmadt032-1.25.0.tar.gz 149360 RMD160 03854bebe670501a15bd8d5691c71dbafd4cc7f7 SHA1 0615613f6179ef927d23ed23daeaf7a718490200 SHA256 3ff26cf80555fd7470b43a87c51d03c1db2a75abcd4561d79f69b6c48298e4a1
 DIST dahdi-linux-2.4.1.tar.gz 1516954 RMD160 7423df78eeefabe1dce3801c7b671842fb4950cd SHA1 a236f0100fc3209c8da6d4ae77a776d8165923d9 SHA256 c5c328ae0b7ad7134950ef6bbd05ec89ff7f07ef4ea64c738b4907eb3922424e
@@ -10,5 +11,6 @@ DIST dahdi-linux-2.5.0.tar.gz 1546486 RMD160 a6ab21554965e403e5869bbae5e404200ca
 DIST gentoo-dahdi-patchset-0.6.tar.bz2 60759 RMD160 d5115d485abfbcba18094409c97bda947a9e85c0 SHA1 607c924e34b13a03bc1f60586134d5b0e6879faa SHA256 5dc02244e88d65cf3af81c58b0266e36d9f5e9ffdfc0dc223b3ab0da3df64621
 DIST gentoo-dahdi-patchset-0.7.tar.bz2 59254 RMD160 b38f73e62a2cac324e9b93ef19544bb1d32c551f SHA1 a273fdc07f7b887caf6a54aeff7e36ca12623126 SHA256 d597c521932c6746df7829e13d40df72de80de5d65745d5d5e8b2ebb9b032eda
 DIST gentoo-dahdi-patchset-0.9.tar.bz2 59614 RMD160 b4e945c133b2134a08d8baa2ce143b8196c64bb2 SHA1 b24135ae9459b1d53cdf3150107c6cbafb512b61 SHA256 c292b899ad70cec834a50e0e1846e98b4dda9644862e22488cb59f62ae786b73
+DIST gentoo-dahdi-patchset-1.0.tar.bz2 60109 RMD160 e0b4c2df3e4f5380105cf77a70298ce316796857 SHA1 96b12774111031eb85f6a0b3db6f0d3640405bba SHA256 81ca9ac6d4244a064c1df6a5315ce1de615cf90d928dce2c1e98076327b9bec1
 DIST jnet-dahdi-drivers-1.0.11.tar.gz 60945 RMD160 629c9993e460ca30bfc5adddf1bcd8edbe3694d7 SHA1 31ec44b7a892e8052b6c2cbe5b10e72646960e2d SHA256 31f0a856f0b75533d4880428c29f2e8a4ca4bbab6c062b7ffe70f335126e9234
 DIST jnet-dahdi-drivers-1.0.13.tar.gz 63887 RMD160 195f3f101f8313e8eef0b25c0e6791ac47100618 SHA1 41ff15af95590023086ce66cd7ff2251522b4c3f SHA256 bdf451e610bb9ff966a3493cc9ac16e90be6a3c3df0d6806cb309998690a96e8
diff --git a/net-misc/dahdi/dahdi-2.5.0.2-r2.ebuild b/net-misc/dahdi/dahdi-2.5.0.2-r2.ebuild
new file mode 100644
index 000000000000..247ca55ef16d
--- /dev/null
+++ b/net-misc/dahdi/dahdi-2.5.0.2-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/dahdi-2.5.0.2-r2.ebuild,v 1.1 2012/01/16 12:39:26 chainsaw Exp $
+
+EAPI=4
+
+inherit base linux-mod eutils flag-o-matic toolchain-funcs
+
+MY_P="${P/dahdi/dahdi-linux}"
+JNET=1.0.13
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)."
+HOMEPAGE="http://www.asterisk.org"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.11.0.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
+mirror://gentoo/gentoo-dahdi-patchset-1.0.tar.bz2
+http://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flash"
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND=""
+
+EPATCH_SUFFIX="diff"
+PATCHES=( "${WORKDIR}/dahdi-patchset" )
+
+CONFIG_CHECK="MODULES CRC_CCITT"
+
+src_unpack() {
+	unpack ${A}
+	# Copy the firmware tarballs over, the makefile will try and download them otherwise
+	for file in ${A} ; do
+		cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/
+	done
+	# But without the .bin's it'll still fall over and die, so copy those too.
+	cp *.bin "${MY_P}"/drivers/dahdi/firmware/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/cwain/*.[ch] "${MY_P}"/drivers/dahdi/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/qozap/*.[ch] "${MY_P}"/drivers/dahdi/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/ztgsm/*.[ch] "${MY_P}"/drivers/dahdi/
+}
+
+src_prepare() {
+	if use flash; then
+		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || die "Failed to define FXSFLASH"
+		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
+	fi
+	base_src_prepare
+}
+
+src_compile() {
+	unset ARCH
+	emake CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" all
+}
+
+src_install() {
+	einfo "Installing kernel module"
+	emake KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" install
+	rm -rf "$D"/lib/modules/*/modules.*
+}
diff --git a/profiles/license_groups b/profiles/license_groups
index 25d498f6ee7c..c6ef9342974a 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.101 2012/01/08 22:35:17 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.102 2012/01/16 07:15:31 ulm Exp $
 
 # Please report bugs or other requests at bugs.gentoo.org and assign to
 # licenses@gentoo.org
@@ -13,7 +13,7 @@
 # they are more permissive than the licenses they are based on.
 GPL-COMPATIBLE AGPL-3 Apache-2.0 Artistic-2 as-is Boost-1.0 BSD BSD-2 CeCILL-2 Clarified-Artistic DB FTL gcc-runtime-library-exception-3.1 GPL-1 GPL-2 GPL-2-with-exceptions GPL-2-with-font-exception GPL-2-with-linking-exception GPL-2-with-MySQL-FLOSS-exception GPL-3 GPL-3-with-font-exception ISC LGPL-2 LGPL-2.1 LGPL-2.1-FPC LGPL-3 libgcc libstdc++ MIT OPENLDAP OracleDB PSF-2 PSF-2.2 PSF-2.3 PSF-2.4 public-domain PYTHON qwt Ruby SGI-B-2.0 tanuki-community unicode UoI-NCSA vim W3C WTFPL-2 ZLIB ZPL
 
-FSF-APPROVED @GPL-COMPATIBLE AFL-2.0 AFL-2.1 AFL-3.0 Apache-1.1 APSL-2 BitTorrent BSD-4 CDDL CNRI CPL-1.0 Emacs-23-CEDET-grammars EPL-1.0 IBM LPPL-1.2 MPL-1.0 MPL-1.1 Ms-PL NPL-1.1 openssl OSL-1.1 OSL-2.0 OSL-2.1 PHP-3.01 QPL QPL-1.0 SPL
+FSF-APPROVED @GPL-COMPATIBLE AFL-2.0 AFL-2.1 AFL-3.0 Apache-1.1 APSL-2 BitTorrent BSD-4 CDDL CNRI CPL-1.0 EPL-1.0 IBM LPPL-1.2 MPL-1.0 MPL-1.1 Ms-PL NPL-1.1 openssl OSL-1.1 OSL-2.0 OSL-2.1 PHP-3.01 QPL QPL-1.0 SPL
 
 # http://www.opensource.org/licenses
 OSI-APPROVED AFL-3.0 AGPL-3 Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artistic-2 as-is Boost-1.0 BSD BSD-2 CDDL CNRI CPAL-1.0 CPL-1.0 DB EPL-1.0 EUPL-1.1 GPL-2 GPL-3 IBM IPAfont ISC LGPL-2.1 LGPL-3 LPPL-1.3c MIT MPL-1.0 MPL-1.1 Ms-PL nethack NOSA OFL-1.1 OGTSL OracleDB PHP-3 PHP-3.01 POSTGRESQL PSF-2 QPL SPL W3C wxWinLL-3 wxWinLL-3.1 ZLIB ZPL
diff --git a/profiles/package.mask b/profiles/package.mask
index 65ec55ebefc7..40b24678fa4d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13397 2012/01/15 17:17:33 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13400 2012/01/16 12:57:09 ssuominen Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -31,6 +31,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Samuli Suominen <ssuominen@gentoo.org> (16 Jan 2012)
+# No longer used and only for Gnome 2.x wrt #398639
+# Removal in 30 days
+dev-dotnet/gnome-panel-sharp
+
 # Andreas K. Huettel <dilfridge@gentoo.org> (14 Jan 2012)
 # _FORTIFY_SOURCE overflows, dead project since 2003. Removal in
 # 30 days. Bug 342799.
@@ -150,12 +155,6 @@ www-client/opera-next
 =x11-libs/libpciaccess-0.12.902
 =x11-proto/inputproto-2.1.99*
 
-# Johannes Huber <johu@gentoo.org> (16 Dec 2011)
-# Masked for removal in 30 days. Dead upstream. Package
-# is not full functional. Last release was on 2010-01-14.
-# See bug #394881
-kde-misc/kcheckgmail
-
 # Hanno Boeck <hanno@gentoo.org> (15 Dec 2011)
 # Breaks pam_mount, which is its only user in the tree.
 # Can be unmasked when a new pam_mount version is released.
@@ -221,10 +220,6 @@ dev-util/cdebootstrap
 # Nothing uses libdebian-installer except cdebootstrap, remove as well
 dev-libs/libdebian-installer
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (25 Nov 2011)
-# Development release, not quite ready for general consumption
-=media-sound/rhythmbox-2.90*
-
 # Alexandre Rostovtsev <tetromino@gentoo.org> (24 Nov 2011)
 # GNOME 2 versions of seed are largely untested
 <dev-libs/seed-3.2
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index f8685efc3961..9459f1f734c2 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -638,7 +638,6 @@ app-misc/strigi:log - Enables advanced logging through dev-libs/log4cxx.
 app-misc/tablix:pvm - Add support for parallel virtual machine (sys-cluster/pvm)
 app-misc/tasque:hiveminder - Allows you to use http://www.hiveminder.com/ as your storage backend.
 app-misc/tasque:rememberthemilk - Allows you to use http://www.rememberthemilk.com/ as your storage backend.
-app-misc/tomboy:applet - Enable tomboy applet for gnome-base/gnome-panel
 app-misc/tomboy:galago - Add support for the galago desktop presence framework (dev-dotnet/galago-sharp)
 app-misc/towitoko:moneyplex - Makes libtowitoko work for the moneyplex home banking software
 app-misc/tracker:applet - Build tracker monitor applet
diff --git a/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild b/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild
index 3463d020c45e..5d389e0217a2 100644
--- a/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild
+++ b/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild,v 1.7 2012/01/15 17:44:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild,v 1.8 2012/01/16 03:08:48 jer Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ~ppc64 sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index bd97723acc86..e8da67641c56 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1 +1,2 @@
 DIST pkgcore-0.7.7.5.tar.bz2 437427 RMD160 b84604bd45c3043e25785a3afbe260e2c2d17354 SHA1 35e3b48c1a444504eb014e3ce9ea76c171dc43dc SHA256 2008524f961f588a1826b3aa18079cf65c4af38a357204590f4bcb68bcfa2197
+DIST pkgcore-0.7.7.6.tar.bz2 437497 RMD160 d56bdec9550ec7c6524cdac64edf065abeb11dce SHA1 74c688d0bd9ed93f7a8f850c0d2c1c91c7e95835 SHA256 5077cfa75227770600ed47f695a6ee58bbb69dd3932ca13972a1ad24710d7e3c
diff --git a/sys-apps/pkgcore/pkgcore-0.7.7.6.ebuild b/sys-apps/pkgcore/pkgcore-0.7.7.6.ebuild
new file mode 100644
index 000000000000..f653d5c46cf6
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.7.7.6.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.7.7.6.ebuild,v 1.1 2012/01/16 10:52:51 ferringb Exp $
+
+EAPI="3"
+DISTUTILS_SRC_TEST="setup.py"
+
+inherit distutils eutils
+
+DESCRIPTION="pkgcore package manager"
+HOMEPAGE="http://pkgcore.googlecode.com/"
+SRC_URI="http://pkgcore.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="-doc build"
+
+RDEPEND=">=dev-lang/python-2.4
+	>=dev-python/snakeoil-0.4.5
+	|| ( >=dev-lang/python-2.5 dev-python/pycrypto )"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx dev-python/pyparsing )"
+
+DOCS="AUTHORS NEWS"
+
+pkg_setup() {
+	# disable snakeoil 2to3 caching...
+	unset PY2TO3_CACHEDIR
+	python_pkg_setup
+}
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc; then
+		python setup.py build_docs || die "doc building failed"
+	fi
+}
+
+src_install() {
+	distutils_src_install
+
+	if use doc; then
+		dohtml -r build/sphinx/html/*
+	fi
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	pplugincache
+}
diff --git a/sys-boot/unetbootin/unetbootin-565.ebuild b/sys-boot/unetbootin/unetbootin-565.ebuild
index 65a562970266..8c6faa1a4eaf 100644
--- a/sys-boot/unetbootin/unetbootin-565.ebuild
+++ b/sys-boot/unetbootin/unetbootin-565.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/unetbootin/unetbootin-565.ebuild,v 1.1 2011/12/13 16:50:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/unetbootin/unetbootin-565.ebuild,v 1.2 2012/01/16 10:49:46 ago Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 UNETBOOTIN_LINGUAS="
diff --git a/sys-devel/autogen/autogen-5.12.ebuild b/sys-devel/autogen/autogen-5.12.ebuild
index 85a0a4635a0e..22f157859da6 100644
--- a/sys-devel/autogen/autogen-5.12.ebuild
+++ b/sys-devel/autogen/autogen-5.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autogen/autogen-5.12.ebuild,v 1.4 2012/01/15 19:23:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autogen/autogen-5.12.ebuild,v 1.5 2012/01/16 03:31:37 jer Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 DEPEND=">=dev-scheme/guile-1.8
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 9f894d083c36..ba633018b94e 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -15,7 +15,7 @@ DIST glibc-2.14.1-patches-2.tar.bz2 152871 RMD160 b5a24969009858e2988b04a46198b6
 DIST glibc-2.14.1-patches-3.tar.bz2 156339 RMD160 8174e9368f2dad6104371b2dd5275c82041d7878 SHA1 660a1b4b161521d075e3c82345e490c7d988218b SHA256 fdf7bb8df325e1c72c293e00083fcc6480f9873b250fc1d2cd8ca40ab6c94b20
 DIST glibc-2.14.1.tar.bz2 15650580 RMD160 f6efab63efdddefd7b868ffcba53885450064996 SHA1 f1945eea78bb30563d33c9e6a5f6f97f374135b4 SHA256 6e85a2fa3ebe6b28103361f09d27eeda37a021f24dab73f34064456d5a715b3b
 DIST glibc-2.14.tar.bz2 15630590 RMD160 f2ba450342f353c7b0a9001ad375ff0adf3f86fc SHA1 2236a3530f83637c4338d81d9ac0f5b4c5e69820 SHA256 8404b54651d42133d9a2ab17d30d698e53c5f250b2ad8e5f3d9a208ea7c75d6c
-DIST glibc-2.15-patches-2.tar.bz2 151584 RMD160 77d39ea4123e90d20327dde18451b4a07ee0e217 SHA1 d2d2562fd703e7e65ad05e1704539be3ffb689d7 SHA256 915f484c683aa992aecd145a139bb8e370c8545097a0c36d08d63af05d36fa43
+DIST glibc-2.15-patches-3.tar.bz2 149726 RMD160 0da77c68ccf66af7505c88cc6c76880711057d80 SHA1 385d9003026ce1c854717b01737ee2bd1d5b86cc SHA256 25e921cdf8d70d16d4b204c0da17e1a81a4c79b1595c447d537c9664eb03477b
 DIST glibc-2.15.tar.xz 10675188 RMD160 bc0f83611fa657d4c8cfa726bb54cfc70cab2d42 SHA1 58b038e2f184bbaac02dbfa41ed8c5851fedd5c9 SHA256 d94d85a27cac2a76ab263b7a130309a46c27ca725e39cd3260e83082366c9dd8
 DIST glibc-2.9-20081201.tar.bz2 16430489 RMD160 1e1feb4ee9c0892a0544c05adb6dd249544621cf SHA1 5756ca3b543a370c4ec9ffc8038b72bf0aa61c71 SHA256 6f8e515775e20ed48610860d10315adda418a3649b3465f36ee5cd467364a8f6
 DIST glibc-2.9-patches-8.tar.bz2 106638 RMD160 dbf343c0f2254674c6096fd65fe5dd33ad119248 SHA1 106452700e7a1a525266f79e77a49b443a8ed411 SHA256 5f1f8b569ac02c2f538bebd64d137bccb442ddfcb28b3ef17b86134edd8e3f6c
diff --git a/sys-libs/glibc/glibc-2.15.ebuild b/sys-libs/glibc/glibc-2.15.ebuild
index 24c0ab7ddd3d..be463a2d90bf 100644
--- a/sys-libs/glibc/glibc-2.15.ebuild
+++ b/sys-libs/glibc/glibc-2.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15.ebuild,v 1.2 2012/01/15 01:19:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15.ebuild,v 1.3 2012/01/16 07:56:56 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -33,7 +33,7 @@ esac
 MANPAGE_VER=""                                 # pregenerated manpages
 INFOPAGE_VER=""                                # pregenerated infopages
 LIBIDN_VER=""                                  # it's integrated into the main tarball now
-PATCH_VER="2"                                  # Gentoo patchset
+PATCH_VER="3"                                  # Gentoo patchset
 PORTS_VER=${RELEASE_VER}                       # version of glibc ports addon
 LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
@@ -195,7 +195,7 @@ done
 eblit-src_unpack-pre() {
 	case ${CHOST} in
 	x86_64*)
-		has x32 $(get_all_abis) || GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-2.14.1-x32.patch"
+		has x32 $(get_all_abis) || GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch"
 		;;
 	esac
 }