From ea29a8e2f78c05a01fc69b06bfe7a5a65ea605cd Mon Sep 17 00:00:00 2001
From: root <root@sandbox.local.calculate.ru>
Date: Wed, 28 Dec 2011 16:31:57 +0400
Subject: [PATCH] Sync with portage [Wed Dec 28 16:31:57 MSK 2011].

---
 app-admin/bcfg2/Manifest                      |   1 +
 app-admin/bcfg2/bcfg2-1.2.0.ebuild            |  57 +++
 app-admin/bcfg2/files/bcfg2-server-1.2.0.rc   |  23 ++
 app-crypt/heimdal/heimdal-1.5.1-r1.ebuild     |   7 +-
 app-forensics/openscap/metadata.xml           |  12 +-
 app-misc/tracker/Manifest                     |   2 +-
 ...er-0.12.7.ebuild => tracker-0.12.9.ebuild} |   2 +-
 .../dvipsk/dvipsk-5.991_p20110705-r1.ebuild   |   4 +-
 app-text/ps2pkm/ps2pkm-1.5_p20110705.ebuild   |   4 +-
 .../texlive-core/texlive-core-2011-r5.ebuild  |   4 +-
 app-text/texlive/texlive-2011.ebuild          |   4 +-
 dev-lang/ghc/Manifest                         |   1 +
 .../ghc/files/ghc-7.0.4-fix-ppc-linker.patch  |  23 ++
 dev-lang/ghc/ghc-7.0.4.ebuild                 |   8 +-
 dev-lang/nqp/nqp-2011.12.ebuild               |   6 +-
 dev-lang/ruby/Manifest                        |   7 -
 dev-lang/ruby/ruby-1.8.7_p334-r1.ebuild       | 195 ----------
 dev-lang/ruby/ruby-1.8.7_p334-r2.ebuild       | 195 ----------
 dev-lang/ruby/ruby-1.9.2_p290.ebuild          | 225 -----------
 dev-lang/ruby/ruby-1.9.3_p0.ebuild            |   8 +-
 dev-lang/ruby/ruby-1.9.3_rc1.ebuild           | 226 -----------
 dev-libs/crypto++/crypto++-5.6.1-r2.ebuild    |  55 +++
 .../files/crypto++-5.6.1-rijndael.patch       |  14 +
 .../ptexenc/ptexenc-1.2.0_p20110705.ebuild    |   4 +-
 dev-perl/Geo-IP/Geo-IP-1.28.ebuild            |  19 -
 dev-perl/Geo-IP/Manifest                      |   1 -
 dev-python/msgpack/Manifest                   |   1 +
 dev-python/msgpack/metadata.xml               |   5 +
 dev-python/msgpack/msgpack-0.1.12.ebuild      |  47 +++
 .../deprecated/deprecated-2.0.1-r1.ebuild     |   4 +-
 .../deprecated/deprecated-2.0.1-r2.ebuild     |  27 ++
 dev-ruby/facter/facter-1.6.0.ebuild           |   4 +-
 dev-ruby/gruff/gruff-0.3.6-r1.ebuild          |   4 +-
 dev-ruby/gruff/gruff-0.3.6-r2.ebuild          |  45 +++
 dev-ruby/hike/hike-1.2.1.ebuild               |   6 +-
 dev-ruby/mechanize/mechanize-1.0.0-r1.ebuild  |  32 ++
 dev-ruby/mechanize/mechanize-1.0.0.ebuild     |   4 +-
 dev-ruby/method_source/Manifest               |   2 -
 .../method_source/method_source-0.6.5.ebuild  |  29 --
 .../method_source/method_source-0.6.6.ebuild  |  36 --
 dev-ruby/mkrf/mkrf-0.2.3-r2.ebuild            |  29 ++
 dev-ruby/narray/narray-0.6.0.1-r1.ebuild      |  54 +++
 dev-ruby/narray/narray-0.6.0.1.ebuild         |   4 +-
 dev-ruby/net-ssh/net-ssh-2.0.23.ebuild        |   6 +-
 dev-ruby/pg/pg-0.11.0.ebuild                  |   4 +-
 .../rspec-core/rspec-core-2.6.4-r1.ebuild     |  73 ++++
 dev-ruby/rspec-core/rspec-core-2.6.4.ebuild   |   4 +-
 .../rspec-expectations-2.6.0-r1.ebuild        |  47 +++
 .../rspec-expectations-2.6.0.ebuild           |   4 +-
 .../rspec-mocks/rspec-mocks-2.6.0-r1.ebuild   |  61 +++
 dev-ruby/rspec-mocks/rspec-mocks-2.6.0.ebuild |   4 +-
 dev-ruby/rspec/rspec-1.3.1-r1.ebuild          |   6 +-
 dev-ruby/rspec/rspec-1.3.1.ebuild             |   6 +-
 dev-ruby/rspec/rspec-2.6.0-r1.ebuild          |  28 ++
 dev-ruby/rspec/rspec-2.6.0.ebuild             |   4 +-
 .../ruby-opengl/ruby-opengl-0.60.1-r1.ebuild  |   6 +-
 dev-ruby/sary-ruby/sary-ruby-1.2.0-r2.ebuild  |   4 +-
 dev-ruby/sary-ruby/sary-ruby-1.2.0-r3.ebuild  |  49 +++
 dev-ruby/tmail/tmail-1.2.7.1-r2.ebuild        |   4 +-
 dev-ruby/tmail/tmail-1.2.7.1-r3.ebuild        |  70 ++++
 dev-ruby/tzinfo/Manifest                      |   1 -
 ...-0.3.30.ebuild => tzinfo-0.3.31-r1.ebuild} |   8 +-
 dev-ruby/tzinfo/tzinfo-0.3.31.ebuild          |   4 +-
 dev-tex/bibtexu/bibtexu-3.71_p20110705.ebuild |   4 +-
 dev-tex/mh/mh-20111011.ebuild                 |   4 +-
 .../texlive-basic-2011-r1.ebuild              |   4 +-
 .../texlive-bibtexextra-2011.ebuild           |   4 +-
 .../texlive-context-2011.ebuild               |   4 +-
 .../texlive-documentation-arabic-2011.ebuild  |   4 +-
 .../texlive-documentation-base-2011.ebuild    |   4 +-
 ...exlive-documentation-bulgarian-2011.ebuild |   4 +-
 .../texlive-documentation-chinese-2011.ebuild |   4 +-
 ...live-documentation-czechslovak-2011.ebuild |   4 +-
 .../texlive-documentation-dutch-2011.ebuild   |   4 +-
 .../texlive-documentation-english-2011.ebuild |   4 +-
 .../texlive-documentation-finnish-2011.ebuild |   4 +-
 .../texlive-documentation-french-2011.ebuild  |   4 +-
 .../texlive-documentation-german-2011.ebuild  |   4 +-
 .../texlive-documentation-italian-2011.ebuild |   4 +-
 ...texlive-documentation-japanese-2011.ebuild |   4 +-
 .../texlive-documentation-korean-2011.ebuild  |   4 +-
 ...exlive-documentation-mongolian-2011.ebuild |   4 +-
 .../texlive-documentation-polish-2011.ebuild  |   4 +-
 ...xlive-documentation-portuguese-2011.ebuild |   4 +-
 .../texlive-documentation-russian-2011.ebuild |   4 +-
 .../texlive-documentation-serbian-2011.ebuild |   4 +-
 ...exlive-documentation-slovenian-2011.ebuild |   4 +-
 .../texlive-documentation-spanish-2011.ebuild |   4 +-
 .../texlive-documentation-thai-2011.ebuild    |   4 +-
 .../texlive-documentation-turkish-2011.ebuild |   4 +-
 ...exlive-documentation-ukrainian-2011.ebuild |   4 +-
 ...xlive-documentation-vietnamese-2011.ebuild |   4 +-
 .../texlive-fontsextra-2011.ebuild            |   4 +-
 .../texlive-fontsrecommended-2011.ebuild      |   4 +-
 .../texlive-fontutils-2011.ebuild             |   4 +-
 .../texlive-formatsextra-2011.ebuild          |   4 +-
 .../texlive-games/texlive-games-2011.ebuild   |   4 +-
 .../texlive-genericextra-2011.ebuild          |   4 +-
 .../texlive-genericrecommended-2011.ebuild    |   4 +-
 .../texlive-htmlxml-2011.ebuild               |   4 +-
 .../texlive-humanities-2011.ebuild            |   4 +-
 .../texlive-langafrican-2011.ebuild           |   4 +-
 .../texlive-langarabic-2011.ebuild            |   4 +-
 .../texlive-langarmenian-2011.ebuild          |   4 +-
 .../texlive-langcjk-2011.ebuild               |   4 +-
 .../texlive-langcroatian-2011.ebuild          |   4 +-
 .../texlive-langcyrillic-2011.ebuild          |   4 +-
 .../texlive-langczechslovak-2011.ebuild       |   4 +-
 .../texlive-langdanish-2011.ebuild            |   4 +-
 .../texlive-langdutch-2011.ebuild             |   4 +-
 .../texlive-langenglish-2011.ebuild           |   4 +-
 .../texlive-langfinnish-2011.ebuild           |   4 +-
 .../texlive-langfrench-2011.ebuild            |   4 +-
 .../texlive-langgerman-2011.ebuild            |   4 +-
 .../texlive-langgreek-2011.ebuild             |   4 +-
 .../texlive-langhebrew-2011.ebuild            |   4 +-
 .../texlive-langhungarian-2011.ebuild         |   4 +-
 .../texlive-langindic-2011.ebuild             |   4 +-
 .../texlive-langitalian-2011.ebuild           |   4 +-
 .../texlive-langlatin-2011.ebuild             |   4 +-
 .../texlive-langlatvian-2011.ebuild           |   4 +-
 .../texlive-langlithuanian-2011.ebuild        |   4 +-
 .../texlive-langmongolian-2011.ebuild         |   4 +-
 .../texlive-langnorwegian-2011.ebuild         |   4 +-
 .../texlive-langother-2011.ebuild             |   4 +-
 .../texlive-langpolish-2011.ebuild            |   4 +-
 .../texlive-langportuguese-2011.ebuild        |   4 +-
 .../texlive-langspanish-2011.ebuild           |   4 +-
 .../texlive-langswedish-2011.ebuild           |   4 +-
 .../texlive-langtibetan-2011.ebuild           |   4 +-
 .../texlive-langturkmen-2011.ebuild           |   4 +-
 .../texlive-langvietnamese-2011.ebuild        |   4 +-
 .../texlive-latex/texlive-latex-2011.ebuild   |   4 +-
 .../texlive-latexextra-2011-r2.ebuild         |   4 +-
 .../texlive-latexrecommended-2011.ebuild      |   4 +-
 .../texlive-luatex/texlive-luatex-2011.ebuild |   4 +-
 .../texlive-mathextra-2011.ebuild             |   4 +-
 .../texlive-metapost-2011.ebuild              |   4 +-
 .../texlive-music/texlive-music-2011.ebuild   |   4 +-
 .../texlive-omega/texlive-omega-2011.ebuild   |   4 +-
 .../texlive-pictures-2011.ebuild              |   4 +-
 .../texlive-plainextra-2011.ebuild            |   4 +-
 .../texlive-pstricks-2011.ebuild              |   4 +-
 .../texlive-publishers-2011.ebuild            |   4 +-
 .../texlive-science-2011.ebuild               |   4 +-
 .../texlive-texinfo-2011.ebuild               |   4 +-
 .../texlive-xetex/texlive-xetex-2011.ebuild   |   4 +-
 dev-util/biew/metadata.xml                    |   3 +-
 dev-util/debhelper/Manifest                   |   1 +
 dev-util/debhelper/debhelper-8.9.14.ebuild    |  71 ++++
 eclass/flag-o-matic.eclass                    |  58 ++-
 gnome-extra/nautilus-tracker-tags/Manifest    |   2 +-
 ...ld => nautilus-tracker-tags-0.12.9.ebuild} |   2 +-
 mail-client/thunderbird-bin/Manifest          | 144 +++----
 .../thunderbird-bin-3.1.10.ebuild             | 167 ---------
 ....0.ebuild => thunderbird-bin-9.0.1.ebuild} |  55 ++-
 media-sound/amarok/amarok-2.4.3-r1.ebuild     | 119 ++++++
 media-sound/amarok/amarok-2.5.0-r1.ebuild     | 135 +++++++
 media-sound/amarok/metadata.xml               |  13 +-
 metadata/cache/app-admin/bcfg2-1.2.0          |  22 ++
 metadata/cache/app-crypt/heimdal-1.5.1-r1     |   6 +-
 .../{tracker-0.12.7 => tracker-0.12.9}        |   2 +-
 .../cache/app-text/dvipsk-5.991_p20110705-r1  |   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-lang/ghc-7.0.4             |   2 +-
 metadata/cache/dev-lang/nqp-2011.12           |   2 +-
 metadata/cache/dev-lang/ruby-1.8.7_p334-r1    |  22 --
 metadata/cache/dev-lang/ruby-1.8.7_p334-r2    |  22 --
 metadata/cache/dev-lang/ruby-1.9.2_p290       |  22 --
 metadata/cache/dev-lang/ruby-1.9.3_p0         |   4 +-
 metadata/cache/dev-lang/ruby-1.9.3_rc1        |  22 --
 metadata/cache/dev-libs/crypto++-5.6.1-r2     |  22 ++
 .../cache/dev-libs/ptexenc-1.2.0_p20110705    |   2 +-
 metadata/cache/dev-perl/Geo-IP-1.28           |  22 --
 metadata/cache/dev-python/msgpack-0.1.12      |  22 ++
 metadata/cache/dev-ruby/deprecated-2.0.1-r1   |   6 +-
 metadata/cache/dev-ruby/deprecated-2.0.1-r2   |  22 ++
 metadata/cache/dev-ruby/facter-1.6.0          |   6 +-
 metadata/cache/dev-ruby/gruff-0.3.6-r1        |   6 +-
 metadata/cache/dev-ruby/gruff-0.3.6-r2        |  22 ++
 metadata/cache/dev-ruby/hike-1.2.1            |   8 +-
 metadata/cache/dev-ruby/mechanize-1.0.0       |   6 +-
 metadata/cache/dev-ruby/mechanize-1.0.0-r1    |  22 ++
 metadata/cache/dev-ruby/method_source-0.6.5   |  22 --
 metadata/cache/dev-ruby/method_source-0.6.6   |  22 --
 metadata/cache/dev-ruby/mkrf-0.2.3-r2         |  22 ++
 metadata/cache/dev-ruby/narray-0.6.0.1        |   8 +-
 metadata/cache/dev-ruby/narray-0.6.0.1-r1     |  22 ++
 metadata/cache/dev-ruby/net-ssh-2.0.23        |   6 +-
 metadata/cache/dev-ruby/pg-0.11.0             |   6 +-
 metadata/cache/dev-ruby/rspec-1.3.1           |   6 +-
 metadata/cache/dev-ruby/rspec-1.3.1-r1        |   6 +-
 metadata/cache/dev-ruby/rspec-2.6.0           |   6 +-
 metadata/cache/dev-ruby/rspec-2.6.0-r1        |  22 ++
 metadata/cache/dev-ruby/rspec-core-2.6.4      |   6 +-
 metadata/cache/dev-ruby/rspec-core-2.6.4-r1   |  22 ++
 .../cache/dev-ruby/rspec-expectations-2.6.0   |   6 +-
 .../dev-ruby/rspec-expectations-2.6.0-r1      |  22 ++
 metadata/cache/dev-ruby/rspec-mocks-2.6.0     |   6 +-
 metadata/cache/dev-ruby/rspec-mocks-2.6.0-r1  |  22 ++
 metadata/cache/dev-ruby/ruby-opengl-0.60.1-r1 |   6 +-
 metadata/cache/dev-ruby/sary-ruby-1.2.0-r2    |   6 +-
 metadata/cache/dev-ruby/sary-ruby-1.2.0-r3    |  22 ++
 metadata/cache/dev-ruby/tmail-1.2.7.1-r2      |   6 +-
 metadata/cache/dev-ruby/tmail-1.2.7.1-r3      |  22 ++
 metadata/cache/dev-ruby/tzinfo-0.3.31         |   6 +-
 .../{tzinfo-0.3.30 => tzinfo-0.3.31-r1}       |   6 +-
 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/debhelper-8.9.14      |  22 ++
 ...gs-0.12.7 => nautilus-tracker-tags-0.12.9} |   6 +-
 .../cache/mail-client/thunderbird-bin-3.1.10  |  22 --
 .../cache/mail-client/thunderbird-bin-6.0     |  22 --
 .../cache/mail-client/thunderbird-bin-9.0.1   |  22 ++
 metadata/cache/media-sound/amarok-2.4.3-r1    |  22 ++
 metadata/cache/media-sound/amarok-2.5.0-r1    |  22 ++
 .../{allpathslg-35725-r1 => allpathslg-40063} |   6 +-
 metadata/cache/sys-apps/portage-2.1.10.44     |  22 ++
 metadata/cache/www-servers/nginx-1.1.11       |  22 --
 .../{nginx-1.1.12 => nginx-1.1.12-r1}         |   4 +-
 metadata/cache/x11-libs/gtk+-3.2.1            |  22 --
 .../cache/x11-libs/{gtk+-3.2.2 => gtk+-3.2.3} |   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 +-
 profiles/use.local.desc                       |   2 +
 sci-biology/allpathslg/Manifest               |   2 +-
 ...5725-r1.ebuild => allpathslg-40063.ebuild} |   7 +-
 sys-apps/portage/Manifest                     |   1 +
 sys-apps/portage/portage-2.1.10.44.ebuild     | 354 ++++++++++++++++++
 www-servers/nginx/Manifest                    |   1 -
 www-servers/nginx/metadata.xml                |   1 +
 www-servers/nginx/nginx-1.1.11.ebuild         | 341 -----------------
 ...x-1.1.12.ebuild => nginx-1.1.12-r1.ebuild} |   6 +-
 x11-libs/gtk+/Manifest                        |   2 +-
 x11-libs/gtk+/gtk+-3.2.1.ebuild               | 195 ----------
 .../{gtk+-3.2.2.ebuild => gtk+-3.2.3.ebuild}  |   3 +-
 324 files changed, 2390 insertions(+), 2466 deletions(-)
 create mode 100644 app-admin/bcfg2/bcfg2-1.2.0.ebuild
 create mode 100644 app-admin/bcfg2/files/bcfg2-server-1.2.0.rc
 rename app-misc/tracker/{tracker-0.12.7.ebuild => tracker-0.12.9.ebuild} (99%)
 create mode 100644 dev-lang/ghc/files/ghc-7.0.4-fix-ppc-linker.patch
 delete mode 100644 dev-lang/ruby/ruby-1.8.7_p334-r1.ebuild
 delete mode 100644 dev-lang/ruby/ruby-1.8.7_p334-r2.ebuild
 delete mode 100644 dev-lang/ruby/ruby-1.9.2_p290.ebuild
 delete mode 100644 dev-lang/ruby/ruby-1.9.3_rc1.ebuild
 create mode 100644 dev-libs/crypto++/crypto++-5.6.1-r2.ebuild
 create mode 100644 dev-libs/crypto++/files/crypto++-5.6.1-rijndael.patch
 delete mode 100644 dev-perl/Geo-IP/Geo-IP-1.28.ebuild
 create mode 100644 dev-python/msgpack/Manifest
 create mode 100644 dev-python/msgpack/metadata.xml
 create mode 100644 dev-python/msgpack/msgpack-0.1.12.ebuild
 create mode 100644 dev-ruby/deprecated/deprecated-2.0.1-r2.ebuild
 create mode 100644 dev-ruby/gruff/gruff-0.3.6-r2.ebuild
 create mode 100644 dev-ruby/mechanize/mechanize-1.0.0-r1.ebuild
 delete mode 100644 dev-ruby/method_source/method_source-0.6.5.ebuild
 delete mode 100644 dev-ruby/method_source/method_source-0.6.6.ebuild
 create mode 100644 dev-ruby/mkrf/mkrf-0.2.3-r2.ebuild
 create mode 100644 dev-ruby/narray/narray-0.6.0.1-r1.ebuild
 create mode 100644 dev-ruby/rspec-core/rspec-core-2.6.4-r1.ebuild
 create mode 100644 dev-ruby/rspec-expectations/rspec-expectations-2.6.0-r1.ebuild
 create mode 100644 dev-ruby/rspec-mocks/rspec-mocks-2.6.0-r1.ebuild
 create mode 100644 dev-ruby/rspec/rspec-2.6.0-r1.ebuild
 create mode 100644 dev-ruby/sary-ruby/sary-ruby-1.2.0-r3.ebuild
 create mode 100644 dev-ruby/tmail/tmail-1.2.7.1-r3.ebuild
 rename dev-ruby/tzinfo/{tzinfo-0.3.30.ebuild => tzinfo-0.3.31-r1.ebuild} (78%)
 create mode 100644 dev-util/debhelper/debhelper-8.9.14.ebuild
 rename gnome-extra/nautilus-tracker-tags/{nautilus-tracker-tags-0.12.7.ebuild => nautilus-tracker-tags-0.12.9.ebuild} (92%)
 delete mode 100644 mail-client/thunderbird-bin/thunderbird-bin-3.1.10.ebuild
 rename mail-client/thunderbird-bin/{thunderbird-bin-6.0.ebuild => thunderbird-bin-9.0.1.ebuild} (73%)
 create mode 100644 media-sound/amarok/amarok-2.4.3-r1.ebuild
 create mode 100644 media-sound/amarok/amarok-2.5.0-r1.ebuild
 create mode 100644 metadata/cache/app-admin/bcfg2-1.2.0
 rename metadata/cache/app-misc/{tracker-0.12.7 => tracker-0.12.9} (98%)
 delete mode 100644 metadata/cache/dev-lang/ruby-1.8.7_p334-r1
 delete mode 100644 metadata/cache/dev-lang/ruby-1.8.7_p334-r2
 delete mode 100644 metadata/cache/dev-lang/ruby-1.9.2_p290
 delete mode 100644 metadata/cache/dev-lang/ruby-1.9.3_rc1
 create mode 100644 metadata/cache/dev-libs/crypto++-5.6.1-r2
 delete mode 100644 metadata/cache/dev-perl/Geo-IP-1.28
 create mode 100644 metadata/cache/dev-python/msgpack-0.1.12
 create mode 100644 metadata/cache/dev-ruby/deprecated-2.0.1-r2
 create mode 100644 metadata/cache/dev-ruby/gruff-0.3.6-r2
 create mode 100644 metadata/cache/dev-ruby/mechanize-1.0.0-r1
 delete mode 100644 metadata/cache/dev-ruby/method_source-0.6.5
 delete mode 100644 metadata/cache/dev-ruby/method_source-0.6.6
 create mode 100644 metadata/cache/dev-ruby/mkrf-0.2.3-r2
 create mode 100644 metadata/cache/dev-ruby/narray-0.6.0.1-r1
 create mode 100644 metadata/cache/dev-ruby/rspec-2.6.0-r1
 create mode 100644 metadata/cache/dev-ruby/rspec-core-2.6.4-r1
 create mode 100644 metadata/cache/dev-ruby/rspec-expectations-2.6.0-r1
 create mode 100644 metadata/cache/dev-ruby/rspec-mocks-2.6.0-r1
 create mode 100644 metadata/cache/dev-ruby/sary-ruby-1.2.0-r3
 create mode 100644 metadata/cache/dev-ruby/tmail-1.2.7.1-r3
 rename metadata/cache/dev-ruby/{tzinfo-0.3.30 => tzinfo-0.3.31-r1} (55%)
 create mode 100644 metadata/cache/dev-util/debhelper-8.9.14
 rename metadata/cache/gnome-extra/{nautilus-tracker-tags-0.12.7 => nautilus-tracker-tags-0.12.9} (62%)
 delete mode 100644 metadata/cache/mail-client/thunderbird-bin-3.1.10
 delete mode 100644 metadata/cache/mail-client/thunderbird-bin-6.0
 create mode 100644 metadata/cache/mail-client/thunderbird-bin-9.0.1
 create mode 100644 metadata/cache/media-sound/amarok-2.4.3-r1
 create mode 100644 metadata/cache/media-sound/amarok-2.5.0-r1
 rename metadata/cache/sci-biology/{allpathslg-35725-r1 => allpathslg-40063} (75%)
 create mode 100644 metadata/cache/sys-apps/portage-2.1.10.44
 delete mode 100644 metadata/cache/www-servers/nginx-1.1.11
 rename metadata/cache/www-servers/{nginx-1.1.12 => nginx-1.1.12-r1} (61%)
 delete mode 100644 metadata/cache/x11-libs/gtk+-3.2.1
 rename metadata/cache/x11-libs/{gtk+-3.2.2 => gtk+-3.2.3} (98%)
 rename sci-biology/allpathslg/{allpathslg-35725-r1.ebuild => allpathslg-40063.ebuild} (84%)
 create mode 100644 sys-apps/portage/portage-2.1.10.44.ebuild
 delete mode 100644 www-servers/nginx/nginx-1.1.11.ebuild
 rename www-servers/nginx/{nginx-1.1.12.ebuild => nginx-1.1.12-r1.ebuild} (98%)
 delete mode 100644 x11-libs/gtk+/gtk+-3.2.1.ebuild
 rename x11-libs/gtk+/{gtk+-3.2.2.ebuild => gtk+-3.2.3.ebuild} (97%)

diff --git a/app-admin/bcfg2/Manifest b/app-admin/bcfg2/Manifest
index 4d7a9fe888fd..bfee909dc2e1 100644
--- a/app-admin/bcfg2/Manifest
+++ b/app-admin/bcfg2/Manifest
@@ -1,2 +1,3 @@
 DIST bcfg2-1.1.3.tar.gz 1784202 RMD160 b00ce8b7f89142e1bb24cb843697a7a0a854b31d SHA1 d3690cc62e0acc8d4affa43b7b48f3280355f5f6 SHA256 bc345a158896967450ddb0c56ae66a25dd31216eb1a1ea954ded494535fdcb05
+DIST bcfg2-1.2.0.tar.gz 1945551 RMD160 db89ee0b8975bf50ad68bfac122e50253ded1906 SHA1 4fb57f24d2fbce3d6afc0d0b4fbecdd7e05bc5a9 SHA256 138d792423475ae6516a95578a3df191504afaff31007877c7c2b36830d1a260
 DIST bcfg2-1.2.0rc2.tar.gz 1942476 RMD160 a717f46623f4251c2cee1b4cf143d380e50ffe14 SHA1 d11d09269200d3d866e4574e052a3102a5d19222 SHA256 d9d9b269fb25b3898b92532bfdb26ab8905a8184824e3576ff5c95d9c08f09ab
diff --git a/app-admin/bcfg2/bcfg2-1.2.0.ebuild b/app-admin/bcfg2/bcfg2-1.2.0.ebuild
new file mode 100644
index 000000000000..c93ced670f4d
--- /dev/null
+++ b/app-admin/bcfg2/bcfg2-1.2.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/bcfg2-1.2.0.ebuild,v 1.1 2011/12/28 07:56:20 xmw Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+# ssl module required.
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
+
+inherit distutils
+
+DESCRIPTION="configuration management tool"
+HOMEPAGE="http://bcfg2.org"
+SRC_URI="ftp://ftp.mcs.anl.gov/pub/bcfg/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="server"
+
+DEPEND=""
+RDEPEND="app-portage/gentoolkit
+	server? (
+		dev-python/lxml
+		dev-libs/libgamin[python] )"
+
+PYTHON_MODNAME="Bcfg2"
+
+distutils_src_install_post_hook() {
+	if ! use server; then
+		rm -f "$(distutils_get_intermediate_installation_image)${EPREFIX}/usr/sbin/bcfg2-"*
+	fi
+}
+
+src_install() {
+	distutils_src_install --record=PY_SERVER_LIBS --install-scripts "${EPREFIX}/usr/sbin"
+
+	if ! use server; then
+		rm -rf "${ED}usr/share/bcfg2"
+		rm -rf "${ED}usr/share/man/man8"
+	else
+		newinitd "${FILESDIR}/bcfg2-server.rc" bcfg2-server
+	fi
+
+	insinto /etc
+	doins examples/bcfg2.conf || die
+}
+
+pkg_postinst () {
+	distutils_pkg_postinst
+
+	if use server; then
+		einfo "If this is a new installation, you probably need to run:"
+		einfo "    bcfg2-admin init"
+	fi
+}
diff --git a/app-admin/bcfg2/files/bcfg2-server-1.2.0.rc b/app-admin/bcfg2/files/bcfg2-server-1.2.0.rc
new file mode 100644
index 000000000000..d3edc5ca949a
--- /dev/null
+++ b/app-admin/bcfg2/files/bcfg2-server-1.2.0.rc
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+#
+# bcfgd - bcfg configuration daemon
+#
+# 
+
+depend () {
+	need net
+}
+
+start () {
+	ebegin "Starting bcfg2-server"
+	start-stop-daemon --start --quiet --pidfile /var/run/bcfg2-server.pid \
+		--exec /usr/sbin/bcfg2-server -- -D /var/run/bcfg2-server.pid
+	eend $? "Failed to start bcfg2-server"
+}
+
+stop () {
+	ebegin "Stopping bcfg2-server"
+	start-stop-daemon --stop --quiet --pidfile /var/run/bcfg2-server.pid \
+		--signal INT
+	eend $? "Failed to stop bcfg2-server"
+}
diff --git a/app-crypt/heimdal/heimdal-1.5.1-r1.ebuild b/app-crypt/heimdal/heimdal-1.5.1-r1.ebuild
index 9d029170b0cd..4ede23883d7a 100644
--- a/app-crypt/heimdal/heimdal-1.5.1-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-1.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.1-r1.ebuild,v 1.1 2011/12/27 21:15:10 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.1-r1.ebuild,v 1.3 2011/12/28 08:17:37 ago Exp $
 
 EAPI=2
 # PYTHON_BDEPEND="2"
@@ -15,7 +15,7 @@ SRC_URI="http://www.h5l.org/dist/src/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit ssl static-libs threads test X"
 
 RDEPEND="ssl? ( dev-libs/openssl )
@@ -26,7 +26,8 @@ RDEPEND="ssl? ( dev-libs/openssl )
 	>=sys-libs/e2fsprogs-libs-1.41.11
 	afs? ( net-fs/openafs )
 	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
-	!!app-crypt/mit-krb5"
+	!!app-crypt/mit-krb5
+	!!app-crypt/mit-krb5-appl"
 
 DEPEND="${RDEPEND}
 	=dev-lang/python-2*
diff --git a/app-forensics/openscap/metadata.xml b/app-forensics/openscap/metadata.xml
index a3016cd59c15..e20ecc98b6a4 100644
--- a/app-forensics/openscap/metadata.xml
+++ b/app-forensics/openscap/metadata.xml
@@ -3,14 +3,14 @@
 <pkgmetadata>
 <herd>proxy-maintainers</herd>
 <maintainer>
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-<description>Proxy maintainer. CC him on bugs</description>
-</maintainer>
-<maintainer>
 <email>corentin.labbe@geomatys.fr</email>
 <name>LABBE Corentin (Montjoie)</name>
-<description>Maintainer. Assign bugs to him</description>
+<description>Maintainer.</description>
+</maintainer>
+<maintainer>
+<email>hwoarang@gentoo.org</email>
+<name>Markos Chandras</name>
+<description>Proxy maintainer.</description>
 </maintainer>
 <use>
 <flag name="nss">Prefer NSS over libgcrypt as the crypto engine</flag>
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index f754efe1b181..8a9778736809 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,4 +1,4 @@
 DIST tracker-0.10.27.tar.xz 5721444 RMD160 63e3609ac51fae013fc0daf9935ec50ef3a4c609 SHA1 01f0a52a21c3aecaaf6cfb140f7a4b5085a7bc5f SHA256 30ca97cc8a1c82cb0e09a921c0ebe8acbfe7be6908b2303266f447477465444f
 DIST tracker-0.10.35.tar.xz 5754872 RMD160 6919a7623bf3f041b617d7c2a2b55856863b5e9e SHA1 93fdeb6be256085e72f1ab9f9e578332de9605f0 SHA256 5f6a32d0b2b0036f4aec74a6d36d889e33ea038a1530161ca4eb9a549cc87fe3
-DIST tracker-0.12.7.tar.xz 5969180 RMD160 e31b85538145404640c303968ecbbb8f729d2564 SHA1 188c9aaa5478302be818e36c3ef126267971289d SHA256 e7a4d016326bc0a1b6aea07e48c3de73ffc29119812149e2dee5eac35104f1b4
 DIST tracker-0.12.8.tar.xz 5876100 RMD160 10f29842973c0489d5e0c2e0c0c977ca87d47fee SHA1 a1a528bdcaacce4350c2368026083236db7cd165 SHA256 92b18cc381a80d87d52e386f51ca1475b94f82cf5adf668424669c5b63474473
+DIST tracker-0.12.9.tar.xz 5867980 RMD160 1c6054ffc9f3588db0d355fcfb02703ab8d403c2 SHA1 b5fc5465f3da00c0b2b23cddc0f55a3d1b66d0b7 SHA256 ccd61c8f79905f7e09af3a4a863772256601dcd3213b0f9a3f76add04e553b5c
diff --git a/app-misc/tracker/tracker-0.12.7.ebuild b/app-misc/tracker/tracker-0.12.9.ebuild
similarity index 99%
rename from app-misc/tracker/tracker-0.12.7.ebuild
rename to app-misc/tracker/tracker-0.12.9.ebuild
index 63de79a65825..33bc1fb685f9 100644
--- a/app-misc/tracker/tracker-0.12.7.ebuild
+++ b/app-misc/tracker/tracker-0.12.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.7.ebuild,v 1.3 2011/11/26 19:27:22 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.9.ebuild,v 1.1 2011/12/28 05:39:02 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
diff --git a/app-text/dvipsk/dvipsk-5.991_p20110705-r1.ebuild b/app-text/dvipsk/dvipsk-5.991_p20110705-r1.ebuild
index 796b7d7bf12a..9bdb40a14339 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
 # 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.1 2011/11/02 21:15:53 aballier Exp $
+# $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 $
 
 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/ps2pkm/ps2pkm-1.5_p20110705.ebuild b/app-text/ps2pkm/ps2pkm-1.5_p20110705.ebuild
index 34adf8b69364..81f3a2d2c633 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
 # 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.1 2011/07/27 13:57:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ps2pkm/ps2pkm-1.5_p20110705.ebuild,v 1.2 2011/12/28 04:27:12 jer 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 1c9bbadb8671..bdc7d5e53939 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
 # 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.1 2011/11/02 21:08:48 aballier Exp $
+# $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 $
 
 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 ea87d3fdf260..9bc23bc51307 100644
--- a/app-text/texlive/texlive-2011.ebuild
+++ b/app-text/texlive/texlive-2011.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.4 2011/10/11 14:15:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive/texlive-2011.ebuild,v 1.5 2011/12/28 05:59:57 jer 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-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index e38f3b36f1d0..7021d44c2603 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -23,5 +23,6 @@ DIST ghc-bin-6.12.3-x86.tbz2 82262946 RMD160 8256df61e6998d819c7d40d613037c5f313
 DIST ghc-bin-7.0.4-alpha.tbz2 111174890 RMD160 efefd10c170e67c3b4b2390fb6bc40bdf4167ba0 SHA1 e90397df11e41aa1b8138b9c5de3caa516d5cec5 SHA256 a83e77b23b49b5d5e47d55019ff7583802b074b5fc48df622572931252391107
 DIST ghc-bin-7.0.4-amd64.tbz2 82353700 RMD160 89a3520ab32a11ef1359a454705d955055845132 SHA1 87350c1186b6033bd0deb9918be7974c07975a4c SHA256 7232ee42a99046d084668cb08d5a7b80ee0adeaf4b26fa5b900b9ea2759bd807
 DIST ghc-bin-7.0.4-arm.tbz2 113773534 RMD160 f8e8827b47b9c73cc12594f25d5afc4c24dba883 SHA1 0ed57f08149dbdc2980208da135e36d0f4a36cea SHA256 cad8248628d33f2f02a46fd8c40170f75273f3dbb8e443a427fcad2840911138
+DIST ghc-bin-7.0.4-ppc.tbz2 95836292 RMD160 d788b8fc4af89c0d6111f70acd8e6afcb95f5c30 SHA1 98fc374dad79171308dcf295e4cac48d06af61f0 SHA256 7ecb2c963da8ad3190dc923c70485ea9abcb5c1bc5e3458b6b0217da997ef3c7
 DIST ghc-bin-7.0.4-sparc.tbz2 82859870 RMD160 39494fbf3dc6c4ec553219281f3a2b0338f5be96 SHA1 a7dc521ed68d69a07d3c5988a1fd4b9502a7deab SHA256 72e067091fa2108c9b5c42bce833e2ac853a9c3bb3406ae23d1d25b5c71168e2
 DIST ghc-bin-7.0.4-x86.tbz2 81814964 RMD160 c901d8b58679d243fa0e77ac7b8d0b6c63fc4bbc SHA1 1a31ff2813bfa0ca8d2dda2d501f95d396974eed SHA256 45450fea47fb8b6cea50bcd7b6c78d121ba6444a5e70f8a53b81009cedcc5838
diff --git a/dev-lang/ghc/files/ghc-7.0.4-fix-ppc-linker.patch b/dev-lang/ghc/files/ghc-7.0.4-fix-ppc-linker.patch
new file mode 100644
index 000000000000..42caa7f7db88
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-7.0.4-fix-ppc-linker.patch
@@ -0,0 +1,23 @@
+commit 243c304273a1254418aeacf4d81cadb2d59945ad
+Author: Erik de Castro Lopo <erikd@mega-nerd.com>
+Date:   Mon Apr 4 22:40:15 2011 +1000
+
+    Fix compiling on linux-powerpc.
+
+diff --git a/rts/Linker.c b/rts/Linker.c
+index 5285ec6..c840857 100644
+--- a/rts/Linker.c
++++ b/rts/Linker.c
+@@ -2572,7 +2572,11 @@ static void
+ ocFlushInstructionCache( ObjectCode *oc )
+ {
+     /* The main object code */
+-    ocFlushInstructionCacheFrom(oc->image + oc->misalignment, oc->fileSize);
++    ocFlushInstructionCacheFrom(oc->image
++#ifdef darwin_HOST_OS
++            + oc->misalignment
++#endif
++            , oc->fileSize);
+ 
+     /* Jump Islands */
+     ocFlushInstructionCacheFrom(oc->symbol_extras, sizeof(SymbolExtra) * oc->n_symbol_extras);
diff --git a/dev-lang/ghc/ghc-7.0.4.ebuild b/dev-lang/ghc/ghc-7.0.4.ebuild
index 601dc1cdf4ad..060cab0b7082 100644
--- a/dev-lang/ghc/ghc-7.0.4.ebuild
+++ b/dev-lang/ghc/ghc-7.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.0.4.ebuild,v 1.3 2011/08/23 18:08:05 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.0.4.ebuild,v 1.4 2011/12/28 08:47:34 josejx Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -43,7 +43,7 @@ arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha
 arch_binaries="$arch_binaries arm? ( http://code.haskell.org/~slyfox/ghc-arm/ghc-bin-${PV}-arm.tbz2 )"
 arch_binaries="$arch_binaries amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-${PV}-amd64.tbz2 )"
 #arch_binaries="$arch_binaries ia64?  ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
-#arch_binaries="$arch_binaries ppc? ( mirror://gentoo/ghc-bin-${PV}-ppc.tbz2 )"
+arch_binaries="$arch_binaries ppc? ( mirror://gentoo/ghc-bin-${PV}-ppc.tbz2 )"
 #arch_binaries="$arch_binaries ppc64? ( mirror://gentoo/ghc-bin-${PV}-ppc64.tbz2 )"
 arch_binaries="$arch_binaries sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-${PV}-sparc.tbz2 )"
 arch_binaries="$arch_binaries x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-${PV}-x86.tbz2 )"
@@ -70,6 +70,9 @@ yet_binary() {
 		x86)
 			return 0
 			;;
+		ppc)
+			return 0
+			;;
 		*)
 			return 1
 			;;
@@ -364,6 +367,7 @@ src_prepare() {
 		epatch "${FILESDIR}"/${PN}-7.0.4-darwin8.patch
 		epatch "${FILESDIR}"/${PN}-6.12.3-mach-o-relocation-limit.patch
 		epatch "${FILESDIR}"/${PN}-7.0.4-nxstack.patch
+		epatch "${FILESDIR}/ghc-7.0.4-fix-ppc-linker.patch"
 
 		if use prefix; then
 			# Make configure find docbook-xsl-stylesheets from Prefix
diff --git a/dev-lang/nqp/nqp-2011.12.ebuild b/dev-lang/nqp/nqp-2011.12.ebuild
index 1b8f37b1ca17..e799ee25cd3b 100644
--- a/dev-lang/nqp/nqp-2011.12.ebuild
+++ b/dev-lang/nqp/nqp-2011.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqp/nqp-2011.12.ebuild,v 1.1 2011/12/27 07:28:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqp/nqp-2011.12.ebuild,v 1.2 2011/12/28 04:07:09 patrick Exp $
 
 EAPI=3
 
@@ -32,6 +32,10 @@ src_configure() {
 	perl Configure.pl || die
 }
 
+src_compile() {
+	emake -j1 || die
+}
+
 src_test() {
 	emake -j1 test || die
 }
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 6727fa453517..491967eb7f55 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,11 +1,4 @@
-DIST ruby-1.8.7-p334.tar.bz2 4190857 RMD160 f3d078d526f1b19d3255dc236f5a46062883e7c9 SHA1 4311ce257f2e54f247bfe07b48e799d293d041f2 SHA256 3e7f1a15fb2c205ac9eb0da804983b83bf8c0ffeb2f146d1eb9e0579ea2507da
 DIST ruby-1.8.7-p352.tar.bz2 4207576 RMD160 9a0ea7e7eb83c809d2890b08db2e78eeb93dee0d SHA1 9f3d039e9bfeda54ea2c2175bbeace375a1ea1ae SHA256 9df4e9108387f7d24a6ab8950984d0c0f8cdbc1dad63194e744f1a176d1c5576
-DIST ruby-1.9.2-p290.tar.bz2 8811237 RMD160 9722a91445fa81a101a2a8ab5753780c4601cc5a SHA1 8f25a74f50a10fdd9724e3c74ccd7bae596e198b SHA256 403b3093fbe8a08dc69c269753b8c6e7bd8f87fb79a7dd7d676913efe7642487
 DIST ruby-1.9.3-p0.tar.bz2 9554576 RMD160 92e95f1d41f89864e2e4791b522a815e6bf51711 SHA1 f63c116411b981ef54c2caeefb9ccc4d71a5d2cf SHA256 ca8ba4e564fc5f98b210a5784e43dfffef9471222849e46f8e848b37e9f38acf
-DIST ruby-1.9.3-rc1.tar.bz2 9552727 RMD160 d81a0f8933804f83fc7db4689ec18669701233a8 SHA1 d922890fabd97016e2a30ee7f7b3241df98e72a6 SHA256 951a8810086abca0e200f81767a518ee2730d6dc9b0cc2c7e3587dcfc3bf5fc8
-DIST ruby-patches-1.8.7_p334-r1.tar.bz2 2060 RMD160 6c20b0cf9ce9f15dc0d0d63afc7f93abd7521317 SHA1 85360153650e942f1cfe4041018fcf1406c1c979 SHA256 fc6069897b0e6480e46c7fca3d8ef3508b6c106f34a8695a6784b20b97f5cc61
-DIST ruby-patches-1.8.7_p334-r2.tar.bz2 2638 RMD160 02feaf918801b8a81716ceb1e9761eca149246d0 SHA1 cbbd3d9d473458d44b83c5d8c9016a62db0337f4 SHA256 d4316ca0f4b504d5aa237c8852533c8e504da76d9aec8305227d12910239e431
 DIST ruby-patches-1.8.7_p352.tar.bz2 2646 RMD160 7af0ab7c86c9284ade489d3a07eb592cb8f20827 SHA1 f4df1f011a96153d4e804be1080a493b454a1852 SHA256 695895d4ab77294975669d879f0b03e08af5fcd750b967b44305031b2c115da6
-DIST ruby-patches-1.9.2_p290.tar.bz2 2246 RMD160 66e8287fa35cf34c471dc19215f4a6f63b67661b SHA1 b1a07618a62877ced18000ceb77bbbed132492e6 SHA256 bc01ad4e6e6dc5cae4c323cc16e9a441f38652eab3e6e3cecdff3baf46102889
 DIST ruby-patches-1.9.3_p0.tar.bz2 2228 RMD160 5fc6e647ec3f1fe6cbe8014121aa6265c8cd9315 SHA1 10fc10bdde1cc40d4153be840a1314da1d988049 SHA256 22116a403a111701972a5a10d5c31b0bb86dd822c346d0079e86e03866d55df6
-DIST ruby-patches-1.9.3_rc1.tar.bz2 2228 RMD160 5fc6e647ec3f1fe6cbe8014121aa6265c8cd9315 SHA1 10fc10bdde1cc40d4153be840a1314da1d988049 SHA256 22116a403a111701972a5a10d5c31b0bb86dd822c346d0079e86e03866d55df6
diff --git a/dev-lang/ruby/ruby-1.8.7_p334-r1.ebuild b/dev-lang/ruby/ruby-1.8.7_p334-r1.ebuild
deleted file mode 100644
index 1da54912d0ee..000000000000
--- a/dev-lang/ruby/ruby-1.8.7_p334-r1.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.7_p334-r1.ebuild,v 1.8 2011/06/07 09:46:44 xarthisius Exp $
-
-EAPI=2
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(replace_version_separator 3 '-')"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-# 1.8 and 1.9 series disagree on this
-RUBYVERSION=$(get_version_component_range 1-2)
-
-if [[ -n ${PATCHSET} ]]; then
-	if [[ ${PVR} == ${PV} ]]; then
-		PATCHSET="${PV}-r0.${PATCHSET}"
-	else
-		PATCHSET="${PVR}.${PATCHSET}"
-	fi
-else
-	PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.bz2
-		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby GPL-2 )"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="+berkdb debug doc examples +gdbm ipv6 rubytests socks5 ssl threads tk xemacs ncurses +readline libedit"
-
-RDEPEND="
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	ssl? ( >=dev-libs/openssl-0.9.8m )
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	tk? ( dev-lang/tk[threads=] )
-	ncurses? ( sys-libs/ncurses )
-	libedit? ( dev-libs/libedit )
-	!libedit? ( readline? ( sys-libs/readline ) )
-	sys-libs/zlib
-	>=app-admin/eselect-ruby-20100603
-	!=dev-lang/ruby-cvs-${SLOT}*
-	!<dev-ruby/rdoc-2
-	!dev-ruby/rexml"
-DEPEND="${RDEPEND}"
-PDEPEND="xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches"
-
-	# Fix a hardcoded lib path in configure script
-	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
-		configure.in || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	if use libedit; then
-		einfo "Using libedit to provide readline extension"
-		myconf="${myconf} --enable-libedit --with-readline"
-	elif use readline; then
-		einfo "Using readline to provide readline extension"
-		myconf="${myconf} --with-readline"
-	else
-		myconf="${myconf} --without-readline"
-	fi
-
-	econf \
-		--program-suffix="${MY_SUFFIX}" \
-		--enable-shared \
-		$(use_enable socks5 socks) \
-		$(use_enable doc install-doc) \
-		$(use_enable threads pthread) \
-		--enable-ipv6 \
-		$(use_enable debug) \
-		$(use_with berkdb dbm) \
-		$(use_with gdbm) \
-		$(use_with ssl openssl) \
-		$(use_with tk) \
-		$(use_with ncurses curses) \
-		${myconf} \
-		--with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \
-		--enable-option-checking=no \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 test || die "make test failed"
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitelibdir']")
-	keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitearchdir']")
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r sample
-	fi
-
-	dosym "libruby${MY_SUFFIX}$(get_libname ${PV%_*})" \
-		"/usr/$(get_libdir)/libruby$(get_libname ${PV%.*})"
-	dosym "libruby${MY_SUFFIX}$(get_libname ${PV%_*})" \
-		"/usr/$(get_libdir)/libruby$(get_libname ${PV%_*})"
-
-	dodoc ChangeLog NEWS README* ToDo || die
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(18|19|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-1.8.7_p334-r2.ebuild b/dev-lang/ruby/ruby-1.8.7_p334-r2.ebuild
deleted file mode 100644
index ddabf81b7974..000000000000
--- a/dev-lang/ruby/ruby-1.8.7_p334-r2.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.7_p334-r2.ebuild,v 1.2 2011/08/10 18:16:07 xarthisius Exp $
-
-EAPI=2
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(replace_version_separator 3 '-')"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-# 1.8 and 1.9 series disagree on this
-RUBYVERSION=$(get_version_component_range 1-2)
-
-if [[ -n ${PATCHSET} ]]; then
-	if [[ ${PVR} == ${PV} ]]; then
-		PATCHSET="${PV}-r0.${PATCHSET}"
-	else
-		PATCHSET="${PVR}.${PATCHSET}"
-	fi
-else
-	PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.bz2
-		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby GPL-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="+berkdb debug doc examples +gdbm ipv6 rubytests socks5 ssl threads tk xemacs ncurses +readline libedit"
-
-RDEPEND="
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	ssl? ( >=dev-libs/openssl-0.9.8m )
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	tk? ( dev-lang/tk[threads=] )
-	ncurses? ( sys-libs/ncurses )
-	libedit? ( dev-libs/libedit )
-	!libedit? ( readline? ( sys-libs/readline ) )
-	sys-libs/zlib
-	>=app-admin/eselect-ruby-20100603
-	!=dev-lang/ruby-cvs-${SLOT}*
-	!<dev-ruby/rdoc-2
-	!dev-ruby/rexml"
-DEPEND="${RDEPEND}"
-PDEPEND="xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches"
-
-	# Fix a hardcoded lib path in configure script
-	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
-		configure.in || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	if use libedit; then
-		einfo "Using libedit to provide readline extension"
-		myconf="${myconf} --enable-libedit --with-readline"
-	elif use readline; then
-		einfo "Using readline to provide readline extension"
-		myconf="${myconf} --with-readline"
-	else
-		myconf="${myconf} --without-readline"
-	fi
-
-	econf \
-		--program-suffix="${MY_SUFFIX}" \
-		--enable-shared \
-		$(use_enable socks5 socks) \
-		$(use_enable doc install-doc) \
-		$(use_enable threads pthread) \
-		--enable-ipv6 \
-		$(use_enable debug) \
-		$(use_with berkdb dbm) \
-		$(use_with gdbm) \
-		$(use_with ssl openssl) \
-		$(use_with tk) \
-		$(use_with ncurses curses) \
-		${myconf} \
-		--with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \
-		--enable-option-checking=no \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 test || die "make test failed"
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitelibdir']")
-	keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitearchdir']")
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r sample
-	fi
-
-	dosym "libruby${MY_SUFFIX}$(get_libname ${PV%_*})" \
-		"/usr/$(get_libdir)/libruby$(get_libname ${PV%.*})"
-	dosym "libruby${MY_SUFFIX}$(get_libname ${PV%_*})" \
-		"/usr/$(get_libdir)/libruby$(get_libname ${PV%_*})"
-
-	dodoc ChangeLog NEWS README* ToDo || die
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(18|19|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-1.9.2_p290.ebuild b/dev-lang/ruby/ruby-1.9.2_p290.ebuild
deleted file mode 100644
index 9016c42c748a..000000000000
--- a/dev-lang/ruby/ruby-1.9.2_p290.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.2_p290.ebuild,v 1.2 2011/10/22 16:53:31 jer Exp $
-
-EAPI=2
-
-#PATCHSET=
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-RUBYPL=$(get_version_component_range 4)
-
-MY_P="${PN}-$(get_version_component_range 1-3)-${RUBYPL:-p0}"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-# 1.9.2 still uses 1.9.1
-RUBYVERSION=1.9.1
-
-if [[ -n ${PATCHSET} ]]; then
-	if [[ ${PVR} == ${PV} ]]; then
-		PATCHSET="${PV}-r0.${PATCHSET}"
-	else
-		PATCHSET="${PVR}.${PATCHSET}"
-	fi
-else
-	PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/${MY_P}.tar.bz2
-		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby GPL-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl tk xemacs ncurses +readline yaml" #libedit
-
-# libedit support is removed everywhere because of this upstream bug:
-# http://redmine.ruby-lang.org/issues/show/3698
-
-RDEPEND="
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	ssl? ( dev-libs/openssl )
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	tk? ( dev-lang/tk[threads] )
-	ncurses? ( sys-libs/ncurses )
-	readline?  ( sys-libs/readline )
-	yaml? ( dev-libs/libyaml )
-	virtual/libffi
-	sys-libs/zlib
-	>=app-admin/eselect-ruby-20100402
-	!=dev-lang/ruby-cvs-${SLOT}*
-	!<dev-ruby/rdoc-2
-	!<dev-ruby/rubygems-1.3.7-r4
-	!dev-ruby/rexml"
-#	libedit? ( dev-libs/libedit )
-#	!libedit? ( readline? ( sys-libs/readline ) )
-
-DEPEND="${RDEPEND}"
-PDEPEND="
-	rdoc? ( >=dev-ruby/rdoc-2.5.11[ruby_targets_ruby19] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches"
-
-	einfo "Unbundling gems..."
-	rm -r \
-		{bin,lib}/rake \
-		ext/json \
-		bin/gem \
-		|| die "removal failed"
-
-	# Fix a hardcoded lib path in configure script
-	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
-		configure.in || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-	# SuperH needs this
-	use sh && append-flags -mieee
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-#	if use libedit; then
-#		einfo "Using libedit to provide readline extension"
-#		myconf="${myconf} --enable-libedit --with-readline"
-#	elif use readline; then
-#		einfo "Using readline to provide readline extension"
-#		myconf="${myconf} --with-readline"
-#	else
-#		myconf="${myconf} --without-readline"
-#	fi
-	myconf="${myconf} $(use_with readline)"
-
-	# Set a faux target (bug #342819)
-	use hppa && myconf="${myconf} --target=parisc"
-
-	econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--enable-shared \
-		--enable-pthread \
-		$(use_enable socks5 socks) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable debug) \
-		$(use_with berkdb dbm) \
-		$(use_with gdbm) \
-		$(use_with ssl openssl) \
-		$(use_with tk) \
-		$(use_with ncurses curses) \
-		$(use_with yaml psych) \
-		${myconf} \
-		--enable-option-checking=no \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 test || die "make test failed"
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	# Remove installed rubygems copy
-	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r sample
-	fi
-
-	dosym "libruby${MY_SUFFIX}$(get_libname ${PV%_*})" \
-		"/usr/$(get_libdir)/libruby$(get_libname ${PV%.*})"
-	dosym "libruby${MY_SUFFIX}$(get_libname ${PV%_*})" \
-		"/usr/$(get_libdir)/libruby$(get_libname ${PV%_*})"
-
-	dodoc ChangeLog NEWS doc/NEWS-1.8.7 README* ToDo || die
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(18|19|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-1.9.3_p0.ebuild b/dev-lang/ruby/ruby-1.9.3_p0.ebuild
index d98068d8a677..37ed443a6217 100644
--- a/dev-lang/ruby/ruby-1.9.3_p0.ebuild
+++ b/dev-lang/ruby/ruby-1.9.3_p0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.3_p0.ebuild,v 1.1 2011/12/18 18:09:12 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.3_p0.ebuild,v 1.2 2011/12/28 07:57:49 graaff Exp $
 
 EAPI=2
 
@@ -52,10 +52,8 @@ RDEPEND="
 	virtual/libffi
 	sys-libs/zlib
 	>=app-admin/eselect-ruby-20100402
-	!=dev-lang/ruby-cvs-${SLOT}*
-	!<dev-ruby/rdoc-2
-	!<dev-ruby/rubygems-1.3.7-r4
-	!dev-ruby/rexml"
+	!<dev-ruby/rdoc-3.9.4
+	!<dev-ruby/rubygems-1.8.10-r1"
 #	libedit? ( dev-libs/libedit )
 #	!libedit? ( readline? ( sys-libs/readline ) )
 
diff --git a/dev-lang/ruby/ruby-1.9.3_rc1.ebuild b/dev-lang/ruby/ruby-1.9.3_rc1.ebuild
deleted file mode 100644
index 7bfbdc70c2ab..000000000000
--- a/dev-lang/ruby/ruby-1.9.3_rc1.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.3_rc1.ebuild,v 1.2 2011/10/22 17:16:53 jer Exp $
-
-EAPI=2
-
-#PATCHSET=
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-RUBYPL=$(get_version_component_range 4)
-
-#MY_P="${PN}-$(get_version_component_range 1-3)-${RUBYPL:-0}"
-MY_P="${PN}-$(get_version_component_range 1-3)-rc1"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-# 1.9.3 still uses 1.9.1
-RUBYVERSION=1.9.1
-
-if [[ -n ${PATCHSET} ]]; then
-	if [[ ${PVR} == ${PV} ]]; then
-		PATCHSET="${PV}-r0.${PATCHSET}"
-	else
-		PATCHSET="${PVR}.${PATCHSET}"
-	fi
-else
-	PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/1.9/${MY_P}.tar.bz2
-		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl tk xemacs ncurses +readline +yaml" #libedit
-
-# libedit support is removed everywhere because of this upstream bug:
-# http://redmine.ruby-lang.org/issues/show/3698
-
-RDEPEND="
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	ssl? ( dev-libs/openssl )
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	tk? ( dev-lang/tk[threads] )
-	ncurses? ( sys-libs/ncurses )
-	readline?  ( sys-libs/readline )
-	yaml? ( dev-libs/libyaml )
-	virtual/libffi
-	sys-libs/zlib
-	>=app-admin/eselect-ruby-20100402
-	!=dev-lang/ruby-cvs-${SLOT}*
-	!<dev-ruby/rdoc-2
-	!<dev-ruby/rubygems-1.3.7-r4
-	!dev-ruby/rexml"
-#	libedit? ( dev-libs/libedit )
-#	!libedit? ( readline? ( sys-libs/readline ) )
-
-DEPEND="${RDEPEND}"
-PDEPEND="
-	rdoc? ( >=dev-ruby/rdoc-2.5.11[ruby_targets_ruby19] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches"
-
-	einfo "Unbundling gems..."
-	cd "$S"
-	rm -r \
-		{bin,lib}/rake lib/rake.rb man/rake.1 \
-		ext/json \
-		bin/gem || die "removal failed"
-
-	# Fix a hardcoded lib path in configure script
-	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
-		configure.in || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-	# SuperH needs this
-	use sh && append-flags -mieee
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-#	if use libedit; then
-#		einfo "Using libedit to provide readline extension"
-#		myconf="${myconf} --enable-libedit --with-readline"
-#	elif use readline; then
-#		einfo "Using readline to provide readline extension"
-#		myconf="${myconf} --with-readline"
-#	else
-#		myconf="${myconf} --without-readline"
-#	fi
-	myconf="${myconf} $(use_with readline)"
-
-	# Set a faux target (bug #342819)
-	use hppa && myconf="${myconf} --target=parisc"
-
-	econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--enable-shared \
-		--enable-pthread \
-		$(use_enable socks5 socks) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable debug) \
-		$(use_with berkdb dbm) \
-		$(use_with gdbm) \
-		$(use_with ssl openssl) \
-		$(use_with tk) \
-		$(use_with ncurses curses) \
-		$(use_with yaml psych) \
-		${myconf} \
-		--enable-option-checking=no \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 test || die "make test failed"
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	# Remove installed rubygems copy
-	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r sample
-	fi
-
-	dosym "libruby${MY_SUFFIX}$(get_libname ${PV%_*})" \
-		"/usr/$(get_libdir)/libruby$(get_libname ${PV%.*})"
-	dosym "libruby${MY_SUFFIX}$(get_libname ${PV%_*})" \
-		"/usr/$(get_libdir)/libruby$(get_libname ${PV%_*})"
-
-	dodoc ChangeLog NEWS doc/NEWS-1.8.7 README* ToDo || die
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(18|19|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-libs/crypto++/crypto++-5.6.1-r2.ebuild b/dev-libs/crypto++/crypto++-5.6.1-r2.ebuild
new file mode 100644
index 000000000000..2891f858eb5d
--- /dev/null
+++ b/dev-libs/crypto++/crypto++-5.6.1-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/crypto++-5.6.1-r2.ebuild,v 1.1 2011/12/28 07:02:02 patrick Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Crypto++ is a C++ class library of cryptographic schemes"
+HOMEPAGE="http://cryptopp.com"
+SRC_URI="mirror://sourceforge/cryptopp/cryptopp${PV//.}.zip"
+
+LICENSE="cryptopp"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-fix_build_system.patch" \
+		"${FILESDIR}/${P}-sunos.patch" \
+		"${FILESDIR}/${P}-rijndael.patch"
+}
+
+src_compile() {
+	# Higher optimizations cause problems.
+	replace-flags -O? -O1
+	filter-flags -fomit-frame-pointer
+
+	emake -f GNUmakefile CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" \
+		LIBDIR="$(get_libdir)" || die "emake failed"
+}
+
+src_test() {
+	# Ensure that all test vectors have Unix line endings.
+	local file
+	for file in TestVectors/*; do
+		edos2unix ${file}
+	done
+
+	if ! emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" test; then
+		eerror "Crypto++ self-tests failed."
+		eerror "Try to remove some optimization flags and reemerge Crypto++."
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install \
+		|| die "emake install failed"
+}
diff --git a/dev-libs/crypto++/files/crypto++-5.6.1-rijndael.patch b/dev-libs/crypto++/files/crypto++-5.6.1-rijndael.patch
new file mode 100644
index 000000000000..153fa44b913f
--- /dev/null
+++ b/dev-libs/crypto++/files/crypto++-5.6.1-rijndael.patch
@@ -0,0 +1,14 @@
+--- rijndael.cpp	2010-08-06 18:46:22.000000000 +0200
++++ rijndael.cpp2	2011-12-27 16:10:52.606933355 +0100
+@@ -349,7 +349,11 @@
+ void Rijndael::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const
+ {
+ #if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) || CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
++#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE)
+ 	if (HasSSE2())
++#else
++	if (HasAESNI())
++#endif
+ 	{
+ 		Rijndael::Enc::AdvancedProcessBlocks(inBlock, xorBlock, outBlock, 16, 0);
+ 		return;
diff --git a/dev-libs/ptexenc/ptexenc-1.2.0_p20110705.ebuild b/dev-libs/ptexenc/ptexenc-1.2.0_p20110705.ebuild
index a4482f62b040..4f724fe15336 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
 # 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.3 2011/08/27 19:50:37 grobian Exp $
+# $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 $
 
 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/Geo-IP/Geo-IP-1.28.ebuild b/dev-perl/Geo-IP/Geo-IP-1.28.ebuild
deleted file mode 100644
index 676da63dde1d..000000000000
--- a/dev-perl/Geo-IP/Geo-IP-1.28.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Geo-IP/Geo-IP-1.28.ebuild,v 1.6 2008/02/04 02:51:46 jer Exp $
-
-inherit perl-module multilib
-
-DESCRIPTION="Look up country by IP Address"
-HOMEPAGE="http://www.cpan.org/modules/by-authors/id/T/TJ/TJMATHER/${P}.readme"
-SRC_URI="mirror://cpan/authors/id/T/TJ/TJMATHER/${P}.tar.gz"
-
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-libs/geoip
-	dev-lang/perl"
-
-myconf="${myconf} LIBS='-L/usr/$(get_libdir)'"
diff --git a/dev-perl/Geo-IP/Manifest b/dev-perl/Geo-IP/Manifest
index 6125ce9560ed..34fd70c72af8 100644
--- a/dev-perl/Geo-IP/Manifest
+++ b/dev-perl/Geo-IP/Manifest
@@ -1,3 +1,2 @@
-DIST Geo-IP-1.28.tar.gz 13470 RMD160 e30a3b82d92e434cbf9ef4b0a89822b6939f1833 SHA1 8d69f4359ec49e7b225059aec0972b92d5f8c170 SHA256 bede8433e200a433cc0defd198136d5d6dd0580542a92f516a707f4829db0c52
 DIST Geo-IP-1.38.tar.gz 63418 RMD160 9f467dbaa677e708dc9ba0a6c12f90eaae810de0 SHA1 6c6ff8fcaf2fdd08ea33730a9cafb0c6df2a1745 SHA256 7c4744926833a6a9e454edea3c987452e4fae1372120186c6952515ca41c6b1f
 DIST Geo-IP-1.40.tar.gz 111898 RMD160 d2048c70626920d38ab06606ee15cead460ca764 SHA1 b13a3d74edf6aad22403b065b07cdaab7fdd207f SHA256 ca48babd3e944cb1bc5cac56f618c9f94f3a329dd2716d6b49b658ae28848ab3
diff --git a/dev-python/msgpack/Manifest b/dev-python/msgpack/Manifest
new file mode 100644
index 000000000000..06e637a009c0
--- /dev/null
+++ b/dev-python/msgpack/Manifest
@@ -0,0 +1 @@
+DIST msgpack-python-0.1.12.tar.gz 49674 RMD160 ededbaf655314cc2df0b2c86640dd894af62a27d SHA1 2cff528c1466b903b8b13b23f96f8486d3438576 SHA256 5aa1d925a536c399a07a1f1d8f394d991ff735724e304a8cdab768f216f93ee6
diff --git a/dev-python/msgpack/metadata.xml b/dev-python/msgpack/metadata.xml
new file mode 100644
index 000000000000..301d2207cc29
--- /dev/null
+++ b/dev-python/msgpack/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+</pkgmetadata>
diff --git a/dev-python/msgpack/msgpack-0.1.12.ebuild b/dev-python/msgpack/msgpack-0.1.12.ebuild
new file mode 100644
index 000000000000..65c0926eaf7d
--- /dev/null
+++ b/dev-python/msgpack/msgpack-0.1.12.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/msgpack/msgpack-0.1.12.ebuild,v 1.1 2011/12/28 03:26:16 patrick Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.5 3"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4"
+DISTUTILS_SRC_TEST="nosetests"
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
+
+inherit distutils
+
+MY_PN="${PN}-python"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="MessagePack (de)serializer for Python"
+HOMEPAGE="http://msgpack.org http://pypi.python.org/pypi/msgpack-python/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	distutils_src_prepare
+
+	preparation() {
+		if [[ "${PYTHON_ABI}" == 3.* ]]; then
+			rm -rf test || die
+			mv test3 test || die
+		else
+			rm -rf test3 || die
+		fi
+	}
+	python_execute_function -s preparation
+}
+
+src_test() {
+	distutils_src_test -P -w test;
+}
\ No newline at end of file
diff --git a/dev-ruby/deprecated/deprecated-2.0.1-r1.ebuild b/dev-ruby/deprecated/deprecated-2.0.1-r1.ebuild
index 1e128c3c5814..f5675a837b13 100644
--- a/dev-ruby/deprecated/deprecated-2.0.1-r1.ebuild
+++ b/dev-ruby/deprecated/deprecated-2.0.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/deprecated/deprecated-2.0.1-r1.ebuild,v 1.7 2011/07/23 11:31:59 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/deprecated/deprecated-2.0.1-r1.ebuild,v 1.8 2011/12/28 08:39:17 graaff Exp $
 
 EAPI="2"
 
-USE_RUBY="ruby18 ruby19 jruby"
+USE_RUBY="ruby18 jruby"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/deprecated/deprecated-2.0.1-r2.ebuild b/dev-ruby/deprecated/deprecated-2.0.1-r2.ebuild
new file mode 100644
index 000000000000..3f3fb26c602a
--- /dev/null
+++ b/dev-ruby/deprecated/deprecated-2.0.1-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/deprecated/deprecated-2.0.1-r2.ebuild,v 1.1 2011/12/28 08:39:17 graaff Exp $
+
+EAPI="2"
+
+USE_RUBY="ruby18 ruby19 jruby"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby library for handling deprecated code"
+HOMEPAGE="http://rubyforge.org/projects/deprecated"
+SRC_URI="mirror://rubyforge/deprecated/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="2"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( virtual/ruby-test-unit )"
+
+each_ruby_test() {
+	${RUBY} -Ilib test/deprecated.rb || die "test failed"
+}
diff --git a/dev-ruby/facter/facter-1.6.0.ebuild b/dev-ruby/facter/facter-1.6.0.ebuild
index 8389e1e8aa1f..71bbf7918ff1 100644
--- a/dev-ruby/facter/facter-1.6.0.ebuild
+++ b/dev-ruby/facter/facter-1.6.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-1.6.0.ebuild,v 1.6 2011/10/09 17:25:48 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-1.6.0.ebuild,v 1.7 2011/12/28 08:37:52 graaff Exp $
 
 EAPI="2"
 
-USE_RUBY="ruby18 ruby19 ree18 jruby"
+USE_RUBY="ruby18 ree18 jruby"
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST="spec"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
diff --git a/dev-ruby/gruff/gruff-0.3.6-r1.ebuild b/dev-ruby/gruff/gruff-0.3.6-r1.ebuild
index 664739ee73d8..3dc50db20c14 100644
--- a/dev-ruby/gruff/gruff-0.3.6-r1.ebuild
+++ b/dev-ruby/gruff/gruff-0.3.6-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gruff/gruff-0.3.6-r1.ebuild,v 1.8 2011/02/13 09:35:15 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gruff/gruff-0.3.6-r1.ebuild,v 1.9 2011/12/28 08:36:49 graaff Exp $
 
 EAPI=2
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby18"
 
 RUBY_FAKEGEM_TASK_DOC="docs"
 
diff --git a/dev-ruby/gruff/gruff-0.3.6-r2.ebuild b/dev-ruby/gruff/gruff-0.3.6-r2.ebuild
new file mode 100644
index 000000000000..a23a70a91ca3
--- /dev/null
+++ b/dev-ruby/gruff/gruff-0.3.6-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gruff/gruff-0.3.6-r2.ebuild,v 1.1 2011/12/28 08:36:49 graaff Exp $
+
+EAPI=2
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_TASK_DOC="docs"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.txt Manifest.txt README.txt"
+
+RUBY_FAKEGEM_EXTRAINSTALL="assets rails_generators"
+
+inherit ruby-fakegem
+
+ruby_add_rdepend '>=dev-ruby/rmagick-2'
+ruby_add_bdepend "
+	test? (
+		dev-ruby/hoe
+		virtual/ruby-test-unit
+	)
+	doc? ( dev-ruby/hoe )"
+
+DESCRIPTION="RMagick Implementation for JRuby"
+HOMEPAGE="http://rubyforge.org/projects/gruff/"
+SRC_URI="mirror://rubyforge/${PN}/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86 ~x86-macos"
+IUSE=""
+
+RUBY_PATCHES=(
+	${P}-sort-filenames.patch
+	${P}-fix-tests.patch
+	${P}-spider.patch
+)
+
+# imagemagick is an indirect dependency through rmagick. However, for
+# gruff to work properly imagemagick needs to be compiled with
+# truetype support and this cannot be expressed in the rmagick
+# dependency. Test also require imagemagick to have jpeg support.
+DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,truetype] )"
+RDEPEND="${RDEPEND} media-gfx/imagemagick[truetype]"
diff --git a/dev-ruby/hike/hike-1.2.1.ebuild b/dev-ruby/hike/hike-1.2.1.ebuild
index c9a525ee3221..375dd953dc7e 100644
--- a/dev-ruby/hike/hike-1.2.1.ebuild
+++ b/dev-ruby/hike/hike-1.2.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hike/hike-1.2.1.ebuild,v 1.1 2011/10/07 06:26:37 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hike/hike-1.2.1.ebuild,v 1.2 2011/12/28 07:41:46 graaff Exp $
 
 EAPI=4
-USE_RUBY="ruby18 ree18"
+USE_RUBY="ruby18 ruby19 ree18 jruby"
 
 RUBY_FAKEGEM_TASK_TEST="none"
 
@@ -22,8 +22,6 @@ KEYWORDS="~amd64"
 SLOT="0"
 IUSE=""
 
-ruby_add_bdepend "test? ( virtual/ruby-test-unit )"
-
 each_ruby_test() {
 	${RUBY} -Ilib:test -S testrb test || die
 }
diff --git a/dev-ruby/mechanize/mechanize-1.0.0-r1.ebuild b/dev-ruby/mechanize/mechanize-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..eb29e19adb7a
--- /dev/null
+++ b/dev-ruby/mechanize/mechanize-1.0.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mechanize/mechanize-1.0.0-r1.ebuild,v 1.1 2011/12/28 08:35:41 graaff Exp $
+
+EAPI=2
+
+USE_RUBY="ruby18 ruby19 jruby"
+
+RUBY_FAKEGEM_TASK_DOC="redocs"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc EXAMPLES.rdoc FAQ.rdoc GUIDE.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby library used for automating interaction with websites."
+HOMEPAGE="http://mechanize.rubyforge.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend ">=dev-ruby/hoe-2.3.3"
+ruby_add_rdepend ">=dev-ruby/nokogiri-1.4.4-r1"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/* || die
+}
diff --git a/dev-ruby/mechanize/mechanize-1.0.0.ebuild b/dev-ruby/mechanize/mechanize-1.0.0.ebuild
index 095655164d21..4028455e26f4 100644
--- a/dev-ruby/mechanize/mechanize-1.0.0.ebuild
+++ b/dev-ruby/mechanize/mechanize-1.0.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mechanize/mechanize-1.0.0.ebuild,v 1.5 2011/12/26 14:32:09 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mechanize/mechanize-1.0.0.ebuild,v 1.6 2011/12/28 08:35:42 graaff Exp $
 
 EAPI=2
 
-USE_RUBY="ruby18 ruby19 jruby"
+USE_RUBY="ruby18 jruby"
 
 RUBY_FAKEGEM_TASK_DOC="redocs"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/method_source/Manifest b/dev-ruby/method_source/Manifest
index 5e82793d1e10..00604dd3468b 100644
--- a/dev-ruby/method_source/Manifest
+++ b/dev-ruby/method_source/Manifest
@@ -1,3 +1 @@
-DIST method_source-0.6.5.gem 9216 RMD160 a50073f0eff4ba2b15c2d054a3504d91bc8b4c92 SHA1 3ef15705a158320de42fd91c7c9b8245c262b2e0 SHA256 c29bf3173ad848e6e1768d43232f12a3a95a287878b1ac23d3b99c5e75dc7d2b
-DIST method_source-0.6.6.gem 9728 RMD160 4b61b1372c335ed9f064718c4859aaec54566668 SHA1 faa5e7b48b0c8215eaf104cce33206ed86f934f9 SHA256 88163260208af7c0ffee227f4ce593fc3b2e8c52fd47e041d2a0d5c5bdcb4c63
 DIST method_source-0.6.7.gem 9728 RMD160 de8bfb506aa9715e398aa45bacf411b3b5b1eac3 SHA1 893b52ea4e2de8495c4d01d2c7d948dfe4092152 SHA256 a756ec0a61dbedc95048c8acff641d8cb80075044fb67d2d9754a039bc8c072d
diff --git a/dev-ruby/method_source/method_source-0.6.5.ebuild b/dev-ruby/method_source/method_source-0.6.5.ebuild
deleted file mode 100644
index 820fd4bb6bb6..000000000000
--- a/dev-ruby/method_source/method_source-0.6.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/method_source/method_source-0.6.5.ebuild,v 1.1 2011/09/10 07:38:23 graaff Exp $
-
-EAPI=4
-# jruby crashes on parsing the metadata.
-USE_RUBY="ruby18 ree18"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Retrieve the source code for a method."
-HOMEPAGE="http://github.com/banister/method_source"
-IUSE=""
-SLOT="0"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-
-ruby_add_bdepend "test? ( >=dev-ruby/bacon-1.1.0 >=dev-ruby/open4-1.0.1 )"
-
-ruby_add_rdepend ">=dev-ruby/ruby_parser-2.0.5"
-
-each_ruby_test() {
-	${RUBY} -S bacon -k test/test.rb || die "Tests failed."
-}
diff --git a/dev-ruby/method_source/method_source-0.6.6.ebuild b/dev-ruby/method_source/method_source-0.6.6.ebuild
deleted file mode 100644
index 5829197ca70d..000000000000
--- a/dev-ruby/method_source/method_source-0.6.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/method_source/method_source-0.6.6.ebuild,v 1.1 2011/10/16 08:44:34 graaff Exp $
-
-EAPI=4
-# jruby crashes on parsing the metadata.
-USE_RUBY="ruby18 ree18"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-RUBY_FAKEGEM_GEMSPEC="method_source.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Retrieve the source code for a method."
-HOMEPAGE="http://github.com/banister/method_source"
-IUSE=""
-SLOT="0"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-
-ruby_add_bdepend "test? ( >=dev-ruby/bacon-1.1.0 >=dev-ruby/open4-1.0.1 )"
-
-ruby_add_rdepend ">=dev-ruby/ruby_parser-2.0.5"
-
-all_ruby_prepare() {
-	# Newer versions of ruby_parser are compatible.
-	sed -i -e 's/~> 2.0.5/>= 2.0.5/' method_source.gemspec || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bacon -k test/test.rb || die "Tests failed."
-}
diff --git a/dev-ruby/mkrf/mkrf-0.2.3-r2.ebuild b/dev-ruby/mkrf/mkrf-0.2.3-r2.ebuild
new file mode 100644
index 000000000000..3b8c7776e0e7
--- /dev/null
+++ b/dev-ruby/mkrf/mkrf-0.2.3-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mkrf/mkrf-0.2.3-r2.ebuild,v 1.1 2011/12/28 08:32:16 graaff Exp $
+
+EAPI="2"
+USE_RUBY="ruby18"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
+RUBY_FAKEGEM_DOCDIR="html"
+
+# The unit tests (test:units) fail so skip them for now, since we have
+# had this version in our tree for a long time. No bug tracker to
+# report this problem. :-(
+RUBY_FAKEGEM_TASK_TEST="test:integration"
+
+inherit ruby-fakegem
+
+DESCRIPTION="mkrf is a library for generating Rakefiles, primarily intended for building C extentions for Ruby."
+HOMEPAGE="http://mkrf.rubyforge.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+IUSE=""
+
+ruby_add_bdepend "test? ( virtual/ruby-test-unit )"
+
+DEPEND="${DEPEND} test? ( virtual/libiconv dev-libs/libxml2 )"
diff --git a/dev-ruby/narray/narray-0.6.0.1-r1.ebuild b/dev-ruby/narray/narray-0.6.0.1-r1.ebuild
new file mode 100644
index 000000000000..d1ae1b5d5de0
--- /dev/null
+++ b/dev-ruby/narray/narray-0.6.0.1-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/narray/narray-0.6.0.1-r1.ebuild,v 1.1 2011/12/28 08:31:08 graaff Exp $
+
+EAPI=4
+
+# jruby → native extension
+USE_RUBY="ruby18 ree18 ruby19"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="ChangeLog README.en README.ja SPEC.en SPEC.ja"
+
+RUBY_FAKEGEM_VERSION="${PV/_p/.}"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Numerical N-dimensional Array class"
+HOMEPAGE="http://www.ir.isas.ac.jp/~masa/ruby/index-e.html"
+SRC_URI="mirror://rubyforge/${PN}/${P/_/}.tar.gz"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+
+IUSE=""
+
+all_ruby_prepare() {
+	# the tests aren't really written to be a testsuite, so the
+	# failure cases will literally fail; ignore all of those ad
+	# instead expect that the rest won't fail.
+	sed -i -e '/[fF]ollowing will fail/,$ s:^:#:' \
+		test/*.rb || die "sed failed"
+}
+
+each_ruby_configure() {
+	${RUBY} extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	emake CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" || die "emake failed"
+	cp -l ${PN}$(get_modname) lib || die "copy of ${PN}$(get_modname) failed"
+}
+
+each_ruby_test() {
+	for unit in test/*; do
+		# Skip over the FFTW test because it needs a package we don't
+		# have in tree.
+		[[ ${unit} == test/testfftw.rb ]] && continue
+
+		${RUBY} -Ilib ${unit} || die "test ${unit} failed"
+	done
+}
diff --git a/dev-ruby/narray/narray-0.6.0.1.ebuild b/dev-ruby/narray/narray-0.6.0.1.ebuild
index b07e8770a9ed..8bdb6661a144 100644
--- a/dev-ruby/narray/narray-0.6.0.1.ebuild
+++ b/dev-ruby/narray/narray-0.6.0.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/narray/narray-0.6.0.1.ebuild,v 1.5 2011/10/23 15:30:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/narray/narray-0.6.0.1.ebuild,v 1.6 2011/12/28 08:31:07 graaff Exp $
 
 EAPI=4
 
 # jruby → native extension
-USE_RUBY="ruby18 ree18 ruby19"
+USE_RUBY="ruby18 ree18"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/net-ssh/net-ssh-2.0.23.ebuild b/dev-ruby/net-ssh/net-ssh-2.0.23.ebuild
index 6992bb099360..17be32b34d75 100644
--- a/dev-ruby/net-ssh/net-ssh-2.0.23.ebuild
+++ b/dev-ruby/net-ssh/net-ssh-2.0.23.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-ssh/net-ssh-2.0.23.ebuild,v 1.6 2010/09/30 01:43:39 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-ssh/net-ssh-2.0.23.ebuild,v 1.7 2011/12/28 08:29:42 graaff Exp $
 
 EAPI="2"
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby18"
 
 RUBY_FAKEGEM_TASK_TEST="" # Tests depend on test-unit-2.x which is masked.
 
diff --git a/dev-ruby/pg/pg-0.11.0.ebuild b/dev-ruby/pg/pg-0.11.0.ebuild
index 47e98839003c..5dd6502aeebb 100644
--- a/dev-ruby/pg/pg-0.11.0.ebuild
+++ b/dev-ruby/pg/pg-0.11.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/pg/pg-0.11.0.ebuild,v 1.5 2011/11/27 15:17:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/pg/pg-0.11.0.ebuild,v 1.6 2011/12/28 08:28:23 graaff Exp $
 
 EAPI=2
-USE_RUBY="ruby18 ree18 ruby19"
+USE_RUBY="ruby18 ree18"
 
 RUBY_FAKEGEM_TEST_TASK=""
 
diff --git a/dev-ruby/rspec-core/rspec-core-2.6.4-r1.ebuild b/dev-ruby/rspec-core/rspec-core-2.6.4-r1.ebuild
new file mode 100644
index 000000000000..38c6a7827e43
--- /dev/null
+++ b/dev-ruby/rspec-core/rspec-core-2.6.4-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-2.6.4-r1.ebuild,v 1.1 2011/12/28 08:22:50 graaff Exp $
+
+EAPI=2
+USE_RUBY="ruby18 ree18 ruby19 jruby"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_TASK_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="http://rspec.rubyforge.org/"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="${RDEPEND} !<dev-ruby/rspec-1.3.1-r1"
+
+ruby_add_bdepend "test? (
+		dev-ruby/nokogiri
+		dev-ruby/syntax
+		>=dev-ruby/zentest-4.4.1
+		dev-ruby/rspec-expectations:2
+		dev-ruby/rspec-mocks:2
+	)"
+
+#	>=dev-ruby/cucumber-0.5.3
+#	>=dev-ruby/autotest-4.2.9 -> zentest-4.4.1
+#	dev-ruby/aruba"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Remove the Gemfile to avoid running through 'bundle exec'
+	rm Gemfile || die
+
+	# Also clean the /usr/lib/rubyee path (which is our own invention).
+	sed -i -e 's#lib\\d\*\\/ruby\\/#lib\\d*\\/ruby(ee|)\\/#' lib/rspec/core/configuration.rb || die
+
+	# Remove jruby-specific comparison documents since for us the normal
+	# version passes.
+	cp spec/rspec/core/formatters/html_formatted-1.8.7.html spec/rspec/core/formatters/html_formatted-1.8.7-jruby.html|| die
+	cp spec/rspec/core/formatters/text_mate_formatted-1.8.7.html spec/rspec/core/formatters/text_mate_formatted-1.8.7-jruby.html|| die
+}
+
+all_ruby_compile() {
+	if use doc ; then
+		RUBYLIB="${S}/lib" rake rdoc || die "Unable to create documentation."
+	fi
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*jruby)
+			# Run jruby's tests with the installed rspec script since
+			# otherwise files can't be found for some unknown reason.
+			RUBYLIB=${S}/lib ${RUBY} -S rspec --color spec || die "Tests failed."
+			;;
+		*)
+			PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -S rake spec || die "Tests failed."
+			;;
+	esac
+
+	# There are features but it seems as if these only work against a
+	# fully installed version.
+}
diff --git a/dev-ruby/rspec-core/rspec-core-2.6.4.ebuild b/dev-ruby/rspec-core/rspec-core-2.6.4.ebuild
index 2c7f7e8440c0..33498bb75d39 100644
--- a/dev-ruby/rspec-core/rspec-core-2.6.4.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-2.6.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-2.6.4.ebuild,v 1.8 2011/10/02 17:05:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-2.6.4.ebuild,v 1.9 2011/12/28 08:22:50 graaff Exp $
 
 EAPI=2
-USE_RUBY="ruby18 ree18 ruby19 jruby"
+USE_RUBY="ruby18 ree18 jruby"
 
 RUBY_FAKEGEM_TASK_TEST="none"
 RUBY_FAKEGEM_TASK_DOC="none"
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-2.6.0-r1.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-2.6.0-r1.ebuild
new file mode 100644
index 000000000000..e5ab1705ccaf
--- /dev/null
+++ b/dev-ruby/rspec-expectations/rspec-expectations-2.6.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-expectations/rspec-expectations-2.6.0-r1.ebuild,v 1.1 2011/12/28 08:21:30 graaff Exp $
+
+EAPI=2
+USE_RUBY="ruby18 ree18 ruby19 jruby"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="http://rspec.rubyforge.org/"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/diff-lcs-1.1.2"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/rspec-core-2.4.0:2
+		dev-ruby/rspec-mocks:2
+	)"
+
+ruby_add_bdepend "doc? ( dev-ruby/rspec-core:2 )"
+
+# Not clear yet to what extend we need those (now)
+#	>=dev-ruby/cucumber-0.6.2
+#	>=dev-ruby/aruba-0.1.1"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Remove the Gemfile to avoid running through 'bundle exec'
+	rm Gemfile || die
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -S rake spec
+
+	# There are features but they require aruba which we don't have yet.
+}
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-2.6.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-2.6.0.ebuild
index 2e5e482db244..3a083ac9d14b 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-2.6.0.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-2.6.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-expectations/rspec-expectations-2.6.0.ebuild,v 1.9 2011/10/12 17:51:40 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-expectations/rspec-expectations-2.6.0.ebuild,v 1.10 2011/12/28 08:21:30 graaff Exp $
 
 EAPI=2
-USE_RUBY="ruby18 ree18 ruby19 jruby"
+USE_RUBY="ruby18 ree18 jruby"
 
 RUBY_FAKEGEM_TASK_TEST="none"
 
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-2.6.0-r1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-2.6.0-r1.ebuild
new file mode 100644
index 000000000000..00397e2ec8c6
--- /dev/null
+++ b/dev-ruby/rspec-mocks/rspec-mocks-2.6.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/rspec-mocks-2.6.0-r1.ebuild,v 1.1 2011/12/28 08:20:13 graaff Exp $
+
+EAPI=2
+USE_RUBY="ruby18 ree18 ruby19 jruby"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_TASK_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="http://rspec.rubyforge.org/"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# cucumber and rspec-core are loaded unconditionally in the Rakefile,
+# so we also need to require them for USE=doc.
+ruby_add_bdepend "test? (
+		>=dev-ruby/rspec-core-2.6.0:2
+		dev-ruby/rspec-expectations:2
+	)
+	doc? ( dev-ruby/rspec-core:2 )"
+
+# Not clear yet to what extend we need those (now)
+#	>=dev-ruby/cucumber-0.6.2
+#	>=dev-ruby/aruba-0.1.1"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Remove the Gemfile to avoid running through 'bundle exec'
+	rm Gemfile || die
+}
+
+all_ruby_compile() {
+	if use doc ; then
+		RUBYLIB="${S}/lib" rake rdoc || die
+	fi
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*jruby)
+			# This particular failure is reported to be fixed in jruby 1.6.
+			ewarn "Tests disabled because they crash jruby."
+			;;
+		*)
+			PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -S rake spec || die
+			;;
+	esac
+
+	# There are features but they require aruba which we don't have yet.
+}
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-2.6.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-2.6.0.ebuild
index 5e014eca07ef..abf98587a6d3 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-2.6.0.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-2.6.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/rspec-mocks-2.6.0.ebuild,v 1.8 2011/10/02 17:01:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/rspec-mocks-2.6.0.ebuild,v 1.9 2011/12/28 08:20:13 graaff Exp $
 
 EAPI=2
-USE_RUBY="ruby18 ree18 ruby19 jruby"
+USE_RUBY="ruby18 ree18 jruby"
 
 RUBY_FAKEGEM_TASK_TEST="none"
 
diff --git a/dev-ruby/rspec/rspec-1.3.1-r1.ebuild b/dev-ruby/rspec/rspec-1.3.1-r1.ebuild
index bb14f9015eff..db026ffedc72 100644
--- a/dev-ruby/rspec/rspec-1.3.1-r1.ebuild
+++ b/dev-ruby/rspec/rspec-1.3.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-1.3.1-r1.ebuild,v 1.6 2011/10/02 17:10:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-1.3.1-r1.ebuild,v 1.7 2011/12/28 08:26:50 graaff Exp $
 
 EAPI=2
-USE_RUBY="ruby18 ree18 ruby19 jruby"
+USE_RUBY="ruby18 ree18 jruby"
 
 RUBY_FAKEGEM_TASK_TEST="spec"
 
@@ -37,7 +37,7 @@ RDEPEND="!<dev-ruby/rspec-rails-${PV}"
 # We should add nokogiri here to make sure that we test as much as
 # possible, but since it's yet unported to 1.9 and the nokogiri-due
 # tests fail for sure, we'll be waiting on it.
-USE_RUBY="ruby18 ree18 ruby19" \
+USE_RUBY="ruby18 ree18" \
 	ruby_add_bdepend "test? (
 		>=dev-ruby/hoe-2.0.0
 		dev-ruby/zentest
diff --git a/dev-ruby/rspec/rspec-1.3.1.ebuild b/dev-ruby/rspec/rspec-1.3.1.ebuild
index 31c416b68448..041993365b5c 100644
--- a/dev-ruby/rspec/rspec-1.3.1.ebuild
+++ b/dev-ruby/rspec/rspec-1.3.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-1.3.1.ebuild,v 1.9 2011/07/22 13:04:02 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-1.3.1.ebuild,v 1.10 2011/12/28 08:26:50 graaff Exp $
 
 EAPI=2
-USE_RUBY="ruby18 ree18 ruby19 jruby"
+USE_RUBY="ruby18 ree18 jruby"
 
 RUBY_FAKEGEM_TASK_TEST="spec"
 
@@ -35,7 +35,7 @@ RDEPEND="!<dev-ruby/rspec-rails-${PV}"
 # We should add nokogiri here to make sure that we test as much as
 # possible, but since it's yet unported to 1.9 and the nokogiri-due
 # tests fail for sure, we'll be waiting on it.
-USE_RUBY="ruby18 ree18 ruby19" \
+USE_RUBY="ruby18 ree18" \
 	ruby_add_bdepend "test? (
 		>=dev-ruby/hoe-2.0.0
 		dev-ruby/zentest
diff --git a/dev-ruby/rspec/rspec-2.6.0-r1.ebuild b/dev-ruby/rspec/rspec-2.6.0-r1.ebuild
new file mode 100644
index 000000000000..6a3310b8223b
--- /dev/null
+++ b/dev-ruby/rspec/rspec-2.6.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-2.6.0-r1.ebuild,v 1.1 2011/12/28 08:24:41 graaff Exp $
+
+EAPI=2
+USE_RUBY="ruby18 ruby19 ree18 jruby"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.markdown"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="http://rspec.rubyforge.org/"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+SUBVERSION="$(get_version_component_range 1-2)"
+
+ruby_add_rdepend "
+	=dev-ruby/rspec-core-${SUBVERSION}*
+	=dev-ruby/rspec-expectations-${SUBVERSION}*
+	=dev-ruby/rspec-mocks-${SUBVERSION}*"
diff --git a/dev-ruby/rspec/rspec-2.6.0.ebuild b/dev-ruby/rspec/rspec-2.6.0.ebuild
index 07aed9ed7a00..7b7a560d349a 100644
--- a/dev-ruby/rspec/rspec-2.6.0.ebuild
+++ b/dev-ruby/rspec/rspec-2.6.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-2.6.0.ebuild,v 1.10 2011/10/02 17:07:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-2.6.0.ebuild,v 1.11 2011/12/28 08:24:41 graaff Exp $
 
 EAPI=2
-USE_RUBY="ruby18 ruby19 ree18 jruby"
+USE_RUBY="ruby18 ree18 jruby"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/ruby-opengl/ruby-opengl-0.60.1-r1.ebuild b/dev-ruby/ruby-opengl/ruby-opengl-0.60.1-r1.ebuild
index 1a1cc6227c8d..e1b38d17d64e 100644
--- a/dev-ruby/ruby-opengl/ruby-opengl-0.60.1-r1.ebuild
+++ b/dev-ruby/ruby-opengl/ruby-opengl-0.60.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-opengl/ruby-opengl-0.60.1-r1.ebuild,v 1.7 2010/10/20 21:50:04 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-opengl/ruby-opengl-0.60.1-r1.ebuild,v 1.8 2011/12/28 08:18:42 graaff Exp $
 
 EAPI="2"
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby18"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
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 ec067b930850..5d980851b1d8 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,10 +1,10 @@
 # Copyright 1999-2011 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.3 2011/12/03 19:04:28 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sary-ruby/sary-ruby-1.2.0-r2.ebuild,v 1.4 2011/12/28 08:17:26 graaff Exp $
 
 EAPI="2"
 # jruby: mkmf issue
-USE_RUBY="ruby18 ree18 ruby19"
+USE_RUBY="ruby18 ree18"
 inherit ruby-ng
 
 DESCRIPTION="Ruby Binding of Sary"
diff --git a/dev-ruby/sary-ruby/sary-ruby-1.2.0-r3.ebuild b/dev-ruby/sary-ruby/sary-ruby-1.2.0-r3.ebuild
new file mode 100644
index 000000000000..fcd3247eb947
--- /dev/null
+++ b/dev-ruby/sary-ruby/sary-ruby-1.2.0-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2011 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-r3.ebuild,v 1.1 2011/12/28 08:17:26 graaff Exp $
+
+EAPI="2"
+# jruby: mkmf issue
+USE_RUBY="ruby18 ree18 ruby19"
+inherit ruby-ng
+
+DESCRIPTION="Ruby Binding of Sary"
+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"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=app-text/sary-1.2.0"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+RUBY_PATCHES=(
+	"${P}-gentoo.patch"
+	"${P}-ruby19.patch"
+)
+
+each_ruby_configure() {
+	${RUBY} extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	# We have injected --no-undefined in Ruby as a safety precaution
+	# against broken ebuilds, but the Ruby-Gnome bindings
+	# unfortunately rely on the lazy load of other extensions; see bug
+	# #320545.
+	find . -name Makefile -print0 | xargs -0 \
+		sed -i -e 's:-Wl,--no-undefined ::' || die "--no-undefined removal failed"
+
+	emake || die "emake failed"
+}
+
+each_ruby_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+}
+
+all_ruby_install() {
+	dodoc ChangeLog *.rd || die
+}
diff --git a/dev-ruby/tmail/tmail-1.2.7.1-r2.ebuild b/dev-ruby/tmail/tmail-1.2.7.1-r2.ebuild
index 63ff10a27f4c..7561c6981c99 100644
--- a/dev-ruby/tmail/tmail-1.2.7.1-r2.ebuild
+++ b/dev-ruby/tmail/tmail-1.2.7.1-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tmail/tmail-1.2.7.1-r2.ebuild,v 1.7 2011/07/24 17:41:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tmail/tmail-1.2.7.1-r2.ebuild,v 1.8 2011/12/28 08:15:56 graaff Exp $
 
 EAPI=2
-USE_RUBY="ruby18 ree18 ruby19 jruby"
+USE_RUBY="ruby18 ree18 jruby"
 
 RUBY_FAKEGEM_TASK_DOC="doc"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/tmail/tmail-1.2.7.1-r3.ebuild b/dev-ruby/tmail/tmail-1.2.7.1-r3.ebuild
new file mode 100644
index 000000000000..67a411405f65
--- /dev/null
+++ b/dev-ruby/tmail/tmail-1.2.7.1-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tmail/tmail-1.2.7.1-r3.ebuild,v 1.1 2011/12/28 08:15:56 graaff Exp $
+
+EAPI=2
+USE_RUBY="ruby18 ree18 ruby19 jruby"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README CHANGES NOTES"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An email handling library"
+HOMEPAGE="http://rubyforge.org/projects/tmail/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="debug"
+
+# Tests seem to be broken with the new encoding handling from Ruby,
+# need to be verified twice; code seems to work anyway.
+RESTRICT=test
+
+# Once it's added to portage, this should be added, right now it's
+# bundled.
+# ruby_add_rdepend dev-ruby/rchardet
+
+ruby_add_bdepend "
+	dev-ruby/racc
+	test? ( >=dev-ruby/mocha-0.9.5 )"
+
+all_ruby_prepare() {
+	# Provide file that is no longer distributed but still needed
+	mkdir meta || die "Failed to mkdir meta."
+	echo "tmail" > meta/unixname || die "Failed to create unixname file."
+}
+
+each_ruby_configure() {
+	case ${RUBY} in
+		*ruby18 | *rubyee18)
+			${RUBY} -Cext/tmailscanner/tmail extconf.rb || die "extconf failed"
+			;;
+	esac
+}
+
+each_ruby_compile() {
+	emake -C lib/tmail $(use debug && echo DEBUG=true) parser.rb || die "emake failed"
+
+	case ${RUBY} in
+		*ruby18 | *rubyee18)
+			emake -Cext/tmailscanner/tmail \
+				CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" || die "emake extension failed"
+			;;
+	esac
+}
+
+each_ruby_install() {
+	# We cannot use the recursive install because there are
+	# racc source files and a makefile.
+	find lib -name '*.rb' | while read file; do
+		ruby_fakegem_newins $file $file
+	done
+
+	[[ -f ext/tmailscanner/tmail/tmailscanner.so ]] && \
+		ruby_fakegem_newins ext/tmailscanner/tmail/tmailscanner.so lib/tmail/tmailscanner.so
+
+	ruby_fakegem_install_gemspec
+}
diff --git a/dev-ruby/tzinfo/Manifest b/dev-ruby/tzinfo/Manifest
index 6e44068ad255..2cf6373da811 100644
--- a/dev-ruby/tzinfo/Manifest
+++ b/dev-ruby/tzinfo/Manifest
@@ -1,3 +1,2 @@
 DIST tzinfo-0.3.27.tar.gz 303590 RMD160 a24ee1626aecdd386b93ac6a7aa676bc7d5f55ff SHA1 c55be7c97a504cad333f3de32a181956bfb26010 SHA256 2d4c06204957a77cd30f084c59e3b1f3dd348ee82814ad9d5f56a419e6c9a313
-DIST tzinfo-0.3.30.tar.gz 295064 RMD160 2d9bc13cedc31fe2dc456c4f5c3d2cc9a5ad35f5 SHA1 c8e1a5d466596fca07f947ab83365976cd87bfc5 SHA256 45069c6ebba94abcf8e982646eae91f1dc396251038931796d7e3394c2fea847
 DIST tzinfo-0.3.31.tar.gz 296665 RMD160 b855dff1b394681f91e70bbfd5ea94c5a214501a SHA1 37919023b2cde4068c6adb239b2cc4eb769777ed SHA256 a57118a631a7d90f978aa5d2b3b11e37385cfc5a17b81583ce9275322f1241a7
diff --git a/dev-ruby/tzinfo/tzinfo-0.3.30.ebuild b/dev-ruby/tzinfo/tzinfo-0.3.31-r1.ebuild
similarity index 78%
rename from dev-ruby/tzinfo/tzinfo-0.3.30.ebuild
rename to dev-ruby/tzinfo/tzinfo-0.3.31-r1.ebuild
index 1c7962177d36..a7386eaafa49 100644
--- a/dev-ruby/tzinfo/tzinfo-0.3.30.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-0.3.31-r1.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tzinfo/tzinfo-0.3.30.ebuild,v 1.1 2011/09/29 23:28:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tzinfo/tzinfo-0.3.31-r1.ebuild,v 1.1 2011/12/28 08:14:14 graaff Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18 ruby19 jruby"
 
+# No longer compatible with rake 0.9 starting with 0.3.31.
+RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="CHANGES README"
 
@@ -32,3 +34,7 @@ all_ruby_prepare() {
 		-e '/^    def test_get_tainted_not_loaded/, /^    end/ s:^:#:' \
 		"${S}"/test/tc_timezone.rb || die "unable to sed out the test"
 }
+
+each_ruby_test() {
+	TZ='America/Los_Angeles' ${RUBY} -I. -S testrb test/tc_*.rb || die
+}
diff --git a/dev-ruby/tzinfo/tzinfo-0.3.31.ebuild b/dev-ruby/tzinfo/tzinfo-0.3.31.ebuild
index 7ad009f09248..673a3f4712c5 100644
--- a/dev-ruby/tzinfo/tzinfo-0.3.31.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-0.3.31.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tzinfo/tzinfo-0.3.31.ebuild,v 1.5 2011/12/18 15:52:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tzinfo/tzinfo-0.3.31.ebuild,v 1.6 2011/12/28 08:14:14 graaff Exp $
 
 EAPI=2
-USE_RUBY="ruby18 ree18 ruby19 jruby"
+USE_RUBY="ruby18 ree18 jruby"
 
 # No longer compatible with rake 0.9 starting with 0.3.31.
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-tex/bibtexu/bibtexu-3.71_p20110705.ebuild b/dev-tex/bibtexu/bibtexu-3.71_p20110705.ebuild
index 2a7ab7182466..ed5ec79a36dc 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
 # 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.1 2011/07/27 14:08:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/bibtexu/bibtexu-3.71_p20110705.ebuild,v 1.2 2011/12/28 04:30:48 jer 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 8f5f4cf8e6e9..7e5be0f6ef6e 100644
--- a/dev-tex/mh/mh-20111011.ebuild
+++ b/dev-tex/mh/mh-20111011.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.1 2011/10/11 14:02:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/mh/mh-20111011.ebuild,v 1.2 2011/12/28 04:58:31 jer 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 9e8caadef93b..fd90085035e1 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
 # 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.1 2011/10/11 14:43:08 aballier Exp $
+# $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 $
 
 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 37c988d82c71..f77bce3de2e6 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
 # 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.1 2011/07/28 12:47:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2011.ebuild,v 1.2 2011/12/28 04:47:58 jer 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 42fae8d80add..e7f07265b60c 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
 # 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.1 2011/07/28 12:48:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-context/texlive-context-2011.ebuild,v 1.2 2011/12/28 05:12:39 jer 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 a2bdd9beaae8..269c280874bc 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
 # 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.1 2011/07/28 12:48:28 aballier Exp $
+# $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 $
 
 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 fcda40e73e0b..9cdcc5ad63af 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
 # 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.1 2011/07/28 12:48:50 aballier Exp $
+# $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 $
 
 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 a64bd59fa1fe..8abd51dabfdb 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
 # 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.1 2011/07/28 12:49:13 aballier Exp $
+# $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 $
 
 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 c3bef770e7cc..4ad02ae23daf 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
 # 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.1 2011/07/28 12:49:37 aballier Exp $
+# $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 $
 
 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 fa64886d0b9e..4c5775d4ce04 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
 # 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.1 2011/07/28 12:50:00 aballier Exp $
+# $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 $
 
 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 ce3d3a757d42..773b2056d3ca 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
 # 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.1 2011/07/28 12:50:23 aballier Exp $
+# $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 $
 
 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 dc20abf597bb..5125faf9e454 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
 # 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.1 2011/07/28 12:50:47 aballier Exp $
+# $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 $
 
 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 ac89784bf663..fd526691d0af 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
 # 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.1 2011/07/28 12:51:10 aballier Exp $
+# $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 $
 
 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 b0417dbf99dd..d9292ca91e01 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
 # 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.1 2011/07/28 12:51:34 aballier Exp $
+# $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 $
 
 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 ddbf211db586..2a033beb07ce 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
 # 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.1 2011/07/28 13:08:32 aballier Exp $
+# $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 $
 
 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 d263ac37453b..157ba13106ae 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
 # 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.1 2011/07/28 13:08:55 aballier Exp $
+# $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 $
 
 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 57eabd44802f..0ec50f3a73d6 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
 # 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.1 2011/07/28 13:09:17 aballier Exp $
+# $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 $
 
 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 910f7f115097..e0c33cb28982 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
 # 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.1 2011/07/28 13:09:39 aballier Exp $
+# $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 $
 
 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 3673a086057e..05fd1f0c5db6 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
 # 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.1 2011/07/28 13:10:01 aballier Exp $
+# $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 $
 
 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 bfadd4c11ef7..825fa231f5f0 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
 # 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.1 2011/07/28 13:10:23 aballier Exp $
+# $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 $
 
 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 17c78d4a01fb..bdca0d2526a5 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
 # 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.1 2011/07/28 13:10:46 aballier Exp $
+# $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 $
 
 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 e55e45d35f36..468655583c11 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
 # 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.1 2011/07/28 13:11:09 aballier Exp $
+# $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 $
 
 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 8b1e0a8c4047..f7d7a0f5a8ff 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
 # 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.1 2011/07/28 13:11:31 aballier Exp $
+# $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 $
 
 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 60f23b80e651..0e4626cd5363 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
 # 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.1 2011/07/28 13:11:53 aballier Exp $
+# $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 $
 
 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 4615c7c40d28..8aea2118784c 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
 # 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.1 2011/07/28 13:12:15 aballier Exp $
+# $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 $
 
 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 adff13da4df5..7179fd560f5d 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
 # 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.1 2011/07/28 13:12:37 aballier Exp $
+# $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 $
 
 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 0f86467a935e..85280a40b589 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
 # 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.1 2011/07/28 13:13:01 aballier Exp $
+# $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 $
 
 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 f27bff27c85c..3bba01ece767 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
 # 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.1 2011/07/28 13:13:23 aballier Exp $
+# $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 $
 
 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 c83651b04830..502d0232395d 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
 # 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.1 2011/07/28 13:13:47 aballier Exp $
+# $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 $
 
 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 1fe803cbc9e9..c54756e09398 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
 # 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.1 2011/07/28 13:14:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-fontsextra/texlive-fontsextra-2011.ebuild,v 1.2 2011/12/28 04:49:03 jer 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 5a504b71ed28..fe63497bb941 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
 # 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.1 2011/07/28 13:14:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2011.ebuild,v 1.2 2011/12/28 04:39:16 jer 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 e402a105a6e3..f29bf8e0964b 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
 # 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.1 2011/07/28 13:15:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-fontutils/texlive-fontutils-2011.ebuild,v 1.2 2011/12/28 04:36:18 jer 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 35fcb5029583..86c290c9144a 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
 # 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.1 2011/07/28 13:15:28 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-formatsextra/texlive-formatsextra-2011.ebuild,v 1.2 2011/12/28 04:49:58 jer 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 0b8a93f91f85..58f55e782626 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
 # 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.1 2011/07/28 13:15:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-games/texlive-games-2011.ebuild,v 1.2 2011/12/28 05:16:51 jer 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 541107ad8e64..08f13159f3eb 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
 # 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.1 2011/07/28 13:16:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-genericextra/texlive-genericextra-2011.ebuild,v 1.2 2011/12/28 04:50:50 jer 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 6225f29af01f..16c867f43016 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
 # 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.1 2011/07/28 13:16:38 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-genericrecommended/texlive-genericrecommended-2011.ebuild,v 1.2 2011/12/28 04:46:21 jer 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 998fd7541453..c7c45b58fe2e 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
 # 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.1 2011/07/28 13:17:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-htmlxml/texlive-htmlxml-2011.ebuild,v 1.2 2011/12/28 05:19:14 jer 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 7bb6062d4cc3..6afda8373997 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
 # 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.1 2011/07/28 13:17:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-humanities/texlive-humanities-2011.ebuild,v 1.2 2011/12/28 05:17:55 jer 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 e9dd901bc133..b75deb6b4bce 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
 # 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.1 2011/07/28 13:17:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langafrican/texlive-langafrican-2011.ebuild,v 1.2 2011/12/28 05:39:24 jer 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 4fda83448d67..bcbbff76d2a2 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
 # 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.1 2011/07/28 13:18:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langarabic/texlive-langarabic-2011.ebuild,v 1.2 2011/12/28 05:40:35 jer 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 cd927bfee241..7c6ee32b45d3 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
 # 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.1 2011/07/28 13:18:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langarmenian/texlive-langarmenian-2011.ebuild,v 1.2 2011/12/28 05:42:07 jer 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 7eb4e5814bdd..41c2edf1e548 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
 # 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.3 2011/08/17 08:51:02 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langcjk/texlive-langcjk-2011.ebuild,v 1.4 2011/12/28 05:42:45 jer 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 f2db87f7a22a..bfc355b627fb 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
 # 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.1 2011/07/28 13:19:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langcroatian/texlive-langcroatian-2011.ebuild,v 1.2 2011/12/28 05:43:33 jer 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 9ba77c2ba74e..52e69277a62b 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
 # 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.1 2011/07/28 13:19:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2011.ebuild,v 1.2 2011/12/28 05:43:50 jer 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 fafdf203c8e1..82dc11c6232d 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
 # 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.1 2011/07/28 13:20:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2011.ebuild,v 1.2 2011/12/28 05:44:49 jer 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 e2530c8eaf1e..255978bfc248 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
 # 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.1 2011/07/28 13:20:28 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langdanish/texlive-langdanish-2011.ebuild,v 1.2 2011/12/28 05:45:01 jer 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 d182df2f52b4..f9f547d29e28 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
 # 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.1 2011/07/28 13:20:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langdutch/texlive-langdutch-2011.ebuild,v 1.2 2011/12/28 05:45:50 jer 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 eccf48edef4f..6286a4b252a2 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
 # 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.1 2011/07/28 13:21:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langenglish/texlive-langenglish-2011.ebuild,v 1.2 2011/12/28 05:46:03 jer 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 395bc7c3fddb..fb660192ebc3 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
 # 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.1 2011/07/28 13:21:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langfinnish/texlive-langfinnish-2011.ebuild,v 1.2 2011/12/28 05:47:13 jer 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 ed0cd78a27f1..24bbb9c2f20e 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
 # 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.1 2011/07/28 13:21:59 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langfrench/texlive-langfrench-2011.ebuild,v 1.2 2011/12/28 05:47:26 jer 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 9a5264e4cde4..cc6dc93b21c9 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
 # 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.1 2011/07/28 13:22:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langgerman/texlive-langgerman-2011.ebuild,v 1.2 2011/12/28 05:48:07 jer 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 98d258864f57..e559b4640ffa 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
 # 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.1 2011/07/28 13:22:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langgreek/texlive-langgreek-2011.ebuild,v 1.2 2011/12/28 05:48:19 jer 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 9763786c98f6..a0228357a63a 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
 # 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.1 2011/07/28 13:23:07 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langhebrew/texlive-langhebrew-2011.ebuild,v 1.2 2011/12/28 05:48:56 jer 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 d6e4e02215cc..9f8930ceb336 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
 # 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.1 2011/07/28 13:23:31 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langhungarian/texlive-langhungarian-2011.ebuild,v 1.2 2011/12/28 05:49:26 jer 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 01c9e6a7c7fd..7885df450b13 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
 # 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.1 2011/07/28 13:23:55 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langindic/texlive-langindic-2011.ebuild,v 1.2 2011/12/28 05:49:47 jer 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 9fe86774e3d3..9afeab4bf9ba 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
 # 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.1 2011/07/28 13:24:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langitalian/texlive-langitalian-2011.ebuild,v 1.2 2011/12/28 05:50:15 jer 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 b81d0f89a2d8..e5106d8b3d71 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
 # 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.1 2011/07/28 13:24:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langlatin/texlive-langlatin-2011.ebuild,v 1.2 2011/12/28 05:51:11 jer 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 81b35b556f02..885097e05510 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
 # 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.1 2011/07/28 13:25:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langlatvian/texlive-langlatvian-2011.ebuild,v 1.2 2011/12/28 05:51:33 jer 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 d354cd8d1110..7f3c8ac9602b 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
 # 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.1 2011/07/28 13:25:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langlithuanian/texlive-langlithuanian-2011.ebuild,v 1.2 2011/12/28 05:52:07 jer 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 0dd5435977f5..5c9109d41c36 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
 # 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.1 2011/07/28 13:25:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langmongolian/texlive-langmongolian-2011.ebuild,v 1.2 2011/12/28 05:52:23 jer 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 df492848e1ed..6d1710f4216b 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
 # 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.1 2011/07/28 13:26:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langnorwegian/texlive-langnorwegian-2011.ebuild,v 1.2 2011/12/28 05:53:48 jer 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 d2f24d3cbf45..8e66541112c7 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
 # 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.1 2011/07/28 13:26:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langother/texlive-langother-2011.ebuild,v 1.2 2011/12/28 05:55:53 jer 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 b4cfd022a84f..83c0b9fe2277 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
 # 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.1 2011/07/28 13:26:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langpolish/texlive-langpolish-2011.ebuild,v 1.2 2011/12/28 05:56:09 jer 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 ce44c800d6be..37555bf1d3e1 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
 # 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.1 2011/07/28 13:27:23 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langportuguese/texlive-langportuguese-2011.ebuild,v 1.2 2011/12/28 05:57:07 jer 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 cb8bbd9c41c4..ff40fe1db377 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
 # 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.1 2011/07/28 13:27:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langspanish/texlive-langspanish-2011.ebuild,v 1.2 2011/12/28 05:57:17 jer 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 5888bd3c49f6..5689fbb29b67 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
 # 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.1 2011/07/28 13:28:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langswedish/texlive-langswedish-2011.ebuild,v 1.2 2011/12/28 05:58:05 jer 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 85b302fb5272..c992576da9dc 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
 # 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.1 2011/07/28 13:28:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langtibetan/texlive-langtibetan-2011.ebuild,v 1.2 2011/12/28 05:58:13 jer 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 3482177dda7d..320215664438 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
 # 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.1 2011/07/28 13:28:55 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langturkmen/texlive-langturkmen-2011.ebuild,v 1.2 2011/12/28 05:59:00 jer 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 99ca9f6d5b70..5da22da2bb40 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
 # 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.1 2011/07/28 13:29:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langvietnamese/texlive-langvietnamese-2011.ebuild,v 1.2 2011/12/28 05:59:12 jer 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 779e53369434..ce6b35e7e712 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
 # 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.2 2011/08/04 05:59:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-latex/texlive-latex-2011.ebuild,v 1.3 2011/12/28 04:40:33 jer 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 5e68d479b3b9..946ff6d24d68 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
 # 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.1 2011/12/22 23:06:22 aballier Exp $
+# $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 $
 
 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 a292a9418839..92905a6d2e7e 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
 # 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.2 2011/08/12 21:26:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2011.ebuild,v 1.3 2011/12/28 04:43:51 jer 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 f385434b6508..018309d81879 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
 # 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.1 2011/07/28 13:31:46 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-luatex/texlive-luatex-2011.ebuild,v 1.2 2011/12/28 04:42:24 jer 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 ba8077566405..096f732a3005 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
 # 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.1 2011/07/28 13:32:13 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-mathextra/texlive-mathextra-2011.ebuild,v 1.2 2011/12/28 04:59:50 jer 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 98d4818419a4..cac6252cf51a 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
 # 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.1 2011/07/28 13:32:38 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-metapost/texlive-metapost-2011.ebuild,v 1.2 2011/12/28 04:45:11 jer 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 25e23b293822..7fcf01d4b9c6 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
 # 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.1 2011/07/28 13:33:03 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-music/texlive-music-2011.ebuild,v 1.2 2011/12/28 05:08:06 jer 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 80fb26944ca7..ba13f71a9dff 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
 # 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.1 2011/07/28 13:33:27 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-omega/texlive-omega-2011.ebuild,v 1.2 2011/12/28 05:10:49 jer 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 e20760d12884..9f308be7730e 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
 # 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.1 2011/07/28 13:33:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-pictures/texlive-pictures-2011.ebuild,v 1.2 2011/12/28 04:55:39 jer 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 c82b4a053feb..a14be251afe6 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
 # 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.1 2011/07/28 13:34:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-plainextra/texlive-plainextra-2011.ebuild,v 1.2 2011/12/28 05:01:08 jer 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 3bfcfc176e45..7ef58a2da7db 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
 # 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.1 2011/07/28 13:34:46 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-pstricks/texlive-pstricks-2011.ebuild,v 1.2 2011/12/28 05:09:54 jer 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 551004105a4e..977600cbed06 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
 # 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.2 2011/07/31 07:41:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-publishers/texlive-publishers-2011.ebuild,v 1.3 2011/12/28 05:06:54 jer 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 e2f6ab95fd43..6f41ca4feb1f 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
 # 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.1 2011/07/28 13:35:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-science/texlive-science-2011.ebuild,v 1.2 2011/12/28 05:03:12 jer 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 ef3ffecba922..f6201e9b6f1c 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
 # 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.1 2011/07/28 13:36:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-texinfo/texlive-texinfo-2011.ebuild,v 1.2 2011/12/28 04:38:14 jer 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 b09c5535229c..1de6556cd5bd 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
 # 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.1 2011/07/28 13:36:34 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-xetex/texlive-xetex-2011.ebuild,v 1.2 2011/12/28 05:02:06 jer 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/biew/metadata.xml b/dev-util/biew/metadata.xml
index ff62877c67ae..58a826b66ff9 100644
--- a/dev-util/biew/metadata.xml
+++ b/dev-util/biew/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer>
-  <email>maintainer-needed@gentoo.org</email>
+  <email>xmw@gentoo.org</email>
+  <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index c4fee1fa5809..0d8254817664 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -9,5 +9,6 @@ DIST debhelper_8.1.1.tar.gz 378596 RMD160 34dc98195c3c47b1bc24a0a9deb135ee3444ee
 DIST debhelper_8.1.3.tar.gz 380118 RMD160 3532a0a8d58ad438410c9e0ac1d366acf8d4524d SHA1 5e8d12fb68e22c28863c30ebe4d8d452e0cf9da6 SHA256 ce4a08a008faf4306fcc77f574c2ded1559bde58aa81d2bdc6c4abb90fd4ddec
 DIST debhelper_8.1.4.tar.gz 380051 RMD160 c646722817a1670a617754b770553b723a5dc7c2 SHA1 f358f178215e2f245ec76ec8ef33b964c9888dab SHA256 9815b407c07ca5baaf33276b5a6e5a14d44c28f43bb395d67ee7f582f555c0f2
 DIST debhelper_8.1.6.tar.gz 380933 RMD160 00ea41a864708065fa68ddf5cf6a1427fe9dcf36 SHA1 259cf48631378233fcd11913ebd396600470c3a6 SHA256 22b4f212fb86d7d6a50bb667a3667494e24a769a205a6ec15879511f4b4f6bf7
+DIST debhelper_8.9.14.tar.gz 460388 RMD160 20442017ff69a02d5a85c2a297b692ea9e4ce5f2 SHA1 25b197c3515a247fb3c86d1520a03e2c35c1797d SHA256 ca9dd349f25c244955d627311e26cbf1622b1dfff365979c2a94294c5a71e3ad
 DIST debhelper_8.9.2.tar.gz 385448 RMD160 d44b9fc20f81eb0c73f6ac98070b75f0a1f2733e SHA1 73dee047e44f94db3d771faf8ab48983823b24e7 SHA256 90944b19ddd039ae703c1713acebd1894ed8e2a12019f071e7e1b104c748d3ae
 DIST debhelper_8.9.3.tar.gz 385402 RMD160 633d5080acfe2b2c983d628a97e8a5bf277e5b20 SHA1 a8720e5d1686c50d2e9239a3c6aa419105163ff9 SHA256 bebb44215fd2d12c07a4ace0c114abc165204a29c177cd102e99fd10db9e485a
diff --git a/dev-util/debhelper/debhelper-8.9.14.ebuild b/dev-util/debhelper/debhelper-8.9.14.ebuild
new file mode 100644
index 000000000000..a1cd776322de
--- /dev/null
+++ b/dev-util/debhelper/debhelper-8.9.14.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-8.9.14.ebuild,v 1.1 2011/12/28 04:06:16 jer Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
+HOMEPAGE="http://packages.qa.debian.org/d/debhelper.html http://kitenet.net/~joey/code/debhelper.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE="nls linguas_de linguas_es linguas_fr test"
+
+RDEPEND="app-arch/dpkg
+	dev-perl/TimeDate
+	virtual/perl-Getopt-Long
+	>=dev-lang/perl-5.10"
+
+DEPEND="${RDEPEND}
+	nls? ( >=app-text/po4a-0.24 )
+	test? ( dev-perl/Test-Pod )"
+
+S=${WORKDIR}/${PN}
+
+PATCH_VER=7.4.13
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-${PATCH_VER}-conditional-nls.patch
+}
+
+src_compile() {
+	tc-export CC
+	local USE_NLS=no LANGS=""
+
+	use nls && USE_NLS=yes
+
+	use linguas_de && LANGS="${LANGS} de"
+	use linguas_es && LANGS="${LANGS} es"
+	use linguas_fr && LANGS="${LANGS} fr"
+
+	emake USE_NLS=${USE_NLS} LANGS="${LANGS}" build
+}
+
+src_install() {
+	default
+	dodoc doc/* debian/changelog
+	docinto examples
+	dodoc examples/*
+	for manfile in *.1 *.7 ; do
+		case ${manfile} in
+			*.de.?)	use linguas_de \
+					&& cp ${manfile} "${T}"/${manfile/.de/} \
+					&& doman -i18n=de "${T}"/${manfile/.de/}
+				;;
+			*.es.?)	use linguas_es \
+					&& cp ${manfile} "${T}"/${manfile/.es/} \
+					&& doman -i18n=es "${T}"/${manfile/.es/}
+				;;
+			*.fr.?)	use linguas_fr \
+					&& cp ${manfile} "${T}"/${manfile/.fr/} \
+					&& doman -i18n=fr "${T}"/${manfile/.fr/}
+				;;
+			*)	doman ${manfile}
+				;;
+		esac
+	done
+}
diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index 0c7c4700d490..0328b63c16d8 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.161 2011/12/15 05:23:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.163 2011/12/28 06:28:55 dirtyepic Exp $
 
 # @ECLASS: flag-o-matic.eclass
 # @MAINTAINER:
@@ -32,41 +32,36 @@ inherit eutils toolchain-funcs multilib
 # {C,CXX,F,FC}FLAGS that we allow in strip-flags
 # Note: shell globs and character lists are allowed
 setup-allowed-flags() {
-	if [[ -z ${ALLOWED_FLAGS} ]] ; then
-		export ALLOWED_FLAGS="-pipe"
-		export ALLOWED_FLAGS="${ALLOWED_FLAGS} -O -O0 -O1 -O2 -mcpu -march -mtune"
-		export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fstack-protector -fstack-protector-all"
-		export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fbounds-checking -fno-strict-overflow"
-		export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-PIE -fno-pie -fno-unit-at-a-time"
-		export ALLOWED_FLAGS="${ALLOWED_FLAGS} -g -g[0-9] -ggdb -ggdb[0-9] -gstabs -gstabs+"
-		export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-ident -fpermissive"
-		export ALLOWED_FLAGS="${ALLOWED_FLAGS} -W* -w"
-	fi
+	ALLOWED_FLAGS="-pipe"
+	ALLOWED_FLAGS+=" -O -O1 -O2 -Os -mcpu -march -mtune"
+	ALLOWED_FLAGS+=" -fstack-protector -fstack-protector-all"
+	ALLOWED_FLAGS+=" -fbounds-checking -fno-strict-overflow"
+	ALLOWED_FLAGS+=" -fno-PIE -fno-pie -fno-unit-at-a-time"
+	ALLOWED_FLAGS+=" -g -g[0-9] -ggdb -ggdb[0-9] -gstabs -gstabs+"
+	ALLOWED_FLAGS+=" -fno-ident -fpermissive"
+	ALLOWED_FLAGS+=" -W* -w"
+
 	# allow a bunch of flags that negate features / control ABI
-	ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-stack-protector -fno-stack-protector-all \
-		-fno-strict-aliasing -fno-bounds-checking -fstrict-overflow -fno-omit-frame-pointer"
-	ALLOWED_FLAGS="${ALLOWED_FLAGS} -mregparm -mno-app-regs -mapp-regs \
-		-mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-ssse3 -mno-sse4 -mno-sse4.1 \
-		-mno-sse4.2 -mno-avx -mno-aes -mno-pclmul -mno-sse4a -mno-3dnow \
-		-mno-popcnt -mno-abm \
-		-mips1 -mips2 -mips3 -mips4 -mips32 -mips64 -mips16 -mplt \
+	ALLOWED_FLAGS+=" -fno-stack-protector -fno-stack-protector-all \
+		-fno-strict-aliasing -fno-bounds-checking -fstrict-overflow \
+		-fno-omit-frame-pointer"
+	ALLOWED_FLAGS+=" -mregparm -mno-app-regs -mapp-regs -mno-mmx -mno-sse \
+		-mno-sse2 -mno-sse3 -mno-ssse3 -mno-sse4 -mno-sse4.1 -mno-sse4.2 \
+		-mno-avx -mno-aes -mno-pclmul -mno-sse4a -mno-3dnow -mno-popcnt \
+		-mno-abm -mips1 -mips2 -mips3 -mips4 -mips32 -mips64 -mips16 -mplt \
 		-msoft-float -mno-soft-float -mhard-float -mno-hard-float -mfpu \
 		-mieee -mieee-with-inexact -mschedule -mfloat-gprs -mspe -mno-spe \
-		-mtls-direct-seg-refs -mno-tls-direct-seg-refs \
-		-mflat -mno-flat -mno-faster-structs -mfaster-structs \
-		-m32 -m64 -mx32 -mabi -mlittle-endian -mbig-endian -EL -EB -fPIC \
-		-mlive-g0 -mcmodel -mstack-bias -mno-stack-bias \
-		-msecure-plt -m*-toc -D* -U*"
+		-mtls-direct-seg-refs -mno-tls-direct-seg-refs -mflat -mno-flat \
+		-mno-faster-structs -mfaster-structs -m32 -m64 -mx32 -mabi \
+		-mlittle-endian -mbig-endian -EL -EB -fPIC -mlive-g0 -mcmodel \
+		-mstack-bias -mno-stack-bias -msecure-plt -m*-toc -D* -U*"
 
 	# 4.5
-	ALLOWED_FLAGS="${ALLOWED_FLAGS} -mno-fma4 -mno-movbe -mno-xop -mno-lwp"
+	ALLOWED_FLAGS+=" -mno-fma4 -mno-movbe -mno-xop -mno-lwp"
 	# 4.6
-	ALLOWED_FLAGS="${ALLOWED_FLAGS} -mno-fsgsbase -mno-rdrnd -mno-f16c \
-		-mno-bmi -mno-tbm"
+	ALLOWED_FLAGS+=" -mno-fsgsbase -mno-rdrnd -mno-f16c -mno-bmi -mno-tbm"
 
-	# {C,CXX,F,FC}FLAGS that we are think is ok, but needs testing
-	# NOTE:  currently -Os have issues with gcc3 and K6* arch's
-	export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks"
+	export ALLOWED_FLAGS
 	return 0
 }
 
@@ -338,11 +333,6 @@ strip-flags() {
 	local NEW_FFLAGS=""
 	local NEW_FCFLAGS=""
 
-	# Allow unstable C[XX]FLAGS if we are using unstable profile ...
-	if has "~$(tc-arch)" ${ACCEPT_KEYWORDS} ; then
-		ALLOWED_FLAGS="${ALLOWED_FLAGS} ${UNSTABLE_FLAGS}"
-	fi
-
 	set -f	# disable pathname expansion
 
 	for x in ${CFLAGS}; do
diff --git a/gnome-extra/nautilus-tracker-tags/Manifest b/gnome-extra/nautilus-tracker-tags/Manifest
index 99159eb63aef..98a9e2ad631c 100644
--- a/gnome-extra/nautilus-tracker-tags/Manifest
+++ b/gnome-extra/nautilus-tracker-tags/Manifest
@@ -1,2 +1,2 @@
-DIST tracker-0.12.7.tar.xz 5969180 RMD160 e31b85538145404640c303968ecbbb8f729d2564 SHA1 188c9aaa5478302be818e36c3ef126267971289d SHA256 e7a4d016326bc0a1b6aea07e48c3de73ffc29119812149e2dee5eac35104f1b4
 DIST tracker-0.12.8.tar.xz 5876100 RMD160 10f29842973c0489d5e0c2e0c0c977ca87d47fee SHA1 a1a528bdcaacce4350c2368026083236db7cd165 SHA256 92b18cc381a80d87d52e386f51ca1475b94f82cf5adf668424669c5b63474473
+DIST tracker-0.12.9.tar.xz 5867980 RMD160 1c6054ffc9f3588db0d355fcfb02703ab8d403c2 SHA1 b5fc5465f3da00c0b2b23cddc0f55a3d1b66d0b7 SHA256 ccd61c8f79905f7e09af3a4a863772256601dcd3213b0f9a3f76add04e553b5c
diff --git a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-0.12.7.ebuild b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-0.12.9.ebuild
similarity index 92%
rename from gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-0.12.7.ebuild
rename to gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-0.12.9.ebuild
index 530e9b26050a..a5035df51ffa 100644
--- a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-0.12.7.ebuild
+++ b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-0.12.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-0.12.7.ebuild,v 1.1 2011/11/02 16:24:23 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-0.12.9.ebuild,v 1.1 2011/12/28 05:39:27 tetromino Exp $
 
 EAPI="4"
 GNOME_ORG_MODULE="tracker"
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index 70250856959b..2b70d4088f09 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -1,50 +1,4 @@
 DIST libnotify.so.1.bz2 11228 RMD160 459dd9f8de3a4a421348c3ad0e793e868a09c228 SHA1 6b6aeff3e4a55b09d6791c2c9cde767a0659efae SHA256 fa0082cf266108da8ef9ef366de1ac044d2df5d4799e359f009c5a5c58f38395
-DIST thunderbird-3.1.10-af.xpi 210557 RMD160 6a0f2dc1241cae8e25f79de456b63fe659072b3f SHA1 398f1dde23d8a8b9870c033ff636738539c115b0 SHA256 e5ceb7e160596e632df8c43c58706158e0440896b517178b0c3506990443b08d
-DIST thunderbird-3.1.10-ar.xpi 230315 RMD160 2d5e9e197efa21e89a91e51c7e93823758387fcd SHA1 bbfbef4860149027756da262d4596d39d5872a7e SHA256 a7d0ca5a275ee934d96943c22de55b0885c49cd0a25e57508b3fad8e2b500338
-DIST thunderbird-3.1.10-be.xpi 194427 RMD160 c71b635673d7268d5e40fd606bf8707464928d92 SHA1 3e49e3edac22ab0997c35521c2f5a3ca85d91231 SHA256 056f899de1725302401339fa9b7c97cddaec376f54d6b156807702c3786200da
-DIST thunderbird-3.1.10-bg.xpi 235120 RMD160 8f5720da1c828c10c4cccef0bf37984ab389a49a SHA1 be367325cf6d9272e5676d8d3fc675c312df9e78 SHA256 0560577d88201e875e72438587bce261e6759f5f7005175f7fec621837d1841e
-DIST thunderbird-3.1.10-bn-BD.xpi 244805 RMD160 dc37ee25b18e8f7c42d99b277d96c0e4e52ce11d SHA1 dfff896b36ff41822cdb9806b759dca60c158f88 SHA256 73dfa5d973ce8928e28aba55fe0ddfa92882210fe0c65d9f05b81f590245ed07
-DIST thunderbird-3.1.10-ca.xpi 219310 RMD160 bb1a72a40292382a2a6acfa760b54afee720d023 SHA1 4b3d92f9233dc06930774e3507dfbe5e8cf16af2 SHA256 eb19a6fff770b1a2ce8bada62540d47a764c04eb2fd7959547fdd795afa91147
-DIST thunderbird-3.1.10-cs.xpi 218144 RMD160 5b51990e3eda404148d070c915cd83cd6ceff8e4 SHA1 149b34bf3f61d78b510c771e00b58cb5e60da11a SHA256 4bb052e7983b47d87386dc7b6f4449aa0b2b7f1a459952b34edc24b62df9a767
-DIST thunderbird-3.1.10-da.xpi 203173 RMD160 587258cd265cec0f93e2a3fa43a188f06b00593b SHA1 447c1ceacc7d601d58354a5f828630a086de5220 SHA256 b517b10e5f9359740c31e484d7524119bdae2f41a78a33c58d0ce306e03e581c
-DIST thunderbird-3.1.10-de.xpi 222771 RMD160 51823d24caef7e395819128788eaa920b310b1e6 SHA1 72e5e9b9b5ce801461766f751ec5dfae91503dc1 SHA256 7d7ae0f47c85118a6471a4aa812d7eb3356cdb849f77754eda5ead413d09883d
-DIST thunderbird-3.1.10-el.xpi 210078 RMD160 04647579694bad1bb0558053e97db7118482d42f SHA1 92d86acdd147d7cf915b8532a6fd66d9302a8193 SHA256 54bd4c18c0c46aa04697fcbc0238165f544d80e40d58b451e4ac11fac8bdd8cb
-DIST thunderbird-3.1.10-en-GB.xpi 203621 RMD160 380b0d8411f3bb8c5092d819214ff34dd409518c SHA1 de58310e30605e2393f2b71f6d591c6790669d28 SHA256 bdb59659852e70c49f92e39c957ee3f0b9c2a3c00e60ea82560def63e420bea3
-DIST thunderbird-3.1.10-es-AR.xpi 218603 RMD160 6eb140d9538104e9e9d99156c823db58b638c054 SHA1 5ffff8167377813fe437d03015f2e42d66cc5308 SHA256 2a372ac13bfd8612c4e08e2282ec48a2432201d812f956d9797bfbdce7b19092
-DIST thunderbird-3.1.10-es-ES.xpi 172969 RMD160 ef269cf41f9b7592910a0fecf356fd0e76522ef7 SHA1 11f7c23fe7318512b1e7b000b37beec167a1860e SHA256 caea4e41dc5b98a151d8859f13ef4c141187a9e1bd4fe486ae2e1e1c685eb1db
-DIST thunderbird-3.1.10-et.xpi 221695 RMD160 88a5a91c45a1e64671dc256fad6d962f0b8c2e8d SHA1 fc1fe908005a17c6155e35c65ca9f4c93d64f021 SHA256 d34e09605516cddcd555c69d58361d11c42d86954a6e6d80218e43e625f9b401
-DIST thunderbird-3.1.10-eu.xpi 211347 RMD160 dd5e88932a964b40a2ad135113499616dbbecfe3 SHA1 3cbbbd9a945f6a1cc9015ba6c63cf489c3df0737 SHA256 9e0a3721af8b76bf0529ae8faf6a8865c59729e36fb1784e34c73b57a234ef7a
-DIST thunderbird-3.1.10-fi.xpi 219468 RMD160 67041bbe6124c4c51735a1c769fc0c851e6e811b SHA1 5c1e3de03a93071c5bcfe4249ea0b2afc1fd69d4 SHA256 02c9088c77ff1ea9bb47d1a55c5517cc2d10b1a8e464b87c88b372d2dc9cf592
-DIST thunderbird-3.1.10-fr.xpi 221694 RMD160 d562a2fc82a61086e9c30846923875906fc4ed7c SHA1 96e71448c149daa1576a917f29a4f4cb823eb3a6 SHA256 7f5bbc2e1c1094f34efe401207d9a7a41afcf585aea7c36b6044bcacdcb51217
-DIST thunderbird-3.1.10-fy-NL.xpi 220803 RMD160 c285594c75c0ba3c4e4fcb041256ff9ffa27dc74 SHA1 af1cf92376ca30bdbebd4656f115cc6486537a05 SHA256 5ecf22e2aced7d435ba4bf4821b600fcb815ea55c2678ea1c0b3e08d07553071
-DIST thunderbird-3.1.10-ga-IE.xpi 219480 RMD160 6dfac503673c23808912dcb7babe8d5af7b5b756 SHA1 20a571d4901ea00b76c6115146b4307123c5f9b9 SHA256 9dedb2e5cd06d0bf82e838580ae6308d677a3654d53b1e0604bc43539c034f85
-DIST thunderbird-3.1.10-he.xpi 204910 RMD160 ff26317abd44f608662c48c548128457c1a98bf0 SHA1 ead73f482bf6d1e9d47cd1d62b5be5ad5edba4ef SHA256 6f69457a8c6dea64b14968e5e3902603b6442548c5565b9f83647374c5a75e76
-DIST thunderbird-3.1.10-hu.xpi 226087 RMD160 5cecbd88863c20db3bc848f9e4cb4a9e48dae7a1 SHA1 c5b717b63c967fe4ae52abb720158e1d97107015 SHA256 46e0a5e724b0c2fcec0c66dc7f152b14c35c9c1aeeb98adf1f84d71fdb8e7376
-DIST thunderbird-3.1.10-id.xpi 185836 RMD160 ea1a75a3efb2efafaee37698fab63e9bd8fc287e SHA1 7344c61b8f3e3c1ac0137d12460f965b537b3705 SHA256 e9622e1429d51a2a551ccb68f0adbced714060593b91dd066f1dee240df92b70
-DIST thunderbird-3.1.10-is.xpi 214062 RMD160 7c142d18b7e04e94b61b761d0c5ad7d62e558758 SHA1 13ce8b7702d4a5e36e7ef785002b710b78276f0c SHA256 8abc2ef9c52178c531f303b3b107a4d3a55e54395b283fe4ff549644059c916d
-DIST thunderbird-3.1.10-it.xpi 171470 RMD160 6faeca0cca04937ec0a0fd0d4c2ab676771709d5 SHA1 a2bb0fb08214475c8af8375ac80e09c536f4f0d8 SHA256 ba9874bbcf1fe5bd72a4a255f42b6eec0772821c373e41a56458cff9fe929a59
-DIST thunderbird-3.1.10-ja.xpi 236560 RMD160 adb040d15a32d97458219b47df966e3a5a842bac SHA1 be4315ff4dc1fe3654a619ec2aa14f798d8c11b4 SHA256 430ec529c9411b70a47cbc7cff1ec3d66b733e990fe2809db34f72766ceab28f
-DIST thunderbird-3.1.10-ko.xpi 194742 RMD160 39a8294e865c75130c17ce6bdd510f759c7fcc2f SHA1 10b1cf4e1ffcbe7e37ecab9170c7c8c58537173a SHA256 f9e89b086a22e8a254bdc2c96a1f7bd7e747e7917db195171a56df799174a61e
-DIST thunderbird-3.1.10-lt.xpi 235350 RMD160 1bc394f2c9c8cd0310b75d1e5e1e365fe52e6c7f SHA1 2de44c90d489d7a37cf248e58d9facfe53215113 SHA256 8d77b28ac9680ed7ed42c1ba96faaa915cf62faddfa485811006b9e492d1e057
-DIST thunderbird-3.1.10-nb-NO.xpi 213927 RMD160 6e3084113f4daba9d140d12c612a7d5292227586 SHA1 b8bfa007b475bdbe5f2ed4c37e4ffa4508bc8fa0 SHA256 4f36a1ed2f56e9c6e42d788af4e79a0170b9c2e0056f16110424f1c8368e47b3
-DIST thunderbird-3.1.10-nl.xpi 216597 RMD160 04da99b7101dd417c0fc23ac845cd466f973095b SHA1 fe5655807226e3a4b23ed12430d84bd12955b249 SHA256 dc37849de48099d837b8ee377ad20dde4c218a0199bbabbb218c66ac84a39c64
-DIST thunderbird-3.1.10-nn-NO.xpi 215687 RMD160 f948618dcc42ab3a07ecb57c1cfa7e9695f80d83 SHA1 26265f746a70e08a0fe0f6e09c013b717ca91270 SHA256 8351ea5cf3fd436d499145af3e95488c4dddbdc5eb7ca9c11e46fb9954de367d
-DIST thunderbird-3.1.10-pa-IN.xpi 241054 RMD160 16a1bbc57bfc9726bb097fe535aa292c38e9eb0a SHA1 26165c8c890973b47a69063bcdb93f69e9cc6105 SHA256 3a6cb05e64c50b640179968c95d88acd4e9e5339df1cf10ef6220a20c243e2b3
-DIST thunderbird-3.1.10-pl.xpi 203864 RMD160 7f5e932a1304b71fbf55f2c3be1fdc29b13b13ef SHA1 eb0ba4c181dbdfb00e004386b51cba02566eb6f7 SHA256 0cc0396be1aa14535988bb77e95bcdb6990601aaf16d3c617cc3483a40fe2820
-DIST thunderbird-3.1.10-pt-BR.xpi 215018 RMD160 9593fb428a86f780a39ce8262336afae7df9321a SHA1 bb6a939c3a49abe4df8dd057e182aa48f761ec6d SHA256 4d7cce717fbf227030c93af100facb7f98623af05fd3fce13cf583bcff7bb187
-DIST thunderbird-3.1.10-pt-PT.xpi 214244 RMD160 0b635cc2f18c312090b0a57ce3a6c5d536ed8c07 SHA1 4e682267ec0b1d6986b56b3f90876d638654a2e8 SHA256 2c6e93091cc1b70ff4a6c3b533ce71344e552dd829986fe3bd690eb9903313f2
-DIST thunderbird-3.1.10-ro.xpi 221219 RMD160 7dedb8daa9a93be1ad40935c58b3895acc5414a1 SHA1 a25888bc041fd36cf517a59d60646a5c956c9198 SHA256 c9770e4e3d192e8eb778cf9661ec1fb753b13809c203d7e338715690cafb7c3f
-DIST thunderbird-3.1.10-ru.xpi 198219 RMD160 5f8614d271dae90f18491ddc68a156f073382571 SHA1 4306b6e5f1c04614fe1a9b1c04b2b086b2d0d953 SHA256 f8f6fffa1c9d4bb03f8abd75b6cf3a82dc88263c6423b590e46b79f209bf2431
-DIST thunderbird-3.1.10-si.xpi 246157 RMD160 f18d8c22ff12b5c665f610096a026f124c2324ac SHA1 55121b68e0d78460f40b001b96d40f16a9d2b821 SHA256 b5a41e989ad703b2dcc646a9b4c8a0b336934fb73120c081c02c7d47b490171e
-DIST thunderbird-3.1.10-sk.xpi 224650 RMD160 bcbea849dfe0d3f051ee3ad16f3e6ea68c014d87 SHA1 1037f9c4562e3d74c0cd0a1e01675f585c69efb0 SHA256 8dff7a1996946f0f77d34ce928e598794fccb691ea93d0a0987d4eb75dd19dd3
-DIST thunderbird-3.1.10-sl.xpi 218530 RMD160 bfc66919b396b6520c0f05c99f58e56195b79cd8 SHA1 8c7c20b8360a44a3f0baaa1e36117d007444e102 SHA256 e98b20743e2539cb415c623fca95e17f938e3d3744c9953a788d29b34fb20dec
-DIST thunderbird-3.1.10-sq.xpi 211225 RMD160 9fe60202696ceb96d8535830da56061ef65f1771 SHA1 306a55e037912034c1eec9eb2392c9310f8af2ca SHA256 f31e237e96bc97a728272778da94e919e9bb8b13ff379f7442f22df811856ae6
-DIST thunderbird-3.1.10-sv-SE.xpi 221172 RMD160 c027f20dce9f17798c6c52febb67886c42160f0f SHA1 ca137b3c4e03c541641fab20077d86e63fd33dc0 SHA256 c648ae39ff76c01b5f38ed080a484ed3471ba86eb78ba2a5c0c9e4f461b90a8f
-DIST thunderbird-3.1.10-tr.xpi 215798 RMD160 598e90256c0606eac289717c766097694bfb07b2 SHA1 bd0630011935607d207f99c5378436f9d5495999 SHA256 30e59f9f93f4aaeec7c325e3738c033a0b166b93cae05295a42bbc5152031d18
-DIST thunderbird-3.1.10-uk.xpi 244817 RMD160 ef681eb41258f9dd5cc56f859a5386f6e5d3716c SHA1 9401c8a33a256901e425dc8a626f908c8a8e207c SHA256 61de746a788db029d09ba2377212fc4023117d5ad0b3282c0efc174afbaaaa7a
-DIST thunderbird-3.1.10-zh-CN.xpi 219651 RMD160 aa029ae3f40a1d3ba715a734f31e94db5e505154 SHA1 cac129db77c856452c84818b77797e0cb917bab7 SHA256 cba81e7a1dceefe27c4effabb83e41f45871f62abf9d0f0f1cc590fee88eb1e4
-DIST thunderbird-3.1.10-zh-TW.xpi 220629 RMD160 ff309998b59cd7eb9577109df89625538ccc966b SHA1 3ee5ac72ccd6eea4deeb40d71cdacf1ae71b902f SHA256 9ddf34a06f6555175ca8ad999b8ceadf9040e424bb203f7cfb2ca8e0d8c2a180
-DIST thunderbird-3.1.10.tar.bz2 11539452 RMD160 c06c80a20d0e9c2f7d6f28842d824617ba7ff7b3 SHA1 52856cb7f844fa9241d584f2aecfcab430fc0ab3 SHA256 0dff466c9ce12adfd51d9cd9a1688e42d3c25e23fd379b677672589db1e8e98b
 DIST thunderbird-3.1.12-af.xpi 210617 RMD160 0d8a79d8066b6706090f6c0a55a0c89423542eab SHA1 abadfd892e896e87a8a394bdc5a1ee6c4aa7f65f SHA256 00d47a4b1443689a328d4903ccea06a058d2d847789442d4a044212bb6813b56
 DIST thunderbird-3.1.12-ar.xpi 230333 RMD160 a9ddde633984f2c431c960870e5d33eac78089ad SHA1 beeff8853f470b9c24f308ce0ad93a95686c7378 SHA256 706f67296c7058d694c712964239b44dcfc4a93ab1148b70fee22ed1056c6832
 DIST thunderbird-3.1.12-be.xpi 194476 RMD160 986f590f22d7e3abb3d9faba7ef03d516018d04c SHA1 272a9b74790b21133b3d87bfa6e87ffb76e2ec38 SHA256 20fb419f9da957b5130a01fe590b134bb5c4f0da7b43a5c1d6a8c6912fb4bd7a
@@ -141,50 +95,6 @@ DIST thunderbird-3.1.16-vi.xpi 220994 RMD160 5a7ec9a67b9b853a56599f6ede6ed3f0b90
 DIST thunderbird-3.1.16-zh-CN.xpi 219707 RMD160 34660bbf425d3c6e75dd725f012920bdfca5e125 SHA1 4dae256573e5963ee4243339f15c7fc8821ec830 SHA256 fb64339eada88a687c1b1c544a41f198033c052c19bdeba78f876edecec55068
 DIST thunderbird-3.1.16-zh-TW.xpi 220591 RMD160 f1b4e48d07852a912769209f76c66476a671000a SHA1 397e2ed783eccbc1c91112e55380f3fe132f78e8 SHA256 792e89acffb92aea711db71cc3ee8561b4bd60dbb580636dcb55ae565f3a9ae0
 DIST thunderbird-3.1.16.tar.bz2 11583777 RMD160 49ae04c8c780a7f10695b2d2224135a4efcc065b SHA1 7c45f468b8ad5d1ea019110ba8aabeea1288aa31 SHA256 7ec7991fc40aafe611f1d4a4225786985536b9c3cc14bf62fb18a77c2224c7a6
-DIST thunderbird-6.0-ar.xpi 427494 RMD160 4532e9315bc6fe5793b80314b235f016035a4c2b SHA1 c8104bdcc654388ea744cf1d17a5e3df374d6936 SHA256 3a451c2f0d127a9d27b8a350b08e4e081ad355465f11340d20cc0e451e8b8a89
-DIST thunderbird-6.0-be.xpi 386317 RMD160 99ff0d78932a82f8e9c9bd1ebbcb0a09a193d4e3 SHA1 a3b18de8291ed8506e0eb3c59ccadd7e998591c1 SHA256 21f88f8e3c358c443bb2ce0680958864f0c66eba99baa8c28fdb8968820bc8fb
-DIST thunderbird-6.0-bn-BD.xpi 464527 RMD160 edf2e295b02e228a6f47fd0def697670914b1d6c SHA1 d6facc7fe373ab7cd370ba04411035149d7c06dc SHA256 d6d16cd89673c1ef3abab059a849b2a6678434cfd0f683b71ec8632fd29565ea
-DIST thunderbird-6.0-br.xpi 357402 RMD160 a15771cc7093e1bc9eabe219e7403c52a987f75d SHA1 80dab22293feb5767bfd12866c938eda982ea113 SHA256 d38de60d65bea16a779642a2232425d4d17bb4020c8ff2b42c210ce4a4127bd6
-DIST thunderbird-6.0-ca.xpi 408682 RMD160 a752d1fbf7129ab61babbca8a251c14e8b6b52d1 SHA1 0845c857e5d78a278eb19ef923bfe303f669c1f8 SHA256 9fc006759723c597b6263ba57b84cf295008ebb84bf77c11c16bb585bd2f1b2e
-DIST thunderbird-6.0-cs.xpi 409069 RMD160 e0257d9638ccaeed152242d24b7e777a0a4ce8c2 SHA1 a96ab64f254d0ee83688312be451236c35dc79a6 SHA256 8251b8f6968ff6c4a085fbc49ad771ec560f6c380477da70d7a05e9076149d1f
-DIST thunderbird-6.0-da.xpi 351543 RMD160 f114e5206e585422b8f901fc67faafad245ad08b SHA1 d0b052f76a7de05bca3c038a3ee884d39f7a487b SHA256 c5146a29b714fb9ce0f6b1ee026c17875219b2e65aec3142764f0ee0c36e2bc6
-DIST thunderbird-6.0-de.xpi 407453 RMD160 e8bc6bb0e952db8668b2eff81b6e5e32fdcf8637 SHA1 6467cb81334a88a8e8c71b6d52dc1fe64c446843 SHA256 4e37fdc9e08acdd8c89e896db7d1bcfb0adcd50d95e96723beda486c26c6f6ca
-DIST thunderbird-6.0-el.xpi 393401 RMD160 8071642c45a5ff77e48707cbd84a9db74f99d272 SHA1 3d9a036696e989184c684ec46258adf2271db10a SHA256 d7033c14788c08775e32467d1cf82d727cb99bd92aeedd43a1b3ae7c8c3b9f4a
-DIST thunderbird-6.0-en-GB.xpi 382371 RMD160 9ad2eded77c080e18fee100f1ef4b98be367dd1b SHA1 c1bf054b086dfcb6d241bb617579db64eb4edd91 SHA256 0caf4a881992c2d96a37398bc0be126133a2f0a297b9955293bc362885c23889
-DIST thunderbird-6.0-es-AR.xpi 400278 RMD160 70e8372159f140bec712792bc097d0956085ed14 SHA1 936d8671058548fca4bcee3db40dcd6c84a8d8fa SHA256 9042e7533f8d3e86f586907581c2d22710848fe46c26cccfa667a4f2963d35e6
-DIST thunderbird-6.0-es-ES.xpi 344500 RMD160 c6d5c990010f559d8ca2f15ea1520d834a70b3bf SHA1 90671a883dc3b058133a94dae9f46c8c0fcb61df SHA256 97fa112a00644fd8b0ae94fc4638501855876e8270aa14ee739191935d3fa801
-DIST thunderbird-6.0-et.xpi 400758 RMD160 d13b265330f9c2df8ce05ea31920674b48398df7 SHA1 8fbe3aad1c9625dee166d4f8864ca18bb27e236b SHA256 cb2aa30dbd8e3df24ab43bedc7689d12cf529fd44448b93e2080bb13d7b68edd
-DIST thunderbird-6.0-eu.xpi 396653 RMD160 f313f0ba8ca1d57e71f1133edc5c4832fa1c0e4a SHA1 a8aa903da2d09debf7666ea09285883e1b6924ef SHA256 648eb6a6e6260be9de9ab0a4cbd23d40f3c7ff965039c5d332acf1b0a7924ac8
-DIST thunderbird-6.0-fi.xpi 401789 RMD160 6c6dac856190d5441b079853cc0c40d689f135f4 SHA1 8f5e40e671a9cefde16a56db10a63ad92662c7c1 SHA256 86a4fde30c122031b7806107069d9fef605a2f590fc66efb7b456de11af7e42e
-DIST thunderbird-6.0-fr.xpi 404210 RMD160 dd91f9af4c1dd8abdf07d3a4c209c0caa363f85c SHA1 9455f7636970cf730d17e0859dd21c2cbc81797d SHA256 d357085563e0edd71241a09ad3d7c63c0737ae3e70cf07692884ae176a648378
-DIST thunderbird-6.0-fy-NL.xpi 404129 RMD160 d6d8e19e194cff2e768b0ca38742d364577e5d22 SHA1 ebadc1b566eab17fe22337abc2e5fc7e5494de26 SHA256 d9cab2a49a76da9d421b6969c6f3abf565bd37340c0a69a396a8f6e515db1837
-DIST thunderbird-6.0-ga-IE.xpi 412669 RMD160 cfd5bee0afe85faf5bf372fd05ab2e02443dad70 SHA1 bb81d7c5dd14ab8a5457c23bdb9b16ca0f27e173 SHA256 9e2d5dd92cf1dec950f791e2dfb396da860ca5e666d31b972e6e02613f2c279b
-DIST thunderbird-6.0-gd.xpi 415265 RMD160 dd2f15334075700d1d37736ce24ce8a34e5e9452 SHA1 84a1ff9eadb1171370fc24381716cae846fd27fe SHA256 d86e05f537b4746ab655e4161ad1a18d5558645b9b95dc891db713cd21aa8dc2
-DIST thunderbird-6.0-gl.xpi 399351 RMD160 da0cbc5b102e2414d719bebaf9ea4a7136c33021 SHA1 87568de0ef2971243c61e5906cc4091d6b7591b7 SHA256 c3faac2259d7396f34b71f05627dd6e8d62abd617200aae892a26b1d9c4d7742
-DIST thunderbird-6.0-he.xpi 415986 RMD160 4dfe258f23e9afbebd8083730a3e0394167375e2 SHA1 1f6d423ef3fad4a2a6ca96b56f5ccf1662bfcc96 SHA256 f330351e4f2810da09d08a8332529337484b04512c87e69b70ea815636e423ed
-DIST thunderbird-6.0-hu.xpi 416271 RMD160 85329b820e94f42a0ebb65f606cf20736413e787 SHA1 97b1dfbf3d14a3841df20649f89a9a3d5d767e54 SHA256 6e5aec41df3d9fcbb7671d5ed0264be96d8a3f3c5d3a18f2cc4db0059fc1d742
-DIST thunderbird-6.0-id.xpi 390926 RMD160 aa7b4886829c655d114ebf60095324c7eeb5a47c SHA1 8d7cdf7cfa5866eefe79b8eeb3110276df1414a4 SHA256 747d9b4b13d180453890cc15e54e4b5816fbd0264d26428569dc7e8fdce30897
-DIST thunderbird-6.0-is.xpi 402535 RMD160 2da7bed1da4d92ec2c24154c9a708b16eca30bf3 SHA1 bbe5ea4b784964049838c3b0d29551559e501263 SHA256 05afdf13888edef7fa6e95ac5b088e6828b1ca7d196cced5f13f79090dbd49f5
-DIST thunderbird-6.0-it.xpi 336843 RMD160 3ded50e7419ee492f4a7dcdb7ebddc7e17b8514c SHA1 ef1a21292fb570fab3df0dc308ff991508fe7e51 SHA256 e301f259468f0d2f42813fade0942be0d8968db71aaecf89de59be8ec06d6431
-DIST thunderbird-6.0-ja.xpi 448030 RMD160 7c8a225e77aa0b21ec64638499652cea316941d6 SHA1 34df3a16b883e5e1d465bfe4a8ea22e2cc93d638 SHA256 1c44d010f91bc71584f4b1551cc6f042f2f54eb23627b733747f346594017330
-DIST thunderbird-6.0-ko.xpi 359873 RMD160 4be7414100791cf9f76de1c8f6c55c21818acf8c SHA1 1333c2e36c027d84e2acc4b807717a372bb55403 SHA256 1cfecb7fa95016d4063df2fb79c4ba6e25b500074a4535b9fd258804101bf8d7
-DIST thunderbird-6.0-lt.xpi 525096 RMD160 9bd23db121f42f69319dca5c90ad00114cfef3dc SHA1 c0dd370e5e250631f8ce64acec14f1a7d4c32eab SHA256 be7c7e1b88a30b7108c1d3852f22442060d5a358279fe3fa74051f94cb5850e6
-DIST thunderbird-6.0-nb-NO.xpi 397892 RMD160 451d86b0a5b4d6dbb4806261dca43e40411a1f2e SHA1 bdd67167d2a0e250d26e019f47ee34e606b5a246 SHA256 9d0330d71dcab318d34caa04757ee53baadaf33ab84a2485028e2d7df276d31e
-DIST thunderbird-6.0-nl.xpi 398169 RMD160 96af11810446ad668863834ad1afb186737bb00e SHA1 a2ba0ef0c6cdf29059283cd7faa59af78ca2fb1d SHA256 f8de141b8eac6c098265c5835cb3477ebb82ce8c98f45bd0df2a13f16d9294c5
-DIST thunderbird-6.0-nn-NO.xpi 399482 RMD160 476753b8f96a6405fd4190407c49e7dfadced064 SHA1 16b7266d60eb25c51aab2ab34dc1ae45fa5c61ed SHA256 45644c01a20167fea279a9a44f94a37d6e69208ff4adf9fda7ed3007a1aae314
-DIST thunderbird-6.0-pl.xpi 384740 RMD160 3ba3f5e32b6c02746ff3c0215647616ffc7ec75e SHA1 e555588ddaba5c3c36b814b029088c95ab0dac66 SHA256 abffe09ca4f72c19d17e6dcbd1d9c2b64bf77170e1c54153a45b2dadb7159250
-DIST thunderbird-6.0-pt-BR.xpi 406991 RMD160 6ac65ea049545b492911fb05067fc81086298c18 SHA1 dbf86f56f3a39f333ef56b2ae5d7e77da503fb90 SHA256 3fa4331317435d3cb4376f79dcef4c0af4c820221ac03a456111ce92db17b9c8
-DIST thunderbird-6.0-pt-PT.xpi 403984 RMD160 e7498d36330ee4f9b426c169269ffaf703070de1 SHA1 b12c245b4100358c6f5cfcc5796e450038a222a9 SHA256 60d724aed7550840d7dfcc7de405117b704f7fdfbec8a34f2ff7999b8569a039
-DIST thunderbird-6.0-rm.xpi 404561 RMD160 546d3470094c9b08b2b89f08523980366ca8e65f SHA1 94d65a592ed908843a4e112fd3a87de73d151292 SHA256 754aba44bfe48932f30a192d3f7296b8dc8901adda66df5813e0c73dea4f8b54
-DIST thunderbird-6.0-ru.xpi 398962 RMD160 2b1b01d1b60347b0cc66543c54ec806d1aff49de SHA1 73be3f0b48111aa6f188fbfffe4351a5cf970fc8 SHA256 b0fc8d5d7ff89f1ccc9d662da7e9a3120900e50003a2281f056abfce3708903e
-DIST thunderbird-6.0-si.xpi 446393 RMD160 de92990ba0117bbc5dbec09595047b1ecc4b2c94 SHA1 489d90f5495757cb22223c94b64333287bc696c3 SHA256 f9618dcd779b0a6d3f33d77777e400acf547237ae14269150764df259fb9045a
-DIST thunderbird-6.0-sk.xpi 414265 RMD160 1d3a5c567ae1c047697af0940d1e37306260a580 SHA1 48d05fff22c1864adae2e5f7d5e613511ef6bb1a SHA256 1f18758211c456335ee335b135c4ad06a20ed734d2abe6541caac589395337ad
-DIST thunderbird-6.0-sl.xpi 400275 RMD160 3eb120d378d87c4f597fd01265a653986434627b SHA1 3ace222f610930541a864e575960a983fa820ee6 SHA256 4fc68f3a7f5b15c4e3314c81ad2945be0881d32da94aa9b118c4911031353ed1
-DIST thunderbird-6.0-sq.xpi 348955 RMD160 e329886e3e9778125da4dd6f7d3b0c32f7d189c1 SHA1 6294e733d7eed976d7e1439a29f249d2eb10244e SHA256 e7ef33b2802aa983e3985f6162490f7be6a0ca32d82d2540ea71cbc80102d0b0
-DIST thunderbird-6.0-sv-SE.xpi 468587 RMD160 63139d49daa44d05036f7bcb657beab5c3d6051e SHA1 7c94cda659c110027af6e8e37653d7c54f15c01e SHA256 6d5b5c1a48c6a2d5918f534800777ddf5e61b5b81374ccc3bb2cc09fc75a2c52
-DIST thunderbird-6.0-ta-LK.xpi 463618 RMD160 8d44ca9b451d034cde2bc52bc0a66bb6f9a851f2 SHA1 9bee4431eb5f2461d1fcacd61fb9c83b0f3a930f SHA256 6614445d8c29a4287469dc781d62630f580e240b0156931d8f32f886effa1963
-DIST thunderbird-6.0-tr.xpi 403273 RMD160 0a1bbbae82a0378016d0dd6185d604b5b608da15 SHA1 5d44b1a3e50015e5a92f672aac6882025b61af99 SHA256 595b22151201dc4b9d08a0321530c1f1f2494d5b6edb5527cd56648b245f1493
-DIST thunderbird-6.0-uk.xpi 452775 RMD160 f1915e4ae3fa8f667540dde3d31c3e36749c0b57 SHA1 54e21c3baff6bf833d18df047cc849d2b9258c65 SHA256 a7030f7f6aa9d52b4a39c344ef1d5aeae9114dca9590e2eabf24b3c2849601ec
 DIST thunderbird-8.0-ar.xpi 429682 RMD160 ac02f62b746232efcbbf622e7d2a84269194441f SHA1 da148179119926bfb2305e2157ccbe6edee86e79 SHA256 ac50815d26c950b51a930239facf46c1225f8c052dc7610106fa74573b187b96
 DIST thunderbird-8.0-be.xpi 388182 RMD160 b76fa607aef8a84430fd174f53bdca2d542e7f92 SHA1 7e606ae1e580242a62e6a136155b8a478ec09dce SHA256 c744b02fe1cb2acc1254d9c7b34af80710dc5de523d077187b87fd53e061aa9f
 DIST thunderbird-8.0-bg.xpi 447619 RMD160 e13ac28e4b34e08308364418b5aab97518bbde84 SHA1 25d48b7d9fbaea3ab2b60e3361185fa3d72e34fa SHA256 aec72e7de903f79775456926e255c39346f8b52d0e12db90246f9401055e6405
@@ -235,7 +145,57 @@ DIST thunderbird-8.0-uk.xpi 456674 RMD160 95c1009e180d50940e8ecedc1d373c834c278b
 DIST thunderbird-8.0-vi.xpi 425968 RMD160 5412aefbf05179354fb4fa2f3865a58b53552041 SHA1 561e797859bb118e54e50e24dbe826558900d96c SHA256 fa82a8f09cc3adaa8e816c953bfef03a385e84662f886061d0a6712dfad576c0
 DIST thunderbird-8.0-zh-CN.xpi 422519 RMD160 ef881e92de682aa3d807a53a7f536f51e6740b94 SHA1 564f90305e0458f57cd27a876f90e8c12b5ade8f SHA256 bb46c2b4d395488104528ac225f2c129e9c4ddb500e6f44082df549560013132
 DIST thunderbird-8.0-zh-TW.xpi 423019 RMD160 3326d286df45aee39ea4dc9303c6e4459b41dba2 SHA1 a81c24ab001eb521a1b4e49da16c8f6914676641 SHA256 a6c78df16a242b1731709fdacae8fcfde630fe10469abfd6a696b46076e9059a
-DIST thunderbird-bin_i686-6.0.tar.bz2 16411468 RMD160 0727fb1603e1cfa965a20d0140ed0e4795290b4d SHA1 88b90b9b89d80d1b287d69fd3d7a9693d356f72b SHA256 cef34bcf2c9990f70c0631858719848b80ce4ab05dfecf33572e06fb9d8ee10e
+DIST thunderbird-9.0.1-ar.xpi 434061 RMD160 5dc069d5933d4b1ab4535f4aef581009e897f665 SHA1 1edc1a1cf459a4c86b53aed3399cffea2ff7d0b1 SHA256 73289a0c1c5b656f96d0741b206cad560a2f21996d169e097b9938c7a6553865
+DIST thunderbird-9.0.1-be.xpi 393304 RMD160 1d793aedff215d3bf66f870ba86616836e59ebd0 SHA1 1da12d960d9a097815ad227a3dbcb1ae81f09a63 SHA256 177817a0b77ab37cb3553b0af76c3846ce149038e4ce951052f5c3021637f820
+DIST thunderbird-9.0.1-bg.xpi 452513 RMD160 97219394f96491660fad143e43ca383f91ff3a6b SHA1 0e1cc99a4118b84777fe74eb17815e353b38213e SHA256 b5da9fedc155466cb15ea8dd82dc2abd063bc0a94ebb70d576d6e89b0a1a5562
+DIST thunderbird-9.0.1-bn-BD.xpi 471927 RMD160 bfb924e040ebb0abfc9a0c2c91b9521116dcb7a5 SHA1 6ee613345e98f0854a81ebdea0f8f30cf8869fec SHA256 0b808982be95bf10375804d03addc321d6e8787f4415c460f7e2db4d07166d9e
+DIST thunderbird-9.0.1-br.xpi 411788 RMD160 d565dbfb49189a04abfc06b9933e5e67d36333a1 SHA1 fc4525a6265c1089eb5fb18c11eb176ab187deda SHA256 c60dc8f2d97b8dc7410b26384a063cf5b2547d12ecda7adf71b8fa13b84019e3
+DIST thunderbird-9.0.1-ca.xpi 411848 RMD160 2404e8fbf6ecd7039ced7a8623e540d054a77d91 SHA1 c45f599fb8211185cfe36655214d5268a148fe27 SHA256 2c0ed277faa1ebd501e77cd4a5850551184a7f23e7d8a42f35a6030236b98e2c
+DIST thunderbird-9.0.1-cs.xpi 415081 RMD160 cf3422f7e518ef04b523270b154cb2de3e63525a SHA1 5ad12e7b76a40f069f4c78106238952f9450f66b SHA256 aee7b417e1d4b5b74f28b7a24329a8f1ca0c0d8f114c1555704f3075fdb1c969
+DIST thunderbird-9.0.1-da.xpi 359198 RMD160 be14f25f19849891531db9e3c8de7aa188719a83 SHA1 349d1091695d89162ff7a44a89b3f489fdedd71e SHA256 afb4c4eede19f3023d5c17c08950f568f290d38264902dda25dd07044f53a99e
+DIST thunderbird-9.0.1-de.xpi 413690 RMD160 2585d23a4195fd05f69a8093c48be6e55ba68401 SHA1 38fc1feecd8995cd0338a7872c1dd4d8387bb974 SHA256 dcbb8b2a3eae90ae715dc89d7146c0e0a0eb5a508b653562fb5d98428488034a
+DIST thunderbird-9.0.1-el.xpi 399466 RMD160 5b852932d93dd7546510322ac1621f8681c531d3 SHA1 6cab0f7b4a33a7d9c70103236fc3da69d475d6ec SHA256 68c1c8545e798f87bbed2f302c685d21b84978fcc133dba3bc2788507fdee19c
+DIST thunderbird-9.0.1-en-GB.xpi 388498 RMD160 4883464573ff7e5f13228cd0b2a3464d6dfd11ad SHA1 0862b475500e911f5555003b109277ebcf736797 SHA256 0d88ee98e81efe64d7b91ffc424bc36e33fbde697b5edca055a01bb9f18bad4a
+DIST thunderbird-9.0.1-es-AR.xpi 406257 RMD160 f4c8b1213781cfef3329237227a3276be4c1e43d SHA1 935f0fe7d721a83fc8521239bed4b0d7c7bde56b SHA256 6f2e8bb77388ba38186ae5d7871abc6660a68046635690c841293ca53c28f88b
+DIST thunderbird-9.0.1-es-ES.xpi 350318 RMD160 f5797984cc3f6827db12e562d5974080cbf3146f SHA1 ff2ccbf1326f7b62918260dca9fe44c2ea154615 SHA256 a898d2e135ba2d1897485a37c8023f583b57c757a538a99b7517212ff4a0c721
+DIST thunderbird-9.0.1-et.xpi 406524 RMD160 90d0239d273cef317daffb800aa9a89316087b8a SHA1 d2792c556fb1111fba175eb57bedb1afcb75d7fe SHA256 8bfc73754d7f248b3f3bbdec31bfd839aed122ec1a838bf5d9e9756185aeb5f6
+DIST thunderbird-9.0.1-eu.xpi 402326 RMD160 691a6da6c3817d90c6aa95da5432477261d1e926 SHA1 f57f01b2ccde869b5a90e9408f1854639a968b4e SHA256 6574d46fb02a25abc102d6f3077d3e89d8c843e0f64def2117345b95775e4985
+DIST thunderbird-9.0.1-fi.xpi 407657 RMD160 22d6f02cc5d9cde8a965e909af9409353847e619 SHA1 07af23abce0bfa598a804604e4ef3508455a919e SHA256 50618f575258ce0e2231e75d401b6d5e7b587c3cfa1ce5ffdcb2fcc279f424cd
+DIST thunderbird-9.0.1-fr.xpi 410408 RMD160 9f1203b44ec899fe5c2ab0587cd2d7391db0e998 SHA1 64ff409610f28051c84c0907672bbcd566d1646a SHA256 b1d1969cb86d4ee125993142b080c22386cb6153724454e4825e48d9e561357a
+DIST thunderbird-9.0.1-fy-NL.xpi 410230 RMD160 021720b49724fdae644b2def023d71575e7282e9 SHA1 da8b8c6ac00373c4b4fd9831b86902e84889215a SHA256 0333f4d3e25bee1705f39404449594cff0befeff3b0aa1f8939c858b6fca2fd8
+DIST thunderbird-9.0.1-ga-IE.xpi 418966 RMD160 55cc58730d2eb96ba5809fef32e2938dcf7618b3 SHA1 c891d49fa0c568506974f226d87c8a3097115442 SHA256 fa3890ed8a28ba40306c7d1e091487f7bb3ac4db5850915ae8e904a2d7426677
+DIST thunderbird-9.0.1-gd.xpi 421642 RMD160 5f918d1722469ae69a5541f17dd43650243399a2 SHA1 ff649fae17e9ca8de3ac2bdfef5a771ae9c21353 SHA256 885dfcc3387bff3e01466c0b275ca9b71f68c64fe06a6636b8f2015b953a4b84
+DIST thunderbird-9.0.1-gl.xpi 405085 RMD160 6035d84d43a6cbb1587456f32f2dcaf31ea5a8ab SHA1 3ffd5d0fa0c30ff586922145862f0de617c176e5 SHA256 0d8b1684f9a681d01aaa13566aafe53244db9cad7af44490f85021061d424db3
+DIST thunderbird-9.0.1-he.xpi 433196 RMD160 2e64bd2c803d7c1a7a4cfdc77026b90c4e0ed6d5 SHA1 88bbd0eaf463123ed603769ede868cd6323b53d8 SHA256 54557a1149b92642e8c7c5133035d1df3cf53a823465192f1ad814ea60f8fd4f
+DIST thunderbird-9.0.1-hu.xpi 422494 RMD160 81a6aeeb23dae057ae4de367673b86d27e41b831 SHA1 adce270bd1c215c63d6856fb6cc6cc7774213553 SHA256 1c5a0d98f30d2f6b5751d50c4847485f5f53932454350f273f51ab717295d625
+DIST thunderbird-9.0.1-id.xpi 396570 RMD160 2c20933813334e00ec92df2d1f413662e1b2ed31 SHA1 5af531d221028831a8cb937edafbf40c9c90adcc SHA256 132a65d1b886bbb4b9506ce94e917a5cd7fab324f06f98767b8efad8577321a0
+DIST thunderbird-9.0.1-is.xpi 408517 RMD160 17325882ab7d66ebc0a66c7c9f0eb9f6a2e4ab86 SHA1 384a089aa6b1501a35763b0a21fa2358540ac954 SHA256 d0cc7c1df9b950afe127bec835e1957ff9e5e16239eb7ff6ce8ec32075bdde5b
+DIST thunderbird-9.0.1-it.xpi 342809 RMD160 62b258556af5d5c6a5ef693324ea6627915bb482 SHA1 a49510b01f279551bd49426a96cb5cfa58073a27 SHA256 d4750c275248b7e63c17557d508277c535164c9202d8b802ceb75b01fa8c8f4a
+DIST thunderbird-9.0.1-ja.xpi 454772 RMD160 50f080f2feac4cacce147c1153c167e9e9c82a21 SHA1 ae0fe8ddd70dbc940c19f13c3bf205618cb04464 SHA256 6f7773a55b8c1ec6f4ba68bd277f45f429c0e140bb032b634ef5322d3cfcd2df
+DIST thunderbird-9.0.1-ko.xpi 367945 RMD160 4e842a5e208f827a9bd616edf1414bbdde880dd6 SHA1 f6eea9f091129708054ee371f31c84db306a591b SHA256 f0819bccad298faab171b2f43ae90a5cd18e407e0d0f4ffbeb19b932fef82fed
+DIST thunderbird-9.0.1-lt.xpi 532805 RMD160 a314799915636209100a780208bb252a3b9d8346 SHA1 109abf0e2e0d27465df61c7c03a01ab5ececd0cf SHA256 afa7f9ad95f8af00f53c7371c8ef16ad6c71f6ff7d1fa0b09bb4f3bdf972a005
+DIST thunderbird-9.0.1-nb-NO.xpi 403656 RMD160 9a99f9f30a00d50bc096a41141e118a1f78a1802 SHA1 c48c86ed56326cee76901596142a08b48c378a57 SHA256 ec6e5b0fc9a14b7a964d46adf56e34cefc2b4ffb8c9d9729c5183302adec2621
+DIST thunderbird-9.0.1-nl.xpi 403895 RMD160 284c01aefad98aab2447bc59c2b0dc40c725b4dc SHA1 8f30c3b27c8d3bddc66ba0b9fb6b3af6ca750dab SHA256 df0e5ae96a5e27d9a5dd75b8cb3d0cc5bc5c7c4122185d3174e71c3413e9f3f5
+DIST thunderbird-9.0.1-nn-NO.xpi 405233 RMD160 6f8d98aab6423c56d1f3df8e0c1a97f66c03da7c SHA1 cd4e1be19343876f93a79ec3595f60d59370d4c0 SHA256 df094ae078d175569fe5aefeb0eacb2adbeac0682abf9b3a1656f029cdb4ac8a
+DIST thunderbird-9.0.1-pa-IN.xpi 443655 RMD160 b1b412f45ca4cfcd29b3d832725187cd10a5f4d8 SHA1 1cf46a5066b92f0a50d794d3f4664dfddc572e1c SHA256 d102c5b9446092cdd2dbd41dcfd55a06d8629b8b5a19e77257508e0fe7831599
+DIST thunderbird-9.0.1-pl.xpi 390107 RMD160 387adcb2e3ef940c9c5ea936afbcd8754eccec8b SHA1 956b7b7b3b8642e874adabbba3e5c28f44f047bb SHA256 df1447f13c6a8256cb815f6eca526242215552a2e7d9a0b36f490c3c55c02832
+DIST thunderbird-9.0.1-pt-BR.xpi 412877 RMD160 98bcc4e9365fd3e457dcb69b6ba8eaf70fff20bf SHA1 802c1a85cf473872cee1f1e7ca8eadb304e5658d SHA256 a10f71ed817474ae7ad1a4c73fb47b4caca887f2c695cac8e457cbb9bd717223
+DIST thunderbird-9.0.1-pt-PT.xpi 409932 RMD160 2312dcc2bab3f17c49897162a176abf6afb27965 SHA1 465dd3765c2f2d5d51cc42c3cc0cb397b3d8effa SHA256 d2fb24b3fb421ad520a0ad32a82fa55bb6e17983edeb24a9b41d188b6fe74386
+DIST thunderbird-9.0.1-rm.xpi 410500 RMD160 f74e143d1afb1429dd5340350c45bedbefa6338b SHA1 cf19be444d2ca160fa4640ab4bb5a866d4a5e5f1 SHA256 d7e385ac651248b4756db7a5b9947fecb0dd9cb3fde084cc05f75148c4ce344d
+DIST thunderbird-9.0.1-ro.xpi 436141 RMD160 e6987510de0d1b04f8fc35fec7eb804d7d928344 SHA1 d83fcb1c6f7f3df325e0760376dd2d41cd650c54 SHA256 8eccaad51985cd89d1f236713d7adce1e475f2a695418d22143074285f060566
+DIST thunderbird-9.0.1-ru.xpi 406090 RMD160 4f4b887c88e38c4c4d2b8b9a77c1f90946f106bf SHA1 bbe78dd359d6110897a27fb15dfba2567f41b76f SHA256 ab3852a6e8591aabad17ff518092bf3ffa784d20b425fa50d76cf412016850a3
+DIST thunderbird-9.0.1-si.xpi 451807 RMD160 ef08cbdc9941c2618085db25407e9745254e13cd SHA1 ad5ad4c9ee054ad93bacc035145118369579a32b SHA256 230230a76de63b94eb2e920224a9ac46fff2345e2f7503467c837d3fe751c22d
+DIST thunderbird-9.0.1-sk.xpi 420589 RMD160 6c893042d0d4a0da08ac0bd0a5218c6f6675ee31 SHA1 7adc8c81b2cbfa3ea5b3c38ff7d6bfecacf98922 SHA256 78e1c8ca9580f70d02a0535a15b850450f6eb97e4bfd48bab85187c32fc93f4b
+DIST thunderbird-9.0.1-sl.xpi 406470 RMD160 43c205327d3da77464d68af8451fddb5c6a8cbd0 SHA1 f85903bb52390b92d0f9bec68fb6060d2e650071 SHA256 6a17a68f90b1460624f4e896cd24baaf9c501591ad73d62a6083dcfa75dcf981
+DIST thunderbird-9.0.1-sq.xpi 355950 RMD160 f08f493eaf834cfb42c8a499a4e6291da4e4b74d SHA1 c068ab65e3445d2927d76fdc29e5eb0481441f50 SHA256 6a9ae5f0207b82b9985b2bbf11c833f0d6efc1364bf7bde7cf8f59c6de010e76
+DIST thunderbird-9.0.1-sv-SE.xpi 474265 RMD160 e4d5c8db02a556889f9cd3109adb66853d981bb6 SHA1 e4a94cc2f9016de1754e1b3d8e01ae3ea39a1071 SHA256 c15c413e211aff5a25d1175db5a3b1c637be3456ec7cec76760dd622359b9c78
+DIST thunderbird-9.0.1-ta-LK.xpi 469046 RMD160 052137e0f48bdfd9b35f77b1af782d2fe6f0f135 SHA1 fa86aee242c09fe56efd8dc8a4f7e27a091b7db7 SHA256 e273c9678005548b5de6a3cb65352fc4a43ab821d0b88ccf456403eee02bfa7b
+DIST thunderbird-9.0.1-tr.xpi 411361 RMD160 9eb05b5ae496278a26eeaf0d6de9edc0e3c7f1d7 SHA1 25c09bb4834e29a7d83f5a9ed308da8aa841efd6 SHA256 bac9fda4855cc92cd43a60311dd852ae17fbfb2a0a5e494e08aa9ef99318c5fc
+DIST thunderbird-9.0.1-uk.xpi 460380 RMD160 8729d8230335cdbc7b48a3dadb7ef6a63e0e6d59 SHA1 26463130ffe3f065437e01d1846d3d58b24db57d SHA256 69334534dba2ef2ed1d10e6ebd67e9a8ea005a9d5a8544fcb073dea305f2a864
+DIST thunderbird-9.0.1-vi.xpi 429543 RMD160 a0ba712d1890caad25eb8c034a880ca5d3ece9ba SHA1 ef8cd3296c80ee076d5bd6597100fafda3c7fc20 SHA256 4f28df503872cddb6892fb499df43b4d780172571e46ffba6398a31109146f68
+DIST thunderbird-9.0.1-zh-CN.xpi 426798 RMD160 d6cc996f801e93e8c1ebcd15477686e8444db5bb SHA1 2abea7d01589ada1d19d3975f4480bf935c8a40b SHA256 d283532ffdfbeb62a04a918b36f2031111d766863995dce20a0767a8d7691762
+DIST thunderbird-9.0.1-zh-TW.xpi 427201 RMD160 d3a47ee5b8283839b57bea335ae96a7f478d9122 SHA1 fa5fa533f16cf69be45493e885a7b8cd7521c370 SHA256 34dba557c5821410526bb910770bb8f9b22508a16bdcd4f729fd94dde6815924
 DIST thunderbird-bin_i686-8.0.tar.bz2 18055050 RMD160 c6a66698cdd2aebb128520d6be190e287ff724f5 SHA1 357250be44bd77d7cdd86e86cdd5986aba5758c6 SHA256 b8a54c480d5c09df1da7411b9f54b9f2c9b02eb563e5842d6856431f5a261752
-DIST thunderbird-bin_x86_64-6.0.tar.bz2 18868715 RMD160 7c3afac77239956d8edf84613ace0cc07520d85d SHA1 8fd81e99be035cb49698e871bbad9da6396c36be SHA256 1bf657d79e37a88126307571d84cedcaf6676b757c517ab4528ee3c5db01cd01
+DIST thunderbird-bin_i686-9.0.1.tar.bz2 18995445 RMD160 46370c2e124fa71671a1374867a0835358313571 SHA1 ea6da4d1b46978cb13367cb66dc64123b0a1201d SHA256 9cc7a222ccf764696308cfe7a043af401cba322ee4f2a1a5897df128f12b9b5a
 DIST thunderbird-bin_x86_64-8.0.tar.bz2 20886942 RMD160 c271c3021d9ccc246be21d519930ed444672ec32 SHA1 c2f2fd60386eefe6abd56a46d10ee5faa47cd219 SHA256 c921b31ecef27cdb9c526824f728c47d20bfe4cf8af529bc16ceaedd94585761
+DIST thunderbird-bin_x86_64-9.0.1.tar.bz2 22025281 RMD160 74ad4c1acf68aedb91e0e3be6fba80360a5c2558 SHA1 0e18402491a4c112fec633c6427db4a4b5ef9ec5 SHA256 536ab6fbdad0ff3bde2c9406b718888c3128f8def8d8d8c1f395a44611d849e8
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-3.1.10.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-3.1.10.ebuild
deleted file mode 100644
index d3071a2eb105..000000000000
--- a/mail-client/thunderbird-bin/thunderbird-bin-3.1.10.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-3.1.10.ebuild,v 1.3 2011/05/01 16:53:35 phajdan.jr Exp $
-
-EAPI="2"
-
-inherit eutils multilib mozextension
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-# '\' at EOL is needed for ${LANG} matching in linguas() below
-LANGS="af ar be bg bn-BD ca cs da de el en en-GB en-US es-AR es-ES et eu fi fr \
-fy-NL ga-IE he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru \
-si sk sl sq sv-SE tr uk zh-CN zh-TW"
-NOSHORTLANGS="en-GB es-AR pt-BR zh-TW"
-
-MY_PN="${PN/-bin}"
-MY_PV="${PV/_beta/b}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Thunderbird Mail Client"
-REL_URI="http://releases.mozilla.org/pub/mozilla.org/${MY_PN}/releases/"
-SRC_URI="${REL_URI}/${MY_PV}/linux-i686/en-US/${MY_P}.tar.bz2
-	mirror://gentoo/libnotify.so.1.bz2"
-HOMEPAGE="http://www.mozilla.com/thunderbird"
-RESTRICT="strip"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE=""
-
-for X in ${LANGS} ; do
-	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
-		SRC_URI="${SRC_URI}
-			linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin/}-${X}.xpi )"
-	fi
-	IUSE="${IUSE} linguas_${X/-/_}"
-	# english is handled internally
-	if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
-		if [ "${X}" != "en-US" ]; then
-			SRC_URI="${SRC_URI}
-				linguas_${X%%-*}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin/}-${X}.xpi )"
-		fi
-		IUSE="${IUSE} linguas_${X%%-*}"
-	fi
-done
-
-DEPEND="app-arch/unzip"
-RDEPEND="x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXmu
-	x86? (
-		>=x11-libs/gtk+-2.2:2
-		net-misc/curl[nss]
-	)
-	amd64? (
-		app-emulation/emul-linux-x86-baselibs
-		app-emulation/emul-linux-x86-gtklibs
-		app-emulation/emul-linux-x86-soundlibs
-	)"
-
-S="${WORKDIR}/thunderbird"
-
-pkg_setup() {
-	# This is a binary x86 package => ABI=x86
-	# Please keep this in future versions
-	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
-	has_multilib_profile && ABI="x86"
-}
-
-linguas() {
-	local LANG SLANG
-	for LANG in ${LINGUAS}; do
-		if has ${LANG} en en_US; then
-			has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
-			continue
-		elif has ${LANG} ${LANGS//-/_}; then
-			has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
-			continue
-		elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
-			for X in ${LANGS}; do
-				if [[ "${X}" == "${LANG}-"* ]] && \
-					[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
-					has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
-					continue 2
-				fi
-			done
-		fi
-		ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
-	done
-}
-
-src_unpack() {
-	unpack ${A}
-
-	linguas
-	for X in ${linguas}; do
-		[[ ${X} != en ]] && xpi_unpack "${P/-bin}-${X}.xpi"
-	done
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/opt/${MY_PN}"
-
-	# Install thunderbird in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
-
-	linguas
-	for X in ${linguas}; do
-		[[ ${X} != en ]] && xpi_install ${WORKDIR}/${P/-bin}-${X}
-	done
-
-	# Create /usr/bin/thunderbird-bin
-	dodir /usr/bin/
-	cat <<EOF >"${D}"/usr/bin/${PN}
-#!/bin/sh
-unset LD_PRELOAD
-LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}"
-exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
-EOF
-	fperms 0755 /usr/bin/${PN}
-
-	# Install icon and .desktop for menu entry
-	doicon "${FILESDIR}"/icon/${PN}-icon.png
-	domenu "${FILESDIR}"/icon/${PN}.desktop
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	doins "${FILESDIR}"/10${PN}
-
-	# Enable very specific settings for thunderbird-3
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js \
-		"${D}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
-		die "failed to cp thunderbird-gentoo-default-prefs.js"
-
-	# This is a copy of 32bit libnotify.so.1 from app-emulation/emul-linux-x86-gtklibs-20110129.
-	# http://bugs.gentoo.org/show_bug.cgi?id=360443.
-	exeinto /opt/thunderbird
-	doexe "${WORKDIR}"/libnotify.so.1 || die
-}
-
-pkg_postinst() {
-	#elog "For enigmail, please see instructions at"
-	#elog "  http://enigmail.mozdev.org/"
-
-	if use x86; then
-		if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' ; then
-			einfo
-			einfo "For using the crashreporter, you need gnome-base/gconf,"
-			einfo "gnome-base/orbit and net-misc/curl emerged."
-			einfo
-		fi
-	else
-		einfo
-		einfo "NB: You just installed a 32-bit thunderbird"
-		einfo
-		einfo "Crashreporter won't work on amd64"
-		einfo
-	fi
-
-	einfo
-	elog 'We have moved away from mozilla-launcher, as it has major design flaws.'
-	elog 'You will need to update your symlinks to use thunderbird-bin as the executable'
-	elog 'to launch thunderbird-bin. If you are used to just typing thunderbird to start, you'
-	elog 'can create an alias in your ${HOME}/.bashrc. Example: alias thunderbird="thunderbird-bin"'
-}
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-6.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-9.0.1.ebuild
similarity index 73%
rename from mail-client/thunderbird-bin/thunderbird-bin-6.0.ebuild
rename to mail-client/thunderbird-bin/thunderbird-bin-9.0.1.ebuild
index 4e21635cedd7..1bb5c403ccee 100644
--- a/mail-client/thunderbird-bin/thunderbird-bin-6.0.ebuild
+++ b/mail-client/thunderbird-bin/thunderbird-bin-9.0.1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-6.0.ebuild,v 1.1 2011/08/21 19:04:25 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-9.0.1.ebuild,v 1.1 2011/12/28 07:32:46 polynomial-c Exp $
 
 EAPI="3"
 
-inherit eutils multilib mozextension
+inherit eutils multilib mozextension pax-utils fdo-mime gnome2-utils
 
 # Can be updated using scripts/get_langs.sh from mozilla overlay
-LANGS=(ar be bn-BD br ca cs da de el en en-GB en-US es-AR es-ES et eu fi fr
-fy-NL ga-IE gd gl he hu id is it ja ko lt nb-NO nl nn-NO pl pt-BR pt-PT rm ru si
-sk sl sq sv-SE ta-LK tr uk)
+LANGS=(ar be bg bn-BD br ca cs da de el en en-GB en-US es-AR es-ES et eu fi fr
+fy-NL ga-IE gd gl he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm
+ro ru si sk sl sq sv-SE ta-LK tr uk vi zh-CN zh-TW)
 
 MY_PN="${PN/-bin}"
 MY_PV="${PV/_beta/b}"
@@ -20,14 +20,13 @@ FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MY_PN}/releases/"
 SRC_URI="
 	amd64? ( ${FTP_URI}/${MY_PV}/linux-x86_64/en-US/${MY_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
 	x86? ( ${FTP_URI}/${MY_PV}/linux-i686/en-US/${MY_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
-HOMEPAGE="http://www.mozilla.com/firefox"
 HOMEPAGE="http://www.mozilla.com/thunderbird"
 RESTRICT="strip"
 
 KEYWORDS="-* ~amd64 ~x86"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE=""
+IUSE="+crashreporter"
 
 for X in "${LANGS[@]}" ; do
 	# en and en_US are handled internally
@@ -49,12 +48,10 @@ DEPEND="app-arch/unzip"
 RDEPEND="x11-libs/libXrender
 	x11-libs/libXt
 	x11-libs/libXmu
-
 	>=x11-libs/gtk+-2.2:2
-	net-misc/curl[nss]
-"
+	crashreporter? ( net-misc/curl ) "
 
-S="${WORKDIR}/thunderbird"
+S="${WORKDIR}/${MY_PN}"
 
 # TODO: Move all the linguas crap to an eclass
 linguas() {
@@ -127,30 +124,22 @@ EOF
 	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js \
 		"${D}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
 		die "failed to cp thunderbird-gentoo-default-prefs.js"
+
+	ln -sfn "/usr/$(get_libdir)/nsbrowser/plugins" \
+			"${D}${MOZILLA_FIVE_HOME}/plugins" || die
+
+	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	#elog "For enigmail, please see instructions at"
-	#elog "  http://enigmail.mozdev.org/"
-
-	if use x86; then
-		if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' ; then
-			einfo
-			einfo "For using the crashreporter, you need gnome-base/gconf,"
-			einfo "gnome-base/orbit and net-misc/curl emerged."
-			einfo
-		fi
-	else
-		einfo
-		einfo "NB: You just installed a 32-bit thunderbird"
-		einfo
-		einfo "Crashreporter won't work on amd64"
-		einfo
-	fi
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
 
-	einfo
-	elog 'We have moved away from mozilla-launcher, as it has major design flaws.'
-	elog 'You will need to update your symlinks to use thunderbird-bin as the executable'
-	elog 'to launch thunderbird-bin. If you are used to just typing thunderbird to start, you'
-	elog 'can create an alias in your ${HOME}/.bashrc. Example: alias thunderbird="thunderbird-bin"'
+pkg_postrm() {
+	gnome2_icon_cache_update
 }
diff --git a/media-sound/amarok/amarok-2.4.3-r1.ebuild b/media-sound/amarok/amarok-2.4.3-r1.ebuild
new file mode 100644
index 000000000000..a8a1c52256ad
--- /dev/null
+++ b/media-sound/amarok/amarok-2.4.3-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.3-r1.ebuild,v 1.1 2011/12/28 01:39:32 jmbsvicetto Exp $
+
+EAPI=4
+
+KDE_LINGUAS="bg ca cs da de en_GB es et eu fi fr it ja km nb nds nl pa
+pl pt pt_BR ru sl sr sr@latin sv th tr uk wa zh_TW"
+KDE_SCM="git"
+KDE_REQUIRED="never"
+inherit flag-o-matic kde4-base
+
+DESCRIPTION="Advanced audio player based on KDE framework."
+HOMEPAGE="http://amarok.kde.org/"
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~x86"
+else
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp opengl semantic-desktop +utils"
+
+# Tests require gmock - http://code.google.com/p/gmock/
+# It's not in the tree yet
+RESTRICT="test"
+
+# ipod requires gdk enabled and also gtk compiled in libgpod
+COMMONDEPEND="
+	app-crypt/qca:2
+	>=app-misc/strigi-0.5.7
+	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
+	$(add_kdebase_dep kdebase-kioslaves)
+	>=media-libs/taglib-1.6.1[asf,mp4]
+	>=media-libs/taglib-extras-1.0.1
+	sys-libs/zlib
+	>=virtual/mysql-5.1[embedded?]
+	x11-libs/qt-script
+	>=x11-libs/qtscriptgenerator-0.1.0
+	cdda? (
+		$(add_kdebase_dep libkcddb)
+		$(add_kdebase_dep libkcompactdisc)
+		$(add_kdebase_dep kdemultimedia-kioslaves)
+	)
+	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
+	lastfm? ( >=media-libs/liblastfm-0.3.0 )
+	mp3tunes? (
+		dev-libs/glib:2
+		dev-libs/libxml2
+		dev-libs/openssl
+		net-libs/loudmouth
+		net-misc/curl
+		x11-libs/qt-core[glib]
+	)
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	opengl? ( virtual/opengl )
+"
+DEPEND="${COMMONDEPEND}
+	dev-util/automoc
+	dev-util/pkgconfig
+"
+RDEPEND="${COMMONDEPEND}
+	$(add_kdebase_dep phonon-kde)
+	!media-sound/amarok-utils
+"
+
+src_configure() {
+	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
+	use ppc64 && append-flags -mminimal-toc
+	local mycmakeargs
+
+	mycmakeargs=(
+		-DWITH_PLAYER=ON
+		-DWITH_Libgcrypt=OFF
+		$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
+		$(cmake-utils_use_with ipod)
+		$(cmake-utils_use_with ipod Gdk)
+		$(cmake-utils_use_with lastfm LibLastFm)
+		$(cmake-utils_use_with mtp)
+		$(cmake-utils_use_with mp3tunes MP3Tunes)
+	)
+
+	mycmakeargs+=(
+		$(cmake-utils_use_with utils UTILITIES)
+	)
+		# $(cmake-utils_use_with semantic-desktop Nepomuk)
+		# $(cmake-utils_use_with semantic-desktop Soprano)
+
+	kde4-base_src_configure
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	if use daap; then
+		echo
+		elog "You have installed amarok with daap support."
+		elog "You may be interested in installing www-servers/mongrel as well."
+		echo
+	fi
+
+	if ! use embedded; then
+		echo
+		elog "You've disabled the amarok support for embedded mysql DBs."
+		elog "You'll have to configure amarok to use an external db server."
+		echo
+		elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
+		elog "to configure the external db and migrate your data from the embedded database."
+		echo
+
+		if has_version "virtual/mysql[minimal]"; then
+			elog "You built mysql with the minimal use flag, so it doesn't include the server."
+			elog "You won't be able to use the local mysql installation to store your amarok collection."
+			echo
+		fi
+	fi
+}
diff --git a/media-sound/amarok/amarok-2.5.0-r1.ebuild b/media-sound/amarok/amarok-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..36251368891c
--- /dev/null
+++ b/media-sound/amarok/amarok-2.5.0-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.5.0-r1.ebuild,v 1.1 2011/12/28 01:39:32 jmbsvicetto Exp $
+
+EAPI=4
+
+KDE_LINGUAS="af ar ast be bg bs ca ca@valencia cs csb da de el en_GB eo es et
+eu fa fi fr ga gl he hr hu is it ja km ko ku lt lv mai ml ms nb nds ne nl nn
+oc pa pl pt pt_BR ro ru se si sk sl sq sr sr@ijekavian sr@ijekavianlatin
+sr@Latn sv tg th tr ug uk wa zh_CN zh_TW"
+KDE_SCM="git"
+KDE_REQUIRED="never"
+inherit flag-o-matic kde4-base
+
+DESCRIPTION="Advanced audio player based on KDE framework."
+HOMEPAGE="http://amarok.kde.org/"
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~x86"
+else
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop +utils"
+
+# Tests require gmock - http://code.google.com/p/gmock/
+# It's not in the tree yet
+RESTRICT="test"
+
+# ipod requires gdk enabled and also gtk compiled in libgpod
+COMMONDEPEND="
+	app-crypt/qca:2
+	>=app-misc/strigi-0.5.7
+	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
+	$(add_kdebase_dep kdebase-kioslaves)
+	>=media-libs/taglib-1.6.1[asf,mp4]
+	>=media-libs/taglib-extras-1.0.1
+	sys-libs/zlib
+	>=virtual/mysql-5.1[embedded?]
+	x11-libs/qt-script
+	>=x11-libs/qtscriptgenerator-0.1.0
+	cdda? (
+		$(add_kdebase_dep libkcddb)
+		$(add_kdebase_dep libkcompactdisc)
+		$(add_kdebase_dep kdemultimedia-kioslaves)
+	)
+	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
+	lastfm? ( >=media-libs/liblastfm-0.3.0 )
+	mp3tunes? (
+		dev-libs/glib:2
+		dev-libs/libxml2
+		dev-libs/openssl
+		net-libs/loudmouth
+		net-misc/curl
+		x11-libs/qt-core[glib]
+	)
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	opengl? ( virtual/opengl )
+"
+DEPEND="${COMMONDEPEND}
+	dev-util/automoc
+	dev-util/pkgconfig
+"
+RDEPEND="${COMMONDEPEND}
+	$(add_kdebase_dep phonon-kde)
+	!media-sound/amarok-utils
+"
+
+src_prepare() {
+	# en locale is special in a way that it is always enabled. English Amarok
+	# handbook however lies in the doc/en_US folder and thus is not picked
+	# up by kde4-functions eclass. Rename it.
+	sed -e 's:add_subdirectory(en_US):add_subdirectory(en):' \
+		-i "${S}/doc/CMakeLists.txt" \
+		|| die "Replacing en_US by en in doc/CMakeLists.txt failed."
+	mv "${S}/doc/en_US" "${S}/doc/en" || die "Moving doc/en_US to doc/en failed."
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
+	use ppc64 && append-flags -mminimal-toc
+	local mycmakeargs
+
+	# Mygpo-qt not yet in portage, add IUSE when available
+	mycmakeargs=(
+		-DWITH_PLAYER=ON
+		-DWITH_Libgcrypt=OFF
+		-DWITH_Mygpo-qt=OFF
+		$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
+		$(cmake-utils_use_with ipod)
+		$(cmake-utils_use_with ipod Gdk)
+		$(cmake-utils_use_with lastfm LibLastFm)
+		$(cmake-utils_use_with mtp)
+		$(cmake-utils_use_with mp3tunes MP3Tunes)
+	)
+
+	mycmakeargs+=(
+		$(cmake-utils_use_with utils UTILITIES)
+	)
+		# $(cmake-utils_use_with semantic-desktop Nepomuk)
+		# $(cmake-utils_use_with semantic-desktop Soprano)
+
+	kde4-base_src_configure
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	if use daap; then
+		echo
+		elog "You have installed amarok with daap support."
+		elog "You may be interested in installing www-servers/mongrel as well."
+		echo
+	fi
+
+	if ! use embedded; then
+		echo
+		elog "You've disabled the amarok support for embedded mysql DBs."
+		elog "You'll have to configure amarok to use an external db server."
+		echo
+		elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
+		elog "to configure the external db and migrate your data from the embedded database."
+		echo
+
+		if has_version "virtual/mysql[minimal]"; then
+			elog "You built mysql with the minimal use flag, so it doesn't include the server."
+			elog "You won't be able to use the local mysql installation to store your amarok collection."
+			echo
+		fi
+	fi
+}
diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index bd6a479359b3..0ed4fbd7afc5 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -19,11 +19,20 @@
       Try disabling this if you encounter -PIC related in amarok,                                                             
       it will make amarok rely only on standalone MySQL server.                                                               
     </flag>
-    <flag name="lastfm">Enable Last.fm streaming services support through <pkg>media-libs/liblastfm</pkg></flag>
+    <flag name="lastfm">
+      Enable Last.fm streaming services support through
+      <pkg>media-libs/liblastfm</pkg>
+    </flag>
     <flag name="mp3tunes">Enable mp3tunes integration</flag>
+    <flag name="ofa">
+      Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic
+      fingerprints (used by MusicBrainz)
+    </flag>
 	<flag name="playdar">Build the playdar collection</flag>
 	<flag name="player">Build the player</flag>
 	<flag name="upnp">Support for upnp servers</flag>
-	<flag name="utils">Build the utils - old <pkg>media-sound/amarok-utils</pkg></flag>
+	<flag name="utils">
+      Build the utils - old <pkg>media-sound/amarok-utils</pkg>
+    </flag>
   </use>
 </pkgmetadata>
diff --git a/metadata/cache/app-admin/bcfg2-1.2.0 b/metadata/cache/app-admin/bcfg2-1.2.0
new file mode 100644
index 000000000000..c4fa09458975
--- /dev/null
+++ b/metadata/cache/app-admin/bcfg2-1.2.0
@@ -0,0 +1,22 @@
+>=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+app-portage/gentoolkit server? ( dev-python/lxml dev-libs/libgamin[python] ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+0
+ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-1.2.0.tar.gz
+
+http://bcfg2.org
+BSD
+configuration management tool
+~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+distutils multilib python toolchain-funcs
+server
+
+
+
+3
+
+compile install postinst postrm prepare
+
+
+
+
+
diff --git a/metadata/cache/app-crypt/heimdal-1.5.1-r1 b/metadata/cache/app-crypt/heimdal-1.5.1-r1
index 9d49324d4525..ca98be3b70c3 100644
--- a/metadata/cache/app-crypt/heimdal-1.5.1-r1
+++ b/metadata/cache/app-crypt/heimdal-1.5.1-r1
@@ -1,12 +1,12 @@
-ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) !berkdb? ( sys-libs/gdbm ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.5.7 >=sys-libs/e2fsprogs-libs-1.41.11 afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) !!app-crypt/mit-krb5 =dev-lang/python-2* dev-util/pkgconfig >=sys-devel/autoconf-2.62 test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=app-admin/eselect-python-20091230
-ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) !berkdb? ( sys-libs/gdbm ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.5.7 >=sys-libs/e2fsprogs-libs-1.41.11 afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) !!app-crypt/mit-krb5 >=app-admin/eselect-python-20091230
+ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) !berkdb? ( sys-libs/gdbm ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.5.7 >=sys-libs/e2fsprogs-libs-1.41.11 afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl =dev-lang/python-2* dev-util/pkgconfig >=sys-devel/autoconf-2.62 test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=app-admin/eselect-python-20091230
+ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) !berkdb? ( sys-libs/gdbm ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.5.7 >=sys-libs/e2fsprogs-libs-1.41.11 afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl >=app-admin/eselect-python-20091230
 0
 http://www.h5l.org/dist/src/heimdal-1.5.1.tar.gz
 
 http://www.h5l.org/
 BSD
 Kerberos 5 implementation from KTH
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 autotools db-use eutils flag-o-matic libtool multilib portability python toolchain-funcs user versionator virtualx
 afs +berkdb caps hdb-ldap ipv6 otp +pkinit ssl static-libs threads test X
 
diff --git a/metadata/cache/app-misc/tracker-0.12.7 b/metadata/cache/app-misc/tracker-0.12.9
similarity index 98%
rename from metadata/cache/app-misc/tracker-0.12.7
rename to metadata/cache/app-misc/tracker-0.12.9
index 8718242d81d7..22af7bd40d0e 100644
--- a/metadata/cache/app-misc/tracker-0.12.7
+++ b/metadata/cache/app-misc/tracker-0.12.9
@@ -1,7 +1,7 @@
 >=app-i18n/enca-1.9 >=dev-db/sqlite-3.7[threadsafe] >=dev-libs/glib-2.28:2 >=dev-libs/gobject-introspection-0.9.5 >=dev-libs/icu-4 || ( >=media-gfx/imagemagick-5.2.1[png,jpeg=] media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) >=media-libs/libpng-1.2 >=x11-libs/pango-1 sys-apps/util-linux applet? ( >=gnome-base/gnome-panel-2.91.6 >=x11-libs/gdk-pixbuf-2.12:2 >=x11-libs/gtk+-3.0:3 ) eds? ( >=mail-client/evolution-2.91.90 >=gnome-extra/evolution-data-server-2.91.90 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) flickr? ( net-libs/rest:0.7 ) gif? ( media-libs/giflib ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.26 ) gsf? ( app-text/odt2txt >=gnome-extra/libgsf-1.13 ) gstreamer? ( >=media-libs/gstreamer-0.10.31:0.10 upnp? ( >=media-libs/gupnp-dlna-0.5 ) !upnp? ( >=media-libs/gst-plugins-base-0.10.31 ) ) !gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) ) gtk? ( >=dev-libs/libgee-0.3:0 >=x11-libs/gtk+-3.0.0:3 ) iptc? ( media-libs/libiptcdata ) jpeg? ( virtual/jpeg:0 ) laptop? ( >=sys-power/upower-0.9 ) mp3? ( >=media-libs/taglib-1.6 gtk? ( x11-libs/gdk-pixbuf:2 ) ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1 >=app-text/poppler-0.16[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( dev-libs/totem-pl-parser ) rss? ( net-libs/libgrss ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff ) vorbis? ( >=media-libs/libvorbis-0.22 ) xine? ( >=media-libs/xine-lib-1 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=dev-util/pkgconfig-0.20 applet? ( >=dev-lang/vala-0.12:0.12 ) gtk? ( >=dev-lang/vala-0.12:0.12 >=dev-libs/libgee-0.3 ) doc? ( app-office/dia >=dev-util/gtk-doc-1.8 media-gfx/graphviz ) test? ( >=dev-libs/dbus-glib-0.82-r1 >=sys-apps/dbus-1.3.1[X] ) app-arch/xz-utils >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 >=app-i18n/enca-1.9 >=dev-db/sqlite-3.7[threadsafe] >=dev-libs/glib-2.28:2 >=dev-libs/gobject-introspection-0.9.5 >=dev-libs/icu-4 || ( >=media-gfx/imagemagick-5.2.1[png,jpeg=] media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) >=media-libs/libpng-1.2 >=x11-libs/pango-1 sys-apps/util-linux applet? ( >=gnome-base/gnome-panel-2.91.6 >=x11-libs/gdk-pixbuf-2.12:2 >=x11-libs/gtk+-3.0:3 ) eds? ( >=mail-client/evolution-2.91.90 >=gnome-extra/evolution-data-server-2.91.90 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) flickr? ( net-libs/rest:0.7 ) gif? ( media-libs/giflib ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.26 ) gsf? ( app-text/odt2txt >=gnome-extra/libgsf-1.13 ) gstreamer? ( >=media-libs/gstreamer-0.10.31:0.10 upnp? ( >=media-libs/gupnp-dlna-0.5 ) !upnp? ( >=media-libs/gst-plugins-base-0.10.31 ) ) !gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) ) gtk? ( >=dev-libs/libgee-0.3:0 >=x11-libs/gtk+-3.0.0:3 ) iptc? ( media-libs/libiptcdata ) jpeg? ( virtual/jpeg:0 ) laptop? ( >=sys-power/upower-0.9 ) mp3? ( >=media-libs/taglib-1.6 gtk? ( x11-libs/gdk-pixbuf:2 ) ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1 >=app-text/poppler-0.16[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( dev-libs/totem-pl-parser ) rss? ( net-libs/libgrss ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff ) vorbis? ( >=media-libs/libvorbis-0.22 ) xine? ( >=media-libs/xine-lib-1 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0
-mirror://gnome/sources/tracker/0.12/tracker-0.12.7.tar.xz
+mirror://gnome/sources/tracker/0.12/tracker-0.12.9.tar.xz
 test
 http://www.tracker-project.org/
 GPL-2
diff --git a/metadata/cache/app-text/dvipsk-5.991_p20110705-r1 b/metadata/cache/app-text/dvipsk-5.991_p20110705-r1
index b0919aea8cc9..52dd13131586 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/ps2pkm-1.5_p20110705 b/metadata/cache/app-text/ps2pkm-1.5_p20110705
index 92eea0c969ac..657c3e35930f 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 14b042d40cc3..4ef746a5d2d7 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 13e661771918..f1844f60d396 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-lang/ghc-7.0.4 b/metadata/cache/dev-lang/ghc-7.0.4
index f4569b25f317..ce82e1a73c1d 100644
--- a/metadata/cache/dev-lang/ghc-7.0.4
+++ b/metadata/cache/dev-lang/ghc-7.0.4
@@ -1,7 +1,7 @@
 !dev-lang/ghc-bin !kernel_Darwin? ( >=sys-devel/gcc-2.95.3 ) kernel_linux? ( >=sys-devel/binutils-2.17 ) kernel_SunOS? ( >=sys-devel/binutils-2.17 ) >=dev-lang/perl-5.6.1 >=dev-libs/gmp-5 !<dev-haskell/haddock-2.4.2 sys-libs/ncurses[unicode] ghcbootstrap? ( doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
 !dev-lang/ghc-bin !kernel_Darwin? ( >=sys-devel/gcc-2.95.3 ) kernel_linux? ( >=sys-devel/binutils-2.17 ) kernel_SunOS? ( >=sys-devel/binutils-2.17 ) >=dev-lang/perl-5.6.1 >=dev-libs/gmp-5 !<dev-haskell/haddock-2.4.2 sys-libs/ncurses[unicode] bash-completion? ( app-admin/eselect )
 0
-!binary? ( http://www.haskell.org/ghc/dist/7.0.4/ghc-7.0.4-src.tar.bz2 ) !ghcbootstrap? ( alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-7.0.4-alpha.tbz2 ) arm? ( http://code.haskell.org/~slyfox/ghc-arm/ghc-bin-7.0.4-arm.tbz2 ) amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-7.0.4-amd64.tbz2 ) sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-7.0.4-sparc.tbz2 ) x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-7.0.4-x86.tbz2 ) )
+!binary? ( http://www.haskell.org/ghc/dist/7.0.4/ghc-7.0.4-src.tar.bz2 ) !ghcbootstrap? ( alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-7.0.4-alpha.tbz2 ) arm? ( http://code.haskell.org/~slyfox/ghc-arm/ghc-bin-7.0.4-arm.tbz2 ) amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-7.0.4-amd64.tbz2 ) ppc? ( mirror://gentoo/ghc-bin-7.0.4-ppc.tbz2 ) sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-7.0.4-sparc.tbz2 ) x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-7.0.4-x86.tbz2 ) )
 
 http://www.haskell.org/ghc/
 BSD
diff --git a/metadata/cache/dev-lang/nqp-2011.12 b/metadata/cache/dev-lang/nqp-2011.12
index 88285b85352d..59468f34b5bf 100644
--- a/metadata/cache/dev-lang/nqp-2011.12
+++ b/metadata/cache/dev-lang/nqp-2011.12
@@ -14,7 +14,7 @@ doc
 
 3
 
-configure install prepare test
+compile configure install prepare test
 
 
 
diff --git a/metadata/cache/dev-lang/ruby-1.8.7_p334-r1 b/metadata/cache/dev-lang/ruby-1.8.7_p334-r1
deleted file mode 100644
index 47e1527d3d88..000000000000
--- a/metadata/cache/dev-lang/ruby-1.8.7_p334-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( >=dev-libs/openssl-0.9.8m ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads=] ) ncurses? ( sys-libs/ncurses ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline ) ) sys-libs/zlib >=app-admin/eselect-ruby-20100603 !=dev-lang/ruby-cvs-1.8* !<dev-ruby/rdoc-2 !dev-ruby/rexml || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
-berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( >=dev-libs/openssl-0.9.8m ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads=] ) ncurses? ( sys-libs/ncurses ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline ) ) sys-libs/zlib >=app-admin/eselect-ruby-20100603 !=dev-lang/ruby-cvs-1.8* !<dev-ruby/rdoc-2 !dev-ruby/rexml
-1.8
-mirror://ruby/1.8/ruby-1.8.7-p334.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-1.8.7_p334-r1.tar.bz2
-
-http://www.ruby-lang.org/
-|| ( Ruby GPL-2 )
-An object-oriented scripting language
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
-autotools eutils flag-o-matic libtool multilib portability toolchain-funcs user versionator
-+berkdb debug doc examples +gdbm ipv6 rubytests socks5 ssl threads tk xemacs ncurses +readline libedit
-
-xemacs? ( app-xemacs/ruby-modes )
-
-2
-
-compile configure install postinst postrm prepare test
-
-
-
-
-
diff --git a/metadata/cache/dev-lang/ruby-1.8.7_p334-r2 b/metadata/cache/dev-lang/ruby-1.8.7_p334-r2
deleted file mode 100644
index d20c863b3978..000000000000
--- a/metadata/cache/dev-lang/ruby-1.8.7_p334-r2
+++ /dev/null
@@ -1,22 +0,0 @@
-berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( >=dev-libs/openssl-0.9.8m ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads=] ) ncurses? ( sys-libs/ncurses ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline ) ) sys-libs/zlib >=app-admin/eselect-ruby-20100603 !=dev-lang/ruby-cvs-1.8* !<dev-ruby/rdoc-2 !dev-ruby/rexml || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
-berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( >=dev-libs/openssl-0.9.8m ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads=] ) ncurses? ( sys-libs/ncurses ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline ) ) sys-libs/zlib >=app-admin/eselect-ruby-20100603 !=dev-lang/ruby-cvs-1.8* !<dev-ruby/rdoc-2 !dev-ruby/rexml
-1.8
-mirror://ruby/1.8/ruby-1.8.7-p334.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-1.8.7_p334-r2.tar.bz2
-
-http://www.ruby-lang.org/
-|| ( Ruby GPL-2 )
-An object-oriented scripting language
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
-autotools eutils flag-o-matic libtool multilib portability toolchain-funcs user versionator
-+berkdb debug doc examples +gdbm ipv6 rubytests socks5 ssl threads tk xemacs ncurses +readline libedit
-
-xemacs? ( app-xemacs/ruby-modes )
-
-2
-
-compile configure install postinst postrm prepare test
-
-
-
-
-
diff --git a/metadata/cache/dev-lang/ruby-1.9.2_p290 b/metadata/cache/dev-lang/ruby-1.9.2_p290
deleted file mode 100644
index a1c014737239..000000000000
--- a/metadata/cache/dev-lang/ruby-1.9.2_p290
+++ /dev/null
@@ -1,22 +0,0 @@
-berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads] ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) yaml? ( dev-libs/libyaml ) virtual/libffi sys-libs/zlib >=app-admin/eselect-ruby-20100402 !=dev-lang/ruby-cvs-1.9* !<dev-ruby/rdoc-2 !<dev-ruby/rubygems-1.3.7-r4 !dev-ruby/rexml || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
-berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads] ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) yaml? ( dev-libs/libyaml ) virtual/libffi sys-libs/zlib >=app-admin/eselect-ruby-20100402 !=dev-lang/ruby-cvs-1.9* !<dev-ruby/rdoc-2 !<dev-ruby/rubygems-1.3.7-r4 !dev-ruby/rexml
-1.9
-mirror://ruby/ruby-1.9.2-p290.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-1.9.2_p290.tar.bz2
-
-http://www.ruby-lang.org/
-|| ( Ruby GPL-2 )
-An object-oriented scripting language
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-autotools eutils flag-o-matic libtool multilib portability toolchain-funcs user versionator
-berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl tk xemacs ncurses +readline yaml
-
-rdoc? ( >=dev-ruby/rdoc-2.5.11[ruby_targets_ruby19] ) xemacs? ( app-xemacs/ruby-modes )
-
-2
-
-compile configure install postinst postrm prepare test
-
-
-
-
-
diff --git a/metadata/cache/dev-lang/ruby-1.9.3_p0 b/metadata/cache/dev-lang/ruby-1.9.3_p0
index 5077830d20fe..d2f151e0b7bd 100644
--- a/metadata/cache/dev-lang/ruby-1.9.3_p0
+++ b/metadata/cache/dev-lang/ruby-1.9.3_p0
@@ -1,5 +1,5 @@
-berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads] ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) yaml? ( dev-libs/libyaml ) virtual/libffi sys-libs/zlib >=app-admin/eselect-ruby-20100402 !=dev-lang/ruby-cvs-1.9* !<dev-ruby/rdoc-2 !<dev-ruby/rubygems-1.3.7-r4 !dev-ruby/rexml || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
-berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads] ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) yaml? ( dev-libs/libyaml ) virtual/libffi sys-libs/zlib >=app-admin/eselect-ruby-20100402 !=dev-lang/ruby-cvs-1.9* !<dev-ruby/rdoc-2 !<dev-ruby/rubygems-1.3.7-r4 !dev-ruby/rexml
+berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads] ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) yaml? ( dev-libs/libyaml ) virtual/libffi sys-libs/zlib >=app-admin/eselect-ruby-20100402 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads] ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) yaml? ( dev-libs/libyaml ) virtual/libffi sys-libs/zlib >=app-admin/eselect-ruby-20100402 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
 1.9
 mirror://ruby/1.9/ruby-1.9.3-p0.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-1.9.3_p0.tar.bz2
 
diff --git a/metadata/cache/dev-lang/ruby-1.9.3_rc1 b/metadata/cache/dev-lang/ruby-1.9.3_rc1
deleted file mode 100644
index fd242c1415d8..000000000000
--- a/metadata/cache/dev-lang/ruby-1.9.3_rc1
+++ /dev/null
@@ -1,22 +0,0 @@
-berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads] ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) yaml? ( dev-libs/libyaml ) virtual/libffi sys-libs/zlib >=app-admin/eselect-ruby-20100402 !=dev-lang/ruby-cvs-1.9* !<dev-ruby/rdoc-2 !<dev-ruby/rubygems-1.3.7-r4 !dev-ruby/rexml || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
-berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads] ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) yaml? ( dev-libs/libyaml ) virtual/libffi sys-libs/zlib >=app-admin/eselect-ruby-20100402 !=dev-lang/ruby-cvs-1.9* !<dev-ruby/rdoc-2 !<dev-ruby/rubygems-1.3.7-r4 !dev-ruby/rexml
-1.9
-mirror://ruby/1.9/ruby-1.9.3-rc1.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-1.9.3_rc1.tar.bz2
-
-http://www.ruby-lang.org/
-|| ( Ruby BSD-2 )
-An object-oriented scripting language
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-autotools eutils flag-o-matic libtool multilib portability toolchain-funcs user versionator
-berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl tk xemacs ncurses +readline +yaml
-
-rdoc? ( >=dev-ruby/rdoc-2.5.11[ruby_targets_ruby19] ) xemacs? ( app-xemacs/ruby-modes )
-
-2
-
-compile configure install postinst postrm prepare test
-
-
-
-
-
diff --git a/metadata/cache/dev-libs/crypto++-5.6.1-r2 b/metadata/cache/dev-libs/crypto++-5.6.1-r2
new file mode 100644
index 000000000000..0bc5d5e82eea
--- /dev/null
+++ b/metadata/cache/dev-libs/crypto++-5.6.1-r2
@@ -0,0 +1,22 @@
+app-arch/unzip
+
+0
+mirror://sourceforge/cryptopp/cryptopp561.zip
+
+http://cryptopp.com
+cryptopp
+Crypto++ is a C++ class library of cryptographic schemes
+~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+eutils flag-o-matic multilib portability toolchain-funcs user
+
+
+
+
+3
+
+compile install prepare test
+
+
+
+
+
diff --git a/metadata/cache/dev-libs/ptexenc-1.2.0_p20110705 b/metadata/cache/dev-libs/ptexenc-1.2.0_p20110705
index 33a6e21191a5..ea2d9cde1523 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/Geo-IP-1.28 b/metadata/cache/dev-perl/Geo-IP-1.28
deleted file mode 100644
index f97c3c821758..000000000000
--- a/metadata/cache/dev-perl/Geo-IP-1.28
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/geoip dev-lang/perl
-dev-libs/geoip dev-lang/perl
-0
-mirror://cpan/authors/id/T/TJ/TJMATHER/Geo-IP-1.28.tar.gz
-
-http://www.cpan.org/modules/by-authors/id/T/TJ/TJMATHER/Geo-IP-1.28.readme
-|| ( Artistic GPL-2 )
-Look up country by IP Address
-alpha amd64 hppa ia64 ppc sparc x86 ~x86-fbsd
-base eutils multilib perl-module portability toolchain-funcs user
-
-
-
-
-
-
-compile install postinst postrm preinst prerm setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-python/msgpack-0.1.12 b/metadata/cache/dev-python/msgpack-0.1.12
new file mode 100644
index 000000000000..13c78aa567b6
--- /dev/null
+++ b/metadata/cache/dev-python/msgpack-0.1.12
@@ -0,0 +1,22 @@
+>=app-admin/eselect-python-20091230 || ( =dev-lang/python-3* =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) test? ( dev-python/nose )
+>=app-admin/eselect-python-20091230 || ( =dev-lang/python-3* =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+0
+mirror://pypi/m/msgpack-python/msgpack-python-0.1.12.tar.gz
+
+http://msgpack.org http://pypi.python.org/pypi/msgpack-python/
+Apache-2.0
+MessagePack (de)serializer for Python
+~amd64 ~x86
+distutils multilib python toolchain-funcs
+test test
+
+
+
+3
+
+compile install postinst postrm prepare test
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/deprecated-2.0.1-r1 b/metadata/cache/dev-ruby/deprecated-2.0.1-r1
index bc7d2f796c2c..00cc060f79c7 100644
--- a/metadata/cache/dev-ruby/deprecated-2.0.1-r1
+++ b/metadata/cache/dev-ruby/deprecated-2.0.1-r1
@@ -1,5 +1,5 @@
-ruby_targets_ruby18? ( test? ( virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( virtual/ruby-test-unit[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( virtual/ruby-test-unit[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+ruby_targets_ruby18? ( test? ( virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_jruby? ( test? ( virtual/ruby-test-unit[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 2
 mirror://rubyforge/deprecated/deprecated-2.0.1.tar.gz
 
@@ -8,7 +8,7 @@ BSD
 A Ruby library for handling deprecated code
 amd64 ia64 ppc ~sparc x86
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby test
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_jruby test
 
 
 
diff --git a/metadata/cache/dev-ruby/deprecated-2.0.1-r2 b/metadata/cache/dev-ruby/deprecated-2.0.1-r2
new file mode 100644
index 000000000000..d6a118a8324a
--- /dev/null
+++ b/metadata/cache/dev-ruby/deprecated-2.0.1-r2
@@ -0,0 +1,22 @@
+ruby_targets_ruby18? ( test? ( virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( virtual/ruby-test-unit[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( virtual/ruby-test-unit[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+2
+mirror://rubyforge/deprecated/deprecated-2.0.1.tar.gz
+
+http://rubyforge.org/projects/deprecated
+BSD
+A Ruby library for handling deprecated code
+~amd64 ~ia64 ~ppc ~sparc ~x86
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby test
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/facter-1.6.0 b/metadata/cache/dev-ruby/facter-1.6.0
index 621d82c8905e..d8a0adc20094 100644
--- a/metadata/cache/dev-ruby/facter-1.6.0
+++ b/metadata/cache/dev-ruby/facter-1.6.0
@@ -1,5 +1,5 @@
-ruby_targets_ruby18? ( test? ( dev-ruby/mocha[ruby_targets_ruby18] dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/mocha[ruby_targets_ruby19] dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/mocha[ruby_targets_ree18] dev-ruby/rspec:2[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/mocha[ruby_targets_jruby] dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+ruby_targets_ruby18? ( test? ( dev-ruby/mocha[ruby_targets_ruby18] dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/mocha[ruby_targets_ree18] dev-ruby/rspec:2[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/mocha[ruby_targets_jruby] dev-ruby/rspec:2[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? ( 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? ( 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
 mirror://rubygems/facter-1.6.0.gem
 
@@ -8,7 +8,7 @@ Apache-2.0
 A cross-platform Ruby library for retrieving facts from operating systems
 amd64 hppa ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby test test
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby test test
 
 
 
diff --git a/metadata/cache/dev-ruby/gruff-0.3.6-r1 b/metadata/cache/dev-ruby/gruff-0.3.6-r1
index 4e3f4c774352..516b3c640529 100644
--- a/metadata/cache/dev-ruby/gruff-0.3.6-r1
+++ b/metadata/cache/dev-ruby/gruff-0.3.6-r1
@@ -1,5 +1,5 @@
-test? ( ruby_targets_ruby18? ( >=dev-ruby/rmagick-2[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/rmagick-2[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/hoe[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) doc? ( dev-ruby/hoe[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/hoe[ruby_targets_ruby19] virtual/ruby-test-unit[ruby_targets_ruby19] ) doc? ( dev-ruby/hoe[ruby_targets_ruby19] ) ) test? ( media-gfx/imagemagick[jpeg,truetype] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-ruby_targets_ruby18? ( >=dev-ruby/rmagick-2[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/rmagick-2[ruby_targets_ruby19] ) media-gfx/imagemagick[truetype] ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+test? ( ruby_targets_ruby18? ( >=dev-ruby/rmagick-2[ruby_targets_ruby18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/hoe[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) doc? ( dev-ruby/hoe[ruby_targets_ruby18] ) ) test? ( media-gfx/imagemagick[jpeg,truetype] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) )
+ruby_targets_ruby18? ( >=dev-ruby/rmagick-2[ruby_targets_ruby18] ) media-gfx/imagemagick[truetype] ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] )
 0
 mirror://rubyforge/gruff/gruff-0.3.6.tgz
 
@@ -8,7 +8,7 @@ MIT
 RMagick Implementation for JRuby
 amd64 ia64 x86 ~x86-macos
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc doc test test
+elibc_FreeBSD ruby_targets_ruby18 doc doc test test
 
 
 
diff --git a/metadata/cache/dev-ruby/gruff-0.3.6-r2 b/metadata/cache/dev-ruby/gruff-0.3.6-r2
new file mode 100644
index 000000000000..7024469c1088
--- /dev/null
+++ b/metadata/cache/dev-ruby/gruff-0.3.6-r2
@@ -0,0 +1,22 @@
+test? ( ruby_targets_ruby18? ( >=dev-ruby/rmagick-2[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/rmagick-2[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/hoe[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) doc? ( dev-ruby/hoe[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/hoe[ruby_targets_ruby19] virtual/ruby-test-unit[ruby_targets_ruby19] ) doc? ( dev-ruby/hoe[ruby_targets_ruby19] ) ) test? ( media-gfx/imagemagick[jpeg,truetype] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+ruby_targets_ruby18? ( >=dev-ruby/rmagick-2[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/rmagick-2[ruby_targets_ruby19] ) media-gfx/imagemagick[truetype] ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+0
+mirror://rubyforge/gruff/gruff-0.3.6.tgz
+
+http://rubyforge.org/projects/gruff/
+MIT
+RMagick Implementation for JRuby
+~amd64 ~ia64 ~x86 ~x86-macos
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc doc test test
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/hike-1.2.1 b/metadata/cache/dev-ruby/hike-1.2.1
index eec27ae37f42..a200a3ae4d10 100644
--- a/metadata/cache/dev-ruby/hike-1.2.1
+++ b/metadata/cache/dev-ruby/hike-1.2.1
@@ -1,5 +1,5 @@
-ruby_targets_ruby18? ( test? ( virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 0
 https://github.com/sstephenson/hike/tarball/v1.2.1 -> hike-1.2.1.tgz
 
@@ -8,8 +8,8 @@ MIT
 Hike is a Ruby library for finding files in a set of paths.
 ~amd64
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
-|| ( ruby_targets_ruby18 ruby_targets_ree18 )
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby test test
+|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby )
 
 
 4
diff --git a/metadata/cache/dev-ruby/mechanize-1.0.0 b/metadata/cache/dev-ruby/mechanize-1.0.0
index ed73c366cf07..e7eb2cf59e70 100644
--- a/metadata/cache/dev-ruby/mechanize-1.0.0
+++ b/metadata/cache/dev-ruby/mechanize-1.0.0
@@ -1,5 +1,5 @@
-ruby_targets_ruby18? ( >=dev-ruby/hoe-2.3.3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/hoe-2.3.3[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/hoe-2.3.3[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-ruby_targets_ruby18? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+ruby_targets_ruby18? ( >=dev-ruby/hoe-2.3.3[ruby_targets_ruby18] ) ruby_targets_jruby? ( >=dev-ruby/hoe-2.3.3[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby18] ) ruby_targets_jruby? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+ruby_targets_ruby18? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby18] ) ruby_targets_jruby? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 0
 mirror://rubygems/mechanize-1.0.0.gem
 
@@ -8,7 +8,7 @@ GPL-2
 A Ruby library used for automating interaction with websites.
 amd64 ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby doc doc test test
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_jruby doc doc test test
 
 
 
diff --git a/metadata/cache/dev-ruby/mechanize-1.0.0-r1 b/metadata/cache/dev-ruby/mechanize-1.0.0-r1
new file mode 100644
index 000000000000..e4257929a804
--- /dev/null
+++ b/metadata/cache/dev-ruby/mechanize-1.0.0-r1
@@ -0,0 +1,22 @@
+ruby_targets_ruby18? ( >=dev-ruby/hoe-2.3.3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/hoe-2.3.3[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/hoe-2.3.3[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+ruby_targets_ruby18? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+0
+mirror://rubygems/mechanize-1.0.0.gem
+
+http://mechanize.rubyforge.org/
+GPL-2
+A Ruby library used for automating interaction with websites.
+~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby doc doc test test
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/method_source-0.6.5 b/metadata/cache/dev-ruby/method_source-0.6.5
deleted file mode 100644
index fc78144457b5..000000000000
--- a/metadata/cache/dev-ruby/method_source-0.6.5
+++ /dev/null
@@ -1,22 +0,0 @@
-ruby_targets_ruby18? ( test? ( >=dev-ruby/bacon-1.1.0[ruby_targets_ruby18] >=dev-ruby/open4-1.0.1[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/bacon-1.1.0[ruby_targets_ree18] >=dev-ruby/open4-1.0.1[ruby_targets_ree18] ) ) test? ( ruby_targets_ruby18? ( >=dev-ruby/ruby_parser-2.0.5[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/ruby_parser-2.0.5[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-ruby_targets_ruby18? ( >=dev-ruby/ruby_parser-2.0.5[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/ruby_parser-2.0.5[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-0
-mirror://rubygems/method_source-0.6.5.gem
-
-http://github.com/banister/method_source
-MIT
-Retrieve the source code for a method.
-~amd64
-eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
-|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-
-
-4
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/method_source-0.6.6 b/metadata/cache/dev-ruby/method_source-0.6.6
deleted file mode 100644
index 2c8c423930e6..000000000000
--- a/metadata/cache/dev-ruby/method_source-0.6.6
+++ /dev/null
@@ -1,22 +0,0 @@
-ruby_targets_ruby18? ( test? ( >=dev-ruby/bacon-1.1.0[ruby_targets_ruby18] >=dev-ruby/open4-1.0.1[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/bacon-1.1.0[ruby_targets_ree18] >=dev-ruby/open4-1.0.1[ruby_targets_ree18] ) ) test? ( ruby_targets_ruby18? ( >=dev-ruby/ruby_parser-2.0.5[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/ruby_parser-2.0.5[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-ruby_targets_ruby18? ( >=dev-ruby/ruby_parser-2.0.5[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/ruby_parser-2.0.5[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-0
-mirror://rubygems/method_source-0.6.6.gem
-
-http://github.com/banister/method_source
-MIT
-Retrieve the source code for a method.
-~amd64
-eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
-|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-
-
-4
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/mkrf-0.2.3-r2 b/metadata/cache/dev-ruby/mkrf-0.2.3-r2
new file mode 100644
index 000000000000..9617d099d067
--- /dev/null
+++ b/metadata/cache/dev-ruby/mkrf-0.2.3-r2
@@ -0,0 +1,22 @@
+ruby_targets_ruby18? ( test? ( virtual/ruby-test-unit[ruby_targets_ruby18] ) ) test? ( virtual/libiconv dev-libs/libxml2 ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) )
+ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] )
+0
+mirror://rubygems/mkrf-0.2.3.gem
+
+http://mkrf.rubyforge.org/
+MIT
+mkrf is a library for generating Rakefiles, primarily intended for building C extentions for Ruby.
+~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
+elibc_FreeBSD ruby_targets_ruby18 doc doc test test
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/narray-0.6.0.1 b/metadata/cache/dev-ruby/narray-0.6.0.1
index 6c76d6b0aada..9b4fc633471f 100644
--- a/metadata/cache/dev-ruby/narray-0.6.0.1
+++ b/metadata/cache/dev-ruby/narray-0.6.0.1
@@ -1,5 +1,5 @@
-ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
 0
 mirror://rubyforge/narray/narray-0.6.0.1.tar.gz
 
@@ -8,8 +8,8 @@ Ruby
 Numerical N-dimensional Array class
 amd64 hppa ~mips ~ppc ~ppc64 x86
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 test
-|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 )
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test
+|| ( ruby_targets_ruby18 ruby_targets_ree18 )
 
 
 4
diff --git a/metadata/cache/dev-ruby/narray-0.6.0.1-r1 b/metadata/cache/dev-ruby/narray-0.6.0.1-r1
new file mode 100644
index 000000000000..ff165ca88b2a
--- /dev/null
+++ b/metadata/cache/dev-ruby/narray-0.6.0.1-r1
@@ -0,0 +1,22 @@
+ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+0
+mirror://rubyforge/narray/narray-0.6.0.1.tar.gz
+
+http://www.ir.isas.ac.jp/~masa/ruby/index-e.html
+Ruby
+Numerical N-dimensional Array class
+~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 test
+|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 )
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/net-ssh-2.0.23 b/metadata/cache/dev-ruby/net-ssh-2.0.23
index a2a32350a300..780bf2a4a150 100644
--- a/metadata/cache/dev-ruby/net-ssh-2.0.23
+++ b/metadata/cache/dev-ruby/net-ssh-2.0.23
@@ -1,5 +1,5 @@
-ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) )
+ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] )
 2
 mirror://rubygems/net-ssh-2.0.23.gem
 
@@ -8,7 +8,7 @@ GPL-2
 Non-interactive SSH processing in pure Ruby
 amd64 ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-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_ruby19 doc doc test
+elibc_FreeBSD ruby_targets_ruby18 doc doc test
 
 
 
diff --git a/metadata/cache/dev-ruby/pg-0.11.0 b/metadata/cache/dev-ruby/pg-0.11.0
index 931f58080351..ca02d69c3943 100644
--- a/metadata/cache/dev-ruby/pg-0.11.0
+++ b/metadata/cache/dev-ruby/pg-0.11.0
@@ -1,5 +1,5 @@
-dev-db/postgresql-base test? ( dev-db/postgresql-server ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake-compiler[ruby_targets_ruby18] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ruby18] dev-ruby/rdoc[ruby_targets_ruby18] ) ) test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake-compiler[ruby_targets_ree18] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ree18] dev-ruby/rdoc[ruby_targets_ree18] ) ) test? ( dev-ruby/rspec:2[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake-compiler[ruby_targets_ruby19] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ruby19] dev-ruby/rdoc[ruby_targets_ruby19] ) ) test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-dev-db/postgresql-base ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+dev-db/postgresql-base test? ( dev-db/postgresql-server ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake-compiler[ruby_targets_ruby18] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ruby18] dev-ruby/rdoc[ruby_targets_ruby18] ) ) test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake-compiler[ruby_targets_ree18] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ree18] dev-ruby/rdoc[ruby_targets_ree18] ) ) test? ( dev-ruby/rspec:2[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+dev-db/postgresql-base ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
 0
 mirror://rubygems/pg-0.11.0.gem
 
@@ -8,7 +8,7 @@ http://bitbucket.org/ged/ruby-pg/
 Ruby extension library providing an API to PostgreSQL
 amd64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 doc doc test test
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 doc doc test test
 
 
 
diff --git a/metadata/cache/dev-ruby/rspec-1.3.1 b/metadata/cache/dev-ruby/rspec-1.3.1
index 0f73b3e7e87e..e61e0b08061b 100644
--- a/metadata/cache/dev-ruby/rspec-1.3.1
+++ b/metadata/cache/dev-ruby/rspec-1.3.1
@@ -1,5 +1,5 @@
-test? ( ruby_targets_ruby18? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ree18] ) ruby_targets_ruby19? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( doc? ( >=dev-ruby/hoe-2.0.0[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( >=dev-ruby/hoe-2.0.0[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( doc? ( >=dev-ruby/hoe-2.0.0[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( >=dev-ruby/hoe-2.0.0[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/hoe-2.0.0[ruby_targets_ruby18] dev-ruby/zentest[ruby_targets_ruby18] >=dev-ruby/syntax-1.0[ruby_targets_ruby18] >=dev-ruby/fakefs-0.2.1[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/hoe-2.0.0[ruby_targets_ree18] dev-ruby/zentest[ruby_targets_ree18] >=dev-ruby/syntax-1.0[ruby_targets_ree18] >=dev-ruby/fakefs-0.2.1[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/hoe-2.0.0[ruby_targets_ruby19] dev-ruby/zentest[ruby_targets_ruby19] >=dev-ruby/syntax-1.0[ruby_targets_ruby19] >=dev-ruby/fakefs-0.2.1[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/heckle-1.4.3[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/heckle-1.4.3[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) 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_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-!<dev-ruby/rspec-rails-1.3.1 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+test? ( ruby_targets_ruby18? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ree18] ) ruby_targets_jruby? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( doc? ( >=dev-ruby/hoe-2.0.0[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( >=dev-ruby/hoe-2.0.0[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( >=dev-ruby/hoe-2.0.0[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/hoe-2.0.0[ruby_targets_ruby18] dev-ruby/zentest[ruby_targets_ruby18] >=dev-ruby/syntax-1.0[ruby_targets_ruby18] >=dev-ruby/fakefs-0.2.1[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/hoe-2.0.0[ruby_targets_ree18] dev-ruby/zentest[ruby_targets_ree18] >=dev-ruby/syntax-1.0[ruby_targets_ree18] >=dev-ruby/fakefs-0.2.1[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/heckle-1.4.3[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/heckle-1.4.3[ruby_targets_ree18] ) ) 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] ) )
+!<dev-ruby/rspec-rails-1.3.1 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
 mirror://rubygems/rspec-1.3.1.gem
 
@@ -8,7 +8,7 @@ MIT
 A Behaviour Driven Development (BDD) framework for Ruby
 amd64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc doc test test
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby doc doc test test
 
 
 
diff --git a/metadata/cache/dev-ruby/rspec-1.3.1-r1 b/metadata/cache/dev-ruby/rspec-1.3.1-r1
index 9e84344554f3..806d780d1377 100644
--- a/metadata/cache/dev-ruby/rspec-1.3.1-r1
+++ b/metadata/cache/dev-ruby/rspec-1.3.1-r1
@@ -1,5 +1,5 @@
-test? ( ruby_targets_ruby18? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ree18] ) ruby_targets_ruby19? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( doc? ( >=dev-ruby/hoe-2.0.0[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( >=dev-ruby/hoe-2.0.0[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( doc? ( >=dev-ruby/hoe-2.0.0[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( >=dev-ruby/hoe-2.0.0[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/hoe-2.0.0[ruby_targets_ruby18] dev-ruby/zentest[ruby_targets_ruby18] >=dev-ruby/syntax-1.0[ruby_targets_ruby18] >=dev-ruby/fakefs-0.2.1[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/hoe-2.0.0[ruby_targets_ree18] dev-ruby/zentest[ruby_targets_ree18] >=dev-ruby/syntax-1.0[ruby_targets_ree18] >=dev-ruby/fakefs-0.2.1[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/hoe-2.0.0[ruby_targets_ruby19] dev-ruby/zentest[ruby_targets_ruby19] >=dev-ruby/syntax-1.0[ruby_targets_ruby19] >=dev-ruby/fakefs-0.2.1[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/heckle-1.4.3[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/heckle-1.4.3[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) 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_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-!<dev-ruby/rspec-rails-1.3.1 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+test? ( ruby_targets_ruby18? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ree18] ) ruby_targets_jruby? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( doc? ( >=dev-ruby/hoe-2.0.0[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( >=dev-ruby/hoe-2.0.0[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( >=dev-ruby/hoe-2.0.0[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/hoe-2.0.0[ruby_targets_ruby18] dev-ruby/zentest[ruby_targets_ruby18] >=dev-ruby/syntax-1.0[ruby_targets_ruby18] >=dev-ruby/fakefs-0.2.1[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/hoe-2.0.0[ruby_targets_ree18] dev-ruby/zentest[ruby_targets_ree18] >=dev-ruby/syntax-1.0[ruby_targets_ree18] >=dev-ruby/fakefs-0.2.1[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/heckle-1.4.3[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/heckle-1.4.3[ruby_targets_ree18] ) ) 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] ) )
+!<dev-ruby/rspec-rails-1.3.1 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
 mirror://rubygems/rspec-1.3.1.gem
 
@@ -8,7 +8,7 @@ MIT
 A Behaviour Driven Development (BDD) framework for Ruby
 amd64 hppa ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc doc test test
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby doc doc test test
 
 
 
diff --git a/metadata/cache/dev-ruby/rspec-2.6.0 b/metadata/cache/dev-ruby/rspec-2.6.0
index fab0edc4c21c..04b5cde9f57b 100644
--- a/metadata/cache/dev-ruby/rspec-2.6.0
+++ b/metadata/cache/dev-ruby/rspec-2.6.0
@@ -1,5 +1,5 @@
-test? ( ruby_targets_ruby18? ( =dev-ruby/rspec-core-2.6*[ruby_targets_ruby18] =dev-ruby/rspec-expectations-2.6*[ruby_targets_ruby18] =dev-ruby/rspec-mocks-2.6*[ruby_targets_ruby18] ) ruby_targets_ruby19? ( =dev-ruby/rspec-core-2.6*[ruby_targets_ruby19] =dev-ruby/rspec-expectations-2.6*[ruby_targets_ruby19] =dev-ruby/rspec-mocks-2.6*[ruby_targets_ruby19] ) ruby_targets_ree18? ( =dev-ruby/rspec-core-2.6*[ruby_targets_ree18] =dev-ruby/rspec-expectations-2.6*[ruby_targets_ree18] =dev-ruby/rspec-mocks-2.6*[ruby_targets_ree18] ) ruby_targets_jruby? ( =dev-ruby/rspec-core-2.6*[ruby_targets_jruby] =dev-ruby/rspec-expectations-2.6*[ruby_targets_jruby] =dev-ruby/rspec-mocks-2.6*[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-ruby_targets_ruby18? ( =dev-ruby/rspec-core-2.6*[ruby_targets_ruby18] =dev-ruby/rspec-expectations-2.6*[ruby_targets_ruby18] =dev-ruby/rspec-mocks-2.6*[ruby_targets_ruby18] ) ruby_targets_ruby19? ( =dev-ruby/rspec-core-2.6*[ruby_targets_ruby19] =dev-ruby/rspec-expectations-2.6*[ruby_targets_ruby19] =dev-ruby/rspec-mocks-2.6*[ruby_targets_ruby19] ) ruby_targets_ree18? ( =dev-ruby/rspec-core-2.6*[ruby_targets_ree18] =dev-ruby/rspec-expectations-2.6*[ruby_targets_ree18] =dev-ruby/rspec-mocks-2.6*[ruby_targets_ree18] ) ruby_targets_jruby? ( =dev-ruby/rspec-core-2.6*[ruby_targets_jruby] =dev-ruby/rspec-expectations-2.6*[ruby_targets_jruby] =dev-ruby/rspec-mocks-2.6*[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+test? ( ruby_targets_ruby18? ( =dev-ruby/rspec-core-2.6*[ruby_targets_ruby18] =dev-ruby/rspec-expectations-2.6*[ruby_targets_ruby18] =dev-ruby/rspec-mocks-2.6*[ruby_targets_ruby18] ) ruby_targets_ree18? ( =dev-ruby/rspec-core-2.6*[ruby_targets_ree18] =dev-ruby/rspec-expectations-2.6*[ruby_targets_ree18] =dev-ruby/rspec-mocks-2.6*[ruby_targets_ree18] ) ruby_targets_jruby? ( =dev-ruby/rspec-core-2.6*[ruby_targets_jruby] =dev-ruby/rspec-expectations-2.6*[ruby_targets_jruby] =dev-ruby/rspec-mocks-2.6*[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] ) 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? ( =dev-ruby/rspec-core-2.6*[ruby_targets_ruby18] =dev-ruby/rspec-expectations-2.6*[ruby_targets_ruby18] =dev-ruby/rspec-mocks-2.6*[ruby_targets_ruby18] ) ruby_targets_ree18? ( =dev-ruby/rspec-core-2.6*[ruby_targets_ree18] =dev-ruby/rspec-expectations-2.6*[ruby_targets_ree18] =dev-ruby/rspec-mocks-2.6*[ruby_targets_ree18] ) ruby_targets_jruby? ( =dev-ruby/rspec-core-2.6*[ruby_targets_jruby] =dev-ruby/rspec-expectations-2.6*[ruby_targets_jruby] =dev-ruby/rspec-mocks-2.6*[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] )
 2
 mirror://rubygems/rspec-2.6.0.gem
 
@@ -8,7 +8,7 @@ MIT
 A Behaviour Driven Development (BDD) framework for Ruby
 amd64 hppa ia64 ppc ~ppc64 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
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby test
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby test
 
 
 
diff --git a/metadata/cache/dev-ruby/rspec-2.6.0-r1 b/metadata/cache/dev-ruby/rspec-2.6.0-r1
new file mode 100644
index 000000000000..46c55956ec08
--- /dev/null
+++ b/metadata/cache/dev-ruby/rspec-2.6.0-r1
@@ -0,0 +1,22 @@
+test? ( ruby_targets_ruby18? ( =dev-ruby/rspec-core-2.6*[ruby_targets_ruby18] =dev-ruby/rspec-expectations-2.6*[ruby_targets_ruby18] =dev-ruby/rspec-mocks-2.6*[ruby_targets_ruby18] ) ruby_targets_ruby19? ( =dev-ruby/rspec-core-2.6*[ruby_targets_ruby19] =dev-ruby/rspec-expectations-2.6*[ruby_targets_ruby19] =dev-ruby/rspec-mocks-2.6*[ruby_targets_ruby19] ) ruby_targets_ree18? ( =dev-ruby/rspec-core-2.6*[ruby_targets_ree18] =dev-ruby/rspec-expectations-2.6*[ruby_targets_ree18] =dev-ruby/rspec-mocks-2.6*[ruby_targets_ree18] ) ruby_targets_jruby? ( =dev-ruby/rspec-core-2.6*[ruby_targets_jruby] =dev-ruby/rspec-expectations-2.6*[ruby_targets_jruby] =dev-ruby/rspec-mocks-2.6*[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+ruby_targets_ruby18? ( =dev-ruby/rspec-core-2.6*[ruby_targets_ruby18] =dev-ruby/rspec-expectations-2.6*[ruby_targets_ruby18] =dev-ruby/rspec-mocks-2.6*[ruby_targets_ruby18] ) ruby_targets_ruby19? ( =dev-ruby/rspec-core-2.6*[ruby_targets_ruby19] =dev-ruby/rspec-expectations-2.6*[ruby_targets_ruby19] =dev-ruby/rspec-mocks-2.6*[ruby_targets_ruby19] ) ruby_targets_ree18? ( =dev-ruby/rspec-core-2.6*[ruby_targets_ree18] =dev-ruby/rspec-expectations-2.6*[ruby_targets_ree18] =dev-ruby/rspec-mocks-2.6*[ruby_targets_ree18] ) ruby_targets_jruby? ( =dev-ruby/rspec-core-2.6*[ruby_targets_jruby] =dev-ruby/rspec-expectations-2.6*[ruby_targets_jruby] =dev-ruby/rspec-mocks-2.6*[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+2
+mirror://rubygems/rspec-2.6.0.gem
+
+http://rspec.rubyforge.org/
+MIT
+A Behaviour Driven Development (BDD) framework for Ruby
+~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~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
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby test
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/rspec-core-2.6.4 b/metadata/cache/dev-ruby/rspec-core-2.6.4
index 8fe3fa786d07..3c0b6c3af936 100644
--- a/metadata/cache/dev-ruby/rspec-core-2.6.4
+++ b/metadata/cache/dev-ruby/rspec-core-2.6.4
@@ -1,5 +1,5 @@
-ruby_targets_ruby18? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby18] dev-ruby/syntax[ruby_targets_ruby18] >=dev-ruby/zentest-4.4.1[ruby_targets_ruby18] dev-ruby/rspec-expectations:2[ruby_targets_ruby18] dev-ruby/rspec-mocks:2[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/nokogiri[ruby_targets_ree18] dev-ruby/syntax[ruby_targets_ree18] >=dev-ruby/zentest-4.4.1[ruby_targets_ree18] dev-ruby/rspec-expectations:2[ruby_targets_ree18] dev-ruby/rspec-mocks:2[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby19] dev-ruby/syntax[ruby_targets_ruby19] >=dev-ruby/zentest-4.4.1[ruby_targets_ruby19] dev-ruby/rspec-expectations:2[ruby_targets_ruby19] dev-ruby/rspec-mocks:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/nokogiri[ruby_targets_jruby] dev-ruby/syntax[ruby_targets_jruby] >=dev-ruby/zentest-4.4.1[ruby_targets_jruby] dev-ruby/rspec-expectations:2[ruby_targets_jruby] dev-ruby/rspec-mocks:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) 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_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-!<dev-ruby/rspec-1.3.1-r1 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+ruby_targets_ruby18? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby18] dev-ruby/syntax[ruby_targets_ruby18] >=dev-ruby/zentest-4.4.1[ruby_targets_ruby18] dev-ruby/rspec-expectations:2[ruby_targets_ruby18] dev-ruby/rspec-mocks:2[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/nokogiri[ruby_targets_ree18] dev-ruby/syntax[ruby_targets_ree18] >=dev-ruby/zentest-4.4.1[ruby_targets_ree18] dev-ruby/rspec-expectations:2[ruby_targets_ree18] dev-ruby/rspec-mocks:2[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/nokogiri[ruby_targets_jruby] dev-ruby/syntax[ruby_targets_jruby] >=dev-ruby/zentest-4.4.1[ruby_targets_jruby] dev-ruby/rspec-expectations:2[ruby_targets_jruby] dev-ruby/rspec-mocks:2[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] ) )
+!<dev-ruby/rspec-1.3.1-r1 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] )
 2
 mirror://rubygems/rspec-core-2.6.4.gem
 
@@ -8,7 +8,7 @@ MIT
 A Behaviour Driven Development (BDD) framework for Ruby
 amd64 hppa ia64 ppc ~ppc64 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_ruby19 ruby_targets_jruby doc test test
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby doc test test
 
 
 
diff --git a/metadata/cache/dev-ruby/rspec-core-2.6.4-r1 b/metadata/cache/dev-ruby/rspec-core-2.6.4-r1
new file mode 100644
index 000000000000..e129c10777a3
--- /dev/null
+++ b/metadata/cache/dev-ruby/rspec-core-2.6.4-r1
@@ -0,0 +1,22 @@
+ruby_targets_ruby18? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby18] dev-ruby/syntax[ruby_targets_ruby18] >=dev-ruby/zentest-4.4.1[ruby_targets_ruby18] dev-ruby/rspec-expectations:2[ruby_targets_ruby18] dev-ruby/rspec-mocks:2[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/nokogiri[ruby_targets_ree18] dev-ruby/syntax[ruby_targets_ree18] >=dev-ruby/zentest-4.4.1[ruby_targets_ree18] dev-ruby/rspec-expectations:2[ruby_targets_ree18] dev-ruby/rspec-mocks:2[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby19] dev-ruby/syntax[ruby_targets_ruby19] >=dev-ruby/zentest-4.4.1[ruby_targets_ruby19] dev-ruby/rspec-expectations:2[ruby_targets_ruby19] dev-ruby/rspec-mocks:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/nokogiri[ruby_targets_jruby] dev-ruby/syntax[ruby_targets_jruby] >=dev-ruby/zentest-4.4.1[ruby_targets_jruby] dev-ruby/rspec-expectations:2[ruby_targets_jruby] dev-ruby/rspec-mocks:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) 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_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+!<dev-ruby/rspec-1.3.1-r1 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+2
+mirror://rubygems/rspec-core-2.6.4.gem
+
+http://rspec.rubyforge.org/
+MIT
+A Behaviour Driven Development (BDD) framework for Ruby
+~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~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_ruby19 ruby_targets_jruby doc test test
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/rspec-expectations-2.6.0 b/metadata/cache/dev-ruby/rspec-expectations-2.6.0
index 38d6a27f73f7..44eb34fb73a1 100644
--- a/metadata/cache/dev-ruby/rspec-expectations-2.6.0
+++ b/metadata/cache/dev-ruby/rspec-expectations-2.6.0
@@ -1,5 +1,5 @@
-test? ( ruby_targets_ruby18? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ree18] ) ruby_targets_ruby19? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/rspec-core-2.4.0:2[ruby_targets_ruby18] dev-ruby/rspec-mocks:2[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/rspec-core-2.4.0:2[ruby_targets_ree18] dev-ruby/rspec-mocks:2[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/rspec-core-2.4.0:2[ruby_targets_ruby19] dev-ruby/rspec-mocks:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/rspec-core-2.4.0:2[ruby_targets_jruby] dev-ruby/rspec-mocks:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( doc? ( dev-ruby/rspec-core:2[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rspec-core:2[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rspec-core:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rspec-core:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) 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_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-ruby_targets_ruby18? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ree18] ) ruby_targets_ruby19? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+test? ( ruby_targets_ruby18? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ree18] ) ruby_targets_jruby? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/rspec-core-2.4.0:2[ruby_targets_ruby18] dev-ruby/rspec-mocks:2[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/rspec-core-2.4.0:2[ruby_targets_ree18] dev-ruby/rspec-mocks:2[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/rspec-core-2.4.0:2[ruby_targets_jruby] dev-ruby/rspec-mocks:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( doc? ( dev-ruby/rspec-core:2[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rspec-core:2[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rspec-core:2[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? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ree18] ) ruby_targets_jruby? ( >=dev-ruby/diff-lcs-1.1.2[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] )
 2
 mirror://rubygems/rspec-expectations-2.6.0.gem
 
@@ -8,7 +8,7 @@ MIT
 A Behaviour Driven Development (BDD) framework for Ruby
 amd64 hppa ia64 ppc ~ppc64 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
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc test test
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby doc test test
 
 
 
diff --git a/metadata/cache/dev-ruby/rspec-expectations-2.6.0-r1 b/metadata/cache/dev-ruby/rspec-expectations-2.6.0-r1
new file mode 100644
index 000000000000..cd372be37e8e
--- /dev/null
+++ b/metadata/cache/dev-ruby/rspec-expectations-2.6.0-r1
@@ -0,0 +1,22 @@
+test? ( ruby_targets_ruby18? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ree18] ) ruby_targets_ruby19? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/rspec-core-2.4.0:2[ruby_targets_ruby18] dev-ruby/rspec-mocks:2[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/rspec-core-2.4.0:2[ruby_targets_ree18] dev-ruby/rspec-mocks:2[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/rspec-core-2.4.0:2[ruby_targets_ruby19] dev-ruby/rspec-mocks:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/rspec-core-2.4.0:2[ruby_targets_jruby] dev-ruby/rspec-mocks:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( doc? ( dev-ruby/rspec-core:2[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rspec-core:2[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rspec-core:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rspec-core:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) 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_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+ruby_targets_ruby18? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ree18] ) ruby_targets_ruby19? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+2
+mirror://rubygems/rspec-expectations-2.6.0.gem
+
+http://rspec.rubyforge.org/
+MIT
+A Behaviour Driven Development (BDD) framework for Ruby
+~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~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
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc test test
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/rspec-mocks-2.6.0 b/metadata/cache/dev-ruby/rspec-mocks-2.6.0
index c3fabc9f6430..03cb93b57726 100644
--- a/metadata/cache/dev-ruby/rspec-mocks-2.6.0
+++ b/metadata/cache/dev-ruby/rspec-mocks-2.6.0
@@ -1,5 +1,5 @@
-ruby_targets_ruby18? ( test? ( >=dev-ruby/rspec-core-2.6.0:2[ruby_targets_ruby18] dev-ruby/rspec-expectations:2[ruby_targets_ruby18] ) doc? ( dev-ruby/rspec-core:2[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/rspec-core-2.6.0:2[ruby_targets_ree18] dev-ruby/rspec-expectations:2[ruby_targets_ree18] ) doc? ( dev-ruby/rspec-core:2[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/rspec-core-2.6.0:2[ruby_targets_ruby19] dev-ruby/rspec-expectations:2[ruby_targets_ruby19] ) doc? ( dev-ruby/rspec-core:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/rspec-core-2.6.0:2[ruby_targets_jruby] dev-ruby/rspec-expectations:2[ruby_targets_jruby] ) doc? ( dev-ruby/rspec-core:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) 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_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+ruby_targets_ruby18? ( test? ( >=dev-ruby/rspec-core-2.6.0:2[ruby_targets_ruby18] dev-ruby/rspec-expectations:2[ruby_targets_ruby18] ) doc? ( dev-ruby/rspec-core:2[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/rspec-core-2.6.0:2[ruby_targets_ree18] dev-ruby/rspec-expectations:2[ruby_targets_ree18] ) doc? ( dev-ruby/rspec-core:2[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/rspec-core-2.6.0:2[ruby_targets_jruby] dev-ruby/rspec-expectations:2[ruby_targets_jruby] ) doc? ( dev-ruby/rspec-core:2[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? ( 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] )
 2
 mirror://rubygems/rspec-mocks-2.6.0.gem
 
@@ -8,7 +8,7 @@ MIT
 A Behaviour Driven Development (BDD) framework for Ruby
 amd64 hppa ia64 ppc ~ppc64 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_ruby19 ruby_targets_jruby doc test test
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby doc test test
 
 
 
diff --git a/metadata/cache/dev-ruby/rspec-mocks-2.6.0-r1 b/metadata/cache/dev-ruby/rspec-mocks-2.6.0-r1
new file mode 100644
index 000000000000..00f0c1085f8e
--- /dev/null
+++ b/metadata/cache/dev-ruby/rspec-mocks-2.6.0-r1
@@ -0,0 +1,22 @@
+ruby_targets_ruby18? ( test? ( >=dev-ruby/rspec-core-2.6.0:2[ruby_targets_ruby18] dev-ruby/rspec-expectations:2[ruby_targets_ruby18] ) doc? ( dev-ruby/rspec-core:2[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/rspec-core-2.6.0:2[ruby_targets_ree18] dev-ruby/rspec-expectations:2[ruby_targets_ree18] ) doc? ( dev-ruby/rspec-core:2[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/rspec-core-2.6.0:2[ruby_targets_ruby19] dev-ruby/rspec-expectations:2[ruby_targets_ruby19] ) doc? ( dev-ruby/rspec-core:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/rspec-core-2.6.0:2[ruby_targets_jruby] dev-ruby/rspec-expectations:2[ruby_targets_jruby] ) doc? ( dev-ruby/rspec-core:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) 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_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+2
+mirror://rubygems/rspec-mocks-2.6.0.gem
+
+http://rspec.rubyforge.org/
+MIT
+A Behaviour Driven Development (BDD) framework for Ruby
+~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~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_ruby19 ruby_targets_jruby doc test test
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/ruby-opengl-0.60.1-r1 b/metadata/cache/dev-ruby/ruby-opengl-0.60.1-r1
index a6405a4affaf..97250dede2d4 100644
--- a/metadata/cache/dev-ruby/ruby-opengl-0.60.1-r1
+++ b/metadata/cache/dev-ruby/ruby-opengl-0.60.1-r1
@@ -1,5 +1,5 @@
-virtual/opengl media-libs/freeglut test? ( ruby_targets_ruby18? ( >=dev-ruby/mkrf-0.2.3[ruby_targets_ruby18] >=dev-ruby/rake-0.7.3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/mkrf-0.2.3[ruby_targets_ruby19] >=dev-ruby/rake-0.7.3[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-virtual/opengl media-libs/freeglut ruby_targets_ruby18? ( >=dev-ruby/mkrf-0.2.3[ruby_targets_ruby18] >=dev-ruby/rake-0.7.3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/mkrf-0.2.3[ruby_targets_ruby19] >=dev-ruby/rake-0.7.3[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+virtual/opengl media-libs/freeglut test? ( ruby_targets_ruby18? ( >=dev-ruby/mkrf-0.2.3[ruby_targets_ruby18] >=dev-ruby/rake-0.7.3[ruby_targets_ruby18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) )
+virtual/opengl media-libs/freeglut ruby_targets_ruby18? ( >=dev-ruby/mkrf-0.2.3[ruby_targets_ruby18] >=dev-ruby/rake-0.7.3[ruby_targets_ruby18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] )
 0
 mirror://rubygems/ruby-opengl-0.60.1.gem
 
@@ -8,7 +8,7 @@ MIT
 OpenGL / GLUT bindings for ruby
 alpha amd64 ia64 ppc sparc x86
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test
+test elibc_FreeBSD ruby_targets_ruby18 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 e77afb547739..be0a1c2079c7 100644
--- a/metadata/cache/dev-ruby/sary-ruby-1.2.0-r2
+++ b/metadata/cache/dev-ruby/sary-ruby-1.2.0-r2
@@ -1,5 +1,5 @@
->=app-text/sary-1.2.0 dev-util/pkgconfig ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
->=app-text/sary-1.2.0 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+>=app-text/sary-1.2.0 dev-util/pkgconfig ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 )
+>=app-text/sary-1.2.0 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 )
 0
 http://sary.sourceforge.net/sary-ruby-1.2.0.tar.gz
 
@@ -8,7 +8,7 @@ LGPL-2.1
 Ruby Binding of Sary
 ~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 ruby_targets_ruby19
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18
 
 
 
diff --git a/metadata/cache/dev-ruby/sary-ruby-1.2.0-r3 b/metadata/cache/dev-ruby/sary-ruby-1.2.0-r3
new file mode 100644
index 000000000000..e1893dd89d6e
--- /dev/null
+++ b/metadata/cache/dev-ruby/sary-ruby-1.2.0-r3
@@ -0,0 +1,22 @@
+>=app-text/sary-1.2.0 dev-util/pkgconfig ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+>=app-text/sary-1.2.0 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+0
+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
+eutils java-utils-2 multilib portability ruby-ng toolchain-funcs user versionator
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/tmail-1.2.7.1-r2 b/metadata/cache/dev-ruby/tmail-1.2.7.1-r2
index 251074d71d0e..880688900590 100644
--- a/metadata/cache/dev-ruby/tmail-1.2.7.1-r2
+++ b/metadata/cache/dev-ruby/tmail-1.2.7.1-r2
@@ -1,5 +1,5 @@
-ruby_targets_ruby18? ( dev-ruby/racc[ruby_targets_ruby18] test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( dev-ruby/racc[ruby_targets_ree18] test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( dev-ruby/racc[ruby_targets_ruby19] test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( dev-ruby/racc[ruby_targets_jruby] test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) 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_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+ruby_targets_ruby18? ( dev-ruby/racc[ruby_targets_ruby18] test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( dev-ruby/racc[ruby_targets_ree18] test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] ) ) ruby_targets_jruby? ( dev-ruby/racc[ruby_targets_jruby] test? ( >=dev-ruby/mocha-0.9.5[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? ( 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
 mirror://rubygems/tmail-1.2.7.1.gem
 test
@@ -8,7 +8,7 @@ MIT
 An email handling library
 amd64 ia64 ppc ppc64 sparc x86 ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-debug elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc doc test test
+debug elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby doc doc test test
 
 
 
diff --git a/metadata/cache/dev-ruby/tmail-1.2.7.1-r3 b/metadata/cache/dev-ruby/tmail-1.2.7.1-r3
new file mode 100644
index 000000000000..0b0ad94107d7
--- /dev/null
+++ b/metadata/cache/dev-ruby/tmail-1.2.7.1-r3
@@ -0,0 +1,22 @@
+ruby_targets_ruby18? ( dev-ruby/racc[ruby_targets_ruby18] test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( dev-ruby/racc[ruby_targets_ree18] test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( dev-ruby/racc[ruby_targets_ruby19] test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( dev-ruby/racc[ruby_targets_jruby] test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) 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_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+0
+mirror://rubygems/tmail-1.2.7.1.gem
+test
+http://rubyforge.org/projects/tmail/
+MIT
+An email handling library
+~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
+debug elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc doc test test
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/tzinfo-0.3.31 b/metadata/cache/dev-ruby/tzinfo-0.3.31
index 42718bb9ad67..4938cbdbcdfa 100644
--- a/metadata/cache/dev-ruby/tzinfo-0.3.31
+++ b/metadata/cache/dev-ruby/tzinfo-0.3.31
@@ -1,5 +1,5 @@
-ruby_targets_ruby18? ( test? ( virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( virtual/ruby-test-unit[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( virtual/ruby-test-unit[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+ruby_targets_ruby18? ( test? ( virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( virtual/ruby-test-unit[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? ( 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? ( 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
 mirror://rubyforge/tzinfo/tzinfo-0.3.31.tar.gz
 
@@ -8,7 +8,7 @@ MIT
 Daylight-savings aware timezone library
 ~alpha amd64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~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_ruby19 ruby_targets_jruby doc test test
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby doc test test
 
 
 
diff --git a/metadata/cache/dev-ruby/tzinfo-0.3.30 b/metadata/cache/dev-ruby/tzinfo-0.3.31-r1
similarity index 55%
rename from metadata/cache/dev-ruby/tzinfo-0.3.30
rename to metadata/cache/dev-ruby/tzinfo-0.3.31-r1
index b411cc6df476..c462c116792b 100644
--- a/metadata/cache/dev-ruby/tzinfo-0.3.30
+++ b/metadata/cache/dev-ruby/tzinfo-0.3.31-r1
@@ -1,14 +1,14 @@
-ruby_targets_ruby18? ( test? ( virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( virtual/ruby-test-unit[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( virtual/ruby-test-unit[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) 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_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) 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_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+ruby_targets_ruby18? ( test? ( virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( virtual/ruby-test-unit[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( virtual/ruby-test-unit[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 0
-mirror://rubyforge/tzinfo/tzinfo-0.3.30.tar.gz
+mirror://rubyforge/tzinfo/tzinfo-0.3.31.tar.gz
 
 http://tzinfo.rubyforge.org/
 MIT
 Daylight-savings aware timezone library
 ~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~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_ruby19 ruby_targets_jruby doc doc test test
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc test test
 
 
 
diff --git a/metadata/cache/dev-tex/bibtexu-3.71_p20110705 b/metadata/cache/dev-tex/bibtexu-3.71_p20110705
index 8882ef48038c..7f4ec731fce0 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 84169e686eae..c03f33e03e4b 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 8f365ff50bd1..590693d1965d 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 77b8cf39e129..70d45ef087ea 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 634afc408f78..802452567dba 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 2f8a05f41a0b..bf505fee5d79 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 a038c7ad87e4..921bb0b70893 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 fae33245c236..1db3869a7514 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 5d75f228b6a1..e5a89cc7307a 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 5e795c6cdeb1..340388ea1bce 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 73480e98175d..38e25cfe247f 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 0fe4046312a7..acad2786e588 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 3678a41124c8..d0512ba4e816 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 81d8066c42ac..66e73b6ac55a 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 111ac8dae703..b42565ce9924 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 fb995714e0b8..8bbcdae4e4c9 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 39573624110e..ea6fd5d706e6 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 3b16b12fdfc4..4b17456f6820 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 682dea5af296..b5a276807f14 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 a62286c3ab12..b4e9cc2b77a6 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 84cbf8633663..ad9555d403e8 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 2f117ec2d9dc..d5cdfc029fcf 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 9e66d16f72ed..555a8a9d7d57 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 17a31aab99d6..8f3569c3c0ba 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 1bac877c17f4..a070d3f6b304 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 0cff0a17608b..e714be2d4883 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 15c40f038811..dfd521f5c8ac 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 cb98395c79c9..bb734638233a 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 16af0619b4bc..b635d58a0e1a 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 bc60b4a80c62..3d83c330dbdd 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 c07dfe07f662..2f87e63613c7 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 12d52382a05e..e91419487f12 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 5e5e2773dcb5..47d931f2398c 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 be3484906c0a..0b5537fbf650 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 c18e2a5b33e3..f8df4d315b42 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 d20021eb996b..9cb685d96cba 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 f9ebbc45c141..2306c8db0eea 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 d168b3821346..7ee8caed144a 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 a2ccd2c85fe9..41efcb28423c 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 9ad5aa791730..bbd32db5ffea 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 96130b109dcf..f1661e1518d9 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 829e691047d4..bd36bef36b73 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 31a321a9964c..5a168a8bd8f8 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 d6f3ed448c64..1dccc1ebaed8 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 1e8aa84688c1..d259ff1e0ee0 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 1885616ed21c..a95af355f978 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 a470d1e0ae71..b8c91af483ed 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 3f674871da5b..98ee8032dfb1 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 2b3a1da1e0e1..32bdae7dcda0 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 801e85f2e908..38bad4028369 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 1ac1130da196..5201b031efb9 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 b6caa7367247..b1fc7ccda5b6 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 f926375ad245..1486c01f5946 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 723618658ad4..0560cc7d88ed 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 fb6674990916..1beb1dfb2d25 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 2f11a0bafedb..8c86df1f961f 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 878bb6a9d615..ab774d762db0 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 4a5a819171a3..a9585ddeee31 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 814e1ccaaf20..d31ea449c542 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 a132e18d10c2..722ba9d8a20b 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 0845f0694abb..0ae439656a83 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 42d8e6860934..57cb8815f53c 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 254915226eea..d46b19abf97b 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 7408882ebeda..183b3e0b26a1 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 ea6844f30488..cc87e878f3bb 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 21b99b2cc7cc..b453ed83de23 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 57a50eeb19bd..4323b40836f7 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 c0cb476f6224..0ff9d0d9198e 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 fb20450eadb6..5a2463744775 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 415037a790ad..05a8bd7631eb 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 4c7113d66d9a..56dfbdd75bef 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 2ad4aa74f08a..1bd03b40eb52 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 20165edf5071..d01598189012 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 6ad6b34b1063..25887a7f48ad 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 61c3f4e65d31..de77ce3fbbb2 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 bb5b51284305..d8ca084ce312 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 dd0e48e93fff..54ece54c630c 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 92468ead8467..e9b75eed6beb 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 704cf8aa84d2..44e0f8f15be2 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 d7a8de939385..153e52bbf593 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 734a01284a0a..1bb742f67ae0 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 eada24528160..a8869d60ca18 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 ba61ec0d02ea..7db2636d5db6 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 16fdcee0f3de..a35a8a04ca05 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/debhelper-8.9.14 b/metadata/cache/dev-util/debhelper-8.9.14
new file mode 100644
index 000000000000..a68ca4e4aa94
--- /dev/null
+++ b/metadata/cache/dev-util/debhelper-8.9.14
@@ -0,0 +1,22 @@
+app-arch/dpkg dev-perl/TimeDate virtual/perl-Getopt-Long >=dev-lang/perl-5.10 nls? ( >=app-text/po4a-0.24 ) test? ( dev-perl/Test-Pod )
+app-arch/dpkg dev-perl/TimeDate virtual/perl-Getopt-Long >=dev-lang/perl-5.10
+0
+mirror://debian/pool/main/d/debhelper/debhelper_8.9.14.tar.gz
+
+http://packages.qa.debian.org/d/debhelper.html http://kitenet.net/~joey/code/debhelper.html
+GPL-2
+Collection of programs that can be used to automate common tasks in debian/rules
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86
+eutils multilib portability toolchain-funcs user
+nls linguas_de linguas_es linguas_fr test
+
+
+
+4
+
+compile install prepare
+
+
+
+
+
diff --git a/metadata/cache/gnome-extra/nautilus-tracker-tags-0.12.7 b/metadata/cache/gnome-extra/nautilus-tracker-tags-0.12.9
similarity index 62%
rename from metadata/cache/gnome-extra/nautilus-tracker-tags-0.12.7
rename to metadata/cache/gnome-extra/nautilus-tracker-tags-0.12.9
index 4164039ec263..95a3e6654b78 100644
--- a/metadata/cache/gnome-extra/nautilus-tracker-tags-0.12.7
+++ b/metadata/cache/gnome-extra/nautilus-tracker-tags-0.12.9
@@ -1,7 +1,7 @@
->=app-misc/tracker-0.12.7 >=dev-libs/glib-2.28:2 >=gnome-base/nautilus-2.90 x11-libs/gtk+:3 app-arch/xz-utils
->=app-misc/tracker-0.12.7 >=dev-libs/glib-2.28:2 >=gnome-base/nautilus-2.90 x11-libs/gtk+:3 !<app-misc/tracker-0.12.5-r1[nautilus]
+>=app-misc/tracker-0.12.9 >=dev-libs/glib-2.28:2 >=gnome-base/nautilus-2.90 x11-libs/gtk+:3 app-arch/xz-utils
+>=app-misc/tracker-0.12.9 >=dev-libs/glib-2.28:2 >=gnome-base/nautilus-2.90 x11-libs/gtk+:3 !<app-misc/tracker-0.12.5-r1[nautilus]
 0
-mirror://gnome/sources/tracker/0.12/tracker-0.12.7.tar.xz
+mirror://gnome/sources/tracker/0.12/tracker-0.12.9.tar.xz
 
 http://www.tracker-project.org/
 GPL-2
diff --git a/metadata/cache/mail-client/thunderbird-bin-3.1.10 b/metadata/cache/mail-client/thunderbird-bin-3.1.10
deleted file mode 100644
index e080eccc27f6..000000000000
--- a/metadata/cache/mail-client/thunderbird-bin-3.1.10
+++ /dev/null
@@ -1,22 +0,0 @@
-app-arch/unzip app-arch/unzip
-x11-libs/libXrender x11-libs/libXt x11-libs/libXmu x86? ( >=x11-libs/gtk+-2.2:2 net-misc/curl[nss] ) amd64? ( app-emulation/emul-linux-x86-baselibs app-emulation/emul-linux-x86-gtklibs app-emulation/emul-linux-x86-soundlibs )
-0
-http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/en-US/thunderbird-3.1.10.tar.bz2 mirror://gentoo/libnotify.so.1.bz2 linguas_af? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/af.xpi -> thunderbird-3.1.10-af.xpi ) linguas_ar? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/ar.xpi -> thunderbird-3.1.10-ar.xpi ) linguas_be? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/be.xpi -> thunderbird-3.1.10-be.xpi ) linguas_bg? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/bg.xpi -> thunderbird-3.1.10-bg.xpi ) linguas_bn_BD? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/bn-BD.xpi -> thunderbird-3.1.10-bn-BD.xpi ) linguas_bn? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/bn-BD.xpi -> thunderbird-3.1.10-bn-BD.xpi ) linguas_ca? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/ca.xpi -> thunderbird-3.1.10-ca.xpi ) linguas_cs? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/cs.xpi -> thunderbird-3.1.10-cs.xpi ) linguas_da? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/da.xpi -> thunderbird-3.1.10-da.xpi ) linguas_de? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/de.xpi -> thunderbird-3.1.10-de.xpi ) linguas_el? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/el.xpi -> thunderbird-3.1.10-el.xpi ) linguas_en_GB? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/en-GB.xpi -> thunderbird-3.1.10-en-GB.xpi ) linguas_es_AR? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/es-AR.xpi -> thunderbird-3.1.10-es-AR.xpi ) linguas_es_ES? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/es-ES.xpi -> thunderbird-3.1.10-es-ES.xpi ) linguas_es? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/es-ES.xpi -> thunderbird-3.1.10-es-ES.xpi ) linguas_et? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/et.xpi -> thunderbird-3.1.10-et.xpi ) linguas_eu? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/eu.xpi -> thunderbird-3.1.10-eu.xpi ) linguas_fi? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/fi.xpi -> thunderbird-3.1.10-fi.xpi ) linguas_fr? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/fr.xpi -> thunderbird-3.1.10-fr.xpi ) linguas_fy_NL? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/fy-NL.xpi -> thunderbird-3.1.10-fy-NL.xpi ) linguas_fy? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/fy-NL.xpi -> thunderbird-3.1.10-fy-NL.xpi ) linguas_ga_IE? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/ga-IE.xpi -> thunderbird-3.1.10-ga-IE.xpi ) linguas_ga? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/ga-IE.xpi -> thunderbird-3.1.10-ga-IE.xpi ) linguas_he? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/he.xpi -> thunderbird-3.1.10-he.xpi ) linguas_hu? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/hu.xpi -> thunderbird-3.1.10-hu.xpi ) linguas_id? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/id.xpi -> thunderbird-3.1.10-id.xpi ) linguas_is? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/is.xpi -> thunderbird-3.1.10-is.xpi ) linguas_it? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/it.xpi -> thunderbird-3.1.10-it.xpi ) linguas_ja? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/ja.xpi -> thunderbird-3.1.10-ja.xpi ) linguas_ko? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/ko.xpi -> thunderbird-3.1.10-ko.xpi ) linguas_lt? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/lt.xpi -> thunderbird-3.1.10-lt.xpi ) linguas_nb_NO? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/nb-NO.xpi -> thunderbird-3.1.10-nb-NO.xpi ) linguas_nb? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/nb-NO.xpi -> thunderbird-3.1.10-nb-NO.xpi ) linguas_nl? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/nl.xpi -> thunderbird-3.1.10-nl.xpi ) linguas_nn_NO? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/nn-NO.xpi -> thunderbird-3.1.10-nn-NO.xpi ) linguas_nn? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/nn-NO.xpi -> thunderbird-3.1.10-nn-NO.xpi ) linguas_pa_IN? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/pa-IN.xpi -> thunderbird-3.1.10-pa-IN.xpi ) linguas_pa? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/pa-IN.xpi -> thunderbird-3.1.10-pa-IN.xpi ) linguas_pl? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/pl.xpi -> thunderbird-3.1.10-pl.xpi ) linguas_pt_BR? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/pt-BR.xpi -> thunderbird-3.1.10-pt-BR.xpi ) linguas_pt_PT? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/pt-PT.xpi -> thunderbird-3.1.10-pt-PT.xpi ) linguas_pt? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/pt-PT.xpi -> thunderbird-3.1.10-pt-PT.xpi ) linguas_ro? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/ro.xpi -> thunderbird-3.1.10-ro.xpi ) linguas_ru? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/ru.xpi -> thunderbird-3.1.10-ru.xpi ) linguas_si? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/si.xpi -> thunderbird-3.1.10-si.xpi ) linguas_sk? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/sk.xpi -> thunderbird-3.1.10-sk.xpi ) linguas_sl? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/sl.xpi -> thunderbird-3.1.10-sl.xpi ) linguas_sq? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/sq.xpi -> thunderbird-3.1.10-sq.xpi ) linguas_sv_SE? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/sv-SE.xpi -> thunderbird-3.1.10-sv-SE.xpi ) linguas_sv? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/sv-SE.xpi -> thunderbird-3.1.10-sv-SE.xpi ) linguas_tr? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/tr.xpi -> thunderbird-3.1.10-tr.xpi ) linguas_uk? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/uk.xpi -> thunderbird-3.1.10-uk.xpi ) linguas_zh_CN? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/zh-CN.xpi -> thunderbird-3.1.10-zh-CN.xpi ) linguas_zh? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/zh-CN.xpi -> thunderbird-3.1.10-zh-CN.xpi ) linguas_zh_TW? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases//3.1.10/linux-i686/xpi/zh-TW.xpi -> thunderbird-3.1.10-zh-TW.xpi )
-strip
-http://www.mozilla.com/thunderbird
-|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-Thunderbird Mail Client
--* amd64 x86
-eutils mozextension multilib portability toolchain-funcs user
-linguas_af linguas_ar linguas_be linguas_bg linguas_bn_BD linguas_bn linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_GB linguas_en_US linguas_en linguas_es_AR linguas_es_ES linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_fy_NL linguas_fy linguas_ga_IE linguas_ga linguas_he linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ko linguas_lt linguas_nb_NO linguas_nb linguas_nl linguas_nn_NO linguas_nn linguas_pa_IN linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_pt linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_sq linguas_sv_SE linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh linguas_zh_TW
-
-
-
-2
-
-install postinst setup unpack
-
-
-
-
-
diff --git a/metadata/cache/mail-client/thunderbird-bin-6.0 b/metadata/cache/mail-client/thunderbird-bin-6.0
deleted file mode 100644
index 4d5cbbebb155..000000000000
--- a/metadata/cache/mail-client/thunderbird-bin-6.0
+++ /dev/null
@@ -1,22 +0,0 @@
-app-arch/unzip app-arch/unzip
-x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=x11-libs/gtk+-2.2:2 net-misc/curl[nss]
-0
-amd64? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-x86_64/en-US/thunderbird-6.0.tar.bz2 -> thunderbird-bin_x86_64-6.0.tar.bz2 ) x86? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/en-US/thunderbird-6.0.tar.bz2 -> thunderbird-bin_i686-6.0.tar.bz2 ) linguas_ar? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/ar.xpi -> thunderbird-6.0-ar.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/be.xpi -> thunderbird-6.0-be.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-6.0-bn-BD.xpi ) linguas_bn? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-6.0-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/br.xpi -> thunderbird-6.0-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/ca.xpi -> thunderbird-6.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/cs.xpi -> thunderbird-6.0-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/da.xpi -> thunderbird-6.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/de.xpi -> thunderbird-6.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/el.xpi -> thunderbird-6.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/en-GB.xpi -> thunderbird-6.0-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/es-AR.xpi -> thunderbird-6.0-es-AR.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/es-AR.xpi -> thunderbird-6.0-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/es-ES.xpi -> thunderbird-6.0-es-ES.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/es-ES.xpi -> thunderbird-6.0-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/et.xpi -> thunderbird-6.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/eu.xpi -> thunderbird-6.0-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/fi.xpi -> thunderbird-6.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/fr.xpi -> thunderbird-6.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-6.0-fy-NL.xpi ) linguas_fy? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-6.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-6.0-ga-IE.xpi ) linguas_ga? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-6.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/gd.xpi -> thunderbird-6.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/gl.xpi -> thunderbird-6.0-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/he.xpi -> thunderbird-6.0-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/hu.xpi -> thunderbird-6.0-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/id.xpi -> thunderbird-6.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/is.xpi -> thunderbird-6.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/it.xpi -> thunderbird-6.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/ja.xpi -> thunderbird-6.0-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/ko.xpi -> thunderbird-6.0-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/lt.xpi -> thunderbird-6.0-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-6.0-nb-NO.xpi ) linguas_nb? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-6.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/nl.xpi -> thunderbird-6.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-6.0-nn-NO.xpi ) linguas_nn? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-6.0-nn-NO.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/pl.xpi -> thunderbird-6.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-6.0-pt-BR.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-6.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-6.0-pt-PT.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-6.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/rm.xpi -> thunderbird-6.0-rm.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/ru.xpi -> thunderbird-6.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/si.xpi -> thunderbird-6.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/sk.xpi -> thunderbird-6.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/sl.xpi -> thunderbird-6.0-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/sq.xpi -> thunderbird-6.0-sq.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-6.0-sv-SE.xpi ) linguas_sv? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-6.0-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-6.0-ta-LK.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-6.0-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/tr.xpi -> thunderbird-6.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//6.0/linux-i686/xpi/uk.xpi -> thunderbird-6.0-uk.xpi )
-strip
-http://www.mozilla.com/thunderbird
-|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-Thunderbird Mail Client
--* ~amd64 ~x86
-eutils mozextension multilib portability toolchain-funcs user
-linguas_ar linguas_be linguas_bn_BD linguas_bn linguas_br linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_GB linguas_en_US linguas_es_AR linguas_es linguas_es_ES linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_fy_NL linguas_fy linguas_ga_IE linguas_ga linguas_gd linguas_gl linguas_he linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ko linguas_lt linguas_nb_NO linguas_nb linguas_nl linguas_nn_NO linguas_nn linguas_pl linguas_pt_BR linguas_pt linguas_pt_PT linguas_pt linguas_rm linguas_ru linguas_si linguas_sk linguas_sl linguas_sq linguas_sv_SE linguas_sv linguas_ta_LK linguas_ta linguas_tr linguas_uk
-
-
-
-3
-
-install postinst unpack
-
-
-
-
-
diff --git a/metadata/cache/mail-client/thunderbird-bin-9.0.1 b/metadata/cache/mail-client/thunderbird-bin-9.0.1
new file mode 100644
index 000000000000..299c61a03a35
--- /dev/null
+++ b/metadata/cache/mail-client/thunderbird-bin-9.0.1
@@ -0,0 +1,22 @@
+app-arch/unzip app-arch/unzip >=sys-apps/sed-4
+x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=x11-libs/gtk+-2.2:2 crashreporter? ( net-misc/curl )
+0
+amd64? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-x86_64/en-US/thunderbird-9.0.1.tar.bz2 -> thunderbird-bin_x86_64-9.0.1.tar.bz2 ) x86? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/en-US/thunderbird-9.0.1.tar.bz2 -> thunderbird-bin_i686-9.0.1.tar.bz2 ) linguas_ar? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/ar.xpi -> thunderbird-9.0.1-ar.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/be.xpi -> thunderbird-9.0.1-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/bg.xpi -> thunderbird-9.0.1-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/bn-BD.xpi -> thunderbird-9.0.1-bn-BD.xpi ) linguas_bn? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/bn-BD.xpi -> thunderbird-9.0.1-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/br.xpi -> thunderbird-9.0.1-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/ca.xpi -> thunderbird-9.0.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/cs.xpi -> thunderbird-9.0.1-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/da.xpi -> thunderbird-9.0.1-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/de.xpi -> thunderbird-9.0.1-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/el.xpi -> thunderbird-9.0.1-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/en-GB.xpi -> thunderbird-9.0.1-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/es-AR.xpi -> thunderbird-9.0.1-es-AR.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/es-AR.xpi -> thunderbird-9.0.1-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/es-ES.xpi -> thunderbird-9.0.1-es-ES.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/es-ES.xpi -> thunderbird-9.0.1-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/et.xpi -> thunderbird-9.0.1-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/eu.xpi -> thunderbird-9.0.1-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/fi.xpi -> thunderbird-9.0.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/fr.xpi -> thunderbird-9.0.1-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/fy-NL.xpi -> thunderbird-9.0.1-fy-NL.xpi ) linguas_fy? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/fy-NL.xpi -> thunderbird-9.0.1-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/ga-IE.xpi -> thunderbird-9.0.1-ga-IE.xpi ) linguas_ga? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/ga-IE.xpi -> thunderbird-9.0.1-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/gd.xpi -> thunderbird-9.0.1-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/gl.xpi -> thunderbird-9.0.1-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/he.xpi -> thunderbird-9.0.1-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/hu.xpi -> thunderbird-9.0.1-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/id.xpi -> thunderbird-9.0.1-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/is.xpi -> thunderbird-9.0.1-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/it.xpi -> thunderbird-9.0.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/ja.xpi -> thunderbird-9.0.1-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/ko.xpi -> thunderbird-9.0.1-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/lt.xpi -> thunderbird-9.0.1-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/nb-NO.xpi -> thunderbird-9.0.1-nb-NO.xpi ) linguas_nb? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/nb-NO.xpi -> thunderbird-9.0.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/nl.xpi -> thunderbird-9.0.1-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/nn-NO.xpi -> thunderbird-9.0.1-nn-NO.xpi ) linguas_nn? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/nn-NO.xpi -> thunderbird-9.0.1-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/pa-IN.xpi -> thunderbird-9.0.1-pa-IN.xpi ) linguas_pa? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/pa-IN.xpi -> thunderbird-9.0.1-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/pl.xpi -> thunderbird-9.0.1-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/pt-BR.xpi -> thunderbird-9.0.1-pt-BR.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/pt-BR.xpi -> thunderbird-9.0.1-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/pt-PT.xpi -> thunderbird-9.0.1-pt-PT.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/pt-PT.xpi -> thunderbird-9.0.1-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/rm.xpi -> thunderbird-9.0.1-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/ro.xpi -> thunderbird-9.0.1-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/ru.xpi -> thunderbird-9.0.1-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/si.xpi -> thunderbird-9.0.1-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/sk.xpi -> thunderbird-9.0.1-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/sl.xpi -> thunderbird-9.0.1-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/sq.xpi -> thunderbird-9.0.1-sq.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/sv-SE.xpi -> thunderbird-9.0.1-sv-SE.xpi ) linguas_sv? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/sv-SE.xpi -> thunderbird-9.0.1-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/ta-LK.xpi -> thunderbird-9.0.1-ta-LK.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/ta-LK.xpi -> thunderbird-9.0.1-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/tr.xpi -> thunderbird-9.0.1-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/uk.xpi -> thunderbird-9.0.1-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/vi.xpi -> thunderbird-9.0.1-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/zh-CN.xpi -> thunderbird-9.0.1-zh-CN.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/zh-CN.xpi -> thunderbird-9.0.1-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/zh-TW.xpi -> thunderbird-9.0.1-zh-TW.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//9.0.1/linux-i686/xpi/zh-TW.xpi -> thunderbird-9.0.1-zh-TW.xpi )
+strip
+http://www.mozilla.com/thunderbird
+|| ( MPL-1.1 GPL-2 LGPL-2.1 )
+Thunderbird Mail Client
+-* ~amd64 ~x86
+eutils fdo-mime gnome2-utils mozextension multilib pax-utils portability toolchain-funcs user
++crashreporter linguas_ar linguas_be linguas_bg linguas_bn_BD linguas_bn linguas_br linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_GB linguas_en_US linguas_es_AR linguas_es linguas_es_ES linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_fy_NL linguas_fy linguas_ga_IE linguas_ga linguas_gd linguas_gl linguas_he linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ko linguas_lt linguas_nb_NO linguas_nb linguas_nl linguas_nn_NO linguas_nn linguas_pa_IN linguas_pa linguas_pl linguas_pt_BR linguas_pt linguas_pt_PT linguas_pt linguas_rm linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_sq linguas_sv_SE linguas_sv linguas_ta_LK linguas_ta linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh linguas_zh_TW linguas_zh
+
+
+
+3
+
+install postinst postrm preinst unpack
+
+
+
+
+
diff --git a/metadata/cache/media-sound/amarok-2.4.3-r1 b/metadata/cache/media-sound/amarok-2.4.3-r1
new file mode 100644
index 000000000000..630fad00e0e2
--- /dev/null
+++ b/metadata/cache/media-sound/amarok-2.4.3-r1
@@ -0,0 +1,22 @@
+app-crypt/qca:2 >=app-misc/strigi-0.5.7 >=kde-base/kdelibs-4.4:4[aqua=,opengl?,semantic-desktop?] >=kde-base/kdebase-kioslaves-4.4:4[aqua=] >=media-libs/taglib-1.6.1[asf,mp4] >=media-libs/taglib-extras-1.0.1 sys-libs/zlib >=virtual/mysql-5.1[embedded?] x11-libs/qt-script >=x11-libs/qtscriptgenerator-0.1.0 cdda? ( >=kde-base/libkcddb-4.4:4[aqua=] >=kde-base/libkcompactdisc-4.4:4[aqua=] >=kde-base/kdemultimedia-kioslaves-4.4:4[aqua=] ) ipod? ( >=media-libs/libgpod-0.7.0[gtk] ) lastfm? ( >=media-libs/liblastfm-0.3.0 ) mp3tunes? ( dev-libs/glib:2 dev-libs/libxml2 dev-libs/openssl net-libs/loudmouth net-misc/curl x11-libs/qt-core[glib] ) mtp? ( >=media-libs/libmtp-1.0.0 ) opengl? ( virtual/opengl ) dev-util/automoc dev-util/pkgconfig >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+app-crypt/qca:2 >=app-misc/strigi-0.5.7 >=kde-base/kdelibs-4.4:4[aqua=,opengl?,semantic-desktop?] >=kde-base/kdebase-kioslaves-4.4:4[aqua=] >=media-libs/taglib-1.6.1[asf,mp4] >=media-libs/taglib-extras-1.0.1 sys-libs/zlib >=virtual/mysql-5.1[embedded?] x11-libs/qt-script >=x11-libs/qtscriptgenerator-0.1.0 cdda? ( >=kde-base/libkcddb-4.4:4[aqua=] >=kde-base/libkcompactdisc-4.4:4[aqua=] >=kde-base/kdemultimedia-kioslaves-4.4:4[aqua=] ) ipod? ( >=media-libs/libgpod-0.7.0[gtk] ) lastfm? ( >=media-libs/liblastfm-0.3.0 ) mp3tunes? ( dev-libs/glib:2 dev-libs/libxml2 dev-libs/openssl net-libs/loudmouth net-misc/curl x11-libs/qt-core[glib] ) mtp? ( >=media-libs/libmtp-1.0.0 ) opengl? ( virtual/opengl ) >=kde-base/phonon-kde-4.4:4[aqua=] !media-sound/amarok-utils
+4
+mirror://kde/stable/amarok/2.4.3/src/amarok-2.4.3.tar.bz2
+test
+http://amarok.kde.org/
+GPL-2
+Advanced audio player based on KDE framework.
+~amd64 ~ppc ~x86
+base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
+cdda daap debug +embedded ipod lastfm mp3tunes mtp opengl semantic-desktop +utils linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_it linguas_ja linguas_km linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_TW kdeenablefinal
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/media-sound/amarok-2.5.0-r1 b/metadata/cache/media-sound/amarok-2.5.0-r1
new file mode 100644
index 000000000000..bbe76ba91b2d
--- /dev/null
+++ b/metadata/cache/media-sound/amarok-2.5.0-r1
@@ -0,0 +1,22 @@
+app-crypt/qca:2 >=app-misc/strigi-0.5.7 >=kde-base/kdelibs-4.4:4[aqua=,opengl?,semantic-desktop?] >=kde-base/kdebase-kioslaves-4.4:4[aqua=] >=media-libs/taglib-1.6.1[asf,mp4] >=media-libs/taglib-extras-1.0.1 sys-libs/zlib >=virtual/mysql-5.1[embedded?] x11-libs/qt-script >=x11-libs/qtscriptgenerator-0.1.0 cdda? ( >=kde-base/libkcddb-4.4:4[aqua=] >=kde-base/libkcompactdisc-4.4:4[aqua=] >=kde-base/kdemultimedia-kioslaves-4.4:4[aqua=] ) ipod? ( >=media-libs/libgpod-0.7.0[gtk] ) lastfm? ( >=media-libs/liblastfm-0.3.0 ) mp3tunes? ( dev-libs/glib:2 dev-libs/libxml2 dev-libs/openssl net-libs/loudmouth net-misc/curl x11-libs/qt-core[glib] ) mtp? ( >=media-libs/libmtp-1.0.0 ) opengl? ( virtual/opengl ) dev-util/automoc dev-util/pkgconfig >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+app-crypt/qca:2 >=app-misc/strigi-0.5.7 >=kde-base/kdelibs-4.4:4[aqua=,opengl?,semantic-desktop?] >=kde-base/kdebase-kioslaves-4.4:4[aqua=] >=media-libs/taglib-1.6.1[asf,mp4] >=media-libs/taglib-extras-1.0.1 sys-libs/zlib >=virtual/mysql-5.1[embedded?] x11-libs/qt-script >=x11-libs/qtscriptgenerator-0.1.0 cdda? ( >=kde-base/libkcddb-4.4:4[aqua=] >=kde-base/libkcompactdisc-4.4:4[aqua=] >=kde-base/kdemultimedia-kioslaves-4.4:4[aqua=] ) ipod? ( >=media-libs/libgpod-0.7.0[gtk] ) lastfm? ( >=media-libs/liblastfm-0.3.0 ) mp3tunes? ( dev-libs/glib:2 dev-libs/libxml2 dev-libs/openssl net-libs/loudmouth net-misc/curl x11-libs/qt-core[glib] ) mtp? ( >=media-libs/libmtp-1.0.0 ) opengl? ( virtual/opengl ) >=kde-base/phonon-kde-4.4:4[aqua=] !media-sound/amarok-utils
+4
+mirror://kde/stable/amarok/2.5.0/src/amarok-2.5.0.tar.bz2
+test
+http://amarok.kde.org/
+GPL-2
+Advanced audio player based on KDE framework.
+~amd64 ~ppc ~x86
+base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
+cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop +utils linguas_af linguas_ar linguas_ast linguas_be linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_csb linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_ko linguas_ku linguas_lt linguas_lv linguas_mai linguas_ml linguas_ms linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_si linguas_sk linguas_sl linguas_sq linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@Latn linguas_sv linguas_tg linguas_th linguas_tr linguas_ug linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW kdeenablefinal
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/sci-biology/allpathslg-35725-r1 b/metadata/cache/sci-biology/allpathslg-40063
similarity index 75%
rename from metadata/cache/sci-biology/allpathslg-35725-r1
rename to metadata/cache/sci-biology/allpathslg-40063
index 35c6271c56f3..507740554431 100644
--- a/metadata/cache/sci-biology/allpathslg-35725-r1
+++ b/metadata/cache/sci-biology/allpathslg-40063
@@ -1,18 +1,18 @@
 dev-libs/boost >=sys-devel/gcc-4.3.3 sci-biology/vaal || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
 
 0
-ftp://ftp.broadinstitute.org/pub/crd/ALLPATHS/Release-LG/latest_source_code/allpathslg-35725.tar.gz
+ftp://ftp.broadinstitute.org/pub/crd/ALLPATHS/Release-LG/latest_source_code/allpathslg-40063.tar.gz
 
 http://www.broadinstitute.org/science/programs/genome-biology/crd
 as-is
 De novo assembly of whole-genome shotgun microreads
 ~amd64
-autotools eutils libtool multilib portability toolchain-funcs user
+autotools eutils flag-o-matic libtool multilib portability toolchain-funcs user
 
 
 
 
-2
+4
 
 install prepare
 
diff --git a/metadata/cache/sys-apps/portage-2.1.10.44 b/metadata/cache/sys-apps/portage-2.1.10.44
new file mode 100644
index 000000000000..23df300eef08
--- /dev/null
+++ b/metadata/cache/sys-apps/portage-2.1.10.44
@@ -0,0 +1,22 @@
+python3? ( =dev-lang/python-3* ) !python2? ( !python3? ( build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) !build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] >=dev-lang/python-3 ) ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 ) doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 ) >=app-admin/eselect-python-20091230
+python3? ( =dev-lang/python-3* ) !python2? ( !python3? ( build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) !build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] >=dev-lang/python-3 ) ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-3.2_p17 >=app-admin/eselect-1.2 ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0 >=app-admin/eselect-python-20091230
+0
+mirror://gentoo/portage-2.1.10.44.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.1.10.44.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 )
+
+http://www.gentoo.org/proj/en/portage/index.xml
+GPL-2
+Portage is the package management and distribution system for Gentoo
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+eutils multilib portability python toolchain-funcs user
+build doc epydoc +ipc linguas_pl python2 python3 selinux
+
+!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
+
+2
+
+compile install postinst postrm preinst prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/www-servers/nginx-1.1.11 b/metadata/cache/www-servers/nginx-1.1.11
deleted file mode 100644
index fb3871eea13d..000000000000
--- a/metadata/cache/www-servers/nginx-1.1.11
+++ /dev/null
@@ -1,22 +0,0 @@
-pcre? ( >=dev-libs/libpcre-4.2 ) ssl? ( dev-libs/openssl ) http-cache? ( userland_GNU? ( dev-libs/openssl ) ) nginx_modules_http_geo? ( dev-libs/geoip ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8 ) nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 ) nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) ) nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) ssl? ( dev-libs/openssl )
-pcre? ( >=dev-libs/libpcre-4.2 ) ssl? ( dev-libs/openssl ) http-cache? ( userland_GNU? ( dev-libs/openssl ) ) nginx_modules_http_geo? ( dev-libs/geoip ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8 ) nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 ) nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) ) nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )
-0
-http://nginx.org/download/nginx-1.1.11.tar.gz nginx_modules_http_upload_progress? ( http://github.com/masterzen/nginx-upload-progress-module/tarball/v0.8.3 -> ngx_upload_progress-0.8.3.tar.gz ) nginx_modules_http_headers_more? ( http://github.com/agentzh/headers-more-nginx-module/tarball/v0.15 -> ngx_http_headers_more-0.15.tar.gz ) nginx_modules_http_push? ( http://pushmodule.slact.net/downloads/nginx_http_push_module-0.692.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-1.5.tar.gz ) nginx_modules_http_upload? ( http://www.grid.net.ru/nginx/download/nginx_upload_module-2.2.0.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.6.tar.gz )
-
-http://nginx.org
-as-is BSD BSD-2 GPL-2 MIT
-Robust, small and high performance http and reverse proxy server
-~amd64 ~ppc ~x86 ~x86-fbsd
-base eutils flag-o-matic multilib perl-module portability ssl-cert toolchain-funcs user
-aio debug +http +http-cache ipv6 libatomic +pcre ssl vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_zone +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_ip_hash +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_upload_progress nginx_modules_http_headers_more nginx_modules_http_passenger nginx_modules_http_push nginx_modules_http_cache_purge nginx_modules_http_upload nginx_modules_http_slowfs_cache ssl
-
-vim-syntax? ( app-vim/nginx-syntax )
-
-4
-
-compile configure install postinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/www-servers/nginx-1.1.12 b/metadata/cache/www-servers/nginx-1.1.12-r1
similarity index 61%
rename from metadata/cache/www-servers/nginx-1.1.12
rename to metadata/cache/www-servers/nginx-1.1.12-r1
index 6f7d84734457..8a122ae3fd4b 100644
--- a/metadata/cache/www-servers/nginx-1.1.12
+++ b/metadata/cache/www-servers/nginx-1.1.12-r1
@@ -8,8 +8,8 @@ as-is BSD BSD-2 GPL-2 MIT
 Robust, small and high performance http and reverse proxy server
 ~amd64 ~ppc ~x86 ~x86-fbsd
 base eutils flag-o-matic multilib perl-module portability ssl-cert toolchain-funcs user
-aio debug +http +http-cache ipv6 libatomic +pcre ssl vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_zone +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_ip_hash +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_upload_progress nginx_modules_http_headers_more nginx_modules_http_passenger nginx_modules_http_push nginx_modules_http_cache_purge nginx_modules_http_upload nginx_modules_http_slowfs_cache ssl
-
+aio debug +http +http-cache ipv6 libatomic +pcre pcre-jit ssl vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_zone +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_ip_hash +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_upload_progress nginx_modules_http_headers_more nginx_modules_http_passenger nginx_modules_http_push nginx_modules_http_cache_purge nginx_modules_http_upload nginx_modules_http_slowfs_cache ssl
+pcre-jit? ( pcre )
 vim-syntax? ( app-vim/nginx-syntax )
 
 4
diff --git a/metadata/cache/x11-libs/gtk+-3.2.1 b/metadata/cache/x11-libs/gtk+-3.2.1
deleted file mode 100644
index ca4c2de8ae25..000000000000
--- a/metadata/cache/x11-libs/gtk+-3.2.1
+++ /dev/null
@@ -1,22 +0,0 @@
-!aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.3 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.10.0[X,glib,svg] >=x11-libs/gdk-pixbuf-2.23.5:2[X,introspection?] ) aqua? ( >=x11-libs/cairo-1.10.0[aqua,glib,svg] >=x11-libs/gdk-pixbuf-2.23.5:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.29.14 >=x11-libs/pango-1.29.0[introspection?] >=dev-libs/atk-2.1.5[introspection?] >=x11-libs/gtk+-2.24:2 media-libs/fontconfig x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9 ) cups? ( net-print/cups ) introspection? ( >=dev-libs/gobject-introspection-0.10.1 ) >=dev-util/pkgconfig-0.9 !aqua? ( x11-proto/xextproto x11-proto/xproto x11-proto/inputproto x11-proto/damageproto ) xinerama? ( x11-proto/xineramaproto ) >=dev-util/gtk-doc-am-1.11 doc? ( >=dev-util/gtk-doc-1.11 ~app-text/docbook-xml-dtd-4.1.2 ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-!aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.3 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.10.0[X,glib,svg] >=x11-libs/gdk-pixbuf-2.23.5:2[X,introspection?] ) aqua? ( >=x11-libs/cairo-1.10.0[aqua,glib,svg] >=x11-libs/gdk-pixbuf-2.23.5:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.29.14 >=x11-libs/pango-1.29.0[introspection?] >=dev-libs/atk-2.1.5[introspection?] >=x11-libs/gtk+-2.24:2 media-libs/fontconfig x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9 ) cups? ( net-print/cups ) introspection? ( >=dev-libs/gobject-introspection-0.10.1 ) !<gnome-base/gail-1000 packagekit? ( app-admin/packagekit-base )
-3
-mirror://gnome/sources/gtk+/3.2/gtk+-3.2.1.tar.xz
-
-http://www.gtk.org/
-LGPL-2
-Gimp ToolKit +
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-eutils flag-o-matic gnome.org gnome2-utils libtool multilib portability toolchain-funcs user versionator virtualx
-aqua colord cups debug doc examples +introspection packagekit test vim-syntax xinerama test
-
-vim-syntax? ( app-vim/gtk-syntax )
-
-4
-
-configure install postinst postrm preinst prepare test
-
-
-
-
-
diff --git a/metadata/cache/x11-libs/gtk+-3.2.2 b/metadata/cache/x11-libs/gtk+-3.2.3
similarity index 98%
rename from metadata/cache/x11-libs/gtk+-3.2.2
rename to metadata/cache/x11-libs/gtk+-3.2.3
index bdd0bae62ff4..eb93af2575bb 100644
--- a/metadata/cache/x11-libs/gtk+-3.2.2
+++ b/metadata/cache/x11-libs/gtk+-3.2.3
@@ -1,7 +1,7 @@
 !aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.3 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.10.0[X,glib,svg] >=x11-libs/gdk-pixbuf-2.23.5:2[X,introspection?] ) aqua? ( >=x11-libs/cairo-1.10.0[aqua,glib,svg] >=x11-libs/gdk-pixbuf-2.23.5:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.29.14 >=x11-libs/pango-1.29.0[introspection?] >=dev-libs/atk-2.1.5[introspection?] >=x11-libs/gtk+-2.24:2 media-libs/fontconfig x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9 ) cups? ( net-print/cups ) introspection? ( >=dev-libs/gobject-introspection-0.10.1 ) >=dev-util/pkgconfig-0.9 !aqua? ( x11-proto/xextproto x11-proto/xproto x11-proto/inputproto x11-proto/damageproto ) xinerama? ( x11-proto/xineramaproto ) >=dev-util/gtk-doc-am-1.11 doc? ( >=dev-util/gtk-doc-1.11 ~app-text/docbook-xml-dtd-4.1.2 ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 !aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.3 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.10.0[X,glib,svg] >=x11-libs/gdk-pixbuf-2.23.5:2[X,introspection?] ) aqua? ( >=x11-libs/cairo-1.10.0[aqua,glib,svg] >=x11-libs/gdk-pixbuf-2.23.5:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.29.14 >=x11-libs/pango-1.29.0[introspection?] >=dev-libs/atk-2.1.5[introspection?] >=x11-libs/gtk+-2.24:2 media-libs/fontconfig x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9 ) cups? ( net-print/cups ) introspection? ( >=dev-libs/gobject-introspection-0.10.1 ) !<gnome-base/gail-1000 !<x11-libs/vte-0.30.1-r1:2.90 packagekit? ( app-admin/packagekit-base )
 3
-mirror://gnome/sources/gtk+/3.2/gtk+-3.2.2.tar.xz
+mirror://gnome/sources/gtk+/3.2/gtk+-3.2.3.tar.xz
 
 http://www.gtk.org/
 LGPL-2
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index fd47c82ff5bf..69a261b62d39 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Dec 2011 01:36:44 +0000
+Wed, 28 Dec 2011 09:06:44 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index fd47c82ff5bf..69a261b62d39 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Dec 2011 01:36:44 +0000
+Wed, 28 Dec 2011 09:06:44 +0000
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a4119dc9ef41..23fe8ebf6498 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Dec 2011 01:36:46 +0000
+Wed, 28 Dec 2011 09:06:46 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 410e54fa2af6..44f5e234fcfe 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Dec 28 01:06:43 UTC 2011
+Wed Dec 28 09:06:44 UTC 2011
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 7576606dd33e..76a996ec9916 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Dec 2011 01:30:01 +0000
+Wed, 28 Dec 2011 09:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index b366225d0548..92dceb85aa5a 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1325034301 Wed Dec 28 01:05:01 2011 UTC
+1325063101 Wed Dec 28 09:05:01 2011 UTC
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 0921edf66bce..58a07451566b 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2566,6 +2566,7 @@ media-sound/amarok:daap - Enable the scripts for music sharing through DAAP. Thi
 media-sound/amarok:embedded - Use libmysqld, MySQL embedded server library. Try disabling this if you encounter -PIC related in amarok, it will make amarok rely only on standalone MySQL server.
 media-sound/amarok:lastfm - Enable Last.fm streaming services support through media-libs/liblastfm
 media-sound/amarok:mp3tunes - Enable mp3tunes integration
+media-sound/amarok:ofa - Use media-libs/libofa to compute MusicDNS acoustic fingerprints (used by MusicBrainz)
 media-sound/amarok:playdar - Build the playdar collection
 media-sound/amarok:player - Build the player
 media-sound/amarok:upnp - Support for upnp servers
@@ -5067,6 +5068,7 @@ www-servers/nginx:nginx_modules_http_upload_progress - This module adds the abil
 www-servers/nginx:nginx_modules_mail_imap - Enables IMAP proxy support
 www-servers/nginx:nginx_modules_mail_pop3 - Enables POP3 proxy support
 www-servers/nginx:nginx_modules_mail_smtp - Enables SMTP proxy support
+www-servers/nginx:pcre-jit - Enable JIT for pcre
 www-servers/ocsigen:ocamlduce - Enables ocamlduce XML typechecking for generated web pages
 www-servers/pound:dynscaler - Enable dynamic rescaling of back-end priorities
 www-servers/pshs:magic - Enable automatic detection of Content-Type using libmagic (sys-apps/file)
diff --git a/sci-biology/allpathslg/Manifest b/sci-biology/allpathslg/Manifest
index ba5bcf7896fb..e4ddb00c89b3 100644
--- a/sci-biology/allpathslg/Manifest
+++ b/sci-biology/allpathslg/Manifest
@@ -1,3 +1,3 @@
-DIST allpathslg-35725.tar.gz 2375961 RMD160 b65870041b6b96b81194cf1b9f820c523be29121 SHA1 2a10c88dc2c313a7307a584495195c40640989f8 SHA256 992089f300ea6ae298036f0636a21e4475ac8961927f59c4b78bb2efc2c068ac
 DIST allpathslg-37578.tar.gz 2511464 RMD160 462febe6efc690d53feaaff9ffb118a0c7e6a134 SHA1 45ca0d5cee312ff77f2c425b6b615dbec0f4726c SHA256 b4fdb6e7cc523cdb2831562bfabdf640dc2eb89f09d626ffeb4d1de358f46056
 DIST allpathslg-38573.tar.gz 2638531 RMD160 bcb7d5d0f1fb37d9418beb6a347f1a68d198bd84 SHA1 aa5240ab4a5159d4e47aebc1cb7f3d7e374c9758 SHA256 8f8a9d18371ea0e8c8927e8ca5ce7a78bd6ad667ce06a0b86e8b444e79ba7c05
+DIST allpathslg-40063.tar.gz 2551220 RMD160 8bc4f79558aa6eca058f75cff1e19f6c93440fb1 SHA1 50272c4c8b11ba58aeb1f14428e6dac4f5794f6c SHA256 b018dc5212a574e8e44ccd6481479b16db2982b497ece56cb0e0aaed91df822b
diff --git a/sci-biology/allpathslg/allpathslg-35725-r1.ebuild b/sci-biology/allpathslg/allpathslg-40063.ebuild
similarity index 84%
rename from sci-biology/allpathslg/allpathslg-35725-r1.ebuild
rename to sci-biology/allpathslg/allpathslg-40063.ebuild
index e0d302533393..b00a62e2451a 100644
--- a/sci-biology/allpathslg/allpathslg-35725-r1.ebuild
+++ b/sci-biology/allpathslg/allpathslg-40063.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpathslg/allpathslg-35725-r1.ebuild,v 1.1 2011/01/27 16:23:34 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpathslg/allpathslg-40063.ebuild,v 1.1 2011/12/28 03:48:22 weaver Exp $
 
-EAPI="2"
+EAPI=4
 
-inherit autotools
+inherit autotools flag-o-matic
 
 DESCRIPTION="De novo assembly of whole-genome shotgun microreads"
 HOMEPAGE="http://www.broadinstitute.org/science/programs/genome-biology/crd"
@@ -21,6 +21,7 @@ DEPEND="dev-libs/boost
 RDEPEND=""
 
 src_prepare() {
+	sed -i 's/-ggdb3//' configure.ac || die
 	eautoreconf
 }
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 181e83f9a300..276f9384b4ce 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,6 +1,7 @@
 DIST portage-2.1.10.11.tar.bz2 849505 RMD160 ae1fae8df7e42978a988ae7f66c3bb335bfd31b4 SHA1 a0c35facd342cc32a4e713925809e72530b98ec9 SHA256 c9d47d2211fa5feec398bc155cf64ec911fb30eb11a32a9ae7ca38dbeb9b37de
 DIST portage-2.1.10.41.tar.bz2 920129 RMD160 c0f425eeb78d9e17d1abfd17787d27df72337931 SHA1 3fb7ab592ceb28544b0ca4a9ddcd1298e73eaaa3 SHA256 e29c94fda9bb2eb2eb191df26ea1db7f709db728d6c3844f7b23a3660b7c5bf9
 DIST portage-2.1.10.43.tar.bz2 925342 RMD160 f172b3bfd54e556e583119fd95f3248fe1c701ab SHA1 1073515c1417d7c3335703755a9a76dd55b9d7da SHA256 d8b86724fd83042b17659b0cfe02d86886448160ce6b94250cf5c261092dd666
+DIST portage-2.1.10.44.tar.bz2 781681 RMD160 b26cd8102620f966eefb2bf5214080d6ce0d8fc1 SHA1 1e1417d1b534fedb4e6ae749fc807c7ba8088a44 SHA256 688494c4b76189550e1a437835f8276f2047992ed6c617f62b01e459f8fbdf04
 DIST portage-2.1.6.13.patch.bz2 177383 RMD160 ef6388ca4a55a7defb319d54c9d80625cb8e12dc SHA1 5298feb6f881c25abdbde4a353d341fd36fdee51 SHA256 2cc897b6fa43b3329ef51f6304c064237be6bc326f1f0c221a19c0f96b69cd9c
 DIST portage-2.1.6.7.patch.bz2 50118 RMD160 cc0a322570829c8dec9aa4886deb5741f0efb489 SHA1 02021be38b0f829d45b342483834652a1985a952 SHA256 5f0605b51a24d23703330b040d2f7154322284db3e0cefa7499002ff1fa733c0
 DIST portage-2.1.6.tar.bz2 518771 RMD160 766ff4eb92497894f4c8678a9c4bc2756e4d9c63 SHA1 a28b191904296b551b22a7af83dacd1c336340a5 SHA256 b1c507445b3858449c861568f477e1cfab8b2326ded906b852c5193fb3839647
diff --git a/sys-apps/portage/portage-2.1.10.44.ebuild b/sys-apps/portage/portage-2.1.10.44.ebuild
new file mode 100644
index 000000000000..59c3ba8403ae
--- /dev/null
+++ b/sys-apps/portage/portage-2.1.10.44.ebuild
@@ -0,0 +1,354 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.10.44.ebuild,v 1.1 2011/12/28 09:00:39 zmedico Exp $
+
+# Require EAPI 2 since we now require at least python-2.6 (for python 3
+# syntax support) which also requires EAPI 2.
+EAPI=2
+inherit eutils multilib python
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+SLOT="0"
+IUSE="build doc epydoc +ipc linguas_pl python2 python3 selinux"
+
+# Import of the io module in python-2.6 raises ImportError for the
+# thread module if threading is disabled.
+python_dep="python3? ( =dev-lang/python-3* )
+	!python2? ( !python3? (
+		build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) )
+		!build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] >=dev-lang/python-3 ) )
+	) )
+	python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )"
+
+# The pysqlite blocker is for bug #282760.
+DEPEND="${python_dep}
+	!build? ( >=sys-apps/sed-4.0.5 )
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )"
+# Require sandbox-2.2 for bug #288863.
+RDEPEND="${python_dep}
+	!build? ( >=sys-apps/sed-4.0.5
+		>=app-shells/bash-3.2_p17
+		>=app-admin/eselect-1.2 )
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
+	!<app-shells/bash-3.2_p17
+	!<app-admin/logrotate-3.8.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=install-sources requires debugedit and rsync
+
+SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+PV_PL="2.1.2"
+PATCHVER_PL=""
+TARBALL_PV=$PV
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
+	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
+		$(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )"
+
+PATCHVER=
+[[ $TARBALL_PV = $PV ]] || PATCHVER=$PV
+if [ -n "${PATCHVER}" ]; then
+	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
+	$(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)"
+fi
+
+S="${WORKDIR}"/${PN}-${TARBALL_PV}
+S_PL="${WORKDIR}"/${PN}-${PV_PL}
+
+compatible_python_is_selected() {
+	[[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
+}
+
+pkg_setup() {
+	# Bug #359731 - Die early if get_libdir fails.
+	[[ -z $(get_libdir) ]] && \
+		die "get_libdir returned an empty string"
+
+	if use python2 && use python3 ; then
+		ewarn "Both python2 and python3 USE flags are enabled, but only one"
+		ewarn "can be in the shebangs. Using python3."
+	fi
+	if ! use python2 && ! use python3 && ! compatible_python_is_selected ; then
+		ewarn "Attempting to select a compatible default python interpreter"
+		local x success=0
+		for x in /usr/bin/python2.* ; do
+			x=${x#/usr/bin/python2.}
+			if [[ $x -ge 6 ]] 2>/dev/null ; then
+				eselect python set python2.$x
+				if compatible_python_is_selected ; then
+					elog "Default python interpreter is now set to python-2.$x"
+					success=1
+					break
+				fi
+			fi
+		done
+		if [ $success != 1 ] ; then
+			eerror "Unable to select a compatible default python interpreter!"
+			die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
+		fi
+	fi
+
+	if use python3; then
+		python_set_active_version 3
+	elif use python2; then
+		python_set_active_version 2
+	fi
+}
+
+src_prepare() {
+	if [ -n "${PATCHVER}" ] ; then
+		if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
+			rm "$S/bin/ebuild-helpers/portageq" \
+				|| die "failed to remove portageq helper symlink"
+		fi
+		epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
+	fi
+	einfo "Setting portage.VERSION to ${PVR} ..."
+	sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
+		die "Failed to patch portage.VERSION"
+	sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
+		die "Failed to patch VERSION in doc/fragment/version"
+	sed -e "1s/VERSION/${PVR}/" -i man/* || \
+		die "Failed to patch VERSION in man page headers"
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i pym/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use python3; then
+		einfo "Converting shebangs for python3..."
+		python_convert_shebangs -r 3 .
+	elif use python2; then
+		einfo "Converting shebangs for python2..."
+		python_convert_shebangs -r 2 .
+	fi
+}
+
+src_compile() {
+	if use doc; then
+		cd "${S}"/doc
+		touch fragment/date
+		make xhtml xhtml-nochunks || die "failed to make docs"
+	fi
+
+	if use epydoc; then
+		einfo "Generating api docs"
+		mkdir "${WORKDIR}"/api
+		local my_modules epydoc_opts=""
+		my_modules="$(find "${S}/pym" -name "*.py" \
+			| sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \
+			 -e 's:/:.:g' | sort)" || die "error listing modules"
+		# workaround for bug 282760
+		> "$S/pym/pysqlite2.py"
+		PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \
+			epydoc -o "${WORKDIR}"/api \
+			-qqqqq --no-frames --show-imports $epydoc_opts \
+			--name "${PN}" --url "${HOMEPAGE}" \
+			${my_modules} || die "epydoc failed"
+		rm "$S/pym/pysqlite2.py"
+	fi
+}
+
+src_test() {
+	# make files executable, in case they were created by patch
+	find bin -type f | xargs chmod +x
+	./pym/portage/tests/runTests || die "test(s) failed"
+}
+
+src_install() {
+	local libdir=$(get_libdir)
+	local portage_base="/usr/${libdir}/portage"
+	local portage_share_config=/usr/share/portage/config
+
+	cd "${S}"/cnf
+	insinto /etc
+	doins etc-update.conf dispatch-conf.conf || die
+
+	insinto "$portage_share_config"
+	doins "$S/cnf/make.globals" || die
+	if [ -f "make.conf.${ARCH}".diff ]; then
+		patch make.conf "make.conf.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+		newins make.conf make.conf.example || die
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+		newins make.conf make.conf.example || die
+	fi
+
+	dosym ..${portage_share_config}/make.globals /etc/make.globals
+
+	insinto /etc/logrotate.d
+	doins "${S}"/cnf/logrotate.d/elog-save-summary || die
+
+	# BSD and OSX need a sed wrapper so that find/xargs work properly
+	if use userland_GNU; then
+		rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper"
+	fi
+
+	local x symlinks files
+
+	cd "$S" || die "cd failed"
+	for x in $(find bin -type d) ; do
+		exeinto $portage_base/$x || die "exeinto failed"
+		cd "$S"/$x || die "cd failed"
+		files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l)
+		if [ -n "$files" ] ; then
+			doexe $files || die "doexe failed"
+		fi
+		symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
+		if [ -n "$symlinks" ] ; then
+			cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
+		fi
+	done
+
+	cd "$S" || die "cd failed"
+	for x in $(find pym/* -type d ! -path "pym/portage/tests*") ; do
+		insinto $portage_base/$x || die "insinto failed"
+		cd "$S"/$x || die "cd failed"
+		# __pycache__ directories contain no py files
+		[[ "*.py" != $(echo *.py) ]] || continue
+		doins *.py || die "doins failed"
+		symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
+		if [ -n "$symlinks" ] ; then
+			cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
+		fi
+	done
+
+	# We install some minimal tests for use as a preinst sanity check.
+	# These tests must be able to run without a full source tree and
+	# without relying on a previous portage instance being installed.
+	cd "$S" || die "cd failed"
+	exeinto $portage_base/pym/portage/tests || die
+	doexe pym/portage/tests/runTests || die
+	insinto $portage_base/pym/portage/tests || die
+	doins pym/portage/tests/*.py || die
+	insinto $portage_base/pym/portage/tests/lint || die
+	doins pym/portage/tests/lint/*.py || die
+	doins pym/portage/tests/lint/__test__ || die
+
+	# Symlinks to directories cause up/downgrade issues and the use of these
+	# modules outside of portage is probably negligible.
+	for x in "${D}${portage_base}/pym/"{cache,elog_modules} ; do
+		[ ! -L "${x}" ] && continue
+		die "symlink to directory will cause upgrade/downgrade issues: '${x}'"
+	done
+
+	doman "${S}"/man/*.[0-9]
+	if use linguas_pl; then
+		doman -i18n=pl "${S_PL}"/man/pl/*.[0-9]
+		doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9]
+	fi
+
+	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES}
+	use doc && dohtml -r "${S}"/doc/*
+	use epydoc && dohtml -r "${WORKDIR}"/api
+
+	dodir /usr/bin
+	for x in ebuild egencache emerge portageq quickpkg repoman ; do
+		dosym ../${libdir}/portage/bin/${x} /usr/bin/${x}
+	done
+
+	dodir /usr/sbin
+	local my_syms="archive-conf
+		dispatch-conf
+		emaint
+		emerge-webrsync
+		env-update
+		etc-update
+		fixpackages
+		regenworld"
+	local x
+	for x in ${my_syms}; do
+		dosym ../${libdir}/portage/bin/${x} /usr/sbin/${x}
+	done
+	dosym env-update /usr/sbin/update-env
+	dosym etc-update /usr/sbin/update-etc
+
+	dodir /etc/portage
+	keepdir /etc/portage
+}
+
+pkg_preinst() {
+	if [[ $ROOT == / ]] ; then
+		# Run some minimal tests as a sanity check.
+		local test_runner=$(find "$D" -name runTests)
+		if [[ -n $test_runner && -x $test_runner ]] ; then
+			einfo "Running preinst sanity tests..."
+			"$test_runner" || die "preinst sanity tests failed"
+		fi
+	fi
+
+	if ! use build && ! has_version dev-python/pycrypto && \
+		! has_version '>=dev-lang/python-2.6[ssl]' ; then
+		ewarn "If you are an ebuild developer and you plan to commit ebuilds"
+		ewarn "with this system then please install dev-python/pycrypto or"
+		ewarn "enable the ssl USE flag for >=dev-lang/python-2.6 in order"
+		ewarn "to enable RMD160 hash support."
+		ewarn "See bug #198398 for more information."
+	fi
+	if [ -f "${ROOT}/etc/make.globals" ]; then
+		rm "${ROOT}/etc/make.globals"
+	fi
+
+	if [[ -d ${ROOT}var/log/portage && \
+		$(ls -ld "${ROOT}var/log/portage") != *" portage portage "* ]] && \
+		has_version '<sys-apps/portage-2.1.10.11' ; then
+		# Initialize permissions for bug #378451 and bug #377177, since older
+		# portage does not create /var/log/portage with the desired default
+		# permissions.
+		einfo "Applying portage group permission to ${ROOT}var/log/portage for bug #378451"
+		chown portage:portage "${ROOT}var/log/portage"
+		chmod g+ws "${ROOT}var/log/portage"
+	fi
+
+	[[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12" \
+		&& REPO_LAYOUT_CONF_WARN=true || REPO_LAYOUT_CONF_WARN=false
+}
+
+pkg_postinst() {
+	# Compile all source files recursively. Any orphans
+	# will be identified and removed in postrm.
+	python_mod_optimize /usr/$(get_libdir)/portage/pym
+
+	if $REPO_LAYOUT_CONF_WARN ; then
+		ewarn
+		echo "If you want overlay eclasses to override eclasses from" \
+			"other repos then see the portage(5) man page" \
+			"for information about the new layout.conf and repos.conf" \
+			"configuration files." \
+			| fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done
+		ewarn
+	fi
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/portage/pym
+}
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 5b924c7358f6..397d32321b14 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,5 +1,4 @@
 DIST nginx-1.0.10.tar.gz 686011 RMD160 875082ff6e9197cc26adf4ee51eeda34b9531e29 SHA1 01304d44048aa57944e935dda8523afd5e5d1e23 SHA256 7221fdb0f2a94875252cb3c406a2cd5895d9bc57874fc1b4f588964fd3361e3c
-DIST nginx-1.1.11.tar.gz 704239 RMD160 8eef7fa6fea1834329b531167130a8102b817747 SHA1 73d65404879d5c130149d9147a16d724b08db62c SHA256 0350274c7b072293f98166a44597e7dddd2c249a1be6bfbeafd97868f49b01a1
 DIST nginx-1.1.12.tar.gz 707120 RMD160 1d09c3b17ee27774657c5be32f7fdcc20252c0b0 SHA1 78e8de01206fa5a150c3494ed313ea1d6b74353a SHA256 0d00f0f928bc8637f200de7bc405ebb95730c923df208624ea56529be44c08f9
 DIST nginx-1.1.8.tar.gz 695829 RMD160 60a8ddd0885b7cb08d5eb1f526dd40f4e4614abd SHA1 e93c4b48379c0240fd4c7af8982faa3c4a7c834f SHA256 2f5d2d08fa59043aaae45c72c16ff052fabe1f5ba95fe5475d4994a5a55c9945
 DIST nginx_http_push_module-0.692.tar.gz 29119 RMD160 9d2be16074cf28115af0f1d8f3646937cda649ad SHA1 72103084cad8f4d3d9a49a6b04cf780e4541605d SHA256 64868708071aa21dbc4c7a07d149dd6ec9108fb7eaf2aad5ad069406151f17fe
diff --git a/www-servers/nginx/metadata.xml b/www-servers/nginx/metadata.xml
index dd7abd7b5984..394ee3557343 100644
--- a/www-servers/nginx/metadata.xml
+++ b/www-servers/nginx/metadata.xml
@@ -14,6 +14,7 @@
 		<flag name='http'>Enable HTTP core support</flag>
 		<flag name='http-cache'>Enable HTTP cache support</flag>
 		<flag name='libatomic'>Use libatomic instead of builtin atomic operations</flag>
+		<flag name='pcre-jit'>Enable JIT for pcre</flag>
 		<flag name='nginx_modules_http_addition'>This module adds contents of
 			other locations before and after the current location's
 			content.</flag>
diff --git a/www-servers/nginx/nginx-1.1.11.ebuild b/www-servers/nginx/nginx-1.1.11.ebuild
deleted file mode 100644
index 8a04794ea9ed..000000000000
--- a/www-servers/nginx/nginx-1.1.11.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.1.11.ebuild,v 1.1 2011/12/25 14:48:32 patrick Exp $
-
-EAPI="4"
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-#   * alive upstream
-#   * sane packaging
-#   * builds cleanly
-#   * does not need a patch for nginx core
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.8.3"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-HTTP_UPLOAD_PROGRESS_MODULE_SHA1="c7c663f"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="http://github.com/masterzen/nginx-upload-progress-module/tarball/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (http://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.15"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_SHA1="137855d"
-HTTP_HEADERS_MORE_MODULE_URI="http://github.com/agentzh/headers-more-nginx-module/tarball/v${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_push (http://pushmodule.slact.net/, MIT license)
-HTTP_PUSH_MODULE_PV="0.692"
-HTTP_PUSH_MODULE_P="nginx_http_push_module-${HTTP_PUSH_MODULE_PV}"
-HTTP_PUSH_MODULE_URI="http://pushmodule.slact.net/downloads/${HTTP_PUSH_MODULE_P}.tar.gz"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="1.5"
-HTTP_CACHE_PURGE_MODULE_P="ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/${HTTP_CACHE_PURGE_MODULE_P}.tar.gz"
-
-# HTTP Upload module from Valery Kholodkov
-# (http://www.grid.net.ru/nginx/upload.en.html, BSD license)
-HTTP_UPLOAD_MODULE_PV="2.2.0"
-HTTP_UPLOAD_MODULE_P="nginx_upload_module-${HTTP_UPLOAD_MODULE_PV}"
-HTTP_UPLOAD_MODULE_URI="http://www.grid.net.ru/nginx/download/${HTTP_UPLOAD_MODULE_P}.tar.gz"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.6"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz"
-
-inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="http://nginx.org"
-SRC_URI="http://nginx.org/download/${P}.tar.gz
-	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
-	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-	nginx_modules_http_push? ( ${HTTP_PUSH_MODULE_URI} )
-	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} )
-	nginx_modules_http_upload? ( ${HTTP_UPLOAD_MODULE_URI} )
-	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} )"
-
-LICENSE="as-is BSD BSD-2 GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
-geo gzip limit_req limit_zone map memcached proxy referer rewrite scgi ssi
-split_clients upstream_ip_hash userid uwsgi"
-NGINX_MODULES_OPT="addition dav degradation flv geoip gzip_static image_filter
-mp4 perl random_index realip secure_link stub_status sub xslt"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-	http_upload_progress
-	http_headers_more
-	http_passenger
-	http_push
-	http_cache_purge
-	http_upload
-	http_slowfs_cache"
-
-IUSE="aio debug +http +http-cache ipv6 libatomic +pcre ssl vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
-	IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
-	IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
-	IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
-	IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-CDEPEND="
-	pcre? ( >=dev-libs/libpcre-4.2 )
-	ssl? ( dev-libs/openssl )
-	http-cache? ( userland_GNU? ( dev-libs/openssl ) )
-	nginx_modules_http_geo? ( dev-libs/geoip )
-	nginx_modules_http_gzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip_static? ( sys-libs/zlib )
-	nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] )
-	nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
-	nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
-	nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) )
-	nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-	arm? ( dev-libs/libatomic_ops )
-	libatomic? ( dev-libs/libatomic_ops )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-pkg_setup() {
-	if use nginx_modules_http_passenger; then
-		einfo
-		einfo "Passenger support has been removed from the nginx ebuild to"
-		einfo "get rid of file collisions, its broken build system and"
-		einfo "incompatibilities between passenger 2 and 3."
-		einfo
-		einfo "Please switch to passenger-3 standalone or use the"
-		einfo "unicorn gem which provides a sane nginx-like architecture"
-		einfo "out of the box."
-		einfo
-		einfo "For more information on sane ruby deployments with"
-		einfo "passenger-3/unicorn go to:"
-		einfo
-		einfo "https://rvm.beginrescueend.com"
-		einfo
-		die "nginx_modules_http_passenger still in IUSE"
-	fi
-
-	ebegin "Creating nginx user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-	eend $?
-
-	if use libatomic; then
-		ewarn "GCC 4.1+ features built-in atomic operations."
-		ewarn "Using libatomic_ops is only needed if using"
-		ewarn "a different compiler or a GCC prior to 4.1"
-	fi
-
-	if [[ -n $NGINX_ADD_MODULES ]]; then
-		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
-		ewarn "This nginx installation is not supported!"
-		ewarn "Make sure you can reproduce the bug without those modules"
-		ewarn "_before_ reporting bugs."
-	fi
-
-	if use !http; then
-		ewarn "To actually disable all http-functionality you also have to disable"
-		ewarn "all nginx http modules."
-	fi
-}
-
-src_prepare() {
-	sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make
-}
-
-src_configure() {
-	local myconf= http_enabled= mail_enabled=
-
-	use aio       && myconf+=" --with-file-aio --with-aio_module"
-	use debug     && myconf+=" --with-debug"
-	use ipv6      && myconf+=" --with-ipv6"
-	use libatomic && myconf+=" --with-libatomic"
-	use pcre      && myconf+=" --with-pcre"
-
-	# HTTP modules
-	for mod in $NGINX_MODULES_STD; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-		else
-			myconf+=" --without-http_${mod}_module"
-		fi
-	done
-
-	for mod in $NGINX_MODULES_OPT; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-			myconf+=" --with-http_${mod}_module"
-		fi
-	done
-
-	if use nginx_modules_http_fastcgi; then
-		myconf+=" --with-http_realip_module"
-	fi
-
-	# third-party modules
-	if use nginx_modules_http_upload_progress; then
-		http_enabled=1
-		myconf+=" --add-module=${WORKDIR}/masterzen-nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_SHA1}"
-	fi
-
-	if use nginx_modules_http_headers_more; then
-		http_enabled=1
-		myconf+=" --add-module=${WORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}"
-	fi
-
-	if use nginx_modules_http_push; then
-		http_enabled=1
-		myconf+=" --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}"
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		http_enabled=1
-		myconf+=" --add-module=${WORKDIR}/${HTTP_CACHE_PURGE_MODULE_P}"
-	fi
-
-	if use nginx_modules_http_upload; then
-		http_enabled=1
-		myconf+=" --add-module=${WORKDIR}/${HTTP_UPLOAD_MODULE_P}"
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		http_enabled=1
-		myconf+=" --add-module=${WORKDIR}/${HTTP_SLOWFS_CACHE_MODULE_P}"
-	fi
-
-	if use http || use http-cache; then
-		http_enabled=1
-	fi
-
-	if [ $http_enabled ]; then
-		use http-cache || myconf+=" --without-http-cache"
-		use ssl && myconf+=" --with-http_ssl_module"
-	else
-		myconf+=" --without-http --without-http-cache"
-	fi
-
-	# MAIL modules
-	for mod in $NGINX_MODULES_MAIL; do
-		if use nginx_modules_mail_${mod}; then
-			mail_enabled=1
-		else
-			myconf+=" --without-mail_${mod}_module"
-		fi
-	done
-
-	if [ $mail_enabled ]; then
-		myconf+=" --with-mail"
-		use ssl && myconf+=" --with-mail_ssl_module"
-	fi
-
-	# custom modules
-	for mod in $NGINX_ADD_MODULES; do
-		myconf+=" --add-module=${mod}"
-	done
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	tc-export CC
-
-	./configure \
-		--prefix=/usr \
-		--sbin-path=/usr/sbin/nginx \
-		--conf-path=/etc/${PN}/${PN}.conf \
-		--error-log-path=/var/log/${PN}/error_log \
-		--pid-path=/var/run/${PN}.pid \
-		--lock-path=/var/lock/nginx.lock \
-		--user=${PN} --group=${PN} \
-		--with-cc-opt="-I${ROOT}usr/include" \
-		--with-ld-opt="-L${ROOT}usr/lib" \
-		--http-log-path=/var/log/${PN}/access_log \
-		--http-client-body-temp-path=/var/tmp/${PN}/client \
-		--http-proxy-temp-path=/var/tmp/${PN}/proxy \
-		--http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \
-		--http-scgi-temp-path=/var/tmp/${PN}/scgi \
-		--http-uwsgi-temp-path=/var/tmp/${PN}/uwsgi \
-		${myconf} || die "configure failed"
-}
-
-src_compile() {
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi,scgi,uwsgi}
-	keepdir /var/www/localhost/htdocs
-
-	dosbin objs/nginx
-	newinitd "${FILESDIR}"/nginx.init-r2 nginx
-
-	cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
-	rm conf/win-utf conf/koi-win conf/koi-utf
-
-	dodir /etc/${PN}
-	insinto /etc/${PN}
-	doins conf/*
-
-	doman man/nginx.8
-	dodoc CHANGES* README
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/nginx.logrotate nginx
-
-	if use nginx_modules_http_perl; then
-		cd "${S}"/objs/src/http/modules/perl/
-		einstall DESTDIR="${D}" INSTALLDIRS=vendor || die "failed to install perl stuff"
-		fixlocalpod
-	fi
-
-	if use nginx_modules_http_push; then
-		docinto ${HTTP_PUSH_MODULE_P}
-		dodoc "${WORKDIR}"/${HTTP_PUSH_MODULE_P}/{changelog.txt,protocol.txt,README}
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		docinto ${HTTP_CACHE_PURGE_MODULE_P}
-		dodoc "${WORKDIR}"/${HTTP_CACHE_PURGE_MODULE_P}/{CHANGES,README.md,TODO.md}
-	fi
-
-	if use nginx_modules_http_upload; then
-		docinto ${HTTP_UPLOAD_MODULE_P}
-		dodoc "${WORKDIR}"/${HTTP_UPLOAD_MODULE_P}/{Changelog,README}
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
-		dodoc "${WORKDIR}"/${HTTP_SLOWFS_CACHE_MODULE_P}/{CHANGES,README}
-	fi
-}
-
-pkg_postinst() {
-	if use ssl; then
-		if [ ! -f "${ROOT}"/etc/ssl/${PN}/${PN}.key ]; then
-			install_cert /etc/ssl/${PN}/${PN}
-			chown ${PN}:${PN} "${ROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-		fi
-	fi
-}
diff --git a/www-servers/nginx/nginx-1.1.12.ebuild b/www-servers/nginx/nginx-1.1.12-r1.ebuild
similarity index 98%
rename from www-servers/nginx/nginx-1.1.12.ebuild
rename to www-servers/nginx/nginx-1.1.12-r1.ebuild
index 44a278c38e0f..cef3c217fdca 100644
--- a/www-servers/nginx/nginx-1.1.12.ebuild
+++ b/www-servers/nginx/nginx-1.1.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.1.12.ebuild,v 1.1 2011/12/27 07:40:00 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.1.12-r1.ebuild,v 1.1 2011/12/28 05:49:12 patrick Exp $
 
 EAPI="4"
 
@@ -81,7 +81,7 @@ NGINX_MODULES_3RD="
 	http_upload
 	http_slowfs_cache"
 
-IUSE="aio debug +http +http-cache ipv6 libatomic +pcre ssl vim-syntax"
+IUSE="aio debug +http +http-cache ipv6 libatomic +pcre pcre-jit ssl vim-syntax"
 
 for mod in $NGINX_MODULES_STD; do
 	IUSE="${IUSE} +nginx_modules_http_${mod}"
@@ -116,6 +116,7 @@ DEPEND="${CDEPEND}
 	arm? ( dev-libs/libatomic_ops )
 	libatomic? ( dev-libs/libatomic_ops )"
 PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
+REQUIRED_USE="pcre-jit? ( pcre )"
 
 pkg_setup() {
 	if use nginx_modules_http_passenger; then
@@ -172,6 +173,7 @@ src_configure() {
 	use ipv6      && myconf+=" --with-ipv6"
 	use libatomic && myconf+=" --with-libatomic"
 	use pcre      && myconf+=" --with-pcre"
+	use pcre-jit  && myconf+=" --with-pcre-jit"
 
 	# HTTP modules
 	for mod in $NGINX_MODULES_STD; do
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 3bdfb40faee7..ed68f6842fc0 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -7,7 +7,7 @@ DIST gtk+-2.24.7.tar.xz 13224600 RMD160 37fcc2702da52ec9785a6886939b795fb3c764ae
 DIST gtk+-2.24.8.tar.xz 12811268 RMD160 55a57b32f3034d7b3d190538f929920bc6c96aff SHA1 b69a7cf512b8254d8a6cd39a45b3f09cb02af20b SHA256 8a3b29f667933cf52eea2db7b066723edbc80443ca9c75b7cd7cbe8c8b90b93c
 DIST gtk+-3.0.12-use-const2.patch.xz 12500 RMD160 2cebd73630f83530a76ac263d797e196032994ee SHA1 697b8d41ba24386acd1cfec1d733361901e797dd SHA256 f10b251a52a4f5d73b435315c94297dd30a4bc3c20a25bc947842bb214808cc4
 DIST gtk+-3.0.12.tar.xz 13104092 RMD160 c82d14e113ae287476f5887ca03b8b01b8d22e1b SHA1 1b87e12ef3dfe598ee757db1f5bdff6cd66e6558 SHA256 219fdea120897981840e909fac40d4d433fe061a37b12b9402e215c819ebeae9
-DIST gtk+-3.2.1.tar.xz 12664740 RMD160 38f61e8881b5dd1230aeafecc01cfa45629bc6ef SHA1 7f3feaa6e9227bfc9247d58fd34962c677750591 SHA256 f1989f183700cd5f46681cfabc2253e2f526b19b56e4b631dcee2594dddb0ef3
 DIST gtk+-3.2.2-patches-2.tar.xz 9428 RMD160 5086a8502ae3b3ed03696f44eb55596d118cf872 SHA1 1ce95a8b22883246ed6b464cd550af014222940b SHA256 205449e86898fd4683d508e57ed93cab401a7036359a4ceb155c10cdc9b20bed
 DIST gtk+-3.2.2.tar.xz 12662804 RMD160 344ff194cda11b95e44ef75cd47f19a858b564b6 SHA1 fc88cbd2801efac02a6171a2f4b5ffe50eec61f7 SHA256 f7ec82de393cd7ae2aa45022576400941704709d1f0f35fb0b17f3be1f2e7d84
+DIST gtk+-3.2.3.tar.xz 12668948 RMD160 48a19eb3df1e38c161aca6573d1f218f2552cd70 SHA1 8b95f6c65f9307a920780847e7c72bafa358eabb SHA256 e2cf20f2510ebbc7be122a1a33dd1f472a7d06aaf16b4f2a63eb048cd9141d3d
 DIST introspection.m4.bz2 1181 RMD160 3648afa820c2ee7e240083076e1452285d043084 SHA1 e5188cc387d0d17feb77684feff7ff163779912f SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae
diff --git a/x11-libs/gtk+/gtk+-3.2.1.ebuild b/x11-libs/gtk+/gtk+-3.2.1.ebuild
deleted file mode 100644
index f8a57c259a3a..000000000000
--- a/x11-libs/gtk+/gtk+-3.2.1.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.2.1.ebuild,v 1.6 2011/12/14 19:58:13 tetromino Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic gnome.org gnome2-utils libtool virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="3"
-# NOTE: This gtk+ has multi-gdk-backend support, see:
-#  * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/
-#  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
-# I tried this and got it all compiling, but the end result is unusable as it
-# horribly mixes up the backends -- grobian
-IUSE="aqua colord cups debug doc examples +introspection packagekit test vim-syntax xinerama"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# FIXME: introspection data is built against system installation of gtk+:3
-# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
-# Use gtk+:2 for gtk-update-icon-cache and gtk-builder-convert
-# >=x11-libs/gtk+-2.24:2 is needed for bug 359555
-COMMON_DEPEND="!aqua? (
-		x11-libs/libXrender
-		x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXt
-		x11-libs/libXext
-		>=x11-libs/libXrandr-1.3
-		x11-libs/libXcursor
-		x11-libs/libXfixes
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		>=x11-libs/cairo-1.10.0[X,glib,svg]
-		>=x11-libs/gdk-pixbuf-2.23.5:2[X,introspection?]
-	)
-	aqua? (
-		>=x11-libs/cairo-1.10.0[aqua,glib,svg]
-		>=x11-libs/gdk-pixbuf-2.23.5:2[introspection?]
-	)
-	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.29.14
-	>=x11-libs/pango-1.29.0[introspection?]
-	>=dev-libs/atk-2.1.5[introspection?]
-	>=x11-libs/gtk+-2.24:2
-	media-libs/fontconfig
-	x11-misc/shared-mime-info
-	colord? ( >=x11-misc/colord-0.1.9 )
-	cups? ( net-print/cups )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.1 )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/pkgconfig-0.9
-	!aqua? (
-		x11-proto/xextproto
-		x11-proto/xproto
-		x11-proto/inputproto
-		x11-proto/damageproto
-	)
-	xinerama? ( x11-proto/xineramaproto )
-	>=dev-util/gtk-doc-am-1.11
-	doc? (
-		>=dev-util/gtk-doc-1.11
-		~app-text/docbook-xml-dtd-4.1.2 )
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gail-1000
-	packagekit? ( app-admin/packagekit-base )"
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-src_prepare() {
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	# Non-working test in gentoo's env
-	sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
-		-i gtk/tests/testing.c || die "sed 1 failed"
-	sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
-		-i gtk/tests/recentmanager.c || die "sed 2 failed"
-
-	# Missing file, required for tests; https://bugzilla.gnome.org/show_bug.cgi?id=662024
-	cp "${FILESDIR}/${PN}-3.2.1-selector.errors" \
-		tests/css/parser/selector.errors || die "cp failed"
-
-	# FIXME: multiple reftests fail when run from portage (but succeed when
-	# run from a manual compile in a temp directory)
-	sed -e 's:\(SUBDIRS.*\)reftests:\1:' \
-		-i tests/Makefile.* || die "sed 3 failed"
-
-	# Test results depend on the list of mounted filesystems!
-	rm -v tests/a11y/pickers.{ui,txt} || die "rm failed"
-
-	# Failing treeview scrolling tests; bug #384855,
-	# https://bugzilla.gnome.org/show_bug.cgi?id=660931
-	epatch "${FILESDIR}/${PN}-3.2.1-failing-tests.patch"
-
-	if ! use test; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS tests Makefile.am
-		strip_builddir SRC_SUBDIRS tests Makefile.in
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.am
-		strip_builddir SRC_SUBDIRS demos Makefile.in
-	fi
-}
-
-src_configure() {
-	# png always on to display icons (foser)
-	local myconf="$(use_enable doc gtk-doc)
-		$(use_enable xinerama)
-		$(use_enable packagekit)
-		$(use_enable cups cups auto)
-		$(use_enable colord)
-		$(use_enable introspection)
-		--disable-papi
-		--enable-gtk2-dependency"
-
-	# XXX: Maybe with multi-backend we should enable x11 all the time?
-	if use aqua; then
-		myconf="${myconf} --enable-quartz-backend --disable-xinput"
-	else
-		myconf="${myconf} --enable-x11-backend --enable-xinput"
-	fi
-
-	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
-	# need libdir here to avoid a double slash in a path that libtool doesn't
-	# grok so well during install (// between $EPREFIX and usr ...)
-	econf --libdir="${EPREFIX}/usr/$(get_libdir)" ${myconf}
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	# Exporting HOME fixes tests using XDG directories spec since all defaults
-	# are based on $HOME. It is also backward compatible with functions not
-	# yet ported to this spec.
-	XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-
-	# Remove unneeded *.la files
-	find "${D}" -name '*.la' -exec rm -f {} +
-
-	# add -framework Carbon to the .pc files
-	use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
-		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
-	done
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-
-	local GTK3_MODDIR="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0"
-	gtk-query-immodules-3.0  > "${GTK3_MODDIR}/immodules.cache" \
-		|| ewarn "Failed to run gtk-query-immodules-3.0"
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/x11-libs/gtk+/gtk+-3.2.2.ebuild b/x11-libs/gtk+/gtk+-3.2.3.ebuild
similarity index 97%
rename from x11-libs/gtk+/gtk+-3.2.2.ebuild
rename to x11-libs/gtk+/gtk+-3.2.3.ebuild
index d6770ae2e0ee..1ab9647fdf4c 100644
--- a/x11-libs/gtk+/gtk+-3.2.2.ebuild
+++ b/x11-libs/gtk+/gtk+-3.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.2.2.ebuild,v 1.4 2011/12/14 19:58:13 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.2.3.ebuild,v 1.1 2011/12/28 04:54:15 tetromino Exp $
 
 EAPI="4"
 
@@ -68,7 +68,6 @@ DEPEND="${COMMON_DEPEND}
 		media-fonts/font-misc-misc
 		media-fonts/font-cursor-misc )"
 # gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
-# Remove blocker after >=vte-0.30.1-r1:2.90 is stable
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/gail-1000
 	!<x11-libs/vte-0.30.1-r1:2.90