[gentoo-commits] dev/axs:master commit in: x11-libs/wxGTK/, dev-perl/perl-ldap/, sci-visualization/grace/, ...

[Ian Stakenvicius]

commit:     049646e46f0db47ad4ce16218d753be32e9421ca
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 27 21:39:10 2012 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Sep 27 21:39:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/axs.git;a=commit;h=049646e4

Sync with tree 2012-09-27 ~21:00UTC , dropped most eclasses as EAPI5 support now in the main tree

---
 app-cdr/dvdisaster/Manifest                        |    4 +-
 app-cdr/dvdisaster/dvdisaster-0.72.4.ebuild        |    4 +-
 app-editors/emacs-vcs/Manifest                     |    4 +-
 app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild   |    4 +-
 app-editors/emacs/Manifest                         |   18 +-
 app-editors/emacs/emacs-18.59-r8.ebuild            |    4 +-
 app-editors/emacs/emacs-21.4-r24.ebuild            |    4 +-
 app-editors/emacs/emacs-22.3-r10.ebuild            |    4 +-
 app-editors/emacs/emacs-23.4-r3.ebuild             |    4 +-
 app-editors/emacs/emacs-23.4-r4.ebuild             |    6 +-
 app-editors/emacs/emacs-24.1-r1.ebuild             |    6 +-
 app-editors/emacs/emacs-24.1.ebuild                |  338 ---
 app-editors/emacs/emacs-24.2.ebuild                |    4 +-
 app-emulation/qemu-kvm/Manifest                    |    4 +-
 app-emulation/qemu-kvm/qemu-kvm-1.1.1-r1.ebuild    |    4 +-
 app-emulation/qemu/Manifest                        |    7 +-
 app-emulation/qemu/files/qemu-1.2.0-cflags.patch   |   15 +
 app-emulation/qemu/qemu-1.1.2.ebuild               |  255 ++
 app-emulation/qemu/qemu-1.2.0.ebuild               |  254 ++
 app-office/libreoffice-bin/Manifest                |   17 +-
 .../libreoffice-bin-3.5.4.2-r1.ebuild              |  197 --
 .../libreoffice-bin/libreoffice-bin-3.5.5.3.ebuild |    3 +-
 app-office/libreoffice/Manifest                    |   16 +-
 .../files/libreoffice-3.6-separate-checks.patch    |   74 +
 .../files/libreoffice-3.7-separate-checks.patch    |   64 +
 ...e-3.6.1.2.ebuild => libreoffice-3.6.2.2.ebuild} |   15 +-
 app-office/libreoffice/libreoffice-3.6.9999.ebuild |    5 +-
 app-office/libreoffice/libreoffice-9999-r2.ebuild  |    4 +-
 dev-java/icedtea/Manifest                          |   64 +-
 .../files/icedtea-7-compile_for_7_cacao_mem.patch  |   85 -
 .../icedtea-7-compiler_detection_cleanup.patch     |  257 --
 dev-java/icedtea/files/icedtea-7-no_suffix.patch   |   25 -
 .../files/icedtea-7.2.0-explicit-gthread.patch     |   13 -
 .../files/icedtea-7.2.0_pax_kernel_support.patch   |  202 --
 .../files/icedtea-7.2.1.1-pax_mark_rmic_java.patch |   31 -
 .../icedtea-7.2.1.1-pr986-cacao_memory_fix.patch   |  143 -
 .../icedtea/files/icedtea-7.2.2-no_suffix.patch    |   25 -
 .../files/icedtea-7.2.2.1-pax_mark_rmic_java.patch |   31 -
 .../icedtea-7.2.2.1-pr986-cacao_memory_fix.patch   |  184 --
 .../icedtea-7.2.2.1-warnings_are_errors.patch      |  217 --
 .../files/icedtea-7.2.3.1-pax_mark_rmic_java.patch |   31 -
 dev-java/icedtea/icedtea-6.1.11.2.ebuild           |  316 --
 dev-java/icedtea/icedtea-6.1.11.3.ebuild           |  336 --
 dev-java/icedtea/icedtea-6.1.11.4.ebuild           |    4 +-
 dev-java/icedtea/icedtea-7.2.1.1.ebuild            |  340 ---
 dev-java/icedtea/icedtea-7.2.1.ebuild              |  334 --
 dev-java/icedtea/icedtea-7.2.2.1.ebuild            |  343 ---
 dev-java/icedtea/icedtea-7.2.2.ebuild              |  334 --
 dev-java/icedtea/icedtea-7.2.3.1.ebuild            |  337 ---
 dev-java/icedtea/icedtea-7.2.3.2.ebuild            |    4 +-
 dev-libs/boost/Manifest                            |    4 +-
 dev-libs/boost/boost-1.49.0-r1.ebuild              |    4 +-
 dev-libs/gjs/Manifest                              |    8 +-
 dev-libs/gjs/gjs-1.30.1.ebuild                     |    4 +-
 dev-libs/gjs/gjs-1.32.0.ebuild                     |    4 +-
 .../gjs/{gjs-1.32.0.ebuild => gjs-1.34.0.ebuild}   |   17 +-
 .../Alien-wxWidgets/Alien-wxWidgets-0.610.0.ebuild |   39 +
 dev-perl/Alien-wxWidgets/Manifest                  |    4 +-
 .../DateTime-TimeZone-1.500.0.ebuild               |   24 +
 dev-perl/DateTime-TimeZone/Manifest                |    4 +-
 dev-perl/Devel-NYTProf/Devel-NYTProf-4.90.0.ebuild |   28 +
 dev-perl/Devel-NYTProf/Manifest                    |    4 +-
 dev-perl/Inline/Inline-0.500.0.ebuild              |    4 +-
 dev-perl/Inline/Manifest                           |    4 +-
 dev-perl/Moose/Manifest                            |    4 +-
 dev-perl/Moose/Moose-2.60.400.ebuild               |  100 +
 dev-perl/Parse-RecDescent/Manifest                 |    4 +-
 .../Parse-RecDescent-1.967.9.ebuild                |    4 +-
 dev-perl/Plack/Manifest                            |    4 +-
 dev-perl/Plack/Plack-1.0.400.ebuild                |   37 +
 dev-perl/SQL-Translator/Manifest                   |    4 +-
 .../SQL-Translator/SQL-Translator-0.110.130.ebuild |   46 +
 dev-perl/Sysadm-Install/Manifest                   |    4 +-
 .../Sysadm-Install/Sysadm-Install-0.400.0.ebuild   |   23 +
 dev-perl/Test-Warn/Manifest                        |    4 +-
 dev-perl/Test-Warn/Test-Warn-0.240.0.ebuild        |    4 +-
 dev-perl/Text-Table/Manifest                       |    4 +-
 dev-perl/Text-Table/Text-Table-1.126.0.ebuild      |   34 +
 dev-perl/Tree-DAG_Node/Manifest                    |    4 +-
 dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.60.0.ebuild |    4 +-
 dev-perl/Wx-Scintilla/Manifest                     |    4 +-
 dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0.ebuild  |   43 +
 dev-perl/XML-Twig/Manifest                         |    4 +-
 dev-perl/XML-Twig/XML-Twig-3.410.0.ebuild          |   29 +
 dev-perl/YAML-Syck/Manifest                        |    4 +-
 dev-perl/YAML-Syck/YAML-Syck-1.210.0.ebuild        |   18 +
 dev-perl/perl-ldap/Manifest                        |    6 +-
 dev-perl/perl-ldap/perl-ldap-0.480.0.ebuild        |   34 +
 dev-perl/wxperl/Manifest                           |    4 +-
 dev-perl/wxperl/wxperl-0.991.200.ebuild            |   29 +
 dev-util/geany-plugins/Manifest                    |    5 +-
 ...ns-1.22.ebuild => geany-plugins-1.22-r1.ebuild} |   18 +-
 dev-util/geany-plugins/geany-plugins-1.22.ebuild   |   12 +-
 dev-util/geany/Manifest                            |    5 +-
 dev-util/geany/geany-1.22.ebuild                   |    4 +-
 dev-util/geany/geany-1.22.ebuild.rej               |   11 +
 dev-vcs/gitolite/Manifest                          |    4 +-
 dev-vcs/gitolite/gitolite-3.04.ebuild              |    7 +-
 eclass/autotools-utils.eclass                      |  497 ---
 eclass/base.eclass                                 |  194 --
 eclass/bash-completion-r1.eclass                   |   52 -
 eclass/check-reqs.eclass                           |  351 ---
 eclass/cmake-utils.eclass                          |  529 ----
 eclass/emboss.eclass                               |  132 -
 eclass/emul-linux-x86.eclass                       |   77 -
 eclass/enlightenment.eclass                        |  171 --
 eclass/fortran-2.eclass                            |  154 -
 eclass/fox.eclass                                  |  230 --
 eclass/games-ggz.eclass                            |   78 -
 eclass/games.eclass                                |  225 --
 eclass/git.eclass                                  |  470 ---
 eclass/gnome2-utils.eclass                         |  426 ---
 eclass/gnome2.eclass                               |  236 --
 eclass/gst-plugins-bad.eclass                      |  155 -
 eclass/gtk-sharp-module.eclass                     |  547 ----
 eclass/haskell-cabal.eclass                        |  519 ----
 eclass/kde4-functions.eclass                       |  485 ---
 eclass/leechcraft.eclass                           |   64 -
 eclass/mozlinguas.eclass                           |  144 -
 eclass/mysql-v2.eclass                             |  702 -----
 eclass/mysql.eclass                                | 1478 ---------
 eclass/obs-service.eclass                          |  109 -
 eclass/office-ext.eclass                           |  178 --
 eclass/perl-module.eclass                          |    4 +-
 eclass/php-ext-source-r2.eclass                    |  372 ---
 eclass/python-distutils-ng.eclass                  |  391 ---
 eclass/python.eclass                               | 3191 --------------------
 eclass/qt4-build.eclass                            |  882 ------
 eclass/qt4-r2.eclass                               |  294 --
 eclass/ruby-ng.eclass                              |  734 -----
 eclass/scons-utils.eclass                          |  235 --
 eclass/selinux-policy-2.eclass                     |  283 --
 eclass/systemd.eclass                              |  167 -
 eclass/vcs-snapshot.eclass                         |   66 -
 eclass/vdr-plugin-2.eclass                         |  614 ----
 eclass/vdr-plugin.eclass                           |  601 ----
 eclass/virtuoso.eclass                             |  144 -
 eclass/waf-utils.eclass                            |   75 -
 eclass/xfconf.eclass                               |  144 -
 eclass/xorg-2.eclass                               |    2 +-
 games-engines/gargoyle/Manifest                    |    4 +-
 games-engines/gargoyle/gargoyle-2011.1.ebuild      |    4 +-
 games-simulation/flightgear/Manifest               |    4 +-
 .../flightgear/flightgear-2.8.0.ebuild             |    4 +-
 media-gfx/feh/Manifest                             |    7 +-
 media-gfx/feh/feh-2.6.2.ebuild                     |   63 +
 media-gfx/feh/files/feh-2.6.2-debug-cflags.patch   |   11 +
 media-gfx/graphite2/Manifest                       |    4 +-
 media-gfx/graphite2/graphite2-1.2.0.ebuild         |  100 +
 media-gfx/inkscape/Manifest                        |    7 +-
 .../inkscape/files/inkscape-0.48.1-lcms.patch      |   20 -
 media-gfx/inkscape/inkscape-0.48.2.ebuild          |   96 -
 media-gfx/inkscape/inkscape-0.48.3.1.ebuild        |   29 +-
 media-gfx/iscan/Manifest                           |    6 +-
 media-gfx/iscan/iscan-2.26.2.ebuild                |    4 +-
 media-gfx/iscan/iscan-2.28.1.3.ebuild              |    4 +-
 media-gfx/luminance-hdr/Manifest                   |    9 +-
 .../files/luminance-hdr-2.2.1-no-git.patch         |   68 -
 media-gfx/luminance-hdr/luminance-hdr-2.0.0.ebuild |   64 -
 media-gfx/luminance-hdr/luminance-hdr-2.2.1.ebuild |   65 -
 media-gfx/luminance-hdr/luminance-hdr-2.3.0.ebuild |    4 +-
 media-libs/allegro/Manifest                        |    4 +-
 media-libs/allegro/allegro-5.0.7.ebuild            |    4 +-
 media-libs/opengtl/Manifest                        |    6 +-
 media-libs/opengtl/opengtl-0.9.15.2.ebuild         |   43 -
 media-libs/opengtl/opengtl-0.9.16.ebuild           |    4 +-
 media-radio/fldigi/Manifest                        |    6 +-
 media-radio/fldigi/fldigi-3.21.50.ebuild           |    4 +-
 ...fldigi-3.21.50.ebuild => fldigi-3.21.52.ebuild} |    2 +-
 media-tv/xbmc/Manifest                             |    6 +-
 media-tv/xbmc/xbmc-9999.ebuild                     |    6 +-
 media-video/tsmuxer/Manifest                       |    6 +-
 media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild       |    4 +-
 media-video/vlc/Manifest                           |    4 +-
 media-video/vlc/vlc-2.0.3.ebuild                   |    4 +-
 net-analyzer/rrdtool/Manifest                      |    4 +-
 net-analyzer/rrdtool/rrdtool-1.4.7-r1.ebuild       |    4 +-
 net-misc/dropbox/Manifest                          |   10 +-
 net-misc/dropbox/dropbox-1.2.48-r1.ebuild          |    4 +-
 net-misc/dropbox/dropbox-1.2.51-r2.ebuild          |    4 +-
 net-misc/dropbox/dropbox-1.4.3-r1.ebuild           |    4 +-
 net-misc/dropbox/dropbox-1.4.7-r1.ebuild           |    4 +-
 net-misc/gcap/Manifest                             |    4 +-
 net-misc/gcap/gcap-0.1.1.ebuild                    |    4 +-
 net-misc/nx/Manifest                               |    4 +-
 net-misc/nx/nx-3.5.0.15.ebuild                     |   96 +
 net-misc/youtube-viewer/Manifest                   |    5 +-
 ...outube-viewer-3.0.1_p20120924-desktopfile.patch |   21 +
 .../youtube-viewer-3.0.1_p20120924.ebuild          |   62 +
 sci-chemistry/pymol/Manifest                       |    4 +-
 sci-chemistry/pymol/pymol-1.5.0.3-r1.ebuild        |    4 +-
 sci-visualization/grace/Manifest                   |    6 +-
 sci-visualization/grace/grace-5.1.22-r2.ebuild     |    4 +-
 sci-visualization/grace/grace-5.1.22-r3.ebuild     |    4 +-
 www-client/chromium/Manifest                       |   24 +-
 www-client/chromium/chromium-21.0.1180.89.ebuild   |  435 ---
 ...1229.52.ebuild => chromium-22.0.1229.79.ebuild} |   16 +-
 ...1229.56.ebuild => chromium-22.0.1229.91.ebuild} |   14 +-
 ...0.1255.0.ebuild => chromium-23.0.1271.1.ebuild} |   68 +-
 ...0.1262.0.ebuild => chromium-23.0.1271.6.ebuild} |   75 +-
 www-client/chromium/chromium-9999-r1.ebuild        |   31 +-
 .../chromium/files/chromium-dbus-glib-r0.patch     |   59 +
 .../chromium/files/chromium-system-icu-r0.patch    |   12 +
 www-client/google-chrome/Manifest                  |   11 -
 .../google-chrome-21.0.1180.89_p154005.ebuild      |  151 -
 .../google-chrome-22.0.1229.64_beta157476.ebuild   |  151 -
 .../google-chrome-23.0.1271.1_alpha157674.ebuild   |  149 -
 www-client/links/Manifest                          |    4 +-
 www-client/links/links-2.7.ebuild                  |    4 +-
 www-plugins/google-talkplugin/Manifest             |    8 +-
 .../google-talkplugin-3.5.1.0.ebuild               |    4 +-
 .../google-talkplugin-3.6.1.0.ebuild               |    4 +-
 .../google-talkplugin-9999.ebuild                  |    4 +-
 x11-drivers/ati-drivers/Manifest                   |   14 +-
 x11-drivers/ati-drivers/ati-drivers-12.2.ebuild    |    4 +-
 x11-drivers/ati-drivers/ati-drivers-12.4.ebuild    |    4 +-
 x11-drivers/ati-drivers/ati-drivers-12.6.ebuild    |    4 +-
 .../ati-drivers-12.6_beta_pre897.ebuild            |    6 +-
 x11-drivers/ati-drivers/ati-drivers-12.8.ebuild    |    4 +-
 x11-drivers/nvidia-drivers/Manifest                |   15 +-
 .../nvidia-drivers/nvidia-drivers-173.14.35.ebuild |    6 +-
 .../nvidia-drivers/nvidia-drivers-295.71.ebuild    |    6 +-
 .../nvidia-drivers/nvidia-drivers-302.17-r1.ebuild |    6 +-
 .../nvidia-drivers/nvidia-drivers-304.51.ebuild    |  447 +++
 .../nvidia-drivers/nvidia-drivers-96.43.20.ebuild  |    6 +-
 x11-drivers/xf86-input-wacom/Manifest              |    4 +-
 .../xf86-input-wacom-0.16.1.ebuild                 |    4 +-
 x11-libs/gdk-pixbuf/Manifest                       |    4 +-
 x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.4.ebuild       |    4 +-
 x11-libs/wxGTK/Manifest                            |    4 +-
 x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild               |    6 +-
 x11-misc/wbar/Manifest                             |    4 +-
 x11-misc/wbar/wbar-2.3.4.ebuild                    |   39 +
 x11-wm/compiz/Manifest                             |    6 +-
 x11-wm/compiz/compiz-0.8.6-r3.ebuild               |  168 -
 .../compiz-0.8.6-gdk-display-deprecated.patch      |  101 -
 .../files/compiz-0.8.6-r2-fontcorruption.patch     |   23 -
 237 files changed, 2567 insertions(+), 22551 deletions(-)

diff --git a/app-cdr/dvdisaster/Manifest b/app-cdr/dvdisaster/Manifest
index fcac1ba..bb8ca20 100644
--- a/app-cdr/dvdisaster/Manifest
+++ b/app-cdr/dvdisaster/Manifest
@@ -2,6 +2,6 @@ AUX dvdisaster-0.72.1-libpng15.patch 194 SHA256 8ddbd4288c1ddb1d6cec404e25795c33
 DIST dvdisaster-0.72.2.tar.bz2 4145193 SHA256 62d00c399c99a3bba493405174aeb96bd8c2d428d01d24b46858a55531b725ae SHA512 5283c5a0f9120a02434c8561f130d497db8eb7dab646f12d9cba9bc3a3ffa97974d783a9a8c67fb0669bba9ab5306545457c29e64b6a6e7a2722d1833dbcba11 WHIRLPOOL b1732e89f11e3e2f29bfa0fc661502eae4c10eb27d6186ca0a79405ca3e40388a2499b9990046fe002717b76332437978b0bcc8ef1cc421fbcbb1abf85198d2e
 DIST dvdisaster_0.72.4.orig.tar.bz2 5097738 SHA256 444763bc40bcc8c396ecd7af0d5d6dd8c458009d4ed62af74ef54074541aa05e SHA512 aa0a9f3040d45b16a9117b2b6756d2423cf55db4a00e8314a164f6dc32863cd4e5a5b5ec009a56782aa2afe6031e3a32954014101abc67291428e9edea1b5272 WHIRLPOOL 888b9643e4102e4c7f237b336bbead60fd02833357775f586766672ea182ce680615a74f9547cf015b3e0edb269fe905a4dd5f28cbf765f3c7f114e097736208
 EBUILD dvdisaster-0.72.2.ebuild 1979 SHA256 bfd0199f5cbccd1e3d6b56194093297e9dccea19f5f19e47671e9855bee61af0 SHA512 72667b39f5bd22e9354b938a110e5f20c8af31bd4a1dccc61ec814f169e52a51286bdcc2f639c23c0d78f0e868c81f9cfea2a95a451663a98d5974fd41284880 WHIRLPOOL 63626a8bda66c6149e29947c3c174e601bd58dba4ce590c2142143c9145d54022cbc9f59686ed88d7b45a3f55ed85a13d9eb28d3c4b89cb593857910727b43b5
-EBUILD dvdisaster-0.72.4.ebuild 1906 SHA256 8f558514b32bf0327e33d427d01a4de34d2f25e5b02adc26f1b24cc709d4097c SHA512 dacd5cc391ce3c7388ca0c5851bfef49558d743e4119c2d12f7edf0c0b290350d291897bfe25ef572c36236e62fd9fecf7b100372dfbec16da32215e26a33bbe WHIRLPOOL 15248d58ba8b4a8b62f015082c9e0702acb46c4cd9e6269ae0ad463b498e6804a8189f62aaa043dc117202c06f06e75a243cf8f41b51a51554a69d37481efb03
-MISC ChangeLog 4175 SHA256 e334067e1125d6778dbe171e840153f8cf8099f8d48a40d2fec65f98948b0524 SHA512 9bd9f6ba3fdeea66ef70f8167cf20e25dd98575ba8caadac046b255b3d741ebadb6e12dab68c50acf36060364d26e5b79826bc3e7eb32ed9ae010d745bb26c6f WHIRLPOOL b79d0b0d078c2421bed97623551665524ab74c2f22ef322ad1d2c93a2045000b400633bc9d9ee30157925644d896d710481a43ce84b4ac65dafac83002f732d5
+EBUILD dvdisaster-0.72.4.ebuild 1905 SHA256 f53335fc029b33fa7d8ea42e849c1a5bc4f46ab77f4e24cc12e944bef2feb605 SHA512 23965f93ff3b7d5bc577458695b26972c222efdc7e97ed57c1f29c773a89889ed689dae584c807d2cefa482182c06fcc5273364615813eece425e54cc5afdff7 WHIRLPOOL 066e5ded8c468fd017ba7fb9b476884f969c34c59ba1335b8c8cca90c6d0778593dfc1fa78c15f026fa1bf685986a04816147ae2c678e01e68a594e39f9d47c1
+MISC ChangeLog 4281 SHA256 199bdfe8af6226d26630d9d9ab1e1f0794e42732edf76dcaa512defa20ad21ba SHA512 2e5c0833ce1553e847e17c9bfd259cfd0ebc78c3454a5b5dd86c1276cc4ffcf25a33da1fbb12d9104be8611e6f1ff4557ca63c89cc368c71272f5f65036a6e75 WHIRLPOOL 41708b7ea5ebc0cf36e9ace923d2491cd3856ad196cf263e86f58e898ca5f65430e79a2a901d6f5037f1bc9c6a7751b04c47d7aa80547d360e0c3604f55bc7d0
 MISC metadata.xml 167 SHA256 e63e128685e2c6da2eacfda6e91e700c1eb6f62cc2172ab64eada2ae71431ef2 SHA512 23b89532b34ac7118832402c25d8afc189132e0da2182fcc5ce5e69ba2f0c170226599ae981be2bbc3fd8474baf707af58f6292b89221339aa8b4a2265ade0cd WHIRLPOOL d8505f9121d7531f43f9730eff208d89eec443f6612cfa288f2f6137e75ac40faf0e11a0e89f23111e3f16dda6178c406025cce3edd399f03d9bfd5a46c76e3b

diff --git a/app-cdr/dvdisaster/dvdisaster-0.72.4.ebuild b/app-cdr/dvdisaster/dvdisaster-0.72.4.ebuild
index 3a0d975..e375de6 100644
--- a/app-cdr/dvdisaster/dvdisaster-0.72.4.ebuild
+++ b/app-cdr/dvdisaster/dvdisaster-0.72.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvdisaster/dvdisaster-0.72.4.ebuild,v 1.6 2012/08/05 11:02:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvdisaster/dvdisaster-0.72.4.ebuild,v 1.7 2012/09/26 11:11:08 ssuominen Exp $
 
 EAPI="5"
 inherit eutils gnome2-utils toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="debug nls"
 
 dvdi_langs="cs de it pt_BR ru sv"

diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index cb28030..c2925f0 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,4 +1,4 @@
 AUX emacs-24.0.92-ns-appdirs.patch 1538 SHA256 588b276284c7a56494fdba935a975c66edb668e5431bf25f1396696950c8f804 SHA512 141d6f2a0df176eafd476b1b064586ac1d32d2b920fd3e65a7bdd9ad6335d3c148761238da07329795477c7aebab2db3b685c3466ddbe6c0d297654949bb8364 WHIRLPOOL daf3baf1d88c2399435b340c178888a126ae4ed1e9ffa87575b14977f215f3cb07b109e0c1fe13ccdd5cf9b1d63b7ebd1237586fef7393c0bc279cf9a6196459
-EBUILD emacs-vcs-24.2.9999.ebuild 10900 SHA256 f7b3f114f89f36dfb35d8b030657496d47e61d55f558dfb732f8f76a61427f2c SHA512 ad5b1b7e914fc446d55b33501944226f2754220528a28b28b612f625a26a538710628cff5340393dee95813cb3ae99bc2c389e000183bfecb5da4f1d3f8bcd10 WHIRLPOOL 6642f0d59eccdf84881e448eabe565c6147970e1d890d70ad5093e2a16e93a68966dfdad7c8a697dc6589d4754e35b8649b28f1a9f44e16af1b7715e77c9da6c
-MISC ChangeLog 69621 SHA256 951e1a8118ea92cf2157fe4fef63da24dcda5d7021cba21936d641c4c21db617 SHA512 465f22749c929e83cdf05790cf426bc9de246d697daa574d937833abbe882b868ea614a3a6f5a713f2bfa6a346fabaa9ffe0d217a82a3279d13ccf6f4706f2d4 WHIRLPOOL ce2b1a9a34caca5689e525f2f62a9a9aac8e10c34f2c50347d6a53b582a56b9655dde04011f97826edeaafbf6549af93bcf4a28681567d74f27dbaf2f294eeb8
+EBUILD emacs-vcs-24.2.9999.ebuild 10899 SHA256 e4deaccc4b58220a883344ef3c8e97afbb0a178fc2e93fbf6ace48bf04922331 SHA512 d1509c4beda0fa570f545d37299de73025a3f3b5504e94d5b05d42ba3bb42eb0c4561686d5c015aa9d94a66916443ca00bf7f5357606f8f6b1afe95303f3de0f WHIRLPOOL 261fbf4e5ee51687fd415e9306ae596371995107f5febeb3b44fe0814e6ec27fc74f6661fc33281e29b39d91dc7febed9da68254b1214cadf01d3e7029a11688
+MISC ChangeLog 69755 SHA256 c83801ee9444bc1b8666137da9849d902d441cad0fa1092a30bb0a4cb95ac467 SHA512 d00741bb28e2fab82f149dcac9786ced2cbb7699a4f836fa6d398697775114fb9ce0adec2f865de49e9e677e9978a91a536661152ce9c031961b6ff4f5efcea2 WHIRLPOOL 3c7a548c29c570cab5b06ea5d22793866bae6f518374af36260348d442ea1ca35fc4ba4639d6583e17ebe898b77c63299f3113ca401f43cbdc085aa41fd4de7e
 MISC metadata.xml 2431 SHA256 f5b0a24ab6e525de4d80cffb7a635260e47c88552e7c2b3fe694b76b130d36f1 SHA512 9345b4871208b2cdc7b1ef4d1981cad54aae6da91ba3fe2aa482df8a242b87d7d1c1288f132ed70ef2cab0372418275a50754c7249bb06adc7f5a17403a40fe7 WHIRLPOOL 73f2ce2c94b5e0b83cd1d06ce975b83004d54f51d573f3330450d60c2e7c5220c4bf92ca0af403a322ed9a67806b3cb11190f81f93e135bf1f8e0d8dee0cf220

diff --git a/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild
index 3089181..e018037 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild,v 1.6 2012/09/18 06:48:05 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild,v 1.7 2012/09/25 19:13:17 ulm Exp $
 
 EAPI="5"
 
@@ -28,7 +28,7 @@ fi
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
 HOMEPAGE="http://www.gnu.org/software/emacs/"
 
-LICENSE="GPL-3+ FDL-1.3+ BSD as-is MIT W3C unicode PSF-2"
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="alsa athena dbus games gconf gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index ee4c563..18cd35e 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -8,19 +8,17 @@ DIST emacs-22.3.tar.gz 39587396 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30
 DIST emacs-23.4-patches-6.tar.bz2 3416 SHA256 a10b45101dbd3f7e4d0bcdf483736b445abf76efdd5d181607ca86180472930d SHA512 b7913b1c6b70b85656007f69b4dd08455a3bcb4eeeeec502c4754b818584e1c186d0be1e8b56ac4358b4bf64997961d72234136e52c09fa115a7a24a3911c06f WHIRLPOOL ef3ae5086863f834b3d46ba3c45c04d4ae27bd95fab225895e3052763716600df89e2b7f6b4dad437cd81e82411ac861aa7a923b66e11064f7719c4d9c868543
 DIST emacs-23.4-patches-7.tar.bz2 3852 SHA256 cfcf49838ed200d28b0073af65768931253e4db3c7b812f3a4809c6d47a6a418 SHA512 bcc3a3ab50281d1d17f906d10b3b922367e41756c5291609cabfeb0a165d061d2c40cd92f7257cba8ad3d92351e69b8647792a4fa0320479f5944e877cfe1cdf WHIRLPOOL c2f14420f2457e45a646f417c84f14a4942714229362f85ae355e2f1daf141cef706c00c00c65cdfc6e93d25e1a98d5ce11380983d1a35822ebdbc5c43253413
 DIST emacs-23.4.tar.bz2 38646508 SHA256 26576f9e664397c729f78f5ffcd092969251988461896fe8793062346ee988b9 SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296 WHIRLPOOL 2384c3f63ff153c3975e373334d6021d46b23ad3cab448ed2e1180501236453a61d13bf1dfbb2e6075bb141dd8511d85f77e37c763b39769f98de48eacc56f3b
-DIST emacs-24.1-patches-4.tar.bz2 4296 SHA256 2dda7c1d74b4fd55937c41fd25401684c6a2998dcd27ada4c5bcca856743cbd7 SHA512 bba85091b10791b7539102f5e8ea961e62da1d9b7752225997ecbbe0c1dd80acadcb74e553a89c4fce0e16c2095938f2f565566aa71f003dd108ab73b7806dc1 WHIRLPOOL 7d950722a9b63d07163b3ca150faf134017e22f38b574adfeef206f29f5a696a469d8b9fa7eb62cc4087095bd2cbf7c91a3030ce3ce7f6c74766898471c3ba00
 DIST emacs-24.1-patches-5.tar.bz2 4720 SHA256 759ea6674b86a7943e95ecfc7d7809367bc6d1506e9b55099ce5e38c80845e9f SHA512 4f213d562237443bd441698e93a9860bdb783bb845412cd3ba5b96e0f029fc49196ffd9644482ae2804293195d621d586ba64ecae7a58e427b40853bcfd52677 WHIRLPOOL f6608221cff48aaeba07f6f98ce0faa75367fafebfb19bd71914cc3ee8a2d10cf7ab25be3735da75f01dd2b7549939d533d7e9d4b54c86d994a718dd6183d32e
 DIST emacs-24.1.tar.bz2 41722508 SHA256 eeea272732146e2be9aee2f8d71d6cf07b8654c0282da62a26b921d433f02b7c SHA512 aff89b54f2c6b30aa8c9bec8902a52b76ee1c5e4717b4c7385fe3a1583153d6857eed5351ce04f0a16d8fa93bb4b96804ade5dcfffc381094cbb7724934633ca WHIRLPOOL fc9343d464ec837dd069931a90c716e200ea8c67ea2e58d916e4bc3e00ad883c05e105161f6cec868d86ca7f6ec79b2a8a9f887fd3a247c1cfb885a4a685d3f6
 DIST emacs-24.2-patches-1.tar.xz 2496 SHA256 c445422e685f3a88742ca9a376f2f147a1fb408730a84214a8752458419040ec SHA512 e51ee423b09e7ec3e725dcb9b58ea6c3a5bb826c0c46d82255975c4f6e212cef7d97831e7924782644045fadbc30690702b46e690ea4d97c87b13bc913ee37f9 WHIRLPOOL 18e5daba204ae1b1ac6cb0fd4aee05001fc24dc09b07ca70b99924d9fa56dd63573dff5d4c1121d5054bc794ebe9a78a04f37088c8ce7b74c671ec4fa5b262a4
 DIST emacs-24.2.tar.xz 34712012 SHA256 1f11b65520611d108eceea886cc1d2573704e18b19aded8a09b75fdea7eb0ddd SHA512 7627d985e9691dd5b5f2a14472592bc1da96ce90823ff50457bb5c20b6e746912b319befff5fb1dac024e1f150df6b7c687ee2cc785f5b7387885244f511bdbd WHIRLPOOL 37a2f8e45a7b3364728f9f99b0661a60355b93f19d745de505dc71b9d8a2ab4de6b4b75a104830da2bcc8d1b3d22539e5f52c85d2f104d8de0dcd0dd69dc9924
 DIST leim-21.4.tar.gz 3291433 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b SHA512 c361996f7a3fcc550e7af30a7df3f692071ded2c9dce998e72f537b0e8011f319cfae1742d0be463608a86852046cba23037a29c3ecdcbaf5976807e1d1a1e2c WHIRLPOOL d7f25d5d491f323b80609567ce5cbcb5f20109cdd4671e9972c79279a3ca5338bbf67d35ae8f0bc627bc06917f545d71ab1f66a09c647f47ddaea26772bfc5c1
-EBUILD emacs-18.59-r8.ebuild 4467 SHA256 5843fefe4e3ecf51073451fb346766d8d1552d9b046cd5dc6e61332c92963af0 SHA512 e1d586651ef042ce2af1ff68489494c43ce22733e1d9bdcf4259e6844d9abe5b28512a818051cf15175144cf33d2eabc336fd957c4622708e7af1ec5849666d5 WHIRLPOOL 3bbaac0f3a06a84e1e0a9895cb4aeea3df82204a8139b1f734fcd34f31bb679b9e191d8237a602d69e76a3a268a6cf3c67ef982a5154fe88651913e1872d3753
-EBUILD emacs-21.4-r24.ebuild 5289 SHA256 20331dede8f4b68ee8cde9e7defd3edff801a89c96f569379d305825893a564d SHA512 973e4f1a567e64cb9f55a24ea92efd8b44d5b38178f3adf0709b7da8a81c5d511cd56f526e6b9da88486ac0a27c88f31c8ec849d13475197f941b5844dbb65af WHIRLPOOL 20408d6fe100609c8c55b5d16f53fb6780f90fd8950c2a2ef7bf4d0e544e3307a5e92662741259e5d53f28d17333b8d6e887eb3116fd6c0444d614322215e874
-EBUILD emacs-22.3-r10.ebuild 7742 SHA256 129189fa3d43321462d4b76078e457cf06e3fa7227c50909651d8b191008cf57 SHA512 fd3b25cf05b890b89e5ab8d01ad2994fc3b3e20ee2b92031cba7ad7f5e257ee56ee60517c43c28d6bff6ce9106a5a6b036efa38b32c5e21c9c1c609e56e6e8a3 WHIRLPOOL 037e976e65581b192997ab738e6526c3b6d58cb265820d013f42b62b646a65766c5c2a03544657c2f6f6af30e34a2484f24c0813a8fc7be98f0bd86fba9cf028
-EBUILD emacs-23.4-r3.ebuild 10594 SHA256 ec931c632c58ece3ccb3c88e7c74f925ef32ee65628826092b10a0802d081550 SHA512 86f1e36e6b22bf0c62cf613747fc7262064b51e7376e6058c74a998f53857188422b038da222ad4cd6c0eab0644e8c31ca7d50ba3336900093778f5ddced8211 WHIRLPOOL 1cbc1299f429c6b8b854268c6011471f0715a18f684f335b3a1a5015f2cde7ff5e7036a9e25e612a15aac11972698a5bb8246e082ea6657c80eecb87d3d1da63
-EBUILD emacs-23.4-r4.ebuild 10590 SHA256 e6ebf06a6ace1b7a709cacf8f06510069b1515127ed28a5c76f3b6f90e58e130 SHA512 eb54350482c7fd8a1fd77bba15c29d01d05dd95125dc4347da2e0c08582ccab28b501cc2e26747db2ff34d8d09f038f4338d0b67437a8b05be5bf23840bfd544 WHIRLPOOL 2d716cdb6507c103e4942039046dd448b381380add03604a95a943b34cd9ec01642ce9d595ce2eddec1f20d42a6e0f6357db8df7fbbcc9cf8c51d2122c122d92
-EBUILD emacs-24.1-r1.ebuild 11019 SHA256 57283cb74e577d238549d84ceef5c7a32b23e8c4dbf9c9fcc1b8bc2a949615b4 SHA512 c137c73860a32821a626d6ea37a788b560831d5bd2f0109106bf6af8ac4f62e4ecb7c68d81a2e6bb3f3dcb9cbe7a3d31160064394c04e7378ed4ad77bbaff66c WHIRLPOOL d63dfcf16363ff0392886e1f30d844b2946d493d211f53e1101739ef9b90b78aef03d80c7d12febed445739b11fb546c69407d8de794361443318f31115490cc
-EBUILD emacs-24.1.ebuild 11021 SHA256 9c0caf43a164c6336c5f3fac835ca061b6bcc404a4bac5ccb2dfb205977e4c03 SHA512 d945bc942ba9f7fec38b9b06b74d373ccad4fc7ae70062960a9dae3afdf4a0ddbdba254e9fe112fe35e09e66e6c4aef9203403e63a4027f0e31579d5d1a6fc58 WHIRLPOOL 1bc8e5ee9c468b2705c2f85f419281119a5a916e4afefc1b991e2f064d4ec95565fffaabc843347aa4f3b7a12b0841fb393b1140cb32c6efffa18ca4ac9ac07e
-EBUILD emacs-24.2.ebuild 10982 SHA256 f28832bbe9dcb52a746f3f9f1f89125f1fd5ff64823a9898daea7dee18c3c73f SHA512 0129fc73dd79977f7db5b9de4df743c429540c01598d28557c8f2669a89103ddff293aa82f7acf359ce28456dcd0d82241f1674ebca829b8764a0a8cc4aadd81 WHIRLPOOL 641f26b20e96fb466a23e4c903ff995c1038358fde41f048cfa04ec81c4cb37c47b4e3e033f5a1ce6c5ca68252c48271c90355d7b8cfab2b516069f49b81c08c
-MISC ChangeLog 74339 SHA256 4f1ad5b2744db97df6e87e25851d7b1a5c16088488a9bb8fabc59eb6f8f502a0 SHA512 8a447d8c360ed819eeabf30e5b4e79960e1ab966f33758f5607a20d780c058df9b4422fa94674a369f67834f702c51b1078d461ddee02cd13ab8d977981fcbbf WHIRLPOOL 8455b0161a718865dffe8b295ce18fe290717aee603a61b02060c1c139a5d2f766d1e53dd6040b22427fd199dfa14d57775fd687bed0172fe35627c303deb70e
+EBUILD emacs-18.59-r8.ebuild 4466 SHA256 5d9cb405643e4c9cf25305391971337e1f5df1b7cd33bde8e487eb792031e7e7 SHA512 fdf65eb9de75318b1e7bfe0372ef1b8ba7aebe55a933bbc3857e92008ef41075c675fff352bde92d1179c7fc757bd091a138af204dc4d02119f7a96ea02bd01e WHIRLPOOL 56bcc9a7f992203c275ae74717a6df401572f25f4e4489fac688e22595a8c115345ddbf41efff631023eb074839038e1049510c1debd73d77054dc51fb5b8bc6
+EBUILD emacs-21.4-r24.ebuild 5288 SHA256 14dc85c4bc2ed74628b0f6970e10b31f4baac4d653d43016abf646ef0aca5b7b SHA512 bccecca7ca47b4295ac5a484c85288a723239c70c35aac62c9b50bc4c6736a72a8c8a4448fdbeac7e6acd34974d219c581bcb68e53a6636b41c08e839a83799a WHIRLPOOL b316e9426fc5e01668b20dee311b7eb5122b650e4eb5b2d6d145a1562fa622c56eca606c9bbcd7560140ebd34c1aae39c9adaf87bca0dd4a9fcf5fa7276668c5
+EBUILD emacs-22.3-r10.ebuild 7741 SHA256 8a32d29186c48a0e39aec60a4ac5601a7d13f9c69bebf939c08856374a7b8353 SHA512 8c36fead12a851fe731707ad4402d61517f3bbc9ee1d7575fe0571e6b0ae4ce7c2ba09c7451cd5bbcbd71c16dd734f6ee7cccf2434e223f553fb5cacb160431a WHIRLPOOL 041135abcfa1eb90020e3ff4fc2f4af3a3a3ec3c69035cfb2abc0c0d7c2d2f14467d8957fb4ce054460e45c957fe3dbb47d4da73ce60b6596cea134df0b58263
+EBUILD emacs-23.4-r3.ebuild 10593 SHA256 5a229b949161edb2fa8db8a7ee169841074aa446598d04eb5e374f9536c5fe97 SHA512 11207369217a257ec751e51506443b5a0fe749b1a4a6273add165d01e307f5b12b588319c58c8eeb99db2a566ec9c3beb3bc249c14ed836078bcdb39e7a499e3 WHIRLPOOL 21d263e79da393d8543e7029ee2dc48df64d933120eb75b2facd02be0d20947c2580457df8e35b909ce7f8ba494985574774214b788bc6378752ee8235b108da
+EBUILD emacs-23.4-r4.ebuild 10595 SHA256 28d5e04b5f749a3ed8a79f07d82ce68fe8b2c936cc02669c58d6f6c0031ea74a SHA512 d41b2f5745214683143ab92f2f4c19ceae6da44d62cdef209fe016fcd9495d0f75be589619254fcefdfb1ee9614f4a9e8584dd5bddc6d6d3924411e4fd02098e WHIRLPOOL f0c4293207c29ec544c4d6251719107020b8f36872bb5435b54e87de78739ee219d7672ce3d1dbbe8c03fd0fd492f068dd5b619c636a57fecd0bdd9590695642
+EBUILD emacs-24.1-r1.ebuild 11024 SHA256 ceefde7ef9845a5d9e724339a8ffeccd90bab677c580b696c2c748fea82f66e9 SHA512 8713956987f7b8cb85bcb4ff90dd1bc2e09b3a81a7ac13712d4cabdba9941a3ca23009fe5b032c8a60ef1350e02d2bca845683a11c9ab5de37561b370d7555e7 WHIRLPOOL dd158f40d8f1b0132109a5d89818fae7221eab0aaa9705ec7a3ae39fc97cfdaf7cee0dc2abd07808cbe465409803cc1253186b1705338287f36af9769713528b
+EBUILD emacs-24.2.ebuild 10981 SHA256 8a9ff0823f64f51532e257a3a3af4af03f4b141d83dd1788ddf8e4f6dc98d8c5 SHA512 b2d1fd6d05d8e3ff070147f8ff00e3eb6449860af599d6da99aefefeb3224e9d1f555d3176020e45153634f9efb57b1f2f49ac821e63957939d48265e5f3370c WHIRLPOOL a6f49054477f98c1f4fd0fc4e7b70d53718a1aa638a1deb1c8732db25d91f7f7202c17382ffabb8550495946570d61433a846fd7eeb86081922448a04180dea8
+MISC ChangeLog 74834 SHA256 330bd0825f2836a9c1a85de8475506f6e45d653cbad5ab5819829fc35db6ac78 SHA512 06fc9290c00024d07b71f13696b5c2a35add39da12701d7726aa18cca3b1f348bebf9056a8550fb623e1b9475bc71c65e5aef3378fb26cfc0624d06486d7b0f3 WHIRLPOOL 709e16a432aa3e40214dd9c91b47812553b82149b3ceaed306779e27ca3084d0afecadda8a6c507b55e6511707cebb3929f909d047615fae57020101c0091568
 MISC metadata.xml 2554 SHA256 94ab92fa323dcb5747564f95bfd1e2a3eca2511cd3e95b48e4ca95ea40ac8238 SHA512 24207b2227969f1d87126bbca5046f10f848f22584fa9c2a23a88ebb854e4344cc564902be1e6e1b86ae8b9da416f65ccf6172d4595633d6063f78893f9ae0c1 WHIRLPOOL db5cb9f87e4804152bf0a41807497733f4a4c382dd634b2ba7cc41fb6bda07191adca7e68b11dcac79d681b3b17dc9a4d629d0b8d152cd8c148883e754385155

diff --git a/app-editors/emacs/emacs-18.59-r8.ebuild b/app-editors/emacs/emacs-18.59-r8.ebuild
index 649d6cf..1e7d663 100644
--- a/app-editors/emacs/emacs-18.59-r8.ebuild
+++ b/app-editors/emacs/emacs-18.59-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.7 2012/09/18 06:52:43 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.8 2012/09/25 19:12:18 ulm Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/old-gnu/emacs/${P}.tar.gz
 	ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz
 	mirror://gentoo/${P}-patches-8.tar.bz2"
 
-LICENSE="GPL-1+ GPL-2+ BSD" #as-is
+LICENSE="GPL-1+ GPL-2+ BSD" #HPND
 SLOT="18"
 KEYWORDS="amd64 x86"
 IUSE=""

diff --git a/app-editors/emacs/emacs-21.4-r24.ebuild b/app-editors/emacs/emacs-21.4-r24.ebuild
index 6e66b5b..c03182b 100644
--- a/app-editors/emacs/emacs-21.4-r24.ebuild
+++ b/app-editors/emacs/emacs-21.4-r24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r24.ebuild,v 1.6 2012/09/18 06:52:43 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r24.ebuild,v 1.7 2012/09/25 19:12:18 ulm Exp $
 
 EAPI="5"
 WANT_AUTOMAKE="none"
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
 	mirror://gentoo/${P}-patches-13.tar.bz2
 	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
 
-LICENSE="GPL-2+ FDL-1.1+ BSD as-is MIT"
+LICENSE="GPL-2+ FDL-1.1+ BSD HPND MIT"
 SLOT="21"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="X Xaw3d leim motif sendmail"

diff --git a/app-editors/emacs/emacs-22.3-r10.ebuild b/app-editors/emacs/emacs-22.3-r10.ebuild
index 7f1246e..3971983 100644
--- a/app-editors/emacs/emacs-22.3-r10.ebuild
+++ b/app-editors/emacs/emacs-22.3-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r10.ebuild,v 1.3 2012/09/18 06:52:43 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r10.ebuild,v 1.4 2012/09/25 19:12:18 ulm Exp $
 
 EAPI="5"
 WANT_AUTOMAKE="none"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/emacs/${P}.tar.gz
 	mirror://gentoo/${P}-patches-8.tar.bz2"
 
-LICENSE="GPL-3+ FDL-1.2+ BSD as-is MIT"
+LICENSE="GPL-3+ FDL-1.2+ BSD HPND MIT"
 SLOT="22"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="alsa games gif gtk gzip-el hesiod jpeg kerberos motif png sound source tiff toolkit-scroll-bars X Xaw3d +xpm"

diff --git a/app-editors/emacs/emacs-23.4-r3.ebuild b/app-editors/emacs/emacs-23.4-r3.ebuild
index 30005cd..0e394ec 100644
--- a/app-editors/emacs/emacs-23.4-r3.ebuild
+++ b/app-editors/emacs/emacs-23.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r3.ebuild,v 1.13 2012/09/18 06:52:43 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r3.ebuild,v 1.14 2012/09/25 19:12:18 ulm Exp $
 
 EAPI="5"
 WANT_AUTOMAKE="none"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
 	mirror://gentoo/${P}-patches-6.tar.bz2"
 
-LICENSE="GPL-3+ FDL-1.3+ BSD as-is MIT W3C unicode PSF-2"
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="23"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"

diff --git a/app-editors/emacs/emacs-23.4-r4.ebuild b/app-editors/emacs/emacs-23.4-r4.ebuild
index cb6df65..f76e4df 100644
--- a/app-editors/emacs/emacs-23.4-r4.ebuild
+++ b/app-editors/emacs/emacs-23.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r4.ebuild,v 1.7 2012/09/18 06:52:43 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r4.ebuild,v 1.9 2012/09/26 15:53:37 xarthisius Exp $
 
 EAPI="5"
 WANT_AUTOMAKE="none"
@@ -12,9 +12,9 @@ HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
 	mirror://gentoo/${P}-patches-7.tar.bz2"
 
-LICENSE="GPL-3+ FDL-1.3+ BSD as-is MIT W3C unicode PSF-2"
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="23"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
 REQUIRED_USE="aqua? ( !X )"
 

diff --git a/app-editors/emacs/emacs-24.1-r1.ebuild b/app-editors/emacs/emacs-24.1-r1.ebuild
index 8acadea..92a1105 100644
--- a/app-editors/emacs/emacs-24.1-r1.ebuild
+++ b/app-editors/emacs/emacs-24.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.1-r1.ebuild,v 1.7 2012/09/18 06:52:43 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.1-r1.ebuild,v 1.9 2012/09/26 15:53:37 xarthisius Exp $
 
 EAPI="5"
 
@@ -11,9 +11,9 @@ HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
 	mirror://gentoo/${P}-patches-5.tar.bz2"
 
-LICENSE="GPL-3+ FDL-1.3+ BSD as-is MIT W3C unicode PSF-2"
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="alsa aqua athena dbus games gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
 REQUIRED_USE="aqua? ( !X )"
 

diff --git a/app-editors/emacs/emacs-24.1.ebuild b/app-editors/emacs/emacs-24.1.ebuild
deleted file mode 100644
index 6a3617e..0000000
--- a/app-editors/emacs/emacs-24.1.ebuild
+++ /dev/null
@@ -1,338 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.1.ebuild,v 1.13 2012/09/18 06:52:43 ulm Exp $
-
-EAPI="5"
-
-inherit autotools elisp-common eutils flag-o-matic multilib
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
-	mirror://gentoo/${P}-patches-4.tar.bz2"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD as-is MIT W3C unicode PSF-2"
-SLOT="24"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="alsa aqua athena dbus games gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
-REQUIRED_USE="aqua? ( !X )"
-
-RDEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-1.2
-	>=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?]
-	net-libs/liblockfile
-	hesiod? ( net-dns/hesiod )
-	kerberos? ( virtual/krb5 )
-	alsa? ( media-libs/alsa-lib )
-	gpm? ( sys-libs/gpm )
-	dbus? ( sys-apps/dbus )
-	gnutls? ( net-libs/gnutls )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	selinux? ( sys-libs/libselinux )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib )
-		jpeg? ( virtual/jpeg )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk3? ( x11-libs/gtk+:3 )
-			!gtk3? ( x11-libs/gtk+:2 )
-		)
-		!gtk? (
-			Xaw3d? ( x11-libs/libXaw3d )
-			!Xaw3d? (
-				athena? ( x11-libs/libXaw )
-				!athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	alsa? ( virtual/pkgconfig )
-	dbus? ( virtual/pkgconfig )
-	gnutls? ( virtual/pkgconfig )
-	libxml2? ( virtual/pkgconfig )
-	X? ( virtual/pkgconfig )
-	gzip-el? ( app-arch/gzip )
-	pax_kernel? ( sys-apps/paxctl )"
-
-RDEPEND="${RDEPEND}
-	!<app-editors/emacs-vcs-24.1.9999-r1"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-# FULL_VERSION keeps the full version number, which is needed in
-# order to determine some path information correctly for copy/move
-# operations later on
-FULL_VERSION="${PV%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-
-src_prepare() {
-	EPATCH_SUFFIX=patch epatch
-	epatch_user
-
-	if ! use alsa; then
-		# ALSA is detected even if not requested by its USE flag.
-		# Suppress it by supplying pkg-config with a wrong library name.
-		sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-	if ! use gzip-el; then
-		# Emacs' build system automatically detects the gzip binary and
-		# compresses el files. We don't want that so confuse it with a
-		# wrong binary name
-		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa && ! use sound; then
-		einfo "Although sound USE flag is disabled you chose to have alsa,"
-		einfo "so sound is switched on anyway."
-		myconf="${myconf} --with-sound"
-	else
-		myconf="${myconf} $(use_with sound)"
-	fi
-
-	if use X; then
-		myconf="${myconf} --with-x --without-ns"
-		myconf="${myconf} $(use_with gconf)"
-		myconf="${myconf} $(use_with gsettings)"
-		myconf="${myconf} $(use_with toolkit-scroll-bars)"
-		myconf="${myconf} $(use_with gif) $(use_with jpeg)"
-		myconf="${myconf} $(use_with png) $(use_with svg rsvg)"
-		myconf="${myconf} $(use_with tiff) $(use_with xpm)"
-		myconf="${myconf} $(use_with imagemagick)"
-
-		if use xft; then
-			myconf="${myconf} --with-xft"
-			myconf="${myconf} $(use_with m17n-lib libotf)"
-			myconf="${myconf} $(use_with m17n-lib m17n-flt)"
-		else
-			myconf="${myconf} --without-xft"
-			myconf="${myconf} --without-libotf --without-m17n-flt"
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			myconf="${myconf} --with-x-toolkit=$(usev gtk3 || echo gtk)"
-			local f
-			for f in athena Xaw3d motif; do
-				use ${f} && ewarn "USE flag \"${f}\" ignored" \
-					"(superseded by \"gtk\")"
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-			use motif && ewarn "USE flag \"motif\" ignored" \
-				"(superseded by \"athena\" or \"Xaw3d\")"
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf="${myconf} --with-x-toolkit=motif"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf="${myconf} --with-x-toolkit=no"
-		fi
-
-		! use gtk && use gtk3 \
-			&& ewarn "USE flag \"gtk3\" has no effect if \"gtk\" is not set."
-	elif use aqua; then
-		einfo "Configuring to build with Cocoa support"
-		myconf="${myconf} --with-ns --disable-ns-self-contained"
-		myconf="${myconf} --without-x"
-	else
-		myconf="${myconf} --without-x --without-ns"
-	fi
-
-	# Save version information in the Emacs binary. It will be available
-	# in variable "system-configuration-options".
-	myconf="${myconf} GENTOO_PACKAGE=${CATEGORY}/${PF}"
-
-	# According to configure, this option is only used for GNU/Linux
-	# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
-	# out the location because $(get_libdir) does not necessarily return
-	# something that matches the host OS's libdir naming (e.g. RHEL).
-	local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
-	crtdir=${crtdir%/*}
-
-	econf \
-		--program-suffix=-${EMACS_SUFFIX} \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-crt-dir="${crtdir}" \
-		--with-gameuser="${GAMES_USER_DED:-games}" \
-		--without-compress-info \
-		--disable-maintainer-mode \
-		$(use_with hesiod) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with gpm) \
-		$(use_with dbus) \
-		$(use_with gnutls) \
-		$(use_with libxml2 xml2) \
-		$(use_with selinux) \
-		$(use_with wide-int) \
-		${myconf}
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake CC="$(tc-getCC)"
-}
-
-src_install () {
-	emake install DESTDIR="${D}"
-
-	rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
-		|| die "removing duplicate emacs executable failed"
-	mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
-		|| die "moving Emacs executable failed"
-
-	# move man pages to the correct place
-	local m
-	for m in "${ED}"/usr/share/man/man1/* ; do
-		mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
-	done
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{applications,icons}
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	local c=";;"
-	if use source; then
-		insinto /usr/share/emacs/${FULL_VERSION}/src
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-		doins -r src/{m,s}
-		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
-		c=""
-	fi
-
-	sed 's/^X//' >"${T}/${SITEFILE}" <<-EOF
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	X  ${c}(setq find-function-C-source-directory
-	X  ${c}      "${EPREFIX}/usr/share/emacs/${FULL_VERSION}/src")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-		elog "Emacs${EMACS_SUFFIX#emacs}.app is in ${EPREFIX}/Applications/Gentoo."
-		elog "You may want to copy or symlink it into /Applications by yourself."
-	fi
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [[ -f ${ED}${infodir}/dir.orig ]]; then
-		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	elif [[ -d "${ED}"${infodir} ]]; then
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${ED}"${infodir}/dir{,.*}
-		for f in "${ED}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${ED}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
-
-	if use X; then
-		elog "You need to install some fonts for Emacs."
-		elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
-		elog "machine would satisfy basic Emacs requirements under X11."
-		elog "See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml"
-		elog "for how to enable anti-aliased fonts."
-		elog
-	fi
-
-	elog "You can set the version to be started by /usr/bin/emacs through"
-	elog "the Emacs eselect module, which also redirects man and info pages."
-	elog "Therefore, several Emacs versions can be installed at the same time."
-	elog "\"man emacs.eselect\" for details."
-	elog
-	elog "If you upgrade from a previous major version of Emacs, then it is"
-	elog "strongly recommended that you use app-admin/emacs-updater to rebuild"
-	elog "all byte-compiled elisp files of the installed Emacs packages."
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}

diff --git a/app-editors/emacs/emacs-24.2.ebuild b/app-editors/emacs/emacs-24.2.ebuild
index 904ae68..45dccea 100644
--- a/app-editors/emacs/emacs-24.2.ebuild
+++ b/app-editors/emacs/emacs-24.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.2.ebuild,v 1.2 2012/09/18 06:52:43 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.2.ebuild,v 1.3 2012/09/25 19:12:18 ulm Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 	mirror://gentoo/${P}-patches-1.tar.xz"
 
-LICENSE="GPL-3+ FDL-1.3+ BSD as-is MIT W3C unicode PSF-2"
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="alsa aqua athena dbus games gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"

diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest
index 29ccaf6..33adfb0 100644
--- a/app-emulation/qemu-kvm/Manifest
+++ b/app-emulation/qemu-kvm/Manifest
@@ -15,8 +15,8 @@ DIST qemu-kvm-1.1.1-bp-2.tar.xz 5404 SHA256 2cfec58dbeea354664d98f9920d8c41f946f
 DIST qemu-kvm-1.1.1.tar.gz 6599376 SHA256 c6fab57ccadcad5deb34728623840a0141a0f3c8f29d0c253db577f059c796df SHA512 1106a35212cdac1fe5b043af6754595d03232f22bf74cdab86973759adb3cff2d3d7b42290883d2d99d97d163fe274de0108a05eed906ffdc3349c0631f52492 WHIRLPOOL 4d9b2b788a7f87104032635b3b6e2cd96275b92683e3003510b0951536ed6bcb959959bc7529e3f912a7a2055b5c1710b9310d591a8b443a17a231e5b86f6105
 EBUILD qemu-kvm-1.0.1-r1.ebuild 12235 SHA256 d7256f46f3d114877109ec607b8b6186060b03e4f4896f052d5ae60051ce901c SHA512 9ba5e841de010f1198899acf06868d888af419fa14ec9831fe2e0ee806dfc1640797abe44dd47c2ce341a259879cddff5b74b95834c8d73f15172fed02f71e71 WHIRLPOOL 7573df0b236500b547d04148de46d69f43a52359ad040e50c2ed3c969df16e49e90d785a1e8054474868e6ec17ca7ab13d4859c2c2604f17e9e0893010cbf366
 EBUILD qemu-kvm-1.0.1.ebuild 11509 SHA256 214a547028e2767e16d8067ded8d5dcab91b8aa924b326ad62ed82c3a298272a SHA512 8eef5aa8fdc4d4ff1c0a158c91de3df07515860031f7f3a7087071b160823790aa6dd4ef0f0fe753408788c4e0b4a545686f1213f43de2d7af11b364ee0d034d WHIRLPOOL 15832313b89f192137b6e2f0e7d72a642520592979c02e3b0ee565db538f97a9d146f404f1ef82b39df49d4ee6b208747d8d207d64347739cd1256da2b3730b3
-EBUILD qemu-kvm-1.1.1-r1.ebuild 12013 SHA256 828791211af9467691c4bc773e3943c7c3109d2a458ce69bb2baa786b15c69a0 SHA512 f775053060fc16dca506ff57222dae76bef7525246277eb072151d72d8b411eb52f9d1f9d07e0bf1db9850c5917c8948b901d8611b953ca53122e16e8d4e16fc WHIRLPOOL 4d983f82429c3aea6e219187f6f250fbb1e0ecbda088ca62e4dace2a9571ec61bb7501f897e7e684baf4767b859321df07b585b8324653bba045e053e434ede9
+EBUILD qemu-kvm-1.1.1-r1.ebuild 12017 SHA256 a86c491c846b747df1bb57a1ac82641eac2c4a3c48f4979db62e0346067cdfcd SHA512 5c3fc3ef190cd0db980b0a3a3ad85ab5800dbc4f70dbd0b1c2b568a11de1f2a26bd794465de3f28781efd64d043e6a5bd57d5853cad09b0a2e8c823dd08e13fd WHIRLPOOL 7bb0e7837f8ab532b0bd12aa72496f7e7ce6002a1865ae6c6445d406065649723ba17f2b15fc7ba864fc0f7fee6b7fb18442483bcd549a4f03d30413c60a82b8
 EBUILD qemu-kvm-1.1.1-r3.ebuild 12096 SHA256 45ad3d466f6ce1a12b71741bf7671de9de7e1b2c4861effea7c1411b230ea4bf SHA512 4b3bb0af0791a6e1914839c63b6f9f03990a328539e79ab4f8821f9bb88c6753d4b794baae2b86b368dd702b5b451e4b171bb3746cfb4cf256f56ea27609fe11 WHIRLPOOL ae469611b22212b5cdd45d5422528d2f54a94465733c6e44693b9371f514cf10e8436e4ba6c1ba2d01637b2c897c1901f10fb4d61fbcdcce6a4f6ee5eebbf981
 EBUILD qemu-kvm-9999.ebuild 12699 SHA256 4136353afa5138bf820d709a6d784a00cd401cc40d1e71377fdcfb6608b6fc92 SHA512 4024d147f10e2a2f1517060935ce2fe749e0f0cc1ee2ea7e326340a973229cd0169db1a62076f308d858646a9f63c5c209a49f2b4fe51f4b8afec4c8741ed5e2 WHIRLPOOL 1e149825be906e0abca31ae683427949be48c8892e60999d2c3c9fd21f4ae02fa592f91f13bcce675d89d9eea462b733cdcd05344ddcba3f9560d9a1157feac7
-MISC ChangeLog 31791 SHA256 76a8a8fcae331fca1b8d911aaa7c854ec9dde01e118aad2ec7c375494c98f3e5 SHA512 59742ae212cf460d46b556b0c66e590e980b38e93222204c467e2a4860a5d02e06d44060c9964d651b251f6fb1a530867d7b2a2dfffbb851797bacc1bd4d288b WHIRLPOOL 09bf166de33ef89858c820a7b17efa14bd2b6e763245dc56752f893429946a6e382aa433b2c700213557e70e0a428354525a0fb1cad5122b8c37b32c795a0ac2
+MISC ChangeLog 31908 SHA256 c11db2f8193138f92d622a58302de6e5ab73b49740092349c11dbd818f401db0 SHA512 59cfef5c2669a6b98c22dfefc5c57cce567714c02ca60d6270d4b4a6b9bbff6248cb234ae8adf5ae15c73533dee34debce086968d64f40da10048102113ed625 WHIRLPOOL 43282d99a2fc9a015c5cc28a429bf1ea02b65a3d1dc1cf938af7a382e094e7db36a504f442d4b2ff90d5678f2cee9e72a9886ebd9db4965d17c3c2c41eb11a68
 MISC metadata.xml 2337 SHA256 b1e73a813ad11b04406255a877894bdfa52967d1cfd1a46338622d85c62d8168 SHA512 0ab3cd05e097cc4711038523121d63a036512e456d192663aee57af17f8f68c214c6ef3166c3a45602cfbd910efa3e57524740ffcde1792c5f9de6564ef24353 WHIRLPOOL 437741e74a6578749afefdf76f5e57a1ceb9e3fe0585cba2512168d9227fd41f429a741dd8602a78bbc7d37df9fd5df04b1c40534775e4cf724c9caa417ea24e

diff --git a/app-emulation/qemu-kvm/qemu-kvm-1.1.1-r1.ebuild b/app-emulation/qemu-kvm/qemu-kvm-1.1.1-r1.ebuild
index 5741447..bf3a64c 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-1.1.1-r1.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.1.1-r1.ebuild,v 1.9 2012/09/10 02:20:44 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.1.1-r1.ebuild,v 1.10 2012/09/23 08:47:42 phajdan.jr Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ else
 	SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz
 	${BACKPORTS:+
 		http://dev.gentoo.org/~cardoe/distfiles/${P}-bp-${BACKPORTS}.tar.xz}"
-	KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index c3a807b..b6b7f71 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -4,6 +4,7 @@ AUX qemu-0.11.1-cfg-pulse.patch 622 SHA256 22ee9c11fad4f1360dff7dfddf0776db72efe
 AUX qemu-1.0-unmagic-debug.patch 1929 SHA256 dd68fa1abc9e7c9d17bb2407c5a5b80b1302a9c1b24805abe61537b068347659 SHA512 12aad340c8357ca42b7fb7fe27e455f6386d99ac904912b60751721cbd32dc0a7068653650271bdcc0a539c72d73e9ede7cd07a598d8a4b4f6e1ea5d639b4c13 WHIRLPOOL d31da466acc21cc2d9b9920ac51f0eece475a2d76163fd185a9585b249da348bef115b1f9dbb35407a4718ea9cdbf5a0a82ae10e497d5d50ff417841df7c7097
 AUX qemu-1.0-unmagic-xfsctl.patch 654 SHA256 b69f5fac63fdd61a314373359dc20b1bf0d4eb6bc0e66105032d28c107a81090 SHA512 a9f8c20b03dad360b1a1cdfcb30109755319582dad3f2c376084a776e55c437af58c55d682b958b11f378c78aff517accd4d93e5d3907c52a9fdfb2ca214d119 WHIRLPOOL 2aabacaf42a496e9fd1fb492c3a8e515fea719eda596d5713502810a24d189dabb16a0b2f9ef46c484af84d276f5b8eea76e3f1c3c8ccf0c38416cca5ef53cdb
 AUX qemu-1.0.1-siginfo.patch 2268 SHA256 b5d8ddf3469b72ac3c82847c7b35df5f84ab2b0f2924e7cdaacaaae173f69846 SHA512 10d27fe413fc5fb3de941a2b00d6504ce766d6246c481c811263617f2cf88f5dda318ecc78b681f0f84c3e8d954527c84d5c21712c908cbfc89b6d5f4a49e6b9 WHIRLPOOL 591645f4e453126b98f055a96fe06e115d7c8821bc7b2be13e329aeeac61d7694ae4df9c62a7eb5d67e5a78d3ab9defdd01db36a2567d7acfc86c69373bb29db
+AUX qemu-1.2.0-cflags.patch 359 SHA256 8917142633d32497d63dd2f2934e17d86a2e2ab11be2c8551e7218c9251b66a1 SHA512 f60ecc9a0e6969436a77444193cdba4f3028db683de0963870cbac5bf3a1b47da815926236f127a5f56333efc21efc52eb732cfce6393b764bfa1b9f569df645 WHIRLPOOL e0b3b8e1e68a3b42ce7727f7fa2029dd382fe9c8f7260c29e52368a1cd3b29efcfc134cf9908b3590ed6fe57c785bd05bf676e61736dc321a7a4899dd8b0a861
 AUX qemu-ifdown 478 SHA256 7d90c39184fd7531d9b8ae787122b68ac768b41afeb0ef2b3baa6461f77af03d SHA512 6aeffcd1cd38ce0468fb280d52de402429d8d88b97b215e6e3727bc7f58f63e60a84ed351becc854436fdcd33d00c0e4ee7b1f5f31b225a009e8af6decab0e4d WHIRLPOOL de2be76d26c28bf5dca213106be824836b682e47f9cfbefe51d515fb4ae5a090624bb7050f13a0340a1305925473043ac5316172b33a197359cd7d89d414174c
 AUX qemu-ifup 554 SHA256 eae9b50680442acc29c65a245a2d26a63756ad4cb894e08cb5ea249686801f1d SHA512 dd1fab3db7fa6e8b8ce3ef27e09996629c0eea9e3d4f6489523af71f25eb0f801d30614a5e0f191b6977b34d13b588e64a5cec8fcc731e6ff7dbfdebc759f028 WHIRLPOOL fb665f63982a47fe47c5186036524981c848ad22902886bc10425e2ea7d06dafdd9b4fe86027e4d9ae3847d81b0fc9c2d6fe7dcf63e55cd943cd0a63503b7450
 AUX qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch 1412 SHA256 9a06665c47b76b2501f148713c46f8ce0b14ed03da5e6cb03c0d141f5d91900a SHA512 ce0cb894819ff4a97de54a0f8935a8311f563c3ef4f7b71f15d83f333481febce947697430db92bf3fe95fbbc921312cb163bc6f214d1cf7c4275d4c4d331587 WHIRLPOOL a526113ef51e6d65ba01db9a8310a161f857b80672a588b52d468540d4ee715b378164ca6c1b7eac68b359895a7b938df67f2a68fc7f2d44ac9d804f7e0afa1d
@@ -12,12 +13,16 @@ DIST qemu-1.0-patches.tar.xz 43540 SHA256 32a8b98cd5fd661268328d71efbfafd6597210
 DIST qemu-1.0.1.tar.gz 10853005 SHA256 198902e10782517f607c9ed9e629b5e7708ea39eb373ed3ec3f1c8a169d98378 SHA512 c3c311288bd9e843c3e9dae9ad36e370ffa6a379878fae1067e656e9a1f38e002314e59f0fc46c84df98bdd4d6b7acc6b99907b3cf04a2b100a752b837da0178 WHIRLPOOL d05e7d97855f67347d7f3e252b7f72f16b112ae2c0b9a9b56e60ab11f78712789d99c35adf09e44c1a4d853a7f24c1dd65ebd7199c5ce66fea00442ff6be6fd0
 DIST qemu-1.0.tar.gz 10848714 SHA256 47674b7da559d5e1b44cc401af9ac5ad962d14e9eede12567b13e4b841989737 SHA512 a49ed9c30f018d361d1cdd71d7149e2373e9243653aee119ece0f2e23d45c61e1fe72412c4a58b6b9906a3003ab70b9a9ba43f090b7edabef3785e04ead5cc70 WHIRLPOOL 850ce298be0c51bfdce3dd987844bda4bd4784016b45f73aab953b56ccde143f67e8a498e3ad1a49b658dcba268b8487ffd0974128342a358ac079055099a0b2
 DIST qemu-1.1.1-1.tar.bz2 9635574 SHA256 6fbaff1fa75aae1a06947cf7cb101c35273712c561b87ef8eaec92aa39734ac8 SHA512 4501b024b1d188349ab767f5c4de4a9bd491b7f7cd62ffbcdf49c1983b96ae1c39d9fba170522014b03d15e7fbdcf8c5276e7790818bbeb741f4f9d38e04a4fb WHIRLPOOL 6d8d6758455f3589bb15c4b10e113ef254cff41a1b7eb2e0f8f17da5d39f0b0ac0bc061f36394888fbe7ee44503df03210103e3016e3aa919cc63c5c77b9089b
+DIST qemu-1.1.2.tar.bz2 9644554 SHA256 d1e2bcd13c9ac4602aa2a2804b7a141d02f7c8480a7618355400a2cd3659a4e8 SHA512 1e68f21f5e5a1fbb4fc8cdfbdf32709631583269e0cb56f6d48377bc33c3ebc1be0be9407e8a5c75f69a29250b0b74388cd19f12c6f5ba9c7c3fe3a3c2b7422e WHIRLPOOL 99a1d29ddc312e93ec3a799a0954ce9310e1fc1797eca139dbd4baed596b5374ac2cd04c42d3b82e546d94dbd4943c16db11e522bfa5db6a3c6a2582d25fa761
+DIST qemu-1.2.0.tar.bz2 9865186 SHA256 c8b84420d9f4869397f84cad2dabd9a475b7723d619a924a873740353e9df936 SHA512 b590ea4ff484abc1abf2d3ec3fb294d4ece24d2dfa0a179d9c5f60baca0ea474d47a560f5d95b010a53a5563793414f3257240c5e9917a8d0f556a2066ccd60e WHIRLPOOL 5e5a5f09b828b0aff6139d7efad4dd0d1ed8d86badc2657f7ea53352aa1dbb6e6e227501f7ab63f7e95ee248007942ae94431b7f99092a4ed7005c345b10ca4e
 EBUILD qemu-0.11.1-r1.ebuild 4894 SHA256 25ef257efc5ee950d5f93ad3dc059c24cc8104e094b62840477ec719c66bd5f5 SHA512 0afcc745a78a23a8fba3cdd518595894f4ed12b4048b128c55be3f53c96f97d7701dd5bebbfcbb06cf37da617a78f3813f847792542e27e85e932ba9395eb542 WHIRLPOOL 3b606df1b67a37b61f858a0e76133867b2c281d0cde1024c510cf4bcdb433e25db117bd817e6e91eadf0d42246c55873e69078bb5f4c212122fc89a36cd7c5c4
 EBUILD qemu-0.11.1.ebuild 4826 SHA256 7aaf359e5b09721faeb9b97ff0fd8ac4c91ba8906d8f9439ac21550af786fcda SHA512 5a9631fe38c86b1fd56519544f381ab4fdb064004a1b229adda361916724ef88451dd72713c61b092a056111a7a66143d9dd0e4b5638a69f9c782f21b63d2289 WHIRLPOOL 2c50d082e32176108d661a199dd9633c4d5bdd94288921d443148c62657cf9f8f24db268f0babf4fdc707d24e3f317e0a019670104849b6b00b272cb505a2006
 EBUILD qemu-1.0-r2.ebuild 6839 SHA256 beec478e25574c362a6349614bbc9f86829f621228a8e63a748ff0a079a1fd79 SHA512 c2706e0f5a069abe696b3811c28a0fbef5edad2942e8d44bc55dbc068eee1d98c50ea03eade46686c2d4e1b903cbe100925a4eb0a499d22a424652c006ba3f8e WHIRLPOOL 1cf251a1b10c09de669a085454ac72ae4dfd7e9363ab5852885ff202505c3cb36ab35dbb8056cab73847a548deec857eeb425a9be10774a0d2105a10731385f7
 EBUILD qemu-1.0-r3.ebuild 7147 SHA256 5d5a273c9eaec2f8b686a22f3d142a0e8246166288c84d97e45e9bb33790ed3b SHA512 1a4903f95d18f158bc2d99ffabfd3c6831f4cf0353dd61c7438428acf371ad24338290b4280680d91a63044235be4c335f8c6e4726d84dcbcf25f6b3f3c6fb7b WHIRLPOOL 7ba4dc1a480631df3da1fe279ce4b30d9213815b14303120fa5faa18057e3cdbd03be6b38d7377bac0529e1b695c526fa521d5a825bf6e168a7b462f2eb21e35
 EBUILD qemu-1.0.1.ebuild 7155 SHA256 3a9457204437593c6391d138ddecd20fcd5ae5f9c31797cde43df22277501e63 SHA512 3c09ef92ae24385a4aacbea6a71f565bb6492787b0dade7178b6004cd09c0900b9a119cdfc0e4688155078850800c51d893fafd423375c0b035be3fad24ded69 WHIRLPOOL 9f2064cdc91760a29ed2ed97e28a79776150e05c763f469205d031ffcb3545ec2151ee175718a4523bd18a11a6e524dfe81e1adb7e32c9e48f681a090793d04b
 EBUILD qemu-1.1.1.ebuild 6831 SHA256 79fee352b10df29a2a64d8f74f3f82786e7e99b45b15b1f553674233838fd328 SHA512 b0b26baca2d939c64581a8cee7670445592f70d3494e24cb950aa8df306027640568358598492707fd28f079b9de51001626163cd9f8f0fac13b98f9432bec69 WHIRLPOOL 79a87fb49eeb37ff6b362791326959cd9217463cc0c47d27745207b783de05f0761adf1fa9c54829c31fc7a41f009520247b4c18d7c893a28be6443e89f92621
+EBUILD qemu-1.1.2.ebuild 6829 SHA256 a41ed75024f3c2e89e57e2f3c767e8e61eb23a67b691586b09ef6ea0dc9a22f5 SHA512 9be738e2bb3c312001fed0832d1237a3629c820275becc14cfc5ac65152c46c244e191ac9411342db316be8c923b177329a0358f66212d0f7be2ba3c748d5ce0 WHIRLPOOL de0a60c7baf621c3e58275ec57cc05552164cbed5456dd92d4b61a9b4e854000d02fab9e6a97a3d97ac35e8895db324210e103d9f0d69cd0033b6bba49975f94
+EBUILD qemu-1.2.0.ebuild 6785 SHA256 74041e2d6a48360d04b4852f5323c3c0ea2f90fa204d4861dfe1ce0f4b6393ba SHA512 11ad96141cbb025a4890f07e42eec54c4d47614b34cf037b6bd5a8789a21d04012155615de7ca2b5e4bc2d1486fe214b360be824fe91d6fd71cbbd0074a33208 WHIRLPOOL 42d449500fa453735da2c258f93ab8e053f9a421a86efec903f61fdec44ecd07b12fd839e86435c06ccb5566dd659879deda8d303b12c25f9333a371325a10ad
 EBUILD qemu-9999.ebuild 6764 SHA256 6488d82f375fc3f2baf1858923963dcc1add2ca555bb8eaaa22136c6643f39d7 SHA512 e8b71b27d05781ddb9b9af71322a52ddfd10fa2fe2fa0b73039d51dc5106ed905a2f9b154e32e004a4ff433372959a0cc57a3158c8f54949219b7763779b4444 WHIRLPOOL 74be9ac4d11639570f1ef5d776b55d1d8451ded2f7cbb17ebf52e6611cb696bde01fbac08160f0e2917e525767128e10001095007e6189efa80cea6a99f62830
-MISC ChangeLog 17579 SHA256 64f3999fde4cc207fe8b2409efabbf8049944423dd3073263b8bbb6e6908bcf8 SHA512 308512edec910ed665c40f215e131bb1dd85bc9d0e6ba2d726a5b60be8559a3696fb64781e5aea3b7543b1be2de5b68feb12015a9cdc211bd945502e4a187dfc WHIRLPOOL 9aac741d79b4986f5bbe5bb1eccbdc9c092dbe330050a4d2b6e706ff94d492d978e993eb42adf9dda0c1ff6d52af74dc0cf69eea35cfaae63a18272857e38f10
+MISC ChangeLog 17774 SHA256 62b9c8f192caa28767baab0ad0611543f7ff5cb907ee8804198d2775d7dcb766 SHA512 10d5a7ad08371f2a7280b6368b970f4301a07f884611bcb311a767bb6aaca6dce08e6acaa8e515c0a6371d3389f799f434fda82bc15d88b69a79dca1ff57dbb7 WHIRLPOOL 3465302fcd3624df809f85a5c5abd69107a4255e025ac9045790609708db564a484a0b12666918055ecfc1c85499f963623e042fba062db03b903547fbf021b3
 MISC metadata.xml 2506 SHA256 039849ef9550e3ef56d5821e4bd7ef0b8cfad1da24f9bf4476ac6871d0f32357 SHA512 8c9aa246aaaadbc295b5f16e62f33a66ebc88c44551de3b2819d0be088c5912fee45655e1994767c8d1f061887a2a769bae896f6e3eb51f3e31603c9bd3a1eca WHIRLPOOL 7f61ba9dc0c645397795de5547ff219ea430f4a37c5a7c1cedd830eba0e839b70d8a1afca1dec7b381bbafeb8ba786f472a2e0adb0b10300e220cdaf889d0724

diff --git a/app-emulation/qemu/files/qemu-1.2.0-cflags.patch b/app-emulation/qemu/files/qemu-1.2.0-cflags.patch
new file mode 100644
index 0000000..9aaa1d6
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-1.2.0-cflags.patch
@@ -0,0 +1,15 @@
+don't override user cflags
+
+--- a/configure
++++ b/configure
+@@ -2995,10 +2995,6 @@ fi
+ # End of CC checks
+ # After here, no more $cc or $ld runs
+ 
+-if test "$debug" = "no" ; then
+-  CFLAGS="-O2 -D_FORTIFY_SOURCE=2 $CFLAGS"
+-fi
+-
+ # Disable zero malloc errors for official releases unless explicitly told to
+ # enable/disable
+ if test -z "$zero_malloc" ; then

diff --git a/app-emulation/qemu/qemu-1.1.2.ebuild b/app-emulation/qemu/qemu-1.1.2.ebuild
new file mode 100644
index 0000000..4bce8b9
--- /dev/null
+++ b/app-emulation/qemu/qemu-1.1.2.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.2.ebuild,v 1.1 2012/09/22 22:01:23 vapier Exp $
+
+EAPI="5"
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://git.qemu.org/qemu.git
+		http://git.qemu.org/git/qemu.git"
+	GIT_ECLASS="git-2"
+fi
+
+inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs python
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="http://wiki.qemu.org/download/${P}.tar.bz2"
+	# Pending review
+	#KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="QEMU emulator and ABI wrapper"
+HOMEPAGE="http://www.qemu.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+aio alsa bluetooth brltty curl fdt hardened jpeg kvm ncurses nss
+opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads usbredir vde
++vhost-net xattr xen xfs"
+
+COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
+
+for target in ${IUSE_SOFTMMU_TARGETS}; do
+	IUSE="${IUSE} +qemu_softmmu_targets_${target}"
+done
+
+for target in ${IUSE_USER_TARGETS}; do
+	IUSE="${IUSE} +qemu_user_targets_${target}"
+done
+
+RESTRICT="test"
+
+RDEPEND="
+	!app-emulation/qemu-kvm
+	!app-emulation/qemu-user
+	>=dev-libs/glib-2.0
+	sys-apps/pciutils
+	>=sys-apps/util-linux-2.16.0
+	sys-libs/zlib
+	aio? ( dev-libs/libaio )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bluetooth? ( net-wireless/bluez )
+	brltty? ( app-accessibility/brltty )
+	curl? ( net-misc/curl )
+	fdt? ( >=sys-apps/dtc-1.2.0 )
+	jpeg? ( virtual/jpeg )
+	ncurses? ( sys-libs/ncurses )
+	nss? ( dev-libs/nss )
+	opengl? (
+		virtual/opengl
+		x11-libs/libX11
+	)
+	png? ( media-libs/libpng:= )
+	pulseaudio? ( media-sound/pulseaudio )
+	qemu-ifup? (
+		sys-apps/iproute2
+		net-misc/bridge-utils
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl )
+	sdl? ( >=media-libs/libsdl-1.2.11[X] )
+	spice? (
+		>=app-emulation/spice-0.9.0
+		>=app-emulation/spice-protocol-0.8.1
+	)
+	ssl? ( net-libs/gnutls )
+	usbredir? ( sys-apps/usbredir )
+	vde? ( net-misc/vde )
+	xattr? ( sys-apps/attr )
+	xen? ( app-emulation/xen-tools )
+	xfs? ( sys-fs/xfsprogs )
+"
+
+DEPEND="${RDEPEND}
+	app-text/texi2html
+	virtual/pkgconfig
+	>=sys-kernel/linux-headers-2.6.35
+"
+
+# alpha ELF binary. don't let portage mess with it
+STRIP_MASK="usr/share/qemu/palcode-clipper"
+
+QA_PRESTRIPPED="
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/palcode-clipper
+"
+# keep sorted
+QA_WX_LOAD="${QA_PRESTRIPPED}
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-armeb
+	usr/bin/qemu-cris
+	usr/bin/qemu-i386
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-ppc64abi32
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32
+	usr/bin/qemu-x86_64
+"
+
+pkg_setup() {
+	use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
+
+	use kvm && ewarn "You have enabled USE=kvm feature. Please consider using app-emulation/qemu-kvm"
+
+	python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0.1-siginfo.patch
+
+	# prevent docs to get automatically installed
+	sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
+
+	# Fix underlinking.
+	# Fault reproducer: USE=nss QEMU_SOFTMMU_TARGETS=lm32 QEMU_USER_TARGETS=
+	sed -i 's/opengl_libs="-lGL"/opengl_libs="-lGL -lX11"/' configure || die
+}
+
+src_configure() {
+	local conf_opts audio_opts user_targets
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		use "qemu_softmmu_targets_${target}" && \
+		softmmu_targets="${softmmu_targets} ${target}-softmmu"
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		use "qemu_user_targets_${target}" && \
+		user_targets="${user_targets} ${target}-linux-user"
+	done
+
+	if [[ -z ${softmmu_targets} ]]; then
+		conf_opts="${conf_opts} --disable-system"
+	else
+		einfo "Building the following softmmu targets: ${softmmu_targets}"
+	fi
+
+	if [[ -n ${user_targets} ]]; then
+		einfo "Building the following user targets: ${user_targets}"
+		conf_opts="${conf_opts} --enable-linux-user"
+	else
+		conf_opts="${conf_opts} --disable-linux-user"
+	fi
+
+	# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
+	conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
+
+	# drop '-g' by default as it tends to eat
+	# A LOT (~2GB) of ram for each job #355861
+	conf_opts="${conf_opts} --disable-debug-info"
+
+	# Add support for static builds
+	use static && conf_opts="${conf_opts} --static"
+
+	#config options
+	conf_opts="${conf_opts}
+		$(use_enable aio linux-aio)
+		$(use_enable bluetooth bluez)
+		$(use_enable brltty brlapi)
+		$(use_enable curl)
+		$(use_enable fdt)
+		$(use_enable hardened pie)
+		$(use_enable jpeg vnc-jpeg)
+		$(use_enable ncurses curses)
+		$(use_enable nss smartcard-nss)
+		$(use_enable opengl)
+		$(use_enable png vnc-png)
+		$(use_enable rbd)
+		$(use_enable sasl vnc-sasl)
+		$(use_enable sdl)
+		$(use_enable spice)
+		$(use_enable ssl vnc-tls)
+		$(use_enable threads vnc-thread)
+		$(use_enable vde)
+		$(use_enable vhost-net)
+		$(use_enable xen)
+		$(use_enable xattr attr)
+		$(use_enable xfs xfsctl)
+		--disable-bsd-user
+	"
+
+	# audio options
+	audio_opts="oss"
+	use alsa && audio_opts="alsa ${audio_opts}"
+	use pulseaudio && audio_opts="pa ${audio_opts}"
+	use sdl && audio_opts="sdl ${audio_opts}"
+
+	set -- --prefix="${EPREFIX}"/usr \
+		--sysconfdir="${EPREFIX}"/etc \
+		--disable-strip \
+		--disable-werror \
+		$(use_enable kvm) \
+		--disable-libiscsi \
+		--enable-nptl \
+		--enable-uuid \
+		${conf_opts} \
+		--audio-card-list="ac97 es1370 sb16 cs4231a adlib gus hda" \
+		--audio-drv-list="${audio_opts}" \
+		--target-list="${softmmu_targets} ${user_targets}" \
+		--cc="$(tc-getCC)" \
+		--host-cc="$(tc-getBUILD_CC)"
+
+	echo ./configure "$@" # show actual options
+	./configure "$@" || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	if [[ -n ${softmmu_targets} ]]; then
+		if use qemu-ifup; then
+			exeinto /etc/qemu
+			doexe "${FILESDIR}"/qemu-if{up,down}
+		fi
+	fi
+
+	dodoc Changelog MAINTAINERS TODO pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+	dohtml qemu-doc.html qemu-tech.html
+}
+
+pkg_postinst() {
+	use qemu-ifup || return
+	elog "You will need the Universal TUN/TAP driver compiled into your"
+	elog "kernel or loaded as a module to use the virtual network device"
+	elog "if using -net tap.  You will also need support for 802.1d"
+	elog "Ethernet Bridging and a configured bridge if using the provided"
+	elog "qemu-ifup script from /etc/qemu."
+	echo
+}

diff --git a/app-emulation/qemu/qemu-1.2.0.ebuild b/app-emulation/qemu/qemu-1.2.0.ebuild
new file mode 100644
index 0000000..3dd0142
--- /dev/null
+++ b/app-emulation/qemu/qemu-1.2.0.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.0.ebuild,v 1.1 2012/09/22 22:01:23 vapier Exp $
+
+EAPI="5"
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://git.qemu.org/qemu.git
+		http://git.qemu.org/git/qemu.git"
+	GIT_ECLASS="git-2"
+fi
+
+inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs python
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="http://wiki.qemu.org/download/${P}.tar.bz2"
+	# Pending review
+	#KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="QEMU emulator and ABI wrapper"
+HOMEPAGE="http://www.qemu.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+aio alsa bluetooth brltty curl fdt hardened jpeg kvm ncurses nss
+opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl static usbredir vde
++vhost-net xattr xen xfs"
+
+COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
+
+for target in ${IUSE_SOFTMMU_TARGETS}; do
+	IUSE="${IUSE} +qemu_softmmu_targets_${target}"
+done
+
+for target in ${IUSE_USER_TARGETS}; do
+	IUSE="${IUSE} +qemu_user_targets_${target}"
+done
+
+RESTRICT="test"
+
+RDEPEND="
+	!app-emulation/qemu-kvm
+	!app-emulation/qemu-user
+	>=dev-libs/glib-2.0
+	sys-apps/pciutils
+	>=sys-apps/util-linux-2.16.0
+	sys-libs/zlib
+	aio? ( dev-libs/libaio )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bluetooth? ( net-wireless/bluez )
+	brltty? ( app-accessibility/brltty )
+	curl? ( net-misc/curl )
+	fdt? ( >=sys-apps/dtc-1.2.0 )
+	jpeg? ( virtual/jpeg )
+	ncurses? ( sys-libs/ncurses )
+	nss? ( dev-libs/nss )
+	opengl? (
+		virtual/opengl
+		x11-libs/libX11
+	)
+	png? ( media-libs/libpng:= )
+	pulseaudio? ( media-sound/pulseaudio )
+	qemu-ifup? (
+		sys-apps/iproute2
+		net-misc/bridge-utils
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl )
+	sdl? ( >=media-libs/libsdl-1.2.11[X] )
+	spice? (
+		>=app-emulation/spice-0.9.0
+		>=app-emulation/spice-protocol-0.8.1
+	)
+	ssl? ( net-libs/gnutls )
+	usbredir? ( sys-apps/usbredir )
+	vde? ( net-misc/vde )
+	xattr? ( sys-apps/attr )
+	xen? ( app-emulation/xen-tools )
+	xfs? ( sys-fs/xfsprogs )
+"
+
+DEPEND="${RDEPEND}
+	app-text/texi2html
+	virtual/pkgconfig
+	>=sys-kernel/linux-headers-2.6.35
+"
+
+# alpha ELF binary. don't let portage mess with it
+STRIP_MASK="usr/share/qemu/palcode-clipper"
+
+QA_PRESTRIPPED="
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/palcode-clipper
+"
+# keep sorted
+QA_WX_LOAD="${QA_PRESTRIPPED}
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-armeb
+	usr/bin/qemu-cris
+	usr/bin/qemu-i386
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-ppc64abi32
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32
+	usr/bin/qemu-x86_64
+"
+
+pkg_setup() {
+	use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
+
+	use kvm && ewarn "You have enabled USE=kvm feature. Please consider using app-emulation/qemu-kvm"
+
+	python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.2.0-cflags.patch
+
+	# prevent docs to get automatically installed
+	sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
+
+	# Fix underlinking.
+	# Fault reproducer: USE=nss QEMU_SOFTMMU_TARGETS=lm32 QEMU_USER_TARGETS=
+	sed -i 's/opengl_libs="-lGL"/opengl_libs="-lGL -lX11"/' configure || die
+}
+
+src_configure() {
+	local conf_opts audio_opts user_targets
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		use "qemu_softmmu_targets_${target}" && \
+		softmmu_targets="${softmmu_targets} ${target}-softmmu"
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		use "qemu_user_targets_${target}" && \
+		user_targets="${user_targets} ${target}-linux-user"
+	done
+
+	if [[ -z ${softmmu_targets} ]]; then
+		conf_opts="${conf_opts} --disable-system"
+	else
+		einfo "Building the following softmmu targets: ${softmmu_targets}"
+	fi
+
+	if [[ -n ${user_targets} ]]; then
+		einfo "Building the following user targets: ${user_targets}"
+		conf_opts="${conf_opts} --enable-linux-user"
+	else
+		conf_opts="${conf_opts} --disable-linux-user"
+	fi
+
+	# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
+	conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
+
+	# drop '-g' by default as it tends to eat
+	# A LOT (~2GB) of ram for each job #355861
+	conf_opts="${conf_opts} --disable-debug-info"
+
+	# Add support for static builds
+	use static && conf_opts="${conf_opts} --static"
+
+	#config options
+	conf_opts="${conf_opts}
+		$(use_enable aio linux-aio)
+		$(use_enable bluetooth bluez)
+		$(use_enable brltty brlapi)
+		$(use_enable curl)
+		$(use_enable fdt)
+		$(use_enable hardened pie)
+		$(use_enable jpeg vnc-jpeg)
+		$(use_enable ncurses curses)
+		$(use_enable nss smartcard-nss)
+		$(use_enable opengl)
+		$(use_enable png vnc-png)
+		$(use_enable rbd)
+		$(use_enable sasl vnc-sasl)
+		$(use_enable sdl)
+		$(use_enable spice)
+		$(use_enable ssl vnc-tls)
+		$(use_enable vde)
+		$(use_enable vhost-net)
+		$(use_enable xen)
+		$(use_enable xattr attr)
+		$(use_enable xfs xfsctl)
+		--disable-bsd-user
+	"
+
+	# audio options
+	audio_opts="oss"
+	use alsa && audio_opts="alsa ${audio_opts}"
+	use pulseaudio && audio_opts="pa ${audio_opts}"
+	use sdl && audio_opts="sdl ${audio_opts}"
+
+	set -- --prefix="${EPREFIX}"/usr \
+		--sysconfdir="${EPREFIX}"/etc \
+		--disable-strip \
+		--disable-werror \
+		$(use_enable kvm) \
+		--disable-libiscsi \
+		--enable-nptl \
+		--enable-uuid \
+		${conf_opts} \
+		--audio-card-list="ac97 es1370 sb16 cs4231a adlib gus hda" \
+		--audio-drv-list="${audio_opts}" \
+		--target-list="${softmmu_targets} ${user_targets}" \
+		--cc="$(tc-getCC)" \
+		--host-cc="$(tc-getBUILD_CC)"
+
+	echo ./configure "$@" # show actual options
+	./configure "$@" || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	if [[ -n ${softmmu_targets} ]]; then
+		if use qemu-ifup; then
+			exeinto /etc/qemu
+			doexe "${FILESDIR}"/qemu-if{up,down}
+		fi
+	fi
+
+	dodoc Changelog MAINTAINERS TODO pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+	dohtml qemu-doc.html qemu-tech.html
+}
+
+pkg_postinst() {
+	use qemu-ifup || return
+	elog "You will need the Universal TUN/TAP driver compiled into your"
+	elog "kernel or loaded as a module to use the virtual network device"
+	elog "if using -net tap.  You will also need support for 802.1d"
+	elog "Ethernet Bridging and a configured bridge if using the provided"
+	elog "qemu-ifup script from /etc/qemu."
+	echo
+}

diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index 05acaf5..ffe2eee 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,29 +1,16 @@
 AUX 50-libreoffice-bin 158 SHA256 6c6cebcce51b639545a42c0b9cc6268f0ce1e8bb9d7d22bb11e5ebd1448638e9 SHA512 2d1158f48ac80f9212578d020e5659e777ff494adc3abc94438cec6890b88741f92ea2ed3bb4585ffdabe531d55c6938ca9408e9ece5a438e67d480eb406ed50 WHIRLPOOL 47d4187edca8b343378a2f58e63b0c10cc11f11b21702064fe102003e2bb6eaf3de660128442238e1c040b97ccaa1ee45d8089713c3a62a1dacfe5a72f1c6ee2
-DIST amd64-bin-libreoffice-base-3.5.4.2-r1.tar.xz 76837568 SHA256 bc785d04de8fb3054484da86415a4c84ed398df63fda72a488363ead08fafd2a SHA512 4f753a0205ae7432ce41030c05cc192f16d748047798390b2e80425e02c43de9eb395a231143a0cdb6718ceab346dfb6c3ce264ac4b07bc220cf85422aad4b76 WHIRLPOOL b50a93c4521902ce844dfeeaf749cdb455c26839e61b8e02d722b5a9094e6b742945098d68e72a625da280063ecd37c9db6396495e51097c6b1c0e37eb69919d
 DIST amd64-bin-libreoffice-base-3.5.5.3.tar.xz 76857984 SHA256 e3990695fa70b4e80f416dba8609b523a1a282906d8822471578762771fe3101 SHA512 573b118354f9b005d39fdf1339647450da904619afedfd1cf3bf09894be7e7552ccff40a0e1dadad16e83a7f013201a47e68c4766c66b4e2f8f8521df573991c WHIRLPOOL 4b6b5c01e1c4676a073330dceb660b6238f1fc0cb7ef691d54b8d6e8d303ff52389fdf9672301be11917d058ea4f1f61d54f683d527d5b2f417820ddd5295736
-DIST amd64-bin-libreoffice-base-java-3.5.4.2-r1.tar.xz 81548412 SHA256 b746c51f3a1535e4d6df7e05cf39b46bf8dda2ad3f70e9a8d6401655f8acf4e6 SHA512 eb9d9f62791ccf6025e57109b64c4925176ac4f4472e1be8430b0761fd6dcd9302f9adfa5cf6ce7a0083df0262d60ca0efe1b76d6e81597e0d97ed0ae9100020 WHIRLPOOL 5a0db88c5ef52fc9e9e1f02047ac4a7279edeb1594ff1c783c15e6010e4e51b48046723797f11ff9b0eeee379a9f1da8ade67f449fa46dec0503293343ecd20d
 DIST amd64-bin-libreoffice-base-java-3.5.5.3.tar.xz 81547036 SHA256 cf903ffc547985e35f82b7ba0e5b8ef30b1670e7a4bee2b6360bf40943571460 SHA512 01918a898441f5db199737b8e28ac94f445f074b7426c0de5047cd9df9573a889cce73489760389a1495a10524f0d8c4e118f318469b45a3df933fb1ab20e02e WHIRLPOOL 35724bb7344bcf8e555b3034ec29531a670bda0b272a6d2b2b16019eb40fb5258f4a2946cbab551d6c5b2314f558c97a75807f5211ca865d8f11918902fee6b1
-DIST amd64-bin-libreoffice-gnome-3.5.4.2-r1.tar.xz 76936220 SHA256 93287a3b878d2a2ac0ed047645679299335d44219e37ff0b1674fe5c458e8ce4 SHA512 e36f242ca48fa4b4b9670215f15ca5717f20119dbe14b1ea7677a219eb5ba449a46a7cea0659d9a4f306272e64db4ff1506f2a3c9b68ec8ffc65699632a09c27 WHIRLPOOL 4413f7582de9f202d648da6373cc2151d059ef544b51d23e48deeee66c248b7bd3b9fd3e79919b9a0a6d46320a2015363b6466cb410b82788b927295db0143a1
 DIST amd64-bin-libreoffice-gnome-3.5.5.3.tar.xz 76960252 SHA256 7382b15818cc96fe6224f43c25695674a9522eff43ef43fc700d938917c28291 SHA512 7971ffd2209fd9bc5cdd5413f19081c8058bfb3cbe452d6ef2ecb4193fb9f7fa03da3cf31b63e39ea03c69fa9389d08bbf970457ffd7b4fbc67384c1c143aa6b WHIRLPOOL 12653d9a33f0464323e636803a4b4b12ea32769c6f4f838ed13ca0a40ed7b00d4e6feaeaddbf3cdc9bda5ba853fa23fe91760ddead7de21b97d25de32fa63d89
-DIST amd64-bin-libreoffice-gnome-java-3.5.4.2-r1.tar.xz 81649352 SHA256 0f072eade4ba36281750409a9f2749a1f00b98dbf3b08e47b2d29e4b58117dff SHA512 3040ad52d14a6e9e92b21bb77464c9585685c487e8cb4c45e36bbdc3427b8316f107326d0e824cbfc4f7a12a221bb5764939a2de6d53b7a61133cfc5d0051ff0 WHIRLPOOL 42dccfa92db92a8e0bbd6b057df0985b22404d9b377c2a7eb364f71d65259bca6f8cb477215c2d58a47cfb74e43b83f892edb311f5f6c5295fc3326f14076f3b
 DIST amd64-bin-libreoffice-gnome-java-3.5.5.3.tar.xz 81659368 SHA256 419eb4071b5bb74455cbf7c8bc96fcace38f247d369ee9ea7c915960805eaa55 SHA512 d680913dd07873d2053430a0049798611653a3ab6e9ea7609b84a4b1433a6d769482177e79da1c04b8138b18fdb655b84cb8063b20fa92a17718537639955fdc WHIRLPOOL 982f77efd95171c2075f59967c8c650a7ed8a77ea087f4995a251d397e462da5cc955a8fd828d8a834dc2d001e38bb0afa69f4aa55ef9dd154643b012831076d
-DIST amd64-bin-libreoffice-kde-3.5.4.2-r1.tar.xz 76892264 SHA256 d771cd1dac3621cd00608a3077213a2616cc4928fd6ce6607e042e3b03b1ab2d SHA512 71015256803bbb6c702f4896edb73384c6fff8e9f71bfbdd93125f6b6dbca0773f9ccf7979930fb6516c44632fcc9456c1cf3ea6c2b89c7f3f4b211d8e9d69e2 WHIRLPOOL a3c7f392904d45f9076ce84db1863fd567e062d341cae92e869e9d99f1f0fb48adb017492f94f54d9f3eb91a13d80f5e88d1c76977d512444bfb42df65578caf
 DIST amd64-bin-libreoffice-kde-3.5.5.3.tar.xz 76893536 SHA256 0ea3cf9192f0bb49661775a5ead4ae933e0581f7dfbee5acd0a4237aa650a750 SHA512 0fbd9900efea9fadb36489487bfafeffa90c1ed672257a4ebf2fc7e575d143102fb722f63e4befc34f805ee5c4e1415aa57639fb1904713110fa7b10b25010f5 WHIRLPOOL 61417200edc142cff5b1eab1ff4c798e4980f41b94b377ac39cdb08d12576bc65d17f035e0bb59d17d8cfabd927586d5de8afed9f7c3378f014ef66d0cc27f40
-DIST amd64-bin-libreoffice-kde-java-3.5.4.2-r1.tar.xz 81594828 SHA256 f46853f5088421e6f9cc663ded560df860a323f5a7b6c33e23f06abfc1681a9e SHA512 48353ba055e880f88afb810d7fc4b9f8f405871a2112a4f7fe819626fa2f6808ba45152c294fe12d8da30e1cf65e597a8a3c3f6a8df004a61cd42b6e70079daf WHIRLPOOL 82970cbf1669e7686af39e23baa258e20476770de2ac984ac6d2a0b583521a2d359081e9926cfdff20655d3ad0993323675434eb05f085f864ddd252633ead4e
 DIST amd64-bin-libreoffice-kde-java-3.5.5.3.tar.xz 81609840 SHA256 28cebeb54c077672af554dcfd14172ac2b95673b9aa4dccb2473b0b5aa3cf30f SHA512 05fe5e59d864cac134443ce4972acc100e74a30f802695d681119d3e7447ac59bb486f1fdcb3eb807752e66dbc34b32bf5fd1e26451c1b0d51c93437266e333c WHIRLPOOL 4ca9c9abba59f77b0b990e591f07fed9b591375e8eb7f0cbc88aca7f6f45dcc2c64cd3c79c0f64d3ca9e0b4bc9e62deca4a6c3cbde492e5cd414474a14bde752
-DIST x86-bin-libreoffice-base-3.5.4.2-r1.tar.xz 75020464 SHA256 d03f7dee46a5d9f2fdc5c7679badcbe3952360e7a31c485934c7fb8b04655087 SHA512 1c80fd13d4987b702606b1d266e3a4961cfa79ed75a1e409f1f850266f32decb9d885a21871e7d75f8950cb9809f82dd9c0b50687abb336a50d31515c66810f4 WHIRLPOOL 9fbc81bd7473827bd98259ce7ddd942a1dd8523cb5a88bbe3a4e4922af48f24d34218b1d8c1cf740884559318862af900cd9622da776e599dd9ed0d1cb67ecad
 DIST x86-bin-libreoffice-base-3.5.5.3.tar.xz 75130636 SHA256 a78e1482a1343640b083f5e944cc99752cf898ec23e9d6a2e43bfc86c59be9bb SHA512 2ee449edc285d51a33f81d851977b1fc8f48a8ea98591e0c651acb222c6a8c2d24bf9c7a578885433477515cfbfc67a2ef6e28afd274775ca279d838a2afad16 WHIRLPOOL ef853aa8416932b180a2fc83fe80b2c49a3e3a8a5dd176b3fcfa73a5489d8edd179d46ec3e7ae79f0467b0ee91a8d95320e8c39d830d5762efd73bad3c4158b2
-DIST x86-bin-libreoffice-base-java-3.5.4.2-r1.tar.xz 79728264 SHA256 4bee2375adffcefec252b364f6ba946493c4b4364e3bea2c5f30e32b67c413ad SHA512 1309169050606dda61ca2172a96351c2621f9082a6dbb4b0723ff4ada0fcfb0bad43c9079012d980ec2bd378bd24c8039ced986c44194b36e1c4dd66adde3d11 WHIRLPOOL 4a861016cecfd1a6891415b2b6ea17508e281c0158314fbdc41c694da630cbb347385d466c924957b9dc91c3dc8645db49b3d420919cc33d34f1dd2ba9a2d23b
 DIST x86-bin-libreoffice-base-java-3.5.5.3.tar.xz 79843968 SHA256 2ad3e3714e61a386f8992cdb5e8b0d6a13e15a5a8e9d3d1666a5f85e0f59a87a SHA512 994b389ea9cd29784b0e91430bc5efb26d9843277b0628c8642f57275e29ac4ff20034df9f1e232538a001dd311cb9773f7af35255ba6a755a5e12a782d69456 WHIRLPOOL e4f8a344220a44685ec580a42b2b208d11ede9e8b2f56c7b13fe1b266fc58a7059826585ee863e8f73981eed8e9e8c59f6548992dbcec93eb544668b65936a72
-DIST x86-bin-libreoffice-gnome-3.5.4.2-r1.tar.xz 75118392 SHA256 260b514cbfe0dfe197b1cf9348accb716fecb86c58c5972080ef960422570a17 SHA512 4f8f6e8399fa5b3139192c469d18dd81e23d401f6c88e44245ed34456d5c528e4df291edd3bcd7d75cd7b13f1e852c939b6402f41b14df9207f6367c60fa24fe WHIRLPOOL 6dd22fd9af44adb98208cdecd04a1bcd4170c01ffec31aa5384c2ca658995d04745aa6d4e57cf82df2368017b3d7fb423255a6819c8d3b0e7ac3c6d9e4e1b658
 DIST x86-bin-libreoffice-gnome-3.5.5.3.tar.xz 75223724 SHA256 226455e05dd200c87d42ee3ac7c1fe927c84204767d7d8ff64ad6579dfc20598 SHA512 1e50b506e98e662a923563c9343069ec9b5f4a7d87c0c04073f46f3a28f5cc3f028339e94dab5927887c3e0bd36db2d15374de74a197bd95c7d505cebe123373 WHIRLPOOL 00dfce8e6e1cd00eea6a6840601317a774295119aeb58cc5c9c02489f177d061890ad4b7e4688154d9d9e029e326c877dc68bff800a77a11f4137353eca00535
-DIST x86-bin-libreoffice-gnome-java-3.5.4.2-r1.tar.xz 79815720 SHA256 c018de2c4e16fdc28936b31c43bb78f845a2fa922f7770faf7c568a0526c208e SHA512 1941ad3eb55782c7d02bcdeaacdca0228e4a7e1922449c7ecf63109a15a416615ad2ef8c4c09fd77016cda66fe5024f4eb7e890f5a53502ea2fc4792f9ee5d1e WHIRLPOOL 5135835bc180310b6f7f2274e6c006503bbaa0baf433a3c8335c0cc9355f85a4d6e78348d4eb98e051343b35fea71c4ddf4b3e7b16ebc60208d4ab4a081a0898
 DIST x86-bin-libreoffice-gnome-java-3.5.5.3.tar.xz 79920296 SHA256 ba5a42892af7b3ea9ea54aa983b2e398fac222078116c8b55166ba74b762e80e SHA512 e72043a2853d47b28742aa4b832c5b98ec6ad1e2df4605bb3e261b25e052504595578611438cf9d03cc6e97a388e32d5b2c08d2dcb0beda8c8ddf6b47adee994 WHIRLPOOL 3d12cb72880d542556b19bf32897aac3e221a41000f876d2363202408c116fcdee52c9aee9434647df1a192ef1245a01af169a1001553326df4f0712641359dc
-DIST x86-bin-libreoffice-kde-3.5.4.2-r1.tar.xz 75070032 SHA256 767b4112bd3234a64a16ddd9c5c3e232d4e087fc464da8bfe9e3a1fce1809a98 SHA512 9309d460b507243af01fe9548945acd98391f85befc307612166f13b7868a8fc4d82ee3c7c5bf80771752c9f6ee31462f24de08501083956804346cf348c1f49 WHIRLPOOL 5f8fe4d430c6a34554be4ca2ac0aea933dca3727e67bb1d28c4f7fa8af250097f4c17bdd35b53b1f2bcb18e71ca2eeea15ebf10ea2e88e92c2f8072789e87afc
 DIST x86-bin-libreoffice-kde-3.5.5.3.tar.xz 75174980 SHA256 34494a74f838f93ee2c8062f298156853bb63474cc3029f9e0dd25f3ec2e60d1 SHA512 bde7ce69b37152d999a9f973b1c0f116c81d291b9bd4998f94ee45701b4d97b47dbb911a6806ba3209155abac638065e19597413bb4b0b389ff705ee3223f1ad WHIRLPOOL 7ea366af0cb763a2f70d474d3b20d5d0580fc472e20dd6649b4f722f6a1d5194ec32115edfbe8620f5b7490aaa36ca1391094a91fd4fa8454f4abe4f75bfa38e
-DIST x86-bin-libreoffice-kde-java-3.5.4.2-r1.tar.xz 79772804 SHA256 9248e1557df216538ccb9b68d786dcf578cb21e2da331a3b2a70bf64d73a2ab4 SHA512 4d40e07b73fb16668d1f9897945db3b5f47a2b342053bb5aab8885807d5685e7b22dab3d69b95598e4a874a9263ae2980972bd4e413d39eac44d95512500a572 WHIRLPOOL eff491ec09ff67cd093b7a5cf338939a491f6b83aeb2d1c1fe4b16f9c762c0296cd8ae5382e65fe6a6567b134712a158e74bcec910f63e260a281e077d07c2ab
 DIST x86-bin-libreoffice-kde-java-3.5.5.3.tar.xz 79877120 SHA256 522c78141326454cb5d84605cb8ed4a89fbc948fedaf6826c13b07aaee61e1cf SHA512 2869ee9918754d10d9aff1dd45ee11cbd1150197bd5ac4c81287b1fd6dcb439e73c0f042771111af16a2a8426b35aefb543c96a125ac21e3732e70559ce12ae8 WHIRLPOOL 30dcc33faa56e6118636a2cc93687d76dfe6ff1664a7e4cb7aa01a818f6bb0e10670694e04eab40898b0edef221832952b502b4e60dd966bbe2e4102897a0a50
-EBUILD libreoffice-bin-3.5.4.2-r1.ebuild 4530 SHA256 2e39aaf838a8d78b5f893e10341bdec34d0e9b8952349a0a38f49ac99b24ff85 SHA512 d59eb38912664e01f085ad5994a9ffc289abf6e53615a60088e64744090e862f3fc274c44869025d62124412ba0efad9cdfa62facc2d28dd7c1d74bec6330a6d WHIRLPOOL 1e5cc3d49f05e1627389a6ceec4a49a8f1b33d2c28ce58155eced906e1235baa91cbbef1ec870b4053cf7333869f86595ed3b1add223b7e75b0b2c2fbf48c871
-EBUILD libreoffice-bin-3.5.5.3.ebuild 4521 SHA256 e81c09ccbd2bf64338774b3f48f48dc03dee1fe33e0213bc0b1c03d33b4ea890 SHA512 ed6d96f7386a90d515dc8389ceda0daa9657ac49a4fd95e58d70b89777e17310ccc3b0a30e3d3ba94765525af6129715387e94f2a62d98ee252e5d589ced73c6 WHIRLPOOL 6f1ba12a1c8dbcba37fe48e777c5e85c1c776c1d70c8b540acf355b0332554ca9edbd9ab4b40a4d910177ef33b35cde81ac71078ec5cf4451ac84b001353641f
-MISC ChangeLog 13890 SHA256 d49110499969d2efa59ff12682e6e04b5b76dc7a54ff80f2c4f0ef348b5a3a95 SHA512 2da1907071b2295ecc5a1832d8eb3683735690cf682159ae145e8c85beb7182282cb173180450ab37e18e4aef321c76003646cb14b39ff2c8ea485a9a7419629 WHIRLPOOL 89ab4bc723d8ec8178e5ba95304a23d904ed1548b557febea948417b4529605c0db584451c6e0fe1972c72a7afe65d9068436943058d745715175745c6ba5322
+EBUILD libreoffice-bin-3.5.5.3.ebuild 4554 SHA256 03a0da0fa74fa5b28838295ce80a14f80c88d6840aa1fb1e45ca1ce2cc60af7f SHA512 ea5286a5953a328e8b82fd368a508a7b0d76b374fe43f36a369229aeddd36e0d9f61fed8359d3a55eb97b5149563da748a50174b9200ccaa4e295a4d289f19b3 WHIRLPOOL 09e83a11578423352cbfc8862f0b5224e94197912ce6d7be74a3dd5c716d12760920d3178852092434608eb232d7ffc58c31d0510b38c290159736e866385f19
+MISC ChangeLog 14078 SHA256 8ffd8fb85a0167e5711be79599ee01cb229f9ae04cd9571db07672d256a62651 SHA512 7ba6d4b182f66153b256203a24f90243eb2baa89d231b42baab498b260f18edbb099a383403d70045cf38447e1720b0f01050731b0596da491a44661ffba8395 WHIRLPOOL 13676cb31f60386cf5f958cb485b752d776e0345e1276984c5aa2584723cac16ea74ad5a41a0bf87284f5864a8cd187c7982791d75ff5cbcf2e35a67789c0f72
 MISC metadata.xml 347 SHA256 921fd936c852005f5783fb6810f61bb344f7f565f6f2068b3ee613ff608bf904 SHA512 2d86c42933be5e7954a6f9a18e38d67f73052ef95d2da495338675ca7fc113b545be8600886aa38ec6d805ecb56a8272951b090eb57708e8e1004118129e49c9 WHIRLPOOL 78d846dad865f271d8d364220febb25f3a2a1426f25ed523c42708c00ce598ce2e269f6415037341e7767881a2458c3ad8ac34618321c1dd4b2e7024d82e2cfa

diff --git a/app-office/libreoffice-bin/libreoffice-bin-3.5.4.2-r1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-3.5.4.2-r1.ebuild
deleted file mode 100644
index b59808e..0000000
--- a/app-office/libreoffice-bin/libreoffice-bin-3.5.4.2-r1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.5.4.2-r1.ebuild,v 1.7 2012/07/19 16:25:10 kensington Exp $
-
-EAPI="5"
-
-KDE_REQUIRED="optional"
-CMAKE_REQUIRED="never"
-
-BASE_AMD64_URI="mirror://gentoo/amd64-bin-"
-BASE_X86_URI="mirror://gentoo/x86-bin-"
-
-inherit kde4-base java-pkg-opt-2 pax-utils prefix
-
-DESCRIPTION="LibreOffice, a full office productivity suite. Binary package."
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI_AMD64="
-	kde? (
-		!java? ( ${BASE_AMD64_URI}${PN/-bin}-kde-${PVR}.tar.xz )
-		java? ( ${BASE_AMD64_URI}${PN/-bin}-kde-java-${PVR}.tar.xz )
-	)
-	gnome? (
-		!java? ( ${BASE_AMD64_URI}${PN/-bin}-gnome-${PVR}.tar.xz )
-		java? ( ${BASE_AMD64_URI}${PN/-bin}-gnome-java-${PVR}.tar.xz )
-	)
-	!kde? ( !gnome? (
-		!java? ( ${BASE_AMD64_URI}${PN/-bin}-base-${PVR}.tar.xz )
-		java? ( ${BASE_AMD64_URI}${PN/-bin}-base-java-${PVR}.tar.xz )
-	) )
-"
-SRC_URI_X86="
-	kde? (
-		!java? ( ${BASE_X86_URI}${PN/-bin}-kde-${PVR}.tar.xz )
-		java? ( ${BASE_X86_URI}${PN/-bin}-kde-java-${PVR}.tar.xz )
-	)
-	gnome? (
-		!java? ( ${BASE_X86_URI}${PN/-bin}-gnome-${PVR}.tar.xz )
-		java? ( ${BASE_X86_URI}${PN/-bin}-gnome-java-${PVR}.tar.xz )
-	)
-	!kde? ( !gnome? (
-		!java? ( ${BASE_X86_URI}${PN/-bin}-base-${PVR}.tar.xz )
-		java? ( ${BASE_X86_URI}${PN/-bin}-base-java-${PVR}.tar.xz )
-	) )
-"
-
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-IUSE="+cups debug gnome java kde"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-BIN_COMMON_DEPEND="
-	=app-text/libexttextcat-3.2*
-	=dev-cpp/libcmis-0.1*
-	=dev-libs/icu-49*
-	>=sys-libs/glibc-2.14.1-r3
-	kde? ( >=kde-base/kdelibs-4.8.0:4 >=x11-libs/qt-core-4.8.0:4 )
-"
-
-NSS_DEPEND="
-	>=dev-libs/nspr-4.8.8
-	>=dev-libs/nss-3.12.9
-"
-
-COMMON_DEPEND="
-	${BIN_COMMON_DEPEND}
-	app-arch/zip
-	app-arch/unzip
-	>=app-text/hunspell-1.3.2-r3
-	app-text/mythes
-	>=app-text/libexttextcat-3.2
-	app-text/libwpd:0.9[tools]
-	app-text/libwpg:0.2
-	>=app-text/libwps-0.2.2
-	dev-cpp/libcmis
-	dev-db/unixODBC
-	dev-libs/expat
-	>=dev-libs/glib-2.28
-	>=dev-libs/hyphen-2.7.1
-	>=dev-libs/icu-49
-	>=dev-lang/perl-5.0
-	>=dev-libs/openssl-1.0.0d
-	>=dev-libs/redland-1.0.14[ssl]
-	>=media-libs/fontconfig-2.8.0
-	media-libs/freetype:2
-	>=media-libs/libpng-1.4:=
-	media-libs/libvisio
-	>=net-misc/curl-7.21.4
-	sci-mathematics/lpsolve
-	>=sys-libs/db-4.8
-	virtual/jpeg
-	>=x11-libs/cairo-1.10.0[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	>=dev-libs/dbus-glib-0.92
-	gnome? ( gnome-extra/evolution-data-server )
-	gnome? (
-		gnome-base/gconf:2
-		gnome-base/orbit
-	)
-	>=x11-libs/gtk+-2.24:2
-	media-gfx/graphite2
-	>=media-libs/gstreamer-0.10
-	>=media-libs/gst-plugins-base-0.10
-	java? (
-		>=dev-java/bsh-2.0_beta4
-		dev-java/lucene:2.9
-		dev-java/lucene-analyzers:2.3
-	)
-	net-libs/neon
-	${NSS_DEPEND}
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice
-	!app-office/openoffice-bin
-	!app-office/openoffice
-	media-fonts/libertine-ttf
-	media-fonts/liberation-fonts
-	media-fonts/urw-fonts
-	cups? ( net-print/cups )
-	java? ( >=virtual/jre-1.6 )
-"
-
-PDEPEND="
-	>=app-office/libreoffice-l10n-3.5.0
-"
-
-# after all it's a binary package
-DEPEND=""
-
-# only one flavor at a time
-REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde )"
-
-RESTRICT="test strip"
-
-S="${WORKDIR}"
-
-PYTHON_UPDATER_IGNORE="1"
-
-pkg_pretend() {
-	[[ $(gcc-major-version) -lt 4 ]] || \
-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \
-		&& die "Sorry, but gcc-4.4 and earlier won't work for libreoffice-bin package (see bug #387515)."
-}
-
-pkg_setup() {
-	kde4-base_pkg_setup
-}
-
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/50-${PN} "${T}"
-	eprefixify "${T}"/50-${PN}
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr
-	cp -aR "${S}"/usr/* "${ED}"/usr/
-
-	# prevent revdep-rebuild from attempting to rebuild all the time
-	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
-}
-
-pkg_preinst() {
-	# Cache updates - all handled by kde eclass for all environments
-	kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
-	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
-
-	use cups || \
-		ewarn 'You will need net-print/cups to be able to print and export to PDF with libreoffice.'
-
-	use java || \
-		ewarn 'If you plan to use lbase aplication you should enable java or you will get various crashes.'
-}
-
-pkg_postrm() {
-	kde4-base_pkg_postrm
-}

diff --git a/app-office/libreoffice-bin/libreoffice-bin-3.5.5.3.ebuild b/app-office/libreoffice-bin/libreoffice-bin-3.5.5.3.ebuild
index 1849c7d..d24f87e 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-3.5.5.3.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-3.5.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.5.5.3.ebuild,v 1.6 2012/08/14 12:55:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.5.5.3.ebuild,v 1.7 2012/09/26 11:23:05 scarabeus Exp $
 
 EAPI="5"
 
@@ -57,6 +57,7 @@ BIN_COMMON_DEPEND="
 	=app-text/libexttextcat-3.3*
 	=dev-cpp/libcmis-0.1*
 	=dev-libs/icu-49*
+	=media-gfx/graphite2-1.1*
 	>=sys-libs/glibc-2.14.1-r3
 	kde? ( >=kde-base/kdelibs-4.8.0:4 >=x11-libs/qt-core-4.8.0:4 )
 "

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 1559b74..32f0420 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -3,7 +3,9 @@ AUX libreoffice-3.5-doublebuild.patch 887 SHA256 15dba3ca6be47bffe26e9eae73ed356
 AUX libreoffice-3.5-hebrew-icu49.patch 5661 SHA256 169ec723b1453b932deefafada3e4dcbc038a336c427657021e1de8afadd8ab9 SHA512 6b6c93092bc34acc4030ebed056ad189d1eefc2081521b1c995ff81b5ac52760e7f631e90a94c7165bd745c7685b43c0e7b105deb37b40b6fd7e767e64e7ee1a WHIRLPOOL 5c2c09462eb770a2240469f972be4b99329674f2a056d56d3fb1cd539da9551a4d4f85040d936e77fe3bdbdfe7e991c47e9a2a83c5906ca7848685498a1f2dc4
 AUX libreoffice-3.5-propagate-gb_FULLDEPS.patch 922 SHA256 73cbbec0744fc8cce99f5c9dd499935e9bf2db2e3d994045fab4c328116e3724 SHA512 3fdeaaffc82e2b43ba162b45866c0bb795b23b6be671f4bdc71459d9ab169fd62487d9339c7d6e8dc4721d567027c049b861ddf56cb097594641b0bf357c7c42 WHIRLPOOL c55ff6ff62b63ccfc4fec7f21ac01bafa21d2228897cda2d3033738a31fd99159a717d463228ba3843f9a45edba87a5a07be9d3d83a0b00f3a763598affe56bd
 AUX libreoffice-3.5.4-libexttextcat.patch 910 SHA256 5e2acf868f511d8937d6551b6fe52e73e808082cc5bf327815a95c8fe4c9a6d2 SHA512 eb3ac4eff756812d3b2a149f30a98501abc625b2177bfed73bb35ab37bfbf09fd3c214aa58fa29b0a4bdc38788dfdb625aa48ba9dc5d05b971bfe4f06a1bc129 WHIRLPOOL 7f1a771765296cce6c38eaec6c2abf50913355cf1d2909fbd51636045c8ac38bdd05dd2cf54edfffeab5c904c2de1de5be57b1347961c55fee937c90afd0758f
+AUX libreoffice-3.6-separate-checks.patch 2366 SHA256 0fa6bdba2a176f3cdbfc8f87f5fc69b8790b6464cb607153e807df758066a3fb SHA512 8c79eb6bb60f04c6877bf7f1aff8f93ff56e069ca00f2982123b6187aba77e23eb8287bf668ef419e0277e3f51a872a2cf11431465a1a35560ae86d4ff4794cf WHIRLPOOL 9c4e8eba379d4c8e51ff6a24438fb3a8f7d3d64132854c8e5cdfd082c2e1c4ae38c501ec199990e3d505466898199b32595045d7e9a456858c63b663d4ad5d2c
 AUX libreoffice-3.6-system-pyuno.patch 1628 SHA256 25f319caed7205e06d4b9e17a45ab268a2ac67846c4e02442a15acc540266a5b SHA512 e7eb2c26932dd3fdff22c0c72a28542a42c26fc04a0fcc2a813e7b4d7fe642f211a395d41042cfc735670127a81104fcc2a4b845a59235a4d7924db2659916b0 WHIRLPOOL 09863ef7c67e8ed5d3edfd758fcdebd3ad785d3f82de47b9f1cc60d41cc18a56973515088abe9a4584311b551073b0db8bdd7e74fb72a81576a5a0d71c900998
+AUX libreoffice-3.7-separate-checks.patch 2014 SHA256 8732f567232408df10b7450c1a58308d43e6df4816300d0e42793457d6bfd05f SHA512 bab7eb7f30b864bec5c9f06e8a81e986fb267468b0b9ba5c6855360d016c58d2fc1f467811680d27b04989683852ceca1eab24ba39c145e4177f88fa4fcd2140 WHIRLPOOL 4a702f8b60ec700deb09831023bda7149c5e4612861270ef5b349c126493a81e7504bcabff6b99c2cb9ae471e834b79bcf571d2412b7459aefe72e316d5cbc0e
 AUX libreoffice-3.7-system-pyuno.patch 1642 SHA256 191d2462c13947d63a3f2758ec26b4b5b7765d06f0454add1c471e9dccfa9016 SHA512 76d0b836f2b26c9cd3a0ad2b471d033c863ffc1eb593f28f1ebecaae30f205adb97b4b0a63483f93d2f32d5934480f580776e1ce83baf77e5bedee759112fb8d WHIRLPOOL efada275cfa123b2f3fd96a20057fab5a8f83c50e0d401df1af76d1eb017e5c7ceb74d0a5d8fd77352379be4a69b67f22d99a072213b5644012094a31f353da0
 AUX libreoffice-system-pyuno.patch 1634 SHA256 8a45fe2d6eb9b9a529c9f237b7219b221296d270caa7d42d4ea1a47c5e30841f SHA512 30d6ea3e648ce21e2e9cabf8b1ffc05e7a97ac691fadc56d02f9fa32df914628735fce2101abc1e30b5a31967f3ce124a85ecb481041b9f61713acd9d9489220 WHIRLPOOL c2f10535ed97b9eb5fa9f271ff4c9ad8b552595f58234899d2b5091daacc4444532bdee1d2ec2bd24f0ce601f0e5b5ce408fcbe169e21184f263c7bac86bfa69
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec
@@ -15,16 +17,16 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51
 DIST ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip 2732347 SHA256 64f8d737c32756713d60c22efe3978a59fa167cdeaa2d3d0a1646b1f2232b825 SHA512 bba2fe76d09e3ab99b170685525ceb4ce8ce8d95ffa0df97c05ce18cd7edbe73028861e19c501bf00db369d36f43fe274d4220ad046518d89737249f61c7cf3a WHIRLPOOL 2dd0924defb85dc6a266126fdaabc29f051ccf525d1e1e7a5f74db19f162ee2d17f98ae96fd832dbd1600c006e277b75a4d88d9b3128c7ec9e2365a6704d32e9
 DIST ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz 12735186 SHA256 dc6445d2c0445e5536010b80bd811adda6741ed82b288fe831d5be9902457941 SHA512 a8c39d205051a8f8abaecb7a6fdc0c2c37baf5eee2a082af8819555f442dab525649b86cae569048357eb1e6e651deff4b62183de417e15b403e1ac09c40ba7b WHIRLPOOL fd9b6bbd214113334d3d5e542bbc9b70d5a9505281454e7f4447c6c73af733e10b007a2d4225acb39db0fc17401c2ae36b6628c59d31f09bec485f4cfc009eb5
 DIST libreoffice-binfilter-3.5.6.2.tar.xz 5982612 SHA256 58c4607ec32a7a0618cd03c439ff6188f1467ccd8a4ff2227b2f681092d5b936 SHA512 c6337fdefbb906c974e64e948899f91553493986eac236548cb40f1ce882706b379add23eaceff4ad3637d738f8741d7e8cbfc6fb54d541fbd6e92d01b95ea04 WHIRLPOOL 158eb39e2db2d328a32263800a6cd8eda0fe7e1bbe00675698b367137209e28c5c572ca9050c84aa2e57640dee04ab01622b91edc6392b3360144218612657ba
-DIST libreoffice-binfilter-3.6.1.2.tar.xz 5979484 SHA256 fa64c070dca5eea80c909ea4598b5dba2b30c24d184b58201081e5b9db1bd405 SHA512 1670fb59f7c368592ad281023ed2937db8d41448c3395c27934b0a438f57cd15d85258d474a148119f546106408458727318a732528910d4d84728cbe43cf47e WHIRLPOOL 936cca7af8e4099039f2186da1ee81383a388eaa4ac261bef2c93d9969718feb1a79fced0fa6d442196d6b5b5e39cc0a1ad5a9fc1e651bd5299602cafb68eb6c
+DIST libreoffice-binfilter-3.6.2.2.tar.xz 6055788 SHA256 07a67c87491542843f44787c5cb7097da2d19b7e97fec827f78722024deb7c0e SHA512 a38ce6bc387d8d257964d0dee5702053a43a65092d51b7f6f68fdfa32f68596ad0016e4735ede99850c28d9364e31208435d392b90f6bc3823c64812c8286cc1 WHIRLPOOL 6f6810a2b138ca70742b9a48b39d408a895751aefb0bfd457a95f32c532f25eb4afa541abe17425fcc34e144cfe53f76fcd9d79faa656e0543680707e4ecee85
 DIST libreoffice-branding-gentoo-0.5.tar.xz 150616 SHA256 91beaf63fca297914cb4390b760ffef52b03450ecb52affab0f124a2dbd63a63 SHA512 a915973e1566414fd8fdae67ccaf426a9543cfa4f2549b39e7da0146c975d568d2e222835a259f4bbe6d36979b956cf65a7d28c7a5b3a7b8858e8f731acf33d9 WHIRLPOOL c2beb6b4220a99820eade85784638b883ea3b9293f6714bcce65dcb91fd617a1712a19327377d5fa1c33ac7b402749e8a29daa72f9ea9672d24607ce27cb82fc
 DIST libreoffice-branding-gentoo-0.6.tar.xz 49756 SHA256 d5c2d12031a807d18e981a6df7e945e1787b96c7ee65fa3d9bb9eac17cf8ade9 SHA512 1126d92b6b8722fc8b7865ed42c98876922ce26c71ebff61faf03e07b338d5278ff41ba29ff296d281cbdee6a9a0965ccf8e2101fc0f4846eaddcf511ac74eed WHIRLPOOL 40f18619246ca0b6f91ff248d65e4a36639c6faee719a842fb57c6bd8fc871686156e1c991776877d5df0811088ca8f3f4390b60f10565deefa2739c99242c91
 DIST libreoffice-core-3.5.6.2.tar.xz 102714756 SHA256 0c0624aca649ab9d86aa3e35584ebeb648fe6e06d82a16c727fad2c56cb6c509 SHA512 fc0f399346b8ae7b235123f12c6c2addf78b25f1c3f03b7fb168089183b7153575f92823425154d5f4e15d79e704213ac834c1165d2393372a7921de8fea603a WHIRLPOOL bc2f214cc79efbe80fe664ebc3f767341aa7b546f31d9965bac80a23440bc8acfd7ea0c4693462421f222483a670d19d2805e7b0556f30b61f1adad79d72938e
-DIST libreoffice-core-3.6.1.2.tar.xz 107175952 SHA256 037a89a6867f2483898e73507b293296e99f899ea4dab2c37ce3061ff707ec8b SHA512 fb1a30fb7989057c3ca124ae6795d21292f007206d925331dc97d8c8ef1752ba359c3aabeca61d2a2a37283d53f2b1dae22b3a2f51ccdc90827590b54d8a97bc WHIRLPOOL 7f23fd65cbeb729597f23054d94d2bcaa453782cca1dd202a7c7558ad723c00340135612e9afb378c2a46a59cbcf0d254d066a3bee610c8e43b3244a344f6ed3
+DIST libreoffice-core-3.6.2.2.tar.xz 109090048 SHA256 5ec07ffacec09c4dcee9246cb132f7a59a618b395835e781735fd61bf47e8d37 SHA512 84784ec5c1a7c0ba1a617ebdede8153240cb88c4a83aa45f532132c076e36434ce00bac162ca31578df7ae97f09fe59cb571cdcf941863ca95d776f5c3e45843 WHIRLPOOL 29bc7c54756c6bf9abb47d73452e2fd5633bf4360e0a075aee29b1749f127fe23f9647165d6d474e95628e3fdc1c6a4a165a55595d7cd925a8d7007ce3d3cf78
 DIST libreoffice-help-3.5.6.2.tar.xz 1856988 SHA256 05840501d0ad959de0ea907c067f8e6c4c91397cba49b54c8ea8a0f0d01fba22 SHA512 1fa1a202f6e975dc6baedec7cbbe6f98ee365bc87ac052eec1559db91984eee552a44b5ed09cf6d574fa002d95189ac7ea30556e829f994fd195d62447a1e35e WHIRLPOOL 516c7848fd077b4962cc703ebf314676424255aa921babefd43c4e710ed2fe33d2a8e6330e491623015d6ae26bfb0d84c9a8cec62eead4f8a42839223969dd86
-DIST libreoffice-help-3.6.1.2.tar.xz 1863760 SHA256 41672c3548f95ff8ad3b491b0ff7d814a6a77f82b94e3adfcebb5538f3a0a349 SHA512 157352376c5811b8b9fa1141e1134c289f79a7f412b10500b0150cffe6d492198e6502d2a952e0e63c22bda88ade83a53357d40edc3543bc145450c9b5e9f26d WHIRLPOOL db2193440d3bb5a0fa7e13dd9af39f196aefbd5c7ff9d4d55fd0f4e4beb61b5727c8451c5b001087d2fa7f92ce3fc61848e97d2d3020c2a2cb2be0cb3be414ea
+DIST libreoffice-help-3.6.2.2.tar.xz 1911136 SHA256 55ec6ef5eef4bbf2298c3b864f67c8424ebb5ccbe7bcd6ca59abba2867989e31 SHA512 1865c70416e51dd76b326d538f618743d6dc6482a768fc31fdb09e52cc332c1b8192f063ef955ca026d8ebc0cd71a6158924f35dac5f9d66e947ad3d71a39bce WHIRLPOOL a8bdd25827d0c896618da2e78340299c948d6628133f5d0ad428ba002c4a194e05b4d2391d33bc7ac672231c7c427139f216df726378691def483aca10bdf209
 EBUILD libreoffice-3.5.6.2.ebuild 15680 SHA256 93bd1a53fccece6729ddec5af81793ffb5dce931d1e7b0add7ba8b3e63554f12 SHA512 d0e2e8fbdf02ce5f33eef01559c7b909abdddb52948abde534debadd20d920138d19c32fe7d1f2528b0ec57cd9def3248c07716e8dfe40e682f685dbed29d03c WHIRLPOOL 027912fee88fcf6cb45c071ea1109c2d3d551d35dcd8a6f3b00958f73e4cd03148a50ae9c1663e5e9f5788a8949b62ba0be75c93b94313b34003108b74e70910
-EBUILD libreoffice-3.6.1.2.ebuild 17376 SHA256 7cb351c0ca2d6c75e0480a1c9e23469bb77bb4642b1b403cabb611c4c87c58f2 SHA512 aaf59f89861ddd47e7d5c5f702cf8f6fad831c0818191eeea9f1138464a0776334ae786c447d1242cf401156b7c4d0fce522a8d0d6b36f980bbbe8f5e9652cac WHIRLPOOL ebe96a0d54fee547f1ade047cb83d20534c3fee180c3dfdf89953dc81477de09d004b28bca53b11ec594c28d36a9f9a9f1a62327289e0ccde017eefc866419a1
-EBUILD libreoffice-3.6.9999.ebuild 17377 SHA256 6233ee7e73f627efe6455fe4e3e4c9cb629cf69d272d287317bf41570bf9294b SHA512 42358525b01c434f2927e91d4282f6b0f7aa527be487400907ed97beac62089cadd88632bdef4093f693648eb78aa1b9617440509cffa4edc199e6600e4847de WHIRLPOOL c559b42d854d072d80ef78e5aea81eb76ce446c17363b8efc6fc4fd55de84f868e842d435264e2f6b19fc0cacab9a5fa075b96cd642689568aedb268f70f5c79
-EBUILD libreoffice-9999-r2.ebuild 17564 SHA256 07f64d1979911315686513654105bce6f5a45bce2f92edacd917c1cbf9ed759b SHA512 91669bc91dfc94776a629a7230e55778f81be5cbe86256432a94664ea7b92a1d2018f50dc8309a200e61a8d3874576768347bf2b9a8153973d3f7feb6b934b9e WHIRLPOOL 6719814449ae27b4a2454d278c1e8e0961cac861b5e43090444355d125406545394664901c247be5723f99ba1c1d45d976f45dac0a1e32da83e0eae6dafb6476
-MISC ChangeLog 68400 SHA256 53090a624d1b506d80fc9341da37857227c92694a739683dbe0e085876ea0abb SHA512 4bd9e49d454effd01e51608bb12aa5980c5e93dd368c2d41fbb5b73af92ec379b6db359712abf4ab84e55d90fa8ed4660693e56160da80e14ceff28371e6fe9d WHIRLPOOL 8198054d3038ac41783226029c080104eaf41394570cbba9f75e9d10ca11f9a7eea86cbcb5d1401897800e5371c6f2ee964a3b333a2921c600bd8403d2bc2aab
+EBUILD libreoffice-3.6.2.2.ebuild 17397 SHA256 74f98b4a2a2319c68a229740e92841a7d7db61ca6d3dd9a2abc05cfb4fa4498d SHA512 e876ce82851e385af9955be302d879b9aac734d5ab93a6c7fb54d91be4f251767d571e9775b27ea58dacccafebb3f20914fa1ed7551100f9dc062c3f511e3779 WHIRLPOOL 447dc6e7ffcb63602875c4f38c2cfa1279591ad161d7a4ad7afd671e69a30d56f6ac1a03809763367264c12e5bd61bd430a0b210c7bde0d92b15a7f0c581cc19
+EBUILD libreoffice-3.6.9999.ebuild 17407 SHA256 bdc14bf9ddf960f9c62d9b033f8de3269d3bbd0aeb83c24f07c1973f365e586a SHA512 40bc1b9e8886ff907139709b0da90b94ed4b7e88da9b877f7bf491d32ad4bf9f9ccd981fb99e0a50056c626fe702916e042e207ae5bc546ebf9286026ed7120a WHIRLPOOL 0d0176750dd04aed01579e1fc120b31a6bf90a89fea4d48a83ef61168184ade1208b9249c8ed1a4dfb4ceaba5a60e170b9c1bd45eb752792b93852b755385381
+EBUILD libreoffice-9999-r2.ebuild 17627 SHA256 0c97729450b4e31979d12c276137db1afe25693e5a2a9a6cf4c274f59b734d27 SHA512 1e1214c1c6ded3321cb2a57cd0bcbd5213a4d3ef4af5fec9e210053ddc8db64ae039bbfa7199841f1b7058f84c0a44af181eddb03bf786e9557c062f177b08ce WHIRLPOOL d011041de225f269df3d3c5135364af3a296462f68fcbc88159972f0cc6ad173d122026eb6ae68aa5a744047cdcdd83f54028204e0ddb01b19b521221517cf34
+MISC ChangeLog 69186 SHA256 0414d3ed9148651f0b0b30847df0d01a969a4b771da766aab03dda58a6d7a82a SHA512 67c382334229f218a8559befed5b95beda85d6a35c0341e20b78b19e463b9943cdd9bd1ea4bed9d88b5064621ccbbd4e00f24bc834ca3181366cb261de159c4e WHIRLPOOL bc7c2233df762e385516b3c38de9c0637aef1663654a27cdf1895e58ff5c7c20bff70216ffbfa5b0d3e5ed5123f7d6d71251c966ee85acbee0845f4d0c32b558
 MISC metadata.xml 1645 SHA256 24887289646f2058654a7701555baf8afabcffa2223f5bece682d537a43fdcda SHA512 dbf85074a9bc3b984a6f8188dee88a19123d0b6fed5131a70592f31769c317b8eb5ea1095fb72a406dad9fe5214ac51e33203c162a6891a63b9cbedb0d1affc0 WHIRLPOOL 7cbfb1f8644f8cf36efc4ddd8bdb0f757483c7fce7da0e2d61922d0a5e9ab4dd968c5120064ec3307fd547544cdb9501a4bedabf905f7a7d201f972534b41172

diff --git a/app-office/libreoffice/files/libreoffice-3.6-separate-checks.patch b/app-office/libreoffice/files/libreoffice-3.6-separate-checks.patch
new file mode 100644
index 0000000..de314df
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-3.6-separate-checks.patch
@@ -0,0 +1,74 @@
+From 4fb35cfbf4b10d5644fd636ddfe3e07b5a932d45 Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@×××××××××.com>
+Date: Sun, 24 Jun 2012 14:01:54 +0200
+Subject: [PATCH] dont run check targets in build, to allow running them
+ separately later
+
+Change-Id: Idb46ebcb427522c74632a1813afcbb841fb61243
+---
+ Makefile.top            |   10 ++++++++--
+ solenv/bin/build.pl     |    2 +-
+ solenv/gbuild/Module.mk |    2 +-
+ 3 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.top b/Makefile.top
+index 7362bbc..ae849fb 100644
+--- a/Makefile.top
++++ b/Makefile.top
+@@ -243,7 +243,7 @@ xsltml\
+ zlib\
+ 
+ gb_TAILBUILDMODULES := $(shell $(GNUMAKE) -r -f $(SRCDIR)/tail_build/Makefile showmodules)
+-export gb_TAILBUILDTARGET=all slowcheck
++export gb_TAILBUILDTARGET=all
+ 
+ define gbuild_module_rules
+ .PHONY: $(1) $(1).all $(1).clean $(1).deliver
+@@ -480,11 +480,17 @@ findunusedcode:
+               | grep -v WPX \
+               > unusedcode.easy
+ 
+-check: dev-install subsequentcheck
++check: unitcheck slowcheck dev-install subsequentcheck
+ 
+ subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install)
+ 	$(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
+ 
++unitcheck:
++	$(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
++
++slowcheck:
++	$(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
++
+ debugrun:
+ 	$(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
+ 
+diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
+index 74d0f32..daa4ae0 100755
+--- a/solenv/bin/build.pl
++++ b/solenv/bin/build.pl
+@@ -1901,7 +1901,7 @@ sub run_job {
+             return 1 if (! $path =~ /prj$/ );
+             mkpath("$workdir/Logs");
+             my $gbuild_flags = '-j' . $ENV{GMAKE_MODULE_PARALLELISM};
+-            my $gbuild_target = 'all slowcheck';
++            my $gbuild_target = 'all';
+             if ($registered_name =~ /tail_build\/prj$/ )
+             {
+                 $gbuild_flags = '-j' . $ENV{GMAKE_PARALLELISM};
+diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
+index e5f87f0..9c2608c 100644
+--- a/solenv/gbuild/Module.mk
++++ b/solenv/gbuild/Module.mk
+@@ -129,7 +129,7 @@ gb_Module_DEVINSTALLHINT=
+ debugrun :| build
+ endif
+ 
+-all : build unitcheck
++all : build
+ 	$(info $(gb_Module_BUILDHINT))
+ 
+ build : 
+-- 
+1.7.9.5
+

diff --git a/app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch b/app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch
new file mode 100644
index 0000000..5805387
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch
@@ -0,0 +1,64 @@
+From 4fb35cfbf4b10d5644fd636ddfe3e07b5a932d45 Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@×××××××××.com>
+Date: Sun, 24 Jun 2012 14:01:54 +0200
+Subject: [PATCH] dont run check targets in build, to allow running them
+ separately later
+
+Change-Id: Idb46ebcb427522c74632a1813afcbb841fb61243
+---
+ Makefile.top            |   10 ++++++++--
+ solenv/bin/build.pl     |    2 +-
+ solenv/gbuild/Module.mk |    2 +-
+ 3 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.top b/Makefile.top
+index 7362bbc..ae849fb 100644
+--- a/Makefile.top
++++ b/Makefile.top
+@@ -251,7 +252,7 @@ xpdf\
+ xsltml\
+ zlib\
+ 
+-export gb_TAILBUILDTARGET=all slowcheck
++export gb_TAILBUILDTARGET=all
+ 
+ define gbuild_module_rules
+ .PHONY: $(1) $(1).all $(1).clean $(1).deliver
+@@ -526,7 +527,7 @@ findunusedcode:
+               | grep -v WPX \
+               > unusedcode.easy
+ 
+-check: dev-install subsequentcheck
++check: unitcheck slowcheck dev-install subsequentcheck
+ 
+ subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install)
+ 	$(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
+diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
+index 74d0f32..daa4ae0 100755
+--- a/solenv/bin/build.pl
++++ b/solenv/bin/build.pl
+@@ -1901,7 +1901,7 @@ sub run_job {
+             return 1 if (! $path =~ /prj$/ );
+             mkpath("$workdir/Logs");
+             my $gbuild_flags = '-j' . $ENV{GMAKE_MODULE_PARALLELISM};
+-            my $gbuild_target = 'all slowcheck';
++            my $gbuild_target = 'all';
+             if ($registered_name =~ /tail_build\/prj$/ )
+             {
+                 $gbuild_flags = '-j' . $ENV{GMAKE_PARALLELISM};
+diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
+index e5f87f0..9c2608c 100644
+--- a/solenv/gbuild/Module.mk
++++ b/solenv/gbuild/Module.mk
+@@ -129,7 +129,7 @@ gb_Module_DEVINSTALLHINT=
+ debugrun :| build
+ endif
+ 
+-all : build unitcheck
++all : build
+ 	$(info $(gb_Module_BUILDHINT))
+ 
+ build : 
+-- 
+1.7.9.5
+

diff --git a/app-office/libreoffice/libreoffice-3.6.1.2.ebuild b/app-office/libreoffice/libreoffice-3.6.2.2.ebuild
similarity index 98%
rename from app-office/libreoffice/libreoffice-3.6.1.2.ebuild
rename to app-office/libreoffice/libreoffice-3.6.2.2.ebuild
index 4813919..1332400 100644
--- a/app-office/libreoffice/libreoffice-3.6.1.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.6.2.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.1.2.ebuild,v 1.4 2012/09/21 09:04:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.2.2.ebuild,v 1.1 2012/09/25 14:03:14 scarabeus Exp $
 
-EAPI="5"
+EAPI=4
 
 KDE_REQUIRED="optional"
 QT_MINIMAL="4.7.4"
@@ -117,7 +117,7 @@ COMMON_DEPEND="
 	>=media-libs/fontconfig-2.8.0
 	media-libs/freetype:2
 	media-libs/lcms:2
-	>=media-libs/libpng-1.4:=
+	>=media-libs/libpng-1.4
 	>=media-libs/libcdr-0.0.5
 	media-libs/libvisio
 	>=net-misc/curl-7.21.4
@@ -215,6 +215,7 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-3.6-system-pyuno.patch"
+	"${FILESDIR}/${PN}-3.6-separate-checks.patch"
 )
 
 REQUIRED_USE="
@@ -226,8 +227,6 @@ REQUIRED_USE="
 	libreoffice_extensions_wiki-publisher? ( java )
 "
 
-RESTRICT="test"
-
 S="${WORKDIR}/${PN}-core-${PV}"
 
 CHECKREQS_MEMORY="512M"
@@ -410,7 +409,7 @@ src_configure() {
 	fi
 
 	# system headers/libs/...: enforce using system packages
-	# --enable-unix-qstart-libpng:=: use libpng splashscreen that is faster
+	# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
 	# --enable-cairo: ensure that cairo is always required
 	# --enable-*-link: link to the library rather than just dlopen on runtime
 	# --enable-release-build: build the libreoffice as release
@@ -440,12 +439,12 @@ src_configure() {
 		--enable-graphite \
 		--enable-cairo-canvas \
 		--enable-largefile \
-		--disable-mergelibs \
+		--enable-mergelibs \
 		--enable-python=system \
 		--enable-randr \
 		--enable-randr-link \
 		--enable-release-build \
-		--enable-unix-qstart-libpng:= \
+		--enable-unix-qstart-libpng \
 		--enable-xmlsec \
 		--disable-ccache \
 		--disable-crashdump \

diff --git a/app-office/libreoffice/libreoffice-3.6.9999.ebuild b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
index d9b6cd6..2d5566f 100644
--- a/app-office/libreoffice/libreoffice-3.6.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.28 2012/09/21 09:04:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.29 2012/09/24 08:26:04 scarabeus Exp $
 
 EAPI="5"
 
@@ -215,6 +215,7 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-3.6-system-pyuno.patch"
+	"${FILESDIR}/${PN}-3.6-separate-checks.patch"
 )
 
 REQUIRED_USE="
@@ -226,8 +227,6 @@ REQUIRED_USE="
 	libreoffice_extensions_wiki-publisher? ( java )
 "
 
-RESTRICT="test"
-
 S="${WORKDIR}/${PN}-core-${PV}"
 
 CHECKREQS_MEMORY="512M"

diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index e419654..1dc363b 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.112 2012/09/21 09:04:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.115 2012/09/25 09:53:19 scarabeus Exp $
 
 EAPI="5"
 
@@ -206,6 +206,7 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/flex
 	sys-devel/gettext
 	>=sys-devel/make-3.82
+	sys-devel/ucpp
 	sys-libs/zlib
 	x11-libs/libXt
 	x11-libs/libXtst
@@ -225,6 +226,7 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-3.7-system-pyuno.patch"
+	"${FILESDIR}/${PN}-3.7-separate-checks.patch"
 )
 
 REQUIRED_USE="

diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index a2a40ad..6c52065 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -2,69 +2,18 @@ AUX fontconfig.Gentoo.properties.src 15602 SHA256 d48a9b43d82f45425464e985955f3f
 AUX generate-cacerts.pl 11051 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97 WHIRLPOOL ad0e7946b1f055542f8a76b1050ae841bc7b6498305def9881d2f5d2177a82b77d25bf20e97488e2c84bbe0c3834421caea7e5bf4ea990c783908bc19133e619
 AUX icedtea-6-pass_javac_memory_args_to_vm.patch 2953 SHA256 39f2b68fea43923f88a6e1e4b8fe51735441e783da9cf2bbc9c95f4dea483763 SHA512 0d9b3fec5a1edf1208e7a5a6ea5e3c75a0179697d1252ba4e430175a5055c78f906af03bb434c0810a89a5fb802757d337c30370fad56bbbca23b3f7c25ef805 WHIRLPOOL 784b5fd27698880c0d831e041e17132befc4fdd8eb94823105618662d16e8f1a5819680a7fcf0fd29f79b3f731c1f5c672b8e6d824c96d1687d56b5c027a228d
 AUX icedtea-6_pax_kernel_support.patch 4862 SHA256 7e9235d5f2b70b3e70c0940d35dc312fa59444e763eb5f521f2b71f86a24f70b SHA512 e9ec9df75925aa408ee78c4730be320231017f6a180f34b0406ef1393a142d14192cd3bc63c1929f9c6904c569f2a4150ceb7f286c69f3084053aab73b4ed253 WHIRLPOOL 3bef4746ed97e8e2f8a37cc337cf50b137afc985220e7804759331aa75c3c4a90b6f2266c3ec8449d6726ea4f45b4b1f55d653048039429013e08f57a50acdb1
-AUX icedtea-7-compile_for_7_cacao_mem.patch 3414 SHA256 0ace12a18f471ddec1412e4eea999a5b38dca0dd653b2a8f0bc80449380c77eb SHA512 2fa5b2483bc19968c7cff322415c63fe94afb2145400770c4d8f5ededb025f35ff441f56c9f0b3326d54804e1976554c3b6a347b8f8d27cf4910d8e39ecf234d WHIRLPOOL dbc9adb2d0f33b35dfbc25a522c7057ca64af44f7fed103b31d990b8e47af3611e88a77ac04a4de68f119dd209333e060cc2122e41c5fb1c1a8007f10fb8109c
-AUX icedtea-7-compiler_detection_cleanup.patch 6833 SHA256 406fccc762d84cb73bb2ef7f934e770a88d82ead45eed860135b4571a6b3a91a SHA512 e2bb1ea1197d44127b214f14c70323fa5f99094720986cdf6429a503f330536ce2d0a3988782736ed2491c1497d70c7fdbac4588df04dcd9b43c8f8bed1adb7e WHIRLPOOL a70d1ba986e598abb04cf5263d063529aded1a683470dc73c2f7c56c8da8dfead09f15cc28ff86379588216a72c0b7be0fa09cadd68decd683aaf0e8ffa23fa0
-AUX icedtea-7-no_suffix.patch 833 SHA256 77b579bf0980410534be744c8d9a953855985869247896f5b44b7f8c55fc58e8 SHA512 d6982b5c7a7df41769cbd14067cff3425af8520d3f8a870028a80b443fe537af1923ed1fc8050ed6fed1d18058c8798bdb578bf19eefc87380c6861702761625 WHIRLPOOL 3df9e0571624fe619170c54379ce673470bb6b9e192942f27300ef5b44f1471cc3abf211bc728a2dbed8070c57d935f8c425129243973f4f9a16d2998a2523b5
-AUX icedtea-7.2.0-explicit-gthread.patch 696 SHA256 78e55b212004127726c8f0ab02b8a0a1c01677443237505a21fb803b38e08c55 SHA512 de4da833fbf5c09b9a9d64b8a4fa3e9e5187296e3da91b410bc2da5207d020a26a3348b70eacb199c5b3efb1eb72023c23b2d327cdc91ce64c6f49b313cf7d22 WHIRLPOOL 386621a8e223f93d12e48a0a1c554284f80ae181b4785e675952df132dd810d4112c0b519235c80cef02b8b894d1ea317922a0bb85948461b881df96e6ef9474
-AUX icedtea-7.2.0_pax_kernel_support.patch 6511 SHA256 4771937bbb89a92fd77dc5e5945231ae511f284fa368648bb7aa34e0fb48ba9e SHA512 4c51920e1376597d91bf11f0e217c177e954d4d59930b9177c48dc2c6c835a0994dbea11ea2cf9e42f4c3b63e0f21ecf4a4ce5790955673b382438cb77ee4e39 WHIRLPOOL 4190de4e1f4c5660154075a85a2c56d6577d13a14d019346e82a86edac1016bf2ff71b07c9c217693eceb46cfcdb216356ff8259736e782104924e056b7e7d9c
-AUX icedtea-7.2.1.1-pax_mark_rmic_java.patch 963 SHA256 52f8c2cc9848b5e63dd70c8ee9dc42008b3cf59ece268474d7fdf164c3f432eb SHA512 ad6ce466dc60c513c1dcbd14878cdc7399f757320d6461ad2d1013d554730cc26c380caef6d8f4eb6323f7c126a1662303c83cb2515cfdfc519459b6ae7a1b75 WHIRLPOOL 7dc02c2b763a0a9eae5051219f7ff31fd3506ec9cff278a6be1ac6b12c1f829d8df296b35010458f4d1dcb4ed763414ac355ec5134c79aa601723280f94adb45
-AUX icedtea-7.2.1.1-pr986-cacao_memory_fix.patch 6342 SHA256 5ad35a62ceb49215631d7d91b8e610598110d4b935140c5498b76f9a697cab3f SHA512 40a5e55691fe2430fe2c449788e1f61bd701d687e4c6ceab026baa8eebfc36ee1e22ff3aab2d1da80c8914abb423f220963a44949678165cb5416e7b43d4629b WHIRLPOOL 4543bb42ae9c6eff0e1e0d4ec0726106c3a55b996daa30bb7bea68174e37f14d231207e24722bb3fe0164a34182db1359fd5c9da8af2376dc9729eceac81880c
-AUX icedtea-7.2.2-no_suffix.patch 833 SHA256 77b579bf0980410534be744c8d9a953855985869247896f5b44b7f8c55fc58e8 SHA512 d6982b5c7a7df41769cbd14067cff3425af8520d3f8a870028a80b443fe537af1923ed1fc8050ed6fed1d18058c8798bdb578bf19eefc87380c6861702761625 WHIRLPOOL 3df9e0571624fe619170c54379ce673470bb6b9e192942f27300ef5b44f1471cc3abf211bc728a2dbed8070c57d935f8c425129243973f4f9a16d2998a2523b5
-AUX icedtea-7.2.2.1-pax_mark_rmic_java.patch 963 SHA256 52f8c2cc9848b5e63dd70c8ee9dc42008b3cf59ece268474d7fdf164c3f432eb SHA512 ad6ce466dc60c513c1dcbd14878cdc7399f757320d6461ad2d1013d554730cc26c380caef6d8f4eb6323f7c126a1662303c83cb2515cfdfc519459b6ae7a1b75 WHIRLPOOL 7dc02c2b763a0a9eae5051219f7ff31fd3506ec9cff278a6be1ac6b12c1f829d8df296b35010458f4d1dcb4ed763414ac355ec5134c79aa601723280f94adb45
-AUX icedtea-7.2.2.1-pr986-cacao_memory_fix.patch 7401 SHA256 e2060ed9acf9ae9da8943ffec470b09745d758c6c6de8ac06737ea26eef21795 SHA512 023578a2243672503e78a159d1774bcbe9d8cf4fc514166a9bf040e25cc7d28422b3a9469d804909e8a8fecfadd9fd31e8f34f85ae688a58620272ae620135f7 WHIRLPOOL 79fade6ca0c0d42f004e0a88f31159b4cabf5b4391ef30c78d74cf01bcf44f78bbf970ac070e8e8f320eb0dfd7fa17e335412156c2e004a47c2d47faba5bc309
-AUX icedtea-7.2.2.1-warnings_are_errors.patch 6739 SHA256 b824eb31b96aad79e877e8ea4e05e44bcfa16d840a3328260d41a465e7ff7f03 SHA512 65ad279885c3645cc208cbc611df4badb8187793c2667af2c123b0c29a213701293dadcc23b3a65ae6ac0ffedd4b5e6ef0b020bf95e620d7d5cac3fcf912b4c9 WHIRLPOOL 21e1faf63a89e856cb44e97612f4e3496a35064211096a738d6533cfc8fc2712f1891df3294e59b2c254b58fc2635ca1334519596f440f86e124a359a522a8ae
-AUX icedtea-7.2.3.1-pax_mark_rmic_java.patch 963 SHA256 52f8c2cc9848b5e63dd70c8ee9dc42008b3cf59ece268474d7fdf164c3f432eb SHA512 ad6ce466dc60c513c1dcbd14878cdc7399f757320d6461ad2d1013d554730cc26c380caef6d8f4eb6323f7c126a1662303c83cb2515cfdfc519459b6ae7a1b75 WHIRLPOOL 7dc02c2b763a0a9eae5051219f7ff31fd3506ec9cff278a6be1ac6b12c1f829d8df296b35010458f4d1dcb4ed763414ac355ec5134c79aa601723280f94adb45
 AUX icedtea-7.2.3.2-pax_mark_rmic_java.patch 963 SHA256 52f8c2cc9848b5e63dd70c8ee9dc42008b3cf59ece268474d7fdf164c3f432eb SHA512 ad6ce466dc60c513c1dcbd14878cdc7399f757320d6461ad2d1013d554730cc26c380caef6d8f4eb6323f7c126a1662303c83cb2515cfdfc519459b6ae7a1b75 WHIRLPOOL 7dc02c2b763a0a9eae5051219f7ff31fd3506ec9cff278a6be1ac6b12c1f829d8df296b35010458f4d1dcb4ed763414ac355ec5134c79aa601723280f94adb45
 AUX icedtea.env 1074 SHA256 b4ad677dede5c06785db6540d51a9dbe6401e894f03857f5b14dbf6bdf9a33a8 SHA512 933c5d96e1cd36badf9c467b5ac06e8cf5d842915662f6744fb641bba64bdbf024685011f48d2742fadf5a3d82ca2e7f3cc555e51079297f5962e22be3afd03a WHIRLPOOL 57ec8849e93bdd595006515c2cbd6e554ee0e84fa74b80fa2a29106e85f000bf5cd8d9e583f6e60974880b250cbb7d6271ac5d53edcbd2765a4dc0babd571258
-DIST 0036fe6fe7dc.tar.gz 3971078 SHA256 245b30d3ac0fe45aa4c2a3d451029107b16fd0b74830d432b45448676aa86ee2 SHA512 45644cc13d7d44d43c949c78fb2399e9aa796562026f9570de10cf3677381b578af83c1720b0a4fa6c0be2f8493975e05f3805fc06fcebc733630dae9340d7ae WHIRLPOOL 452ef804a5eb87ca47d67083c4a43049301b3ea8a56e9031eb38edbb702d370f67314b7b76c0656f57c8b99bc41669811bed92478701cfd34bfa8c7322f14778
-DIST 0b776ef59474.tar.gz 128861 SHA256 15a6eab62f5108efbf7937b1de7697bd789971886fc1fc08ee8199e16a5c10fe SHA512 2cb8838b44b83a596b34a383b1578eaeb4be6c8df453531c66630f134633c757a958ad86f18327eefcb4501aed9225d62d8836ae15b796e0c0179ce692aafd53 WHIRLPOOL e9dade224f0dbfe8639b67a8fa811b689fac8af36f87703e871ea467a1fa13262743e32c65bef200f06271950933e3604a31648627a3138cdcc99f86e1783864
-DIST 0cf6181d44db.tar.gz 2311102 SHA256 9fbd9e68422aaae9b6962bb7a9400a45959bf36b5f1ea443fbbd270dda9feca1 SHA512 c3dda08fc4a134537c6662877190e444fb3cf9cb2e47b52a2225af101a1c3d8d41abaa34390fa1cd0d0a864411269d514e9a839086b8b3071462bf47babc3359 WHIRLPOOL a73a2f75b2822c2d9d207c0d6f52a42451004a843f02aa15a307ceb0ff770ce81f9087a560c339d3d944510c01055290eae137d27b93a9c7e234cf18ea5ebb07
-DIST 0e651e004747.tar.gz 8994812 SHA256 d68455e5cdb14280cd61155a4e9d531e90b073607f4367e93ead0fcf34476ae1 SHA512 5a1c7e8079fc2955983edb7bd5d85b3470a944b59f18bc5b3f41d7bee14964b8315a19753ac0ac2fcb75b04cbebcdcb043b858615b0cbba34cbd1b6aabb75306 WHIRLPOOL 016f7211a4e6e0145ee28b76b6a99f4a56d607bb050393e525ae3158f9953b955c6090823525315f654fdb81ac4afa5f88e9eb463a9b80756800bf705d94dba4
-DIST 1cf75c0e2c96.tar.gz 3985855 SHA256 8ce48c704f38285207ee6dc56c45b2d214083b4d4d36be02901401b594ce701e SHA512 d800aeb9685548ba6e4955dfd3dfd63fe656b5075ab6847e7c98043c50ed3a3494a727037380adbf0be801fd4a2932f003b97708a936277994939c49fca6a6d6 WHIRLPOOL d34c568db93f00e111f11149683b3ceb3b1f085cb241eb8df1e4b51758699d9ebdded5e40609fb2fbf5d620a344499756f02b11447d18c50655230d24256972d
-DIST 22cc03983e20.tar.gz 129111 SHA256 ada790b4754f521ebfad0dd909ea29b92b2b3c1b84b2e99d32673343727d95d7 SHA512 c6d067471a4b1ee77a88395ff03795358db8f633a68006b6f5f8f2cf9c6db95cb144ab824d5c6a1474053485660fc6d31aecd765932373a91badac35b0393881 WHIRLPOOL a1aa2aae22d5cbfbce582e1d6025b548ae42dbc5e6712789ea322224231e1c76ececb795242c04d5480394beb36a1c60e6adb63aca96a3b096b928c1a1bd363a
-DIST 3231f3e9c517.tar.gz 1449514 SHA256 9e26ea18aff308f636199e9cd822a1af078570221e8b76bbce1dea90d8ac6274 SHA512 b918b7ceaadc4f265f54a0c74ed88ddea72a7bba54c39fb38a780fcf88138bbf723624f445852b1a8394b19e11dc9503323ad19b46c41170046128c414f0a285 WHIRLPOOL 61486703bf67ae02816efef5c586c59b69a7c410ed4a2de2c2cce4068ddc08bf1e31352a3c89ff79d32c7bfbff8340ac4265b075dc49d5390e6cc5c4bfb265a3
-DIST 335fb0b059b7.tar.gz 3971488 SHA256 ff4ab3710fe316b7adc4e57d4d21ff967ca20e2ccc5267ac26b93cd22db8b3fd SHA512 af9d77d1819d20142179aa4ae2f51b5713381539626762698691940ae25e451c4304d865ceef6d4cccd73e015a7b4caba8e1dc11d1ee7718e5e3f0d46148f5cc WHIRLPOOL 8905ec62a5411003a50822ad4122c538ca942e0b2c9223c33abc7d4cf0fcadefc12e5bc6b05ec52bf98167f2bacdf03d4606fb0b20a1382d7ea23e5ae70fe02e
-DIST 338c21646c76.tar.gz 1447906 SHA256 10425cbbb439551293a7a96a128f25ce408c38826bef8562f4c2d65d3134a1d3 SHA512 a7b9aa38297bf42a755a7c0250e8106b374f44764542bd3d314a0c93af5c0261f9d15717ccbd024b2272f04cd220e24a74232b6fa4b2df847e5ee889b978cd0b WHIRLPOOL 20fe9bebaca713e54b26c34b5bb61830ac833f769f2278068ad90cd35a7dcff541574f5323c2f8b0cfd048e68d8b49d1e5b08a72866eb8b27e5fcd09ccd022a8
-DIST 38deb372c569.tar.gz 1450094 SHA256 b892b0db6f3e4f89fd480d46ecb7c9ce5c71a884ae5bfe953b4bda9eedf7ea93 SHA512 e2649648d752d8b412e249c0ff5d319fca3043c053d29a60fa6f79f44211656c92e0c83f04d3ab0c3be1e1201aea0f14ac3035f9a7ef53446e429bd7ab33ab9f WHIRLPOOL 21edaa9d200a316f6602c3569e5af132cbc5c31e3793c8b6452eb21e10d58811619ccdf0a2fd224a701c85a8670f9a5440e1f71005787c8740dfaf65f7aaa0a6
-DIST 3e0087ab5e92.tar.gz 9591074 SHA256 3e85e236b683c14bad9505f414a0acd876956bb8e67362acd6a5bbae99bbe9e4 SHA512 33ceb4cfbdccd1913241b216670e4c59d81dc5419d8c416e6c88fc97cff43088c3b1a1c60d85e456679baae8e47c454f1be04428c3e94fd5ed1313eb84bd1678 WHIRLPOOL 28bb1dab51e347df91e19945d0ecb69c97704ca44bd35389297c7bad51d4c71bdbc635c0acb290a71cdebbc224dda2924f3832ca985e5e627c4e32a1eebef7eb
-DIST 49a6fc8f712f.tar.gz 128837 SHA256 26b9a5b546dfa66ae070ed7863a6580e054d7c5691472273540009cf3f172b54 SHA512 c27ceda3527b80d0cb24101f3e8e4e8eae7c17e88543823610d3d152692a0717bb234db27ddf519b62080fba9248ae29656a0e0f991b07d64357b4afbd41d5a8 WHIRLPOOL 03d541655a6580478b2f86a57ce6d099970012b82054261e70297de3aaff2868046dca90967fbd5f0c101a4549cf8acb3063cf5d3b7f290ca6f2facb7ddff86c
-DIST 507eee662587.tar.gz 44936515 SHA256 b7a309b177f53281fba881f379619a6ce36f1f733da610af1275ed160dbe6d02 SHA512 da77c0ba25b89a2eb61fcbe74a0a44bb82fdd38e6210cc65037cd0828437bed35f21bd2bde4f15c6ad6513dc6a1a4d2a43c02c903585bce645aab8524a29a72d WHIRLPOOL 3e86bd29d251ca18b23b1fa44ee55c67d9b56572cd7fe56fbc467b153fdb50086b30591a8642e9121c6224065181d5b3ee888c21b81435c4d665f752ba2e4290
-DIST 50f6f276a06c.tar.gz 43434230 SHA256 5f8b5edbebb358730425e64a31eaa11c346467ba10ffe1848f2d2ad2ea53bc3d SHA512 2a39043200c81571a4f5bb2011915f1ff2f692e783ae970b3917c9d67ef269fc6b73b9bd23da9a4afde39bb31dba53792bf9241e4b01731bc7e4520f05cf264e WHIRLPOOL 2d494d91d0667ed5c3d672f7c8e18b1ca0684aacf31edef7081b95fca4beb3aa172a2acc88325cfbfde0235290a846b93c2a343e08d7b1442855f072e31e63b0
-DIST 5471e01ef43b.tar.gz 2761767 SHA256 1ef055749ee46ebf7a5be94403b461d8d32e95c98906da459aeb217a0784ff1d SHA512 53396ef5f19f0062e0393b0525e909a49f1ba0af2ed08ef2c3ef48bcd532be7ebbc9f9ee4947466cf4ee5486ef6695c3e42fbcce39045fdb6c3387d694eecde8 WHIRLPOOL 8089242c7b843436df3b6552c07c421f00b8c2300e28a58bbffb37265a1df424fd15c62cfd98e16135bffb357cd4a9665855a7d91a98c59de58528fc0de5a7d1
-DIST 5617f6c5cc94.tar.gz 1447230 SHA256 963915483530f311ff313635f79ed11ea7ce5a1c0dbee5d1acb1994132857fa3 SHA512 e69344abd1daa14cad99c4ab397d138d61a57b13965333dbf627193d3a262ca45c953b9338ca651727c001135c54c905d1aec20fcf7702928b9088989c386d55 WHIRLPOOL 392229728f661ba601fd18ea2b7f7de682e7721e1dc04de71f8acee1f8b486b11f4e1028188f7fa60c282b8fcc775851b39e18327962e6de5baa3dd796fed637
-DIST 6c3b742b735d.tar.gz 44788667 SHA256 48a513d18c919ec08d44cffdc12ae65f1e8942924c6cfcca5c1ffa8ca38afd0e SHA512 4be68e6d0d46c56f597f0750496f9b19c70a44f8aff07df91e17af71af7a368ae7de090e74e9eaaa9120222523afaeab5a50c483deaf09c1a16cfe0634cc7304 WHIRLPOOL 16322e86c2d1f9e2db1ccb7c3010759dbba1886e325d5f9b2aaea475ba4416cfeee8d3bf1ba9464d25a492b3e132eef7d60a2f2d6cd2fd5256f317dee2f728cd
-DIST 7a8825b15df6.tar.gz 3986524 SHA256 297c8dbeed5afa5395b6be06b17282d53f8a888c2909074dfc1605afc0daf1c2 SHA512 5a6459c1d214510adabf9d4f7f62841a34f3ba406c08c12d3e7212399de3e2c36b59511a28b234f076552b4e1b1a96de90bc0fd19472e0d01d310aff7a73d572 WHIRLPOOL 870693026238ec603365ac8175dde13ea180baded1e25d87b78452ea5dc6beaec8f87a1863f3938e4679d5691b24526dfa33a304d53d89aa011ae72d904629ae
-DIST 7edfbfe974f2.tar.gz 2760671 SHA256 823ca6b8fd780bf1b1565a90cfc8ec6f0ee422a5d25ffb20b1ce0272dc4955aa SHA512 561f3a5409f74c1a27eb793fb1a3ec8355df7eb6449994d497621a546c2eafcdf99a625df67cb01a3bd06d07099137d0f7b926a119aafc31e3167dfb35fc17ea WHIRLPOOL d3ce038cb44f45d34f783841233cb7418a7961631afe1760e026984c32555acd6af4795ef4b88bf75decda593b3f7fd567ae0b1b21f3b201a0441519c390d7ea
 DIST 7fae6a3a68c7.tar.gz 1453824 SHA256 8d94e9b594e4ae0eff6899cb4ff899ce66db3b4d6ef158e019b7be96e193ec0f SHA512 76b29c79d4219857ab8b628086d3ea9379c490402643bc4947d3253b012115e97c5f4463f54fe7abf5d82227d722e3cb5ebb5060cdaa881bcc214670200040e0 WHIRLPOOL 55cc41286aaf4df881313dcc28664cfaf3f18b51947951a3a47b41ba7081b168941723700e6128f59729460e4c50c0ab192afc7539d131e6e48130799b4cae8c
-DIST 839d0155f7cc.tar.gz 44793871 SHA256 19dbbf2e370ee89703305c561b3fdd174e949b041484ab515138b72d16fbd7e7 SHA512 815b6036a07552caa96814b3f6559fb5e99cf77168b590137e69a838bdea1b9fc277f3bdecf4f56e07040fcbe1a3b1d7ddd03fb9a7094b208c9e44d81daed919 WHIRLPOOL f6639be4f40d6df9ae4734c97e438bb4a221566a87151bccd97f3db9b417b4e6a484b223a8f62b92ca18a06b3014fd80f20a6de517809520456c4e985b332f93
 DIST 867d5041bee6.tar.gz 2311092 SHA256 ded69ccf2baea82b7baf9050c64160733ff45c10c0a363de80d795618c494707 SHA512 eca7177ceca9f90b344167330bba7a3e53989ccfea6bf0e38851735d4bf9dc8f23f1238d26373f1e19c804e7ec05aa4e84c0004847af116bc2183aded9c34cde WHIRLPOOL 18f007a4378c54c6a1ff1befbea87b39e65b3ec48cf69ac7374c3fe695d58197909b4d2952cf7d81ba9c35c40172c89c3c5cb496c1d82140d92435c06ab570d6
-DIST 889dffcf4a54.tar.gz 9363922 SHA256 b29a8929bb4aadbc033e99dca6a381ca6342f0373b9c3f67827bfc025187ba41 SHA512 e4c4cf5e2112eb9829c43ff9b381d34211245f3291181f309fc91181360fe83b8cf12ce21dac67a400e64eaca4e2ef2dbab2a6c07da7d79de99c03103e5eeb46 WHIRLPOOL 79898542e59eac28c223c142e352285e496c91fc133d0a1ddf3990fdd4032209011365a7ea9f456ef07205da97bbe751372058c4d49d260e6913a3c88d4db519
-DIST 8b7c4c5f6ba9.tar.gz 9101747 SHA256 22866990d143e76ced94b76defa3051e5e5d9a51fd272d63daa0df272d6406a2 SHA512 46ea6c2d60dc2f2daadc31c33663c5d48a20121274fea6ca90afc9c470861cd9f4c53bcf4d6b8ad4e3a8fe90fd73282413d10c05f1c240d64f99acb7e7d336f1 WHIRLPOOL 8c172ddb43093474a75ff202d3b8c71e3f993724442a96c1c6036cd30f75cc8cccd0a71b8a78f610dcfc6e33580f43dadf112ca366ca6bec128ee34636f87487
-DIST 9a744f20cfc5.tar.gz 2754118 SHA256 d8a6012bfb7217d3033b4b2c530753f336a5ea52e487f776f0399c87d7979b99 SHA512 da3946d02275b8f3685a2dd260ca391e3ca3f55518ea87b8a702f460c61f18fcc5b19e076dec13b241da2b665615289aba2cc18dc61d6da57f3934ec38f81671 WHIRLPOOL 5745df4b3b7f7e3888ee3075025367d19eb753b8f4195672da23866151bbdeb6853eace4d2c63ecf6c5d2278ec1cdaf4b10b2677f4e9f5bbb01518403f082ac7
-DIST 9bd1d8e8b802.tar.gz 3863897 SHA256 2bddebe957905927dde720619601ffc22d3067448e6079a2befe2ba30de99a15 SHA512 3061095facb5b0216fd40055bc72cdecf3ce57d49974df6691addbbc296596f1c734440db59a843ddde86b8862fd9f497da79e3a9a2730618fa7465b3a404669 WHIRLPOOL 5b5d364a984b9f29df55b272c74800a57db981288f9b5ac1513de24775434dc22b826847a5dde3b82209b0aca60f73aeae2d533b959b260d31429e7bb203a47e
-DIST a3fa5d49d528.tar.gz 130422 SHA256 c9c03e96be355de46f7aef23209afe2e9ff58c9bd4cf3e6fa4bebfb8f7dc89aa SHA512 08c0106fd8d0e8c81781e7f002a961d791afeddfa00a9e10ad4eff08e856e69c0360ee9f9e2990ddac7ae24084a9e74acf097636b91bc86dd3f88393112e8242 WHIRLPOOL 1a66ba28258b65b9a87a406cb7a6576d7be3b8fd4f02accdaeb9937770a1e47787cfb4ee4891235b677fb14597c6637fc38016fa14f13da0eca8e734ed82f96c
 DIST a567bcb7f589.tar.gz 4263355 SHA256 d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 SHA512 2abbd6ad72a5811963610b81ad3f59882fa0109bbffb69316f7bcadd218982abbb7b94ea41ddd379a0dad8586301e1d317226153d2f592876c56e7d338afadf5 WHIRLPOOL e712ee17b9e4e23a1fe54823218a79a45ab1ca11e23de2896b576a2034650bf8b151f01022e0d3f12421008fc1e8d8f9aa0bfc4cc6bce812dcfbbbab1c66af7c
-DIST abfb890c262a.tar.gz 2761760 SHA256 e800972666fadd0235d9a4d30df7778ec502a4761dc33467e9c80fffc6289c8a SHA512 14a4bc79dc5b70aedcd03bdb75edc08276d6723d2697054975c474d19df703b87f407982599ada7c8cb981f61b5de30e071292e37d2727cd3496505370519577 WHIRLPOOL e534a30d32dff0e5c852353aada373ee68316e1e9ec8991b6c86885b59e49fbc5b88bd3164b652cbff7f73587f138d274b3058ad14f56c8a6f028ebc7ecb8110
 DIST acba2d30209d.tar.gz 130448 SHA256 ae63f88590d4aa82de82322e6bb61b31157e49617a4f8c310fc4c4ab4690f528 SHA512 deabb45a62fde29f4d896351a52742fd27f4410899a0b0fa613f5a7142b0a0125a02c36b14ab21f6d98af671e606d032b47edcd5167d498c1f5173b4d83a4818 WHIRLPOOL 4f8dd5ec721ba7fdd163e54d0f83521444962b1ff5c6c0a165773e9dea23c343c2a5c049029ad4144145af8a87e8704c5c9e68a1e8b3572be804a36b9151bff7
-DIST b534c4c6cd9b.tar.gz 2291346 SHA256 c77dd42d83f06d18fa8aa65c93d137608a2e02cf24b68fc10d7b1c0bcc12a93c SHA512 134554bcd68986ec574e88a5571bc55eb224a2e4a453e7762e9c87b97b871094a2ce828f4d403dd644b927bc303cb6699e34e0beab832e43c800a46e36352aab WHIRLPOOL ab8abfc586830532bfed09fd58e8336a07f936deee248846342c9897b20b55ceadfcbd1783b4c16ee4329964839337b7a9838c67ff95e2004c79a5feb8587800
-DIST beea46c7086b.tar.gz 2304058 SHA256 17055cf1490fab1cccc57bf3aa5b32d655c408859790c7f671bfde180ddf70cb SHA512 05847a1f83248ef1f41a221cd6e8d274f29490286a0162e29d56661d82702dbb9e58b24b2815ca803749f060a6549871f6e235e4193e819f2c326b9fc9c2486f WHIRLPOOL 9499dcd542d14403ee79276d4884e41feeb88440e837078e827c401c2659e12ebec4d132c656ae1f25bde2261e6d13c88b3f79a154b7b21696989e2aace7e711
-DIST bfe5efd70bce.tar.gz 9363244 SHA256 86d2f78025d5781222bcab985b93c97af7a114bdf7ac03b2a7abf7e0fce8a514 SHA512 2a015fef6673f85f152f7d2d9298a6773befec34686a1a170c88b069be5a7de62c51d63afe24fcca7681d1f099956eafb85296107b7bf481925e2b2a9a1b7d5d WHIRLPOOL 22a21277aafd840697191db8f27c0e6cba88c960442b95d474800b7aa994de1d7b0701d7f968bfc1720eb36ae52797c9491faa4a9769a1cf314205aa317c1700
 DIST c89c6ac953e7.tar.gz 2754322 SHA256 a411bdde270bb0451b74fc9ba890159ed1f7070bc25f21b3ebd17b79b42805f8 SHA512 d71228526b24bb4ae8aceeaf51ee77cb1ffb0d7aa6373f61f83d13c6428446327c3ba7edd80eb7ba32c55de2916e00ca06ba8c420d6137cb4afeead843ea242d WHIRLPOOL cb34cc39d8595e1d18abd85d95779e8f83bc3fcafc89558d6fc2d163d7e4b00d0715e7e2883d22ac477535158c52c85f584abd75161b4a903eb31aee6010fae5
 DIST cff92704c4e0.tar.gz 4261719 SHA256 dc768c9d097fb056ad34fc6d5a57e8fd4f3b24bf515be92acc5ee4208160eb3f SHA512 d03f04a13e271a57b8a704ef1684cbf64da0519d579c4bd1aafa0d8e0bc241939018d8425f1b65f6999a7f0dc4b58eb5ba6ea8ed76b3ed5ce3299dd7cd094861 WHIRLPOOL efaabbca72b4471fa72679f071ed0a64184e3281ff7c1a301bcee1a131f3c7f91f93c9f42fc87d4c79e802074da158cdde96578a5eb40f7605c6fbc5b6880959
-DIST d5ddeffc4651.tar.gz 43435299 SHA256 e83e6234842376147a4c32451f23d629ba107e908ebdb0f367657f9cc6c1be98 SHA512 42e4847e20111427f0b1460ee92ba0c72048696c096072084ddee983fe171b30f1c4481080def4368f99a1e15bebf9f242a5a213166459b955a968d848d51dc0 WHIRLPOOL 35abb980f983737c4d3e84a3174cc7b0d0008e8f16ebca2460b0ccbec9411611944c00d1dca5683a9e716b8e279d4e84bfbe21d8846f711ebb32ec569696fde3
-DIST e9b200124386.tar.gz 1453778 SHA256 07dcf05edc38ae63e4b667437cd23e5c3edbf6e03ffd7ce4b3eb24ea4c868468 SHA512 4852ad060d5f645433671da48591015ca8068554f1e1646b449288a35d4c9983dd7ba685db527106cddfcf456ae2bf337b776370c4a269a814bcd8c7348e2eca WHIRLPOOL 6bdb53adc0b8219c3d305a5fa798c1191848f7e929a75eb8cfaa045e89bece895405192bc51248a6f1b304292d8645c14f3228723ffe1d24ced3ced3abe04b95
 DIST ea39d76b3bde.tar.gz 9593612 SHA256 25733b44590c950adc42a2e9c366b8a3992803c06dedcc16d2bf0d50fed54844 SHA512 1ce50a238e3420a56c3f17aa6744031be8124c9984525cd66c74ec7871bb1c25aaa2aa729f23e58a59fb27e4365a3fb268f26097062d69581549c08a83cb0719 WHIRLPOOL 2fde8912e828ef5e0d448b0ee6a019cd76d35dc85e5e8604023103cb2c4cb6274d82e432f05822231ec537845cc13a1371ccf4bc804e5a490d9269396e744dd5
 DIST ee4bd94136ec.tar.gz 3863931 SHA256 26991edc468b7599a332753a60ff861fde78af439d0a5b87d0e5b389d5e53fb5 SHA512 b995ff0e4ea3dac907a30a437aeb1c21a0ecb248c5e8f62cf5c77511c255da2471e34a23758b66c2419bf9e040a2949bf4069f564edc4944964cd144341c9034 WHIRLPOOL f833dd202edb9786b023d0634311834aee3e4cefd51caf8815a5235de8bab85370329c1fdda9461a5bd0f037fe02f4662ed622f2e29e8d4aea7f8b06456a2b49
 DIST f78eb7e08ee1.tar.gz 44934222 SHA256 74cd8b7c7ed1d80dd4cfa45565584ec1c24cfd5e10a32fc026b92f0ce27ff224 SHA512 7b5f09c42403c35d3d11bc22a291709158702abb699cca74e7f3ebcdacd684c8cdd4fd555c85e1b84e57b61f2c0e1bbd5c482bbc448506a67f643ee76b3ceb72 WHIRLPOOL 4cef5657368e52c5c79c3bca96bb6e79168950d9f7277a3addac4b701050b690da43d31877cecdc1e5259d86dba3b795cd9b36ec75d334f0702ec4542803020d
-DIST f855bdb37537.tar.gz 2303970 SHA256 d46ab00352ee74b9d18e5daf38a10f6a31288e38583675c2b2eb58a16e154d19 SHA512 fe866421f2dc98558093d9db0cbe1639b434f63d7a676e41b5d8874a46cf36f5b1d1aa16586c980692d0bae4097399f47939c099c0369c30e2200ba9fd9a0fc7 WHIRLPOOL fedb457aa2f09bca9416b00406838f3ed1baaeb133fe49c98e73ffb7be278ebf1eb7dcba42f6a0c7758404b47ec34b9f382a8dcdf8e988256264592f01b7990e
-DIST icedtea-2.1.1.tar.gz 4658834 SHA256 4a015cf3fb8fb9aa6b3ce4a41fd9bc5dcb417a1885a10a01e92d0cc7a5ffdc65 SHA512 055fa8787a49152944c2141d284be358c0e0e7248dc8c56002c06a49040d9b994cf7184b2406bec60771b7621a16c0936384089503f129bbb856f805512c7f5a WHIRLPOOL 70d55da5dd44b424ec23f350a9e0061112588e81bcb64cf50c53e679ba056c6212020069e556ef59baac2421994823843f4eaa4dc41ffa17b154600c0644e2ff
-DIST icedtea-2.1.tar.gz 4687722 SHA256 8492920dccae8b76bcb41f91f8d98b2dc619380531a679f1f9ea4e166ad02ec6 SHA512 a126f42928387a5482643006422b3a87e8e66d1d0495096944e539256bdb4d0c5d4423d8888a9d9d9a85fb04fec1cbff2488a2bbd6ff1bc46ffcc54623897276 WHIRLPOOL 3a22beff7c51b22487d45538b2b95540ed64facfcc5be0603b19cd8ea5f62b278c82600ee158c58d909103f4f82c7a405eac643043aeb64dd1bb9b881aa49665
-DIST icedtea-2.2.1.tar.gz 4715301 SHA256 0f5ba163904f7c50374ab345216dd1b66c077fc431592eb3d4801f7ecda200b6 SHA512 03e216e29ed12e8514c4e829c66b5d11f0d9935455409be30fe01874a81a438544a99ed2b6a501d341f79f036bf3c1606ba7c25b27de6fbc6f204457c16779cd WHIRLPOOL 5287ff2a0d950a8b203e0ecc6f6c95aa082ab01105f81287ffb2a43753bf31d3acf7c4b0433acbc2a683112f989b31e2ee75bb8b7a6dce2112c9eafacaeb150b
-DIST icedtea-2.2.tar.gz 4749395 SHA256 98bc5a0d789a686cb7a1209a8945c314e801a931b2b6004a33dfe692e93626d5 SHA512 69418c22d7d6635d236e4ba3b8995019ff1d2ecc1166d10606a797239eed952e4a91dc5cec9ea61433b6cc855a4a8de112f638f6f01ab0ec45ca1440d47b78b9 WHIRLPOOL 4288bec9ad76374ef8d27a9549356361a17bba6bc5f0066c9a523b4b3d0f40abd8c89fd0214386b1a453b7e77723a00f348dc71258169bf7af7abf234967d69d
-DIST icedtea-2.3.1.tar.gz 4740854 SHA256 4d5f253fb20d4026ae55e8ab97840e257ca5b89897593a68dd18bb1c48b6f3e9 SHA512 0f415b84f18019690309b57ced53eb23e9a92b3537672b7185062a721ca3f533af65d4571a42501204f6442a22c41762837e222ff02a34c5f628607c009ff2d8 WHIRLPOOL e9794b9a3173302ebf2479dbb3e3b6db0f00ad5213c146c99da4b688164870cd1e9a825e25436e624384f889bb15e59ac03917c1205881997e9c43fe936d4f2e
 DIST icedtea-2.3.2.tar.gz 5042922 SHA256 d7e87de527934fcbb06c162e0e119d9b118069f3f52a1420d303fe19c5d74ef2 SHA512 e1d56b0576d87f546dd10dc3b684db8af555599706582efc3535ef96732ca1934b1f1bda99dc706b6c242834fdbb16fbd94827e876110cbff1fd7338475d7ae1 WHIRLPOOL 170486abd82b63687d9af14b724aa9143c25a4463802534fe4e0e3470ebcb5950e91353f11170c5d6238015c2fd0124c7ee81388664412fc9ab89df7418f299e
-DIST icedtea6-1.11.2.tar.gz 6387625 SHA256 078637dc8323951b18cbb2aac56fd2f24baaa81f0757391aaa17e1b7577e9ce5 SHA512 0aa85aba480a59edacb639e639610fc2967834f5b528a8418d972ad5e391913a74546d682943d7df71841281caf5d3639cc49bcdfafd6ef6eebdc0d4899b1018 WHIRLPOOL 7bdaa91b0b50857de18ae13b721572e1fdc7ecbdbd30b15c992bbc2c90ec11aaf7476a8f7b98a54d5dd54b9891e1a3ec0f95be0280fa4b04ec6ce47f51d55da0
-DIST icedtea6-1.11.3.tar.gz 6340923 SHA256 7d91c407b9795bd6f6255bcf0fb808416b36418c57f601dc47cfabff83194cf4 SHA512 517c81d24c26b583ed3c0cbd3ecd1a4379b9ea323c03349c12e1cb5125ec84c1e91adc3382b8a8bf2146115347d97462cb4d89c7af4bdb485f89aed864d9b082 WHIRLPOOL 532ec3212ffa0a9f97dec174e23a1af3874b2bef2ed327ae3cb97a1b8a920fd1c62008fa458d582df7ce28aa130371644759892137829a01856a3047df75b88f
 DIST icedtea6-1.11.4.tar.gz 6379356 SHA256 7bc0037514aedbbd5e65edcb2fa300a18285688d27b359c2144fcf563174e4fd SHA512 e50dea9674d5badeebdafe50ca81b5f195cb8fa898ae43f5110971aebf5f5419b2841786aa132e839fec569206a70fb4ace0111ecf5a1b0fe567561fc28a8ccf WHIRLPOOL ac5349ddf715bab29e2e8a93e13e5e8a056c14b8a63976ac1ea96ed14ae7ee0d383eb97716e71d7b348649dab19d58e2c824b0a76128e2cb6518b29c49dd0e50
 DIST jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz 294537 SHA256 47fce7bd556c1b1d29a93b8c45497e0d872b48b7f535066b303336f29d0f0d8d SHA512 8b479a23f4c2eb16100bb0745452c652849f8e18912756e2d9f8ac9cd395f4bcf89af89d6feda25c8ec41cb90b7f17bebe646637234ed360c65da2a45dbbac04 WHIRLPOOL b9ba7a0c73e16245c109f983435f00a9349c747cc5b5ef4592b8aaf7efc95af0992d9c897530a12e886e7f20687a290f70f3cb27529f1661bc37d76d00f2b2af
 DIST jamvm-e70f2450890b82c37422616cc85e1a23385f03cd.tar.gz 298410 SHA256 3ca7e297ef4daa56c3dd733e21bce795d57ab071243369aa9400c0384ada8a4c SHA512 5843bdf7e00a120e6dc545b4d2d69f2fb72cb0e368a9fe5e280536bf065c6cb207c75c32477f3ef7d210c8dcbcb93324c14042579b92b177c651dfae1ae95b54 WHIRLPOOL b0a40fd4929acac5d3a24c3aabc9666baf071b84b56e3992d3a191eea202bf8d7d169a68a390816dec606df2055902f33ce10c8c0a5d1b6d46ff7a8869e8098f
@@ -72,14 +21,7 @@ DIST jaxp144_03.zip 5964999 SHA256 c1a5348e17b330a7e4b18431e61a40efd2ba99a7da711
 DIST jdk6-jaf-b20.zip 71243 SHA256 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012 SHA512 22fef9e0fdde82f141151d426d26316d7c23fd4cc2132ef191f38ea9420ebb3126670b0456ab4de83896307eab48bab0c46aaf0485f39e89cb57dac3215d499a WHIRLPOOL 2b02e883c7a2341ce927f402a9abc5a632a6718f713fbaa5c65133a0ac81a1a58a317b7e2028c309196805dc43146c591852c05144c64f2428938cb3ec4972d2
 DIST jdk6-jaxws2_1_6-2011_06_13.zip 5512710 SHA256 229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3 SHA512 643266da495f239aca1a08ba85af337e5ab50e5b859bffbccab64cf1c4099cae641d9741a20ca59c599c1285266a79489dec190d7fb15daa88c82b69ce97dbd6 WHIRLPOOL cbd0614060d887ce5e1ee6aefaa213265ee45ae11b3f0f90eef0cfa5ee5db1c35d8209bf1d2dab6f5966af22ab14312891081cfa6ca4a11de92f272f33a2ea20
 DIST openjdk-6-src-b24-14_nov_2011.tar.gz 45742125 SHA256 f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227 SHA512 a965efa2fbe95a32988f78f1e51c42321ff42c1e631d5062aff204ba42839d6e05455f1ae039540e38ec947b50a635984cd3302eb09e81962575510309374e05 WHIRLPOOL 2dd759c4d8a23f0eb66bb28e1b48842fa3984d9796833bbbb6a3305a49d9cb1f2ce19b59c93b9f2a33d679559bf893fd62b4f831aa76bb053351e219639d9286
-EBUILD icedtea-6.1.11.2.ebuild 9967 SHA256 49b1245db6e90f5a32075b87b450eb2beb9f4af876bcae319c995b3c525b4591 SHA512 2e52e8b97579b0a5f030e83d9acd62c12f28c22991c30dda4b923062f3f1f5fc8f4c77e220c1189723fae98966ba7d5e2812ad41374beba583cdbdd57bf00d97 WHIRLPOOL 053118c3e59c940eaf119c54ece3744fb89051b83df5733446e052f12fd05261bd58d79203cde24b5374d8062f29e9e87b56a88d2eca9beb97bf2ec97edf0c57
-EBUILD icedtea-6.1.11.3.ebuild 10613 SHA256 840aa55b38dffb5bae4a32e566909736f1b41ba08e27f5df48096acecf20ef97 SHA512 dd9e7e4a66b0cec9c09f8cd850e9b196b2df77ee6d404c79d0c6cd0ac3aa09d08dad513eb6a2a8b7e9e6f5025c51b52a292a8b57d8503a172a79939c8557988b WHIRLPOOL 8548fbf800c52b61959a7a3282953b967330ecdba3ce920a1a516effb1d781d32a611bb125b45a3da47396c8c773b7d08f96ca17985832604ecfbe004321309c
-EBUILD icedtea-6.1.11.4.ebuild 10660 SHA256 8564fe27d190e559567e910528759779b7f2f54869320e49a0859b07c14659fd SHA512 59f049b7a75e529fc67e3f25d9d12daf1c0b807d226f82b1e36a5463ebcf51791327e8e8f6c71f4d60c517166b59a9a54ebea33bf2b753fddfad0d39ca28644c WHIRLPOOL ef1f12cde29752b12b4c0f2d521d6279a5ace3ea31e3a5e8ff98fc14b2cad8fa88ae251824527f84435f4d94069a8b37c5df514f35f03ab7a2765e0a4f67be00
-EBUILD icedtea-7.2.1.1.ebuild 11131 SHA256 47c5aa1f16a1d99852674e096edd6530f9d6ff08beb095a8fdb9a4e51758a0ec SHA512 55ff267a4fc22a9ef26b339c8785e9898efad6d6f14f050c807143abd7a368c4fef13a4bd101044e597238a4417ae7412f64f136ff8559b3138773fac36100c4 WHIRLPOOL 34b0936a0ec4185c166e0d290661a850941744cf3a05ad049d9622475cd5c05399eb786eb6f9a201e4c29bd5928d865d3801e1c52f70029cfe650866b7146892
-EBUILD icedtea-7.2.1.ebuild 10770 SHA256 282eeafdc55f375d48246a24a03c99b84427d1ef0927d31745b91ff4a0f86bad SHA512 b736da8d0155ac249c0ab1b6a8ad2a3c7adc86369bc7513217a7b38a8e36a5c8658c9151e259d4c36e631a029f09ecf12c45158ace0585c14840f250981aae36 WHIRLPOOL 315cdbe24b427508337d5e25a5faf8703f789baeaac51ca9c0c0a5d938e4ca403525bf465d54b23659f8388c1ff2f181210e5c31b96a900774d7d76bedf6422d
-EBUILD icedtea-7.2.2.1.ebuild 11203 SHA256 3094ffef6577b34a9ac55d5a22351f0a18bb6754411cfa5e73b745a792ed25a0 SHA512 9c9dc1c7ac8918898be348c49d8afd414a2dce371e8df3add1be976881c934f8fa7bae41a99e1624417aa3bfac4fb2c3c77b3d3804925a2b21d369da94f0d2bf WHIRLPOOL e78a60b1ca973441e5f06d107bac6e02f6bd27ba48199bc4d2cde75973fe7271086e099089c4050d011fbbfb400928a4812a4c4531d043f8a7f49716e166e7dd
-EBUILD icedtea-7.2.2.ebuild 10672 SHA256 c804007326276dcac72ceb6ad7c68cffc046ea75653e2d037510bfd4c2593791 SHA512 6a72cd6502f3f707e8d486fa07e3f461e3651324dc25a5c05f92e83895fbc7b18a6b555e9d785e1cb39d0ed7622e9a832fbe8d5cd63a0869dbdb83a38189517e WHIRLPOOL cd686bab60538d2d6cf595afe67fc0abf7fbbf2c28ee48faed66ec1f11362fc978d139bee6e0164ee1bb98006605e18640f41227ba143fd21e69a4c050a7c286
-EBUILD icedtea-7.2.3.1.ebuild 10876 SHA256 51ed3d110a6abcf8072f2538e9be677609eba24a762ab41d4a6ef5c5854ce566 SHA512 447db9ce8cfdf1d00bd0c942e6924cf8af2e4ca96b3b0b99f01bc596d2f115dcb58dd559d9fc8304b1076c2e3a1a4ec8a84be9e3770d6fdda09cb7c67a406e21 WHIRLPOOL 08bc66777775bb946536a1fa4caf101d6e2fb265474ed5b465d6ff4cd486b88ad9e82ab0d85c58007072738c14b47c646482bd2617ac4054a2147f71fc68d195
-EBUILD icedtea-7.2.3.2.ebuild 10876 SHA256 0a9b99bd9e9bbbc75940dc89e70be545dde3457d32e2ab58f850ba54d9e216e5 SHA512 ced3493603dc0c5f58a15327d3ed568ffeffc9c472118be19bd6735914d37b8aff872b678f88b44a2bd42cff8e1912e288e117f96c271c7bbec257d29aa696f5 WHIRLPOOL 9e31bae2842b920f49ea45b8cda6cba41b1ff8b1bd291cbcd19d1ca3e04c0b4aab541b216d487778615af1c879da27311d451cc9ef552c69d85c817ecac7c072
-MISC ChangeLog 18055 SHA256 7885e96cc5d5ca76e8ee259adef5f91338d58cdf5cca671b51d975d2bd994820 SHA512 651e914fc03560a857c96c93ba16e971ac457ecc1dc2a6dff5074b35a4c2b550354197998c33bc7a12d794aa94aebc3e05803f696aea62d5a4f60850efeaa9b0 WHIRLPOOL e0b1dac5d088fdc84d146aaeab9e6137bec6571d8b46af2bd5b0c52e89a698b2810af252bb2167beab002357aaa5af1aeb3dc7572166418a40fd113585b52fe2
+EBUILD icedtea-6.1.11.4.ebuild 10658 SHA256 427b41a560754d0b04bf7ab0bcfcf087d9c0d441b8ee47cd5dfbf56f6ee54266 SHA512 6487869f5c80b44d6882e0b7e07e4550caa29d12872e471fb111489f21193bb87a05b1ea3a43d6d22610ee52b7df6f55761dc1340ee8dc4de81ac764b969a977 WHIRLPOOL 12b06251a92b5748a09369722c9c5b594893b62313a558cf14ea9e8b91e8e17bbd40ba5f39d35ba56c1df1b8eca2f85812d19a78e31c6d1f8c9c78bcd2da5123
+EBUILD icedtea-7.2.3.2.ebuild 10874 SHA256 019296d5c11411f45f944f48e439d1ab3c95b0e16e426f13c062e301563a58ab SHA512 c971d82120377f5e7e4d0255071183b74dec8ff96dc97eac4a90b50e729f4e5153c08f318ebed3a6571d779234b84e26e5c5cda5595e353d531b2b95cc8f9c19 WHIRLPOOL 78a395ce7b8e5e04db5f87f3d2ad85665487d1859812213903dee06020e93e0bae4ab1cf6aaf2373eef8ebd457957337be06d3f835f84d3b59cb509c8311475b
+MISC ChangeLog 18989 SHA256 5efc673212929da94f13c486c8e7ba6eac28622d6d06f91b6201de2f85c44d2e SHA512 4c1cb15c966c9bd335f9c588d3292b3cc8223a84136ea8b93d3c68376694420ce1aac57a3aeae6136465c6a2a0ca094ba22589cc6c9c7df57e4dd0053713a6de WHIRLPOOL 27161615d002201c23d8202f68d41b0d55ef86feee71590287dd4f5979af827ce8a439193e71ebdf8be4f8302155a1b3e420f796675e7d964f24186bd19fea65
 MISC metadata.xml 1493 SHA256 13532771b5aeb1b23a22b1ea5947feabe6011d567d15e38e676e4045e8adcf12 SHA512 ecd4563d7550be63e20371b67510d16582d661914df3ccad31faa59e173aa51d81a3ae6b19518dfb86bce23f231ad0fc44f042ff187613fe2ec9680f1621061d WHIRLPOOL 3bb02e03a422667191a98bc0cfa695b0f35a565d38b979f413b2a0768d6fea2d47692279433ab85e4871ee5968e81e1e229a09f134f68e0c0966cecb9646a23a

diff --git a/dev-java/icedtea/files/icedtea-7-compile_for_7_cacao_mem.patch b/dev-java/icedtea/files/icedtea-7-compile_for_7_cacao_mem.patch
deleted file mode 100644
index 497a67f..0000000
--- a/dev-java/icedtea/files/icedtea-7-compile_for_7_cacao_mem.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-# HG changeset patch
-# User Andrew John Hughes <gnu_andrew@××××××××××.org>
-# Date 1339588177 -3600
-# Node ID df0999b55509faf1504b3ff55152a61a7cff57fc
-# Parent  e6d81fc2c9439652f903664d51a13732c73485ea
-Make compile-for-7.patch apply after cacao/memory.patch
-
-2012-06-13  Andrew John Hughes  <gnu_andrew@××××××××××.org>
-
-	* Makefile.am:
-	Apply compile-for-7-cacao-mem.patch instead of
-	compile-for-7.patch when using a compiler that
-	supports diamond and either USING_CACAO or BUILD_CACAO
-	are set.
-	* patches/boot/compile-for-7-cacao-mem.patch:
-	Version of compile-for-7.patch post applying
-	cacao/memory.patch.
-
-diff --git a/Makefile.am b/Makefile.am
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -364,8 +364,16 @@
- if JAVAC_LACKS_DIAMOND
- ICEDTEA_BOOT_PATCHES += patches/boot/ecj-diamond.patch
- else
-+if USING_CACAO
-+ICEDTEA_BOOT_PATCHES += patches/boot/compile-for-7-cacao-mem.patch
-+else
-+if BUILD_CACAO
-+ICEDTEA_BOOT_PATCHES += patches/boot/compile-for-7-cacao-mem.patch
-+else
- ICEDTEA_BOOT_PATCHES += patches/boot/compile-for-7.patch
- endif
-+endif
-+endif
- 
- if DTDTYPE_QNAME
- ICEDTEA_BOOT_PATCHES += patches/boot/jaxws-getdtdtype.patch
-diff --git a/patches/boot/compile-for-7-cacao-mem.patch b/patches/boot/compile-for-7-cacao-mem.patch
-new file mode 100644
---- /dev/null
-+++ b/patches/boot/compile-for-7-cacao-mem.patch
-@@ -0,0 +1,42 @@
-+diff -Nru openjdk-boot.orig/hotspot/make/linux/makefiles/rules.make openjdk-boot/hotspot/make/linux/makefiles/rules.make
-+--- openjdk-boot.orig/hotspot/make/linux/makefiles/rules.make	2012-06-13 03:40:41.009311243 +0100
-++++ openjdk-boot/hotspot/make/linux/makefiles/rules.make	2012-06-13 03:48:41.838257784 +0100
-+@@ -139,8 +139,8 @@
-+ RUN.JAR$(MAKE_VERBOSE) += >/dev/null
-+ 
-+ # Settings for javac
-+-BOOT_SOURCE_LANGUAGE_VERSION = 6
-+-BOOT_TARGET_CLASS_VERSION = 6
-++BOOT_SOURCE_LANGUAGE_VERSION = 7
-++BOOT_TARGET_CLASS_VERSION = 7
-+ JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+ 
-+diff -Nru openjdk-boot.orig/hotspot/make/solaris/makefiles/rules.make openjdk-boot/hotspot/make/solaris/makefiles/rules.make
-+--- openjdk-boot.orig/hotspot/make/solaris/makefiles/rules.make	2012-06-13 03:40:41.009311243 +0100
-++++ openjdk-boot/hotspot/make/solaris/makefiles/rules.make	2012-06-13 11:36:03.057522188 +0100
-+@@ -131,8 +131,8 @@
-+ RUN.JAR$(MAKE_VERBOSE) += >/dev/null
-+ 
-+ # Settings for javac
-+-BOOT_SOURCE_LANGUAGE_VERSION = 6
-+-BOOT_TARGET_CLASS_VERSION = 6
-++BOOT_SOURCE_LANGUAGE_VERSION = 7
-++BOOT_TARGET_CLASS_VERSION = 7
-+ JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+ 
-+diff -Nru openjdk-boot.orig/hotspot/make/windows/makefiles/rules.make openjdk-boot/hotspot/make/windows/makefiles/rules.make
-+--- openjdk-boot.orig/hotspot/make/windows/makefiles/rules.make	2012-06-13 03:40:41.009311243 +0100
-++++ openjdk-boot/hotspot/make/windows/makefiles/rules.make	2012-06-13 11:36:19.537797380 +0100
-+@@ -43,8 +43,8 @@
-+ !endif
-+ 
-+ # Settings for javac
-+-BOOT_SOURCE_LANGUAGE_VERSION=6
-+-BOOT_TARGET_CLASS_VERSION=6
-++BOOT_SOURCE_LANGUAGE_VERSION=7
-++BOOT_TARGET_CLASS_VERSION=7
-+ JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+ 

diff --git a/dev-java/icedtea/files/icedtea-7-compiler_detection_cleanup.patch b/dev-java/icedtea/files/icedtea-7-compiler_detection_cleanup.patch
deleted file mode 100644
index af13d42..0000000
--- a/dev-java/icedtea/files/icedtea-7-compiler_detection_cleanup.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-# HG changeset patch
-# User Andrew John Hughes <gnu_andrew@××××××××××.org>
-# Date 1339484856 -3600
-# Node ID 1a9e619bc32e81697bf4200a607935ee00c8d388
-# Parent  7ceb431c104f1da9cbabebdcc223b008e0177a71
-Bring compiler detection into line with other jdk tools and check java/javac work before running other macros.
-
-2012-03-20  Andrew John Hughes  <ahughes@××××××.com>
-
-	* acinclude.m4:
-	(IT_FIND_COMPILER): Define only once and
-	rename from IT_FIND_JAVA_COMPILER.
-	(IT_FIND_ECJ): Use same form as detection
-	for java, javah, jar and rmic.
-	(IT_FIND_JAVAC): Likewise.
-	(IT_CHECK_JAVA_AND_JAVAC_WORK): New macro to check
-	java and javac actually work together to compile code
-	before running other tests such as the dtdtype one.
-	(IT_CHECK_FOR_CLASS): Depend on java/javac working.
-	(IT_GETDTDTYPE_CHECK): Likewise.  Add -target 5.
-	(IT_JAVAH): Depend on java/javac working.
-	* configure.ac: Invoke IT_FIND_COMPILER rather than
-	IT_FIND_JAVA_COMPILER.
-
-diff --git a/acinclude.m4 b/acinclude.m4
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -117,50 +117,41 @@
-   AC_SUBST(OS_PATH)
- ])
- 
--AC_DEFUN([IT_FIND_JAVA_COMPILER],
-+AC_DEFUN([IT_FIND_COMPILER],
- [
--  JAVAC=${SYSTEM_JDK_DIR}/bin/javac
-   IT_FIND_JAVAC
-   IT_FIND_ECJ
-   IT_USING_ECJ
- 
-+  AC_SUBST(ECJ)
-   AC_SUBST(JAVAC)
- ])
- 
--AC_DEFUN([IT_FIND_ECJ],
-+AC_DEFUN_ONCE([IT_FIND_ECJ],
- [
-+  ECJ_DEFAULT=/usr/bin/ecj
-+  AC_MSG_CHECKING([if an ecj binary was specified])
-   AC_ARG_WITH([ecj],
--	      [AS_HELP_STRING([--with-ecj[[=PATH]]],the path to an ecj binary)],
-+	      [AS_HELP_STRING(--with-ecj,bytecode compilation with ecj)],
-   [
--    if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
--      IT_CHECK_ECJ(${withval})
-+    if test "x${withval}" = "xyes"; then
-+      ECJ=no
-     else
--      if test "x${withval}" != xno; then
--        IT_CHECK_ECJ
--      fi
-+      ECJ="${withval}"
-     fi
-   ],
-   [ 
--    IT_CHECK_ECJ
-+    ECJ=no
-   ])
--  if test "x${JAVAC}" = "x"; then
--    if test "x{ECJ}" != "x"; then
--      JAVAC="${ECJ}"
--    fi
-+  AC_MSG_RESULT(${ECJ})
-+  if test "x${ECJ}" = "xno"; then
-+    ECJ=${ECJ_DEFAULT}
-   fi
--])
--
--AC_DEFUN([IT_CHECK_ECJ],
--[
--  if test "x$1" != x; then
--    if test -f "$1"; then
--      AC_MSG_CHECKING(for ecj)
--      ECJ="$1"
--      AC_MSG_RESULT(${ECJ})
--    else
--      AC_PATH_PROG(ECJ, "$1")
--    fi
-+  AC_MSG_CHECKING([if $ECJ is a valid executable file])
-+  if test -x "${ECJ}" && test -f "${ECJ}"; then
-+    AC_MSG_RESULT([yes])
-   else
-+    ECJ=""
-     AC_PATH_PROG(ECJ, "ecj")
-     if test -z "${ECJ}"; then
-       AC_PATH_PROG(ECJ, "ecj-3.1")
-@@ -171,43 +162,45 @@
-     if test -z "${ECJ}"; then
-       AC_PATH_PROG(ECJ, "ecj-3.3")
-     fi
-+    if test -z "${ECJ}"; then
-+      AC_PATH_PROG(ECJ, "ecj-3.4")
-+    fi
-   fi
- ])
- 
--AC_DEFUN([IT_FIND_JAVAC],
-+AC_DEFUN_ONCE([IT_FIND_JAVAC],
- [
-+  JAVAC_DEFAULT=${SYSTEM_JDK_DIR}/bin/javac
-+  AC_MSG_CHECKING([if a javac binary was specified])
-   AC_ARG_WITH([javac],
- 	      [AS_HELP_STRING([--with-javac[[=PATH]]],the path to a javac binary)],
-   [
--    if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
--      IT_CHECK_JAVAC(${withval})
-+    if test "x${withval}" = "xyes"; then
-+      JAVAC=no
-     else
--      if test "x${withval}" != xno; then
--        IT_CHECK_JAVAC(${JAVAC})
--      fi
-+      JAVAC="${withval}"
-     fi
-   ],
--  [ 
--    IT_CHECK_JAVAC(${JAVAC})
-+  [
-+    JAVAC=no
-+  ])
-+  AC_MSG_RESULT(${JAVAC})
-+  if test "x${JAVAC}" = "xno"; then
-+    JAVAC=${JAVAC_DEFAULT}
-+  fi
-+  AC_MSG_CHECKING([if $JAVAC is a valid executable file])
-+  if test -x "${JAVAC}" && test -f "${JAVAC}"; then
-+    AC_MSG_RESULT([yes])
-+  else
-+    AC_MSG_RESULT([no])
-+    JAVAC=""
-+    AC_PATH_PROG(JAVAC, "javac")
-+  fi
-+  AC_SUBST(JAVAC)
-   ])
- ])
- 
--AC_DEFUN([IT_CHECK_JAVAC],
--[
--  if test "x$1" != x; then
--    if test -f "$1"; then
--      AC_MSG_CHECKING(for javac)
--      JAVAC="$1"
--      AC_MSG_RESULT(${JAVAC})
--    else
--      AC_PATH_PROG(JAVAC, "$1")
--    fi
--  else
--    AC_PATH_PROG(JAVAC, "javac")
--  fi
--])
--
--AC_DEFUN([IT_FIND_JAVA],
-+AC_DEFUN_ONCE([IT_FIND_JAVA],
- [
-   JAVA_DEFAULT=${SYSTEM_JDK_DIR}/bin/java
-   AC_MSG_CHECKING([if a java binary was specified])
-@@ -1158,6 +1151,7 @@
- ])
- 
- AC_DEFUN([IT_JAVAH],[
-+AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
- AC_CACHE_CHECK([if $JAVAH exhibits Classpath bug 39408], it_cv_cp39408_javah, [
- SUPERCLASS=Test.java
- SUBCLASS=TestImpl.java
-@@ -1452,6 +1446,44 @@
-   AC_CONFIG_FILES([tz.properties])
- ])
- 
-+dnl check that javac and java work
-+AC_DEFUN_ONCE([IT_CHECK_JAVA_AND_JAVAC_WORK],[
-+  AC_REQUIRE([IT_FIND_JAVA])
-+  AC_REQUIRE([IT_FIND_COMPILER])
-+  AC_CACHE_CHECK([if the VM and compiler work together], it_cv_jdk_works, [
-+  CLASS=Test.java
-+  BYTECODE=$(echo $CLASS|sed 's#\.java##')
-+  mkdir tmp.$$
-+  cd tmp.$$
-+  cat << \EOF > $CLASS
-+[/* [#]line __oline__ "configure" */
-+
-+public class Test
-+{
-+    public static void main(String[] args)
-+    {
-+      System.out.println("Hello World!");
-+    }
-+}]
-+EOF
-+  if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
-+    if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
-+      it_cv_jdk_works=yes;
-+    else
-+      it_cv_jdk_works=no;
-+      AC_MSG_ERROR([VM failed to run compiled class.])
-+    fi
-+  else
-+    it_cv_jdk_works=no;
-+    AC_MSG_ERROR([Compiler failed to compile Java code.])
-+  fi
-+  rm -f $CLASS *.class
-+  cd ..
-+  rmdir tmp.$$
-+  ])
-+AC_PROVIDE([$0])dnl
-+])
-+
- dnl Generic macro to check for a Java class
- dnl Takes two arguments: the name of the macro
- dnl and the name of the class.  The macro name
-@@ -1459,6 +1491,7 @@
- dnl replaced by '_' and all letters capitalised.
- dnl e.g. IT_CHECK_FOR_CLASS([JAVA_UTIL_SCANNER],[java.util.Scanner])
- AC_DEFUN([IT_CHECK_FOR_CLASS],[
-+AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
- AC_CACHE_CHECK([if $2 is missing], it_cv_$1, [
- CLASS=Test.java
- BYTECODE=$(echo $CLASS|sed 's#\.java##')
-@@ -1504,7 +1537,8 @@
-   AC_PROVIDE([$0])dnl
- ])
- 
--AC_DEFUN([IT_GETDTDTYPE_CHECK],[
-+AC_DEFUN_ONCE([IT_GETDTDTYPE_CHECK],[
-+  AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
-   AC_CACHE_CHECK([if javax.xml.stream.events.Attribute.getDTDType() wrongly returns a QName], it_cv_dtdtype, [
-   CLASS=Test.java
-   BYTECODE=$(echo $CLASS|sed 's#\.java##')
-@@ -1561,7 +1595,7 @@
-     }
- }]
- EOF
--  if $JAVAC -cp . $JAVACFLAGS -source 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
-+  if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
-     if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
-       it_cv_dtdtype=no;
-     else
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -97,7 +97,7 @@
- IT_CHECK_IF_DOWNLOADING
- IT_CHECK_FOR_JDK
- IT_FIND_JAVA
--IT_FIND_JAVA_COMPILER
-+IT_FIND_COMPILER
- IT_FIND_JAVAH
- IT_FIND_JAR
- IT_FIND_RMIC

diff --git a/dev-java/icedtea/files/icedtea-7-no_suffix.patch b/dev-java/icedtea/files/icedtea-7-no_suffix.patch
deleted file mode 100644
index 61bbd09..0000000
--- a/dev-java/icedtea/files/icedtea-7-no_suffix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# HG changeset patch
-# User Andrew John Hughes <ahughes@××××××.com>
-# Date 1338297380 -3600
-# Node ID fb4e64ae06a31c878cc711579fe87a6f626f73fb
-# Parent  2c3c929e038c6c64d79ecf98005f5fd2f4d0f37d
-Don't add a suffix for building the default, IcedTea.
-
-2012-05-25  Andrew John Hughes  <ahughes@××××××.com>
-
-	* Makefile.am:
-	(versioning): Don't add a suffix if building
-	the default project, 'icedtea'.
-
-diff --git a/Makefile.am b/Makefile.am
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1435,7 +1435,7 @@
- 	  echo "DISTRO_PACKAGE_VERSION=$(PKGVERSION)" \
- 	    >>openjdk/jdk/make/common/shared/Defs.gmk ;
- endif
--	if test x"$(PROJECT_NAME)" != "xjdk7"; then \
-+	if test x"$(PROJECT_NAME)" != "xjdk7" && test x"$(PROJECT_NAME)" != "xicedtea"; then \
- 	  proj_suffix="-$(PROJECT_NAME)"; \
- 	fi ; \
- 	if test x"$(VERSION_SUFFIX)" != "x"; then \

diff --git a/dev-java/icedtea/files/icedtea-7.2.0-explicit-gthread.patch b/dev-java/icedtea/files/icedtea-7.2.0-explicit-gthread.patch
deleted file mode 100644
index 1f13e07..0000000
--- a/dev-java/icedtea/files/icedtea-7.2.0-explicit-gthread.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- acinclude.m4.orig	2012-02-25 15:44:58.208371766 +0100
-+++ acinclude.m4	2012-02-25 15:46:03.592027548 +0100
-@@ -2011,7 +2011,9 @@
-   AC_MSG_RESULT(${ENABLE_SYSTEM_GTK})
-   if test x"${ENABLE_SYSTEM_GTK}" = "xyes"; then
-     dnl Check for Gtk+ headers and libraries.
--    PKG_CHECK_MODULES(GTK, gtk+-2.0,[GTK_FOUND=yes],[GTK_FOUND=no])
-+    dnl Explicitly include gthread-2.0 to get g_thread_init even on glib 2.32
-+    dnl where it is deprecated.
-+    PKG_CHECK_MODULES(GTK, gtk+-2.0 gthread-2.0,[GTK_FOUND=yes],[GTK_FOUND=no])
-     if test "x${GTK_FOUND}" = xno
-     then
-       AC_MSG_ERROR([Could not find Gtk+; install Gtk+ or build with --disable-system-gtk to use the in-tree headers.])

diff --git a/dev-java/icedtea/files/icedtea-7.2.0_pax_kernel_support.patch b/dev-java/icedtea/files/icedtea-7.2.0_pax_kernel_support.patch
deleted file mode 100644
index 2d8f8ce..0000000
--- a/dev-java/icedtea/files/icedtea-7.2.0_pax_kernel_support.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-Author: Ralph Sennhaser <sera@g.o>
-
-The idea is to apply the pax markings before using a freshly built jdk. Be it
-for running tests or building additonal vms or after bootstrap to build the
-final jdk.
-
-There are currently two types of pax markings with the userspace utilities
-chpax and paxctl. Both types of pax marking are base on modifing the ELFs. A
-third type based on xattrs is in development.
-
-The embedded test_gamma.patch is taken from icedtea 2.0 itself.
-
-diff --git a/Makefile.am b/Makefile.am
-index 129edf2..158b149 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -279,6 +279,10 @@ else
- ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
- endif
- 
-+if WITH_PAX
-+ICEDTEA_PATCHES += patches/test_gamma.patch
-+endif
-+
- ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
- 
- # Bootstrapping patches
-@@ -300,7 +304,6 @@ ICEDTEA_BOOT_PATCHES = \
- 	patches/boot/jar.patch \
- 	patches/boot/symbols.patch \
- 	patches/boot/tobin.patch \
--	patches/boot/test_gamma.patch \
- 	patches/boot/tools.jar.patch \
- 	patches/boot/jopt.patch \
- 	patches/boot/jaxp-dependency.patch \
-@@ -320,6 +323,10 @@ ICEDTEA_BOOT_PATCHES = \
- 	patches/boot/ecj-autoboxing.patch \
- 	patches/boot/xsltproc.patch
- 
-+if !WITH_PAX
-+ICEDTEA_BOOT_PATCHES += patches/boot/test_gamma.patch
-+endif
-+
- if CP39408_JAVAH
- ICEDTEA_BOOT_PATCHES += patches/boot/pr39408.patch
- endif
-@@ -1612,6 +1619,7 @@ stamps/icedtea.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
- 	  $(ICEDTEA_ENV) \
- 	  -C openjdk/ \
- 	  $(ICEDTEA_BUILD_TARGET)
-+	$(abs_top_builddir)/pax-mark-vm $(BUILD_OUTPUT_DIR)/j2sdk-image
- 	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
- 	mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
- 	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
-@@ -1765,6 +1773,7 @@ stamps/icedtea-boot.stamp: stamps/bootstrap-directory-symlink-stage1.stamp \
- 	  $(ICEDTEA_ENV_BOOT) \
- 	  -C openjdk-boot \
- 	  $(ICEDTEA_BUILD_TARGET)
-+	$(abs_top_builddir)/pax-mark-vm $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image
- 	@echo "Bootstrapped IcedTea is served:" \
- 	  $(BOOT_BUILD_OUTPUT_DIR)
- 	mkdir -p stamps
-diff --git a/acinclude.m4 b/acinclude.m4
-index 5310d71..f08f1a9 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -2181,3 +2181,49 @@ rmdir tmp.$$
- AM_CONDITIONAL([NO_BYTECODE7], test x"${it_cv_bytecode7}" = "xyes")
- AC_PROVIDE([$0])dnl
- ])
-+
-+AC_DEFUN_ONCE([IT_WITH_PAX],
-+[
-+  AC_MSG_CHECKING([for pax utility to use])
-+  AC_ARG_WITH([pax],
-+              [AS_HELP_STRING(--with-pax=COMMAND,the command used for pax marking)],
-+  [
-+    PAX_COMMAND=${withval}
-+    if test "x${PAX_COMMAND}" = "xno"; then
-+      PAX_COMMAND="not specified"
-+    fi
-+  ],
-+  [ 
-+    PAX_COMMAND="not specified"
-+  ])
-+  case "x${PAX_COMMAND}" in
-+    xchpax)
-+      case "${host_cpu}" in
-+        i?86)
-+          PAX_COMMAND_ARGS="-msp"
-+          ;;
-+        *)
-+          PAX_COMMAND_ARGS="-m"
-+          ;;
-+      esac
-+      ;;
-+    xpaxctl)
-+      case "${host_cpu}" in
-+        i?86)
-+          PAX_COMMAND_ARGS="-msp"
-+          ;;
-+        *)
-+          PAX_COMMAND_ARGS="-m"
-+          ;;
-+      esac
-+      ;;
-+    *)
-+      PAX_COMMAND="not specified"
-+      PAX_COMMAND_ARGS="not specified"
-+      ;;
-+  esac
-+  AM_CONDITIONAL(WITH_PAX, test "x${PAX_COMMAND}" != "xnot specified")
-+  AC_MSG_RESULT(${PAX_COMMAND})
-+  AC_SUBST(PAX_COMMAND)
-+  AC_SUBST(PAX_COMMAND_ARGS)
-+])
-diff --git a/configure.ac b/configure.ac
-index e0b866b..7c665ef 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -146,6 +146,9 @@ IT_WITH_PROJECT
- IT_ENABLE_HG
- IT_WITH_TZDATA_DIR
- 
-+IT_WITH_PAX
-+AC_CONFIG_FILES([pax-mark-vm], [chmod +x pax-mark-vm])
-+
- AC_PATH_TOOL([HG],[hg])
- if test "x${enable_hg}" = "xyes"; then
-   if test "x${HG}" = x; then
-diff --git a/patches/test_gamma.patch b/patches/test_gamma.patch
-new file mode 100644
-index 0000000..7e8d3d6
---- /dev/null
-+++ b/patches/test_gamma.patch
-@@ -0,0 +1,47 @@
-+diff -Nru ../openjdk.orig/openjdk/hotspot/make/linux/Makefile openjdk/hotspot/make/linux/Makefile
-+--- ../openjdk.orig/openjdk/hotspot/make/linux/Makefile	2009-10-30 17:37:07.000000000 +0000
-++++ openjdk/hotspot/make/linux/Makefile	2009-10-30 17:45:40.000000000 +0000
-+@@ -287,42 +287,36 @@
-+ 
-+ $(TARGETS_C2):  $(SUBDIRS_C2)
-+ 	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
-+-	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
-+ ifdef INSTALL
-+ 	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
-+ endif
-+ 
-+ $(TARGETS_TIERED):  $(SUBDIRS_TIERED)
-+ 	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
-+-	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
-+ ifdef INSTALL
-+ 	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
-+ endif
-+ 
-+ $(TARGETS_C1):  $(SUBDIRS_C1)
-+ 	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
-+-	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
-+ ifdef INSTALL
-+ 	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
-+ endif
-+ 
-+ $(TARGETS_CORE):  $(SUBDIRS_CORE)
-+ 	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
-+-	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
-+ ifdef INSTALL
-+ 	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
-+ endif
-+ 
-+ $(TARGETS_ZERO):  $(SUBDIRS_ZERO)
-+ 	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS)
-+-	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma
-+ ifdef INSTALL
-+ 	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
-+ endif
-+ 
-+ $(TARGETS_SHARK):  $(SUBDIRS_SHARK)
-+    cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
-+-   cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma
-+ ifdef INSTALL
-+    cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
-+ endif
-+ 
-diff --git a/pax-mark-vm.in b/pax-mark-vm.in
-new file mode 100644
-index 0000000..118bb61
---- /dev/null
-+++ b/pax-mark-vm.in
-@@ -0,0 +1,13 @@
-+#!/bin/sh
-+
-+# Taken from Gentoo's pax-utils.eclass
-+list_paxables() {
-+	file "$@" 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//'
-+}
-+
-+if test "@PAX_COMMAND@" != "not specified"; then
-+	for paxable in `list_paxables "${1}"/bin/* "${1}"/jre/bin/*`; do
-+		echo "PaX mark @PAX_COMMAND_ARGS@ ${paxable}"
-+		@PAX_COMMAND@ @PAX_COMMAND_ARGS@ "${paxable}"
-+	done
-+fi

diff --git a/dev-java/icedtea/files/icedtea-7.2.1.1-pax_mark_rmic_java.patch b/dev-java/icedtea/files/icedtea-7.2.1.1-pax_mark_rmic_java.patch
deleted file mode 100644
index c665253..0000000
--- a/dev-java/icedtea/files/icedtea-7.2.1.1-pax_mark_rmic_java.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 49d8bc4..85ac971 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -277,7 +277,9 @@ ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
- endif
- 
- if WITH_PAX
--ICEDTEA_PATCHES += patches/test_gamma.patch
-+ICEDTEA_PATCHES += \
-+	patches/test_gamma.patch \
-+	patches/pax-mark-rmic-java.patch
- endif
- 
- ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
-diff --git a/patches/pax-mark-rmic-java.patch b/patches/pax-mark-rmic-java.patch
-new file mode 100644
-index 0000000..ad80f3a
---- /dev/null
-+++ b/patches/pax-mark-rmic-java.patch
-@@ -0,0 +1,10 @@
-+--- openjdk/jdk/make/com/sun/jmx/Makefile
-++++ openjdk/jdk/make/com/sun/jmx/Makefile
-+@@ -119,6 +119,7 @@
-+ 
-+ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
-+ 	$(prep-target)
-++	"$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)"
-+ 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
-+                 -d $(CLASSDESTDIR)              \
-+                 -v1.2                           \

diff --git a/dev-java/icedtea/files/icedtea-7.2.1.1-pr986-cacao_memory_fix.patch b/dev-java/icedtea/files/icedtea-7.2.1.1-pr986-cacao_memory_fix.patch
deleted file mode 100644
index 17e5f2a..0000000
--- a/dev-java/icedtea/files/icedtea-7.2.1.1-pr986-cacao_memory_fix.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-diff -Nru icedtea-2.1.1.orig/acinclude.m4 icedtea-2.1.1/acinclude.m4
---- icedtea-2.1.1.orig/acinclude.m4	2012-06-13 02:56:54.455836680 +0100
-+++ icedtea-2.1.1/acinclude.m4	2012-06-13 02:57:31.660476528 +0100
-@@ -2258,3 +2258,18 @@
-   AC_SUBST(PAX_COMMAND)
-   AC_SUBST(PAX_COMMAND_ARGS)
- ])
-+
-+AC_DEFUN([IT_USING_CACAO],[
-+  AC_REQUIRE([IT_FIND_JAVA])
-+  AC_CACHE_CHECK([if we are using CACAO as the build VM], it_cv_cacao, [
-+  if $JAVA -version 2>&1| grep '^CACAO' >&AS_MESSAGE_LOG_FD ; then
-+    it_cv_cacao=yes;
-+  else
-+    it_cv_cacao=no;
-+  fi
-+  ])
-+  USING_CACAO=$it_cv_cacao
-+  AC_SUBST(USING_CACAO)
-+  AM_CONDITIONAL(USING_CACAO, test "x${USING_CACAO}" = "xyes")
-+  AC_PROVIDE([$0])dnl
-+])
-diff -Nru icedtea-2.1.1.orig/configure.ac icedtea-2.1.1/configure.ac
---- icedtea-2.1.1.orig/configure.ac	2012-06-13 02:56:54.459836748 +0100
-+++ icedtea-2.1.1/configure.ac	2012-06-13 02:57:31.660476528 +0100
-@@ -101,6 +101,7 @@
- IT_FIND_JAR
- IT_FIND_RMIC
- IT_FIND_NATIVE2ASCII
-+IT_USING_CACAO
- if test "x$enable_bootstrap" = "xyes"; then
-   IT_FIND_ECJ_JAR
-   IT_FIND_TOOL([XSLTPROC], [xsltproc])
-diff -Nru icedtea-2.1.1.orig/Makefile.am icedtea-2.1.1/Makefile.am
---- icedtea-2.1.1.orig/Makefile.am	2012-06-13 02:56:54.403835785 +0100
-+++ icedtea-2.1.1/Makefile.am	2012-06-13 02:57:31.648476322 +0100
-@@ -249,6 +249,11 @@
- 	patches/cacao/launcher.patch \
- 	patches/cacao/jsig.patch \
- 	patches/cacao/memory.patch
-+else
-+if USING_CACAO
-+ICEDTEA_PATCHES += \
-+	patches/cacao/memory.patch
-+endif
- endif
- 
- if ENABLE_CACAO
-diff -Nru icedtea-2.1.1.orig/patches/cacao/launcher.patch icedtea-2.1.1/patches/cacao/launcher.patch
---- icedtea-2.1.1.orig/patches/cacao/launcher.patch	2012-06-13 02:28:23.950879620 +0100
-+++ icedtea-2.1.1/patches/cacao/launcher.patch	2012-06-13 02:59:50.858865063 +0100
-@@ -1,14 +1,3 @@
----- openjdk/jdk/make/docs/Makefile.orig	2010-08-27 20:01:53.000000000 +0200
--+++ openjdk/jdk/make/docs/Makefile	2010-09-07 12:56:00.309691118 +0200
--@@ -70,7 +70,7 @@
-- ifeq ($(ARCH_DATA_MODEL),64)
--   MAX_VM_MEMORY = 1024
-- else
---  MAX_VM_MEMORY = 512
--+  MAX_VM_MEMORY = 768
-- endif
-- 
-- # List of all possible directories for javadoc to look for sources
- --- openjdk/jdk/src/share/bin/java.c.orig	2010-09-07 05:24:49.307192201 +0200
- +++ openjdk/jdk/src/share/bin/java.c	2010-09-07 12:56:00.309691118 +0200
- @@ -174,6 +174,8 @@
-diff -Nru icedtea-2.1.1.orig/patches/cacao/memory.patch icedtea-2.1.1/patches/cacao/memory.patch
---- icedtea-2.1.1.orig/patches/cacao/memory.patch	2012-06-13 02:28:23.954879676 +0100
-+++ icedtea-2.1.1/patches/cacao/memory.patch	2012-06-13 03:01:11.156239098 +0100
-@@ -1,6 +1,70 @@
----- openjdk.orig/langtools/make/build.xml	2010-06-01 11:25:40.145287816 +0100
--+++ openjdk/langtools/make/build.xml	2010-06-21 21:48:41.000000000 +0100
--@@ -554,6 +554,7 @@
-+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/rules.make openjdk/hotspot/make/linux/makefiles/rules.make
-+--- openjdk.orig/hotspot/make/linux/makefiles/rules.make	2012-06-07 19:21:17.000000000 +0100
-++++ openjdk/hotspot/make/linux/makefiles/rules.make	2012-06-13 03:36:26.364575315 +0100
-+@@ -141,7 +141,7 @@
-+ # Settings for javac
-+ BOOT_SOURCE_LANGUAGE_VERSION = 6
-+ BOOT_TARGET_CLASS_VERSION = 6
-+-JAVAC_FLAGS = -g -encoding ascii
-++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+ 
-+ # With parallel makes, print a message at the end of compilation.
-+diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/rules.make openjdk/hotspot/make/solaris/makefiles/rules.make
-+--- openjdk.orig/hotspot/make/solaris/makefiles/rules.make	2012-06-07 19:21:17.000000000 +0100
-++++ openjdk/hotspot/make/solaris/makefiles/rules.make	2012-06-13 03:36:26.364575315 +0100
-+@@ -133,7 +133,7 @@
-+ # Settings for javac
-+ BOOT_SOURCE_LANGUAGE_VERSION = 6
-+ BOOT_TARGET_CLASS_VERSION = 6
-+-JAVAC_FLAGS = -g -encoding ascii
-++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+ 
-+ # With parallel makes, print a message at the end of compilation.
-+diff -Nru openjdk.orig/hotspot/make/windows/makefiles/rules.make openjdk/hotspot/make/windows/makefiles/rules.make
-+--- openjdk.orig/hotspot/make/windows/makefiles/rules.make	2012-06-07 19:21:17.000000000 +0100
-++++ openjdk/hotspot/make/windows/makefiles/rules.make	2012-06-13 03:36:26.364575315 +0100
-+@@ -45,7 +45,7 @@
-+ # Settings for javac
-+ BOOT_SOURCE_LANGUAGE_VERSION=6
-+ BOOT_TARGET_CLASS_VERSION=6
-+-JAVAC_FLAGS=-g -encoding ascii
-++JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+ 
-+ ProjectFile=jvm.vcproj
-+diff -Nru openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
-+--- openjdk.orig/jdk/make/common/shared/Platform.gmk	2012-06-08 14:12:38.000000000 +0100
-++++ openjdk/jdk/make/common/shared/Platform.gmk	2012-06-13 03:36:26.380575614 +0100
-+@@ -447,7 +447,7 @@
-+       else \
-+         echo "false"; \
-+       fi)
-+-    MAX_VM_MEMORY := 512
-++    MAX_VM_MEMORY := 1536
-+     MIN_VM_MEMORY := $(MAX_VM_MEMORY)
-+   else
-+     MB_OF_MEMORY       := unknown
-+diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile
-+--- openjdk.orig/jdk/make/docs/Makefile	2012-06-08 14:12:38.000000000 +0100
-++++ openjdk/jdk/make/docs/Makefile	2012-06-13 03:36:26.380575614 +0100
-+@@ -69,9 +69,9 @@
-+ #    NOTE: javadoc will not complete without these larger settings.
-+ #    WARNING: This could cause thrashing on low memory machines.
-+ ifeq ($(ARCH_DATA_MODEL),64)
-+-  MAX_VM_MEMORY = 1024
-++  MAX_VM_MEMORY = 1792
-+ else
-+-  MAX_VM_MEMORY = 512
-++  MAX_VM_MEMORY = 768
-+ endif
-+ 
-+ # List of all possible directories for javadoc to look for sources
-+diff -Nru openjdk.orig/langtools/make/build.xml openjdk/langtools/make/build.xml
-+--- openjdk.orig/langtools/make/build.xml	2012-02-15 08:26:56.000000000 +0000
-++++ openjdk/langtools/make/build.xml	2012-06-13 03:36:26.380575614 +0100
-+@@ -796,6 +796,7 @@
-                      <compilerarg value="-implicit:none"/>
-                      <compilerarg value="-Xprefer:source"/>
-                      <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>

diff --git a/dev-java/icedtea/files/icedtea-7.2.2-no_suffix.patch b/dev-java/icedtea/files/icedtea-7.2.2-no_suffix.patch
deleted file mode 100644
index 61bbd09..0000000
--- a/dev-java/icedtea/files/icedtea-7.2.2-no_suffix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# HG changeset patch
-# User Andrew John Hughes <ahughes@××××××.com>
-# Date 1338297380 -3600
-# Node ID fb4e64ae06a31c878cc711579fe87a6f626f73fb
-# Parent  2c3c929e038c6c64d79ecf98005f5fd2f4d0f37d
-Don't add a suffix for building the default, IcedTea.
-
-2012-05-25  Andrew John Hughes  <ahughes@××××××.com>
-
-	* Makefile.am:
-	(versioning): Don't add a suffix if building
-	the default project, 'icedtea'.
-
-diff --git a/Makefile.am b/Makefile.am
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1435,7 +1435,7 @@
- 	  echo "DISTRO_PACKAGE_VERSION=$(PKGVERSION)" \
- 	    >>openjdk/jdk/make/common/shared/Defs.gmk ;
- endif
--	if test x"$(PROJECT_NAME)" != "xjdk7"; then \
-+	if test x"$(PROJECT_NAME)" != "xjdk7" && test x"$(PROJECT_NAME)" != "xicedtea"; then \
- 	  proj_suffix="-$(PROJECT_NAME)"; \
- 	fi ; \
- 	if test x"$(VERSION_SUFFIX)" != "x"; then \

diff --git a/dev-java/icedtea/files/icedtea-7.2.2.1-pax_mark_rmic_java.patch b/dev-java/icedtea/files/icedtea-7.2.2.1-pax_mark_rmic_java.patch
deleted file mode 100644
index c665253..0000000
--- a/dev-java/icedtea/files/icedtea-7.2.2.1-pax_mark_rmic_java.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 49d8bc4..85ac971 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -277,7 +277,9 @@ ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
- endif
- 
- if WITH_PAX
--ICEDTEA_PATCHES += patches/test_gamma.patch
-+ICEDTEA_PATCHES += \
-+	patches/test_gamma.patch \
-+	patches/pax-mark-rmic-java.patch
- endif
- 
- ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
-diff --git a/patches/pax-mark-rmic-java.patch b/patches/pax-mark-rmic-java.patch
-new file mode 100644
-index 0000000..ad80f3a
---- /dev/null
-+++ b/patches/pax-mark-rmic-java.patch
-@@ -0,0 +1,10 @@
-+--- openjdk/jdk/make/com/sun/jmx/Makefile
-++++ openjdk/jdk/make/com/sun/jmx/Makefile
-+@@ -119,6 +119,7 @@
-+ 
-+ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
-+ 	$(prep-target)
-++	"$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)"
-+ 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
-+                 -d $(CLASSDESTDIR)              \
-+                 -v1.2                           \

diff --git a/dev-java/icedtea/files/icedtea-7.2.2.1-pr986-cacao_memory_fix.patch b/dev-java/icedtea/files/icedtea-7.2.2.1-pr986-cacao_memory_fix.patch
deleted file mode 100644
index c76c9f3..0000000
--- a/dev-java/icedtea/files/icedtea-7.2.2.1-pr986-cacao_memory_fix.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-# HG changeset patch
-# User Andrew John Hughes <gnu_andrew@××××××××××.org>
-# Date 1339542060 -3600
-# Node ID e6d81fc2c9439652f903664d51a13732c73485ea
-# Parent  1a9e619bc32e81697bf4200a607935ee00c8d388
-PR986: Allow CACAO builds of IcedTea to be able to build IcedTea without bootstrap.
-
-2012-06-12  Andrew John Hughes  <gnu_andrew@××××××××××.org>
-
-	PR986
-	* Makefile.am:
-	(ICEDTEA_PATCHES): Add memory patch when
-	building using CACAO as well, even if the
-	result is not a CACAO build.
-	* acinclude.m4:
-	(IT_USING_CACAO): New macro; detects use of
-	CACAO as the build VM so memory limits can
-	be raised accordingly.
-	* configure.ac: Call IT_USING_CACAO.
-	* patches/cacao/launcher.patch:
-	Move memory increase to memory.patch.
-	* patches/cacao/memory.patch:
-	Extend with additional cases in HotSpot and
-	the JDK.
-
-diff --git a/Makefile.am b/Makefile.am
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -249,6 +249,11 @@
- 	patches/cacao/launcher.patch \
- 	patches/cacao/jsig.patch \
- 	patches/cacao/memory.patch
-+else
-+if USING_CACAO
-+ICEDTEA_PATCHES += \
-+	patches/cacao/memory.patch
-+endif
- endif
- 
- if ENABLE_CACAO
-diff --git a/acinclude.m4 b/acinclude.m4
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -2278,3 +2278,18 @@
-   AC_SUBST(PAX_COMMAND)
-   AC_SUBST(PAX_COMMAND_ARGS)
- ])
-+
-+AC_DEFUN([IT_USING_CACAO],[
-+  AC_REQUIRE([IT_FIND_JAVA])
-+  AC_CACHE_CHECK([if we are using CACAO as the build VM], it_cv_cacao, [
-+  if $JAVA -version 2>&1| grep '^CACAO' >&AS_MESSAGE_LOG_FD ; then
-+    it_cv_cacao=yes;
-+  else
-+    it_cv_cacao=no;
-+  fi
-+  ])
-+  USING_CACAO=$it_cv_cacao
-+  AC_SUBST(USING_CACAO)
-+  AM_CONDITIONAL(USING_CACAO, test "x${USING_CACAO}" = "xyes")
-+  AC_PROVIDE([$0])dnl
-+])
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -102,6 +102,7 @@
- IT_FIND_JAR
- IT_FIND_RMIC
- IT_FIND_NATIVE2ASCII
-+IT_USING_CACAO
- if test "x$enable_bootstrap" = "xyes"; then
-   IT_FIND_ECJ_JAR
-   IT_FIND_TOOL([XSLTPROC], [xsltproc])
-diff --git a/patches/cacao/launcher.patch b/patches/cacao/launcher.patch
---- a/patches/cacao/launcher.patch
-+++ b/patches/cacao/launcher.patch
-@@ -1,15 +1,3 @@
--diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile
----- openjdk.orig/jdk/make/docs/Makefile	2012-03-21 17:09:55.000000000 +0000
--+++ openjdk/jdk/make/docs/Makefile	2012-03-23 00:46:49.461847958 +0000
--@@ -73,7 +73,7 @@
-- else ifeq ($(ARCH),universal)
--   MAX_VM_MEMORY = 1024
-- else
---  MAX_VM_MEMORY = 512
--+  MAX_VM_MEMORY = 768
-- endif
-- 
-- # List of all possible directories for javadoc to look for sources
- diff -Nru openjdk.orig/jdk/src/share/bin/java.c openjdk/jdk/src/share/bin/java.c
- --- openjdk.orig/jdk/src/share/bin/java.c	2012-03-21 17:09:55.000000000 +0000
- +++ openjdk/jdk/src/share/bin/java.c	2012-03-23 00:46:49.461847958 +0000
-diff --git a/patches/cacao/memory.patch b/patches/cacao/memory.patch
---- a/patches/cacao/memory.patch
-+++ b/patches/cacao/memory.patch
-@@ -1,6 +1,85 @@
----- openjdk.orig/langtools/make/build.xml	2010-06-01 11:25:40.145287816 +0100
--+++ openjdk/langtools/make/build.xml	2010-06-21 21:48:41.000000000 +0100
--@@ -554,6 +554,7 @@
-+diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/rules.make openjdk/hotspot/make/bsd/makefiles/rules.make
-+--- openjdk.orig/hotspot/make/bsd/makefiles/rules.make	2012-06-08 17:13:09.000000000 +0100
-++++ openjdk/hotspot/make/bsd/makefiles/rules.make	2012-06-12 10:50:20.974290246 +0100
-+@@ -128,7 +128,7 @@
-+ # Settings for javac
-+ BOOT_SOURCE_LANGUAGE_VERSION = 6
-+ BOOT_TARGET_CLASS_VERSION = 6
-+-JAVAC_FLAGS = -g -encoding ascii
-++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+ 
-+ # With parallel makes, print a message at the end of compilation.
-+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/rules.make openjdk/hotspot/make/linux/makefiles/rules.make
-+--- openjdk.orig/hotspot/make/linux/makefiles/rules.make	2012-06-08 17:13:09.000000000 +0100
-++++ openjdk/hotspot/make/linux/makefiles/rules.make	2012-06-12 10:50:20.982290377 +0100
-+@@ -128,7 +128,7 @@
-+ # Settings for javac
-+ BOOT_SOURCE_LANGUAGE_VERSION = 6
-+ BOOT_TARGET_CLASS_VERSION = 6
-+-JAVAC_FLAGS = -g -encoding ascii
-++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+ 
-+ # With parallel makes, print a message at the end of compilation.
-+diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/rules.make openjdk/hotspot/make/solaris/makefiles/rules.make
-+--- openjdk.orig/hotspot/make/solaris/makefiles/rules.make	2012-06-08 17:13:09.000000000 +0100
-++++ openjdk/hotspot/make/solaris/makefiles/rules.make	2012-06-12 10:50:20.982290377 +0100
-+@@ -120,7 +120,7 @@
-+ # Settings for javac
-+ BOOT_SOURCE_LANGUAGE_VERSION = 6
-+ BOOT_TARGET_CLASS_VERSION = 6
-+-JAVAC_FLAGS = -g -encoding ascii
-++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+ 
-+ # With parallel makes, print a message at the end of compilation.
-+diff -Nru openjdk.orig/hotspot/make/windows/makefiles/rules.make openjdk/hotspot/make/windows/makefiles/rules.make
-+--- openjdk.orig/hotspot/make/windows/makefiles/rules.make	2012-06-08 17:13:09.000000000 +0100
-++++ openjdk/hotspot/make/windows/makefiles/rules.make	2012-06-12 10:50:20.982290377 +0100
-+@@ -45,7 +45,7 @@
-+ # Settings for javac
-+ BOOT_SOURCE_LANGUAGE_VERSION=6
-+ BOOT_TARGET_CLASS_VERSION=6
-+-JAVAC_FLAGS=-g -encoding ascii
-++JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+ 
-+ ProjectFile=jvm.vcproj
-+diff -Nru openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
-+--- openjdk.orig/jdk/make/common/shared/Platform.gmk	2012-06-08 17:12:17.000000000 +0100
-++++ openjdk/jdk/make/common/shared/Platform.gmk	2012-06-12 10:50:20.982290377 +0100
-+@@ -537,7 +537,7 @@
-+       else \
-+         echo "false"; \
-+       fi)
-+-    MAX_VM_MEMORY := 512
-++    MAX_VM_MEMORY := 1536
-+     MIN_VM_MEMORY := $(MAX_VM_MEMORY)
-+   else
-+     MB_OF_MEMORY       := unknown
-+diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile
-+--- openjdk.orig/jdk/make/docs/Makefile	2012-06-08 17:12:17.000000000 +0100
-++++ openjdk/jdk/make/docs/Makefile	2012-06-12 11:09:31.616702981 +0100
-+@@ -69,11 +69,11 @@
-+ #    NOTE: javadoc will not complete without these larger settings.
-+ #    WARNING: This could cause thrashing on low memory machines.
-+ ifeq ($(ARCH_DATA_MODEL),64)
-+-  MAX_VM_MEMORY = 1024
-++  MAX_VM_MEMORY = 1792
-+ else ifeq ($(ARCH),universal)
-+-  MAX_VM_MEMORY = 1024
-++  MAX_VM_MEMORY = 1792
-+ else
-+-  MAX_VM_MEMORY = 512
-++  MAX_VM_MEMORY = 768
-+ endif
-+ 
-+ # List of all possible directories for javadoc to look for sources
-+diff -Nru openjdk.orig/langtools/make/build.xml openjdk/langtools/make/build.xml
-+--- openjdk.orig/langtools/make/build.xml	2012-06-08 17:12:36.000000000 +0100
-++++ openjdk/langtools/make/build.xml	2012-06-12 10:50:20.974290246 +0100
-+@@ -796,6 +796,7 @@
-                      <compilerarg value="-implicit:none"/>
-                      <compilerarg value="-Xprefer:source"/>
-                      <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>

diff --git a/dev-java/icedtea/files/icedtea-7.2.2.1-warnings_are_errors.patch b/dev-java/icedtea/files/icedtea-7.2.2.1-warnings_are_errors.patch
deleted file mode 100644
index 2822155..0000000
--- a/dev-java/icedtea/files/icedtea-7.2.2.1-warnings_are_errors.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 49d8bc4..b20ee99 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -235,7 +235,8 @@ REWRITER_SRCS = $(top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java
- 
- # Patch list
- 
--ICEDTEA_PATCHES =
-+ICEDTEA_PATCHES = \
-+	patches/warnings-are-errors.patch
- 
- # Conditional patches
- 
-@@ -437,7 +438,9 @@ ICEDTEA_ENV = \
- 	USE_SYSTEM_CUPS="true" \
- 	CUPS_LIBS="${CUPS_LIBS}" \
- 	CUPS_CFLAGS="${CUPS_CFLAGS}" \
--	ALT_STRIP_POLICY=no_strip
-+	ALT_STRIP_POLICY=no_strip \
-+	COMPILER_WARNINGS_FATAL="@WARNINGS_ARE_ERRORS@" \
-+	JAVAC_WARNINGS_FATAL="@WARNINGS_ARE_ERRORS@"
- 
- if ENABLE_CACAO
- ICEDTEA_ENV += \
-diff --git a/acinclude.m4 b/acinclude.m4
-index f0a336f..3dc4aa0 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -2244,3 +2244,23 @@ AC_DEFUN_ONCE([IT_WITH_PAX],
-   AC_SUBST(PAX_COMMAND)
-   AC_SUBST(PAX_COMMAND_ARGS)
- ])
-+
-+AC_DEFUN_ONCE([IT_WARNINGS_ARE_ERRORS],
-+[
-+  AC_MSG_CHECKING([whether to treat warnings as errors.])
-+  AC_ARG_ENABLE([warnings-are-errors],
-+                [AS_HELP_STRING(--enable-warnings-are-errors,treat warnings as errors [[default=yes]])],
-+  [
-+    if test x"${enableval}" = "xyes"; then
-+      WARNINGS_ARE_ERRORS="true"
-+    else
-+      WARNINGS_ARE_ERRORS="false"
-+    fi
-+  ],
-+  [
-+    dnl use local defaults
-+    WARNINGS_ARE_ERRORS=
-+  ])
-+  AC_MSG_RESULT([${WARNINGS_ARE_ERRORS}])
-+  AC_SUBST([WARNINGS_ARE_ERRORS])
-+])
-diff --git a/configure.ac b/configure.ac
-index 36c9d77..af52bf1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -54,6 +54,7 @@ IT_DISABLE_TESTS
- IT_DISABLE_HOTSPOT_TESTS
- IT_DISABLE_LANGTOOLS_TESTS
- IT_DISABLE_JDK_TESTS
-+IT_WARNINGS_ARE_ERRORS
- 
- # Use xvfb-run if found to run gui tests (check-jdk).
- AC_CHECK_PROG(XVFB_RUN_CMD, xvfb-run, [xvfb-run -a -e xvfb-errors], [])
-diff --git a/patches/boot/ecj-opts.patch b/patches/boot/ecj-opts.patch
-index 99ed532..284bd37 100644
---- a/patches/boot/ecj-opts.patch
-+++ b/patches/boot/ecj-opts.patch
-@@ -5,8 +5,8 @@ diff -Nru openjdk-boot.orig/jdk/make/java/nio/Makefile openjdk-boot/jdk/make/jav
-  PACKAGE = java.nio
-  LIBRARY = nio
-  PRODUCT = java
---OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror
-+-OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial
- +OTHER_JAVACFLAGS += -Xlint:serial -Werror
-- include $(BUILDDIR)/common/Defs.gmk
-- 
-- NIO_SRC = $(SHARE_SRC)/classes/java/nio
-+ ifneq ($(JAVAC_WARNINGS_FATAL),false)
-+   OTHER_JAVACFLAGS += -Werror
-+ endif
-diff --git a/patches/warnings-are-errors.patch b/patches/warnings-are-errors.patch
-new file mode 100644
-index 0000000..7fe1e08
---- /dev/null
-+++ b/patches/warnings-are-errors.patch
-@@ -0,0 +1,129 @@
-+--- openjdk/hotspot/make/linux/makefiles/adlc.make
-++++ openjdk/hotspot/make/linux/makefiles/adlc.make
-+@@ -67,8 +67,10 @@
-+ CXXFLAGS += -DASSERT
-+ 
-+ # CFLAGS_WARN holds compiler options to suppress/enable warnings.
-+-# Compiler warnings are treated as errors
-+-CFLAGS_WARN = -Werror
-++# Treat compiler warnings as errors, unless warnings are allowed
-++ifneq ($(COMPILER_WARNINGS_FATAL),false)
-++  CFLAGS_WARN = -Werror
-++endif
-+ CFLAGS += $(CFLAGS_WARN)
-+ 
-+ OBJECTNAMES = \
-+--- openjdk/hotspot/make/linux/makefiles/gcc.make
-++++ openjdk/hotspot/make/linux/makefiles/gcc.make
-+@@ -149,8 +149,10 @@
-+   CFLAGS += -pipe
-+ endif
-+ 
-+-# Compiler warnings are treated as errors
-+-WARNINGS_ARE_ERRORS = -Werror
-++# Treat compiler warnings as errors, unless warnings are allowed
-++ifneq ($(COMPILER_WARNINGS_FATAL),false)
-++  WARNINGS_ARE_ERRORS = -Werror
-++endif
-+ 
-+ # Except for a few acceptable ones
-+ # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
-+--- openjdk/hotspot/make/solaris/makefiles/gcc.make
-++++ openjdk/hotspot/make/solaris/makefiles/gcc.make
-+@@ -111,8 +111,10 @@
-+ endif
-+ 
-+ 
-+-# Compiler warnings are treated as errors 
-+-WARNINGS_ARE_ERRORS = -Werror 
-++# Treat compiler warnings as errors, unless warnings are allowed
-++ifneq ($(COMPILER_WARNINGS_FATAL),false)
-++  WARNINGS_ARE_ERRORS = -Werror
-++endif
-+ # Enable these warnings. See 'info gcc' about details on these options
-+ ADDITIONAL_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare 
-+ CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ADDITIONAL_WARNINGS) 
-+--- openjdk/jdk/make/java/nio/Makefile
-++++ openjdk/jdk/make/java/nio/Makefile
-+@@ -31,7 +31,10 @@
-+ PACKAGE = java.nio
-+ LIBRARY = nio
-+ PRODUCT = java
-+-OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror
-++OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial
-++ifneq ($(JAVAC_WARNINGS_FATAL),false)
-++  OTHER_JAVACFLAGS += -Werror
-++endif
-+ include $(BUILDDIR)/common/Defs.gmk
-+ 
-+ NIO_SRC = $(SHARE_SRC)/classes/java/nio
-+--- openjdk/jdk/make/java/sun_nio/Makefile
-++++ openjdk/jdk/make/java/sun_nio/Makefile
-+@@ -31,7 +31,11 @@
-+ PACKAGE = sun.nio
-+ PRODUCT = sun
-+ 
-+-OTHER_JAVACFLAGS += -Xlint:serial,-deprecation -Werror
-++OTHER_JAVACFLAGS += -Xlint:serial,-deprecation
-++ifneq ($(JAVAC_WARNINGS_FATAL),false)
-++  OTHER_JAVACFLAGS += -Werror
-++endif
-++
-+ include $(BUILDDIR)/common/Defs.gmk
-+ 
-+ #
-+--- openjdk/jdk/make/sun/native2ascii/Makefile
-++++ openjdk/jdk/make/sun/native2ascii/Makefile
-+@@ -30,7 +30,10 @@
-+ BUILDDIR = ../..
-+ PACKAGE = sun.tools.native2ascii
-+ PRODUCT = sun
-+-OTHER_JAVACFLAGS += -Xlint:serial -Werror
-++OTHER_JAVACFLAGS += -Xlint:serial
-++ifneq ($(JAVAC_WARNINGS_FATAL),false)
-++  OTHER_JAVACFLAGS += -Werror
-++endif
-+ include $(BUILDDIR)/common/Defs.gmk
-+ 
-+ # This program must contain a manifest that defines the execution level
-+--- openjdk/jdk/make/sun/nio/cs/Makefile
-++++ openjdk/jdk/make/sun/nio/cs/Makefile
-+@@ -36,7 +36,10 @@
-+ # This re-directs all the class files to a separate location
-+ CLASSDESTDIR = $(TEMPDIR)/classes
-+ 
-+-OTHER_JAVACFLAGS += -Xlint:serial,-deprecation -Werror
-++OTHER_JAVACFLAGS += -Xlint:serial,-deprecation
-++ifneq ($(JAVAC_WARNINGS_FATAL),false)
-++  OTHER_JAVACFLAGS += -Werror
-++endif
-+ include $(BUILDDIR)/common/Defs.gmk
-+ 
-+ #
-+--- openjdk/jdk/make/tools/Makefile
-++++ openjdk/jdk/make/tools/Makefile
-+@@ -29,7 +29,10 @@
-+ 
-+ BUILDDIR = ..
-+ 
-+-SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true JAVAC_WARNINGS_FATAL=true
-++SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true
-++ifneq ($(JAVAC_WARNINGS_FATAL),false)
-++  SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true
-++endif
-+ include $(BUILDDIR)/common/Defs.gmk
-+ 
-+ # Note: freetypecheck is built by Sanity.gmk if needed
-+--- openjdk/langtools/make/Makefile
-++++ openjdk/langtools/make/Makefile
-+@@ -111,6 +111,10 @@
-+   ANT_OPTIONS += -Ddebug.classfiles=true
-+ endif
-+ 
-++ifeq ($(JAVAC_WARNINGS_FATAL),false)
-++  ANT_OPTIONS += -Djavac.lint.opts=-Xlint:all,-deprecation
-++endif
-++
-+ # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)
-+ # and the somewhat misnamed CLASS_VERSION (-target NN)
-+ ifdef TARGET_CLASS_VERSION

diff --git a/dev-java/icedtea/files/icedtea-7.2.3.1-pax_mark_rmic_java.patch b/dev-java/icedtea/files/icedtea-7.2.3.1-pax_mark_rmic_java.patch
deleted file mode 100644
index c665253..0000000
--- a/dev-java/icedtea/files/icedtea-7.2.3.1-pax_mark_rmic_java.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 49d8bc4..85ac971 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -277,7 +277,9 @@ ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
- endif
- 
- if WITH_PAX
--ICEDTEA_PATCHES += patches/test_gamma.patch
-+ICEDTEA_PATCHES += \
-+	patches/test_gamma.patch \
-+	patches/pax-mark-rmic-java.patch
- endif
- 
- ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
-diff --git a/patches/pax-mark-rmic-java.patch b/patches/pax-mark-rmic-java.patch
-new file mode 100644
-index 0000000..ad80f3a
---- /dev/null
-+++ b/patches/pax-mark-rmic-java.patch
-@@ -0,0 +1,10 @@
-+--- openjdk/jdk/make/com/sun/jmx/Makefile
-++++ openjdk/jdk/make/com/sun/jmx/Makefile
-+@@ -119,6 +119,7 @@
-+ 
-+ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
-+ 	$(prep-target)
-++	"$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)"
-+ 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
-+                 -d $(CLASSDESTDIR)              \
-+                 -v1.2                           \

diff --git a/dev-java/icedtea/icedtea-6.1.11.2.ebuild b/dev-java/icedtea/icedtea-6.1.11.2.ebuild
deleted file mode 100644
index 38fbc3d..0000000
--- a/dev-java/icedtea/icedtea-6.1.11.2.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.11.2.ebuild,v 1.1 2012/05/14 16:27:04 sera Exp $
-# Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
-# *********************************************************
-
-EAPI="5"
-
-inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
-
-ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
-OPENJDK_BUILD="24"
-OPENJDK_DATE="14_nov_2011"
-OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
-JAXP_TARBALL="jaxp144_03.zip"
-JAXWS_TARBALL="jdk6-jaxws2_1_6-2011_06_13.zip"
-JAF_TARBALL="jdk6-jaf-b20.zip"
-CACAO_TARBALL="cff92704c4e0.tar.gz"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="
-	http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
-	http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL}
-	http://icedtea.classpath.org/download/drops/${JAXWS_TARBALL}
-	http://icedtea.classpath.org/download/drops/${JAF_TARBALL}
-	http://icedtea.classpath.org/download/drops/${JAXP_TARBALL}
-	!amd64? ( !sparc? ( !x86? (
-		http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
-	) ) )"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-SLOT="6"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-
-IUSE="+X +alsa cjk +cups debug doc examples javascript +jbootstrap +nsplugin
-	+nss pax_kernel pulseaudio +source systemtap test +webstart"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.2.12"
-X_COMMON_DEP="
-	dev-libs/glib
-	>=media-libs/freetype-2.3.5
-	>=x11-libs/gtk+-2.8:2
-	>=x11-libs/libX11-1.1.3
-	>=x11-libs/libXext-1.1.1
-	>=x11-libs/libXi-1.1.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.0.3"
-X_DEPEND="
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2
-	>=x11-libs/libXp-1.0.0
-	x11-proto/inputproto
-	>=x11-proto/xextproto-7.1.1
-	x11-proto/xineramaproto
-	x11-proto/xproto"
-
-COMMON_DEP="
-	>=media-libs/giflib-4.1.6
-	>=media-libs/libpng-1.2:=
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg
-	javascript? ( dev-java/rhino:1.6 )
-	nss? ( >=dev-libs/nss-3.12.5-r1 )
-	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
-	systemtap? ( >=dev-util/systemtap-1 )"
-
-# media-fonts/lklug needs ppc ppc64 keywords
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea6
-	X? (
-		${X_COMMON_DEP}
-		media-fonts/dejavu
-		cjk? (
-			media-fonts/arphicfonts
-			media-fonts/baekmuk-fonts
-			!ppc? ( !ppc64? ( media-fonts/lklug ) )
-			media-fonts/lohit-fonts
-			media-fonts/sazanami
-		)
-	)
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )"
-
-# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-# xext headers have two variants depending on version - bug #288855
-# !eclipse-ecj-3.7 - bug #392587
-# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
-	|| (
-		>=dev-java/gcj-jdk-4.3
-		dev-java/icedtea-bin:6
-		dev-java/icedtea:6
-	)
-	app-arch/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	>=dev-java/ant-core-1.8.1
-	dev-java/ant-nodeps
-	dev-lang/perl
-	>=dev-libs/libxslt-1.1.26
-	dev-libs/openssl
-	virtual/pkgconfig
-	sys-apps/lsb-release
-	${X_DEPEND}
-	jbootstrap? (
-		|| ( <dev-java/eclipse-ecj-3.7 dev-java/ecj-gcj )
-	)
-	pax_kernel? ( sys-apps/paxctl )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:6 )
-	nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="
-		icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
-		gcj-jdk"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${ICEDTEA_PKG}.tar.gz
-}
-
-java_prepare() {
-	# icedtea doesn't like some locales. #330433 #389717
-	export LANG="C" LC_ALL="C"
-
-	epatch "${FILESDIR}"/${PN}-${SLOT}_pax_kernel_support.patch #389751
-	eautoreconf
-}
-
-src_configure() {
-	local config bootstrap
-	local vm=$(java-pkg_get-current-vm)
-
-	# IcedTea6 can't be built using IcedTea7; its class files are too new
-	if has "${vm}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6; then
-		use jbootstrap && bootstrap=yes
-	elif has "${vm}" gcj-jdk; then
-		# gcj-jdk ensures ecj is present.
-		use jbootstrap || einfo "bootstrap forced on for ${vm}, ignoring use jbootstrap"
-		bootstrap=yes
-	else
-		eerror "IcedTea${SLOT} must be built with either a JDK based on GNU Classpath or an existing build of IcedTea${SLOT}."
-		die "Install a GNU Classpath JDK (gcj-jdk)"
-	fi
-
-	if [[ ${bootstrap} ]]; then
-		config="${config} --enable-bootstrap"
-
-		# icedtea-6 javac wrapper requires to always have ecj if bootstrapping #392337
-		local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
-		# Don't use eclipse-ecj-3.7 #392587
-		local ecj_all=( "${EPREFIX}"/usr/share/{eclipse-ecj,ecj-gcj}-* )
-		ecj_all=( "${ecj_all[@]/*eclipse-ecj-3.7*/}" )
-		if ! has "${ecj_jar%/lib/ecj.jar}" "${ecj_all[@]}"; then
-			ecj_jar="${ecj_jar%/lib/ecj.jar}"
-			ewarn "${ecj_jar##*/} set as system ecj, can't use for bootstrap"
-			ewarn "Found usable: ${ecj_all[@]##*/}"
-			ewarn "using ${ecj_all##*/} instead"
-			ecj_jar="${ecj_all}"/lib/ecj.jar
-		fi
-		config="${config} --with-ecj-jar=${ecj_jar}"
-	else
-		config="${config} --disable-bootstrap"
-	fi
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# Otherwise use CACAO
-	if ! has "${ARCH}" amd64 sparc x86; then
-		config="${config} --enable-cacao --with-cacao-src-zip=${DISTDIR}/${CACAO_TARBALL}"
-	fi
-
-	# OpenJDK-specific parallelism support. Bug #389791, #337827
-	# Implementation modified from waf-utils.eclass
-	# Note that "-j" is converted to "-j1" as the system doesn't support --load-average
-	local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
-	config="${config} --with-parallel-jobs=${procs}";
-	einfo "Configuring using --with-parallel-jobs=${procs}"
-
-	if use javascript ; then
-		config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)"
-	else
-		config="${config} --without-rhino"
-	fi
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
-		--with-jaxp-drop-zip="${DISTDIR}/${JAXP_TARBALL}" \
-		--with-jaxws-drop-zip="${DISTDIR}/${JAXWS_TARBALL}" \
-		--with-jaf-drop-zip="${DISTDIR}/${JAF_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
-		$(use_enable !debug optimizations) \
-		$(use_enable doc docs) \
-		$(use_enable nss) \
-		$(use_enable pulseaudio pulse-java) \
-		$(use_enable systemtap) \
-		$(use_with pax_kernel pax paxctl)
-}
-
-src_compile() {
-	# Would use GENTOO_VM otherwise.
-	export ANT_RESPECT_JAVA_HOME=TRUE
-
-	# Load the least that's needed to avoid possible classpath collisions.
-	export ANT_TASKS="ant-nodeps"
-
-	emake
-}
-
-src_test() {
-	# Use Xvfb for tests
-	unset DISPLAY
-
-	Xemake -j1 check
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}/${dest}"
-	dodir "${dest}"
-
-	dodoc README NEWS AUTHORS THANKYOU
-	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
-	cd openjdk.build/j2sdk-image || die
-
-	# Ensures HeadlessGraphicsEnvironment is used.
-	if ! use X; then
-		rm -r jre/lib/$(get_system_arch)/xawt || die
-	fi
-
-	#402507
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-
-	# doins can't handle symlinks.
-	cp -vRP bin include jre lib man "${ddest}" || die
-
-	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
-	if use doc; then
-		# java-pkg_dohtml needed for package-list #302654
-		java-pkg_dohtml -r ../docs/* || die
-	fi
-
-	if use examples; then
-		dodir "${dest}/share";
-		cp -vRP demo sample "${ddest}/share/" || die
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	# Needs to be done before generating cacerts
-	java-vm_set-pax-markings "${ddest}"
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
-	mkdir "${T}/certgen" && cd "${T}/certgen" || die
-	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
-	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
-		openssl x509 -text -in "${c}" >> all.crt || die
-	done
-	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-	# Bug 390663
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
-	eprefixify "${T}"/fontconfig.Gentoo.properties
-	insinto "${dest}"/jre/lib
-	doins "${T}"/fontconfig.Gentoo.properties
-
-	set_java_env "${FILESDIR}/icedtea.env"
-	if ! use X || ! use alsa || ! use cups; then
-		java-vm_revdep-mask "${dest}"
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
-		# portage would preserve the symlink otherwise, related to bug #384397
-		rm -f "${EROOT}/usr/lib/jvm/icedtea6"
-		elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
-		elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
-		elog "If you had icedtea6 as system VM, the change should be automatic, however"
-		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
-		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
-	fi
-}

diff --git a/dev-java/icedtea/icedtea-6.1.11.3.ebuild b/dev-java/icedtea/icedtea-6.1.11.3.ebuild
deleted file mode 100644
index a718c64..0000000
--- a/dev-java/icedtea/icedtea-6.1.11.3.ebuild
+++ /dev/null
@@ -1,336 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.11.3.ebuild,v 1.2 2012/06/24 08:19:48 sera Exp $
-# Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
-# *********************************************************
-
-EAPI="5"
-
-inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
-
-ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
-OPENJDK_BUILD="24"
-OPENJDK_DATE="14_nov_2011"
-OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
-JAXP_TARBALL="jaxp144_03.zip"
-JAXWS_TARBALL="jdk6-jaxws2_1_6-2011_06_13.zip"
-JAF_TARBALL="jdk6-jaf-b20.zip"
-CACAO_TARBALL="cff92704c4e0.tar.gz"
-JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="
-	http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
-	http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL}
-	http://icedtea.classpath.org/download/drops/${JAXWS_TARBALL}
-	http://icedtea.classpath.org/download/drops/${JAF_TARBALL}
-	http://icedtea.classpath.org/download/drops/${JAXP_TARBALL}
-	http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
-	http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-SLOT="6"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-
-IUSE="+X +alsa cacao cjk +cups debug doc examples javascript +jbootstrap +nsplugin
-	+nss pax_kernel pulseaudio +source systemtap test +webstart"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.2.12"
-X_COMMON_DEP="
-	dev-libs/glib
-	>=media-libs/freetype-2.3.5
-	>=x11-libs/gtk+-2.8:2
-	>=x11-libs/libX11-1.1.3
-	>=x11-libs/libXext-1.1.1
-	>=x11-libs/libXi-1.1.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.0.3"
-X_DEPEND="
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2
-	>=x11-libs/libXp-1.0.0
-	x11-proto/inputproto
-	>=x11-proto/xextproto-7.1.1
-	x11-proto/xineramaproto
-	x11-proto/xproto"
-
-COMMON_DEP="
-	>=media-libs/giflib-4.1.6
-	>=media-libs/libpng-1.2:=
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg
-	javascript? ( dev-java/rhino:1.6 )
-	nss? ( >=dev-libs/nss-3.12.5-r1 )
-	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
-	systemtap? ( >=dev-util/systemtap-1 )"
-
-# media-fonts/lklug needs ppc ppc64 keywords
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea6
-	X? (
-		${X_COMMON_DEP}
-		media-fonts/dejavu
-		cjk? (
-			media-fonts/arphicfonts
-			media-fonts/baekmuk-fonts
-			!ppc? ( !ppc64? ( media-fonts/lklug ) )
-			media-fonts/lohit-fonts
-			media-fonts/sazanami
-		)
-	)
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )"
-
-# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-# xext headers have two variants depending on version - bug #288855
-# !eclipse-ecj-3.7 - bug #392587
-# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
-	|| (
-		>=dev-java/gcj-jdk-4.3
-		dev-java/icedtea-bin:6
-		dev-java/icedtea:6
-	)
-	app-arch/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	>=dev-java/ant-core-1.8.1
-	dev-java/ant-nodeps
-	dev-lang/perl
-	>=dev-libs/libxslt-1.1.26
-	dev-libs/openssl
-	virtual/pkgconfig
-	sys-apps/lsb-release
-	${X_DEPEND}
-	jbootstrap? (
-		|| ( <dev-java/eclipse-ecj-3.7 dev-java/ecj-gcj )
-	)
-	pax_kernel? ( sys-apps/paxctl )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:6 )
-	nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="
-		icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
-		gcj-jdk"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${ICEDTEA_PKG}.tar.gz
-}
-
-java_prepare() {
-	# icedtea doesn't like some locales. #330433 #389717
-	export LANG="C" LC_ALL="C"
-
-	epatch "${FILESDIR}"/${PN}-${SLOT}_pax_kernel_support.patch #389751 #422525
-	epatch "${FILESDIR}"/${PN}-${SLOT}-pass_javac_memory_args_to_vm.patch
-	eautoreconf
-}
-
-bootstrap_impossible() {
-	# Fill this according to testing what works and what not
-	has "${1}" # icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
-}
-
-src_configure() {
-	local config bootstrap enable_cacao
-	local vm=$(java-pkg_get-current-vm)
-
-	# IcedTea6 can't be built using IcedTea7; its class files are too new
-	# Whether to bootstrap
-	bootstrap="disable"
-	if use jbootstrap; then
-		if bootstrap_impossible "${vm}"; then
-			einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
-		else
-			bootstrap="enable"
-		fi
-	fi
-
-	if has "${vm}" gcj-jdk; then
-		# gcj-jdk ensures ecj is present.
-		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
-		bootstrap="enable"
-	fi
-
-	config="${config} --${bootstrap}-bootstrap"
-
-	if [[ ${bootstrap} == enable ]]; then
-		# icedtea-6 javac wrapper requires to always have ecj if bootstrapping #392337
-		local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
-		# Don't use eclipse-ecj-3.7 #392587
-		local ecj_all=( "${EPREFIX}"/usr/share/{eclipse-ecj,ecj-gcj}-* )
-		ecj_all=( "${ecj_all[@]/*eclipse-ecj-3.7*/}" )
-		if ! has "${ecj_jar%/lib/ecj.jar}" "${ecj_all[@]}"; then
-			ecj_jar="${ecj_jar%/lib/ecj.jar}"
-			ewarn "${ecj_jar##*/} set as system ecj, can't use for bootstrap"
-			ewarn "Found usable: ${ecj_all[@]##*/}"
-			ewarn "using ${ecj_all##*/} instead"
-			ecj_jar="${ecj_all}"/lib/ecj.jar
-		fi
-		config="${config} --with-ecj-jar=${ecj_jar}"
-	fi
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# Otherwise use CACAO
-	if ! has "${ARCH}" amd64 sparc x86; then
-		enable_cacao=yes
-	elif use cacao; then
-		ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
-		ewarn 'If so, please rebuild with USE="-cacao"'
-		enable_cacao=yes
-	fi
-
-	if [[ ${enable_cacao} ]]; then
-		config="${config} --enable-cacao"
-	fi
-
-	# OpenJDK-specific parallelism support. Bug #389791, #337827
-	# Implementation modified from waf-utils.eclass
-	# Note that "-j" is converted to "-j1" as the system doesn't support --load-average
-	local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
-	config="${config} --with-parallel-jobs=${procs}";
-	einfo "Configuring using --with-parallel-jobs=${procs}"
-
-	if use javascript ; then
-		config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)"
-	else
-		config="${config} --without-rhino"
-	fi
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
-		--with-jaxp-drop-zip="${DISTDIR}/${JAXP_TARBALL}" \
-		--with-jaxws-drop-zip="${DISTDIR}/${JAXWS_TARBALL}" \
-		--with-jaf-drop-zip="${DISTDIR}/${JAF_TARBALL}" \
-		--with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
-		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
-		$(use_enable !debug optimizations) \
-		$(use_enable doc docs) \
-		$(use_enable nss) \
-		$(use_enable pulseaudio pulse-java) \
-		$(use_enable systemtap) \
-		$(use_with pax_kernel pax paxctl)
-}
-
-src_compile() {
-	# Would use GENTOO_VM otherwise.
-	export ANT_RESPECT_JAVA_HOME=TRUE
-
-	# Load the least that's needed to avoid possible classpath collisions.
-	export ANT_TASKS="ant-nodeps"
-
-	emake
-}
-
-src_test() {
-	# Use Xvfb for tests
-	unset DISPLAY
-
-	Xemake check
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}/${dest}"
-	dodir "${dest}"
-
-	dodoc README NEWS AUTHORS THANKYOU
-	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-	docompress -x /usr/share/doc/${PN}${SLOT}
-
-	cd openjdk.build/j2sdk-image || die
-
-	# Ensures HeadlessGraphicsEnvironment is used.
-	if ! use X; then
-		rm -r jre/lib/$(get_system_arch)/xawt || die
-	fi
-
-	#402507
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-
-	# doins can't handle symlinks.
-	cp -vRP bin include jre lib man "${ddest}" || die
-
-	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
-	if use doc; then
-		# java-pkg_dohtml needed for package-list #302654
-		java-pkg_dohtml -r ../docs/* || die
-	fi
-
-	if use examples; then
-		dodir "${dest}/share";
-		cp -vRP demo sample "${ddest}/share/" || die
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	# Needs to be done before generating cacerts
-	java-vm_set-pax-markings "${ddest}"
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
-	mkdir "${T}/certgen" && cd "${T}/certgen" || die
-	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
-	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
-		openssl x509 -text -in "${c}" >> all.crt || die
-	done
-	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-	# Bug 390663
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
-	eprefixify "${T}"/fontconfig.Gentoo.properties
-	insinto "${dest}"/jre/lib
-	doins "${T}"/fontconfig.Gentoo.properties
-
-	set_java_env "${FILESDIR}/icedtea.env"
-	if ! use X || ! use alsa || ! use cups; then
-		java-vm_revdep-mask "${dest}"
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
-		# portage would preserve the symlink otherwise, related to bug #384397
-		rm -f "${EROOT}/usr/lib/jvm/icedtea6"
-		elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
-		elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
-		elog "If you had icedtea6 as system VM, the change should be automatic, however"
-		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
-		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
-	fi
-}

diff --git a/dev-java/icedtea/icedtea-6.1.11.4.ebuild b/dev-java/icedtea/icedtea-6.1.11.4.ebuild
index e97c142..ad0c64e 100644
--- a/dev-java/icedtea/icedtea-6.1.11.4.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.11.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.11.4.ebuild,v 1.1 2012/09/02 11:48:02 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.11.4.ebuild,v 1.2 2012/09/26 08:42:27 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
 
 # *********************************************************
@@ -213,7 +213,7 @@ src_configure() {
 	einfo "Configuring using --with-parallel-jobs=${procs}"
 
 	if use javascript ; then
-		config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)"
+		config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
 	else
 		config="${config} --without-rhino"
 	fi

diff --git a/dev-java/icedtea/icedtea-7.2.1.1.ebuild b/dev-java/icedtea/icedtea-7.2.1.1.ebuild
deleted file mode 100644
index c310fc1..0000000
--- a/dev-java/icedtea/icedtea-7.2.1.1.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.1.1.ebuild,v 1.2 2012/06/24 08:19:48 sera Exp $
-# Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
-EAPI="5"
-
-inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
-
-ICEDTEA_VER=$(get_version_component_range 2-)
-ICEDTEA_BRANCH=$(get_version_component_range 2-3)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-OPENJDK_TARBALL="22cc03983e20.tar.gz"
-CORBA_TARBALL="338c21646c76.tar.gz"
-HOTSPOT_TARBALL="8b7c4c5f6ba9.tar.gz"
-JAXP_TARBALL="7a8825b15df6.tar.gz"
-JAXWS_TARBALL="7edfbfe974f2.tar.gz"
-JDK_TARBALL="d5ddeffc4651.tar.gz"
-LANGTOOLS_TARBALL="b534c4c6cd9b.tar.gz"
-CACAO_TARBALL="a567bcb7f589.tar.gz"
-JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="
-	http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/archive/${OPENJDK_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/corba/archive/${CORBA_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxp/archive/${JAXP_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxws/archive/${JAXWS_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jdk/archive/${JDK_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/hotspot/archive/${HOTSPOT_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/langtools/archive/${LANGTOOLS_TARBALL}
-	http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
-	http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-SLOT="7"
-KEYWORDS="~amd64 ~ia64 ~x86"
-
-IUSE="+X +alsa cjk +cups debug doc examples javascript +jbootstrap +nsplugin
-	+nss pax_kernel pulseaudio +source systemtap test +webstart"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.2.12"
-X_COMMON_DEP="
-	>=dev-libs/atk-1.30.0
-	>=dev-libs/glib-2.26
-	media-libs/fontconfig
-	>=media-libs/freetype-2.3.5
-	>=x11-libs/cairo-1.8.8
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.8:2
-	>=x11-libs/libX11-1.1.3
-	>=x11-libs/libXext-1.1.1
-	>=x11-libs/libXi-1.1.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.0.3
-	>=x11-libs/pango-1.24.5"
-X_DEPEND="
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2
-	>=x11-libs/libXp-1.0.0
-	x11-proto/inputproto
-	>=x11-proto/xextproto-7.1.1
-	x11-proto/xineramaproto
-	x11-proto/xproto"
-
-COMMON_DEP="
-	>=media-libs/giflib-4.1.6
-	media-libs/lcms:2
-	>=media-libs/libpng-1.2:=
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg
-	javascript? ( dev-java/rhino:1.6 )
-	nss? ( >=dev-libs/nss-3.12.5-r1 )
-	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
-	systemtap? ( >=dev-util/systemtap-1 )"
-
-# cups is needed for X. #390945 #390975
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea:0
-	X? (
-		${CUPS_COMMON_DEP}
-		${X_COMMON_DEP}
-		media-fonts/dejavu
-		cjk? (
-			media-fonts/arphicfonts
-			media-fonts/baekmuk-fonts
-			media-fonts/lklug
-			media-fonts/lohit-fonts
-			media-fonts/sazanami
-		)
-	)
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )"
-
-# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-# xext headers have two variants depending on version - bug #288855
-# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
-	|| (
-		>=dev-java/gcj-jdk-4.3
-		dev-java/icedtea-bin:7
-		dev-java/icedtea-bin:6
-		dev-java/icedtea:7
-		dev-java/icedtea:6
-	)
-	app-arch/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	>=dev-java/ant-core-1.8.1
-	dev-java/ant-nodeps
-	dev-lang/perl
-	>=dev-libs/libxslt-1.1.26
-	dev-libs/openssl
-	virtual/pkgconfig
-	sys-apps/attr
-	sys-apps/lsb-release
-	${X_DEPEND}
-	pax_kernel? ( sys-apps/paxctl )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:7 )
-	nsplugin? ( dev-java/icedtea-web:7[nsplugin] )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="
-		icedtea-7 icedtea-bin-7 icedtea7
-		icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
-		gcj-jdk"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${ICEDTEA_PKG}.tar.gz
-}
-
-java_prepare() {
-	# For bootstrap builds as the sandbox control file might not yet exist.
-	addpredict /proc/self/coredump_filter
-
-	# icedtea doesn't like some locales. #330433 #389717
-	export LANG="C" LC_ALL="C"
-
-	epatch "${FILESDIR}"/${PN}-7.2.0_pax_kernel_support.patch #389751
-	epatch "${FILESDIR}"/${PN}-${SLOT}-compiler_detection_cleanup.patch
-	epatch "${FILESDIR}"/${P}-pr986-cacao_memory_fix.patch
-	epatch "${FILESDIR}"/${PN}-${SLOT}-compile_for_7_cacao_mem.patch
-	epatch "${FILESDIR}"/${P}-pax_mark_rmic_java.patch #422525
-	eautoreconf
-}
-
-bootstrap_impossible() {
-	# Fill this according to testing what works and what not
-	has "${1}" icedtea7 icedtea-7 icedtea-bin-7 icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
-}
-
-src_configure() {
-	local config bootstrap
-	local vm=$(java-pkg_get-current-vm)
-
-	# Whether to bootstrap
-	bootstrap="disable"
-	if use jbootstrap; then
-		if bootstrap_impossible "${vm}"; then
-			einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
-		else
-			bootstrap="enable"
-		fi
-	fi
-
-	if has "${vm}" gcj-jdk; then
-		# gcj-jdk ensures ecj is present.
-		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
-		bootstrap="enable"
-		local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
-		config="${config} --with-ecj-jar=${ecj_jar}"
-	fi
-
-	config="${config} --${bootstrap}-bootstrap"
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# Otherwise use JamVM as it's the only possibility right now
-	if ! has "${ARCH}" amd64 sparc x86; then
-		config="${config} --enable-jamvm"
-	fi
-
-	# OpenJDK-specific parallelism support. Bug #389791, #337827
-	# Implementation modified from waf-utils.eclass
-	# Note that "-j" is converted to "-j1" as the system doesn't support --load-average
-	local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
-	config="${config} --with-parallel-jobs=${procs}";
-	einfo "Configuring using --with-parallel-jobs=${procs}"
-
-	if use javascript ; then
-		config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)"
-	else
-		config="${config} --without-rhino"
-	fi
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
-		--with-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \
-		--with-jaxp-src-zip="${DISTDIR}/${JAXP_TARBALL}" \
-		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_TARBALL}" \
-		--with-jdk-src-zip="${DISTDIR}/${JDK_TARBALL}" \
-		--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \
-		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_TARBALL}" \
-		--with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
-		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
-		$(use_enable !debug optimizations) \
-		$(use_enable doc docs) \
-		$(use_enable nss) \
-		$(use_enable pulseaudio pulse-java) \
-		$(use_enable systemtap) \
-		$(use_with pax_kernel pax paxctl)
-}
-
-src_compile() {
-	# Would use GENTOO_VM otherwise.
-	export ANT_RESPECT_JAVA_HOME=TRUE
-
-	# Load the least that's needed to avoid possible classpath collisions.
-	export ANT_TASKS="ant-nodeps"
-
-	emake -j 1
-}
-
-src_test() {
-	# Use Xvfb for tests
-	unset DISPLAY
-
-	Xemake -j1 check
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}/${dest}"
-	dodir "${dest}"
-
-	dodoc README NEWS AUTHORS
-	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-	docompress -x /usr/share/doc/${PN}${SLOT}
-
-	cd openjdk.build/j2sdk-image || die
-
-	# Ensures HeadlessGraphicsEnvironment is used.
-	if ! use X; then
-		rm -r jre/lib/$(get_system_arch)/xawt || die
-	fi
-
-	# Don't hide classes
-	rm lib/ct.sym || die
-
-	#402507
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-
-	# doins can't handle symlinks.
-	cp -vRP bin include jre lib man "${ddest}" || die
-
-	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
-	if use doc; then
-		# java-pkg_dohtml needed for package-list #302654
-		java-pkg_dohtml -r ../docs/* || die
-	fi
-
-	if use examples; then
-		dodir "${dest}/share";
-		cp -vRP demo sample "${ddest}/share/" || die
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	# Needs to be done before generating cacerts
-	java-vm_set-pax-markings "${ddest}"
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
-	mkdir "${T}/certgen" && cd "${T}/certgen" || die
-	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
-	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
-		openssl x509 -text -in "${c}" >> all.crt || die
-	done
-	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-	# OpenJDK7 should be able to use fontconfig instead, but wont hurt to
-	# install it anyway. Bug 390663
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
-	eprefixify "${T}"/fontconfig.Gentoo.properties
-	insinto "${dest}"/jre/lib
-	doins "${T}"/fontconfig.Gentoo.properties
-
-	set_java_env "${FILESDIR}/icedtea.env"
-	if ! use X || ! use alsa || ! use cups; then
-		java-vm_revdep-mask "${dest}"
-	fi
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_preinst() {
-	if has_version "<=dev-java/icedtea-7.2.0:7"; then
-		# portage would preserve the symlink otherwise, related to bug #384397
-		rm -f "${EROOT}/usr/lib/jvm/icedtea7"
-		elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
-		elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
-		elog "If you had icedtea7 as system VM, the change should be automatic, however"
-		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
-		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
-	fi
-}

diff --git a/dev-java/icedtea/icedtea-7.2.1.ebuild b/dev-java/icedtea/icedtea-7.2.1.ebuild
deleted file mode 100644
index fe989be..0000000
--- a/dev-java/icedtea/icedtea-7.2.1.ebuild
+++ /dev/null
@@ -1,334 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.1.ebuild,v 1.4 2012/05/03 07:42:50 jdhore Exp $
-# Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
-EAPI="5"
-
-inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
-
-ICEDTEA_VER=$(get_version_component_range 2-)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-OPENJDK_TARBALL="22cc03983e20.tar.gz"
-CORBA_TARBALL="5617f6c5cc94.tar.gz"
-HOTSPOT_TARBALL="0e651e004747.tar.gz"
-JAXP_TARBALL="1cf75c0e2c96.tar.gz"
-JAXWS_TARBALL="7edfbfe974f2.tar.gz"
-JDK_TARBALL="50f6f276a06c.tar.gz"
-LANGTOOLS_TARBALL="b534c4c6cd9b.tar.gz"
-JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="
-	http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/archive/${OPENJDK_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/corba/archive/${CORBA_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jaxp/archive/${JAXP_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jaxws/archive/${JAXWS_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jdk/archive/${JDK_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/hotspot/archive/${HOTSPOT_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/langtools/archive/${LANGTOOLS_TARBALL}
-	!amd64? ( !sparc? ( !x86? (
-		http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL}
-	) ) )"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-SLOT="7"
-KEYWORDS="~amd64 ~ia64 ~x86"
-
-IUSE="+X +alsa cjk +cups debug doc examples javascript +jbootstrap +nsplugin
-	+nss pax_kernel pulseaudio +source systemtap test +webstart"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.2.12"
-X_COMMON_DEP="
-	>=dev-libs/atk-1.30.0
-	>=dev-libs/glib-2.26
-	media-libs/fontconfig
-	>=media-libs/freetype-2.3.5
-	>=x11-libs/cairo-1.8.8
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.8:2
-	>=x11-libs/libX11-1.1.3
-	>=x11-libs/libXext-1.1.1
-	>=x11-libs/libXi-1.1.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.0.3
-	>=x11-libs/pango-1.24.5"
-X_DEPEND="
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2
-	>=x11-libs/libXp-1.0.0
-	x11-proto/inputproto
-	>=x11-proto/xextproto-7.1.1
-	x11-proto/xineramaproto
-	x11-proto/xproto"
-
-COMMON_DEP="
-	>=media-libs/giflib-4.1.6
-	media-libs/lcms:2
-	>=media-libs/libpng-1.2:=
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg
-	javascript? ( dev-java/rhino:1.6 )
-	nss? ( >=dev-libs/nss-3.12.5-r1 )
-	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
-	systemtap? ( >=dev-util/systemtap-1 )"
-
-# cups is needed for X. #390945 #390975
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea:0
-	X? (
-		${CUPS_COMMON_DEP}
-		${X_COMMON_DEP}
-		media-fonts/dejavu
-		cjk? (
-			media-fonts/arphicfonts
-			media-fonts/baekmuk-fonts
-			media-fonts/lklug
-			media-fonts/lohit-fonts
-			media-fonts/sazanami
-		)
-	)
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )"
-
-# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-# xext headers have two variants depending on version - bug #288855
-# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
-	|| (
-		>=dev-java/gcj-jdk-4.3
-		dev-java/icedtea-bin:7
-		dev-java/icedtea-bin:6
-		dev-java/icedtea:7
-		dev-java/icedtea:6
-	)
-	app-arch/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	>=dev-java/ant-core-1.8.1
-	dev-java/ant-nodeps
-	dev-lang/perl
-	>=dev-libs/libxslt-1.1.26
-	dev-libs/openssl
-	virtual/pkgconfig
-	sys-apps/attr
-	sys-apps/lsb-release
-	|| ( >=sys-devel/autoconf-2.65:2.5 <sys-devel/autoconf-2.64:2.5 )
-	${X_DEPEND}
-	pax_kernel? ( sys-apps/paxctl )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:7 )
-	nsplugin? ( dev-java/icedtea-web:7[nsplugin] )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="
-		icedtea-7 icedtea-bin-7 icedtea7
-		icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
-		gcj-jdk"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${ICEDTEA_PKG}.tar.gz
-}
-
-java_prepare() {
-	# For bootstrap builds as the sandbox control file might not yet exist.
-	addpredict /proc/self/coredump_filter
-
-	# icedtea doesn't like some locales. #330433 #389717
-	export LANG="C" LC_ALL="C"
-
-	epatch "${FILESDIR}"/${PN}-7.2.0_pax_kernel_support.patch #389751
-	epatch "${FILESDIR}"/${PN}-7.2.0-explicit-gthread.patch #402481
-	eautoreconf
-}
-
-bootstrap_impossible() {
-	# Fill this according to testing what works and what not
-	has "${1}" icedtea7 icedtea-7 icedtea-bin-7 icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
-}
-
-src_configure() {
-	local config bootstrap
-	local vm=$(java-pkg_get-current-vm)
-
-	# Whether to bootstrap
-	bootstrap="disable"
-	if use jbootstrap; then
-		if bootstrap_impossible "${vm}"; then
-			einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
-		else
-			bootstrap="enable"
-		fi
-	fi
-
-	if has "${vm}" gcj-jdk; then
-		# gcj-jdk ensures ecj is present.
-		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
-		bootstrap="enable"
-		local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
-		config="${config} --with-ecj-jar=${ecj_jar}"
-	fi
-
-	config="${config} --${bootstrap}-bootstrap"
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# Otherwise use JamVM as it's the only possibility right now
-	if ! has "${ARCH}" amd64 sparc x86; then
-		config="${config} --enable-jamvm --with-jamvm-src-zip=${DISTDIR}/${JAMVM_TARBALL}"
-	fi
-
-	# OpenJDK-specific parallelism support. Bug #389791, #337827
-	# Implementation modified from waf-utils.eclass
-	# Note that "-j" is converted to "-j1" as the system doesn't support --load-average
-	local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
-	config="${config} --with-parallel-jobs=${procs}";
-	einfo "Configuring using --with-parallel-jobs=${procs}"
-
-	if use javascript ; then
-		config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)"
-	else
-		config="${config} --without-rhino"
-	fi
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
-		--with-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \
-		--with-jaxp-src-zip="${DISTDIR}/${JAXP_TARBALL}" \
-		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_TARBALL}" \
-		--with-jdk-src-zip="${DISTDIR}/${JDK_TARBALL}" \
-		--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \
-		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
-		$(use_enable !debug optimizations) \
-		$(use_enable doc docs) \
-		$(use_enable nss) \
-		$(use_enable pulseaudio pulse-java) \
-		$(use_enable systemtap) \
-		$(use_with pax_kernel pax paxctl)
-}
-
-src_compile() {
-	# Would use GENTOO_VM otherwise.
-	export ANT_RESPECT_JAVA_HOME=TRUE
-
-	# Load the least that's needed to avoid possible classpath collisions.
-	export ANT_TASKS="ant-nodeps"
-
-	emake -j 1
-}
-
-src_test() {
-	# Use Xvfb for tests
-	unset DISPLAY
-
-	Xemake -j1 check
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}/${dest}"
-	dodir "${dest}"
-
-	dodoc README NEWS AUTHORS
-	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
-	cd openjdk.build/j2sdk-image || die
-
-	# Ensures HeadlessGraphicsEnvironment is used.
-	if ! use X; then
-		rm -r jre/lib/$(get_system_arch)/xawt || die
-	fi
-
-	# Don't hide classes
-	rm lib/ct.sym || die
-
-	#402507
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-
-	# doins can't handle symlinks.
-	cp -vRP bin include jre lib man "${ddest}" || die
-
-	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
-	if use doc; then
-		# java-pkg_dohtml needed for package-list #302654
-		java-pkg_dohtml -r ../docs/* || die
-	fi
-
-	if use examples; then
-		dodir "${dest}/share";
-		cp -vRP demo sample "${ddest}/share/" || die
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	# Needs to be done before generating cacerts
-	java-vm_set-pax-markings "${ddest}"
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
-	mkdir "${T}/certgen" && cd "${T}/certgen" || die
-	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
-	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
-		openssl x509 -text -in "${c}" >> all.crt || die
-	done
-	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-	# OpenJDK7 should be able to use fontconfig instead, but wont hurt to
-	# install it anyway. Bug 390663
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
-	eprefixify "${T}"/fontconfig.Gentoo.properties
-	insinto "${dest}"/jre/lib
-	doins "${T}"/fontconfig.Gentoo.properties
-
-	set_java_env "${FILESDIR}/icedtea.env"
-	if ! use X || ! use alsa || ! use cups; then
-		java-vm_revdep-mask "${dest}"
-	fi
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_preinst() {
-	if has_version "<=dev-java/icedtea-7.2.0:7"; then
-		# portage would preserve the symlink otherwise, related to bug #384397
-		rm -f "${EROOT}/usr/lib/jvm/icedtea7"
-		elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
-		elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
-		elog "If you had icedtea7 as system VM, the change should be automatic, however"
-		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
-		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
-	fi
-}

diff --git a/dev-java/icedtea/icedtea-7.2.2.1.ebuild b/dev-java/icedtea/icedtea-7.2.2.1.ebuild
deleted file mode 100644
index 3b7d2bc..0000000
--- a/dev-java/icedtea/icedtea-7.2.2.1.ebuild
+++ /dev/null
@@ -1,343 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.2.1.ebuild,v 1.3 2012/06/27 19:08:57 sera Exp $
-# Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
-EAPI="5"
-
-inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
-
-ICEDTEA_VER=$(get_version_component_range 2-)
-ICEDTEA_BRANCH=$(get_version_component_range 2-3)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-OPENJDK_TARBALL="0b776ef59474.tar.gz"
-CORBA_TARBALL="38deb372c569.tar.gz"
-HOTSPOT_TARBALL="889dffcf4a54.tar.gz"
-JAXP_TARBALL="335fb0b059b7.tar.gz"
-JAXWS_TARBALL="5471e01ef43b.tar.gz"
-JDK_TARBALL="6c3b742b735d.tar.gz"
-LANGTOOLS_TARBALL="beea46c7086b.tar.gz"
-CACAO_TARBALL="a567bcb7f589.tar.gz"
-JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="
-	http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/archive/${OPENJDK_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/corba/archive/${CORBA_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxp/archive/${JAXP_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxws/archive/${JAXWS_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jdk/archive/${JDK_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/hotspot/archive/${HOTSPOT_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/langtools/archive/${LANGTOOLS_TARBALL}
-	http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
-	http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-SLOT="7"
-KEYWORDS="~amd64 ~ia64 ~x86"
-
-IUSE="+X +alsa cjk +cups debug doc examples javascript +jbootstrap +nsplugin
-	+nss pax_kernel pulseaudio +source systemtap test +webstart"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.2.12"
-X_COMMON_DEP="
-	>=dev-libs/atk-1.30.0
-	>=dev-libs/glib-2.26
-	media-libs/fontconfig
-	>=media-libs/freetype-2.3.5
-	>=x11-libs/cairo-1.8.8
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.8:2
-	>=x11-libs/libX11-1.1.3
-	>=x11-libs/libXext-1.1.1
-	>=x11-libs/libXi-1.1.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.0.3
-	>=x11-libs/pango-1.24.5"
-X_DEPEND="
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2
-	>=x11-libs/libXp-1.0.0
-	x11-proto/inputproto
-	>=x11-proto/xextproto-7.1.1
-	x11-proto/xineramaproto
-	x11-proto/xproto"
-
-COMMON_DEP="
-	>=media-libs/giflib-4.1.6
-	media-libs/lcms:2
-	>=media-libs/libpng-1.2:=
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg
-	javascript? ( dev-java/rhino:1.6 )
-	nss? ( >=dev-libs/nss-3.12.5-r1 )
-	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
-	systemtap? ( >=dev-util/systemtap-1 )"
-
-# cups is needed for X. #390945 #390975
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea:0
-	X? (
-		${CUPS_COMMON_DEP}
-		${X_COMMON_DEP}
-		media-fonts/dejavu
-		cjk? (
-			media-fonts/arphicfonts
-			media-fonts/baekmuk-fonts
-			media-fonts/lklug
-			media-fonts/lohit-fonts
-			media-fonts/sazanami
-		)
-	)
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )"
-
-# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-# xext headers have two variants depending on version - bug #288855
-# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
-	|| (
-		>=dev-java/gcj-jdk-4.3
-		dev-java/icedtea-bin:7
-		dev-java/icedtea-bin:6
-		dev-java/icedtea:7
-		dev-java/icedtea:6
-	)
-	app-arch/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	>=dev-java/ant-core-1.8.1
-	dev-java/ant-nodeps
-	dev-lang/perl
-	>=dev-libs/libxslt-1.1.26
-	dev-libs/openssl
-	virtual/pkgconfig
-	sys-apps/attr
-	sys-apps/lsb-release
-	${X_DEPEND}
-	pax_kernel? ( sys-apps/paxctl )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:7 )
-	nsplugin? ( dev-java/icedtea-web:7[nsplugin] )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="
-		icedtea-7 icedtea-bin-7 icedtea7
-		icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
-		gcj-jdk"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${ICEDTEA_PKG}.tar.gz
-}
-
-java_prepare() {
-	# For bootstrap builds as the sandbox control file might not yet exist.
-	addpredict /proc/self/coredump_filter
-
-	# icedtea doesn't like some locales. #330433 #389717
-	export LANG="C" LC_ALL="C"
-
-	epatch "${FILESDIR}"/${PN}-${SLOT}-no_suffix.patch
-	epatch "${FILESDIR}"/${PN}-${SLOT}-compiler_detection_cleanup.patch
-	epatch "${FILESDIR}"/${P}-pr986-cacao_memory_fix.patch
-	epatch "${FILESDIR}"/${PN}-${SLOT}-compile_for_7_cacao_mem.patch
-	epatch "${FILESDIR}"/${P}-pax_mark_rmic_java.patch #422525
-	epatch "${FILESDIR}"/${P}-warnings_are_errors.patch #310503 #418359
-	eautoreconf
-}
-
-bootstrap_impossible() {
-	# Fill this according to testing what works and what not
-	has "${1}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
-}
-
-src_configure() {
-	local config bootstrap
-	local vm=$(java-pkg_get-current-vm)
-
-	# Whether to bootstrap
-	bootstrap="disable"
-	if use jbootstrap; then
-		if bootstrap_impossible "${vm}"; then
-			einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
-		else
-			bootstrap="enable"
-		fi
-	fi
-
-	if has "${vm}" gcj-jdk; then
-		# gcj-jdk ensures ecj is present.
-		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
-		bootstrap="enable"
-		local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
-		config="${config} --with-ecj-jar=${ecj_jar}"
-	fi
-
-	config="${config} --${bootstrap}-bootstrap"
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# Otherwise use JamVM as it's the only possibility right now
-	if ! has "${ARCH}" amd64 sparc x86; then
-		config="${config} --enable-jamvm"
-	fi
-
-	# OpenJDK-specific parallelism support. Bug #389791, #337827
-	# Implementation modified from waf-utils.eclass
-	# Note that "-j" is converted to "-j1" as the system doesn't support --load-average
-	local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
-	config="${config} --with-parallel-jobs=${procs}";
-	einfo "Configuring using --with-parallel-jobs=${procs}"
-
-	if use javascript ; then
-		config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)"
-	else
-		config="${config} --without-rhino"
-	fi
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
-		--with-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \
-		--with-jaxp-src-zip="${DISTDIR}/${JAXP_TARBALL}" \
-		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_TARBALL}" \
-		--with-jdk-src-zip="${DISTDIR}/${JDK_TARBALL}" \
-		--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \
-		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_TARBALL}" \
-		--with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
-		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
-		--disable-downloading \
-		--disable-warnings-are-errors \
-		$(use_enable !debug optimizations) \
-		$(use_enable doc docs) \
-		$(use_enable nss) \
-		$(use_enable pulseaudio pulse-java) \
-		$(use_enable systemtap) \
-		$(use_with pax_kernel pax paxctl)
-}
-
-src_compile() {
-	# Would use GENTOO_VM otherwise.
-	export ANT_RESPECT_JAVA_HOME=TRUE
-
-	# Load the least that's needed to avoid possible classpath collisions.
-	export ANT_TASKS="ant-nodeps"
-
-	emake
-}
-
-src_test() {
-	# Use Xvfb for tests
-	unset DISPLAY
-
-	Xemake check
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}/${dest}"
-	dodir "${dest}"
-
-	dodoc README NEWS AUTHORS
-	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-	docompress -x /usr/share/doc/${PN}${SLOT}
-
-	cd openjdk.build/j2sdk-image || die
-
-	# Ensures HeadlessGraphicsEnvironment is used.
-	if ! use X; then
-		rm -r jre/lib/$(get_system_arch)/xawt || die
-	fi
-
-	# Don't hide classes
-	rm lib/ct.sym || die
-
-	#402507
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-
-	# doins can't handle symlinks.
-	cp -vRP bin include jre lib man "${ddest}" || die
-
-	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
-	if use doc; then
-		# java-pkg_dohtml needed for package-list #302654
-		java-pkg_dohtml -r ../docs/* || die
-	fi
-
-	if use examples; then
-		dodir "${dest}/share";
-		cp -vRP demo sample "${ddest}/share/" || die
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	# Needs to be done before generating cacerts
-	java-vm_set-pax-markings "${ddest}"
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
-	mkdir "${T}/certgen" && cd "${T}/certgen" || die
-	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
-	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
-		openssl x509 -text -in "${c}" >> all.crt || die
-	done
-	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-	# OpenJDK7 should be able to use fontconfig instead, but wont hurt to
-	# install it anyway. Bug 390663
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
-	eprefixify "${T}"/fontconfig.Gentoo.properties
-	insinto "${dest}"/jre/lib
-	doins "${T}"/fontconfig.Gentoo.properties
-
-	set_java_env "${FILESDIR}/icedtea.env"
-	if ! use X || ! use alsa || ! use cups; then
-		java-vm_revdep-mask "${dest}"
-	fi
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_preinst() {
-	if has_version "<=dev-java/icedtea-7.2.0:7"; then
-		# portage would preserve the symlink otherwise, related to bug #384397
-		rm -f "${EROOT}/usr/lib/jvm/icedtea7"
-		elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
-		elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
-		elog "If you had icedtea7 as system VM, the change should be automatic, however"
-		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
-		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
-	fi
-}

diff --git a/dev-java/icedtea/icedtea-7.2.2.ebuild b/dev-java/icedtea/icedtea-7.2.2.ebuild
deleted file mode 100644
index c4a39df..0000000
--- a/dev-java/icedtea/icedtea-7.2.2.ebuild
+++ /dev/null
@@ -1,334 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.2.ebuild,v 1.1 2012/06/10 13:56:19 sera Exp $
-# Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
-EAPI="5"
-
-inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
-
-ICEDTEA_VER=$(get_version_component_range 2-)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-OPENJDK_TARBALL="49a6fc8f712f.tar.gz"
-CORBA_TARBALL="3231f3e9c517.tar.gz"
-HOTSPOT_TARBALL="bfe5efd70bce.tar.gz"
-JAXP_TARBALL="0036fe6fe7dc.tar.gz"
-JAXWS_TARBALL="abfb890c262a.tar.gz"
-JDK_TARBALL="839d0155f7cc.tar.gz"
-LANGTOOLS_TARBALL="f855bdb37537.tar.gz"
-JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="
-	http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/archive/${OPENJDK_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/corba/archive/${CORBA_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jaxp/archive/${JAXP_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jaxws/archive/${JAXWS_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jdk/archive/${JDK_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/hotspot/archive/${HOTSPOT_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/langtools/archive/${LANGTOOLS_TARBALL}
-	!amd64? ( !sparc? ( !x86? (
-		http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL}
-	) ) )"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-SLOT="7"
-KEYWORDS="~amd64 ~ia64 ~x86"
-
-IUSE="+X +alsa cjk +cups debug doc examples javascript +jbootstrap +nsplugin
-	+nss pax_kernel pulseaudio +source systemtap test +webstart"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.2.12"
-X_COMMON_DEP="
-	>=dev-libs/atk-1.30.0
-	>=dev-libs/glib-2.26
-	media-libs/fontconfig
-	>=media-libs/freetype-2.3.5
-	>=x11-libs/cairo-1.8.8
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.8:2
-	>=x11-libs/libX11-1.1.3
-	>=x11-libs/libXext-1.1.1
-	>=x11-libs/libXi-1.1.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.0.3
-	>=x11-libs/pango-1.24.5"
-X_DEPEND="
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2
-	>=x11-libs/libXp-1.0.0
-	x11-proto/inputproto
-	>=x11-proto/xextproto-7.1.1
-	x11-proto/xineramaproto
-	x11-proto/xproto"
-
-COMMON_DEP="
-	>=media-libs/giflib-4.1.6
-	media-libs/lcms:2
-	>=media-libs/libpng-1.2:=
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg
-	javascript? ( dev-java/rhino:1.6 )
-	nss? ( >=dev-libs/nss-3.12.5-r1 )
-	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
-	systemtap? ( >=dev-util/systemtap-1 )"
-
-# cups is needed for X. #390945 #390975
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea:0
-	X? (
-		${CUPS_COMMON_DEP}
-		${X_COMMON_DEP}
-		media-fonts/dejavu
-		cjk? (
-			media-fonts/arphicfonts
-			media-fonts/baekmuk-fonts
-			media-fonts/lklug
-			media-fonts/lohit-fonts
-			media-fonts/sazanami
-		)
-	)
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )"
-
-# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-# xext headers have two variants depending on version - bug #288855
-# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
-	|| (
-		>=dev-java/gcj-jdk-4.3
-		dev-java/icedtea-bin:7
-		dev-java/icedtea-bin:6
-		dev-java/icedtea:7
-		dev-java/icedtea:6
-	)
-	app-arch/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	>=dev-java/ant-core-1.8.1
-	dev-java/ant-nodeps
-	dev-lang/perl
-	>=dev-libs/libxslt-1.1.26
-	dev-libs/openssl
-	virtual/pkgconfig
-	sys-apps/attr
-	sys-apps/lsb-release
-	${X_DEPEND}
-	pax_kernel? ( sys-apps/paxctl )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:7 )
-	nsplugin? ( dev-java/icedtea-web:7[nsplugin] )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="
-		icedtea-7 icedtea-bin-7 icedtea7
-		icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
-		gcj-jdk"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${ICEDTEA_PKG}.tar.gz
-}
-
-java_prepare() {
-	# For bootstrap builds as the sandbox control file might not yet exist.
-	addpredict /proc/self/coredump_filter
-
-	# icedtea doesn't like some locales. #330433 #389717
-	export LANG="C" LC_ALL="C"
-
-	epatch "${FILESDIR}"/${P}-no_suffix.patch
-	eautoreconf
-}
-
-bootstrap_impossible() {
-	# Fill this according to testing what works and what not
-	has "${1}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6 icedtea-7 icedtea-bin-7 icedtea7
-}
-
-src_configure() {
-	local config bootstrap
-	local vm=$(java-pkg_get-current-vm)
-
-	# Whether to bootstrap
-	bootstrap="disable"
-	if use jbootstrap; then
-		if bootstrap_impossible "${vm}"; then
-			einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
-		else
-			bootstrap="enable"
-		fi
-	fi
-
-	if has "${vm}" gcj-jdk; then
-		# gcj-jdk ensures ecj is present.
-		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
-		bootstrap="enable"
-		local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
-		config="${config} --with-ecj-jar=${ecj_jar}"
-	fi
-
-	config="${config} --${bootstrap}-bootstrap"
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# Otherwise use JamVM as it's the only possibility right now
-	if ! has "${ARCH}" amd64 sparc x86; then
-		config="${config} --enable-jamvm --with-jamvm-src-zip=${DISTDIR}/${JAMVM_TARBALL}"
-	fi
-
-	# OpenJDK-specific parallelism support. Bug #389791, #337827
-	# Implementation modified from waf-utils.eclass
-	# Note that "-j" is converted to "-j1" as the system doesn't support --load-average
-	local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
-	config="${config} --with-parallel-jobs=${procs}";
-	einfo "Configuring using --with-parallel-jobs=${procs}"
-
-	if use javascript ; then
-		config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)"
-	else
-		config="${config} --without-rhino"
-	fi
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
-		--with-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \
-		--with-jaxp-src-zip="${DISTDIR}/${JAXP_TARBALL}" \
-		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_TARBALL}" \
-		--with-jdk-src-zip="${DISTDIR}/${JDK_TARBALL}" \
-		--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \
-		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
-		--disable-downloading \
-		$(use_enable !debug optimizations) \
-		$(use_enable doc docs) \
-		$(use_enable nss) \
-		$(use_enable pulseaudio pulse-java) \
-		$(use_enable systemtap) \
-		$(use_with pax_kernel pax paxctl)
-}
-
-src_compile() {
-	# Would use GENTOO_VM otherwise.
-	export ANT_RESPECT_JAVA_HOME=TRUE
-
-	# Load the least that's needed to avoid possible classpath collisions.
-	export ANT_TASKS="ant-nodeps"
-
-	emake
-}
-
-src_test() {
-	# Use Xvfb for tests
-	unset DISPLAY
-
-	Xemake check
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}/${dest}"
-	dodir "${dest}"
-
-	dodoc README NEWS AUTHORS
-	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-	docompress -x /usr/share/doc/${PN}${SLOT}
-
-	cd openjdk.build/j2sdk-image || die
-
-	# Ensures HeadlessGraphicsEnvironment is used.
-	if ! use X; then
-		rm -r jre/lib/$(get_system_arch)/xawt || die
-	fi
-
-	# Don't hide classes
-	rm lib/ct.sym || die
-
-	#402507
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-
-	# doins can't handle symlinks.
-	cp -vRP bin include jre lib man "${ddest}" || die
-
-	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
-	if use doc; then
-		# java-pkg_dohtml needed for package-list #302654
-		java-pkg_dohtml -r ../docs/* || die
-	fi
-
-	if use examples; then
-		dodir "${dest}/share";
-		cp -vRP demo sample "${ddest}/share/" || die
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	# Needs to be done before generating cacerts
-	java-vm_set-pax-markings "${ddest}"
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
-	mkdir "${T}/certgen" && cd "${T}/certgen" || die
-	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
-	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
-		openssl x509 -text -in "${c}" >> all.crt || die
-	done
-	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-	# OpenJDK7 should be able to use fontconfig instead, but wont hurt to
-	# install it anyway. Bug 390663
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
-	eprefixify "${T}"/fontconfig.Gentoo.properties
-	insinto "${dest}"/jre/lib
-	doins "${T}"/fontconfig.Gentoo.properties
-
-	set_java_env "${FILESDIR}/icedtea.env"
-	if ! use X || ! use alsa || ! use cups; then
-		java-vm_revdep-mask "${dest}"
-	fi
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_preinst() {
-	if has_version "<=dev-java/icedtea-7.2.0:7"; then
-		# portage would preserve the symlink otherwise, related to bug #384397
-		rm -f "${EROOT}/usr/lib/jvm/icedtea7"
-		elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
-		elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
-		elog "If you had icedtea7 as system VM, the change should be automatic, however"
-		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
-		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
-	fi
-}

diff --git a/dev-java/icedtea/icedtea-7.2.3.1.ebuild b/dev-java/icedtea/icedtea-7.2.3.1.ebuild
deleted file mode 100644
index 1351aa4..0000000
--- a/dev-java/icedtea/icedtea-7.2.3.1.ebuild
+++ /dev/null
@@ -1,337 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.3.1.ebuild,v 1.1 2012/08/31 14:28:28 caster Exp $
-# Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
-EAPI="5"
-
-inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
-
-ICEDTEA_VER=$(get_version_component_range 2-)
-ICEDTEA_BRANCH=$(get_version_component_range 2-3)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-OPENJDK_TARBALL="a3fa5d49d528.tar.gz"
-CORBA_TARBALL="e9b200124386.tar.gz"
-HOTSPOT_TARBALL="3e0087ab5e92.tar.gz"
-JAXP_TARBALL="9bd1d8e8b802.tar.gz"
-JAXWS_TARBALL="9a744f20cfc5.tar.gz"
-JDK_TARBALL="507eee662587.tar.gz"
-LANGTOOLS_TARBALL="0cf6181d44db.tar.gz"
-CACAO_TARBALL="a567bcb7f589.tar.gz"
-JAMVM_TARBALL="jamvm-e70f2450890b82c37422616cc85e1a23385f03cd.tar.gz"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="
-	http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/archive/${OPENJDK_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/corba/archive/${CORBA_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxp/archive/${JAXP_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxws/archive/${JAXWS_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jdk/archive/${JDK_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/hotspot/archive/${HOTSPOT_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/langtools/archive/${LANGTOOLS_TARBALL}
-	http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
-	http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-SLOT="7"
-KEYWORDS="~amd64 ~ia64 ~x86"
-
-IUSE="+X +alsa cjk +cups debug doc examples javascript +jbootstrap +nsplugin
-	+nss pax_kernel pulseaudio +source systemtap test +webstart"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.2.12"
-X_COMMON_DEP="
-	>=dev-libs/atk-1.30.0
-	>=dev-libs/glib-2.26
-	media-libs/fontconfig
-	>=media-libs/freetype-2.3.5
-	>=x11-libs/cairo-1.8.8
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.8:2
-	>=x11-libs/libX11-1.1.3
-	>=x11-libs/libXext-1.1.1
-	>=x11-libs/libXi-1.1.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.0.3
-	>=x11-libs/pango-1.24.5"
-X_DEPEND="
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2
-	>=x11-libs/libXp-1.0.0
-	x11-proto/inputproto
-	>=x11-proto/xextproto-7.1.1
-	x11-proto/xineramaproto
-	x11-proto/xproto"
-
-COMMON_DEP="
-	>=media-libs/giflib-4.1.6
-	media-libs/lcms:2
-	>=media-libs/libpng-1.2:=
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg
-	javascript? ( dev-java/rhino:1.6 )
-	nss? ( >=dev-libs/nss-3.12.5-r1 )
-	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
-	systemtap? ( >=dev-util/systemtap-1 )"
-
-# cups is needed for X. #390945 #390975
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea:0
-	X? (
-		${CUPS_COMMON_DEP}
-		${X_COMMON_DEP}
-		media-fonts/dejavu
-		cjk? (
-			media-fonts/arphicfonts
-			media-fonts/baekmuk-fonts
-			media-fonts/lklug
-			media-fonts/lohit-fonts
-			media-fonts/sazanami
-		)
-	)
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )"
-
-# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-# xext headers have two variants depending on version - bug #288855
-# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
-	|| (
-		>=dev-java/gcj-jdk-4.3
-		dev-java/icedtea-bin:7
-		dev-java/icedtea-bin:6
-		dev-java/icedtea:7
-		dev-java/icedtea:6
-	)
-	app-arch/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	>=dev-java/ant-core-1.8.1
-	dev-java/ant-nodeps
-	dev-lang/perl
-	>=dev-libs/libxslt-1.1.26
-	dev-libs/openssl
-	virtual/pkgconfig
-	sys-apps/attr
-	sys-apps/lsb-release
-	${X_DEPEND}
-	pax_kernel? ( sys-apps/paxctl )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:7 )
-	nsplugin? ( dev-java/icedtea-web:7[nsplugin] )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="
-		icedtea-7 icedtea-bin-7 icedtea7
-		icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
-		gcj-jdk"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${ICEDTEA_PKG}.tar.gz
-}
-
-java_prepare() {
-	# For bootstrap builds as the sandbox control file might not yet exist.
-	addpredict /proc/self/coredump_filter
-
-	# icedtea doesn't like some locales. #330433 #389717
-	export LANG="C" LC_ALL="C"
-
-	epatch "${FILESDIR}"/${P}-pax_mark_rmic_java.patch #422525
-	eautoreconf
-}
-
-bootstrap_impossible() {
-	# Fill this according to testing what works and what not
-	has "${1}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
-}
-
-src_configure() {
-	local config bootstrap
-	local vm=$(java-pkg_get-current-vm)
-
-	# Whether to bootstrap
-	bootstrap="disable"
-	if use jbootstrap; then
-		if bootstrap_impossible "${vm}"; then
-			einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
-		else
-			bootstrap="enable"
-		fi
-	fi
-
-	if has "${vm}" gcj-jdk; then
-		# gcj-jdk ensures ecj is present.
-		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
-		bootstrap="enable"
-		local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
-		config="${config} --with-ecj-jar=${ecj_jar}"
-	fi
-
-	config="${config} --${bootstrap}-bootstrap"
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# Otherwise use JamVM as it's the only possibility right now
-	if ! has "${ARCH}" amd64 sparc x86; then
-		config="${config} --enable-jamvm"
-	fi
-
-	# OpenJDK-specific parallelism support. Bug #389791, #337827
-	# Implementation modified from waf-utils.eclass
-	# Note that "-j" is converted to "-j1" as the system doesn't support --load-average
-	local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
-	config="${config} --with-parallel-jobs=${procs}";
-	einfo "Configuring using --with-parallel-jobs=${procs}"
-
-	if use javascript ; then
-		config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)"
-	else
-		config="${config} --without-rhino"
-	fi
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
-		--with-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \
-		--with-jaxp-src-zip="${DISTDIR}/${JAXP_TARBALL}" \
-		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_TARBALL}" \
-		--with-jdk-src-zip="${DISTDIR}/${JDK_TARBALL}" \
-		--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \
-		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_TARBALL}" \
-		--with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
-		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
-		--disable-downloading --disable-Werror \
-		$(use_enable !debug optimizations) \
-		$(use_enable doc docs) \
-		$(use_enable nss) \
-		$(use_enable pulseaudio pulse-java) \
-		$(use_enable systemtap) \
-		$(use_with pax_kernel pax paxctl)
-}
-
-src_compile() {
-	# Would use GENTOO_VM otherwise.
-	export ANT_RESPECT_JAVA_HOME=TRUE
-
-	# Load the least that's needed to avoid possible classpath collisions.
-	export ANT_TASKS="ant-nodeps"
-
-	emake
-}
-
-src_test() {
-	# Use Xvfb for tests
-	unset DISPLAY
-
-	Xemake check
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}/${dest}"
-	dodir "${dest}"
-
-	dodoc README NEWS AUTHORS
-	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-	docompress -x /usr/share/doc/${PN}${SLOT}
-
-	cd openjdk.build/j2sdk-image || die
-
-	# Ensures HeadlessGraphicsEnvironment is used.
-	if ! use X; then
-		rm -r jre/lib/$(get_system_arch)/xawt || die
-	fi
-
-	# Don't hide classes
-	rm lib/ct.sym || die
-
-	#402507
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-
-	# doins can't handle symlinks.
-	cp -vRP bin include jre lib man "${ddest}" || die
-
-	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
-	if use doc; then
-		# java-pkg_dohtml needed for package-list #302654
-		java-pkg_dohtml -r ../docs/* || die
-	fi
-
-	if use examples; then
-		dodir "${dest}/share";
-		cp -vRP demo sample "${ddest}/share/" || die
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	# Needs to be done before generating cacerts
-	java-vm_set-pax-markings "${ddest}"
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
-	mkdir "${T}/certgen" && cd "${T}/certgen" || die
-	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
-	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
-		openssl x509 -text -in "${c}" >> all.crt || die
-	done
-	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-	# OpenJDK7 should be able to use fontconfig instead, but wont hurt to
-	# install it anyway. Bug 390663
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
-	eprefixify "${T}"/fontconfig.Gentoo.properties
-	insinto "${dest}"/jre/lib
-	doins "${T}"/fontconfig.Gentoo.properties
-
-	set_java_env "${FILESDIR}/icedtea.env"
-	if ! use X || ! use alsa || ! use cups; then
-		java-vm_revdep-mask "${dest}"
-	fi
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_preinst() {
-	if has_version "<=dev-java/icedtea-7.2.0:7"; then
-		# portage would preserve the symlink otherwise, related to bug #384397
-		rm -f "${EROOT}/usr/lib/jvm/icedtea7"
-		elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
-		elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
-		elog "If you had icedtea7 as system VM, the change should be automatic, however"
-		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
-		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
-	fi
-}

diff --git a/dev-java/icedtea/icedtea-7.2.3.2.ebuild b/dev-java/icedtea/icedtea-7.2.3.2.ebuild
index 07c39cb..ad93f27 100644
--- a/dev-java/icedtea/icedtea-7.2.3.2.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.3.2.ebuild,v 1.1 2012/09/02 10:52:37 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.3.2.ebuild,v 1.2 2012/09/26 08:42:27 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
 
 # *********************************************************
@@ -205,7 +205,7 @@ src_configure() {
 	einfo "Configuring using --with-parallel-jobs=${procs}"
 
 	if use javascript ; then
-		config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)"
+		config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
 	else
 		config="${config} --without-rhino"
 	fi

diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index ba855e9..8bdb547 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -61,8 +61,8 @@ EBUILD boost-1.46.1-r1.ebuild 16224 SHA256 9d7726f12645e301fcc9174880e45e44c9d1a
 EBUILD boost-1.47.0-r1.ebuild 15910 SHA256 f29520bcbd74fa8d75acfc6a1cd7f30329b401cc35b1197e67fc6da39e14ac00 SHA512 def45bb3289e0e2676169edce1423840e310e0d6de5680099cbf3bfb6422b56e97bc57a04a730179b2d52b0ebf1a280ecc111b735851cb23d332f15ae2d1e83f WHIRLPOOL 58b926d3c34f116c252de63a6002ce29fa29c1ff58e0d86e3b25ad3900425841ffe23005a2ec092320acfd854831625a193f03bde675b72cc921b33c62a3efac
 EBUILD boost-1.47.0.ebuild 15907 SHA256 e79d396d32d06b5e3353664d3c95de05448b935d5a36a6df83d32b01047b7c46 SHA512 4ddc6f2cbac138e5f4a12359a945da7c70536d8580a2cddd5f0271d5a8de69080843eb9bc547f6726ca5016e01b504a175e1de55854074ff7c4131f5138eda95 WHIRLPOOL 86c566793087c5a4e3ceaa94744715bd118126019212ad4a0d596ec0373e3354e449272d5902a44d8a824d2ef1f738c17038e17bd69a33b07719475da688bb10
 EBUILD boost-1.48.0-r2.ebuild 19807 SHA256 d3be1ac925eb52331fb6c077461611bab401bae59f933f02f0dbe111ed7abe50 SHA512 5e4b1058548320f79dba6ce46f6672ed798c7fc39cfd6a0447275c875ed0bea379fc3330e6171823d8b2b9027cb7f2bdbb699df8d6707aa8a6c77972e51e52e6 WHIRLPOOL f3e00d25862a96c4ef9db7b50f401ebd70c136c3cc31c5cd80056bffab3ce6c57e9232fdc0f05cc73b5d43349fc002b9e68f4a9cdbf6fed4e6a4d830e31ff97e
-EBUILD boost-1.49.0-r1.ebuild 19767 SHA256 0cffe877c2c3ec044de7553ea5072f86f8b003d55677a27e0a161765029b3e93 SHA512 be65859f2d6b51b79ac5065a11f0678e3367140fc9289daac0c11a056a472504c8e0fa61b16afa0f1306d9e07de3f24862aef456d3487abcd8736590e71498b5 WHIRLPOOL 96ed10bd534ca0d43a88f04a33707ed8a4054401be3aae142e04cd2ef2335bbe0e35c00827bec68602cb87ba255de150ebfe0f45e790913917ad8495e6f3b1b1
+EBUILD boost-1.49.0-r1.ebuild 19761 SHA256 c79f1cfba965c477bad0053726fc4a9e81be320b48d96627c62d2dcdc58996ea SHA512 5290eaf39d4a906d04cff6724e3df18739cb185be77b46505f18286b6d1f4c1259135bc27d7444b626c1c0457d836bf23f37ad46653e330d8b4fb7bc071b1c99 WHIRLPOOL 9cc912e2e6046631bd8580e5be54811b1a9a6d2323bfbac79acb2bf7b58d69abc0884eb2b97f3c5277ff23e5b09772be2b0c6eebcd332aaf63c6f1bb8fbb7f11
 EBUILD boost-1.50.0-r2.ebuild 19113 SHA256 ab574403829c1d68973df875d9372bfd77e77fc7b786ca9159426eb8f49825b3 SHA512 6cfff2f2af201038ccbf631d27ec1b616c0b945f1480450f4b5159e4ed58723b9f73b981881db0d6d4fdecb3c63f81aedebd19c3734006baaaf07ae22da4c778 WHIRLPOOL 8eabd65542b62c47e277367cd6d0b85092a9d279dd047191029e0772be92991a198830d5257658de9e39807c21aab145882d871bef6572c90cdebdc8c62df243
 EBUILD boost-1.50.0.ebuild 19767 SHA256 ff7baaa6e8957b8304d5124b0271f2dbd79bec6d584b940df2fdcb35935468a4 SHA512 23f5034e5859f4834523b210b3fbf4b5c46cb7a92f222b708f875ca21b4c3917c2937d5863fef0cc2a34941fba3d1097bd72e9ad18a4787565336db5c66ff1bc WHIRLPOOL 75fade824202de1e0afd0158db23420aad20a67b114402e96a84325f5d62f497df5f52be5f0fa9dff9a558a27989beebb63724d64eeca05f2c9bd1b836ce026a
-MISC ChangeLog 41745 SHA256 860c944a30543cadbbd8a77149b29f57d12766f27b7ad7e4e407a10ffcb54310 SHA512 225128f3e3f51379e6b11c6309660246303eee968c668b7d46202a87c20115fe2670764808100530ad7617929c1007f5a75e5391c63b9f6e5d0f95a08f86a629 WHIRLPOOL 5000c4e7430c028d7b3a86e96f2314bb68714f20a7a612fed553237b240f8ff76cbcbac1d65a3992c16a0c4935c3b1a04fc527d547be524e99a42a42630fe5aa
+MISC ChangeLog 41852 SHA256 9f59ce86c093bd09213e3c5c54b7e1990fdac27dbdf1f67f583709ff6d899ebd SHA512 57f976c46def4e48d9f9cd8dbcc1e08d6ac35d327bfaa98b400fc4097f9161bc09de5bba5b0f749eeddd44c122b276f4fa8bc14c183c8f6a0f45d6916f46d0cb WHIRLPOOL 884e9ef28e67c4f34f971e810d82115a5608a99a80b695dd27625862bea03c936d076d322065156cf73a01a05e8fc6a958b6d7800d464678d086395f5f2b84e5
 MISC metadata.xml 900 SHA256 145957b2e684c72aaa4fd6d2174e7ae66b2d8a36a49e144f6f99f3b9fa7fa811 SHA512 c3dec3e401bb1e27f37c81998079ed459adec357b6b044bcd08161d5a53ced18bf76d07d665c4f80bed1fe072b02ef84dc7a21316fee41f5c20ef893dfb93d09 WHIRLPOOL 05b7460e6f69943413caec2756b4e8054f9d884bf350027e5fbef56534279b25d6df937c94d8e96d5fb2ac01a109ef23d6d5359d48604f3f99fa7afdd83805e9

diff --git a/dev-libs/boost/boost-1.49.0-r1.ebuild b/dev-libs/boost/boost-1.49.0-r1.ebuild
index c6000b9..e714930 100644
--- a/dev-libs/boost/boost-1.49.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.49.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.49.0-r1.ebuild,v 1.6 2012/09/06 13:37:44 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.49.0-r1.ebuild,v 1.7 2012/09/23 12:28:19 ago Exp $
 
 EAPI="5"
 PYTHON_DEPEND="python? *"
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"
 
 LICENSE="Boost-1.0"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug doc +eselect icu mpi python static-libs test tools"
 
 RDEPEND="icu? ( >=dev-libs/icu-3.3 )

diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 7144f8a..f5e1fbe 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,6 +1,8 @@
 DIST gjs-1.30.1.tar.xz 455456 SHA256 f5db07ddf70458a33a5d0bdf83f84070fc234237ecb0d49a8676e67b52119a05 SHA512 59d63d279e34d6906b7bb9053110c1334f247ac10d61191b7950b57951f8048454a1745dba125a2f421b3d4f9939e87b507b2721f35bb2b4267f7f5decfc8383 WHIRLPOOL 120474a4c2d438e336e9558aace335bfbcf786da73f4876d47a88ad65d05dd4d9892dacc331f8084dc88a9c9bc6a2da092974469f24244b631a63e39e6248b5e
 DIST gjs-1.32.0.tar.xz 464372 SHA256 b9f1dc156c15806824c936bb08ddc5048f52f6921654146c47025a62457108c0 SHA512 58cbf0372a1f1494d10664c8d29c6ba02cebd23325b563cc83c2d63d34db141b91ed28efb5f31b08d43a52ddc2126e2a02fe85449891718d54350cab1eee8203 WHIRLPOOL e94bd8ec975f33f7d24dcbe27345a3b2b7208fa02e0d450c7e9865796b23f0bf8057b43d83889c6f6b9225738343ad85d51a98f1ca5967c5b2256956347fb677
-EBUILD gjs-1.30.1.ebuild 1452 SHA256 2e9b24ec5f9bb37332d06255c194eee8ffae54375fef42e74307ca49f8d67205 SHA512 c56cceb27f8dd9bc7245f46424d725b6bb535546a5c731a66cf54ee89fbd241c9354972728b95ee8f47468e92fd211defc8e2fcd462b39163b751cf6324db72c WHIRLPOOL e79677ac5cc8d7c11d55c1db37db9ce3c52996e899a4106eb5badd2a4c707520e16926ba22769b27e3dfa899e5f623142e0cbf0814a03667877767fe3446d790
-EBUILD gjs-1.32.0.ebuild 1549 SHA256 61ca1fb66f9b54520ae48d5bece979cf28fa738fadfa11a24666e49d44124bdb SHA512 b5ac128288cf65454b85e0dd79b68eab34424ae37f30af817207b00b32ef95c8adc04e4c86b675592b445bbf68b219e28822ad3a82a0b90be30f0f164830acf7 WHIRLPOOL c5e9df9015fd54e89689a15eb109998f7fc599d621e19a710d55478249dfbd0a88343df7ff779f34a4ceeae52edc804cec394869098898850c98ecd36a8f58e0
-MISC ChangeLog 1715 SHA256 7bebd22a887113daac64b37c557474166060a70cdfff2eb4db71e5b2bfd08c2a SHA512 1ba66e9c67e718c828023be9b516db72e6bb45414458757b70e43a9198067ebf01ee156d6bc0869cd2ecf452576d0bb9e3713a602917a7160d2f6b3ed200bef2 WHIRLPOOL d9b8444c29a25dbb0aa9e320ac3bede77b023c56b8386312619ed4bb5f2fb0d9abf608c4a52c6555e145a576ddda917886a3154c7e9d821403651dd67578ae30
+DIST gjs-1.34.0.tar.xz 474004 SHA256 3d62c717a0522a36c6faa1eb021872255e3cd285a72786afe23b7cca2e3084cb SHA512 938134f25f07e7cb9267f0f44944841d93143a3403cf002fc8393a342140b52b6540edfe90e5e0e1f10b40486914535ba6d57bb7c6e9f34ded11cde327293e1d WHIRLPOOL 53f11d800e69ea24b62b7f719118783fa0e397c807ee032baac3485031ae6627e20f7aa7b54fcc9cc850c0041e2b256fac5d076893d4ae5b784aa89b92508432
+EBUILD gjs-1.30.1.ebuild 1464 SHA256 d5848a804223f67f09e040ed2610bfe2e9de8d59b6efe6ea2ab92604d766da40 SHA512 4d359d09f81aeca8e8efe2e9d4a00e566f886bf5045d04579f88546549845fb4a800780f63768bd7da035ae06f9875de80edbfb157d30b2d3aa61d496b7a082b WHIRLPOOL 8ba3440b85da86f8e07333dbeab58bb0bb2d92f48e3d718d2d8dcfa77616dc49af1ebf7ed6d2f0b67fd7e44993bf3e604f19c4e3bb159f8647c3fdee62509d32
+EBUILD gjs-1.32.0.ebuild 1559 SHA256 ea07dce22c4b2ed6cf4e1f2ac8489713a51794f181e1ea13905e3eb03593f928 SHA512 95db7242b6547249eea314be649de613a46140158f013f6d3b00ac8ee53cb8e4ae27abdbd4588951d83a262d4c2ebda67026901408e8942dcf3545cc9c34fb31 WHIRLPOOL b139cf218ddbaa1f02995bea2f8b07440ddc876077328bf8d65a0c315a53f683d638fb417baa2bb3ce534ccdb5beb683deab504dc03814d515c20f3d1d9d9e4e
+EBUILD gjs-1.34.0.ebuild 1599 SHA256 90f54dc4d78311c981fe403cf2fa0218ddc00fff0623898fa46eab832f14c087 SHA512 08d271c297aff6c062b4f42c4a91ffb785ebcbb8236ca95302ba021f70b4ea058d3e7b3afdedd194d09aca94c9f2fd53d5fe733445b6f564c4213afb985d4512 WHIRLPOOL bba9d0c404787f67388c2159489a14387bd659a2040deb175d909e58a61b44c860880bc8698a8fc9343dd7549c334bebafcd6dc60e3090d7495f1e8238783e49
+MISC ChangeLog 1940 SHA256 9668d339327a80f892fd18fb4bcdaaa5b99216e18ffb213d77f50098b3576771 SHA512 3e0779e22c66b0a343aa687feabba46db28de5d73ad1f44c6970df2019df194fe0a9e1b1b17b4b1b2458e0ead62d80e102637fcacc49167d5346811da5c91389 WHIRLPOOL 8927f598a5074c2d378d61eb9c9907df4037c42f671aafc762f4bceb12a92e70b605f57d5b624a60c41f4aa8268a3c9a03e0a551cde2addae5b5bdd0f5b6f856
 MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83

diff --git a/dev-libs/gjs/gjs-1.30.1.ebuild b/dev-libs/gjs/gjs-1.30.1.ebuild
index bc1c62d..8b68b5a 100644
--- a/dev-libs/gjs/gjs-1.30.1.ebuild
+++ b/dev-libs/gjs/gjs-1.30.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/gjs-1.30.1.ebuild,v 1.2 2012/05/04 18:35:43 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/gjs-1.30.1.ebuild,v 1.3 2012/09/25 11:52:27 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ inherit gnome2 python virtualx
 DESCRIPTION="Javascript bindings for GNOME"
 HOMEPAGE="http://live.gnome.org/Gjs"
 
-LICENSE="MIT MPL-1.1 LGPL-2 GPL-2"
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="examples test"
 KEYWORDS="~amd64 ~x86"

diff --git a/dev-libs/gjs/gjs-1.32.0.ebuild b/dev-libs/gjs/gjs-1.32.0.ebuild
index 6f59962..d5effe0 100644
--- a/dev-libs/gjs/gjs-1.32.0.ebuild
+++ b/dev-libs/gjs/gjs-1.32.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/gjs-1.32.0.ebuild,v 1.4 2012/08/13 18:40:42 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/gjs-1.32.0.ebuild,v 1.5 2012/09/25 11:52:27 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ inherit gnome2 pax-utils python virtualx
 DESCRIPTION="Javascript bindings for GNOME"
 HOMEPAGE="http://live.gnome.org/Gjs"
 
-LICENSE="MIT MPL-1.1 LGPL-2 GPL-2"
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="examples test"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"

diff --git a/dev-libs/gjs/gjs-1.32.0.ebuild b/dev-libs/gjs/gjs-1.34.0.ebuild
similarity index 79%
copy from dev-libs/gjs/gjs-1.32.0.ebuild
copy to dev-libs/gjs/gjs-1.34.0.ebuild
index 6f59962..fb2fc04 100644
--- a/dev-libs/gjs/gjs-1.32.0.ebuild
+++ b/dev-libs/gjs/gjs-1.34.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/gjs-1.32.0.ebuild,v 1.4 2012/08/13 18:40:42 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/gjs-1.34.0.ebuild,v 1.1 2012/09/25 11:52:27 tetromino Exp $
 
-EAPI="5"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2"
@@ -12,18 +12,19 @@ inherit gnome2 pax-utils python virtualx
 DESCRIPTION="Javascript bindings for GNOME"
 HOMEPAGE="http://live.gnome.org/Gjs"
 
-LICENSE="MIT MPL-1.1 LGPL-2 GPL-2"
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="examples test"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 
-RDEPEND=">=dev-libs/glib-2.31:2
-	>=dev-libs/gobject-introspection-1.31.22
+RDEPEND=">=dev-libs/glib-2.32:2
+	>=dev-libs/gobject-introspection-1.33.10
 
 	dev-libs/dbus-glib
 	sys-libs/readline
 	x11-libs/cairo
-	>=dev-lang/spidermonkey-1.8.5:="
+	>=dev-lang/spidermonkey-1.8.5
+	virtual/libffi"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"
@@ -37,8 +38,8 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-systemtap
 		--disable-dtrace
-		--disable-coverage"
-
+		--disable-coverage
+		$(use_enable test tests)"
 	python_set_active_version 2
 	python_pkg_setup
 }

diff --git a/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.610.0.ebuild b/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.610.0.ebuild
new file mode 100644
index 0000000..d91d0af
--- /dev/null
+++ b/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.610.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.610.0.ebuild,v 1.1 2012/09/24 18:09:38 tove Exp $
+
+EAPI=4
+
+WX_GTK_VER="2.8"
+MODULE_AUTHOR=MDOOTSON
+MODULE_VERSION=0.61
+inherit wxwidgets perl-module
+
+DESCRIPTION="Building, finding and using wxWidgets binaries"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	|| (
+		x11-libs/wxGTK:2.9[X,tiff]
+		>=x11-libs/wxGTK-2.8.11.0:2.8[X,tiff]
+	)
+	>=virtual/perl-Module-Pluggable-3.1-r1
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-CBuilder-0.24
+	virtual/perl-Module-Build
+	test? (
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage
+	)
+"
+
+SRC_TEST="do"
+
+src_configure() {
+	myconf=( --wxWidgets-build=0 )
+	perl-module_src_configure
+}

diff --git a/dev-perl/Alien-wxWidgets/Manifest b/dev-perl/Alien-wxWidgets/Manifest
index ddad0d4..9bdd210 100644
--- a/dev-perl/Alien-wxWidgets/Manifest
+++ b/dev-perl/Alien-wxWidgets/Manifest
@@ -1,6 +1,8 @@
 DIST Alien-wxWidgets-0.59.tar.gz 662467 SHA256 2f813e3c752970d63c288586c4d032fb5fbce7b90a6c3e3418b83b17dd8e2e4c SHA512 149242b3664c7d436fa9da902bc05cd482a1c3b45cf0cebe3c8d4c2c09b00c8fbd05612496b5a4e0d57f41880b1f6ab213775862dcf28d1b75eadeb42583966f WHIRLPOOL 7196fba98873eaaf896a4164202ff0c7bb48cd48f62ef73034a72ec7ffadaecba04948582e899963a0118a09bf9f03984b7aff64893cbd9dc4afa73aaccedbd1
 DIST Alien-wxWidgets-0.60.tar.gz 666207 SHA256 282b283dbe989365cdb5c13dceaf6276949ac17603a9c7914e474fed9637dc1f SHA512 0abb8c01a445c440ebcff4a2a5eb2b4e2f8b20e679c7bbacb6dc97f878f21b8745320acf973922331212e4dc7ed103d1223adc121616ae94a6aa1dd950ae5534 WHIRLPOOL 41aa65671b6cfcd2812ab9faeae83294efe84f55da999052b49c6c6dab8dd7563406b74a1f5c9e4801b43a4e30853044218288a2bc1eb1d3b3b051e4f28f0e39
+DIST Alien-wxWidgets-0.61.tar.gz 666365 SHA256 d8cb146f3c100a4dd904fbe1259ba1fc8eee25a2c25926cc4460d40c273495c3 SHA512 5d83211ef9f13836e162bd1492af2928f3b4a9c2044b7432efe086ce99c8989c3038e126bd75adf19307f9ef4fd1382e5a0332b14f4d82155def3b17da68c75f WHIRLPOOL 0c5e1d3d850de9a164c3540c086a13e10427132d5ab2e17f57e7b3ce5fde34a7cb70c2fc56044bf7e55c573a3d27f3ecb82c9172de056f6f2112eec5c2a19587
 EBUILD Alien-wxWidgets-0.590.0.ebuild 738 SHA256 c71bd0221420aec7e5fda2ccb80d7bfff5fa31dc25dbee9f01816b3c68990af1 SHA512 7ccd6c61a442be945a7adbaffc6d18a325b17fb8ae3558d33d8a08e00c09d070661299f2f2da3435ef901698440c78d0a778cf5d8afd641ff1780f000ca3befb WHIRLPOOL ad011750fe1c80d0d6efa910d1a5b76988cad9b0db4f7174459e77b0fd2110fc6dfe608326a7cf3edb03f9ca383c2b760bc66d0d6b54a7a169f2f99f9fc9ecd6
 EBUILD Alien-wxWidgets-0.600.0.ebuild 743 SHA256 030a6443c94d090c2592bbdae6f708a06fcd76d7e00985b8d0e7b4508e1828e9 SHA512 bb162ee9209db0b73f3808b26f26e19121059eb9e36873ac64ec2708a2f59b0a25c552802e55123a5e2618211260045404cdeb1572bd82f3d51fe7e869b98bd0 WHIRLPOOL 55606b8a8cd612a24b513b809254342b2c4120d33e0f97ab75dee263cfd3cf039ee215a03cba16608a1c555ebb17d221a0e0a629a234c6a9d124981007a4b2f6
-MISC ChangeLog 6536 SHA256 93c66c553a80d112b9606543a24f29344c3e0a27ddaf83a922a2d66f58c7bb62 SHA512 18674d1bb8aef86c0de4ad674ea8ab2f598d8c46c09fd21a07cfb297c05f89a49e597cdaefe557cd0cf8b4efa3e27e3f85d63f33e874e0af2e0136b4657fc827 WHIRLPOOL 40fd549e22502fc84aa628871499abeacec60f39e21d88564cbf05d87d6ad28f02a59d688caf4ca1f60b5deed150217619c633e99663063238fe12601ceff5bd
+EBUILD Alien-wxWidgets-0.610.0.ebuild 821 SHA256 b8fa75e23eca6b93506da3bb8a1fd0fb00c8b5331fd4644f3fd9d78299e7b640 SHA512 8f37abbe7b2d304ffde790a656c432a18a3c979045438e9309a19a45ec87c347fb35412c008bd2d5e3232d12159353ebd701e4d4ba668d5fb0b1923bf76d5a88 WHIRLPOOL 5d21429a330529a3f52f70529972259fd399b26de3eeccb300ae7c283e5af5bca949991dfb757f92ceae1dfcbf14fa3d6b46663549b0da8b7f28ec79ed9bb0ca
+MISC ChangeLog 6675 SHA256 a232782ab7d723159f3406b99f76e26844749a3c858bf4cab76f6e0cb5f9f3a2 SHA512 59926b36f90e0c12eaf55740807479fdd67b53e6a40fa2570bb08a0e2a0840c59bf1333942dd1f6fd9c7fa959c7deeda610f631d0e6fcc9c1b489c8159002968 WHIRLPOOL 270ba9134308e4923c1a30a47ead9109513052afc95ff7cb9dc1c7719afbaccaa9e325d1ee412a7c9ef48cf935219dc6da30bee5953e556840149d82a3f4854c
 MISC metadata.xml 376 SHA256 7ff696a38937cfbe4e96b68e64ff9e35a7f9078c77a574b023b22d3dc1bdaffe SHA512 cbcb56be6b1ecd6398c4cdb68020125492ee45107c0f8670f906c479bf09122f319e5d742521d5a356f111a131fc13af0eb71b8b19bad531075dec7a8f9249f1 WHIRLPOOL 64251e95a543b363472be10d11c391ce359510faf795f688d810218257c0db9dd99d5b62fd51e1a09cb7bd12c6b8e7e578438161ea8a8d1b945af64d48978478

diff --git a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.500.0.ebuild b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.500.0.ebuild
new file mode 100644
index 0000000..7b879f6
--- /dev/null
+++ b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.500.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.500.0.ebuild,v 1.1 2012/09/24 17:53:43 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=DROLSKY
+MODULE_VERSION=1.50
+inherit perl-module
+
+DESCRIPTION="Time zone object base class and factory"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND="dev-perl/Class-Load
+	>=dev-perl/Params-Validate-0.72
+	>=dev-perl/Class-Singleton-1.03"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.31
+	test? ( >=virtual/perl-Test-Simple-0.92 )"
+
+SRC_TEST="do"

diff --git a/dev-perl/DateTime-TimeZone/Manifest b/dev-perl/DateTime-TimeZone/Manifest
index 9ae0d0f..c62bdd5 100644
--- a/dev-perl/DateTime-TimeZone/Manifest
+++ b/dev-perl/DateTime-TimeZone/Manifest
@@ -2,9 +2,11 @@ DIST DateTime-TimeZone-1.22.tar.gz 540883 SHA256 0c52fdcb2e84410007271701fac9f62
 DIST DateTime-TimeZone-1.46.tar.gz 384097 SHA256 dc5789385f5845554d7039c9241abbea3bd72f10b19c4618e60986a19cb25571 SHA512 345516411e0a35c69c4c5ad325da3e79c04ab5ca077e5e4a2e5d881577ae2cad45ebdcaa8a04eb2272fb816f2adeadd9aa84158ac440288e8bfb01ce52b7bc52 WHIRLPOOL ce934cda44d04b32bb5908564d0c024e05ae75de136945ba59d735bc63c93c2c672cf0d90e519e9694a5fc7f32042e510847ac43c933265a67a1490f0d4dfd31
 DIST DateTime-TimeZone-1.48.tar.gz 384084 SHA256 b9726d846f9dc50a03e27219705933de79fd6943bb5009b13c75d32d2bf6dc77 SHA512 b67b06e909d7922df4cc59bbe2876945f81dfd8e5be7141d6281a8ba9a6a751492b084fcbfc79e8404aaa2c717a329b5282ddf9f5007a790bdcbea63244203fd WHIRLPOOL b63db46b23590f05e709bbc187ae389d78a9e419b5892a43bb07ba3c91834153eedc5585102f5eb77c933ba1b4650cbf1493a664a94d717a44273c624e8bd1fc
 DIST DateTime-TimeZone-1.49.tar.gz 384843 SHA256 e0e7d0cad8da11ca6b4fa6c09fa3388cf8d133129c6125defc52a5818af1e70e SHA512 17798d6853094e7d6d9a0354456071e3cb549f3740915da63d44569383d0eaa2d8847ab24d6f84169b8dcd64e6645de0d2b11bab0ff097b6f1ccffa2d990745c WHIRLPOOL df5441f0d9767afd3cd93de92d5aa584602b4c457b6234ea68f1da9539102f2ed8fe9d3ac148cfbbcc039e6a0335d5ed6e714d000abf84bcea61798b88ee5617
+DIST DateTime-TimeZone-1.50.tar.gz 385925 SHA256 c4bfc42828336f1b39bad31ad5d3b9d8dd6caeb414b76894accfc7bcf58c37dd SHA512 483ea270a5ed7497e1d13fa2999a30e31d832b7323dbd5f6374ee8db49d65ef5081864d119ac377256db88ec5d5dd5cbb61c2a96459cf1380cf18e0c1e79a082 WHIRLPOOL 42d4a6d52133a417de22e3ff71d2355e4c18202b0d30e074bbce0e2841380f53e51aa8e0e7bc4bf19314bd658c2e7580b7abde370b375dd8877ed9f5ddb76f7f
 EBUILD DateTime-TimeZone-1.22.ebuild 783 SHA256 e421ae7d4c5d21fe51c66b476482c107086d573696c87f234a7063e4166b1e16 SHA512 ee337c4c06bea7462a46f87b7b957d1212a63e9eb60f8803e29df59ae677b04b97fc64f7a5d45f89881c6fc7f13fe5a03933482d430c2c93dd4273ad14be3fb0 WHIRLPOOL 0a0df9334b3a42a5f053b997fbff9c4274fdec177065c27243a327c47cdeec7cb416a54ec1c9ab1e729db385fe1bb3f194f752dd5a62c9b3657fd2a57ebd1d76
 EBUILD DateTime-TimeZone-1.460.0.ebuild 765 SHA256 209f588cb9b89d76aecb372129be88f504210c6d8b4478db43c18b9b8dc694dc SHA512 79bb2267ec41891876801829626d247b867287fb6a022eff6030ed3723cebfc8ed2b9853a62c7ef933322bcf6fc6629d608d7d567ff75076dfc08097ba3b1ffb WHIRLPOOL cb4d5cac1fb2c3da258d21afb3c068cc570db85e7753d41544374f0ba7e4b4b2d73f863aef95bc99c5a8c18dee34fc2962de5f4280475ddb7c702fa81f79c8e4
 EBUILD DateTime-TimeZone-1.480.0.ebuild 785 SHA256 315d27349bb817cae91a57633462fcc81b7cb8d91aaa8fc92e8705c6c5fce145 SHA512 371716cc6210d0648a14201bb29de7ecbfb78e2071dc36eba1be6ed5d5c5f948250c69b6a4f02c8f1d5ea6a208e5fa72cfa24b323963461c48b8a18020e6a1b2 WHIRLPOOL 2bffb7a02ea60654d7c55b2f16b0ba3152ff93119abbf119699beb8be02a4c6259ad57cb14e1bede7447361bea4b3dc89cc684c4806b69e59f1c054c6a58ba93
 EBUILD DateTime-TimeZone-1.490.0.ebuild 782 SHA256 78e5bfff8e978001df27709db94a2c2340d137afd8fc34c4e935e133cf41c83b SHA512 2a66c3fb8a4d9911da4efc22f8b41458e586e6f456a1c3b52caa3ac052b1d269954621b6ab86843b0668f2a7c3e354721549df4628460397ce5b6b7850eb7f3e WHIRLPOOL 4318ab32e317c163d0cb88d8c0f9e2ec60975025746849a4bd93aa59a317d977f8a67b81f84520320243a0bf240dc21ceb5e4955d6a28e174fc77406fb3db1f6
-MISC ChangeLog 28423 SHA256 fd2c0ee6bae25ce19b8784ec6bd01a7b71b5f1d4da8f4bc61f8a7fa9c25f56ae SHA512 e1a56f7c62218355e445df2f7204ef6416ef2c2287e6979478c178e6ba48d2a0e3e6ec67a054348bdd205c80a31c4444b33e14e3d1c93132a538d614a552ca80 WHIRLPOOL 1ca270cd5e8d42b6025dd7ded82065ae871093aae8fba29fa91a00318598de9136e5527a011d61c7cad50ff793995ac2d1dc5101f83d403dc29a48cec10656c8
+EBUILD DateTime-TimeZone-1.500.0.ebuild 780 SHA256 055d2e3ff55b149d9527f61ff22fa28f7a22f48c044f8d5c9f568fe0a1c9ce3f SHA512 0a6ca51a28b9bc93b39202718d23c1f42fb0e0fe8dd462599b9975b2cfef720cfe44ad3e5da34a0aefafbaec05bf8dc334f63d34ce9fd77a52dc54926c902c2a WHIRLPOOL 1094d6b1a7e654c171f25ee0bf8b5369f306340c4b1864f18d98d42e2f061021defa965d0ea5dec84a49595686cfa7c6d953c81021bda019ff27430030ed083e
+MISC ChangeLog 28566 SHA256 9beb7a2c6bcab5a8c43b2871d719ce112a71f6cd740e9825903b673dee10a70f SHA512 c2e4b9bf13a4554e90211fc2310b969595290a39d7c21b860b819ffd95cc6aec7bb7c015747f69a54cc4800f43d240e75bf8139090b576273d85928de55e9728 WHIRLPOOL e6afcee46cfa18ee0ca448be03f76d713a84a305b1a03e74852d3d383861b9c26b24fe83f1dd2df26fe10801c5adb7a4be508ef31c1838a4d63a4cc2e2e3682a
 MISC metadata.xml 35193 SHA256 8e17b6597114fa3ad8bd3d2ce31c61570a9fa5f4cefec990de11d36ad0444674 SHA512 9e58ae6e7c120563f041010eb17ed697d985a0d27d6aebbf92196270afb8e81ca882fc76a222b9629c5c70826f848195d166610eb8d8bd7482d9421c1e30ff1c WHIRLPOOL 0e9e4c08b3ccaefb38f5e7e648a748ae3f618b906cd8d1c5c3cbd7ab743fcc347d3ad5a15df2574156ecddfb64c83dc0b5e616d875b68035335c03ae0b826adf

diff --git a/dev-perl/Devel-NYTProf/Devel-NYTProf-4.90.0.ebuild b/dev-perl/Devel-NYTProf/Devel-NYTProf-4.90.0.ebuild
new file mode 100644
index 0000000..8183d67
--- /dev/null
+++ b/dev-perl/Devel-NYTProf/Devel-NYTProf-4.90.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Devel-NYTProf/Devel-NYTProf-4.90.0.ebuild,v 1.1 2012/09/24 17:55:48 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=TIMB
+MODULE_VERSION=4.09
+inherit perl-module
+
+DESCRIPTION="Powerful feature-rich perl source code profiler"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Getopt-Long
+	dev-perl/JSON-Any
+"
+#	virtual/perl-XSLoader
+DEPEND="${RDEPEND}
+	test? (
+		virtual/perl-Scalar-List-Utils
+		>=virtual/perl-Test-Simple-0.84
+	)
+"
+SRC_TEST="do"

diff --git a/dev-perl/Devel-NYTProf/Manifest b/dev-perl/Devel-NYTProf/Manifest
index 48fa316..a78f221 100644
--- a/dev-perl/Devel-NYTProf/Manifest
+++ b/dev-perl/Devel-NYTProf/Manifest
@@ -1,4 +1,6 @@
 DIST Devel-NYTProf-4.08.tar.gz 413566 SHA256 e3ddb5c1ec8c44fbdecaa1990a28d16ea8d58036fcedef99d9fc2a15e6a39867 SHA512 ab19711e4dd13624673544e1383768a40e0413e45e0bdbaf5710972bd7fb6b13481d324f26b1cf5d0adcfeeed0fa10f20cb5503cd77e62efe0dc14c8cb67c3a4 WHIRLPOOL fd9caed73dde334c114f8f971dcfb98a351e978ff56387cb6fa4c9219a06227b0a90ee7dd0860f1e09f3eecde489d8ad694022bf9bae443195f9002e84b75aab
+DIST Devel-NYTProf-4.09.tar.gz 413599 SHA256 9270afc427e03c6c604bceba9450dde484191342435e85849b784d53b3c3a153 SHA512 2840e28f600ea9d814f588e6fe5df0b5b08955c12e301b67b535eab4c50fa34a63f0da514bfed5c9feea71fa01614eeaf9781ad12baf2ae0a8b019bdda6798db WHIRLPOOL 9fd878c13a90894f8269481286502751fd42afbd387ec06d5333f3e047d486edfa1d7e02aa6f773e6bdf651df3e150db83998c1183b5b6263977dfdabf02d833
 EBUILD Devel-NYTProf-4.80.0.ebuild 604 SHA256 70f3c5c942550e5a63200b986ae14bf6bd161ac900e29d74f7ea2092eb9e09ee SHA512 b2c957a1638b8ee5333cc77cd732cccad20a73050d2d991aba0fafe23e38cfd78eabfc3e2b664af18fc12a603bb3dea6af724bb93e6b64f8ea4b42437c928022 WHIRLPOOL bf0da6d5692f0ffafcaa98c0b897b343e2bb3607ef3bf6ce0e6e01025de54f5906381bbca64e836eb2e8f5b9b77f5bf3f766578a56a8b74f3ba558a23f91511b
-MISC ChangeLog 3464 SHA256 f16ad54e31a829b2cc2d89c294b541800925d18d06dd64c97e4918b48c5607ad SHA512 26811e7366e5260a3dd4817b3220367e858fa1316acd130d7a97c92b35ae959a82a78d54c88271f1fa9c3965809853d453bee3f6b597a4d8aee0c50e70527ab9 WHIRLPOOL fe4f99f1eaa28fa4e0ae570c253cccf596be69c9aa3a375f859ea6b4454bd0429cc69e3b846e3c39fa2e37f00ad8807f87d53a9ebda6ac5e10f7d419eebdd983
+EBUILD Devel-NYTProf-4.90.0.ebuild 602 SHA256 7742e13c7212b30cae070c54d7ca521bd5f58bcca4bbd0e4577e5faff3961088 SHA512 60cc7d868c7b27c25b65e3db183080c1dfc6bd7beaff31a407c6b8e70aae6697bdb027d81699af94e381349f9269be51f9b2d2aec3c08a0c8323214f2fb8115f WHIRLPOOL f68280fa5e591c052d927c20f4ba7984dbba629759099e7840e2333451fc2054412b6c032f655343eedc7d9472d39d4fbf0e02cf91890eea21e0dedf3e1a20e0
+MISC ChangeLog 3595 SHA256 292b7885ded77479d48fbb3632ac9dc2e15c11fe55996b646456a73effdeb682 SHA512 e641b156a3533705076f8ce52413c6586ea3b8c559a1bf2c9c17c916d405e7829f3d4aa02fd71c2d3f4ded99ab795ebfad6848d24e9511e215b4930a1b0f3072 WHIRLPOOL 02da73c6c8ade5bbf0a40ab6a0de8eacd22e4a960ab4c89b61963ec681ce05b96d8a20af3c68b7c117df3de1bb730a0daed769122ab21039935a0048c83c00ab
 MISC metadata.xml 1064 SHA256 4eaee55ab0e0a9a5e888e4a1ee5d5c3d0c9ffe5bbac6eda4d9af4ddce5deb901 SHA512 fca7267ed728980784e2c4c88a2a5952b1348ace0188a94e91feedf02992867184bd346b8b1e35a6ef6f76470b0f43c881c765694f22354c41d26ce3b3b80c7d WHIRLPOOL 9574ccfc5f6167f5ddaa8d14805457749b385f54d0517e6455c0082dfe08a8f4d372ed5a9ae4d6685ee2362d0b46c59bca01fa39a16446699b322188b61f6bef

diff --git a/dev-perl/Inline/Inline-0.500.0.ebuild b/dev-perl/Inline/Inline-0.500.0.ebuild
index 661330a..294d2fc 100644
--- a/dev-perl/Inline/Inline-0.500.0.ebuild
+++ b/dev-perl/Inline/Inline-0.500.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Inline/Inline-0.500.0.ebuild,v 1.7 2012/06/17 13:53:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Inline/Inline-0.500.0.ebuild,v 1.8 2012/09/22 13:20:24 blueness Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Write Perl subroutines in other languages"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc s390 sh sparc x86"
 IUSE="test"
 
 RDEPEND="virtual/perl-Digest-MD5

diff --git a/dev-perl/Inline/Manifest b/dev-perl/Inline/Manifest
index b6835c5..3c6fd5d 100644
--- a/dev-perl/Inline/Manifest
+++ b/dev-perl/Inline/Manifest
@@ -6,6 +6,6 @@ DIST Inline-0.50.tar.gz 104632 SHA256 6263fa1145efe9e96bcd60d10f9eabd93313e00cb1
 EBUILD Inline-0.44-r1.ebuild 919 SHA256 10be653817c023fbf606be52482ec10bd4c57f1e4a7029b0b8286eb2c0522cdd SHA512 f9347bb92eaf6f6c5f89f98840575162fe6e860bff948ce39667a1c992bdd0a663ea351d8051b54f91cc3415033c1a98a0bdfc34e84f95ce9a128270aff5bad8 WHIRLPOOL 9480a51ea71e2a78513342b42bff646de8988f5cb2e65309d3b77e57714d981bc7488f56156a35a02e553043a40fffd8a586ffdab8069b764f43a0ecb8aed874
 EBUILD Inline-0.470.0.ebuild 567 SHA256 66d1db66377fcd2608dc6f52489a90199a8b483170b0826a91426cb54f391c7a SHA512 589cb4941608554a0402dbc57f211c8b270f31a644be0e9280effaa8f4026d994676d0d51d366c98e5067583454e8715b3dbdcea91691583f17ac1460b4e39e2 WHIRLPOOL 20f3dfc7b08193c013bbb215c2514ee6f92a51446e3ef048116c724612adb660231b782435e1ab53e42623eef154899a8d4a11cd3648b432dcfcf5e424df142b
 EBUILD Inline-0.480.0.ebuild 669 SHA256 8d36cdd7f5d94fbaafa02d4a43805c07bdda2b57442da022e8e1e0dfb1eba0c6 SHA512 6de7ad9a74bf02e1e8c7f24530d628732d2e6934534d72398819e09bd4968741bb1fd7f8d3efdd78375a9d4afa51f1a35783011db157255b657c73396ff4355a WHIRLPOOL 67e298713fd6ef58ec987c3f5460541897a8a85a604d1a52cae818c2b897d2dfbb3b95a3814a8aa6a8b8a5c28882485efddc0486c4655bdfd43e3b7c1404ce10
-EBUILD Inline-0.500.0.ebuild 658 SHA256 d60971181f4a94148d4f91a198e143543dd78e1841346e29c8b72286170f1106 SHA512 cbc8c6ebc260972ed7f5982742602603ed6995be4f2556ec780390be7e2af57e7cec9b34bfda3c6504c710f63e658458146576f5c51ecf86519bacf6f539d78a WHIRLPOOL 3a5340137c39b79259dfab61b1685244b030e2cd084b016e6a04d449095e77db58ee9da1c5b867636e6b404b437716c7c69dea127ba80d44a31809546bb76a20
-MISC ChangeLog 5692 SHA256 b9df86e604fc695a9d07add8ced1e33ecf09cf0be42cc7e066c4aebe996acbb5 SHA512 54d51db0cceaaabce79eed2da5ab26dac439c44c87a0d0a319985bb603c0c63d10d5ffb762b6cb8b67c27142dbf8bc32c80112af569bce258e554e4960deacf3 WHIRLPOOL d1dcc326c95e19dffbc6cb266ae823d7feb5e8c797f8a2c3513d9e4f0b7857a4008873352e2a693fe4d7249c9f186b9875e17923996467f166fbc0af3a28e4df
+EBUILD Inline-0.500.0.ebuild 664 SHA256 c0ee555156b212262e7600ad98dd49d3670cad5e6f7ce775db4d99b56ce51768 SHA512 325b9e35d8b1d3c7968c0ba280d602053b265100d400ab543eb501e5e42f658d02f323d5405ab75c93933eb72fd2c784576f42da366264eac88c6115fc632859 WHIRLPOOL bbf7ec9c0e4af4cce346d0c208eb43a5e82985f907b044e511f7eab3bf7404e7c750ac769508ff34790e1fa518c069520beb2f5c1194cfa90f22bae7e73656ba
+MISC ChangeLog 5805 SHA256 67c13ba85e7fa1a67be731cb958e3b50598fa1a3d1e094227c197fa6050cf997 SHA512 071da821e119db623b0b4e9f397d993caab02ff62f0d4fed463496f6fe8c55a6050c62a76138d70454aca099fa852fb3742cb3f827c009fe19143027126308c1 WHIRLPOOL 9a335b08fc484be9d089a3041ee0a0b218639ed8294bbfdc9ee0ca275a3dee3d36062d64fd85e064d4674370b60d1d9c525e7db64a763a0c19dd38c94c6884c9
 MISC metadata.xml 783 SHA256 454497f1806ac76e2e2093cbf4e000dd55fc44ef1ea1cc89e0618e6aa1e48fc5 SHA512 ea2440cd867d9bd02e970fa1e457b46c4744c56448f79f07b108daa999180acb3297229e97d5821c858fc87832fdd1fbe399d5dd6c860a6b3df5a491f4640095 WHIRLPOOL 72c7959ff4e3833efad502f5a865dc1fc4e5372631d70c74ed76a9673344685225bf179918a1c6800446a815813e7ac74bf74747da0725566db4336cedde4ac7

diff --git a/dev-perl/Moose/Manifest b/dev-perl/Moose/Manifest
index bbbedea..09dd0a6 100644
--- a/dev-perl/Moose/Manifest
+++ b/dev-perl/Moose/Manifest
@@ -1,8 +1,10 @@
 DIST Moose-1.24.tar.gz 470108 SHA256 787ecd308bd6c2565739d092f8cf28f849721b8d197b1ef8eed14bd443a53791 SHA512 f18490633feb24565c4a595b21723bf1d3b29ddb459509cf97cda96d969362b6a43876c11e14bb0f80c773330fe3d3088078ec6c079d1ee8399232c137c91008 WHIRLPOOL 158277011c20628102669321d4b798d0121242d11cade6fb2a98db1d811118e5607d02c61256c38b6247c4c7ea383ef39bb26601193fb4380b452a0fd35fbfff
 DIST Moose-2.0402.tar.gz 677553 SHA256 d033fa37b7c7451312fdd1b758511afe43b4bba10acce063aaf219dbd7008a6e SHA512 9f3bbadb0bb8ffbc701e457fc670e630217de7b83c2d241e879086a03ddf4a19a291b6b55160248eab2a2c74dc981920422978e0189938f540ea2db404277882 WHIRLPOOL 06ff2b7250fe8605999551f51196482ea3537df532fcb5c92d40bf1b36ac450c64808391192e88c2d2b52bdec219b725bdae3841bcce10fb7cfd9fc3601a2a03
 DIST Moose-2.0603.tar.gz 696979 SHA256 279738dc91407ccb8c02cb444c3ed0feb4d4525549bece4fdde6c2bae371c356 SHA512 2ea47abb9668887e7d9f8f73cf785170e2ecfad66542cd65188513728fffbe42e27b23d94b1f5101e0c72880947e078b900133ce5a06cf0bc691109631f463af WHIRLPOOL 9a02953eef8c206eb6aae81d11c6f0a2f3b455e8d6018e27413515345c520cf870f3861baac2143e1f0e396945d7326e3786c3b623af7327858338e8746b8d06
+DIST Moose-2.0604.tar.gz 696388 SHA256 121fa0032e3838faddfea63028458ff963fd527c63c6cea7a6c8f186169d9b5b SHA512 58ccb7e8e5065ae4b49c683295231e7e03fbee41ce18dfb68255b21087091c45227452acbb2eef61abfa94f661eaf888078cdc40a0640b96e9b7ab49d7d81cc3 WHIRLPOOL 995d955a17befed17a4dfe043e2c2239f17a2bf43e056863cd31615ea619e8e49ff71ba1044306dbab5277f1e782894386ef0f00f5e609838823d3c285e69795
 EBUILD Moose-1.240.ebuild 945 SHA256 481edc464dfbd4d305b70a283aa74875562d0ded772b31e82f860a0442ab408f SHA512 edc70160a9e955200690844c4d21b6747feb8a5f314452606690af8b434d878a241a3dbdfd5742aeb4633bc1e4ed743ec14acbadd40e4990e099d350ca657a38 WHIRLPOOL 88827f8321cc920e734c1d582f9aa547c71d81b3f26732e0f90d2b5f040aa865204871ae7cfccf839bfd11a20eed2eb7b283bb8e8918dbb1c35a073b6a7c492f
 EBUILD Moose-2.40.200.ebuild 2980 SHA256 80acb488a927ec656c11608aacca65add15e1c061adf3eccadb442faa48d7417 SHA512 bc63f583b1e6bac5761d5606c877f1c356db903a176a666cf9d5b1fbf8fb0358dba86bafb7caac3a85849fbbb86496068687b0ac715638fb00e22ee6c66d23b3 WHIRLPOOL ea325484dd9ba61149b03b1762d1f5949ccf967347f9ffe69f0522182a095b35d833606a19b8ef5f4396bdde47c1477f21169f62c022e8b2ab768328916e8059
 EBUILD Moose-2.60.300.ebuild 3078 SHA256 fc27f1cc39ede02b3f587e8b59c11b2d0e21c894b36c389e2d0e558eaf65d4b3 SHA512 3b5bd5a77572c3cdd8f98d18fdf4abcc5b95029050727e527493bf87957c2deb64c497caf98d50a7e648cbdf31c11ff2962ca092f93b7578112837fe7acbeeee WHIRLPOOL 6d5756db5dd1e1163f027d5f690f9210267d79e8a9f88f10a8d7067d6b1d70ff43f4d637f90e764f44b7be7360df2a9d296a00ba82a9d5474eddf36266a26613
-MISC ChangeLog 12416 SHA256 688e58a7ba1e16fd859adafd3e49d70047b1284615434cb7d1906b4d2b51504f SHA512 a8b43890854a6fc8ca6deddbc090ca23605a5955bca5811c2b1b0b5402eb889c17274f0771a25829350cade19855531285fea28a85e25656702bd910afd54ee9 WHIRLPOOL 54702786532f6c6d7b093584f49b66a71709d91fd2fa1a04f5c2ee67ab68a2855771cec8104d47479f345d37236521f9cd3a73be7a2623ca67f69a9fd72e4fb1
+EBUILD Moose-2.60.400.ebuild 3079 SHA256 68220bae0426b9b520654dd53f8102d5048ab6bbcc648902668ed8d2c8bfd386 SHA512 ef0110d9a8ea710a04c8947b0cd34c98b85905d94300864aa62dd29ec7fcc77a074fd7028f4aa5c74db622b236ac43654af6c49896a1787bf4385749d67c917e WHIRLPOOL e3a44b66d1a40abe791d715c1f8c5e7ad1f17c43d4a389445da103861078ad36b29984d9e553c0bf8fae05265f693bb26bd249c4d1d15a2bc8c1d0692bbb0768
+MISC ChangeLog 12535 SHA256 a30e9a413c3195b60911e3d0e99ed46cd2a488c736f18c300adfe9d331269eda SHA512 5d282f15718f146e8a4f7aeb1644bee0be801c51d144fc2c0a764d4eb0915ce4c3fd2284dcccbf082e84d559029366a4826f35089d37d913d615c1a2e0ec5b0c WHIRLPOOL 2ade62fe2637dd22e02006268be3d071703825216a8893dacfbc885f1095dcb7ca209f5dde42bc281207fab8efbff19e761626c7ca068be8f79ac208b7840d28
 MISC metadata.xml 6552 SHA256 0b5fd9152322d033c663acf9478521d07e7f7955cc22d3dea6f1f302abed875f SHA512 21e68e88c32c27d108db0b32ca9a0c55f2b5efd4bf0811d73babd533950a879bf254e4f01f279949936bf2449d918e4806fe6d79205b8c5d7e2f93848d2c7f1f WHIRLPOOL c3e028254f3de2a52bec02a3d43ce24c10cc1479121c3bd2054ac9a0ae23d3981cc07c8f9d4e5001403fa1be4cf96ff30215083a7311d669eb424c594697dd95

diff --git a/dev-perl/Moose/Moose-2.60.400.ebuild b/dev-perl/Moose/Moose-2.60.400.ebuild
new file mode 100644
index 0000000..75e4584
--- /dev/null
+++ b/dev-perl/Moose/Moose-2.60.400.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Moose/Moose-2.60.400.ebuild,v 1.1 2012/09/23 12:34:08 tove Exp $
+
+EAPI="5"
+
+MODULE_AUTHOR=DOY
+MODULE_VERSION=2.0604
+inherit perl-module
+
+DESCRIPTION="A postmodern object system for Perl 5"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x64-macos"
+IUSE="test"
+
+CONFLICTS="
+	!<=dev-perl/Catalyst-5.800.280
+	!<=dev-perl/Devel-REPL-1.003008
+	!<=dev-perl/Fey-0.360
+	!<=dev-perl/Fey-ORM-0.420
+	!<=dev-perl/File-ChangeNotify-0.150
+	!<=dev-perl/KiokuDB-0.510.0
+	!<=dev-perl/Markdent-0.160
+	!<=dev-perl/Mason-2.180.0
+	!<=dev-perl/MooseX-ABC-0.50.0
+	!<=dev-perl/MooseX-Aliases-0.80
+	!<=dev-perl/MooseX-AlwaysCoerce-0.130.0
+	!<=dev-perl/MooseX-Attribute-Deflator-2.1.7
+	!<=dev-perl/MooseX-Attribute-Dependent-1.1.0
+	!<=dev-perl/MooseX-Attribute-Prototype-0.100
+	!<=dev-perl/MooseX-AttributeHelpers-0.22
+	!<=dev-perl/MooseX-AttributeIndexes-1.0.0
+	!<=dev-perl/MooseX-AttributeInflate-0.20
+	!<=dev-perl/MooseX-CascadeClearing-0.30.0
+	!<=dev-perl/MooseX-ClassAttribute-0.250.0
+	!<=dev-perl/MooseX-Meta-Attribute-Index-0.40.0
+	!<=dev-perl/MooseX-Meta-Attribute-Lvalue-0.50.0
+	!<=dev-perl/MooseX-Constructor-AllErrors-0.12
+	!<=dev-perl/MooseX-FollowPBP-0.20
+	!<=dev-perl/MooseX-HasDefaults-0.20
+	!<=dev-perl/MooseX-InstanceTracking-0.40
+	!<=dev-perl/MooseX-LazyRequire-0.60.0
+	!<=dev-perl/MooseX-NonMoose-0.170.0
+	!<=dev-perl/MooseX-POE-0.214.0
+	!<=dev-perl/MooseX-Params-Validate-0.50
+	!<=dev-perl/MooseX-PrivateSetters-0.30.0
+	!<=dev-perl/MooseX-Role-Cmd-0.60
+	!<=dev-perl/MooseX-Role-Parameterized-0.230.0
+	!<=dev-perl/MooseX-Role-WithOverloading-0.070
+	!<=dev-perl/MooseX-Scaffold-0.50.0
+	!<=dev-perl/MooseX-SemiAffordanceAccessor-0.50
+	!<=dev-perl/MooseX-SetOnce-0.100.472
+	!<=dev-perl/MooseX-Singleton-0.250
+	!<=dev-perl/MooseX-StrictConstructor-0.120
+	!<=dev-perl/MooseX-Types-Parameterizable-0.50.0
+	!<=dev-perl/MooseX-Types-Signal-1.101930
+	!<=dev-perl/MooseX-Types-0.190
+	!<=dev-perl/MooseX-UndefTolerant-0.110.0
+	!<=dev-perl/PRANG-0.140.0
+	!<=dev-perl/Pod-Elemental-0.93.280
+	!<=dev-perl/Reaction-0.2.3
+	!<=dev-perl/Test-Able-0.100.0
+	!<=dev-perl/namespace-autoclean-0.08
+"
+
+RDEPEND="
+	${CONFLICTS}
+	!dev-perl/Class-MOP
+	>=dev-perl/Class-Load-0.90.0
+	>=dev-perl/Class-Load-XS-0.10.0
+	>=dev-perl/Dist-CheckConflicts-0.20
+	>=dev-perl/Data-OptList-0.107.0
+	dev-perl/Devel-GlobalDestruction
+	>=dev-perl/Eval-Closure-0.40.0
+	>=dev-perl/List-MoreUtils-0.280.0
+	>=dev-perl/MRO-Compat-0.05
+	>=dev-perl/Package-DeprecationManager-0.110.0
+	>=dev-perl/Package-Stash-0.320.0
+	>=dev-perl/Package-Stash-XS-0.240.0
+	>=dev-perl/Params-Util-1
+	>=virtual/perl-Scalar-List-Utils-1.19
+	>=dev-perl/Sub-Exporter-0.980
+	>=dev-perl/Sub-Name-0.05
+	>=dev-perl/Try-Tiny-0.20
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.56
+	test? (
+		dev-perl/PadWalker
+		dev-perl/Test-Fatal
+		>=virtual/perl-Test-Simple-0.88
+		dev-perl/Test-Requires
+		>=dev-perl/Test-Output-0.09
+		>=dev-perl/Test-Warn-0.11
+		dev-perl/Test-Deep
+		dev-perl/Module-Refresh
+	)"
+
+SRC_TEST=do

diff --git a/dev-perl/Parse-RecDescent/Manifest b/dev-perl/Parse-RecDescent/Manifest
index 59b92ac..7a8d17b 100644
--- a/dev-perl/Parse-RecDescent/Manifest
+++ b/dev-perl/Parse-RecDescent/Manifest
@@ -1,6 +1,6 @@
 DIST Parse-RecDescent-1.965001.tar.gz 154813 SHA256 00fa63039b062452d675712e58f0311d7323377af3cdd0fdccb1ecfe64b68d64 SHA512 630215cc3a4b424688fe8ff63d3b671eaeb091d6a5e4aad39444163c98b8c39acd05202b0d59487a63e0ad6b6986a8a7e9394a1b171fcecd3f0d3e6b5dd1b56b WHIRLPOOL 3e1e442d8ab29d5ca13cb01d0b712fc2daa48487a6c8f5992b2f12a04d5164c3f79f8170766cc9a30ea8d78f8f1a576f6fcdecf228a0ad6c2c2e51535890bbfb
 DIST Parse-RecDescent-1.967009.tar.gz 170858 SHA256 e1000f0b82256269fb8daa43aab166a7832fc18b4689af7c8d6d1a49fe75c687 SHA512 8423f4c61770ec77b67c656755dd952fb01b739405fe0586d502d9698f8b18e401ca7f40e7e88208af4a15c0f7d45c4ecf5f20032014cf650351763516515cae WHIRLPOOL 91af978877642f54bf4e8464343a79892242a49859df78c3f11962ca2e09eafcc69cbd2e935a5220e1552fa90907d0b02a866d4cfa3b4339ac16afb74a95d45e
 EBUILD Parse-RecDescent-1.965.1.ebuild 759 SHA256 7c5904bf1287fa4d0125ad8b34302494b23348fddb49f7f4bcd2480dfb2f6807 SHA512 3b215bd00969b28d3378e6ab2ca790bad9c493a25ffeaf9872243f91f507db57a554fe45999864b46d90540f74cf3aada7271693df7be59a801500bffba3a968 WHIRLPOOL 45f8f486f884418692b902529abb902b50ed545706ed7cc82147479069402bc63cacdc427c4a8356dd8cac69f115df31f4a5f201ffe35e533dba00ca0f3729f8
-EBUILD Parse-RecDescent-1.967.9.ebuild 812 SHA256 308a9d63a20cad54b337db8b54b6c4a8a6b3ceec806cfb6a94fd468b4ebaa234 SHA512 db5fd4de322d17702401c637e1fbf23e51c2834359ba4f8f6293ec2c7f22a5c38597fe2344f3eec97a4bf3b501d16d969bce5643dfb6eea32244a46d598225b8 WHIRLPOOL 5520278b97cae68e1aaaea3ec72c03848a06fd6ffdd76ef9e53e7cf830d24be36bc27532a78318e34fb75b8033a940e275cc064e677f2c49771ecaefdbc5eefe
-MISC ChangeLog 6701 SHA256 e49903749242c128871b16e3b3dd9888b4be584c5bfb4f749571f140f94b4452 SHA512 dec4bc4e62a580ceab3fe1a0a042ec997fd2ba8a10f29b04cd7d7f4e2c3f00984980aa08a7e6800c7b3c35e4ae827ff89e1ae41c114004a4326a1bc02e8a5909 WHIRLPOOL 6af172fda769cb9af2384e8358652b11e66632b81e959eba68f0bf3c6a18bcbadf48db7dcf0addb64a537d07d95f0b97ef00a4dbcaffbb90a718f0719695fc30
+EBUILD Parse-RecDescent-1.967.9.ebuild 820 SHA256 f04f48ae14c99dc9ae61c6f088e9171eea530436cf185f2113407809bfeb7cdd SHA512 26ea8e16e4e25548eb5994cbd75c8f5b035d8ce1b7bc5b821ec4555f3899d788882f7e21d63d3d11147c5008deaba5a332d788132c2eac74d5e6889d980817ab WHIRLPOOL f85e79e5e23ba19a704fb387908e27d12e7760742d22c34f473ea87afbd2ebf48bba1c549d3a15ec0508757b49099573cd38d9a206fee555d6abbcf66e3b0614
+MISC ChangeLog 6823 SHA256 51bfde5075e0dea9f51085e54b09dce452becdfc657e853f85f994b3c2edf3d3 SHA512 2fa5c9562cd213bc3c0100d041270e2d9653cfef08bec90898258ad5cd2068665874913f97fde48f009b67f20fd43a1fad4540ea11923eb1e7f966abafffa099 WHIRLPOOL e3f9a04f41bb9f4814a8f62aab44d5b7a0779b530320a1f313312614573edfacd6d285a07ea751cf08a0d8476932b4232a579872ddfb5bb8a665295dfc800e8c
 MISC metadata.xml 1571 SHA256 16e4f654cbe1642a59d68cdea0faf00cc0b5d4b1532b7dce743c9c4543b715a1 SHA512 749b15fba0ce4d837f76fb38683715b870b40c42b961fe9cf44b4285189c0fd227817d875ad65f131896adffa055d012ec52eecde647efca2af83252aa664b8c WHIRLPOOL d91903baa2320e9fcf8cca662b043d90fc1f0c7fe8eb71af6be32e26b96312391df282536159c7e27496bf465ee23b8a186de241458bff20ea2ccfd8ed98e859

diff --git a/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.9.ebuild b/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.9.ebuild
index 47c5b0e..9c1ecb1 100644
--- a/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.9.ebuild
+++ b/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.9.ebuild,v 1.4 2012/09/01 11:48:32 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.9.ebuild,v 1.5 2012/09/22 13:25:49 blueness Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Parse::RecDescent - generate recursive-descent parsers"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="

diff --git a/dev-perl/Plack/Manifest b/dev-perl/Plack/Manifest
index 1306b0d..6cd90fe 100644
--- a/dev-perl/Plack/Manifest
+++ b/dev-perl/Plack/Manifest
@@ -1,8 +1,10 @@
 DIST Plack-0.9989.tar.gz 235848 SHA256 d9d3d1d1a23636864851f290bc0a926ed54524dd793527432f0197abd5932b38 SHA512 aebe3ff5b63df78960d1e341d5544656215b70b641310155963b470d525d903b3feb8aacb9ff575a181d952e30521890df9b10a08ef5e4edc76f26543710540a WHIRLPOOL 893a8b0938a1d86c6cbcb32920533a9f6d298d74efc3064e74ecdbe28587593ba78d230562d41f56e3825d5aaa885c6d7b6161bb7c68ba45c42c6a7949831d69
 DIST Plack-1.0001.tar.gz 235400 SHA256 dc7415b51c51d0525da346c4b00d3c52aaa0b656b91a62e305c380e43732db03 SHA512 297ebd555d06ff78cd2cb00ccc858329152faae41563e22a65d33f70aa60e67c516f49a92713da15cbd5acf4c42a9cfe5a635b7ce598b8d684f14b0882f5e895 WHIRLPOOL 475d55ca87542d0ff10b046f6a64d6b1833a20ac478323d4bc1021e129c616c68a69406e6813156e8775a39e7edd1c62e615dc00745d1daa93292a9e264b6307
 DIST Plack-1.0003.tar.gz 236391 SHA256 68151b3371bd1a19f7e8e6c67a9b6e88e2a5e9eb64bd2d0af7d0cb7103b07d99 SHA512 20e419868ff63874c264ca5b291786d6a0872e6c3f581adff912e1d1f757d7ae02c1d8b377608b46ca3e7ed140ed5d21bbfcfeca31fff9496d9e295f11c0c97a WHIRLPOOL bc741d6517f67c2cccad44970755363096d570804de58c50e3ba3924309cc9f5036f017ee9247d02d1ab2997e3bff0008a216f0d25df340afae35651227fb2e1
+DIST Plack-1.0004.tar.gz 237026 SHA256 ceb44cad54f7040527236cc1197ee54e1580d3a6caa2c705c093f70e1491d587 SHA512 344ff33d5641c393ada07d78d052e2f2537c1f7bfd46338dabe513d3c0d7ababe4123b378965a3c9efb18e47f1179a861f525e6f96903a5064b08a9565b3b238 WHIRLPOOL 479bdbfc9ce31ea026402ce8abd8a4183a91e3654966e0fc9031acef991a559da0b1ebcdd4d2f0ca6b49f643508e3d4f5213bad759b9bb46d5432bb3cd94822f
 EBUILD Plack-0.998.900.ebuild 853 SHA256 c4dd7eff5a76d74a8fe5884e8bf6dff0fbdbf9019ff167470ae2b0705c703ce4 SHA512 30fa9951f2b6034950ea511dcc02f221d1c1bb2ab86e46af3647a9655fd0ed70b10ca23ee37380bdf2c5a337e75852db44b1c4f4fd70dd8eb67237951fe42d41 WHIRLPOOL 2c4d0d964d37af24833d890fae63ac231d1334f3c72b6fbad716216eb907433ee340065de44e55c7a7444b87c530282d4658448311a999c69a63eb6788346f9f
 EBUILD Plack-1.0.100.ebuild 851 SHA256 d26ed817f145e5c6b2792e1f3d45d94a5b018cb43ee59e3849bee643559c26da SHA512 218811e69f133a21de924d098a8d1caeb5dc8c007a41a4aa17093850c24b2c8d602a1f57d2fafc2a9afea299d14e0faee0a335d46e3e4077dcd390f4e7c31fb0 WHIRLPOOL 8fa3197fb3e1a5530245347432b6d47431ece79e31446b88109a9d9705e566439709face537ce1c79d2925e3f9dae17ad9ecc29401905efb1615444293912a80
 EBUILD Plack-1.0.300.ebuild 851 SHA256 b323345feb86e450e6eb41520d5db965b57b22810d6530f1c13296420148ca26 SHA512 fd4e0240f08e7f91252c7e19408d660a5feb340202f75c3ff7fba8ee47e5fff5d3e02d0bc657b02d0e662037e29f5932cb9a90631cbd23708f2ec20e82f1c736 WHIRLPOOL 2d1ed69a5e1cb7fc7ad0d3ed9799909bb6ca6c9f8d785e6b841ebb3c3e288d69fe147cf997cbffac26b0beea5803e0a1f7e3ee9c8ba8841f5cac4a464b6ff740
-MISC ChangeLog 5753 SHA256 51e82f1324ce506161893309648576c8370c69c04a949d4b9ea1d72180d10e77 SHA512 ef75bc1754e52b3751cadaead4032272f1553fe66913cfd76c57c1512b0467fa2aa4756730f42553f7b076a7a78c70514c6c3c303e9187f6b43edb7deee4a17a WHIRLPOOL fcaa925f21c02d076a0451810cee6cb9892ffbe409d0e7582444d49dbd38ccc23ab6e082116eebf954693258a6e52b6dde81cadb0ee9b75ed9d8c08b426ea240
+EBUILD Plack-1.0.400.ebuild 851 SHA256 8eb4ab9a2904f822c956f3aae89a8d0608f773ff73a428577dcf92384290f084 SHA512 584ab5b4d0785f3e6d46fd65f6135858b42dfefb4f0ef368e3ff97d4c639b4a3b286e10ca386f50301a588fef44b22365d58cfe22be62a797398912d3c5824af WHIRLPOOL 7672e5b002d2660195f6366d722e370bb8faf1fb426930462eea00da5b836e69265464db1aa02eeedb7781baa3dbf150394d46862ec0739bf1a9494a5075f56c
+MISC ChangeLog 5871 SHA256 fc91d39c27919dd76943bda6f75395a493e92625474c141b5ab854595449b226 SHA512 c8f20e9e7bedde4b559f22271923e44805aa54030576e05d6548a804883c8d00baf0c02aa836adbb548d44026b95f078910d50161373961e2bd2e47419c035ed WHIRLPOOL efd59aa1eba3524e50c23923993bf802bf9a94c88c860e9c9f74afb055ae814f043313bb8864d1ecf1b86888f252c58aa6439df44576f275c8ced56687ac2fcb
 MISC metadata.xml 5785 SHA256 d5ed86ab3030cb8d32159724d6600e89845fa04fd8c199b91587c24e338f079b SHA512 a7ce41882d170b18c28d07519b9ff88657930ed4ab8704cc0d6383697d15653af507e3b1cc2f619e9f22cc3240a7a83a0ab0c0b7587327512ef497d66a30266d WHIRLPOOL dc67de98f78b280e5aa21e652c8f5a73c94116251e098031e44520c510a58b5d5c3745ad41c4a56a6effa42f4b4dad5211519a54cd6ff2a92097fdc4220f7452

diff --git a/dev-perl/Plack/Plack-1.0.400.ebuild b/dev-perl/Plack/Plack-1.0.400.ebuild
new file mode 100644
index 0000000..82199dc
--- /dev/null
+++ b/dev-perl/Plack/Plack-1.0.400.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Plack/Plack-1.0.400.ebuild,v 1.1 2012/09/23 12:24:58 tove Exp $
+
+EAPI="5"
+
+MODULE_AUTHOR=MIYAGAWA
+MODULE_VERSION=1.0004
+inherit perl-module
+
+DESCRIPTION="PSGI toolkit and servers"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/libwww-perl-5.814.0
+	>=dev-perl/URI-1.590.0
+	virtual/perl-PodParser
+	>=dev-perl/File-ShareDir-1.0.0
+	dev-perl/Try-Tiny
+	virtual/perl-parent
+	>=dev-perl/Devel-StackTrace-1.230.0
+	>=dev-perl/Devel-StackTrace-AsHTML-0.110.0
+	dev-perl/Filesys-Notify-Simple
+	>=dev-perl/Hash-MultiValue-0.50.0
+	>=dev-perl/HTTP-Body-1.60.0
+	>=dev-perl/Test-TCP-0.110.0
+"
+DEPEND="${RDEPEND}
+	test? (
+		>=virtual/perl-Test-Simple-0.88
+		dev-perl/Test-Requires
+	)"
+
+SRC_TEST=do

diff --git a/dev-perl/SQL-Translator/Manifest b/dev-perl/SQL-Translator/Manifest
index 98baa98..da9c667 100644
--- a/dev-perl/SQL-Translator/Manifest
+++ b/dev-perl/SQL-Translator/Manifest
@@ -1,4 +1,6 @@
 DIST SQL-Translator-0.11012.tar.gz 418455 SHA256 b22bbcf1f83d2ffbdebed635a113764be8fbff16f7dd8e658d838316588be05f SHA512 b0e6dd8ce81fda3575b123a8ddd393220e7e44601bf19e5bb843e87d553eec052697d3c2cb2a082e2d6aaddc5927d6c763c1ace3c60e8d7fa5cff5da8f3d4d9f WHIRLPOOL 68248c90462754bcb43b4ced7ba7870e3312abcacf34a23f1f9a0c332bf9e84723c5c970f682928036508ed7bc69c3f5f4bb9518c2a6fc1fdb658715046f7036
+DIST SQL-Translator-0.11013.tar.gz 418436 SHA256 69d5fb657a341503756a49e6ed184dc75d86c03dde6baee3ac0550c1eddf3663 SHA512 529b9c57168945e55b4c87f93c7f0073a9c4435a1124b31e6a1b7cffabaeffaa69701ea690fb103bfb2606f5f2cf82551eef2fedb76c30301e9c76110c6df53b WHIRLPOOL 45d2d41791b526b71777a3d544a872798d60588a939736473e5f7ae25eb3eaeec3560e73a5d1e71cea3b462f0714ee9de36a55419427c4c356f1adcfec7a299c
 EBUILD SQL-Translator-0.110.120.ebuild 1073 SHA256 a4867d5e76ca2a34ff8e67cbe6cfc6600662568102ba85e3eb80258213ad56b3 SHA512 65ba252d345f4dfd3b98ae44383d780c14bc22eee8f1175d3f16a848a636ae300f88989b42deca321a892c97143e859a3cde5ce442a3380e8ed93a9b61ddf279 WHIRLPOOL 1cc9524e19c931227bcee465e94da20d6cfb62c70e7814b7c0a542a8e59c3e72bb218afb4d8a3c4d8c14805080a37305de1d7c450c52efaba00aa9919affb8ec
-MISC ChangeLog 3940 SHA256 92c948753f2a1b518b68f3e8f7da1f08549e51c1d8acb0f361da26b107d5cf32 SHA512 ffeb62c6788792c3d4015f3bb2edbcc75c0e323821089a42c4e4d6f7be8a27b514b29eae8b9be4448b0e767550d233f695a27e6cead58622ca3440237445d218 WHIRLPOOL 4395d55c6d4106a082e5fc1cfcdbdaa8777fe352a7a496af78e9c7b33b574cc8845e9c3f1f05f5ceb7e84ee76bae2cb4db1011e58e9c02af4109aca8e76c5ac3
+EBUILD SQL-Translator-0.110.130.ebuild 1070 SHA256 5d286ad0331eafbaae58795053769f97ea0c2b2cdf1dc4d505977377bd7fbd78 SHA512 066a2df3804ad1df623142925618d66aaf411618fa113c6f8e884d3fb439b5034cd09e62e00c311d0b00db3e9617dff082f41b48cfb0703718fdc717d51603e3 WHIRLPOOL 2416a0d8d2ca4b3874484961f82f588a0ea58131958bb8ec64030d7b39f44d91f3a5bd9373349e7799eb6ca96e16e772f47ef00c90830fdbb3d74203faba0f4c
+MISC ChangeLog 4078 SHA256 da82082df4686850cda80150eddf0bd14ee36c612f165189379d4c720d0f91d1 SHA512 eb62742ede8aaecc274d7feb7d8c5cf85a428bfbee14399cc8a30bab0418a4ec8a1e1c653eb3a893916b6ff9ddfd10bdbd919e07667baad6203c1d3218fcd561 WHIRLPOOL fb3e6803df6d644871100de4eabca9073c0630772f82c436d6104534415f9f0215d628021da0f864a4018f9e34bca9d8ec74619f0eb2ed051f81ee0458491aa5
 MISC metadata.xml 5885 SHA256 d2ba945fc00740fc8308dc7d3c88741e7948698bd8cb37bd9520a474cecd6477 SHA512 35f48caa0cebb347efb2e9480d1b139798818ceea02836e078f26ce36a9793558f25993448d9308d3f9e16704042ed13a5ee14074f15ca7f89c4d9bb41bd3273 WHIRLPOOL e2b0998db39f362b492d330e26040808e814ba85cca8e347f837ebd240a74015b878ef84af55d1f46aa15639bc4cb0884fc071ab233679ae85022871f3e62209

diff --git a/dev-perl/SQL-Translator/SQL-Translator-0.110.130.ebuild b/dev-perl/SQL-Translator/SQL-Translator-0.110.130.ebuild
new file mode 100644
index 0000000..9a1787b
--- /dev/null
+++ b/dev-perl/SQL-Translator/SQL-Translator-0.110.130.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/SQL-Translator/SQL-Translator-0.110.130.ebuild,v 1.1 2012/09/23 13:58:47 tove Exp $
+
+EAPI="5"
+
+MODULE_AUTHOR=FREW
+MODULE_VERSION=${PV:2:6}
+MODULE_VERSION=${PV:0:1}.${MODULE_VERSION/.}
+inherit perl-module
+
+DESCRIPTION="Convert RDBMS SQL CREATE syntax"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~ppc-aix ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/yaml-0.68
+	>=dev-perl/IO-stringy-2.110
+	dev-perl/Class-Base
+	>=dev-perl/Digest-SHA1-2.12
+	dev-perl/Class-Accessor
+	>=dev-perl/Parse-RecDescent-1.967.9
+	>=dev-perl/File-ShareDir-1.00
+	dev-perl/Class-MakeMethods
+	>=dev-perl/XML-Writer-0.606
+	dev-perl/Carp-Clan
+	dev-perl/Class-Data-Inheritable
+	dev-perl/DBI
+	dev-perl/Moo
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-perl/HTML-Parser
+		>=dev-perl/XML-LibXML-1.69
+		dev-perl/Spreadsheet-ParseExcel
+		>=dev-perl/Template-Toolkit-2.2
+		dev-perl/Test-Exception
+		dev-perl/Test-Differences
+		dev-perl/Test-Pod
+	)
+"
+
+SRC_TEST=do

diff --git a/dev-perl/Sysadm-Install/Manifest b/dev-perl/Sysadm-Install/Manifest
index a39ba42..79281de 100644
--- a/dev-perl/Sysadm-Install/Manifest
+++ b/dev-perl/Sysadm-Install/Manifest
@@ -1,4 +1,6 @@
 DIST Sysadm-Install-0.39.tar.gz 28076 SHA256 536daff2f82f37e5e11fa03eaf1703466306612985526b05d4cc58b9dd22f728 SHA512 ceef305cce94a129625f726d7dae43904b8def9e0997f2290c9a35c0031e0de14752a27ccdbc43c45bb910f28c50fde960603247c714cabc4b27e23517fa41b5 WHIRLPOOL 5c552128ae568792e2850805724729107256e84ed42f0108914785418432cf8444b08296180bafb02a0120f5f1fb87e1e3f720165a9f76c0caaa12dae8f8ce88
+DIST Sysadm-Install-0.40.tar.gz 28153 SHA256 df850ae9febea97f36ae999e0e403eb1f882739ff02244696f771d8f5b1ac2f6 SHA512 8f499960fb28112af4ace9cb6b709975814ede783a3c12b69cc67fe453625d7c0197b6afd667224c5a74b2b0da7929f7c5a922d95a48da3666abcf37414b9cd6 WHIRLPOOL cbd7e8f249c81d896263c001723cd9ce97c20ef5ba3c5181842859b8770d2dfbc5b36ec8244a5edb944600834e7ebd7ddf4995c03b58f6948a9278b61693388f
 EBUILD Sysadm-Install-0.390.0.ebuild 570 SHA256 5fa923d7e1890fa946ef9d17b90a41fdd3082f1a9c382b05ade77cf8ec32235c SHA512 cce9ccc1598721bb138b8fcc98e34c926899fb664df1ace35ffc8e572ad23dc28a0134f97a09dbfe22da4ea46ffff6641e8962545a05d4c6660bf85072675880 WHIRLPOOL 4b16194e43f04e9cc8e1adb472d133fffee3b0a0c8176c428f1c81e3f4d13d993510aa8897114c0245cdffbee7a1dcb98dc72361d51eba2003a75c94053cf905
-MISC ChangeLog 1582 SHA256 3e9e182cbd7c963430b91ea6b557e3457fcd01a51e8d273972bc1e9988990081 SHA512 92566180af804fe3f820e7a691e9818c0a767cc5bdddafcd6575806fd02be40c12ca7a1b4e0baa6f451c760f9c678c2101c695d897d0e35361978453c366ae7a WHIRLPOOL 20492242dace5e7889636a94cdca36a6bd3a4818e3cf0f66e94499bfc810e06a7ceb0abe97c6f8c00bfa1b0bf67e39c42192786ddef40155d1c9200ad52b370f
+EBUILD Sysadm-Install-0.400.0.ebuild 570 SHA256 e50a0d8ade033ddef74907367e07e2616d0b9bf8d52b5213c84fa14d4ee4fe2a SHA512 9a1e3facc0caf0a064012195d425fd9d038e7c6ef366a2b2618be46273148231fe99101fd3d010f44d0d9ca558bac17a39224ed846e6259420fe4f81749a10cf WHIRLPOOL 5f3ea17cd54ef1a34ff6c5dfd9b9bc60327432b4384d02386766d2ca2b018fe8e115f66dafc049f58475c320a85ac5c9e90fe556b8e0bd8303c50839e95ed5e6
+MISC ChangeLog 1717 SHA256 8f43a182890c7b1d538e4f17f3c7a680524e80c5369a35a63b4d54e82e0e0f09 SHA512 88ce3f7aa32c130d80443045fdba74a4ef75c02272bd3f78ea0732733f4d40e210925272add966fa1c940081ffb999a34c50ff7a01c64bded2e3b3cf03289941 WHIRLPOOL 3571c02a94ee610dd3762481f0617f3bcb3f9f6e1e6beea85dc3087fb64d6f930e2d71491213683099c0de6f718a9b0ad87401c5c9d2b4c7a6d29380832a14ba
 MISC metadata.xml 481 SHA256 b3c9202df83e114942c779daa91a96f8318ed3c85cb13d35cc9976d68c843eba SHA512 2056024fbd0da797bf2d5fd5746bf6f0a1cc505fd9bbf438192f1e3b44602bbc72e1f18ea8acc4647ef9d5144cc3c728ed9eb82bc859d2391e796cd1eb013b74 WHIRLPOOL 5dfd7b9a6747f0693d4a140b792ab995a21380cdebce962895cf6d47dd24506e6369f5fcf72a2ea0b8036468109c90eca00eb2eac6bf6dc5d6a80a5db690874c

diff --git a/dev-perl/Sysadm-Install/Sysadm-Install-0.400.0.ebuild b/dev-perl/Sysadm-Install/Sysadm-Install-0.400.0.ebuild
new file mode 100644
index 0000000..a068b6d
--- /dev/null
+++ b/dev-perl/Sysadm-Install/Sysadm-Install-0.400.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Sysadm-Install/Sysadm-Install-0.400.0.ebuild,v 1.1 2012/09/23 12:19:04 tove Exp $
+
+EAPI="5"
+
+MODULE_AUTHOR=MSCHILLI
+MODULE_VERSION=0.40
+inherit perl-module
+
+DESCRIPTION="Typical installation tasks for system administrators"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="hammer"
+
+RDEPEND="dev-perl/TermReadKey
+	dev-perl/libwww-perl
+	>=dev-perl/Log-Log4perl-1.28
+	hammer? ( dev-perl/Expect )"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"

diff --git a/dev-perl/Test-Warn/Manifest b/dev-perl/Test-Warn/Manifest
index 3a84f1d..d9a7801 100644
--- a/dev-perl/Test-Warn/Manifest
+++ b/dev-perl/Test-Warn/Manifest
@@ -3,6 +3,6 @@ DIST Test-Warn-0.23.tar.gz 11316 SHA256 c035679567d817e38979de9f071ea109c4bc76d8
 DIST Test-Warn-0.24.tar.gz 11804 SHA256 b4f6b60c158cb8405861ddd045247c31d75d8cd89cab77ef608f999a39ab218b SHA512 58a7531b510d01f7ac12ab5170955dc55dcdf346766917c94375ee9ec89a536602f1f99d730441358a4a64b4d76cc073ebd7b113347bceec086f663bec2a7ae2 WHIRLPOOL c9ff708d4a47d43079da0d13a55cd2761bffc35425bd616f68a344019d47f39c35513c5d7b87d086e2cbecf947e06e8cad90549e7ff6df085b70597175e1ebe6
 EBUILD Test-Warn-0.21.ebuild 671 SHA256 068f20f8d75dd962d62eec4e4ddeadde39ca28daddc1d72bc1bc2b078593cc30 SHA512 b4b37fa29796d5afd50fe45995bf06a8ea0b38fce3434200ee39deecace576ed83cd0230ae421a0ea30786e89d4052e8cd330fcb441067165e9d43ebdbc73f57 WHIRLPOOL 6ba72988dfd210e668c020b7c1edc9f64bae365d61588d32b5bf4684388ae4f923cc6da93f203730b807da219c963d49fc5dc139f86d21cfd4844d981b144889
 EBUILD Test-Warn-0.230.0.ebuild 681 SHA256 327af8b15a23c7c39ac7f8003dc522577305503bfa8ef77b6eef448de1cb57e9 SHA512 9a5ca2f6d9c98595f6d3484eb98f2647ceacc8081e23bdd720461d58f36a51468aaffb63ded4649ff9e2f568babf3bafb9d48539f711ad2f42775e5f74624451 WHIRLPOOL bc1eceed65424fe2d16856ac00d9f5c0380adcc521033a41ece94859a0f3249829258a5371310c63a1d3622f422a6934a05177006ab7c00afa92b140ddc0906f
-EBUILD Test-Warn-0.240.0.ebuild 711 SHA256 d130b4c99789f66e3d417fdaeddf37d529cdd678cd66252d76791dbe6a1030a0 SHA512 0c77ebfa79611b75283959a73a3e4f3445d1971fa267a4dc266c0b37de939d7f3b681844e75669e943914dab17c8011f4c78a097ed68bdce5848c95fe03ab0d7 WHIRLPOOL 8d312938844f0d799085fe916ba15063b64538cbd668cb3c2e3a26931b8b489a262619563525043e421ba462944105bc112c0306e3077289d28cff9e57558655
-MISC ChangeLog 4994 SHA256 00a89ce6343dd3e635bf8130621b8211f1e9b9f878a38a42d785303f0877a0a1 SHA512 32c1659e80c44303883ab0ae1a348b41a114e8a5ea1d61c457a927a98f094191a54aabeda62be5eb90a8774fa4f6c1404e737c88f86f1c805e230f3d9e7a7139 WHIRLPOOL 79b37a627868971c886511007a12ff44a2b2423d258ef445fd9cc190d75c39710a12082c5e7ccec34cd22a44036228596c43ed2203215ca183f2bc5b2b722e56
+EBUILD Test-Warn-0.240.0.ebuild 721 SHA256 60f0431b1470192be8b922072800639d3517cf3d292a7e361278a66c9c344e01 SHA512 42e2694d0c5c8e9cfe30db348393fd51bb95c1a2080668ebbae0dca0b298ab428e30e42c491bc6a543fef4c1f7efe367d5c5013cf874151f1d9a8b44b5d6ff7a WHIRLPOOL 119d5f902ca12a7ef76f47f51973f8f507102c85088f726da942602304cf3492f4879cbd866f175a5a7c3b5127377bd21bd8fa16d4fe0490b76d5f5199f4c011
+MISC ChangeLog 5111 SHA256 04a9d17c64abfe68df3deb0f66b23ba076da4467da2d56d6245bbae8a93ed5c1 SHA512 c6783320f98dc949ef45c735440b38758403d7fb6c36c233d477955eb5865be8156e07f93f97f1fa699c455d4beab6d2fda2258c568013d2e023ae86d04f291a WHIRLPOOL 19299064a9b5d8b1c1c9276e90602da9029f644b07ac480b632635e3d338e6d3d8362cea6810334083835cfc2c87ad255a8465a5fb211afb09260be9c44f085a
 MISC metadata.xml 437 SHA256 f4561892f15095d83e7100db66edf73769a9cb555f0bd8eebc3a341f4d2f5bfa SHA512 87d07baa88eee2639bdde812fc99175ab9b45bb1e234823a289e13fb61f92bbe988f2278f0fad8f406a464e9301bdb945246975c3835fcf1215e39b287fd175e WHIRLPOOL 3390d3d32c292870f2e48b3d3be609696c782221a98956a6928252d66c2e04196175f994a33d21124745375a0cc76757e16013cf804d0435910ab2ce6a236e1f

diff --git a/dev-perl/Test-Warn/Test-Warn-0.240.0.ebuild b/dev-perl/Test-Warn/Test-Warn-0.240.0.ebuild
index 422d99f..f9b0938 100644
--- a/dev-perl/Test-Warn/Test-Warn-0.240.0.ebuild
+++ b/dev-perl/Test-Warn/Test-Warn-0.240.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Warn/Test-Warn-0.240.0.ebuild,v 1.3 2012/08/08 01:32:52 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Warn/Test-Warn-0.240.0.ebuild,v 1.4 2012/09/22 13:22:57 blueness Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl extension to test methods for warnings"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-perl/Sub-Uplevel-0.12

diff --git a/dev-perl/Text-Table/Manifest b/dev-perl/Text-Table/Manifest
index 613c88f..41d03d3 100644
--- a/dev-perl/Text-Table/Manifest
+++ b/dev-perl/Text-Table/Manifest
@@ -1,6 +1,8 @@
 DIST Text-Table-1.124.tar.gz 25840 SHA256 d15c1d21cf666db4b3795afaa455e1a4fcea7e35893711830c42a01b48f0d1bf SHA512 8ba440c162de426c8ccff645c215f7329b9e0115e28bcc44402307ff293fc3b068f986554704584c6fd02633365b5328fac35f60c374b17df808ca211fd727c2 WHIRLPOOL 410419c2e98ea2fbec5824a85c507ecfa9be4d09311b4bffd4e09d4996b412cbeb5e577629882bd71016f1a0414ca58f6a43643d0c760ce9de68057bc52c3ad4
 DIST Text-Table-1.125.tar.gz 27445 SHA256 fa19230f1b0327a9453cd4aab583f37fcbd4b8db5d2bb2f2acd2d2fa394fc511 SHA512 4d966db1b7d90f1a34c9797201957e06b897b13896c487d1bbf457727ce3595cb54cc3f6f64bcfb3d6ac310608ae189bcd3281aaeda941f57af38e3493ea15f0 WHIRLPOOL 4c3764f725909744a00542372a36bffba46f19dbe95394d8af36160875dff42de9eac88075bfd192094d94b330ba437176a1d9e84fa39f57b1e47ad34cc800f0
+DIST Text-Table-1.126.tar.gz 27579 SHA256 019ecd82bd7f700b595669b4e7b937ce227f542b27e8792ba490606006a569a3 SHA512 4ee1db3c4ed49299e5243e3e25ad10df0022512c2baa71ad44d53832f4332b7ea83094e18a900e13f964dd5f1a1af6cfcbcbc3418e7d84bcf467889f52e13550 WHIRLPOOL d83b0385979fc3ab3d648e436e817debc779a9ebdfa60bf580f1a0710946f71a404a7b7042af9063864ebb47580687d90f64aa345469ce6cd1cbc13f4b5c0e26
 EBUILD Text-Table-1.124.0.ebuild 568 SHA256 29323887bfc7b4b5440f8e8a0441537466ade2cbb0f8ccb1c552ca6ec7380f0a SHA512 de331429907549a858300124aa8737f20119959c5e8acc375582af4ffa29088f8965473e6962243035f16870be44ec0f483b30803b961ce5c50b4e7a3b4204b4 WHIRLPOOL eaabd3bc9693ad5769b43dbedf47531ee52f5881148e326a4ca5c66ba397bb24d44ba1351f140d809b55fbe76da116472418a5dc6db64b2bf7aabcc6b5139ba9
 EBUILD Text-Table-1.125.0.ebuild 723 SHA256 d031e9796ffff2fec2314e3fa833995210be48ad22ae7eaa3ba324effc65f0e0 SHA512 6705bd559798adde3774766c798d8ff562709b066d9447148951dc4fe0335a4359d24627da66a75bde6d52cf7e94e551ecb06882a0a08daa8f631b364948ee3c WHIRLPOOL 991f08ecfa4bbf448043e2bf56808d62547cb0591de83622790ad204e07d263c2cb9636debc0a1202dcb974b4a9dd308fbdba571c37a0659d24e22750fda5496
-MISC ChangeLog 2066 SHA256 c0b51f385131f67e404ca0a0538fedf3eb2c88eaae6494e27c969eca60d0bdea SHA512 c4759a31f7438bc84dce68cd6f6a1487beb0f2d16f17bb93a7ce5b528e177a7e1a7f3fafd9440c21a37e82fabaf140c1cf8b816e1c0e45e04deefcfeca8790c2 WHIRLPOOL 8df12d2c0487df861138eb9f9806c2aa6e655a7c28c57f70a8817a8ae2a21a8522a6b3508ff85ceb3e5dd01bd79c86e0004efb317790b8f41a680facac86becf
+EBUILD Text-Table-1.126.0.ebuild 721 SHA256 5a05486627fdce9f5c1e8fc151f430135ae0f998672a5b5538ba7b10c280d08c SHA512 b1a9b91828f785b0a9d7881376965191829565686d1d6dd037249e9e73258ca6042852d0aa5fcf7b8942f27bb33794fbfb86ecccf2de0ed712a8543164f29f65 WHIRLPOOL 359b19b55b032a44cd59dfd4cd01122c59d4afe4da842d326d88c965f58f783d4879141089f48c84c995e489529df55053c8f7cf520d7b1d101192f1cd623f61
+MISC ChangeLog 2193 SHA256 3dc5fa5e00dfce679c667ff467956425d8356bdc0f5d4544264c02a9bad4d88d SHA512 4e89a86eb4bd72667b2bbcb1926503c5a5ba4e3d069e3b5708a46764838c26f16ff03f65fb2704051b0d7ba7a26af52b4768bf271c1994dd071c9efcaca5b41a WHIRLPOOL cd77847d20173dad19cb5200333755b88c700104d31b5677db67d59bf345f9df7d3d80a28c623d0dd6c4cf4576820a24e2f29f3e2d82be9d0da5bc5e0499e580
 MISC metadata.xml 397 SHA256 1e712e8ea2a18449d94bc05163dacabf5061106c66a44b812818948283506cc1 SHA512 dccf133dd08f63d89896e1b49d1ce5e35c57515405c618b19a795b570485aa2135319bbaf94a120dc15d55dcd30b0aa345816438f12061f3dad942f31711ec28 WHIRLPOOL e2863c3d39120638e7d33bbe9009a31c91c63ed2e76c00f30b8eb4f5caefff4fe919d325332f2afdf67c0c2622bb1424cf9c77c9985dd3334920974ab2c5cb77

diff --git a/dev-perl/Text-Table/Text-Table-1.126.0.ebuild b/dev-perl/Text-Table/Text-Table-1.126.0.ebuild
new file mode 100644
index 0000000..dc2c4fc
--- /dev/null
+++ b/dev-perl/Text-Table/Text-Table-1.126.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Text-Table/Text-Table-1.126.0.ebuild,v 1.1 2012/09/24 18:19:11 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=SHLOMIF
+MODULE_VERSION=1.126
+inherit perl-module
+
+DESCRIPTION="Organize Data in Tables"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-perl/Text-Aligner-0.50.0"
+DEPEND="${RDEPEND}
+	>=virtual/perl-Module-Build-0.360.0
+	test? (
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage
+	)
+"
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+	docinto examples
+	docompress -x /usr/share/doc/${PF}/examples
+	dodoc examples/Text-Table-UTF8-example.pl
+}

diff --git a/dev-perl/Tree-DAG_Node/Manifest b/dev-perl/Tree-DAG_Node/Manifest
index 98722b6..4af4a5a 100644
--- a/dev-perl/Tree-DAG_Node/Manifest
+++ b/dev-perl/Tree-DAG_Node/Manifest
@@ -1,4 +1,4 @@
 DIST Tree-DAG_Node-1.06.tar.gz 32843 SHA256 502570774dd3bf11345fb028ca4cdd79f04db12ee68a826f0c44e24da0e3db2a SHA512 dfdec2799b3ef2e20303001aa40df16be134e1c56d48acd61cb6397e66d7fb38beeb4efdbcd24fe16e2fcc15471e77dabb1fd2df0334e3e44024109a997ae71b WHIRLPOOL 08083b8136b710d68f342403ad601037fad7ffe04b0728a54dbd45f5bbda12a16c0265dddadc22ef7612fb6a0485402938adf577735c8b3fcec9c4b2b222990b
-EBUILD Tree-DAG_Node-1.60.0.ebuild 544 SHA256 b0f005113a6f0bc6d4a6dbe91b836d75b83880e5480878ff6b26165757ee6653 SHA512 bb2077996ab4f305328a20d5fd3783bf5a23bca63efca518648ae54fecd05a41096b9a32fd606f6dcb395899a869f89df2bed78614f03f705e41745c095d323f WHIRLPOOL e306cc592173d2c6fe76996b901dd0ae7840380f88e8ca9a853bdbcdafc28a595cab01e0bb4ba5253085b4fef1399bf34386533a9db21bc25f4c7871a328dd90
-MISC ChangeLog 3612 SHA256 2e6f2f790a28ed33e869f384edc31b5634bf91b219c03443ae980ef871aab4c4 SHA512 cc652bb74820ec4fc0e8fbf293b2216215bbc3871f0010a144e2ee64bb9dfcc414f111009b8acfd1aa0757bdf36d6fad5ff69a475ad56e2382958ca8bbbf8d4f WHIRLPOOL 920d5efe2a21dbb3b91ba3ec018b9d013ea5320e10b5789cdb4d98e87ffc3f46102da9fd8a9d44853b64f618431f78e918ae7e2e34725ba49f96a4f380a044fc
+EBUILD Tree-DAG_Node-1.60.0.ebuild 554 SHA256 45e87c4de20cf282d7fee4769c4214874596380e26b771a265d0adb4c7098078 SHA512 50fcfc1214560cd017625b6b995f7521fa1724f08b5d42b5d4f1dd5b4cbee8ed4a5ccfe78cb0ee499d228ac566205a4267419f223b7d8503dbf33ee29c373c5a WHIRLPOOL a1eeaab04fc160e24906cf3654999626c4e8ecfa1cfd8264508d4cfc6c58a6e434e23e90d581c3239ffe6b84cdf5aaa3175efd65c779e898a0939ae5bd89f59a
+MISC ChangeLog 3732 SHA256 1134b9ee6a88d63d80ced763bd2fb560afe43efcefcd8129205b8ed237c83f18 SHA512 e4d607696882dd27146b1c05ce5ea0ca2e3cbbe815ab526d186c47750fb39b71aafd1bf1198f723d849bf607954da165047f9cc146dc6301c9ec28fce4078017 WHIRLPOOL 3bb3b1307ab09e87db4a5f65ffabc7b1536825dcd058767f9e9edffb64cbcc4d90471f84c51685049eed489793b3dc076eecdb10fe175442f60276c58a283b88
 MISC metadata.xml 300 SHA256 0965c8a02048b4a5bff0fa68d562352248a50190991505f94508f42cac874498 SHA512 4290dd2e18fb73e8933796af67f613f0dcb9999079e1b369c4fe6c4ab8b3057ff3285d867465931587a41e78c0c90c54093c4bc6c08b579368f1de71f0554360 WHIRLPOOL 38c6c4e5df176ff8f3dd425efef99eb550aeb077e3ed2b8b142c06e141dee22e0cef59159f8b6f7955336a3786d64de21ce16137e65797c1b6f6189f86de1e6f

diff --git a/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.60.0.ebuild b/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.60.0.ebuild
index e8cea63..39fa31e 100644
--- a/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.60.0.ebuild
+++ b/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.60.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.60.0.ebuild,v 1.13 2012/08/08 01:31:51 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.60.0.ebuild,v 1.14 2012/09/22 13:21:38 blueness Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="(Super)class for representing nodes in a tree"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"

diff --git a/dev-perl/Wx-Scintilla/Manifest b/dev-perl/Wx-Scintilla/Manifest
index 924b803..c41808f 100644
--- a/dev-perl/Wx-Scintilla/Manifest
+++ b/dev-perl/Wx-Scintilla/Manifest
@@ -1,5 +1,7 @@
 DIST Wx-Scintilla-0.34-patches.tar.gz 488 SHA256 3ca51b083080d0e1943c24db04251b1a1a8961ded91d18935f850e0004152bd4 SHA512 743468ea05f78f147664bc550ad6f2869db3876085d56f86b245ba568d58dfa50d957da22a29dbe322f10c5f25001d40927fdc19a83f616778e6b6c55e75d98f WHIRLPOOL 22b241121fc202386e81eb774fcfd0e6c686bdcaf3a3af4b5056465c2d35b9c21bc849702b26e4d6e386c7ea424f827c92f41788140a6f75d4c91906f4495813
 DIST Wx-Scintilla-0.3801.tar.gz 847738 SHA256 97283dc197c866050fc35fcdea347e2ce82c277727770a9ad097bdcc346eddde SHA512 723fb3d9e58d3b1ba7010675e35d8891406278ea60f4a8e07eac5fd89f85cdbf648a5607c60480f01217ebc91acb8bf586e8eacea04e65763c54089d3036b3d8 WHIRLPOOL 4a4df95a7917d1984c15e89dc9d0e5efd6166693f7cd8ad7907136805ccf6f2048eb183fb5ee73f4f5a933a87a36ca22ced4dbf1a300393923dbd405999fa4dd
+DIST Wx-Scintilla-0.39.tar.gz 848565 SHA256 d6d67528a55552bb3fda2a1f22058c6c94a05eaf632dba5331afb3390defe0ea SHA512 d9ecec347c1f1382788e5ed7708b0caf86f2ff87db0fdb2b8fa07460c96b1a7921a9402431105beee61f4627f3694a79db7515ceb76b1ae4fb3f95c807afb4d4 WHIRLPOOL 229c694683e939cc1110171945aa18cddcb989c63e33c032ae755ba878717792d88f9670f968bd989e58c62066d7e8d4035962ae58975970876a6741a8285560
 EBUILD Wx-Scintilla-0.380.100.ebuild 884 SHA256 521d6deede58017976ddfc888749658ca5f5514de575a34e74e878c8042d0c4a SHA512 323ca2144c5e2940b4f9d2c4cde20a10dda08a89b14994db410e3767f036afea625b31d9623a325d1c4fda4cc4a7938e25acbb55c24645e647de32b9d6b8adde WHIRLPOOL b3e4017f1f9afb35b28b46c1c08a8fdcbab46907156eb2dc69c69b0637372dfda67affbda4d2f45528db331dc67e8d2c311cf8712be767d2b2df3481a774f548
-MISC ChangeLog 1080 SHA256 5ae67781846cf320b27ecb22fc76535baa177d88ac5f1e75d23ed9ff42acf140 SHA512 d9595c6fa20bef72ccc7c9ca17590af56157761c7f366b07a03c1d85fd0fdc6ccfb3f02593b9fee12eb26693a865d33a21755a5a287bf3a6a9e01e4496da5493 WHIRLPOOL d19d8afa1be9b98fa62c4b91e090d7c738aeed3d2aacbdb3bda7220be5283048ebd4c5fa1504930a463bc1a72673ff3cb8b8d141e8dca36647811dd5487a4455
+EBUILD Wx-Scintilla-0.390.0.ebuild 948 SHA256 d931e614960a698d5d85dd8dd95b4fddca2811ddb9a0890f32da447dd6847313 SHA512 92dec2c7875934828db029620f5cf7918193b20dc2269103017e006e275c12c120378a3905622c6f765c89219c6c30a1eaeb7fd39642889818c1c9ed16412c98 WHIRLPOOL 8dab5246201f55883a5fb40251d8cfe762a163cfc7158de9ca5ccb173bbffa1bfdfa128da00540622c7274eeff304f2adb44dfdca6ed823083d7a0f43f5659f5
+MISC ChangeLog 1211 SHA256 4638362fb345e248cf515e2b5ef7250a01e98ef04373e9b427504d445a02d263 SHA512 d7f679c5882d5edd906a43fd9a2f6127e81a8173b6aa6b01f491ffaeb3f55f2df999cd9a4f8906415f17891adbccbe2684356f3e9bb10dd309f1037e990cac75 WHIRLPOOL 925045ad8de4d8bda86a73f51d25e140e2764c729c53311cb686ee215f59038d673cb205ce520b36aecf6335fbb7a175394bc3c8116e1a6f1104e4066e788ad0
 MISC metadata.xml 646 SHA256 3aa8bb78bcfe0310bccc2312be902982200330eeeec136416500a2e2c91d630c SHA512 45fbe21c18b8da0bc82c110a7829ee07432afc3f500366204862e6c6b08fa376aa7425569067ad42da33228a5e3ab22ee2b325c2aa8674a69dca01e31c111133 WHIRLPOOL f42a911774e430fe21ee5746a60c84eb1074097a825787f3cbb217411abcb56e589f50dd1a7167d843c770b689d0e2aef6fb6ce995b82ca3a0bcd863ed9dd420

diff --git a/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0.ebuild b/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0.ebuild
new file mode 100644
index 0000000..20b1813
--- /dev/null
+++ b/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0.ebuild,v 1.1 2012/09/24 18:17:47 tove Exp $
+
+EAPI=4
+
+WX_GTK_VER="2.8"
+#VIRTUALX_REQUIRED=test
+#inherit virtualx
+MODULE_AUTHOR=AZAWAWI
+MODULE_VERSION=0.39
+inherit wxwidgets perl-module
+
+DESCRIPTION="Scintilla source code editing component for wxWidgets"
+SRC_URI+=" http://dev.gentoo.org/~tove/distfiles/dev-perl/${PN}-0.34-patches.tar.gz"
+
+LICENSE+=" Scintilla"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-perl/Alien-wxWidgets
+	dev-perl/wxperl
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/ExtUtils-XSpp-0.160.200
+	>=virtual/perl-Module-Build-0.360.0
+"
+
+PATCHES=(
+	"${WORKDIR}"/${PN}-patches/0.34-flags.patch
+)
+
+src_configure() {
+	myconf=( --verbose )
+	perl-module_src_configure
+}
+
+#SRC_TEST=do
+#src_test() {
+#	VIRTUALX_COMMAND="./Build" virtualmake test || die
+#}

diff --git a/dev-perl/XML-Twig/Manifest b/dev-perl/XML-Twig/Manifest
index e9a4a2a..8cc087d 100644
--- a/dev-perl/XML-Twig/Manifest
+++ b/dev-perl/XML-Twig/Manifest
@@ -1,4 +1,6 @@
 DIST XML-Twig-3.39.tar.gz 369305 SHA256 33940ed00763cf4def0052b095ac79418da3902b4c6fa67b21e4bf929d1f7fb6 SHA512 e8588f32d61a7175cdd36ca2a34432ed09e017b19833d3b69c3c600e7123813cdf46d954e2ba792cfada753c3438add7ff8ea674aba8cd7c16b4279ef6399646 WHIRLPOOL 620f29a78e274ea2f9fe5ca40d2852bf75e54bd4e71149992473cb33dff39e131868fab9d0bb2c9d99f17faa2d109763c4501c796e5ce6e5d10e99258c4b93ac
+DIST XML-Twig-3.41.tar.gz 388697 SHA256 20ed8ce932903b1bafd47542ac0e7965b4f0ff349450c1f410238ced6803a055 SHA512 e5163d2b469697c68bf9d3f6947184515f9b6195cef7f3b401a3234669d108864e4841530969118f862077847c41b616de084a26f3d2495b3f14eb6dabc44726 WHIRLPOOL d241c7a0be244b6477356afb6d580b4a99b8354802adb2aab1bea8a107eb9bb7a8eae927446fd3db84cacd457f5646c70975aebea9f8a69d6dcf281e15b494dd
 EBUILD XML-Twig-3.390.0.ebuild 830 SHA256 adaaf39cda2af7a8d93529276f83d279db98de0f49b2cde05545c4d46173b727 SHA512 f3fdc538a5045df193e684f036341ff723427bef26084cabecff83c71b64e992c18896f0a330ba0a6575ccd19e7ad338e40dd04409184849f2e71d113289a282 WHIRLPOOL 77cca57052b69dcb87eb47559910ab47882316100921d36f1bc8f1508ed0e3faf80b4f376dafdf421dd4ca673068703b4fcc8ebb311ebdb4d8ec44197c1aaf30
-MISC ChangeLog 9943 SHA256 f22d88e9e9fdf9ff55d9f9fb58aa62949df0c42b896b7ca57885495f534d7241 SHA512 d6deb67567f81ddd6296a5416b4207edb91caa70e168221d130267908c472013313d5e71887459111ae654e8642eac21b4cb66c060108a67bffbcdff44f94c13 WHIRLPOOL 196d6e0222d1fbc8873315045b2f075c8d9ba84299dd1b5add0f458c74bd1f514d10d4e555c3a665bfb51a19eab7fb357a49a8822dd98145e20011c06cfab920
+EBUILD XML-Twig-3.410.0.ebuild 834 SHA256 4fdc6aa5132ae208b056ea1ec687757611ec5ff5e41888306a71a02781181b39 SHA512 7e05953770fc13a87148915ae732a4c7e6c036372d4648a64bf54426ab257fededa7bdfabce11ad9ee3e536c54aa5c7c9ba4563818c8c8ad4ab0535750595377 WHIRLPOOL 6daf6a78c4cece6ab2954ca3c8794aadc7e7a61e08b93802149977bf03aadafffb9c75505e4559eb70e55b822e4a2207c360188a65cca9c60d0623b72d9655d8
+MISC ChangeLog 10066 SHA256 2140a896cab81c8a1b5a5b1edbf820e68b16a67ea85ee8ca68decef98ebb391c SHA512 29eec197c54a75ecaa588760855def4414eb44f1ca8c7aabf763772ccb86e555945eed3744d54da93b2db9c5b7d6b0fa2ae3decdde3a80c4e8ad393edbd1edd4 WHIRLPOOL 4ff7755af933da644b9ea52499615f0ba58bb9146cec0822e2484aa8d2e5b801699f41d0a48a461a7715abb364a2ad12141e1621f032c57778b9d1cb8b99945b
 MISC metadata.xml 901 SHA256 8ed41fbcf56e10e1137f35fd4e1ed224e060ec8e422be85a44bcf4ea21e5674c SHA512 0a46983eea663cf7a0eb6eaf234dee82a32fc94f719dbd04b1da747c220f5618c80c17844a1f58db111b6f14ed4c430a1f4f29633246285e7ae732e2493d8139 WHIRLPOOL ca70ce3227e58291280d767a7b9fe860ff6ebd5bbcb2f1aa7d2da12bb9ad5508fd5ffbc2368b555d423520fb9ae1f4db3e5a5e644aee616b68790bab2347fb0e

diff --git a/dev-perl/XML-Twig/XML-Twig-3.410.0.ebuild b/dev-perl/XML-Twig/XML-Twig-3.410.0.ebuild
new file mode 100644
index 0000000..b51ff9c
--- /dev/null
+++ b/dev-perl/XML-Twig/XML-Twig-3.410.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-Twig/XML-Twig-3.410.0.ebuild,v 1.1 2012/09/23 12:16:54 tove Exp $
+
+EAPI="5"
+
+MODULE_AUTHOR=MIROD
+MODULE_VERSION=3.41
+inherit perl-module
+
+DESCRIPTION="Process huge XML documents in tree mode"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="nls"
+
+# Twig ONLY works with expat 1.95.5
+RDEPEND=">=dev-perl/XML-Parser-2.31
+	virtual/perl-Scalar-List-Utils
+	>=dev-libs/expat-1.95.5
+	dev-perl/Tie-IxHash
+	dev-perl/XML-SAX-Writer
+	dev-perl/XML-Handler-YAWriter
+	dev-perl/XML-XPath
+	dev-perl/libwww-perl
+	nls? ( >=dev-perl/Text-Iconv-1.2-r1 )"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"

diff --git a/dev-perl/YAML-Syck/Manifest b/dev-perl/YAML-Syck/Manifest
index 57c4d08..256683d 100644
--- a/dev-perl/YAML-Syck/Manifest
+++ b/dev-perl/YAML-Syck/Manifest
@@ -1,4 +1,6 @@
 DIST YAML-Syck-1.20.tar.gz 164384 SHA256 5a23dafeb76b04a536f7ad59499ff54a986d20ab4ac659d238304fac013e9d6f SHA512 a49cd972015e05aac22cf0414e9b6a85fa3f05d54e1855fae72869a8f2209a7cd5f1007350b372be6feaebed015dfd2c43e2345b27b6d84a56717802a5423c17 WHIRLPOOL eb64b3a7104970cd523964aeff25be15f9546f1f25d62180b6f2d1ee361b2d8c4d359d33725a3d2bfa605535c2d10c912463f9b94220316db6c6c4c7f484e007
+DIST YAML-Syck-1.21.tar.gz 168765 SHA256 f43f39bc4cc4fa1e8aacd398b1c7f1bae39c0b44074b164c9da0be4f5ffebd15 SHA512 d607dff167d2255395eaf415d025a11dee967793a1430709da57081182d1ab3aebce72d6b06de2d0da2b4abcf23bb90f8324bba46141eda5e533bd14eefea1e8 WHIRLPOOL ec0943da442266f3b33432db01651711db3842ef014931d0f7d3f7558af3d2608e9c20f1d8f825e636039ac44cb79c463f811bf41c7fd2b74f612dcc04f306bc
 EBUILD YAML-Syck-1.200.0.ebuild 617 SHA256 15870db3d01c679609e3cd34b0a05d8f73a0afd59d4595f032e70ed9938aed13 SHA512 487cd3ae29060498240366932cf2d6f124557af63e0ca50dcf979bafda8e73262e1a12de87554cdf18c5d565d15283e34cd4ffe4aed779d8c872584c7878725f WHIRLPOOL c1d656a2dfc1a908b764e3e5080893e92be110bb495010629b75c227fdc443d991a872bd2f06142a4cf45f39e5c9d616447a3dcfe02a04cfe7dc455095a7693a
-MISC ChangeLog 6289 SHA256 9003b2a2054c00a11199a95417d1962f5bab3299594c8f56cc5039b5e4fdaccd SHA512 2003020872d364f711075ab55a5bfebf469d07c0d5d3b46184c896a8c3d34760b58667ea693ef901b54308bab804956e813aff2aee67a80c6885f7256e4efe28 WHIRLPOOL d52773e4dd2f88a654e6276e86698ed201a6682264102ed37b4635cad2b15c6f306f95002db3e91428e0e7d04684bddaa0c3287a767b96acf9722723a7e61740
+EBUILD YAML-Syck-1.210.0.ebuild 625 SHA256 a3f00d656e4ecd3f81721946e5bca533a4ef2a10daf2a3906d912106fb11cb46 SHA512 992856f0821da6c8ca0328a0979f1a74bbfd3a6090e1b08be601fa94b2e0426c836af97b6d521293d5f10345d7692a29de7f58b841422c17c67940367805206e WHIRLPOOL 8ce1f932a852b6f33b9282eebf3b19a4e89bc90b120a672ccdb82020ed9f45aac362d53b6271c549cf97ff8929c566797094d5706bbc22df75b8fbef169284eb
+MISC ChangeLog 6414 SHA256 70b56e15aaafc1e0f38382eea51c6af2bbf805f38fbf6d9fd1dc63c73a3104f0 SHA512 af60702c773aed6b8e996c8ce87f54d4711eaa84fd941ac455bb0b1bb87e897102adc44fcb1327a6522432c76a72f43f9232b15b3c4aa071d9fc09a015a38a02 WHIRLPOOL 5ea40f82fa8495778e4ed43b91502226ddc75072768804ece0d72b526c69be6ec0b2b64b3249f2b67f72c8592c56c6b0ce67a99ca3a382c5d835db49ff1f07ce
 MISC metadata.xml 479 SHA256 346ef717930d403a2cd8f0a07748511f48e0891a213fe89686aeafff82dbc56a SHA512 8256b249ac5f539b0f97240e347c5eb6685b55692e8edc118a23bd5351bf0003bdbab3dbfe8d22bf5208a64704698404db750fc0d29f764b9ee71acdd303aabe WHIRLPOOL 2111bc6983029d8d363e268947893c6311c4990109a546fdb8fbf5487c1bc5511d4e3bac902270ff06ee3194520d86321459e520901adbcc38098551e888f431

diff --git a/dev-perl/YAML-Syck/YAML-Syck-1.210.0.ebuild b/dev-perl/YAML-Syck/YAML-Syck-1.210.0.ebuild
new file mode 100644
index 0000000..5ac59df
--- /dev/null
+++ b/dev-perl/YAML-Syck/YAML-Syck-1.210.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/YAML-Syck/YAML-Syck-1.210.0.ebuild,v 1.1 2012/09/23 08:46:20 tove Exp $
+
+EAPI="5"
+
+MODULE_AUTHOR=TODDR
+MODULE_VERSION=1.21
+inherit perl-module
+
+DESCRIPTION="Fast, lightweight YAML loader and dumper"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE=""
+
+SRC_TEST="do"

diff --git a/dev-perl/perl-ldap/Manifest b/dev-perl/perl-ldap/Manifest
index c33157f..0e44d12 100644
--- a/dev-perl/perl-ldap/Manifest
+++ b/dev-perl/perl-ldap/Manifest
@@ -1,8 +1,10 @@
 DIST perl-ldap-0.4001.tar.gz 254232 SHA256 fae2cf183b6b214ee904eea854ea84ba54b13ce28d8ea6d62f70760f4e8bfc6a SHA512 e4fe781f1d4c4a2b6365be4ff7a44ac8e7d96f0f5544281d6baaeaef4dbd173c77424fc105dbf61c6a2fbf9deff34cf08b470773ac34b83aca878a58fe2467de WHIRLPOOL bb1f29e73a4c5247d4896b5070c5f12a687796a9018fbc77aac3309c1c6842c12d751cf67e4eeb85e6318764109e605d7d3097cb6ffc1f46653c2b7e14cc7c1c
 DIST perl-ldap-0.44.tar.gz 262973 SHA256 6c398f32bf598ee139d111b5fd91cda1e77ca0fb3a57e9616909efdec5d4cacb SHA512 7a2bc4f7c4d2957c1e3eb24451687625e2ba5044818c34d2fe59162ea34a5218e3da4a8e01a5024c6dedf393733238a802436f6b9a0d884a59c520c6061d7e81 WHIRLPOOL 5c62e8c9affad750c142133c3cc875b84172d7afa6b1b92151f4bcc178520c143a11e397c7ab9a336e082d8880804d8c246ef3af292fe9635c1ebde5c1821b8b
 DIST perl-ldap-0.46.tar.gz 263688 SHA256 1a89b35515b1ff114ebcef1194be9c7599a3856ad3cfdc43970f38739d432f5c SHA512 40c9466b3d27601a1c0c5918c8b35e23952f630731407de53b2421585e0ab7ad7c0db4fbfdf6e9ddb5ab11e7bf99d91f99af4af8adbc47aab76c0227918bacc1 WHIRLPOOL 4f9f483be025f642101675fa96857ecc7315fe88b5514da1fb04efbef0b8eb73d2f03a6c14940689d77cba2cee8c635faa426bc921757ca9e701e30f0a207295
+DIST perl-ldap-0.48.tar.gz 265877 SHA256 773e0e421021a76b1eef43ff57e8481ca6fd690ba1157c64ac7b1cf29d2d49f3 SHA512 b894833c9d4c13336d216c0208626ff8ed0d028d2c1a5200593d4839b53a4ec7ce3c1b606a734f0dcd841dc131b189925db603fb5c9a19fe18bd61875be618c4 WHIRLPOOL 71bda604f8fd2539badc13ef64c456454032780b1a1cbf8ce929c6ce8069c9e0e0a97c76a70fd19472f822a1c3588966559921b8044b94580766de2c5f44bbc0
 EBUILD perl-ldap-0.400.100.ebuild 852 SHA256 8af962cf6fdc5af2b09e54b267b0c52bf7d30594c4914a9c146f8bb0c38a135b SHA512 2dd258bc4eead8bf1acf29313b4a0fbc01c71354c0a5a952ef05128dbc8c2eb7ecda68ecddb273629fde100e42277f7b81cd6fe9b331d69a88b9bf65e8405da0 WHIRLPOOL c77a0b2c8bd4d611e60b930385f8a20a59e9a0e8f29231541cb264f72239b54d64d201e2d5ea850455be3424a8e60c9007ee28432967e6e10785685abb2a5bab
 EBUILD perl-ldap-0.440.0.ebuild 867 SHA256 0651be881e72a50bf055b310a20225efa2ea43de712da1f72dd0817d20adeee2 SHA512 72aba799354809692ffc13e861c20ebc1a085fea0e1f796552200121bdd75f23c80e20612474108b332a1ddcb1dd446f42d8719e9951a7aae2853fd2696aa477 WHIRLPOOL 8102eccd0318ef6a51fc498ca8886d728e7320d6e9133d343dd29a08e05665d4d20dd5a334d15880ae17ed322875e1fe47980c3ed0e0beb8765274da260f1980
 EBUILD perl-ldap-0.460.0.ebuild 875 SHA256 24e7c71cacc71f51b4b1a187feaca73577d9fa3ad6f28ad3defb6cabfeb9d0ce SHA512 e7480f7c2f2c37ac5e1173443206f58101b3e3e16ef41694ba441a57eb0a8bdc21ea361adb0dcc373fffa83418937b75ad16828a1e129b6a2564d2eb98ebfc29 WHIRLPOOL d831077f859f50be5e46c820eae30aec635ab7d6d0928267e7325934294ba3425763c49e3f5111c21f48cf4acb1cefa3ed8834f55fc3581ed469c5b0e3b84ac2
-MISC ChangeLog 10800 SHA256 f80d39c298146515b4c93fc9dffcdfee3e0914b1b79de16cc32389586585599e SHA512 19a5a2c66030c699b7a26add133ba533b4a0e620751269e05552016f77be90a492997aa747f01c7642a1d94a8bf5f1e8b77e7b55cb1e387341a9da9437ffd70e WHIRLPOOL e2053a0a1ffed1612818b5bfd31b46638616c9837792ce46cfaa7d964b5447c86559561e4d497697c5ab7a2145a079a903bbc75d1526b6d546ee20bc64226e0b
-MISC metadata.xml 3723 SHA256 a3d2deff0557f883c9447c490c6e9345229662ea1d35e9a72edd167fcbcabac2 SHA512 e907f2a0cca6d0d795f4d6c7021ea2312a241503014793abbb1049c78bf7c246ad316b8eef9e7361c6a7d26eb5551d1227e996defd71a05dd180d2c965058b47 WHIRLPOOL eb2be6da916c9cf9db5e2e32c6b2319f18be06ecf73311570e4fa0060c2bd6fd64e028207663fdadcb1aaddb1cbbdc0c320fa529b56df8bc4eac576faae8aa3e
+EBUILD perl-ldap-0.480.0.ebuild 875 SHA256 cc735ee14e8fa45cb89691609b1b9d45e43d16caeae9e02f34d4220c514c8a18 SHA512 b88c05322204bde19574f1ad8540baaf4ad206c3fa7ee2922f85311b02abd6a81c2127a6d3158f9435f329ad6025fcf11d2735f9b9ce06f400a5135bfa466f53 WHIRLPOOL 9f50209dc2a9fabbecc97193e47cff2fd453b67dafebeb9078bc40a7236163961cda43d1ed7f89b42f0d37158835735782addb92db34f5a2de9d026ed8c53a75
+MISC ChangeLog 10941 SHA256 5ff5fb0af952f1677deb8a129019c169c39a3e389791bae140645791e324e39e SHA512 d61a2a715092416a68caa80aa64a15bb012e87ab80022c3c2fd3fd75a3c281c4ebfb4c177b77e23d3ccd9af3cbc4814ff3fdc9f2825be57e5e2479f513543d41 WHIRLPOOL 6e998c2ba5beb49e94fbd2045723e7eaea7a68cb465d7315285822358768a8fc64e00075e26ca5b286f38296c7e6819b23e21cdda91ea163b1e45d968e2257e9
+MISC metadata.xml 3790 SHA256 b09b398c8b9af39bbe03f0608d6a2bee5b8bd6b3cf77a6aafe5f882c64ee11e6 SHA512 184aa4b4031016cdda1e9fff046bf1d9aa8a3bc1977925f50f5989567ce10feb2c57f976ea2ce473a3ee665933c6f612e2285904257345b36c0a469c9ed52b91 WHIRLPOOL fda295d87eb5c3a510dfee188b07787bf9c0fe3deb69496918e0c793dbb69fea5ad6b3e293951f64e4c8281cd31b69b30b2f31db6318833aaf6587068ab59cdc

diff --git a/dev-perl/perl-ldap/perl-ldap-0.480.0.ebuild b/dev-perl/perl-ldap/perl-ldap-0.480.0.ebuild
new file mode 100644
index 0000000..d0d2d5c
--- /dev/null
+++ b/dev-perl/perl-ldap/perl-ldap-0.480.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-ldap/perl-ldap-0.480.0.ebuild,v 1.1 2012/09/23 08:26:36 tove Exp $
+
+EAPI="5"
+
+MODULE_AUTHOR=MARSCHAP
+MODULE_VERSION=0.48
+inherit perl-module
+
+DESCRIPTION="A collection of perl modules which provide an object-oriented interface to LDAP servers."
+
+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 ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="sasl xml ssl"
+
+RDEPEND="
+	dev-perl/Convert-ASN1
+	dev-perl/URI
+	sasl? (
+		virtual/perl-Digest-MD5
+		dev-perl/Authen-SASL
+	)
+	xml? (
+		dev-perl/XML-Parser
+		dev-perl/XML-SAX
+		dev-perl/XML-SAX-Writer
+	)
+	ssl? (
+		>=dev-perl/IO-Socket-SSL-1.26
+	)"
+DEPEND="${RDEPEND}"
+
+#SRC_TEST=do

diff --git a/dev-perl/wxperl/Manifest b/dev-perl/wxperl/Manifest
index c2eca2f..5029ada 100644
--- a/dev-perl/wxperl/Manifest
+++ b/dev-perl/wxperl/Manifest
@@ -1,8 +1,10 @@
 DIST Wx-0.9902.tar.gz 406639 SHA256 ea4982993de1a188d4bc130d785f10faa0fda4c8521b08b3768915d0ed8b7ebf SHA512 e6d1061319c0232b0f5109f314b88c771960aeb2ce18effd4bf040fd377edd0f9ab94f3359c318b52a40fe73bd8e1a0c9f90d87d5c23690435303e644e5bbfd3 WHIRLPOOL 59f4b30616931d3c89bd61076bbaf69592ec0facb3eb063387d8d34f004b5c42775b5bafe688d2bd5458af9556c023a6149a0e104d7ef34403eccb9c760dc353
 DIST Wx-0.9909.tar.gz 459405 SHA256 76bbb94d082f2a8eba5c22d94e976d5549e2a319df0ede52912790095690a879 SHA512 ffa7d2c997185a955e2940b048130dddc7bc08523eab0f208af995042038d0abb3aa35bd5661bd1a3bd7038f841f38283b909885a9864750e3c0f5d1a6007f96 WHIRLPOOL 6679b032a7bdb274564e7fb57b9a579adc9f2388ab8d958ece6ef13cdd3fbff2540b3b596e3a2b0b70a761dc9d2a42d6ed5a5ce4df45d4bbe9d58bdfdc4de329
 DIST Wx-0.9911.tar.gz 459762 SHA256 3f2cfb813c5d3a061aeb6742b7e2312b3bd75ec26ce3eeeec6bf583ec97c8b88 SHA512 3b12266b98b7b5c0ad9039b9f6e904778fb3caccf0c862d30f4db6341ad56571d99cb7b29a34b129742105f17b70bf4cf960d57511945ddb0f6d977bf0649fa5 WHIRLPOOL bc1cd8bdd657f2b0af1cb64cb29dc0d59eb50f2bbd16dcb65f2a742f13d6ea6acca474e5e9489d5303ce466726b0ae7d53945abead4bd9990cb0bbd5d84a87d8
+DIST Wx-0.9912.tar.gz 465242 SHA256 82b01febb67f638fa7f97244789e030d8f27b635d42c96f23281df6d6e88268e SHA512 ea5f3fce04be8e2e41698b1da220d7cbc8a5b50867972d4a9697113e5c0157d05099ca01d8da2f52997aec21c959378cf1429ab2f6e2b089a55db30770bdc334 WHIRLPOOL 5fb640a74a7933e21d2751baa4dc1f5de1368abb4a72215f800449a413920e3c037bf1098f08757960438ce92dc3a9b8f29af5c51f6e58197f079697b2cedf50
 EBUILD wxperl-0.990.200.ebuild 654 SHA256 5856184976cdea920e7f15f1f92a20651602679fe9c49f3fb4d19874d915b3db SHA512 c7dc494ca73d62315c04c83c5170a045fd5f36199d2eff6a2a0e0ec7ebee5f74b90346ec86ece5b793fc548c10a5ffd7aa5c9776ee7e27ded959552e0bcc1627 WHIRLPOOL 4a796f945723e7525e1a35ab9c5bd98d39ceae9e5750dae88d4b70951b9c16d1ccf817b469cba285c9d459c8ffec8d78c9618e69282bd93ad3c7c818c9f3f001
 EBUILD wxperl-0.990.900.ebuild 654 SHA256 e24cc05da37f6db7949526d9687aafacd626fb998226c2093b2fd6f79e1f579f SHA512 45e2000c6b3d7327ec03ba55c8c7effd19023b50748e0bcd2db3e668aa631db367d09771200d7e70c64a16859e3868edcd0a4722b1eac53e71aa2258d6f8844b WHIRLPOOL 8f0cb10523f6494552b44ac27286d845f8a409f5f3943069beaa5413dc20edb49672cfb5021124bb6c11f54a0114b9c52c5e28a85eb7f55e652610514b1e012a
 EBUILD wxperl-0.991.100.ebuild 668 SHA256 3ffc5768eb39e787fa27e1b5f0cea75af2b4f35cee83bd3cfda522d2dec2aa52 SHA512 3d9271a994211371b6180b1550c8e752906322a5b0d4870f44f32e0aa1ce7d629d1a7eb5dc4a0e3ea3eca08a9bb8dbba528c657d627a98b20a884276b7093290 WHIRLPOOL 898dd20f9424f2e215bb63dbbd053cac13d311c30b2f106babe336bdf959b69253b33684d46cb009ca4db725ed902f09bde7ee6f89be128adf9949ccfd2b46d3
-MISC ChangeLog 7027 SHA256 4d1eb7f62dd3bf392d033819aeaa449472a03997586d1ddc61b07c9f2c087857 SHA512 17542b0c0522f5819131401221cbbe63b32cbcfa9ea8c941b84ed50e8613630d8824e1a68de9f840ba799012385d2a34fa852a8e619c5f86dd5ef2e8f243736f WHIRLPOOL 2420ff29910f38e9600e9aad6403f253de3abe69d37b4760a9e95e88760a4d2c273baf2137e1c6893b0c6540f092f0a29de8f85cbe53bf84da5e508317404c96
+EBUILD wxperl-0.991.200.ebuild 666 SHA256 4f713cec4916ecf5e818fb7004cdb45484fc7c9b10f7ce8bceaadb88e19eacd6 SHA512 f2e364b061edd6b322927fa03228728a267774d3d01e94c5d938c0dec310246f698cb03c2b002fd12d5a43f11992dc9a4ea330a273f5e491a1936f19c3a14164 WHIRLPOOL 78c6ab6b132b11826304338f73e0cc6b4152d1e3f6e3be29ccb76a974b53b6d03d1ca89e0ec13e40c22df5160e8dc6b330737ca04fb0b4104d4139651b08bee8
+MISC ChangeLog 7150 SHA256 b0822f052019765fa453e36dfb554a4925b13b3f2bdf6766f7856e728459d8c3 SHA512 8c4b8ec0472c5059fbb6414e41a4e94656a18e905d00600ee6e97a4a2890bfa03ed0b9abf7331d77891dd8dee5b925063b371ca7270c8d5bf7ba3e9efc526704 WHIRLPOOL 1e6278a24bd181402e0545b613c7c679f93f3325ea9ab6e13258d4f8afd2db995d9ef0904c6e9f6243d86ec5c8787260e11a4418de664ccc2b06aa5862abb3df
 MISC metadata.xml 19384 SHA256 ca32fffc518593f84ccfdeb3d0a5eddf9f431d04816a4d644bd0ec19e1375b09 SHA512 960021b1bdb2dc1cf2148b1a13ed1d78dc5b5fe831790847edf87e09914d82745ebae2ec5b63e8dc192007f4a410ee9f4dbcb47b9c17f84960ccf2f9a90c7201 WHIRLPOOL f8970045ed0d264d4790b6336442e252391d5c4b57e15969e742d079a6ad618ba6ea09a108c1f062534c6fb3dfc857e53cf09e35ec9ddf22e89913fb0261f794

diff --git a/dev-perl/wxperl/wxperl-0.991.200.ebuild b/dev-perl/wxperl/wxperl-0.991.200.ebuild
new file mode 100644
index 0000000..3080c97
--- /dev/null
+++ b/dev-perl/wxperl/wxperl-0.991.200.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/wxperl/wxperl-0.991.200.ebuild,v 1.1 2012/09/24 18:13:42 tove Exp $
+
+EAPI=4
+
+MY_PN=Wx
+WX_GTK_VER="2.8"
+MODULE_AUTHOR=MDOOTSON
+MODULE_VERSION=0.9912
+inherit wxwidgets perl-module
+
+DESCRIPTION="Perl bindings for wxGTK"
+HOMEPAGE="http://wxperl.sourceforge.net/ ${HOMEPAGE}"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-perl/Alien-wxWidgets-0.25
+	>=virtual/perl-File-Spec-0.82
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-ParseXS-0.22.03
+	>=dev-perl/ExtUtils-XSpp-0.160.200
+"
+
+MAKEOPTS="${MAKEOPTS} -j1"

diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index c88f1b5..df0b36f 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -5,6 +5,7 @@ DIST geany-plugins-0.21.1.tar.gz 2652907 SHA256 e9d6eb4a65784be0a5c058f18309671d
 DIST geany-plugins-1.22.tar.gz 2836541 SHA256 3ea2b4e61934bbaf710222a4be15aec5c334fcddacf58194f006b7ee9cd9e768 SHA512 c5e239219e46bbe206578ed91f52ba044ad8c1f5a2b165ceed1392f39d6d8eb85447a0abb3359cd7ae48489cb41ef4f9b7ed6aa30d5adea0fcd037f33e90fdd0 WHIRLPOOL f745869183ee02cb9f320e8e5190f6f6cc7ce048e60c416509acf2ca152084da4b39f6d6ca35149dc55eae2e633afe8c4563eecddc98e28b0c82d81cb4ec6f3b
 EBUILD geany-plugins-0.20-r1.ebuild 1665 SHA256 2bb7d64f10ce990e93a74b44980c7b80011860005088260818356dcf2c4aaf34 SHA512 469651afb13f4f9e9459325fd70de6195cf257b0d23787785dd11d4e83bc8cd29b437a968400aeda85359b1cf57775fafa994ed2b9c4b04315d253554943cd74 WHIRLPOOL 108e1e1eab285659b09229c412854240cfb2191297006082c19c996551a6e88bc4fae9ace31f815177886e169079da88a350a3d128a886cd574789efe2423057
 EBUILD geany-plugins-0.21.1.ebuild 1677 SHA256 64ec29971d0f6d785cac4d19ac5b10011697dce9c085b328f3bf4c207a288316 SHA512 e371e38e75159338bb2c2fa50cbcf7d495cb31168a77145af31e71b27831656f6f00371762997fc928b6da6d2859cf46f57cf5f882a48236ef3228c6b9f453de WHIRLPOOL ddd6de6005be131bb3f39c991938baf1d79fedf8e7aa211a79ce72ac403be52f6160c07d20103d57ebe176fc0c40035f9f7218969dabd3c3a61526410d2ac709
-EBUILD geany-plugins-1.22.ebuild 2024 SHA256 05cba728640713bd340e5e9796a618fc96855a16db7db71a0cfed6ebaab92735 SHA512 9c7adb05144392b57da08b056ca139f7f138ec2200a67f754c8a0c52c71771d9af2656cb30d5eb70c05ecfa6c4e6fb738981a9f3edd610188891d3b67f004194 WHIRLPOOL f5d04888cc357032c8687aaac8e69b7bc7f9dd40c2619a242c05f14f7b2ebf5e1bedf1e27b5c2ff055f75c7c40f9653fc29ef5c3974f2ec4df58f6357b6b6615
-MISC ChangeLog 3180 SHA256 7033add189ba1936004ed5dc91b1707c21e163e37f58cdad2feebe2d8e226d92 SHA512 917176f7fc49bc276ee1d38bd42f3b112d581d6955220ab445ad4f629b385cb3d7e0aed3dbc33dbd099ec9d1a6b11444c78cc40ffde21b46ec597cc00fab9373 WHIRLPOOL b863c2b728d41a34266dc6f88e2ba69e3b3c169843349b78640988f809ea5b984305fca186499e9b7930fe6d18b876a0be2b9561481ca82424b3318e73f29e7b
+EBUILD geany-plugins-1.22-r1.ebuild 2138 SHA256 d51d63428f6e51fa539cf4db6321bebfa2c1f938f7f8c583e479def22102e4ea SHA512 47425244e86880ca0d06919871ddf7a245899d086c15910542fa10c8cd9b89654aabd79cbb9b0c22dec4b238253f68b22b3f8114ef21aa546f245ed83f73086f WHIRLPOOL aa28549e4ac59349e6401b8cbd3b048311747041c809ef0b98ba2f65b98bdccf8ee36e94199ca4a3073b808e05feb89491781deeea284468ce61ca793f0591f3
+EBUILD geany-plugins-1.22.ebuild 1960 SHA256 4979caea946964250fc2e3654187da3aae99d2a800b2f9bbf367369a879f4d0d SHA512 929b599c0095d0d91b3288cad12541c6283f3cfb2f715ecd3d43131a9eed498d0dfdabebfd437b1f7cc939f217c9713661b9db5f2c1df70e96e8c7b723ab4056 WHIRLPOOL 78317c47f7334cfba09699f98c26af45ae88c4c8be2c5794ce23411b230d8c13ff3d9da0ac9c2fe13c782156a2a93b393685e2789d8354242a288f5f01daaeb2
+MISC ChangeLog 3784 SHA256 006d22ccca087b3ed53f45d31a456a771cf719206dafed1b90481d37d72d4415 SHA512 82a07bedb9f0971c88aa07b4148ceae316af139ad4d7b7374f80a7805725ea73e2cd02a7806a87f3955249294913347986a44240ea8e0f1bf81fca92ff117e73 WHIRLPOOL 941b7ff0b27630b4d2b73955e2af280dbf31ee4825cdc9b9b9b8992551ede36a8a8c30c96fcc27d40e4148ddb0c7a59e7848744bdaffc7a23a46d9b0c9221de1
 MISC metadata.xml 980 SHA256 8c8b2e01f44222aee29c75fea76da9d41aea9fbf0b3337f9525e7a5a58a71820 SHA512 64092d74c34f8b7b0d0e418fbb0fe79800a44718a8c86f95c2e9e811e42b430c3ccee3a6c513085d4a6de8490071a93b00562e2242abad5892005f87797573c0 WHIRLPOOL 19517c6bcda41e14848b0c94d616f089a9e4a48131db02d98aaa2b9c8032eaa1373eefe1d62e1febf8e3f3b3cc1a7edd5c206526e739c5fd839adf7b860494f2

diff --git a/dev-util/geany-plugins/geany-plugins-1.22.ebuild b/dev-util/geany-plugins/geany-plugins-1.22-r1.ebuild
similarity index 84%
copy from dev-util/geany-plugins/geany-plugins-1.22.ebuild
copy to dev-util/geany-plugins/geany-plugins-1.22-r1.ebuild
index 778cff3..468d000 100644
--- a/dev-util/geany-plugins/geany-plugins-1.22.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.22-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/geany-plugins/geany-plugins-1.22.ebuild,v 1.2 2012/09/13 12:21:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/geany-plugins/geany-plugins-1.22-r1.ebuild,v 1.1 2012/09/26 05:33:52 binki Exp $
 
-EAPI="5"
+EAPI=4
 
-inherit autotools-utils versionator
+inherit autotools-utils vala versionator
 
 DESCRIPTION="A collection of different plugins for Geany"
 HOMEPAGE="http://plugins.geany.org/geany-plugins"
@@ -12,12 +12,12 @@ SRC_URI="http://plugins.geany.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debugger devhelp enchant gpg gtkspell lua multiterm nls soup webkit"
 
 LINGUAS="be ca da de es fr gl ja pt pt_BR ru tr zh_CN"
 
-RDEPEND=">=dev-util/geany-$(get_version_component_range 1-2):=
+RDEPEND=">=dev-util/geany-$(get_version_component_range 1-2)
 	dev-libs/libxml2:2
 	dev-libs/glib:2
 	debugger? ( x11-libs/vte:0 )
@@ -33,8 +33,9 @@ RDEPEND=">=dev-util/geany-$(get_version_component_range 1-2):=
 	gtkspell? ( app-text/gtkspell:2 )
 	lua? ( dev-lang/lua )
 	multiterm? (
+		$(vala_depend)
 		x11-libs/gtk+:2
-		x11-libs/vte:0
+		>=x11-libs/vte-0.28:0
 		)
 	soup? ( net-libs/libsoup )
 	webkit? (
@@ -46,6 +47,11 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig"
 
+src_prepare() {
+	autotools-utils_src_prepare
+	use multiterm && vala_src_prepare
+}
+
 src_configure() {
 	# GeanyGenDoc requires ctpl which isn't yet in portage
 	local myeconfargs=(

diff --git a/dev-util/geany-plugins/geany-plugins-1.22.ebuild b/dev-util/geany-plugins/geany-plugins-1.22.ebuild
index 778cff3..1467262 100644
--- a/dev-util/geany-plugins/geany-plugins-1.22.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/geany-plugins/geany-plugins-1.22.ebuild,v 1.2 2012/09/13 12:21:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/geany-plugins/geany-plugins-1.22.ebuild,v 1.5 2012/09/27 00:11:29 blueness Exp $
 
 EAPI="5"
 
@@ -12,8 +12,8 @@ SRC_URI="http://plugins.geany.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE="debugger devhelp enchant gpg gtkspell lua multiterm nls soup webkit"
+KEYWORDS="amd64 ppc x86"
+IUSE="debugger devhelp enchant gpg gtkspell lua nls soup webkit"
 
 LINGUAS="be ca da de es fr gl ja pt pt_BR ru tr zh_CN"
 
@@ -32,10 +32,6 @@ RDEPEND=">=dev-util/geany-$(get_version_component_range 1-2):=
 	gpg? ( app-crypt/gpgme )
 	gtkspell? ( app-text/gtkspell:2 )
 	lua? ( dev-lang/lua )
-	multiterm? (
-		x11-libs/gtk+:2
-		x11-libs/vte:0
-		)
 	soup? ( net-libs/libsoup )
 	webkit? (
 		net-libs/webkit-gtk:2
@@ -53,6 +49,7 @@ src_configure() {
 		--disable-cppcheck
 		--disable-extra-c-warnings
 		--disable-geanygendoc
+		--disable-multiterm
 		--enable-geanygdb
 		--enable-geanymacro
 		--enable-geanynumberedbookmarks
@@ -66,7 +63,6 @@ src_configure() {
 		$(use_enable enchant spellcheck)
 		$(use_enable gpg geanypg)
 		$(use_enable gtkspell)
-		$(use_enable multiterm)
 		$(use_enable lua geanylua)
 		$(use_enable nls)
 		# Having updatechecker... when you're using a package manager?

diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index 5393013..0c57c52 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -1,6 +1,7 @@
 DIST geany-0.21.tar.bz2 3109890 SHA256 cc0609d4c4d3bd8cf772bc4994d51cb1f79a12da5a82f2335a381293c5123a8c SHA512 c9e964279ebd84f4fe1dffa73b4771483df011f7a521758a154f1ea1a3ee56d487427d45c6d59c1de3f6267187d2a21aaa08a83b416b32f9fd04e9d7ceff5582 WHIRLPOOL e8584cd5b33cf67c4762aa1f8e36c4caaf971d168947348e93a69b6a6da20a9deeb5f634a50cd4384052b0fdbc0712eb60e8666637810cd937520b994beb4127
 DIST geany-1.22.tar.bz2 3198289 SHA256 901a35a7395ef10a80fb10b3ab63bae3871693a4e82d56388e9521a27877577e SHA512 59c411dc8df9f92fd26dc1c4ba65d18c92a2a9e84ae4413153d697ccd90f00d1d437ce63700e3198869dc11dcb8c81920df57a75b5a95cebeb88a364418869cc WHIRLPOOL 8c63308feecf1abb730671c077efc97ee788ac2bed90d0400b7480946eeb9c84e16a3c7b38a46f356eb6f51d68972c8b7b4c0c62b37a3ab95ff003a712a494d0
 EBUILD geany-0.21-r1.ebuild 1438 SHA256 76486248d4b81f80f83c4b5765b7d041689477a0e32e0c7d9ed6df190b13881b SHA512 1455950903de12395a33843a6f7041015db8825db2848fced346b44a19fcbe335179b5581fc49e0908c318fa719d51434e892f68a15c68bb003fa69934feaec9 WHIRLPOOL 5cfeb108b1a74e765725c82a8aba063745d399bd6d891ab54454613edab251b9ce61bd2845cabf884989d2a4ebaf49bb71ca6b01e3e57802cae947f5d93ba922
-EBUILD geany-1.22.ebuild 1455 SHA256 a7b45251bd2b7a67db0e82be59f7b76243304efd500068fcd51e17141af2085c SHA512 8c211cc832f5f1f60047a92a86b7fdd069f223aa665969a6c288bf04927bef5bb7cead8216b5e50e4339441cc60c51c0bdc8c88ca43c9c038f4831e18c3b10d1 WHIRLPOOL df8b331dedcc5d01a617074ba59a47f9bf9f43770ddd295949f5d43465a692f3dd51ecde1a3b29e9d307d2a5a50fc06178e53f993fcd3418bcc8d175e919ab08
-MISC ChangeLog 7263 SHA256 fac09112963ec8b5e572b31c1fd318883672bc5ff7d9e8d5adcde556b76bae0a SHA512 4179bd4814b5457e6a7fae25f8f0ac4ead573845aebf241a0fd6e3a2c530cd8e14ad66acb12b6067dbc4064f256a65fd040810d682274059134d652961b647cb WHIRLPOOL 85b411863d1b24c486da4efee4702e35d2bac27bb9d0d115e520a763c30563ed9eb4586f1d981ef6f76caf8c368c767528bee5c4bb3c6099a5cbce800e49423f
+EBUILD geany-1.22.ebuild 1458 SHA256 fb05b4d950bd31d1bea128e2f1b6c6c2566a140f4893236ee7c148950e86d900 SHA512 5bbe2ef0d0cca997d4c4c68108cd5e3703c4f5ce03e9fc4870436f84c7c2b3587969cbfefa6d142e2b3f62361211d95db1a11691082e6e297ceb3ff6d86b600c WHIRLPOOL c04bacdefc3ffe42155bb604400fbce9c26b6ac77aab47f11703c04c3d47010664b86e26422f175f9ed5171aec6c4ac1af5e9ef2120f22a3a8cd6bea8b2b2068
+MISC ChangeLog 7472 SHA256 c0725b5382b455b1dd3f9f465efb7d98d01158c0032646babb9250b7e2603c1a SHA512 ec419e9f80c20b4eaec48bdda87092c804258eafa8bb517079dbac148bb239cc86fcac12ab9acc3203ec9f694fab732546588cb4ad5e1d00223aed34891db378 WHIRLPOOL cfe9ffc62c290ba436122502332577b6f83ca6dfd0756cce6b56e2125891ec1a0e5de9c3eacde9693042419c41e52113c2149d5ff501ea9899ea62beb2986792
+MISC geany-1.22.ebuild.rej 341 SHA256 3f64f8e1d2f7a2faf2b331a280fc3b1602918d20b970d52e3037f8f21d9128cf SHA512 c7312a9c663dd771a3d29b622f31d441adf8e898a682708acc707163d792665f529b2c5776967848cf614f53ebfe3fed7ed2df668eebb63d40ffa5004c11b1e5 WHIRLPOOL 1de072cd5a92d1d5bb78417f3dbca584572306038bf4a34ba9c95393711db8df93fb240ba7c425323d9aa55e1519171fe08ba01f7e8f50f0fe4c30520f00a158
 MISC metadata.xml 1922 SHA256 2a7ea9ffd1605dbce99497564a98bbb49d20c2d62f11fed8c1d39ce7988645d4 SHA512 8d54c284469f12733610b66947c75e055bb46f41213573ce811e8fd2d48b3a90e822c753118d0a213e0f1262dd513681dede592fd27ef814b6455725ab186e57 WHIRLPOOL 041975002890b1fd0d28adb1823ec38da865efbd307666777fb1839c5e9f82d465c497f8e846845fa692cacff221e6eb0eb53083c0b8867fefb7e3d23d5e1441

diff --git a/dev-util/geany/geany-1.22.ebuild b/dev-util/geany/geany-1.22.ebuild
index 806e371..09dd034 100644
--- a/dev-util/geany/geany-1.22.ebuild
+++ b/dev-util/geany/geany-1.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/geany/geany-1.22.ebuild,v 1.3 2012/09/13 12:20:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/geany/geany-1.22.ebuild,v 1.5 2012/09/27 00:08:59 blueness Exp $
 
 EAPI="5"
 inherit eutils gnome2-utils
@@ -14,7 +14,7 @@ SRC_URI="http://download.geany.org/${P}.tar.bz2"
 
 LICENSE="GPL-2 Scintilla"
 SLOT="0/1"
-KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+vte"
 
 RDEPEND=">=x11-libs/gtk+-2.16:2

diff --git a/dev-util/geany/geany-1.22.ebuild.rej b/dev-util/geany/geany-1.22.ebuild.rej
new file mode 100644
index 0000000..92e58dd
--- /dev/null
+++ b/dev-util/geany/geany-1.22.ebuild.rej
@@ -0,0 +1,11 @@
+--- dev-util/geany/geany-1.22.ebuild	2012-09-24 09:44:25.000000000 -0400
++++ dev-util/geany/geany-1.22.ebuild	2012-09-24 13:58:43.000000000 -0400
+@@ -13,7 +13,7 @@
+ SRC_URI="http://download.geany.org/${P}.tar.bz2"
+ 
+ LICENSE="GPL-2 Scintilla"
+-SLOT="0"
++SLOT="0/1"
+ KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+ IUSE="+vte"
+ 

diff --git a/dev-vcs/gitolite/Manifest b/dev-vcs/gitolite/Manifest
index da9ed51..5a75d56 100644
--- a/dev-vcs/gitolite/Manifest
+++ b/dev-vcs/gitolite/Manifest
@@ -10,6 +10,6 @@ EBUILD gitolite-2.2.ebuild 1734 SHA256 82fc1a5e80d6fb826e9cefc1450f3a3af0847d046
 EBUILD gitolite-2.3.1.ebuild 1751 SHA256 219f29141b7ddf74101d43b0b523b64cdfb73ce386b9062e989ce76259a0479b SHA512 643d69490835e1cc576d7a8845357f08b42329c11cb4ca367865fa7b2b6c2715fd60dcb6d8ee567903f2d19b90e7d8a50f8fa183fd29667479ed13f55b88fd1b WHIRLPOOL db835457d04b34fc6042703930d5b8cf72bcf38053cc06d0e28eda0443ee5456759acae20fb267f6a322735de50f01745ef6b42d6b42604fdf500e34d90532c9
 EBUILD gitolite-2.3.ebuild 1740 SHA256 f4932f5ceed77b0c1867f378f04ab9df3e62072472351247245cf12f830e1294 SHA512 78b8bcc965f7b7e54fcc04e99dac225505092218eae3c9547e0ca56993d682ee5762cf17373093d5131c1dc8c942edb022ed78d1aa9d82aae2fbdc42d118a196 WHIRLPOOL 6c82f94547447a51b4b80bdc09244df495847ccf0c57522c00c355c42759c334fe67032438c817596cb3fc24b267505b3ec71fb8d6a3846b1154d543f5df0cc8
 EBUILD gitolite-3.03.ebuild 2131 SHA256 f281e839c853aabe12bef757b4b80e96b9735756fd92b0b343763a965d640c96 SHA512 ee9a08bf4bac1846ef76c7a620917c422ad1d7abee533d7e2588cc995531b353587db2f1b95911404916d7f014f10a31c60781c7485f9691ac5c8d8d8f1a8d04 WHIRLPOOL 4a61c31e458580f0d6280be83607f96900e0ec644a70a7e87325834482f729c9cd5c3842eda30cc642b21d4df73169ee96c475ef4e4000cc825d42889380c797
-EBUILD gitolite-3.04.ebuild 1914 SHA256 3ef95d9349346009c714b07fda01e0394821dce9e34675b17d1bf70106727ba4 SHA512 4041c3220e259793c9be13f65655182ddbd9c4d25e81c0391cf452da17ed7d8f6401c6faccab9c24d38ed1b1a4c29384a43b29fa9c93b691818dd6505fd5944a WHIRLPOOL 0529d9fe3ccd4e6029d7f4b39ba72317ad89d561051f19134b7284e0b2f59be6b7d5d91429547af2e8c507ec376af6a05ee8422859cedd1f53cab523b0ed65a5
-MISC ChangeLog 3629 SHA256 14971669cf2ad5b60b5a2803f4765642e9e8fc7dfa2b6638b3fa59362f411cab SHA512 3c3c545cd707721c8c59dc138a120a2bfafd7169cd870b4dadfb7dcf1b172810c2555ea46ba74f5d2591c3d299c11c9fdc227d63f00708e54fa6199932bfc7a5 WHIRLPOOL 46d821240b89fcb9866e130929b4341ad8d11f3f6683b479e1c04968be8e3c5b09b48ad12af7b535fc1fc48f46077792acf201160f8526bd3bf585d624d4439b
+EBUILD gitolite-3.04.ebuild 1945 SHA256 62f5e6e5811d7100795c09b1faa3b35d75fb7d6b77a4a420e5f5c1b09ace2ea3 SHA512 10073ad6f1b2c5fd592c71ec97427cbe0d5cbe734e462d4c2ce117fef2295b9309a6a8262bfbf50f722d4842dae20c3096cb9e7108be2f7bc3625a17fb879bf5 WHIRLPOOL 1286716ab88b25400a2e8ca92f7b94a8e0322cc1400175c829ba8e6ae1027782dbe70b7db066157161eedd7bbf3c080e9e42013c6cc3d80b46295941d1a993c9
+MISC ChangeLog 3770 SHA256 30718d9cbc3f89f11d0d3b7ed07f0f2c8531d75a5ea4fe27deba1220320fb2aa SHA512 77b8e491cdcf3e1c0d5374493c9887f2a83b2c09c63723a9b6d06a451deffb2b4244c50d99c647ed329e4d9adfcaec74e5ce802082b33cf42ee0396715dc7cdf WHIRLPOOL 180e8df28a4f922630e6d2405a03e56da346e9b0b1f40e5c0f5824e398ba02ffe972b6d7423079140b80c6a14ad5ebf5d3cbdd760aebf675c059c65420ee5bbc
 MISC metadata.xml 779 SHA256 b4ffa2d440bbd0bad5a09952ae8b0240b7056ad2773cd36c617d89ac0b589e8b SHA512 119a713d329854b20633d292fddd5e38f2292a81c76de4fe776cb06168ba03a2bde59b954b5453ec5232645516a62b2d0a2ec68ad27f9d011dbc309ebd1d123a WHIRLPOOL 1abe55643411d0c9a0750d221784ecd085916a3f806af052b6c5c8dc93844bed9897400535545d387697663cd1bec73b37f7fbc25956d517583eef156b945cf7

diff --git a/dev-vcs/gitolite/gitolite-3.04.ebuild b/dev-vcs/gitolite/gitolite-3.04.ebuild
index 2a52278..9946648 100644
--- a/dev-vcs/gitolite/gitolite-3.04.ebuild
+++ b/dev-vcs/gitolite/gitolite-3.04.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-3.04.ebuild,v 1.1 2012/08/26 13:00:38 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-3.04.ebuild,v 1.2 2012/09/22 15:17:47 idl0r Exp $
 
 EAPI="5"
 
-inherit eutils perl-module user
+inherit eutils perl-module user versionator
 
 DESCRIPTION="Highly flexible server for git directory version tracker"
 HOMEPAGE="http://github.com/sitaramc/gitolite"
@@ -68,11 +68,12 @@ src_install() {
 }
 
 pkg_postinst() {
-	if has_version "=dev-vcs/gitolite-2*"; then
+	if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
 		ewarn
 		elog "***NOTE** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
 		elog "Please read http://sitaramc.github.com/gitolite/install.html#migr first!"
 	fi
+
 	# bug 352291
 	ewarn
 	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."

diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass
deleted file mode 100644
index 3cd17dd..0000000
--- a/eclass/autotools-utils.eclass
+++ /dev/null
@@ -1,497 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.56 2012/06/08 17:50:10 mgorny Exp $
-
-# @ECLASS: autotools-utils.eclass
-# @MAINTAINER:
-# Maciej Mrozowski <reavertm@g.o>
-# Michał Górny <mgorny@g.o>
-# @BLURB: common ebuild functions for autotools-based packages
-# @DESCRIPTION:
-# autotools-utils.eclass is autotools.eclass(5) and base.eclass(5) wrapper
-# providing all inherited features along with econf arguments as Bash array,
-# out of source build with overridable build dir location, static archives
-# handling, libtool files removal.
-#
-# Please note that autotools-utils does not support mixing of its phase
-# functions with regular econf/emake calls. If necessary, please call
-# autotools-utils_src_compile instead of the latter.
-#
-# @EXAMPLE:
-# Typical ebuild using autotools-utils.eclass:
-#
-# @CODE
-# EAPI="2"
-#
-# inherit autotools-utils
-#
-# DESCRIPTION="Foo bar application"
-# HOMEPAGE="http://example.org/foo/"
-# SRC_URI="mirror://sourceforge/foo/${P}.tar.bz2"
-#
-# LICENSE="LGPL-2.1"
-# KEYWORDS=""
-# SLOT="0"
-# IUSE="debug doc examples qt4 static-libs tiff"
-#
-# CDEPEND="
-# 	media-libs/libpng:0
-# 	qt4? (
-# 		x11-libs/qt-core:4
-# 		x11-libs/qt-gui:4
-# 	)
-# 	tiff? ( media-libs/tiff:0 )
-# "
-# RDEPEND="${CDEPEND}
-# 	!media-gfx/bar
-# "
-# DEPEND="${CDEPEND}
-# 	doc? ( app-doc/doxygen )
-# "
-#
-# # bug 123456
-# AUTOTOOLS_IN_SOURCE_BUILD=1
-#
-# DOCS=(AUTHORS ChangeLog README "Read me.txt" TODO)
-#
-# PATCHES=(
-# 	"${FILESDIR}/${P}-gcc44.patch" # bug 123458
-# 	"${FILESDIR}/${P}-as-needed.patch"
-# 	"${FILESDIR}/${P}-unbundle_libpng.patch"
-# )
-#
-# src_configure() {
-# 	local myeconfargs=(
-# 		$(use_enable debug)
-# 		$(use_with qt4)
-# 		$(use_enable threads multithreading)
-# 		$(use_with tiff)
-# 	)
-# 	autotools-utils_src_configure
-# }
-#
-# src_compile() {
-# 	autotools-utils_src_compile
-# 	use doc && autotools-utils_src_compile docs
-# }
-#
-# src_install() {
-# 	use doc && HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}/apidocs/html/")
-# 	autotools-utils_src_install
-# 	if use examples; then
-# 		dobin "${AUTOTOOLS_BUILD_DIR}"/foo_example{1,2,3} \\
-# 			|| die 'dobin examples failed'
-# 	fi
-# }
-#
-# @CODE
-
-# Keep variable names synced with cmake-utils and the other way around!
-
-case ${EAPI:-0} in
-	2|3|4|5) ;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-# @ECLASS-VARIABLE: AUTOTOOLS_AUTORECONF
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Set to a non-empty value in order to enable running autoreconf
-# in src_prepare() and adding autotools dependencies.
-#
-# This is usually necessary when using live sources or applying patches
-# modifying configure.ac or Makefile.am files. Note that in the latter case
-# setting this variable is obligatory even though the eclass will work without
-# it (to add the necessary dependencies).
-#
-# The eclass will try to determine the correct autotools to run including a few
-# external tools: gettext, glib-gettext, intltool, gtk-doc, gnome-doc-prepare.
-# If your tool is not supported, please open a bug and we'll add support for it.
-#
-# Note that dependencies are added for autoconf, automake and libtool only.
-# If your package needs one of the external tools listed above, you need to add
-# appropriate packages to DEPEND yourself.
-[[ ${AUTOTOOLS_AUTORECONF} ]] || : ${AUTOTOOLS_AUTO_DEPEND:=no}
-
-inherit autotools eutils libtool
-
-EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test
-
-# @ECLASS-VARIABLE: AUTOTOOLS_BUILD_DIR
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Build directory, location where all autotools generated files should be
-# placed. For out of source builds it defaults to ${WORKDIR}/${P}_build.
-
-# @ECLASS-VARIABLE: AUTOTOOLS_IN_SOURCE_BUILD
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Set to enable in-source build.
-
-# @ECLASS-VARIABLE: ECONF_SOURCE
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Specify location of autotools' configure script. By default it uses ${S}.
-
-# @ECLASS-VARIABLE: myeconfargs
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Optional econf arguments as Bash array. Should be defined before calling src_configure.
-# @CODE
-# src_configure() {
-# 	local myeconfargs=(
-# 		--disable-readline
-# 		--with-confdir="/etc/nasty foo confdir/"
-# 		$(use_enable debug cnddebug)
-# 		$(use_enable threads multithreading)
-# 	)
-# 	autotools-utils_src_configure
-# }
-# @CODE
-
-# @ECLASS-VARIABLE: DOCS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Array containing documents passed to dodoc command.
-#
-# Example:
-# @CODE
-# DOCS=( NEWS README )
-# @CODE
-
-# @ECLASS-VARIABLE: HTML_DOCS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Array containing documents passed to dohtml command.
-#
-# Example:
-# @CODE
-# HTML_DOCS=( doc/html/ )
-# @CODE
-
-# @ECLASS-VARIABLE: PATCHES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# PATCHES array variable containing all various patches to be applied.
-#
-# Example:
-# @CODE
-# PATCHES=( "${FILESDIR}"/${P}-mypatch.patch )
-# @CODE
-
-# Determine using IN or OUT source build
-_check_build_dir() {
-	: ${ECONF_SOURCE:=${S}}
-	if [[ -n ${AUTOTOOLS_IN_SOURCE_BUILD} ]]; then
-		AUTOTOOLS_BUILD_DIR="${ECONF_SOURCE}"
-	else
-		: ${AUTOTOOLS_BUILD_DIR:=${WORKDIR}/${P}_build}
-	fi
-	echo ">>> Working in BUILD_DIR: \"$AUTOTOOLS_BUILD_DIR\""
-}
-
-# @FUNCTION: remove_libtool_files
-# @USAGE: [all]
-# @DESCRIPTION:
-# Determines unnecessary libtool files (.la) and libtool static archives (.a)
-# and removes them from installation image.
-#
-# To unconditionally remove all libtool files, pass 'all' as argument.
-# Otherwise, libtool archives required for static linking will be preserved.
-#
-# In most cases it's not necessary to manually invoke this function.
-# See autotools-utils_src_install for reference.
-remove_libtool_files() {
-	debug-print-function ${FUNCNAME} "$@"
-	local removing_all
-
-	eqawarn "The remove_libtool_files() function was deprecated."
-	eqawarn "Please use prune_libtool_files() from eutils eclass instead."
-
-	[[ ${#} -le 1 ]] || die "Invalid number of args to ${FUNCNAME}()"
-	if [[ ${#} -eq 1 ]]; then
-		case "${1}" in
-			all)
-				removing_all=1
-				;;
-			*)
-				die "Invalid argument to ${FUNCNAME}(): ${1}"
-		esac
-	fi
-
-	local pc_libs=()
-	if [[ ! ${removing_all} ]]; then
-		local arg
-		for arg in $(find "${D}" -name '*.pc' -exec \
-					sed -n -e 's;^Libs:;;p' {} +); do
-			[[ ${arg} == -l* ]] && pc_libs+=(lib${arg#-l}.la)
-		done
-	fi
-
-	local f
-	find "${D}" -type f -name '*.la' -print0 | while read -r -d '' f; do
-		local shouldnotlink=$(sed -ne '/^shouldnotlink=yes$/p' "${f}")
-		local archivefile=${f/%.la/.a}
-		[[ "${f}" != "${archivefile}" ]] || die 'regex sanity check failed'
-
-		# Remove static libs we're not supposed to link against.
-		if [[ ${shouldnotlink} ]]; then
-			einfo "Removing unnecessary ${archivefile#${D%/}}"
-			rm -f "${archivefile}" || die
-			# The .la file may be used by a module loader, so avoid removing it
-			# unless explicitly requested.
-			[[ ${removing_all} ]] || continue
-		fi
-
-		# Remove .la files when:
-		# - user explicitly wants us to remove all .la files,
-		# - respective static archive doesn't exist,
-		# - they are covered by a .pc file already,
-		# - they don't provide any new information (no libs & no flags).
-		local removing
-		if [[ ${removing_all} ]]; then removing='forced'
-		elif [[ ! -f ${archivefile} ]]; then removing='no static archive'
-		elif has "$(basename "${f}")" "${pc_libs[@]}"; then
-			removing='covered by .pc'
-		elif [[ ! $(sed -n -e \
-			"s/^\(dependency_libs\|inherited_linker_flags\)='\(.*\)'$/\2/p" \
-			"${f}") ]]; then removing='no libs & flags'
-		fi
-
-		if [[ ${removing} ]]; then
-			einfo "Removing unnecessary ${f#${D%/}} (${removing})"
-			rm -f "${f}" || die
-		fi
-	done
-}
-
-# @FUNCTION: autotools-utils_autoreconf
-# @DESCRIPTION:
-# Reconfigure the sources (like gnome-autogen.sh or eautoreconf).
-autotools-utils_autoreconf() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	eqawarn "The autotools-utils_autoreconf() function was deprecated."
-	eqawarn "Please call autotools-utils_src_prepare()"
-	eqawarn "with AUTOTOOLS_AUTORECONF set instead."
-
-	# Override this func to not require unnecessary eaclocal calls.
-	autotools_check_macro() {
-		local x
-
-		# Add a few additional variants as we don't get expansions.
-		[[ ${1} = AC_CONFIG_HEADERS ]] && set -- "${@}" \
-			AC_CONFIG_HEADER AM_CONFIG_HEADER
-
-		for x; do
-			grep -h "^${x}" configure.{ac,in} 2>/dev/null
-		done
-	}
-
-	einfo "Autoreconfiguring '${PWD}' ..."
-
-	local auxdir=$(sed -n -e 's/^AC_CONFIG_AUX_DIR(\(.*\))$/\1/p' \
-			configure.{ac,in} 2>/dev/null)
-	if [[ ${auxdir} ]]; then
-		auxdir=${auxdir%%]}
-		mkdir -p ${auxdir##[}
-	fi
-
-	# Support running additional tools like gnome-autogen.sh.
-	# Note: you need to add additional depends to the ebuild.
-
-	# gettext
-	if [[ $(autotools_check_macro AM_GLIB_GNU_GETTEXT) ]]; then
-		echo 'no' | autotools_run_tool glib-gettextize --copy --force
-	elif [[ $(autotools_check_macro AM_GNU_GETTEXT) ]]; then
-		eautopoint --force
-	fi
-
-	# intltool
-	if [[ $(autotools_check_macro AC_PROG_INTLTOOL IT_PROG_INTLTOOL) ]]
-	then
-		autotools_run_tool intltoolize --copy --automake --force
-	fi
-
-	# gtk-doc
-	if [[ $(autotools_check_macro GTK_DOC_CHECK) ]]; then
-		autotools_run_tool gtkdocize --copy
-	fi
-
-	# gnome-doc
-	if [[ $(autotools_check_macro GNOME_DOC_INIT) ]]; then
-		autotools_run_tool gnome-doc-prepare --copy --force
-	fi
-
-	if [[ $(autotools_check_macro AC_PROG_LIBTOOL AM_PROG_LIBTOOL LT_INIT) ]]
-	then
-		_elibtoolize --copy --force --install
-	fi
-
-	eaclocal
-	eautoconf
-	eautoheader
-	FROM_EAUTORECONF=sure eautomake
-
-	local x
-	for x in $(autotools_check_macro_val AC_CONFIG_SUBDIRS); do
-		if [[ -d ${x} ]] ; then
-			pushd "${x}" >/dev/null || die
-			autotools-utils_autoreconf
-			popd >/dev/null || die
-		fi
-	done
-}
-
-# @FUNCTION: autotools-utils_src_prepare
-# @DESCRIPTION:
-# The src_prepare function.
-#
-# Supporting PATCHES array and user patches. See base.eclass(5) for reference.
-autotools-utils_src_prepare() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local want_autoreconf=${AUTOTOOLS_AUTORECONF}
-
-	[[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
-
-	at_checksum() {
-		find '(' -name 'Makefile.am' \
-			-o -name 'configure.ac' \
-			-o -name 'configure.in' ')' \
-			-exec cksum {} + | sort -k2
-	}
-
-	[[ ! ${want_autoreconf} ]] && local checksum=$(at_checksum)
-	epatch_user
-	if [[ ! ${want_autoreconf} ]]; then
-		if [[ ${checksum} != $(at_checksum) ]]; then
-			einfo 'Will autoreconfigure due to user patches applied.'
-			want_autoreconf=yep
-		fi
-	fi
-
-	[[ ${want_autoreconf} ]] && eautoreconf
-	elibtoolize --patch-only
-}
-
-# @FUNCTION: autotools-utils_src_configure
-# @DESCRIPTION:
-# The src_configure function. For out of source build it creates build
-# directory and runs econf there. Configuration parameters defined
-# in myeconfargs are passed here to econf. Additionally following USE
-# flags are known:
-#
-# IUSE="static-libs" passes --enable-shared and either --disable-static/--enable-static
-# to econf respectively.
-autotools-utils_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ -z ${myeconfargs+1} || $(declare -p myeconfargs) == 'declare -a'* ]] \
-		|| die 'autotools-utils.eclass: myeconfargs has to be an array.'
-
-	[[ ${EAPI} == 2 ]] && ! use prefix && EPREFIX=
-
-	# Common args
-	local econfargs=()
-
-	_check_build_dir
-	if "${ECONF_SOURCE}"/configure --help 2>&1 | grep -q '^ *--docdir='; then
-		econfargs+=(
-			--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		)
-	fi
-
-	# Handle static-libs found in IUSE, disable them by default
-	if in_iuse static-libs; then
-		econfargs+=(
-			--enable-shared
-			$(use_enable static-libs static)
-		)
-	fi
-
-	# Append user args
-	econfargs+=("${myeconfargs[@]}")
-
-	mkdir -p "${AUTOTOOLS_BUILD_DIR}" || die "mkdir '${AUTOTOOLS_BUILD_DIR}' failed"
-	pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die
-	econf "${econfargs[@]}" "$@"
-	popd > /dev/null || die
-}
-
-# @FUNCTION: autotools-utils_src_compile
-# @DESCRIPTION:
-# The autotools src_compile function, invokes emake in specified AUTOTOOLS_BUILD_DIR.
-autotools-utils_src_compile() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	_check_build_dir
-	pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die
-	emake "$@" || die 'emake failed'
-	popd > /dev/null || die
-}
-
-# @FUNCTION: autotools-utils_src_install
-# @DESCRIPTION:
-# The autotools src_install function. Runs emake install, unconditionally
-# removes unnecessary static libs (based on shouldnotlink libtool property)
-# and removes unnecessary libtool files when static-libs USE flag is defined
-# and unset.
-#
-# DOCS and HTML_DOCS arrays are supported. See base.eclass(5) for reference.
-autotools-utils_src_install() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	_check_build_dir
-	pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die
-	emake DESTDIR="${D}" "$@" install || die "emake install failed"
-	popd > /dev/null || die
-
-	# Move docs installed by autotools (in EAPI < 4).
-	if [[ ${EAPI} == [23] ]] \
-			&& path_exists "${D}${EPREFIX}"/usr/share/doc/${PF}/*; then
-		if [[ $(find "${D}${EPREFIX}"/usr/share/doc/${PF}/* -type d) ]]; then
-			eqawarn "autotools-utils: directories in docdir require at least EAPI 4"
-		else
-			mkdir "${T}"/temp-docdir
-			mv "${D}${EPREFIX}"/usr/share/doc/${PF}/* "${T}"/temp-docdir/ \
-				|| die "moving docs to tempdir failed"
-
-			dodoc "${T}"/temp-docdir/* || die "docdir dodoc failed"
-			rm -r "${T}"/temp-docdir || die
-		fi
-	fi
-
-	# XXX: support installing them from builddir as well?
-	if [[ ${DOCS} ]]; then
-		dodoc "${DOCS[@]}" || die "dodoc failed"
-	else
-		local f
-		# same list as in PMS
-		for f in README* ChangeLog AUTHORS NEWS TODO CHANGES \
-				THANKS BUGS FAQ CREDITS CHANGELOG; do
-			if [[ -s ${f} ]]; then
-				dodoc "${f}" || die "(default) dodoc ${f} failed"
-			fi
-		done
-	fi
-	if [[ ${HTML_DOCS} ]]; then
-		dohtml -r "${HTML_DOCS[@]}" || die "dohtml failed"
-	fi
-
-	# Remove libtool files and unnecessary static libs
-	prune_libtool_files
-}
-
-# @FUNCTION: autotools-utils_src_test
-# @DESCRIPTION:
-# The autotools src_test function. Runs emake check in build directory.
-autotools-utils_src_test() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	_check_build_dir
-	pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die
-	# Run default src_test as defined in ebuild.sh
-	default_src_test
-	popd > /dev/null || die
-}

diff --git a/eclass/base.eclass b/eclass/base.eclass
deleted file mode 100644
index f9e28be..0000000
--- a/eclass/base.eclass
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.57 2012/07/09 02:38:05 floppym Exp $
-
-# @ECLASS: base.eclass
-# @MAINTAINER:
-# QA Team <qa@g.o>
-# @AUTHOR:
-# Original author: Dan Armak <danarmak@g.o>
-# @BLURB: The base eclass defines some default functions and variables.
-# @DESCRIPTION:
-# The base eclass defines some default functions and variables.
-
-if [[ ${___ECLASS_ONCE_BASE} != "recur -_+^+_- spank" ]] ; then
-___ECLASS_ONCE_BASE="recur -_+^+_- spank"
-
-inherit eutils
-
-BASE_EXPF="src_unpack src_compile src_install"
-case "${EAPI:-0}" in
-	2|3|4|5) BASE_EXPF+=" src_prepare src_configure" ;;
-	*) ;;
-esac
-
-EXPORT_FUNCTIONS ${BASE_EXPF}
-
-# @ECLASS-VARIABLE: DOCS
-# @DESCRIPTION:
-# Array containing documents passed to dodoc command.
-#
-# DOCS=( "${S}/doc/document.txt" "${S}/doc/doc_folder/" )
-
-# @ECLASS-VARIABLE: HTML_DOCS
-# @DESCRIPTION:
-# Array containing documents passed to dohtml command.
-#
-# HTML_DOCS=( "${S}/doc/document.html" "${S}/doc/html_folder/" )
-
-# @ECLASS-VARIABLE: PATCHES
-# @DESCRIPTION:
-# PATCHES array variable containing all various patches to be applied.
-# This variable is expected to be defined in global scope of ebuild.
-# Make sure to specify the full path. This variable is utilised in
-# src_unpack/src_prepare phase based on EAPI.
-#
-# NOTE: if using patches folders with special file suffixes you have to
-# define one additional variable EPATCH_SUFFIX="something"
-#
-# PATCHES=( "${FILESDIR}/mypatch.patch" "${FILESDIR}/patches_folder/" )
-
-
-# @FUNCTION: base_src_unpack
-# @DESCRIPTION:
-# The base src_unpack function, which is exported.
-# Calls also src_prepare with eapi older than 2.
-base_src_unpack() {
-	debug-print-function $FUNCNAME "$@"
-
-	pushd "${WORKDIR}" > /dev/null
-
-	if [[ $(type -t unpacker_src_unpack) == "function" ]] ; then
-		unpacker_src_unpack
-	elif [[ -n ${A} ]] ; then
-		unpack ${A}
-	fi
-	has src_prepare ${BASE_EXPF} || base_src_prepare
-
-	popd > /dev/null
-}
-
-# @FUNCTION: base_src_prepare
-# @DESCRIPTION:
-# The base src_prepare function, which is exported
-# EAPI is greater or equal to 2. Here the PATCHES array is evaluated.
-base_src_prepare() {
-	debug-print-function $FUNCNAME "$@"
-	debug-print "$FUNCNAME: PATCHES=$PATCHES"
-
-	local patches_failed=0
-
-	pushd "${S}" > /dev/null
-	if [[ "$(declare -p PATCHES 2>/dev/null 2>&1)" == "declare -a"* ]]; then
-		for x in "${PATCHES[@]}"; do
-			debug-print "$FUNCNAME: applying patch from ${x}"
-			if [[ -d "${x}" ]]; then
-				# Use standardized names and locations with bulk patching
-				# Patch directory is ${WORKDIR}/patch
-				# See epatch() in eutils.eclass for more documentation
-				EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}
-
-				# in order to preserve normal EPATCH_SOURCE value that can
-				# be used other way than with base eclass store in local
-				# variable and restore later
-				oldval=${EPATCH_SOURCE}
-				EPATCH_SOURCE=${x}
-				EPATCH_FORCE=yes
-				epatch
-				EPATCH_SOURCE=${oldval}
-			elif [[ -f "${x}" ]]; then
-				epatch "${x}"
-			else
-				ewarn "QA: File or directory \"${x}\" does not exist."
-				ewarn "QA: Check your PATCHES array or add missing file/directory."
-				patches_failed=1
-			fi
-		done
-		[[ ${patches_failed} -eq 1 ]] && die "Some patches failed. See above messages."
-	else
-		for x in ${PATCHES}; do
-			debug-print "$FUNCNAME: patching from ${x}"
-			epatch "${x}"
-		done
-	fi
-
-	# Apply user patches
-	debug-print "$FUNCNAME: applying user patches"
-	epatch_user
-
-	popd > /dev/null
-}
-
-# @FUNCTION: base_src_configure
-# @DESCRIPTION:
-# The base src_configure function, which is exported when
-# EAPI is greater or equal to 2. Runs basic econf.
-base_src_configure() {
-	debug-print-function $FUNCNAME "$@"
-
-	# there is no pushd ${S} so we can override its place where to run
-	[[ -x ${ECONF_SOURCE:-.}/configure ]] && econf "$@"
-}
-
-# @FUNCTION: base_src_compile
-# @DESCRIPTION:
-# The base src_compile function, calls src_configure with
-# EAPI older than 2.
-base_src_compile() {
-	debug-print-function $FUNCNAME "$@"
-
-	has src_configure ${BASE_EXPF} || base_src_configure
-	base_src_make "$@"
-}
-
-# @FUNCTION: base_src_make
-# @DESCRIPTION:
-# Actual function that runs emake command.
-base_src_make() {
-	debug-print-function $FUNCNAME "$@"
-
-	if [[ -f Makefile || -f GNUmakefile || -f makefile ]]; then
-		emake "$@" || die "died running emake, $FUNCNAME"
-	fi
-}
-
-# @FUNCTION: base_src_install
-# @DESCRIPTION:
-# The base src_install function. Runs make install and
-# installs documents and html documents from DOCS and HTML_DOCS
-# arrays.
-base_src_install() {
-	debug-print-function $FUNCNAME "$@"
-
-	emake DESTDIR="${D}" "$@" install || die "died running make install, $FUNCNAME"
-	base_src_install_docs
-}
-
-# @FUNCTION: base_src_install_docs
-# @DESCRIPTION:
-# Actual function that install documentation from
-# DOCS and HTML_DOCS arrays.
-base_src_install_docs() {
-	debug-print-function $FUNCNAME "$@"
-
-	local x
-
-	pushd "${S}" > /dev/null
-
-	if [[ "$(declare -p DOCS 2>/dev/null 2>&1)" == "declare -a"* ]]; then
-		for x in "${DOCS[@]}"; do
-			debug-print "$FUNCNAME: docs: creating document from ${x}"
-			dodoc "${x}" || die "dodoc failed"
-		done
-	fi
-	if [[ "$(declare -p HTML_DOCS 2>/dev/null 2>&1)" == "declare -a"* ]]; then
-		for x in "${HTML_DOCS[@]}"; do
-			debug-print "$FUNCNAME: docs: creating html document from ${x}"
-			dohtml -r "${x}" || die "dohtml failed"
-		done
-	fi
-
-	popd > /dev/null
-}
-
-fi

diff --git a/eclass/bash-completion-r1.eclass b/eclass/bash-completion-r1.eclass
deleted file mode 100644
index 191e720..0000000
--- a/eclass/bash-completion-r1.eclass
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion-r1.eclass,v 1.2 2011/09/08 20:28:29 mgorny Exp $
-
-# @ECLASS: bash-completion-r1.eclass
-# @MAINTAINER:
-# mgorny@g.o
-# @BLURB: A few quick functions to install bash-completion files
-# @EXAMPLE:
-#
-# @CODE
-# EAPI=4
-#
-# src_install() {
-# 	default
-#
-# 	newbashcomp contrib/${PN}.bash-completion ${PN}
-# }
-# @CODE
-
-case ${EAPI:-0} in
-	0|1|2|3|4|5) ;;
-	*) die "EAPI ${EAPI} unsupported (yet)."
-esac
-
-# @FUNCTION: dobashcomp
-# @USAGE: file [...]
-# @DESCRIPTION:
-# Install bash-completion files passed as args. Has EAPI-dependant failure
-# behavior (like doins).
-dobashcomp() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	(
-		insinto /usr/share/bash-completion
-		doins "${@}"
-	)
-}
-
-# @FUNCTION: newbashcomp
-# @USAGE: file newname
-# @DESCRIPTION:
-# Install bash-completion file under a new name. Has EAPI-dependant failure
-# behavior (like newins).
-newbashcomp() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	(
-		insinto /usr/share/bash-completion
-		newins "${@}"
-	)
-}

diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass
deleted file mode 100644
index 66978a2..0000000
--- a/eclass/check-reqs.eclass
+++ /dev/null
@@ -1,351 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v 1.10 2011/09/06 13:57:51 scarabeus Exp $
-
-# @ECLASS: check-reqs.eclass
-# @MAINTAINER:
-# QA Team <qa@g.o>
-# @AUTHOR:
-# Bo Ørsted Andresen <zlin@g.o>
-# Original Author: Ciaran McCreesh <ciaranm@g.o>
-# @BLURB: Provides a uniform way of handling ebuild which have very high build requirements
-# @DESCRIPTION:
-# This eclass provides a uniform way of handling ebuilds which have very high
-# build requirements in terms of memory or disk space. It provides a function
-# which should usually be called during pkg_setup().
-#
-# The chosen action only happens when the system's resources are detected
-# correctly and only if they are below the threshold specified by the package.
-#
-# @CODE
-# # need this much memory (does *not* check swap)
-# CHECKREQS_MEMORY="256M"
-#
-# # need this much temporary build space
-# CHECKREQS_DISK_BUILD="2G"
-#
-# # install will need this much space in /usr
-# CHECKREQS_DISK_USR="1G"
-#
-# # install will need this much space in /var
-# CHECKREQS_DISK_VAR="1024M"
-#
-# @CODE
-#
-# If you don't specify a value for, say, CHECKREQS_MEMORY, then the test is not
-# carried out.
-#
-# These checks should probably mostly work on non-Linux, and they should
-# probably degrade gracefully if they don't. Probably.
-
-inherit eutils
-
-# @ECLASS-VARIABLE: CHECKREQS_MEMORY
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# How much RAM is needed? Eg.: CHECKREQS_MEMORY=15M
-
-# @ECLASS-VARIABLE:  CHECKREQS_DISK_BUILD
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# How much diskspace is needed to build the package? Eg.: CHECKREQS_DISK_BUILD=2T
-
-# @ECLASS-VARIABLE: CHECKREQS_DISK_USR
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# How much space in /usr is needed to install the package? Eg.: CHECKREQS_DISK_USR=15G
-
-# @ECLASS-VARIABLE: CHECKREQS_DISK_VAR
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# How much space is needed in /var? Eg.: CHECKREQS_DISK_VAR=3000M
-
-EXPORT_FUNCTIONS pkg_setup
-case "${EAPI:-0}" in
-	0|1|2|3) ;;
-	4|5) EXPORT_FUNCTIONS pkg_pretend ;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-# @FUNCTION: check_reqs
-# @DESCRIPTION:
-# Obsolete function executing all the checks and priting out results
-check_reqs() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	echo
-	ewarn "QA: Package calling old ${FUNCNAME} function."
-	ewarn "QA: Please file a bug against the package."
-	ewarn "QA: It should call check-reqs_pkg_pretend and check-reqs_pkg_setup"
-	ewarn "QA: and possibly use EAPI=4 or later."
-	echo
-
-	check-reqs_pkg_setup "$@"
-}
-
-# @FUNCTION: check-reqs_pkg_setup
-# @DESCRIPTION:
-# Exported function running the resources checks in pkg_setup phase.
-# It should be run in both phases to ensure condition changes between
-# pkg_pretend and pkg_setup won't affect the build.
-check-reqs_pkg_setup() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	check-reqs_prepare
-	check-reqs_run
-	check-reqs_output
-}
-
-# @FUNCTION: check-reqs_pkg_pretend
-# @DESCRIPTION:
-# Exported function running the resources checks in pkg_pretend phase.
-check-reqs_pkg_pretend() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	check-reqs_pkg_setup "$@"
-}
-
-# @FUNCTION: check-reqs_prepare
-# @DESCRIPTION:
-# Internal function that checks the variables that should be defined.
-check-reqs_prepare() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ -z ${CHECKREQS_MEMORY} &&
-			-z ${CHECKREQS_DISK_BUILD} &&
-			-z ${CHECKREQS_DISK_USR} &&
-			-z ${CHECKREQS_DISK_VAR} ]]; then
-		eerror "Set some check-reqs eclass variables if you want to use it."
-		eerror "If you are user and see this message file a bug against the package."
-		die "${FUNCNAME}: check-reqs eclass called but not actualy used!"
-	fi
-}
-
-# @FUNCTION: check-reqs_run
-# @DESCRIPTION:
-# Internal function that runs the check based on variable settings.
-check-reqs_run() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	# some people are *censored*
-	unset CHECKREQS_FAILED
-
-	[[ -n ${CHECKREQS_MEMORY} ]] && \
-		check-reqs_memory \
-			${CHECKREQS_MEMORY}
-
-	[[ -n ${CHECKREQS_DISK_BUILD} ]] && \
-		check-reqs_disk \
-			"${T}" \
-			"${CHECKREQS_DISK_BUILD}"
-
-	[[ -n ${CHECKREQS_DISK_USR} ]] && \
-		check-reqs_disk \
-			"${EROOT}/usr" \
-			"${CHECKREQS_DISK_USR}"
-
-	[[ -n ${CHECKREQS_DISK_VAR} ]] && \
-		check-reqs_disk \
-			"${EROOT}/var" \
-			"${CHECKREQS_DISK_VAR}"
-}
-
-# @FUNCTION: check-reqs_get_mebibytes
-# @DESCRIPTION:
-# Internal function that returns number in mebibytes.
-# Converts from 1G=1024 or 1T=1048576
-check-reqs_get_mebibytes() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ -z ${1} ]] && die "Usage: ${FUNCNAME} [size]"
-
-	local unit=${1:(-1)}
-	local size=${1%[GMT]}
-
-	case ${unit} in
-		G) echo $((1024 * size)) ;;
-		[M0-9]) echo ${size} ;;
-		T) echo $((1024 * 1024 * size)) ;;
-		*)
-			die "${FUNCNAME}: Unknown unit: ${unit}"
-		;;
-	esac
-}
-
-# @FUNCTION: check-reqs_get_number
-# @DESCRIPTION:
-# Internal function that returns number without the unit.
-# Converts from 1G=1 or 150T=150.
-check-reqs_get_number() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ -z ${1} ]] && die "Usage: ${FUNCNAME} [size]"
-
-	local unit=${1:(-1)}
-	local size=${1%[GMT]}
-
-	# Check for unset units and warn about them.
-	# Backcompat.
-	if [[ ${size} == ${1} ]]; then
-		ewarn "QA: Package does not specify unit for the size check"
-		ewarn "QA: Assuming mebibytes."
-		ewarn "QA: File bug against the package. It should specify the unit."
-	fi
-
-	echo ${size}
-}
-
-# @FUNCTION: check-reqs_get_unit
-# @DESCRIPTION:
-# Internal function that returns number without the unit.
-# Converts from 1G=1 or 150T=150.
-check-reqs_get_unit() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ -z ${1} ]] && die "Usage: ${FUNCNAME} [size]"
-
-	local unit=${1:(-1)}
-
-	case ${unit} in
-		G) echo "gibibytes" ;;
-		[M0-9]) echo "mebibytes" ;;
-		T) echo "tebibytes" ;;
-		*)
-			die "${FUNCNAME}: Unknown unit: ${unit}"
-		;;
-	esac
-}
-
-# @FUNCTION: check-reqs_output
-# @DESCRIPTION:
-# Internal function that prints the warning and dies if required based on
-# the test results.
-check-reqs_output() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local msg="ewarn"
-
-	[[ ${EBUILD_PHASE} == "pretend" && -z ${I_KNOW_WHAT_I_AM_DOING} ]] && msg="eerror"
-	if [[ -n ${CHECKREQS_FAILED} ]]; then
-		${msg}
-		${msg} "Space constrains set in the ebuild were not met!"
-		${msg} "The build will most probably fail, you should enhance the space"
-		${msg} "as per failed tests."
-		${msg}
-
-		[[ ${EBUILD_PHASE} == "pretend" && -z ${I_KNOW_WHAT_I_AM_DOING} ]] && \
-			die "Build requirements not met!"
-	fi
-}
-
-# @FUNCTION: check-reqs_memory
-# @DESCRIPTION:
-# Internal function that checks size of RAM.
-check-reqs_memory() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ -z ${1} ]] && die "Usage: ${FUNCNAME} [size]"
-
-	local size=${1}
-	local actual_memory
-
-	check-reqs_start_phase \
-		${size} \
-		"RAM"
-
-	if [[ -r /proc/meminfo ]] ; then
-		actual_memory=$(awk '/MemTotal/ { print $2 }' /proc/meminfo)
-	else
-		actual_memory=$(sysctl hw.physmem 2>/dev/null )
-		[[ "$?" == "0" ]] &&
-			actual_memory=$(echo $actual_memory | sed -e 's/^[^:=]*[:=]//' )
-	fi
-	if [[ -n ${actual_memory} ]] ; then
-		if [[ ${actual_memory} -lt $((1024 * $(check-reqs_get_mebibytes ${size}))) ]] ; then
-			eend 1
-			check-reqs_unsatisfied \
-				${size} \
-				"RAM"
-		else
-			eend 0
-		fi
-	else
-		eend 1
-		ewarn "Couldn't determine amount of memory, skipping..."
-	fi
-}
-
-# @FUNCTION: check-reqs_disk
-# @DESCRIPTION:
-# Internal function that checks space on the harddrive.
-check-reqs_disk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ -z ${2} ]] && die "Usage: ${FUNCNAME} [path] [size]"
-
-	local path=${1}
-	local size=${2}
-	local space_megs
-
-	check-reqs_start_phase \
-		${size} \
-		"disk space at \"${path}\""
-
-	space_megs=$(df -Pm "${1}" 2>/dev/null | awk 'FNR == 2 {print $4}')
-
-	if [[ $? == 0 && -n ${space_megs} ]] ; then
-		if [[ ${space_megs} -lt $(check-reqs_get_mebibytes ${size}) ]] ; then
-			eend 1
-			check-reqs_unsatisfied \
-				${size} \
-				"disk space at \"${path}\""
-		else
-			eend 0
-		fi
-	else
-		eend 1
-		ewarn "Couldn't determine disk space, skipping..."
-	fi
-}
-
-# @FUNCTION: check-reqs_start_phase
-# @DESCRIPTION:
-# Internal function that inform about started check
-check-reqs_start_phase() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ -z ${2} ]] && die "Usage: ${FUNCNAME} [size] [location]"
-
-	local size=${1}
-	local location=${2}
-	local sizeunit="$(check-reqs_get_number ${size}) $(check-reqs_get_unit ${size})"
-
-	ebegin "Checking for at least ${sizeunit} ${location}"
-}
-
-# @FUNCTION: check-reqs_unsatisfied
-# @DESCRIPTION:
-# Internal function that inform about check result.
-# It has different output between pretend and setup phase,
-# where in pretend phase it is fatal.
-check-reqs_unsatisfied() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ -z ${2} ]] && die "Usage: ${FUNCNAME} [size] [location]"
-
-	local msg="ewarn"
-	local size=${1}
-	local location=${2}
-	local sizeunit="$(check-reqs_get_number ${size}) $(check-reqs_get_unit ${size})"
-
-	[[ ${EBUILD_PHASE} == "pretend" && -z ${I_KNOW_WHAT_I_AM_DOING} ]] && msg="eerror"
-	${msg} "There is NOT at least ${sizeunit} ${location}"
-
-	# @ECLASS-VARIABLE: CHECKREQS_FAILED
-	# @DESCRIPTION:
-	# @INTERNAL
-	# If set the checks failed and eclass should abort the build.
-	# Internal, do not set yourself.
-	CHECKREQS_FAILED="true"
-}
-

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
deleted file mode 100644
index e265e42..0000000
--- a/eclass/cmake-utils.eclass
+++ /dev/null
@@ -1,529 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.81 2012/09/20 10:32:40 kensington Exp $
-
-# @ECLASS: cmake-utils.eclass
-# @MAINTAINER:
-# kde@g.o
-# @AUTHOR:
-# Tomáš Chvátal <scarabeus@g.o>
-# Maciej Mrozowski <reavertm@g.o>
-# (undisclosed contributors)
-# Original author: Zephyrus (zephyrus@××××××.it)
-# @BLURB: common ebuild functions for cmake-based packages
-# @DESCRIPTION:
-# The cmake-utils eclass is base.eclass(5) wrapper that makes creating ebuilds for
-# cmake-based packages much easier.
-# It provides all inherited features (DOCS, HTML_DOCS, PATCHES) along with out-of-source
-# builds (default), in-source builds and an implementation of the well-known use_enable
-# and use_with functions for CMake.
-
-# @ECLASS-VARIABLE: WANT_CMAKE
-# @DESCRIPTION:
-# Specify if cmake-utils eclass should depend on cmake optionaly or not.
-# This is usefull when only part of aplication is using cmake build system.
-# Valid values are: always [default], optional (where the value is the useflag
-# used for optionality)
-WANT_CMAKE="${WANT_CMAKE:-always}"
-
-# @ECLASS-VARIABLE: CMAKE_MIN_VERSION
-# @DESCRIPTION:
-# Specify the minimum required CMake version.  Default is 2.8.4
-CMAKE_MIN_VERSION="${CMAKE_MIN_VERSION:-2.8.4}"
-
-# @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES_LIST
-# @DESCRIPTION:
-# Space-separated list of CMake modules that will be removed in $S during src_prepare,
-# in order to force packages to use the system version.
-CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST:-FindBLAS FindLAPACK}"
-
-# @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES
-# @DESCRIPTION:
-# Do we want to remove anything? yes or whatever else for no
-CMAKE_REMOVE_MODULES="${CMAKE_REMOVE_MODULES:-yes}"
-
-# @ECLASS-VARIABLE: CMAKE_MAKEFILE_GENERATOR
-# @DESCRIPTION:
-# Specify a makefile generator to be used by cmake. At this point only "make"
-# and "ninja" is supported.
-CMAKE_MAKEFILE_GENERATOR="${CMAKE_MAKEFILE_GENERATOR:-make}"
-
-CMAKEDEPEND=""
-case ${WANT_CMAKE} in
-	always)
-		;;
-	*)
-		IUSE+=" ${WANT_CMAKE}"
-		CMAKEDEPEND+="${WANT_CMAKE}? ( "
-		;;
-esac
-inherit toolchain-funcs multilib flag-o-matic base
-
-CMAKE_EXPF="src_compile src_test src_install"
-case ${EAPI:-0} in
-	4|5|3|2) CMAKE_EXPF+=" src_configure" ;;
-	1|0) ;;
-	*) die "Unknown EAPI, Bug eclass maintainers." ;;
-esac
-EXPORT_FUNCTIONS ${CMAKE_EXPF}
-
-if [[ ${PN} != cmake ]]; then
-	CMAKEDEPEND+=" >=dev-util/cmake-${CMAKE_MIN_VERSION}"
-fi
-
-CMAKEDEPEND+=" userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
-
-[[ ${WANT_CMAKE} = always ]] || CMAKEDEPEND+=" )"
-
-DEPEND="${CMAKEDEPEND}"
-unset CMAKEDEPEND
-
-# Internal functions used by cmake-utils_use_*
-_use_me_now() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local uper capitalised x
-	[[ -z $2 ]] && die "cmake-utils_use-$1 <USE flag> [<flag name>]"
-	if [[ ! -z $3 ]]; then
-		# user specified the use name so use it
-		echo "-D$1$3=$(use $2 && echo ON || echo OFF)"
-	else
-		# use all various most used combinations
-		uper=$(echo ${2} | tr '[:lower:]' '[:upper:]')
-		capitalised=$(echo ${2} | sed 's/\<\(.\)\([^ ]*\)/\u\1\L\2/g')
-		for x in $2 $uper $capitalised; do
-			echo "-D$1$x=$(use $2 && echo ON || echo OFF) "
-		done
-	fi
-}
-_use_me_now_inverted() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local uper capitalised x
-	[[ -z $2 ]] && die "cmake-utils_use-$1 <USE flag> [<flag name>]"
-	if [[ ! -z $3 ]]; then
-		# user specified the use name so use it
-		echo "-D$1$3=$(use $2 && echo OFF || echo ON)"
-	else
-		# use all various most used combinations
-		uper=$(echo ${2} | tr '[:lower:]' '[:upper:]')
-		capitalised=$(echo ${2} | sed 's/\<\(.\)\([^ ]*\)/\u\1\L\2/g')
-		for x in $2 $uper $capitalised; do
-			echo "-D$1$x=$(use $2 && echo OFF || echo ON) "
-		done
-	fi
-}
-
-# @ECLASS-VARIABLE: CMAKE_BUILD_DIR
-# @DESCRIPTION:
-# Build directory where all cmake processed files should be generated.
-# For in-source build it's fixed to ${CMAKE_USE_DIR}.
-# For out-of-source build it can be overriden, by default it uses
-# ${WORKDIR}/${P}_build.
-
-# @ECLASS-VARIABLE: CMAKE_BUILD_TYPE
-# @DESCRIPTION:
-# Set to override default CMAKE_BUILD_TYPE. Only useful for packages
-# known to make use of "if (CMAKE_BUILD_TYPE MATCHES xxx)".
-# If about to be set - needs to be set before invoking cmake-utils_src_configure.
-# You usualy do *NOT* want nor need to set it as it pulls CMake default build-type
-# specific compiler flags overriding make.conf.
-: ${CMAKE_BUILD_TYPE:=Gentoo}
-
-# @ECLASS-VARIABLE: CMAKE_IN_SOURCE_BUILD
-# @DESCRIPTION:
-# Set to enable in-source build.
-
-# @ECLASS-VARIABLE: CMAKE_USE_DIR
-# @DESCRIPTION:
-# Sets the directory where we are working with cmake.
-# For example when application uses autotools and only one
-# plugin needs to be done by cmake.
-# By default it uses ${S}.
-
-# @ECLASS-VARIABLE: CMAKE_VERBOSE
-# @DESCRIPTION:
-# Set to OFF to disable verbose messages during compilation
-: ${CMAKE_VERBOSE:=ON}
-
-# @ECLASS-VARIABLE: PREFIX
-# @DESCRIPTION:
-# Eclass respects PREFIX variable, though it's not recommended way to set
-# install/lib/bin prefixes.
-# Use -DCMAKE_INSTALL_PREFIX=... CMake variable instead.
-: ${PREFIX:=/usr}
-
-# @ECLASS-VARIABLE: CMAKE_BINARY
-# @DESCRIPTION:
-# Eclass can use different cmake binary than the one provided in by system.
-: ${CMAKE_BINARY:=cmake}
-
-# Determine using IN or OUT source build
-_check_build_dir() {
-	: ${CMAKE_USE_DIR:=${S}}
-	if [[ -n ${CMAKE_IN_SOURCE_BUILD} ]]; then
-		# we build in source dir
-		CMAKE_BUILD_DIR="${CMAKE_USE_DIR}"
-	else
-		: ${CMAKE_BUILD_DIR:=${WORKDIR}/${P}_build}
-	fi
-	mkdir -p "${CMAKE_BUILD_DIR}"
-	echo ">>> Working in BUILD_DIR: \"$CMAKE_BUILD_DIR\""
-}
-
-# Determine which generator to use
-_generator_to_use() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} = "ninja" ]]; then
-		has_version dev-util/ninja && echo "Ninja" && return
-	fi
-	echo "Unix Makefiles"
-}
-
-# @FUNCTION: cmake-utils_use_with
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on use_with. See ebuild(5).
-#
-# `cmake-utils_use_with foo FOO` echoes -DWITH_FOO=ON if foo is enabled
-# and -DWITH_FOO=OFF if it is disabled.
-cmake-utils_use_with() { _use_me_now WITH_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_enable
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_use_enable foo FOO` echoes -DENABLE_FOO=ON if foo is enabled
-# and -DENABLE_FOO=OFF if it is disabled.
-cmake-utils_use_enable() { _use_me_now ENABLE_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_disable
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on inversion of use_enable. See ebuild(5).
-#
-# `cmake-utils_use_enable foo FOO` echoes -DDISABLE_FOO=OFF if foo is enabled
-# and -DDISABLE_FOO=ON if it is disabled.
-cmake-utils_use_disable() { _use_me_now_inverted DISABLE_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_no
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on use_disable. See ebuild(5).
-#
-# `cmake-utils_use_no foo FOO` echoes -DNO_FOO=OFF if foo is enabled
-# and -DNO_FOO=ON if it is disabled.
-cmake-utils_use_no() { _use_me_now_inverted NO_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_want
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_use_want foo FOO` echoes -DWANT_FOO=ON if foo is enabled
-# and -DWANT_FOO=OFF if it is disabled.
-cmake-utils_use_want() { _use_me_now WANT_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_build
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_use_build foo FOO` echoes -DBUILD_FOO=ON if foo is enabled
-# and -DBUILD_FOO=OFF if it is disabled.
-cmake-utils_use_build() { _use_me_now BUILD_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_has
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_use_has foo FOO` echoes -DHAVE_FOO=ON if foo is enabled
-# and -DHAVE_FOO=OFF if it is disabled.
-cmake-utils_use_has() { _use_me_now HAVE_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_use
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_use_use foo FOO` echoes -DUSE_FOO=ON if foo is enabled
-# and -DUSE_FOO=OFF if it is disabled.
-cmake-utils_use_use() { _use_me_now USE_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_use foo FOO` echoes -DFOO=ON if foo is enabled
-# and -DFOO=OFF if it is disabled.
-cmake-utils_use() { _use_me_now "" "$@" ; }
-
-# Internal function for modifying hardcoded definitions.
-# Removes dangerous definitions that override Gentoo settings.
-_modify-cmakelists() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	# Only edit the files once
-	grep -qs "<<< Gentoo configuration >>>" CMakeLists.txt && return 0
-
-	# Comment out all set (<some_should_be_user_defined_variable> value)
-	# TODO Add QA checker - inform when variable being checked for below is set in CMakeLists.txt
-	find "${CMAKE_USE_DIR}" -name CMakeLists.txt \
-		-exec sed -i -e '/^[[:space:]]*[sS][eE][tT][[:space:]]*([[:space:]]*CMAKE_BUILD_TYPE.*)/{s/^/#IGNORE /g}' {} + \
-		-exec sed -i -e '/^[[:space:]]*[sS][eE][tT][[:space:]]*([[:space:]]*CMAKE_COLOR_MAKEFILE.*)/{s/^/#IGNORE /g}' {} + \
-		-exec sed -i -e '/^[[:space:]]*[sS][eE][tT][[:space:]]*([[:space:]]*CMAKE_INSTALL_PREFIX.*)/{s/^/#IGNORE /g}' {} + \
-		-exec sed -i -e '/^[[:space:]]*[sS][eE][tT][[:space:]]*([[:space:]]*CMAKE_VERBOSE_MAKEFILE.*)/{s/^/#IGNORE /g}' {} + \
-		|| die "${LINENO}: failed to disable hardcoded settings"
-
-	# NOTE Append some useful summary here
-	cat >> "${CMAKE_USE_DIR}"/CMakeLists.txt <<- _EOF_
-
-		MESSAGE(STATUS "<<< Gentoo configuration >>>
-		Build type      \${CMAKE_BUILD_TYPE}
-		Install path    \${CMAKE_INSTALL_PREFIX}
-		Compiler flags:
-		C               \${CMAKE_C_FLAGS}
-		C++             \${CMAKE_CXX_FLAGS}
-		Linker flags:
-		Executable      \${CMAKE_EXE_LINKER_FLAGS}
-		Module          \${CMAKE_MODULE_LINKER_FLAGS}
-		Shared          \${CMAKE_SHARED_LINKER_FLAGS}\n")
-	_EOF_
-}
-
-enable_cmake-utils_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ "${CMAKE_REMOVE_MODULES}" == "yes" ]] && {
-		local name
-		for name in ${CMAKE_REMOVE_MODULES_LIST} ; do
-			find "${S}" -name ${name}.cmake -exec rm -v {} +
-		done
-	}
-
-	_check_build_dir
-
-	# check if CMakeLists.txt exist and if no then die
-	if [[ ! -e ${CMAKE_USE_DIR}/CMakeLists.txt ]] ; then
-		eerror "Unable to locate CMakeLists.txt under:"
-		eerror "\"${CMAKE_USE_DIR}/CMakeLists.txt\""
-		eerror "Consider not inheriting the cmake eclass."
-		die "FATAL: Unable to find CMakeLists.txt"
-	fi
-
-	# Remove dangerous things.
-	_modify-cmakelists
-
-	# Fix xdg collision with sandbox
-	export XDG_CONFIG_HOME="${T}"
-
-	# @SEE CMAKE_BUILD_TYPE
-	if [[ ${CMAKE_BUILD_TYPE} = Gentoo ]]; then
-		# Handle release builds
-		if ! has debug ${IUSE//+} || ! use debug; then
-			append-cppflags -DNDEBUG
-		fi
-	fi
-
-	# Prepare Gentoo override rules (set valid compiler, append CPPFLAGS)
-	local build_rules=${CMAKE_BUILD_DIR}/gentoo_rules.cmake
-	cat > "${build_rules}" <<- _EOF_
-		SET (CMAKE_C_COMPILER $(type -P $(tc-getCC)) CACHE FILEPATH "C compiler" FORCE)
-		SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
-		SET (CMAKE_CXX_COMPILER $(type -P $(tc-getCXX)) CACHE FILEPATH "C++ compiler" FORCE)
-		SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
-	_EOF_
-
-	has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
-
-	if [[ ${EPREFIX} ]]; then
-		cat >> "${build_rules}" <<- _EOF_
-			# in Prefix we need rpath and must ensure cmake gets our default linker path
-			# right ... except for Darwin hosts
-			IF (NOT APPLE)
-			SET (CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
-			SET (CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH "${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)"
-			CACHE STRING "" FORCE)
-
-			ELSE ()
-
-			SET(CMAKE_PREFIX_PATH "${EPREFIX}${PREFIX}" CACHE STRING ""FORCE)
-			SET(CMAKE_SKIP_BUILD_RPATH OFF CACHE BOOL "" FORCE)
-			SET(CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
-			SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE CACHE BOOL "")
-			SET(CMAKE_INSTALL_RPATH "${EPREFIX}${PREFIX}/lib;${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)" CACHE STRING "" FORCE)
-			SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "" FORCE)
-			SET(CMAKE_INSTALL_NAME_DIR "${EPREFIX}${PREFIX}/lib" CACHE STRING "" FORCE)
-
-			ENDIF (NOT APPLE)
-		_EOF_
-	fi
-
-	# Common configure parameters (invariants)
-	local common_config=${CMAKE_BUILD_DIR}/gentoo_common_config.cmake
-	local libdir=$(get_libdir)
-	cat > "${common_config}" <<- _EOF_
-		SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE)
-		SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries")
-	_EOF_
-	[[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}"
-
-	# Convert mycmakeargs to an array, for backwards compatibility
-	# Make the array a local variable since <=portage-2.1.6.x does not
-	# support global arrays (see bug #297255).
-	if [[ $(declare -p mycmakeargs 2>&-) != "declare -a mycmakeargs="* ]]; then
-		local mycmakeargs_local=(${mycmakeargs})
-	else
-		local mycmakeargs_local=("${mycmakeargs[@]}")
-	fi
-
-	# Common configure parameters (overridable)
-	# NOTE CMAKE_BUILD_TYPE can be only overriden via CMAKE_BUILD_TYPE eclass variable
-	# No -DCMAKE_BUILD_TYPE=xxx definitions will be in effect.
-	local cmakeargs=(
-		--no-warn-unused-cli
-		-C "${common_config}"
-		-G "$(_generator_to_use)"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}${PREFIX}"
-		"${mycmakeargs_local[@]}"
-		-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
-		-DCMAKE_INSTALL_DO_STRIP=OFF
-		-DCMAKE_USER_MAKE_RULES_OVERRIDE="${build_rules}"
-		"${MYCMAKEARGS}"
-	)
-
-	pushd "${CMAKE_BUILD_DIR}" > /dev/null
-	debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: mycmakeargs is ${mycmakeargs_local[*]}"
-	echo "${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}"
-	"${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}" || die "cmake failed"
-	popd > /dev/null
-}
-
-enable_cmake-utils_src_compile() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	has src_configure ${CMAKE_EXPF} || cmake-utils_src_configure
-	cmake-utils_src_make "$@"
-}
-
-# @FUNCTION: cmake-utils_src_make
-# @DESCRIPTION:
-# Function for building the package. Automatically detects the build type.
-# All arguments are passed to emake.
-cmake-utils_src_make() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	_check_build_dir
-	pushd "${CMAKE_BUILD_DIR}" > /dev/null
-	if [[ $(_generator_to_use) = Ninja ]]; then
-		# first check if Makefile exist otherwise die
-		[[ -e build.ninja ]] || die "Makefile not found. Error during configure stage."
-		if [[ "${CMAKE_VERBOSE}" != "OFF" ]]; then
-			#TODO get load average from portage (-l option)
-			ninja ${MAKEOPTS} -v "$@"
-		else
-			ninja "$@"
-		fi || die "ninja failed!"
-	else
-		# first check if Makefile exist otherwise die
-		[[ -e Makefile ]] || die "Makefile not found. Error during configure stage."
-		if [[ "${CMAKE_VERBOSE}" != "OFF" ]]; then
-			emake VERBOSE=1 "$@" || die "Make failed!"
-		else
-			emake "$@" || die "Make failed!"
-		fi
-	fi
-	popd > /dev/null
-}
-
-enable_cmake-utils_src_install() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	_check_build_dir
-	pushd "${CMAKE_BUILD_DIR}" > /dev/null
-	if [[ $(_generator_to_use) = Ninja ]]; then
-		DESTDIR=${D} ninja install "$@" || die "died running ninja install"
-		base_src_install_docs
-	else
-		base_src_install "$@"
-	fi
-	popd > /dev/null
-
-	# Backward compatibility, for non-array variables
-	if [[ -n "${DOCS}" ]] && [[ "$(declare -p DOCS 2>/dev/null 2>&1)" != "declare -a"* ]]; then
-		dodoc ${DOCS} || die "dodoc failed"
-	fi
-	if [[ -n "${HTML_DOCS}" ]] && [[ "$(declare -p HTML_DOCS 2>/dev/null 2>&1)" != "declare -a"* ]]; then
-		dohtml -r ${HTML_DOCS} || die "dohtml failed"
-	fi
-}
-
-enable_cmake-utils_src_test() {
-	debug-print-function ${FUNCNAME} "$@"
-	local ctestargs
-
-	_check_build_dir
-	pushd "${CMAKE_BUILD_DIR}" > /dev/null
-	[[ -e CTestTestfile.cmake ]] || { echo "No tests found. Skipping."; return 0 ; }
-
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	if ctest ${ctestargs} "$@" ; then
-		einfo "Tests succeeded."
-	else
-		if [[ -n "${CMAKE_YES_I_WANT_TO_SEE_THE_TEST_LOG}" ]] ; then
-			# on request from Diego
-			eerror "Tests failed. Test log ${CMAKE_BUILD_DIR}/Testing/Temporary/LastTest.log follows:"
-			eerror "--START TEST LOG--------------------------------------------------------------"
-			cat "${CMAKE_BUILD_DIR}/Testing/Temporary/LastTest.log"
-			eerror "--END TEST LOG----------------------------------------------------------------"
-			die "Tests failed."
-		else
-			die "Tests failed. When you file a bug, please attach the following file: \n\t${CMAKE_BUILD_DIR}/Testing/Temporary/LastTest.log"
-		fi
-	fi
-	popd > /dev/null
-}
-
-# @FUNCTION: cmake-utils_src_configure
-# @DESCRIPTION:
-# General function for configuring with cmake. Default behaviour is to start an
-# out-of-source build.
-cmake-utils_src_configure() {
-	_execute_optionaly "src_configure" "$@"
-}
-
-# @FUNCTION: cmake-utils_src_compile
-# @DESCRIPTION:
-# General function for compiling with cmake. Default behaviour is to check for
-# EAPI and respectively to configure as well or just compile.
-# Automatically detects the build type. All arguments are passed to emake.
-cmake-utils_src_compile() {
-	_execute_optionaly "src_compile" "$@"
-}
-
-# @FUNCTION: cmake-utils_src_install
-# @DESCRIPTION:
-# Function for installing the package. Automatically detects the build type.
-cmake-utils_src_install() {
-	_execute_optionaly "src_install" "$@"
-}
-
-# @FUNCTION: cmake-utils_src_test
-# @DESCRIPTION:
-# Function for testing the package. Automatically detects the build type.
-cmake-utils_src_test() {
-	_execute_optionaly "src_test" "$@"
-}
-
-# Optionally executes phases based on WANT_CMAKE variable/USE flag.
-_execute_optionaly() {
-	local phase="$1" ; shift
-	if [[ ${WANT_CMAKE} = always ]]; then
-		enable_cmake-utils_${phase} "$@"
-	else
-		use ${WANT_CMAKE} && enable_cmake-utils_${phase} "$@"
-	fi
-}

diff --git a/eclass/emboss.eclass b/eclass/emboss.eclass
deleted file mode 100644
index c411d0a..0000000
--- a/eclass/emboss.eclass
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/emboss.eclass,v 1.2 2011/08/22 04:46:31 vapier Exp $
-
-# @ECLASS: emboss.eclass
-# @MAINTAINER:
-# sci-biology@g.o
-# jlec@g.o
-# @AUTHOR:
-# Original author: Author Olivier Fisette <ofisette@×××××.com>
-# Next gen author: Justin Lecher <jlec@g.o>
-# @BLURB: Use this to easy install EMBOSS and EMBASSY programs (EMBOSS add-ons).
-# @DESCRIPTION:
-# The inheriting ebuild must set EAPI=4 and provide EBO_DESCRIPTION before the inherit line.
-# KEYWORDS should be set. Additionally "(R|P)DEPEND"encies and other standard
-# ebuild variables can be extended (FOO+=" bar").
-# Default installation of following DOCS="AUTHORS ChangeLog NEWS README"
-#
-# Example:
-#
-# EAPI="4"
-#
-# EBO_DESCRIPTION="applications from the CBS group"
-#
-# inherit emboss
-
-# @ECLASS-VARIABLE: EBO_DESCRIPTION
-# @DESCRIPTION:
-# Should be set. Completes the generic description of the embassy module as follows:
-#
-# EMBOSS integrated version of ${EBO_DESCRIPTION},
-# e.g.
-# "EMBOSS integrated version of applications from the CBS group"
-#
-# Defaults to the upstream name of the module.
-
-# @ECLASS-VARIABLE: EBO_EAUTORECONF
-# @DESCRIPTION:
-# Set to 'no', if you don't want eautoreconf to be run after patching.
-: ${EBO_EAUTORECONF:=yes}
-
-# @ECLASS-VARIABLE: EBO_EXTRA_ECONF
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Extra config options passed to econf, similar to EXTRA_ECONF.
-
-case ${EAPI:-0} in
-	4|5) ;;
-	*) die "this eclass doesn't support < EAPI 4" ;;
-esac
-
-inherit autotools eutils
-
-HOMEPAGE="http://emboss.sourceforge.net/"
-LICENSE="LGPL-2 GPL-2"
-
-SLOT="0"
-IUSE="mysql pdf png postgres static-libs X"
-
-DEPEND="
-	dev-libs/expat
-	dev-libs/libpcre:3
-	sci-libs/plplot
-	sys-libs/zlib
-	mysql? ( dev-db/mysql )
-	pdf? ( media-libs/libharu )
-	png? ( media-libs/gd[png] )
-	postgres? ( dev-db/postgresql-base )
-	X? ( x11-libs/libXt )"
-RDEPEND="${DEPEND}"
-
-if [[ ${PN} == embassy-* ]]; then
-	# The EMBASSY package name, retrieved from the inheriting ebuild's name
-	EN=${PN:8}
-	# The full name and version of the EMBASSY package (excluding the Gentoo
-	# revision number)
-	EF=$(echo ${EN} | tr "[:lower:]" "[:upper:]")-${PV}
-	: ${EBO_DESCRIPTION:=${EN}}
-	DESCRIPTION="EMBOSS integrated version of ${EBO_DESCRIPTION}"
-	SRC_URI="ftp://emboss.open-bio.org/pub/EMBOSS/${EF}.tar.gz -> embassy-${EN}-${PV}.tar.gz"
-	DEPEND+=" >=sci-biology/emboss-6.3.1_p4[mysql=,pdf=,png=,postgres=,static-libs=,X=]"
-
-	S="${WORKDIR}"/${EF}
-fi
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-# @FUNCTION: emboss_src_prepare
-# @DESCRIPTION:
-# Does following things
-#
-#  1. Patches with "${FILESDIR}"/${PF}.patch, if present
-#  2. Runs eautoreconf, unless EBO_EAUTORECONF is set to no
-#
-
-emboss_src_prepare() {
-	[[ -f ${FILESDIR}/${PF}.patch ]] && epatch "${FILESDIR}"/${PF}.patch
-	[[ ${EBO_EAUTORECONF} == yes ]] && eautoreconf
-}
-
-# @FUNCTION: emboss_src_configure
-# @DESCRIPTION:
-# runs econf with following options.
-#
-#  $(use_with X x)
-#  $(use_with png pngdriver)
-#  $(use_with pdf hpdf)
-#  $(use_with mysql mysql)
-#  $(use_with postgres postgresql)
-#  $(use_enable static-libs static)
-#  --enable-large
-#  --without-java
-#  --enable-systemlibs
-#  --docdir="${EPREFIX}/usr/share/doc/${PF}"
-#  ${EBO_EXTRA_ECONF}
-
-emboss_src_configure() {
-	econf \
-		$(use_with X x) \
-		$(use_with png pngdriver) \
-		$(use_with pdf hpdf) \
-		$(use_with mysql mysql) \
-		$(use_with postgres postgresql) \
-		$(use_enable static-libs static) \
-		--enable-large \
-		--without-java \
-		--enable-systemlibs \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		${EBO_EXTRA_ECONF}
-}
-
-EXPORT_FUNCTIONS src_prepare src_configure

diff --git a/eclass/emul-linux-x86.eclass b/eclass/emul-linux-x86.eclass
deleted file mode 100644
index 5458113..0000000
--- a/eclass/emul-linux-x86.eclass
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v 1.10 2011/12/27 17:55:12 fauli Exp $
-
-#
-# Original Author: Mike Doty <kingtaco@g.o>
-# Adapted from emul-libs.eclass
-# Purpose: Providing a template for the app-emulation/emul-linux-* packages
-#
-
-inherit versionator
-
-if version_is_at_least 20110129; then
-	IUSE="development"
-else
-	IUSE=""
-fi
-
-case "${EAPI:-0}" in
-	0|1)
-		EXPORT_FUNCTIONS src_unpack src_install
-		;;
-	2|3|4|5)
-		EXPORT_FUNCTIONS src_unpack src_prepare src_install
-		;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-if version_is_at_least 20110722; then
-	SRC_URI="http://dev.gentoo.org/~pacho/emul/${P}.tar.xz"
-else
-	if version_is_at_least 20110129; then
-		SRC_URI="http://dev.gentoo.org/~pacho/emul/${P}.tar.bz2"
-	else
-		SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2"
-	fi
-fi
-
-DESCRIPTION="Provides precompiled 32bit libraries"
-#HOMEPAGE="http://amd64.gentoo.org/emul/content.xml"
-HOMEPAGE="http://dev.gentoo.org/~pacho/emul.html"
-
-RESTRICT="strip"
-S=${WORKDIR}
-
-SLOT="0"
-
-DEPEND=">=sys-apps/findutils-4.2.26"
-RDEPEND=""
-
-emul-linux-x86_src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	has ${EAPI:-0} 0 1 && emul-linux-x86_src_prepare
-}
-
-emul-linux-x86_src_prepare() {
-	ALLOWED=${ALLOWED:-^${S}/etc/env.d}
-	has development "${IUSE//+}" && use development && ALLOWED="${ALLOWED}|/usr/lib32/pkgconfig"
-	find "${S}" ! -type d ! -name '*.so*' | egrep -v "${ALLOWED}" | xargs -d $'\n' rm -f || die 'failed to remove everything but *.so*'
-}
-
-emul-linux-x86_src_install() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
-	for dir in etc/env.d etc/revdep-rebuild ; do
-		if [[ -d "${S}"/${dir} ]] ; then
-			for f in "${S}"/${dir}/* ; do
-				mv -f "$f"{,-emul}
-			done
-		fi
-	done
-
-	# remove void directories
-	find "${S}" -depth -type d -print0 | xargs -0 rmdir 2&>/dev/null
-
-	cp -pPR "${S}"/* "${ED}"/ || die "copying files failed!"
-}

diff --git a/eclass/enlightenment.eclass b/eclass/enlightenment.eclass
deleted file mode 100644
index ee2dc7d..0000000
--- a/eclass/enlightenment.eclass
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v 1.93 2012/09/12 06:03:47 vapier Exp $
-
-# @ECLASS: enlightenment.eclass
-# @MAINTAINER:
-# enlightenment@g.o
-# @BLURB: simplify enlightenment package management
-
-inherit eutils libtool
-
-# @ECLASS-VARIABLE: E_PYTHON
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# if defined, the package is based on Python/distutils
-
-# @ECLASS-VARIABLE: E_CYTHON
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# if defined, the package is Cython bindings (implies E_PYTHON)
-
-# E_STATE's:
-#	release      [default]
-#		KEYWORDS arch
-#		SRC_URI  $P.tar.gz
-#		S        $WORKDIR/$P
-#
-#	snap         $PV has .200##### datestamp or .### counter
-#		KEYWORDS ~arch
-#		SRC_URI  $P.tar.bz2
-#		S        $WORKDIR/$P
-#
-#	live         $PV has a 9999 marker
-#		KEYWORDS ""
-#		SRC_URI  svn/etc... up
-#		S        $WORKDIR/$E_S_APPEND
-#
-# Overrides:
-#	KEYWORDS    EKEY_STATE
-#	SRC_URI     EURI_STATE
-#	S           EURI_STATE
-
-E_LIVE_SERVER_DEFAULT_SVN="http://svn.enlightenment.org/svn/e/trunk"
-
-E_STATE="release"
-if [[ ${PV} == *9999* ]] ; then
-	E_LIVE_SERVER=${E_LIVE_SERVER:-${E_LIVE_SERVER_DEFAULT_SVN}}
-	E_STATE="live"
-	WANT_AUTOTOOLS="yes"
-
-	ESVN_URI_APPEND=${ESVN_URI_APPEND:-${PN}}
-	ESVN_PROJECT="enlightenment/${ESVN_SUB_PROJECT}"
-	ESVN_REPO_URI=${ESVN_SERVER:-${E_LIVE_SERVER_DEFAULT_SVN}}/${ESVN_SUB_PROJECT}/${ESVN_URI_APPEND}
-	E_S_APPEND=${ESVN_URI_APPEND}
-	E_LIVE_SOURCE="svn"
-	inherit subversion
-elif [[ -n ${E_SNAP_DATE} ]] ; then
-	E_STATE="snap"
-else
-	E_STATE="release"
-fi
-
-# Parse requested python state
-: ${E_PYTHON:=${E_CYTHON}}
-if [[ -n ${E_PYTHON} ]] ; then
-	PYTHON_DEPEND="2:2.4"
-
-	inherit python
-fi
-
-if [[ ${WANT_AUTOTOOLS} == "yes" ]] ; then
-	WANT_AUTOCONF=${E_WANT_AUTOCONF:-latest}
-	WANT_AUTOMAKE=${E_WANT_AUTOMAKE:-latest}
-	inherit autotools
-fi
-
-ENLIGHTENMENT_EXPF="src_unpack src_compile src_install"
-case "${EAPI:-0}" in
-		2|3|4|5) ENLIGHTENMENT_EXPF+=" src_prepare src_configure" ;;
-		*) ;;
-esac
-EXPORT_FUNCTIONS ${ENLIGHTENMENT_EXPF}
-
-DESCRIPTION="A DR17 production"
-HOMEPAGE="http://www.enlightenment.org/"
-case ${EURI_STATE:-${E_STATE}} in
-	release) SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz";;
-	snap)    SRC_URI="http://download.enlightenment.org/snapshots/${E_SNAP_DATE}/${P}.tar.bz2";;
-	live)    SRC_URI="";;
-esac
-
-LICENSE="BSD"
-SLOT="0"
-case ${EKEY_STATE:-${E_STATE}} in
-	release) KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-interix ~x86-solaris ~x64-solaris";;
-	snap)    KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-interix ~x86-solaris ~x64-solaris";;
-	live)    KEYWORDS="";;
-esac
-IUSE="nls doc"
-
-DEPEND="doc? ( app-doc/doxygen )
-	${E_PYTHON:+>=dev-python/setuptools-0.6_rc9}
-	${E_CYTHON:+>=dev-python/cython-0.12.1}"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-case ${EURI_STATE:-${E_STATE}} in
-	release) S=${WORKDIR}/${P};;
-	snap)    S=${WORKDIR}/${P};;
-	live)    S=${WORKDIR}/${E_S_APPEND};;
-esac
-
-enlightenment_src_unpack() {
-	if [[ ${E_STATE} == "live" ]] ; then
-		case ${E_LIVE_SOURCE} in
-			svn) subversion_src_unpack;;
-			*)   die "eek!";;
-		esac
-	else
-		unpack ${A}
-	fi
-	has src_prepare ${ENLIGHTENMENT_EXPF} || enlightenment_src_prepare
-}
-
-enlightenment_src_prepare() {
-	epatch_user
-	[[ -s gendoc ]] && chmod a+rx gendoc
-	if [[ ${WANT_AUTOTOOLS} == "yes" ]] ; then
-		[[ -d po ]] && eautopoint -f
-		# autotools require README, when README.in is around, but README
-		# is created later in configure step
-		[[ -f README.in ]] && touch README
-		export SVN_REPO_PATH=${ESVN_WC_PATH}
-		eautoreconf
-	fi
-	epunt_cxx
-	elibtoolize
-}
-
-enlightenment_src_configure() {
-	# gstreamer sucks, work around it doing stupid stuff
-	export GST_REGISTRY="${S}/registry.xml"
-	has static-libs ${IUSE} && MY_ECONF+=" $(use_enable static-libs static)"
-
-	econf ${MY_ECONF}
-}
-
-enlightenment_src_compile() {
-	has src_configure ${ENLIGHTENMENT_EXPF} || enlightenment_src_configure
-
-	emake || die
-
-	if use doc ; then
-		if [[ -x ./gendoc ]] ; then
-			./gendoc || die
-		elif emake -j1 -n doc >&/dev/null ; then
-			emake doc || die
-		fi
-	fi
-}
-
-enlightenment_src_install() {
-	emake install DESTDIR="${D}" || die
-	find "${D}" '(' -name CVS -o -name .svn -o -name .git ')' -type d -exec rm -rf '{}' \; 2>/dev/null
-	for d in AUTHORS ChangeLog NEWS README TODO ${EDOCS}; do
-		[[ -f ${d} ]] && dodoc ${d}
-	done
-	use doc && [[ -d doc ]] && dohtml -r doc/*
-	if has static-libs ${IUSE} ; then
-		use static-libs || find "${D}" -name '*.la' -exec rm -f {} +
-	fi
-}

diff --git a/eclass/fortran-2.eclass b/eclass/fortran-2.eclass
deleted file mode 100644
index 817d1b1..0000000
--- a/eclass/fortran-2.eclass
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/fortran-2.eclass,v 1.5 2011/08/22 04:46:31 vapier Exp $
-
-# @ECLASS: fortran-2.eclass
-# @MAINTAINER:
-# jlec@g.o
-# sci@g.o
-# @AUTHOR:
-# Author Justin Lecher <jlec@g.o>
-# Test functions provided by Sebastien Fabbro and Kacper Kowalik
-# @BLURB: Simplify fortran compiler management
-# @DESCRIPTION:
-# If you need a fortran compiler, then you should be inheriting this eclass and
-# adding virtual/fortran to your dependencies.
-# The eclass tests for working fortran compilers
-# and exports the variables FC and F77.
-# Optionally, it checks for extended capabilities based on
-# the variable options selected in the ebuild
-# The only phase function exported is fortran-2_pkg_setup.
-
-# @ECLASS-VARIABLE: FORTRAN_NEED_OPENMP
-# @DESCRIPTION:
-# Set to "1" in order to automatically have the eclass abort if the fortran
-# compiler lacks openmp support.
-: ${FORTRAN_NEED_OPENMP:=0}
-
-# @ECLASS-VARIABLE: FORTRAN_STANDARD
-# @DESCRIPTION:
-# Set this, if a special dialect needs to be supported.
-# Generally not needed as default is sufficient.
-#
-# Valid settings are any combination of: 77 90 95 2003
-: ${FORTRAN_STANDARD:=77}
-
-inherit toolchain-funcs
-
-# @FUNCTION: _write_testsuite
-# @INTERNAL
-# @DESCRIPTION:
-# writes fortran test code
-_write_testsuite() {
-	local filebase=${T}/test-fortran
-
-	# f77 code
-	cat <<- EOF > "${filebase}.f"
-	       end
-	EOF
-
-	# f90/95 code
-	cat <<- EOF > "${filebase}.f90"
-	end
-	EOF
-
-	# f2003 code
-	cat <<- EOF > "${filebase}.f03"
-	       procedure(), pointer :: p
-	       end
-	EOF
-}
-
-# @FUNCTION: _compile_test
-# @INTERNAL
-# @DESCRIPTION:
-# Takes fortran compiler as first argument and dialect as second.
-# Checks whether the passed fortran compiler speaks the fortran dialect
-_compile_test() {
-	local filebase=${T}/test-fortran
-	local fcomp=${1}
-	local fdia=${2}
-	local fcode=${filebase}.f${fdia}
-	local ret
-
-	[[ $# -eq 0 ]] && die "_compile_test() needs at least one argument"
-
-	[[ -f ${fcode} ]] || _write_testsuite
-
-	${fcomp} "${fcode}" -o "${fcode}.x" >&/dev/null
-	ret=$?
-
-	rm -f "${fcode}.x"
-	return ${ret}
-}
-
-# @FUNCTION: _fortran-has-openmp
-# @INTERNAL
-# @DESCRIPTION:
-# See if the fortran supports OpenMP.
-_fortran-has-openmp() {
-	local flag
-	local filebase=${T}/test-fc-openmp
-	local fcode=${filebase}.f
-	local ret
-	local _fc=$(tc-getFC)
-
-	cat <<- EOF > "${fcode}"
-	       call omp_get_num_threads
-	       end
-	EOF
-
-	for flag in -fopenmp -xopenmp -openmp -mp -omp -qsmp=omp; do
-		${_fc} ${flag} "${fcode}" -o "${fcode}.x" >&/dev/null
-		ret=$?
-		(( ${ret} )) || break
-	done
-
-	rm -f "${fcode}.x"
-	return ${ret}
-}
-
-# @FUNCTION: _die_msg
-# @INTERNAL
-# @DESCRIPTION:
-# Detailed description how to handle fortran support
-_die_msg() {
-	echo
-	eerror "Please install currently selected gcc version with USE=fortran."
-	eerror "If you intend to use a different compiler then gfortran, please"
-	eerror "set FC variable accordingly and take care that the neccessary"
-	eerror "fortran dialects are support."
-	echo
-	die "Currently no working fortran compiler is available"
-}
-
-# @FUNCTION: fortran-2_pkg_setup
-# @DESCRIPTION:
-# Setup functionallity, checks for a valid fortran compiler and optionally for its openmp support.
-fortran-2_pkg_setup() {
-	local dialect
-
-	: ${F77:=$(tc-getFC)}
-
-	: ${FORTRAN_STANDARD:=77}
-	for dialect in ${FORTRAN_STANDARD}; do
-		case ${dialect} in
-			77) _compile_test $(tc-getF77) || _die_msg ;;
-			90|95) _compile_test $(tc-getFC) 90 || _die_msg ;;
-			2003) _compile_test $(tc-getFC) 03 || _die_msg ;;
-			2008) die "Future" ;;
-			*) die "${dialect} is not a Fortran dialect." ;;
-		esac
-	done
-
-	if [[ ${FORTRAN_NEED_OPENMP} == 1 ]]; then
-		_fortran-has-openmp || \
-			die "Please install current gcc with USE=openmp or set the FC variable to a compiler that supports OpenMP"
-	fi
-	tc-export F77 FC
-}
-
-case ${EAPI:-0} in
-	0|1|2|3|4|5) EXPORT_FUNCTIONS pkg_setup ;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac

diff --git a/eclass/fox.eclass b/eclass/fox.eclass
deleted file mode 100644
index 07c28c2..0000000
--- a/eclass/fox.eclass
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.16 2012/08/13 15:54:08 mabi Exp $
-
-# @ECLASS: fox.eclass
-# @MAINTAINER:
-# mabi@g.o
-# @BLURB: Functionality required the FOX Toolkit and it's applications
-# @DESCRIPTION:
-# This eclass allows building SLOT-able FOX Toolkit installations
-# (x11-libs/fox: headers, libs, and docs), which are by design
-# parallel-installable, while installing only one version of the utils
-# (dev-util/reswrap) and apps (app-editors/adie, sci-calculators/calculator,
-# x11-misc/pathfinder, and x11-misc/shutterbug).
-#
-# Version numbering follows the kernel-style odd-even minor version
-# designation.  Even-number minor versions are API stable, which patch
-# releases aimed mostly at the library; apps generally won't need to be
-# bumped for a patch release.
-#
-# Odd-number versions are development branches with their own SLOT and
-# are API unstable; changes are made to the apps, and likely need to be
-# bumped together with the library.
-#
-# Here are sample [R]DEPENDs for the fox apps
-#	1.6: 'x11-libs/fox:1.6'
-#	1.7: '~x11-libs/fox-${PV}'
-#
-# EAPI phase trickery borrowed from enlightenment.eclass
-
-inherit autotools versionator
-
-
-FOX_EXPF="src_unpack src_compile src_install pkg_postinst"
-case "${EAPI:-0}" in
-	2|3|4|5) FOX_EXPF+=" src_prepare src_configure" ;;
-	*) ;;
-esac
-EXPORT_FUNCTIONS ${FOX_EXPF}
-
-# @ECLASS-VARIABLE: FOX_PV
-# @DESCRIPTION:
-# The version of the FOX Toolkit provided or required by the package
-: ${FOX_PV:=${PV}}
-
-# @ECLASS-VARIABLE: FOXVER
-# @INTERNAL
-# @DESCRIPTION:
-# The major.minor version of FOX_PV, usually acts as $SLOT and is used in
-# building the applications
-FOXVER=$(get_version_component_range 1-2 ${FOX_PV})
-
-# @ECLASS-VARIABLE: FOX_APPS
-# @INTERNAL
-# @DESCRIPTION:
-# The applications originally packaged in the FOX Toolkit
-FOX_APPS="adie calculator pathfinder shutterbug"
-
-# @ECLASS-VARIABLE: FOXCONF
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Set this to add additional configuration options during src_configure
-
-DESCRIPTION="C++ based Toolkit for developing Graphical User Interfaces easily and effectively"
-HOMEPAGE="http://www.fox-toolkit.org/"
-SRC_URI="ftp://ftp.fox-toolkit.org/pub/fox-${FOX_PV}.tar.gz"
-
-IUSE="debug doc profile"
-
-if [[ ${PN} != fox ]] ; then
-	FOX_COMPONENT="${FOX_COMPONENT:-${PN}}"
-fi
-
-if [[ -z ${FOX_COMPONENT} ]] ; then
-	DOXYGEN_DEP="doc? ( app-doc/doxygen )"
-fi
-
-if [[ ${PN} != reswrap ]] ; then
-	RESWRAP_DEP="dev-util/reswrap"
-fi
-
-DEPEND="${DOXYGEN_DEP}
-	${RESWRAP_DEP}
-	>=sys-apps/sed-4"
-
-S="${WORKDIR}/fox-${FOX_PV}"
-
-fox_src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	has src_prepare ${FOX_EXPF} || fox_src_prepare
-}
-
-fox_src_prepare() {
-	# fox changed from configure.in to configure.am in 1.6.38
-	local confFile="configure.ac"
-	[[ -r "configure.in" ]] && confFile="configure.in"
-
-	# Respect system CXXFLAGS
-	sed -i -e 's:CXXFLAGS=""::' $confFile || die "sed ${confFile} error"
-
-	# don't strip binaries
-	sed -i -e '/LDFLAGS="-s ${LDFLAGS}"/d' $confFile || die "sed ${confFile} error"
-
-	# don't build apps from top-level (i.e. x11-libs/fox)
-	# utils == reswrap
-	local d
-	for d in ${FOX_APPS} utils windows ; do
-		sed -i -e "s:${d}::" Makefile.am || die "sed Makefile.am error"
-	done
-
-	# use the installed reswrap for everything else
-	for d in ${FOX_APPS} chart controlpanel tests ; do
-		[[ -d ${d} ]] &&
-		(sed -i -e 's:$(top_builddir)/utils/reswrap:reswrap:' \
-			${d}/Makefile.am || die "sed ${d}/Makefile.am error")
-	done
-
-	# use the installed headers and library for apps
-	for d in ${FOX_APPS} ; do
-		sed -i \
-			-e "s:-I\$(top_srcdir)/include -I\$(top_builddir)/include:-I\$(includedir)/fox-${FOXVER}:" \
-			-e 's:$(top_builddir)/src/libFOX:-lFOX:' \
-			-e 's:$(top_builddir)/lib/libFOX:-lFOX:' \
-			-e 's:\.la::' \
-			${d}/Makefile.am || die "sed ${d}/Makefile.am error"
-	done
-
-	eautoreconf
-}
-
-fox_src_configure() {
-	use debug && FOXCONF+=" --enable-debug" \
-		  || FOXCONF+=" --enable-release"
-
-	econf ${FOXCONF} \
-		  $(use_with profile profiling)
-}
-
-
-fox_src_compile() {
-	has src_configure ${FOX_EXPF} || fox_src_configure
-
-	cd "${S}/${FOX_COMPONENT}"
-	emake || die "compile error"
-
-	# build class reference docs (FOXVER >= 1.2)
-	if use doc && [[ -z ${FOX_COMPONENT} ]] ; then
-		emake -C "${S}"/doc docs  || die "doxygen error"
-	fi
-}
-
-fox_src_install() {
-	cd "${S}/${FOX_COMPONENT}"
-
-	emake install \
-		DESTDIR="${D}" \
-		htmldir=/usr/share/doc/${PF}/html \
-		artdir=/usr/share/doc/${PF}/html/art \
-		screenshotsdir=/usr/share/doc/${PF}/html/screenshots \
-		|| die "install error"
-
-	# create desktop menu items for apps
-	case ${FOX_COMPONENT} in
-		adie)
-			newicon big_gif.gif adie.gif
-			make_desktop_entry adie "Adie Text Editor" adie.gif
-			;;
-		calculator)
-			newicon bigcalc.gif foxcalc.gif
-			make_desktop_entry calculator "FOX Calculator" foxcalc.gif
-			;;
-		pathfinder)
-			newicon iconpath.gif pathfinder.gif
-			make_desktop_entry PathFinder "PathFinder" pathfinder.gif "FileManager"
-			;;
-		shutterbug)
-			doicon shutterbug.gif
-			make_desktop_entry shutterbug "ShutterBug" shutterbug.gif "Graphics"
-			;;
-	esac
-
-	for doc in ADDITIONS AUTHORS LICENSE_ADDENDUM README TRACING ; do
-		[ -f $doc ] && dodoc $doc
-	done
-
-	# remove documentation if USE=-doc
-	use doc || rm -fr "${D}/usr/share/doc/${PF}/html"
-
-	# install class reference docs if USE=doc
-	if use doc && [[ -z ${FOX_COMPONENT} ]] ; then
-		dohtml -r "${S}/doc/ref"
-	fi
-
-	# slot fox-config
-	if [[ -f ${D}/usr/bin/fox-config ]] ; then
-		mv "${D}/usr/bin/fox-config" "${D}/usr/bin/fox-${FOXVER}-config" \
-		|| die "failed to install fox-config"
-	fi
-}
-
-fox_pkg_postinst() {
-	if [ -z "${FOX_COMPONENT}" ] ; then
-		echo
-		einfo "Multiple versions of the FOX Toolkit library may now be installed"
-		einfo "in parallel SLOTs on the same system."
-		einfo
-		einfo "The reswrap utility and the applications included in the FOX Toolkit"
-		einfo "(adie, calculator, pathfinder, shutterbug) are now available as"
-		einfo "separate ebuilds."
-		echo
-
-		if version_is_at_least "1.7.25"; then
-			einfo "Fox versions after 1.7.25 ships a pkg-config file called fox17.pc"
-			einfo "instead of the previous fox-config tool."
-			einfo "You now get all info via pkg-config:"
-			einfo
-			einfo "pkg-config fox17 --libs (etc.)"
-		else
-			einfo "The fox-config script has been installed as fox-${FOXVER}-config."
-			einfo "The fox-wrapper package is used to direct calls to fox-config"
-			einfo "to the correct versioned script, based on the WANT_FOX variable."
-			einfo "For example:"
-			einfo
-			einfo "    WANT_FOX=\"${FOXVER}\" fox-config <options>"
-		fi
-		einfo
-	fi
-}

diff --git a/eclass/games-ggz.eclass b/eclass/games-ggz.eclass
deleted file mode 100644
index 6ad837b..0000000
--- a/eclass/games-ggz.eclass
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/games-ggz.eclass,v 1.8 2012/04/23 07:16:34 mr_bones_ Exp $
-
-inherit base
-
-# For GGZ Gaming Zone packages
-
-GAMES_GGZ_EXPF="src_compile src_install pkg_postinst pkg_postrm"
-case "${EAPI:-0}" in
-	2|3|4|5) GAMES_GGZ_EXPF+=" src_configure" ;;
-	0|1) : ;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
-EXPORT_FUNCTIONS ${GAMES_GGZ_EXPF}
-
-HOMEPAGE="http://www.ggzgamingzone.org/"
-SRC_URI="mirror://ggz/${PV}/${P}.tar.gz"
-
-GGZ_MODDIR="/usr/share/ggz/modules"
-
-games-ggz_src_configure() {
-	local reg="--enable-noregistry=\"${GGZ_MODDIR}\""
-	[[ ${PN} == ggz-client-libs ]] && reg=''
-	econf \
-		--disable-dependency-tracking \
-		$reg \
-		$(has debug ${IUSE} && ! use debug && echo --disable-debug) \
-		"$@"
-}
-
-games-ggz_src_compile() {
-	has src_configure ${GAMES_GGZ_EXPF} || games-ggz_src_configure
-	emake || die "emake failed"
-}
-
-games-ggz_src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	local f
-	for f in AUTHORS ChangeLog NEWS QuickStart.GGZ README* TODO ; do
-		[[ -f ${f} ]] && dodoc ${f}
-	done
-}
-
-# Update ggz.modules with the .dsc files from ${GGZ_MODDIR}.
-games-ggz_update_modules() {
-	[[ ${EBUILD_PHASE} == "postinst" || ${EBUILD_PHASE} == "postrm" ]] \
-	 	 || die "${FUNCNAME} can only be used in pkg_postinst or pkg_postrm"
-
-	# ggz-config needs libggz, so it could be broken
-	ggz-config -h &> /dev/null || return 1
-
-	local confdir=${ROOT}/etc
-	local moddir=${ROOT}/${GGZ_MODDIR}
-	local dsc rval=0
-
-	mkdir -p "${confdir}"
-	echo -n > "${confdir}"/ggz.modules
-	if [[ -d ${moddir} ]] ; then
-		ebegin "Updating GGZ modules"
-		cd "${moddir}"
-		find . -type f -name '*.dsc' | while read dsc ; do
-			DESTDIR=${ROOT} ggz-config -Dim "${dsc}" || ((rval++))
-		done
-		eend ${rval}
-	fi
-	return ${rval}
-}
-
-# Register new modules
-games-ggz_pkg_postinst() {
-	games-ggz_update_modules
-}
-
-# Unregister old modules
-games-ggz_pkg_postrm() {
-	games-ggz_update_modules
-}

diff --git a/eclass/games.eclass b/eclass/games.eclass
deleted file mode 100644
index 991725d..0000000
--- a/eclass/games.eclass
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.152 2012/09/15 16:16:53 zmedico Exp $
-
-# devlist: games@g.o
-#
-# This is the games eclass for standardizing the install of games ...
-# you better have a *good* reason why you're *not* using games.eclass
-# in a games-* ebuild
-
-if [[ ${___ECLASS_ONCE_GAMES} != "recur -_+^+_- spank" ]] ; then
-___ECLASS_ONCE_GAMES="recur -_+^+_- spank"
-
-inherit base multilib toolchain-funcs eutils user
-
-case ${EAPI:-0} in
-	0|1) EXPORT_FUNCTIONS pkg_setup src_compile pkg_preinst pkg_postinst ;;
-	2|3|4|5) EXPORT_FUNCTIONS pkg_setup src_configure src_compile pkg_preinst pkg_postinst ;;
-	*) die "no support for EAPI=${EAPI} yet" ;;
-esac
-
-export GAMES_PREFIX=${GAMES_PREFIX:-/usr/games}
-export GAMES_PREFIX_OPT=${GAMES_PREFIX_OPT:-/opt}
-export GAMES_DATADIR=${GAMES_DATADIR:-/usr/share/games}
-export GAMES_DATADIR_BASE=${GAMES_DATADIR_BASE:-/usr/share} # some packages auto append 'games'
-export GAMES_SYSCONFDIR=${GAMES_SYSCONFDIR:-/etc/games}
-export GAMES_STATEDIR=${GAMES_STATEDIR:-/var/games}
-export GAMES_LOGDIR=${GAMES_LOGDIR:-/var/log/games}
-export GAMES_BINDIR=${GAMES_BINDIR:-${GAMES_PREFIX}/bin}
-export GAMES_ENVD="90games"
-# if you want to use a different user/group than games.games,
-# just add these two variables to your environment (aka /etc/profile)
-export GAMES_USER=${GAMES_USER:-root}
-export GAMES_USER_DED=${GAMES_USER_DED:-games}
-export GAMES_GROUP=${GAMES_GROUP:-games}
-
-games_get_libdir() {
-	echo ${GAMES_PREFIX}/$(get_libdir)
-}
-
-egamesconf() {
-	econf \
-		--prefix="${GAMES_PREFIX}" \
-		--libdir="$(games_get_libdir)" \
-		--datadir="${GAMES_DATADIR}" \
-		--sysconfdir="${GAMES_SYSCONFDIR}" \
-		--localstatedir="${GAMES_STATEDIR}" \
-		"$@"
-}
-
-gameswrapper() {
-	# dont want to pollute calling env
-	(
-		into "${GAMES_PREFIX}"
-		cmd=$1
-		shift
-		${cmd} "$@"
-	)
-}
-
-dogamesbin() { gameswrapper ${FUNCNAME/games} "$@"; }
-dogamessbin() { gameswrapper ${FUNCNAME/games} "$@"; }
-dogameslib() { gameswrapper ${FUNCNAME/games} "$@"; }
-dogameslib.a() { gameswrapper ${FUNCNAME/games} "$@"; }
-dogameslib.so() { gameswrapper ${FUNCNAME/games} "$@"; }
-newgamesbin() { gameswrapper ${FUNCNAME/games} "$@"; }
-newgamessbin() { gameswrapper ${FUNCNAME/games} "$@"; }
-
-games_make_wrapper() { gameswrapper ${FUNCNAME/games_} "$@"; }
-
-gamesowners() { chown ${GAMES_USER}:${GAMES_GROUP} "$@"; }
-gamesperms() { chmod u+rw,g+r-w,o-rwx "$@"; }
-prepgamesdirs() {
-	local dir f mode
-	for dir in \
-		"${GAMES_PREFIX}" "${GAMES_PREFIX_OPT}" "${GAMES_DATADIR}" \
-		"${GAMES_SYSCONFDIR}" "${GAMES_STATEDIR}" "$(games_get_libdir)" \
-		"${GAMES_BINDIR}" "$@"
-	do
-		[[ ! -d ${D}/${dir} ]] && continue
-		(
-			gamesowners -R "${D}/${dir}"
-			find "${D}/${dir}" -type d -print0 | xargs -0 chmod 750
-			mode=o-rwx,g+r,g-w
-			[[ ${dir} = ${GAMES_STATEDIR} ]] && mode=o-rwx,g+r
-			find "${D}/${dir}" -type f -print0 | xargs -0 chmod $mode
-
-			# common trees should not be games owned #264872
-			if [[ ${dir} == "${GAMES_PREFIX_OPT}" ]] ; then
-				fowners root:root "${dir}"
-				fperms 755 "${dir}"
-				for d in $(get_libdir) bin ; do
-					# check if dirs exist to avoid "nonfatal" option
-					if [[ -e ${D}/${dir}/${d} ]] ; then
-						fowners root:root "${dir}/${d}"
-						fperms 755 "${dir}/${d}"
-					fi
-				done
-			fi
-		) &>/dev/null
-
-		f=$(find "${D}/${dir}" -perm +4000 -a -uid 0 2>/dev/null)
-		if [[ -n ${f} ]] ; then
-			eerror "A game was detected that is setuid root!"
-			eerror "${f}"
-			die "refusing to merge a setuid root game"
-		fi
-	done
-	[[ -d ${D}/${GAMES_BINDIR} ]] || return 0
-	find "${D}/${GAMES_BINDIR}" -maxdepth 1 -type f -exec chmod 750 '{}' \;
-}
-
-gamesenv() {
-	local d libdirs
-
-	for d in $(get_all_libdirs) ; do
-		libdirs="${libdirs}:${GAMES_PREFIX}/${d}"
-	done
-
-	# Wish we could use doevnd here, but we dont want the env
-	# file to be tracked in the CONTENTS of every game
-	cat <<-EOF > "${ROOT}"/etc/env.d/${GAMES_ENVD}
-	LDPATH="${libdirs:1}"
-	PATH="${GAMES_BINDIR}"
-	EOF
-}
-
-games_pkg_setup() {
-	tc-export CC CXX LD AR RANLIB
-
-	enewgroup "${GAMES_GROUP}" 35
-	[[ ${GAMES_USER} != "root" ]] \
-		&& enewuser "${GAMES_USER}" 35 -1 "${GAMES_PREFIX}" "${GAMES_GROUP}"
-	[[ ${GAMES_USER_DED} != "root" ]] \
-		&& enewuser "${GAMES_USER_DED}" 36 /bin/bash "${GAMES_PREFIX}" "${GAMES_GROUP}"
-
-	# Dear portage team, we are so sorry.  Lots of love, games team.
-	# See Bug #61680
-	[[ ${USERLAND} != "GNU" ]] && return 0
-	[[ $(egetshell "${GAMES_USER_DED}") == "/bin/false" ]] \
-		&& usermod -s /bin/bash "${GAMES_USER_DED}"
-}
-
-games_src_configure() {
-	[[ -x ./configure ]] && egamesconf
-}
-
-games_src_compile() {
-	case ${EAPI:-0} in
-		0|1) games_src_configure ;;
-	esac
-	base_src_make
-}
-
-games_pkg_preinst() {
-	local f
-
-	while read f ; do
-		if [[ -e ${ROOT}/${GAMES_STATEDIR}/${f} ]] ; then
-			cp -p \
-				"${ROOT}/${GAMES_STATEDIR}/${f}" \
-				"${D}/${GAMES_STATEDIR}/${f}" \
-				|| die "cp failed"
-			# make the date match the rest of the install
-			touch "${D}/${GAMES_STATEDIR}/${f}"
-		fi
-	done < <(find "${D}/${GAMES_STATEDIR}" -type f -printf '%P\n' 2>/dev/null)
-}
-
-# pkg_postinst function ... create env.d entry and warn about games group
-games_pkg_postinst() {
-	gamesenv
-	if [[ -z "${GAMES_SHOW_WARNING}" ]] ; then
-		ewarn "Remember, in order to play games, you have to"
-		ewarn "be in the '${GAMES_GROUP}' group."
-		echo
-		case ${CHOST} in
-			*-darwin*) ewarn "Just run 'niutil -appendprop / /groups/games users <USER>'";;
-			*-freebsd*|*-dragonfly*) ewarn "Just run 'pw groupmod ${GAMES_GROUP} -m <USER>'";;
-			*) ewarn "Just run 'gpasswd -a <USER> ${GAMES_GROUP}', then have <USER> re-login.";;
-		esac
-		echo
-		einfo "For more info about Gentoo gaming in general, see our website:"
-		einfo "   http://games.gentoo.org/"
-		echo
-	fi
-}
-
-# Unpack .uz2 files for UT2003/UT2004
-# $1: directory or file to unpack
-games_ut_unpack() {
-	local ut_unpack="$1"
-	local f=
-
-	if [[ -z ${ut_unpack} ]] ; then
-		die "You must provide an argument to games_ut_unpack"
-	fi
-	if [[ -f ${ut_unpack} ]] ; then
-		uz2unpack "${ut_unpack}" "${ut_unpack%.uz2}" \
-			|| die "uncompressing file ${ut_unpack}"
-	fi
-	if [[ -d ${ut_unpack} ]] ; then
-		while read f ; do
-			uz2unpack "${ut_unpack}/${f}" "${ut_unpack}/${f%.uz2}" \
-				|| die "uncompressing file ${f}"
-			rm -f "${ut_unpack}/${f}" || die "deleting compressed file ${f}"
-		done < <(find "${ut_unpack}" -maxdepth 1 -name '*.uz2' -printf '%f\n' 2>/dev/null)
-	fi
-}
-
-# Unpacks .umod/.ut2mod/.ut4mod files for UT/UT2003/UT2004
-# Usage: games_umod_unpack $1
-# oh, and don't forget to set 'dir' and 'Ddir'
-games_umod_unpack() {
-	local umod=$1
-	mkdir -p "${Ddir}"/System
-	cp "${dir}"/System/{ucc-bin,{Manifest,Def{ault,User}}.ini,{Engine,Core,zlib,ogg,vorbis}.so,{Engine,Core}.int} "${Ddir}"/System
-	cd "${Ddir}"/System
-	UT_DATA_PATH=${Ddir}/System ./ucc-bin umodunpack -x "${S}/${umod}" -nohomedir &> /dev/null \
-		|| die "uncompressing file ${umod}"
-	rm -f "${Ddir}"/System/{ucc-bin,{Manifest,Def{ault,User},User,UT200{3,4}}.ini,{Engine,Core,zlib,ogg,vorbis}.so,{Engine,Core}.int,ucc.log} &>/dev/null \
-		|| die "Removing temporary files"
-}
-
-fi

diff --git a/eclass/git.eclass b/eclass/git.eclass
deleted file mode 100644
index 8899129..0000000
--- a/eclass/git.eclass
+++ /dev/null
@@ -1,470 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/git.eclass,v 1.58 2011/12/14 23:40:18 vapier Exp $
-
-# @DEPRECATED
-# This eclass has been superseded by git-2 eclass.
-# Please modify your ebuilds to use that one instead.
-
-# @ECLASS: git.eclass
-# @MAINTAINER:
-# Donnie Berkholz <dberkholz@g.o>
-# @BLURB: Fetching and unpacking of git repositories
-# @DESCRIPTION:
-# The git eclass provides functions to fetch, patch and bootstrap
-# software sources from git repositories and is based on the subversion eclass.
-# It is necessary to define at least the EGIT_REPO_URI variable.
-# @THANKS TO:
-# Fernando J. Pereda <ferdy@g.o>
-
-inherit eutils
-
-EGIT="git.eclass"
-
-# We DEPEND on a not too ancient git version
-DEPEND=">=dev-vcs/git-1.6"
-
-EXPORTED_FUNCTIONS="src_unpack"
-case "${EAPI:-0}" in
-	4|5|3|2) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare" ;;
-	1|0) ;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
-EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
-
-# define some nice defaults but only if nothing is set already
-: ${HOMEPAGE:=http://git-scm.com/}
-
-# @ECLASS-VARIABLE: EGIT_QUIET
-# @DESCRIPTION:
-# Set to non-empty value to supress some eclass messages.
-: ${EGIT_QUIET:=${ESCM_QUIET}}
-
-# @ECLASS-VARIABLE: EGIT_STORE_DIR
-# @DESCRIPTION:
-# Storage directory for git sources.
-# Can be redefined.
-: ${EGIT_STORE_DIR:="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/git-src"}
-
-# @ECLASS-VARIABLE: EGIT_UNPACK_DIR
-# @DESCRIPTION:
-# Directory to unpack git sources in.
-
-# @ECLASS-VARIABLE: EGIT_HAS_SUBMODULES
-# @DESCRIPTION:
-# Set this to non-empty value to enable submodule support (slower).
-: ${EGIT_HAS_SUBMODULES:=}
-
-# @ECLASS-VARIABLE: EGIT_FETCH_CMD
-# @DESCRIPTION:
-# Command for cloning the repository.
-: ${EGIT_FETCH_CMD:="git clone"}
-
-# @ECLASS-VARIABLE: EGIT_UPDATE_CMD
-# @DESCRIPTION:
-# Git fetch command.
-if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
-	EGIT_UPDATE_CMD="git pull -f -u"
-else
-	EGIT_UPDATE_CMD="git fetch -f -u"
-fi
-
-# @ECLASS-VARIABLE: EGIT_DIFFSTAT_CMD
-# @DESCRIPTION:
-# Git command for diffstat.
-EGIT_DIFFSTAT_CMD="git --no-pager diff --stat"
-
-# @ECLASS-VARIABLE: EGIT_OPTIONS
-# @DESCRIPTION:
-# This variable value is passed to clone and fetch.
-: ${EGIT_OPTIONS:=}
-
-# @ECLASS-VARIABLE: EGIT_MASTER
-# @DESCRIPTION:
-# Variable for specifying master branch.
-# Usefull when upstream don't have master branch.
-: ${EGIT_MASTER:=master}
-
-# @ECLASS-VARIABLE: EGIT_REPO_URI
-# @DESCRIPTION:
-# URI for the repository
-# e.g. http://foo, git://bar
-# Supported protocols:
-#   http://
-#   https://
-#   git://
-#   git+ssh://
-#   rsync://
-#   ssh://
-eval X="\$${PN//[-+]/_}_LIVE_REPO"
-if [[ ${X} = "" ]]; then
-	: ${EGIT_REPO_URI:=}
-else
-	EGIT_REPO_URI="${X}"
-fi
-# @ECLASS-VARIABLE: EGIT_PROJECT
-# @DESCRIPTION:
-# Project name, it must be unique across EGIT_STORE_DIR.
-# Git eclass will check out the git repository into ${EGIT_STORE_DIR}/${EGIT_PROJECT}/${EGIT_REPO_URI##*/}
-# Default is ${PN}.
-: ${EGIT_PROJECT:=${PN}}
-
-# @ECLASS-VARIABLE: EGIT_BOOTSTRAP
-# @DESCRIPTION:
-# bootstrap script or command like autogen.sh or etc...
-: ${EGIT_BOOTSTRAP:=}
-
-# @ECLASS-VARIABLE: EGIT_OFFLINE
-# @DESCRIPTION:
-# Set this variable to a non-empty value to disable the automatic updating of
-# an GIT source tree. This is intended to be set outside the git source
-# tree by users.
-: ${EGIT_OFFLINE:=${ESCM_OFFLINE}}
-
-# @ECLASS-VARIABLE: EGIT_PATCHES
-# @DESCRIPTION:
-# Similar to PATCHES array from base.eclass
-# Only difference is that this patches are applied before bootstrap.
-# Please take note that this variable should be bash array.
-
-# @ECLASS-VARIABLE: EGIT_BRANCH
-# @DESCRIPTION:
-# git eclass can fetch any branch in git_fetch().
-eval X="\$${PN//[-+]/_}_LIVE_BRANCH"
-if [[ "${X}" = "" ]]; then
-	: ${EGIT_BRANCH:=master}
-else
-	EGIT_BRANCH="${X}"
-fi
-
-# @ECLASS-VARIABLE: EGIT_COMMIT
-# @DESCRIPTION:
-# git eclass can checkout any commit.
-eval X="\$${PN//[-+]/_}_LIVE_COMMIT"
-if [[ "${X}" = "" ]]; then
-	: ${EGIT_COMMIT:=${EGIT_BRANCH}}
-else
-	EGIT_COMMIT="${X}"
-fi
-
-# @ECLASS-VARIABLE: EGIT_REPACK
-# @DESCRIPTION:
-# Set to non-empty value to repack objects to save disk space. However this can
-# take a long time with VERY big repositories.
-: ${EGIT_REPACK:=}
-
-# @ECLASS-VARIABLE: EGIT_PRUNE
-# @DESCRIPTION:
-# Set to non-empty value to prune loose objects on each fetch. This is useful
-# if upstream rewinds and rebases branches often.
-: ${EGIT_PRUNE:=}
-
-# @FUNCTION: git_submodules
-# @DESCRIPTION:
-# Internal function wrapping the submodule initialisation and update
-git_submodules() {
-	if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
-		debug-print "git submodule init"
-		git submodule init
-		debug-print "git submodule sync"
-		git submodule sync
-		debug-print "git submodule update"
-		git submodule update
-	fi
-}
-
-# @FUNCTION: git_branch
-# @DESCRIPTION:
-# Internal function that changes branch for the repo based on EGIT_TREE and
-# EGIT_BRANCH variables.
-git_branch() {
-	local branchname=branch-${EGIT_BRANCH} src=origin/${EGIT_BRANCH}
-	if [[ "${EGIT_COMMIT}" != "${EGIT_BRANCH}" ]]; then
-		branchname=tree-${EGIT_COMMIT}
-		src=${EGIT_COMMIT}
-	fi
-	debug-print "git checkout -b ${branchname} ${src}"
-	git checkout -b ${branchname} ${src} &> /dev/null
-
-	unset branchname src
-}
-
-# @FUNCTION: git_fetch
-# @DESCRIPTION:
-# Gets repository from EGIT_REPO_URI and store it in specified EGIT_STORE_DIR
-git_fetch() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	eqawarn "git.eclass is deprecated."
-	eqawarn "Please update your ebuilds to use git-2 instead. For details, see"
-	eqawarn "http://archives.gentoo.org/gentoo-dev/msg_b7ba363cae580845819ae3501fb157e9.xml"
-
-	local GIT_DIR EGIT_CLONE_DIR oldsha1 cursha1 extra_clone_opts upstream_branch
-	[[ -z ${EGIT_HAS_SUBMODULES} ]] && export GIT_DIR
-
-	# choose if user wants elog or just einfo.
-	if [[ -n ${EGIT_QUIET} ]]; then
-		elogcmd="einfo"
-	else
-		elogcmd="elog"
-	fi
-
-	# If we have same branch and the tree we can do --depth 1 clone
-	# which outputs into really smaller data transfers.
-	# Sadly we can do shallow copy for now because quite a few packages need .git
-	# folder.
-	#[[ ${EGIT_COMMIT} = ${EGIT_BRANCH} ]] && \
-	#	EGIT_FETCH_CMD="${EGIT_FETCH_CMD} --depth 1"
-	if [[ -n ${EGIT_TREE} ]] ; then
-		EGIT_COMMIT=${EGIT_TREE}
-		ewarn "QA: Usage of deprecated EGIT_TREE variable detected."
-		ewarn "QA: Use EGIT_COMMIT variable instead."
-	fi
-
-	# EGIT_REPO_URI is empty.
-	[[ -z ${EGIT_REPO_URI} ]] && die "${EGIT}: EGIT_REPO_URI is empty."
-
-	# check for the protocol or pull from a local repo.
-	if [[ -z ${EGIT_REPO_URI%%:*} ]] ; then
-		case ${EGIT_REPO_URI%%:*} in
-			git*|http|https|rsync|ssh) ;;
-			*) die "${EGIT}: protocol for fetch from "${EGIT_REPO_URI%:*}" is not yet implemented in eclass." ;;
-		esac
-	fi
-
-	# initial clone, we have to create master git storage directory and play
-	# nicely with sandbox
-	if [[ ! -d ${EGIT_STORE_DIR} ]] ; then
-		debug-print "${FUNCNAME}: initial clone. creating git directory"
-		addwrite /
-		mkdir -m 775 -p "${EGIT_STORE_DIR}" \
-			|| die "${EGIT}: can't mkdir ${EGIT_STORE_DIR}."
-		export SANDBOX_WRITE="${SANDBOX_WRITE%%:/}"
-	fi
-
-	cd -P "${EGIT_STORE_DIR}" || die "${EGIT}: can't chdir to ${EGIT_STORE_DIR}"
-	EGIT_STORE_DIR=${PWD}
-
-	# allow writing into EGIT_STORE_DIR
-	addwrite "${EGIT_STORE_DIR}"
-
-	[[ -z ${EGIT_REPO_URI##*/} ]] && EGIT_REPO_URI="${EGIT_REPO_URI%/}"
-	EGIT_CLONE_DIR="${EGIT_PROJECT}"
-
-	debug-print "${FUNCNAME}: EGIT_OPTIONS = \"${EGIT_OPTIONS}\""
-
-	GIT_DIR="${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}"
-	# we also have to remove all shallow copied repositories
-	# and fetch them again
-	if [[ -e "${GIT_DIR}/shallow" ]]; then
-		rm -rf "${GIT_DIR}"
-		einfo "The ${EGIT_CLONE_DIR} was shallow copy. Refetching."
-	fi
-	# repack from bare copy to normal one
-	if [[ -n ${EGIT_HAS_SUBMODULES} ]] && [[ -d ${GIT_DIR} && ! -d ${GIT_DIR}/.git ]]; then
-		rm -rf "${GIT_DIR}"
-		einfo "The ${EGIT_CLONE_DIR} was bare copy. Refetching."
-	fi
-	if [[ -z ${EGIT_HAS_SUBMODULES} ]] && [[ -d ${GIT_DIR} && -d ${GIT_DIR}/.git ]]; then
-		rm -rf "${GIT_DIR}"
-		einfo "The ${EGIT_CLONE_DIR} was not a bare copy. Refetching."
-	fi
-
-	if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
-		upstream_branch=origin/${EGIT_BRANCH}
-	else
-		upstream_branch=${EGIT_BRANCH}
-		extra_clone_opts=--bare
-	fi
-
-	if [[ ! -d ${GIT_DIR} ]] ; then
-		# first clone
-		${elogcmd} "GIT NEW clone -->"
-		${elogcmd} "   repository: 		${EGIT_REPO_URI}"
-
-		debug-print "${EGIT_FETCH_CMD} ${extra_clone_opts} ${EGIT_OPTIONS} \"${EGIT_REPO_URI}\" ${GIT_DIR}"
-		${EGIT_FETCH_CMD} ${extra_clone_opts} ${EGIT_OPTIONS} "${EGIT_REPO_URI}" ${GIT_DIR} \
-			|| die "${EGIT}: can't fetch from ${EGIT_REPO_URI}."
-
-		pushd "${GIT_DIR}" &> /dev/null
-		cursha1=$(git rev-parse ${upstream_branch})
-		${elogcmd} "   at the commit:		${cursha1}"
-
-		git_submodules
-		popd &> /dev/null
-	elif [[ -n ${EGIT_OFFLINE} ]] ; then
-		pushd "${GIT_DIR}" &> /dev/null
-		cursha1=$(git rev-parse ${upstream_branch})
-		${elogcmd} "GIT offline update -->"
-		${elogcmd} "   repository: 		${EGIT_REPO_URI}"
-		${elogcmd} "   at the commit:		${cursha1}"
-		popd &> /dev/null
-	else
-		pushd "${GIT_DIR}" &> /dev/null
-		# Git urls might change, so unconditionally set it here
-		git config remote.origin.url "${EGIT_REPO_URI}"
-
-		# fetch updates
-		${elogcmd} "GIT update -->"
-		${elogcmd} "   repository: 		${EGIT_REPO_URI}"
-
-		oldsha1=$(git rev-parse ${upstream_branch})
-
-		if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
-			debug-print "${EGIT_UPDATE_CMD} ${EGIT_OPTIONS}"
-			# fix branching
-			git checkout ${EGIT_MASTER}
-			for x in $(git branch |grep -v "* ${EGIT_MASTER}" |tr '\n' ' '); do
-				git branch -D ${x}
-			done
-			${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} \
-				|| die "${EGIT}: can't update from ${EGIT_REPO_URI}."
-		else
-			debug-print "${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} origin ${EGIT_BRANCH}:${EGIT_BRANCH}"
-			${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} origin ${EGIT_BRANCH}:${EGIT_BRANCH} \
-				|| die "${EGIT}: can't update from ${EGIT_REPO_URI}."
-		fi
-
-		git_submodules
-		cursha1=$(git rev-parse ${upstream_branch})
-
-		# write out message based on the revisions
-		if [[ "${oldsha1}" != "${cursha1}" ]]; then
-			${elogcmd} "   updating from commit:	${oldsha1}"
-			${elogcmd} "   to commit:		${cursha1}"
-		else
-			${elogcmd} "   at the commit: 		${cursha1}"
-			# @ECLASS-VARIABLE: LIVE_FAIL_FETCH_IF_REPO_NOT_UPDATED
-			# @DESCRIPTION:
-			# If this variable is set to TRUE in make.conf or somewhere in
-			# enviroment the package will fail if there is no update, thus in
-			# combination with --keep-going it would lead in not-updating
-			# pakcages that are up-to-date.
-			# TODO: this can lead to issues if more projects/packages use same repo
-			[[ ${LIVE_FAIL_FETCH_IF_REPO_NOT_UPDATED} = true ]] && \
-				debug-print "${FUNCNAME}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping." && \
-				die "${EGIT}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping."
-		fi
-		${EGIT_DIFFSTAT_CMD} ${oldsha1}..${upstream_branch}
-		popd &> /dev/null
-	fi
-
-	pushd "${GIT_DIR}" &> /dev/null
-	if [[ -n ${EGIT_REPACK} ]] || [[ -n ${EGIT_PRUNE} ]]; then
-		ebegin "Garbage collecting the repository"
-		local args
-		[[ -n ${EGIT_PRUNE} ]] && args='--prune'
-		git gc ${args}
-		eend $?
-	fi
-	popd &> /dev/null
-
-	# export the git version
-	export EGIT_VERSION="${cursha1}"
-
-	# log the repo state
-	[[ "${EGIT_COMMIT}" != "${EGIT_BRANCH}" ]] && ${elogcmd} "   commit:			${EGIT_COMMIT}"
-	${elogcmd} "   branch: 			${EGIT_BRANCH}"
-	${elogcmd} "   storage directory: 	\"${GIT_DIR}\""
-
-	if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
-		pushd "${GIT_DIR}" &> /dev/null
-		debug-print "rsync -rlpgo . \"${EGIT_UNPACK_DIR:-${S}}\""
-		time rsync -rlpgo . "${EGIT_UNPACK_DIR:-${S}}"
-		popd &> /dev/null
-	else
-		unset GIT_DIR
-		debug-print "git clone -l -s -n \"${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}\" \"${EGIT_UNPACK_DIR:-${S}}\""
-		git clone -l -s -n "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" "${EGIT_UNPACK_DIR:-${S}}"
-	fi
-
-	pushd "${EGIT_UNPACK_DIR:-${S}}" &> /dev/null
-	git_branch
-	# submodules always reqire net (thanks to branches changing)
-	[[ -z ${EGIT_OFFLINE} ]] && git_submodules
-	popd &> /dev/null
-
-	echo ">>> Unpacked to ${EGIT_UNPACK_DIR:-${S}}"
-}
-
-# @FUNCTION: git_bootstrap
-# @DESCRIPTION:
-# Runs bootstrap command if EGIT_BOOTSTRAP variable contains some value
-# Remember that what ever gets to the EGIT_BOOTSTRAP variable gets evaled by bash.
-git_bootstrap() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ -n ${EGIT_BOOTSTRAP} ]] ; then
-		pushd "${S}" > /dev/null
-		einfo "Starting bootstrap"
-
-		if [[ -f ${EGIT_BOOTSTRAP} ]]; then
-			# we have file in the repo which we should execute
-			debug-print "$FUNCNAME: bootstraping with file \"${EGIT_BOOTSTRAP}\""
-
-			if [[ -x ${EGIT_BOOTSTRAP} ]]; then
-				eval "./${EGIT_BOOTSTRAP}" \
-					|| die "${EGIT}: bootstrap script failed"
-			else
-				eerror "\"${EGIT_BOOTSTRAP}\" is not executable."
-				eerror "Report upstream, or bug ebuild maintainer to remove bootstrap command."
-				die "${EGIT}: \"${EGIT_BOOTSTRAP}\" is not executable."
-			fi
-		else
-			# we execute some system command
-			debug-print "$FUNCNAME: bootstraping with commands \"${EGIT_BOOTSTRAP}\""
-
-			eval "${EGIT_BOOTSTRAP}" \
-				|| die "${EGIT}: bootstrap commands failed."
-
-		fi
-
-		einfo "Bootstrap finished"
-		popd > /dev/null
-	fi
-}
-
-# @FUNCTION: git_apply_patches
-# @DESCRIPTION:
-# Apply patches from EGIT_PATCHES bash array.
-# Preferred is using the variable as bash array but for now it allows to write
-# it also as normal space separated string list. (This part of code should be
-# removed when all ebuilds get converted on bash array).
-git_apply_patches() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	pushd "${EGIT_UNPACK_DIR:-${S}}" > /dev/null
-	if [[ ${#EGIT_PATCHES[@]} -gt 1 ]] ; then
-		for i in "${EGIT_PATCHES[@]}"; do
-			debug-print "$FUNCNAME: git_autopatch: patching from ${i}"
-			epatch "${i}"
-		done
-	elif [[ -n ${EGIT_PATCHES} ]]; then
-		# no need for loop if space separated string is passed.
-		debug-print "$FUNCNAME: git_autopatch: patching from ${EGIT_PATCHES}"
-		epatch "${EGIT_PATCHES}"
-	fi
-
-	popd > /dev/null
-}
-
-# @FUNCTION: git_src_unpack
-# @DESCRIPTION:
-# src_upack function, calls src_prepare one if EAPI!=2.
-git_src_unpack() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	git_fetch || die "${EGIT}: unknown problem in git_fetch()."
-
-	has src_prepare ${EXPORTED_FUNCTIONS} || git_src_prepare
-}
-
-# @FUNCTION: git_src_prepare
-# @DESCRIPTION:
-# src_prepare function for git stuff. Patches, bootstrap...
-git_src_prepare() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	git_apply_patches
-	git_bootstrap
-}

diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass
deleted file mode 100644
index f27c738..0000000
--- a/eclass/gnome2-utils.eclass
+++ /dev/null
@@ -1,426 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.28 2012/06/21 15:10:59 naota Exp $
-
-# @ECLASS: gnome2-utils.eclass
-# @MAINTAINER:
-# gnome@g.o
-# @BLURB: Auxiliary functions commonly used by Gnome packages.
-# @DESCRIPTION:
-# This eclass provides a set of auxiliary functions needed by most Gnome
-# packages. It may be used by non-Gnome packages as needed for handling various
-# Gnome stack related functions such as:
-#  * Gtk+ icon cache management
-#  * GSettings schemas management
-#  * GConf schemas management
-#  * scrollkeeper (old Gnome help system) management
-
-case "${EAPI:-0}" in
-	0|1|2|3|4|5) ;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-# @ECLASS-VARIABLE: GCONFTOOL_BIN
-# @INTERNAL
-# @DESCRIPTION:
-# Path to gconftool-2
-: ${GCONFTOOL_BIN:="/usr/bin/gconftool-2"}
-
-# @ECLASS-VARIABLE: SCROLLKEEPER_DIR
-# @INTERNAL
-# @DESCRIPTION:
-# Directory where scrollkeeper-update should do its work
-: ${SCROLLKEEPER_DIR:="/var/lib/scrollkeeper"}
-
-# @ECLASS-VARIABLE: SCROLLKEEPER_UPDATE_BIN
-# @INTERNAL
-# @DESCRIPTION:
-# Path to scrollkeeper-update
-: ${SCROLLKEEPER_UPDATE_BIN:="/usr/bin/scrollkeeper-update"}
-
-# @ECLASS-VARIABLE: GTK_UPDATE_ICON_CACHE
-# @INTERNAL
-# @DESCRIPTION:
-# Path to gtk-update-icon-cache
-: ${GTK_UPDATE_ICON_CACHE:="/usr/bin/gtk-update-icon-cache"}
-
-# @ECLASS-VARIABLE: GLIB_COMPILE_SCHEMAS
-# @INTERNAL
-# @DESCRIPTION:
-# Path to glib-compile-schemas
-: ${GLIB_COMPILE_SCHEMAS:="/usr/bin/glib-compile-schemas"}
-
-# @ECLASS-VARIABLE: GNOME2_ECLASS_SCHEMAS
-# @INTERNAL
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# List of GConf schemas provided by the package
-
-# @ECLASS-VARIABLE: GNOME2_ECLASS_ICONS
-# @INTERNAL
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# List of icons provided by the package
-
-# @ECLASS-VARIABLE: GNOME2_ECLASS_SCROLLS
-# @INTERNAL
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# List of scrolls (documentation files) provided by the package
-
-# @ECLASS-VARIABLE: GNOME2_ECLASS_GLIB_SCHEMAS
-# @INTERNAL
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# List of GSettings schemas provided by the package
-
-DEPEND=">=sys-apps/sed-4"
-
-
-# @FUNCTION: gnome2_environment_reset
-# @DESCRIPTION:
-# Reset various variables inherited from root's evironment to a reasonable
-# default for ebuilds to help avoid access violations and test failures.
-gnome2_environment_reset() {
-	# Respected by >=glib-2.30.1-r1
-	export G_HOME="${T}"
-
-	# GST_REGISTRY is to work around gst utilities trying to read/write /root
-	export GST_REGISTRY="${T}/registry.xml"
-
-	# XXX: code for resetting XDG_* directories should probably be moved into
-	# a separate function in a non-gnome eclass
-	export XDG_DATA_HOME="${T}/.local/share"
-	export XDG_CONFIG_HOME="${T}/.config"
-	export XDG_CACHE_HOME="${T}/.cache"
-	export XDG_RUNTIME_DIR="${T}/run"
-	mkdir -p "${XDG_DATA_HOME}" "${XDG_CONFIG_HOME}" "${XDG_CACHE_HOME}" \
-		"${XDG_RUNTIME_DIR}"
-	# This directory needs to be owned by the user, and chmod 0700
-	# http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
-	chmod 0700 "${XDG_RUNTIME_DIR}"
-}
-
-# @FUNCTION: gnome2_gconf_savelist
-# @DESCRIPTION:
-# Find the GConf schemas that are about to be installed and save their location
-# in the GNOME2_ECLASS_SCHEMAS environment variable.
-# This function should be called from pkg_preinst.
-gnome2_gconf_savelist() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
-	pushd "${ED}" &> /dev/null
-	export GNOME2_ECLASS_SCHEMAS=$(find 'etc/gconf/schemas/' -name '*.schemas' 2> /dev/null)
-	popd &> /dev/null
-}
-
-# @FUNCTION: gnome2_gconf_install
-# @DESCRIPTION:
-# Applies any schema files installed by the current ebuild to Gconf's database
-# using gconftool-2.
-# This function should be called from pkg_postinst.
-gnome2_gconf_install() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
-	local updater="${EROOT}${GCONFTOOL_BIN}"
-
-	if [[ ! -x "${updater}" ]]; then
-		debug-print "${updater} is not executable"
-		return
-	fi
-
-	if [[ -z "${GNOME2_ECLASS_SCHEMAS}" ]]; then
-		debug-print "No GNOME 2 GConf schemas found"
-		return
-	fi
-
-	# We are ready to install the GCONF Scheme now
-	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-	export GCONF_CONFIG_SOURCE="$("${updater}" --get-default-source | sed "s;:/;:${ROOT};")"
-
-	einfo "Installing GNOME 2 GConf schemas"
-
-	local F
-	for F in ${GNOME2_ECLASS_SCHEMAS}; do
-		if [[ -e "${EROOT}${F}" ]]; then
-			debug-print "Installing schema: ${F}"
-			"${updater}" --makefile-install-rule "${EROOT}${F}" 1>/dev/null
-		fi
-	done
-
-	# have gconf reload the new schemas
-	pids=$(pgrep -x gconfd-2)
-	if [[ $? == 0 ]] ; then
-		ebegin "Reloading GConf schemas"
-		kill -HUP ${pids}
-		eend $?
-	fi
-}
-
-# @FUNCTION: gnome2_gconf_uninstall
-# @DESCRIPTION:
-# Removes schema files previously installed by the current ebuild from Gconf's
-# database.
-gnome2_gconf_uninstall() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
-	local updater="${EROOT}${GCONFTOOL_BIN}"
-
-	if [[ ! -x "${updater}" ]]; then
-		debug-print "${updater} is not executable"
-		return
-	fi
-
-	if [[ -z "${GNOME2_ECLASS_SCHEMAS}" ]]; then
-		debug-print "No GNOME 2 GConf schemas found"
-		return
-	fi
-
-	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-	export GCONF_CONFIG_SOURCE="$("${updater}" --get-default-source | sed "s;:/;:${ROOT};")"
-
-	einfo "Uninstalling GNOME 2 GConf schemas"
-
-	local F
-	for F in ${GNOME2_ECLASS_SCHEMAS}; do
-		if [[ -e "${EROOT}${F}" ]]; then
-			debug-print "Uninstalling gconf schema: ${F}"
-			"${updater}" --makefile-uninstall-rule "${EROOT}${F}" 1>/dev/null
-		fi
-	done
-
-	# have gconf reload the new schemas
-	pids=$(pgrep -x gconfd-2)
-	if [[ $? == 0 ]] ; then
-		ebegin "Reloading GConf schemas"
-		kill -HUP ${pids}
-		eend $?
-	fi
-}
-
-# @FUNCTION: gnome2_icon_savelist
-# @DESCRIPTION:
-# Find the icons that are about to be installed and save their location
-# in the GNOME2_ECLASS_ICONS environment variable.
-# This function should be called from pkg_preinst.
-gnome2_icon_savelist() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
-	pushd "${ED}" &> /dev/null
-	export GNOME2_ECLASS_ICONS=$(find 'usr/share/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
-	popd &> /dev/null
-}
-
-# @FUNCTION: gnome2_icon_cache_update
-# @DESCRIPTION:
-# Updates Gtk+ icon cache files under /usr/share/icons if the current ebuild
-# have installed anything under that location.
-# This function should be called from pkg_postinst and pkg_postrm.
-gnome2_icon_cache_update() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
-	local updater="${EROOT}${GTK_UPDATE_ICON_CACHE}"
-
-	if [[ ! -x "${updater}" ]] ; then
-		debug-print "${updater} is not executable"
-		return
-	fi
-
-	if [[ -z "${GNOME2_ECLASS_ICONS}" ]]; then
-		debug-print "No icon cache to update"
-		return
-	fi
-
-	ebegin "Updating icons cache"
-
-	local retval=0
-	local fails=( )
-
-	for dir in ${GNOME2_ECLASS_ICONS}
-	do
-		if [[ -f "${EROOT}${dir}/index.theme" ]] ; then
-			local rv=0
-
-			"${updater}" -qf "${EROOT}${dir}"
-			rv=$?
-
-			if [[ ! $rv -eq 0 ]] ; then
-				debug-print "Updating cache failed on ${EROOT}${dir}"
-
-				# Add to the list of failures
-				fails[$(( ${#fails[@]} + 1 ))]="${EROOT}${dir}"
-
-				retval=2
-			fi
-		elif [[ $(ls "${EROOT}${dir}") = "icon-theme.cache" ]]; then
-			# Clear stale cache files after theme uninstallation
-			rm "${EROOT}${dir}/icon-theme.cache"
-		fi
-
-		if [[ -z $(ls "${EROOT}${dir}") ]]; then
-			# Clear empty theme directories after theme uninstallation
-			rmdir "${EROOT}${dir}"
-		fi
-	done
-
-	eend ${retval}
-
-	for f in "${fails[@]}" ; do
-		eerror "Failed to update cache with icon $f"
-	done
-}
-
-# @FUNCTION: gnome2_omf_fix
-# @DESCRIPTION:
-# Workaround applied to Makefile rules in order to remove redundant
-# calls to scrollkeeper-update and sandbox violations.
-# This function should be called from src_prepare.
-gnome2_omf_fix() {
-	local omf_makefiles filename
-
-	omf_makefiles="$@"
-
-	if [[ -f ${S}/omf.make ]] ; then
-		omf_makefiles="${omf_makefiles} ${S}/omf.make"
-	fi
-
-	if [[ -f ${S}/gnome-doc-utils.make ]] ; then
-		omf_makefiles="${omf_makefiles} ${S}/gnome-doc-utils.make"
-	fi
-
-	# testing fixing of all makefiles found
-	# The sort is important to ensure .am is listed before the respective .in for
-	# maintainer mode regeneration not kicking in due to .am being newer than .in
-	for filename in $(find "${S}" -name "Makefile.in" -o -name "Makefile.am" |sort) ; do
-		omf_makefiles="${omf_makefiles} ${filename}"
-	done
-
-	ebegin "Fixing OMF Makefiles"
-
-	local retval=0
-	local fails=( )
-
-	for omf in ${omf_makefiles} ; do
-		sed -i -e 's:scrollkeeper-update:true:' "${omf}"
-		retval=$?
-
-		if [[ $retval -ne 0 ]] ; then
-			debug-print "updating of ${omf} failed"
-
-			# Add to the list of failures
-			fails[$(( ${#fails[@]} + 1 ))]=$omf
-
-			retval=2
-		fi
-	done
-
-	eend $retval
-
-	for f in "${fails[@]}" ; do
-		eerror "Failed to update OMF Makefile $f"
-	done
-}
-
-# @FUNCTION: gnome2_scrollkeeper_savelist
-# @DESCRIPTION:
-# Find the scrolls that are about to be installed and save their location
-# in the GNOME2_ECLASS_SCROLLS environment variable.
-# This function should be called from pkg_preinst.
-gnome2_scrollkeeper_savelist() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
-	pushd "${ED}" &> /dev/null
-	export GNOME2_ECLASS_SCROLLS=$(find 'usr/share/omf' -type f -name "*.omf" 2> /dev/null)
-	popd &> /dev/null
-}
-
-# @FUNCTION: gnome2_scrollkeeper_update
-# @DESCRIPTION:
-# Updates the global scrollkeeper database.
-# This function should be called from pkg_postinst and pkg_postrm.
-gnome2_scrollkeeper_update() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
-	local updater="${EROOT}${SCROLLKEEPER_UPDATE_BIN}"
-
-	if [[ ! -x "${updater}" ]] ; then
-		debug-print "${updater} is not executable"
-		return
-	fi
-
-	if [[ -z "${GNOME2_ECLASS_SCROLLS}" ]]; then
-		debug-print "No scroll cache to update"
-		return
-	fi
-
-	ebegin "Updating scrollkeeper database ..."
-	"${updater}" -q -p "${EROOT}${SCROLLKEEPER_DIR}"
-	eend $?
-}
-
-# @FUNCTION: gnome2_schemas_savelist
-# @DESCRIPTION:
-# Find if there is any GSettings schema to install and save the list in
-# GNOME2_ECLASS_GLIB_SCHEMAS variable.
-# This function should be called from pkg_preinst.
-gnome2_schemas_savelist() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
-	pushd "${ED}" &>/dev/null
-	export GNOME2_ECLASS_GLIB_SCHEMAS=$(find 'usr/share/glib-2.0/schemas' -name '*.gschema.xml' 2>/dev/null)
-	popd &>/dev/null
-}
-
-# @FUNCTION: gnome2_schemas_update
-# @USAGE: gnome2_schemas_update
-# @DESCRIPTION:
-# Updates GSettings schemas if GNOME2_ECLASS_GLIB_SCHEMAS has some.
-# This function should be called from pkg_postinst and pkg_postrm.
-gnome2_schemas_update() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
-	local updater="${EROOT}${GLIB_COMPILE_SCHEMAS}"
-
-	if [[ ! -x ${updater} ]]; then
-		debug-print "${updater} is not executable"
-		return
-	fi
-
-	if [[ -z ${GNOME2_ECLASS_GLIB_SCHEMAS} ]]; then
-		debug-print "No GSettings schemas to update"
-		return
-	fi
-
-	ebegin "Updating GSettings schemas"
-	${updater} --allow-any-name "$@" "${EROOT%/}/usr/share/glib-2.0/schemas" &>/dev/null
-	eend $?
-}
-
-# @FUNCTION: gnome2_query_immodules_gtk2
-# @USAGE: gnome2_query_immodules_gtk2
-# @DESCRIPTION:
-# Updates gtk2 immodules/gdk-pixbuf loaders listing.
-gnome2_query_immodules_gtk2() {
-	local GTK2_CONFDIR="/etc/gtk-2.0/$(get_abi_CHOST)"
-
-	local query_exec="${EPREFIX}/usr/bin/gtk-query-immodules-2.0"
-	local gtk_conf="${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
-	local gtk_conf_dir=$(dirname "${gtk_conf}")
-
-	einfo "Generating Gtk2 immodules/gdk-pixbuf loaders listing:"
-	einfo "-> ${gtk_conf}"
-
-	mkdir -p "${gtk_conf_dir}"
-	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgtk_query_immodules)
-	if [ -z "${tmp_file}" ]; then
-		ewarn "gtk_query_immodules: cannot create temporary file"
-		return 1
-	fi
-
-	if ${query_exec} > "${tmp_file}"; then
-		cat "${tmp_file}" > "${gtk_conf}" || \
-			ewarn "Failed to write to ${gtk_conf}"
-	else
-		ewarn "Cannot update gtk.immodules, file generation failed"
-	fi
-	rm "${tmp_file}"
-}
-
-# @FUNCTION: gnome2_query_immodules_gtk3
-# @USAGE: gnome2_query_immodules_gtk3
-# @DESCRIPTION:
-# Updates gtk3 immodules/gdk-pixbuf loaders listing.
-gnome2_query_immodules_gtk3() {
-	"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
-}

diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
deleted file mode 100644
index ccffdb6..0000000
--- a/eclass/gnome2.eclass
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.106 2012/05/09 08:23:14 pacho Exp $
-
-# @ECLASS: gnome2.eclass
-# @MAINTAINER:
-# gnome@g.o
-# @BLURB: 
-# @DESCRIPTION:
-# Exports portage base functions used by ebuilds written for packages using the
-# GNOME framework. For additional functions, see gnome2-utils.eclass.
-
-inherit fdo-mime libtool gnome.org gnome2-utils
-
-case "${EAPI:-0}" in
-	0|1)
-		EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
-		;;
-	2|3|4|5)
-		EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm
-		;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-# @ECLASS-VARIABLE: G2CONF
-# @DEFAULT-UNSET
-# @DESCRIPTION:
-# Extra configure opts passed to econf
-G2CONF=${G2CONF:-""}
-
-# @ECLASS-VARIABLE: GNOME2_LA_PUNT
-# @DESCRIPTION:
-# Should we delete all the .la files?
-# NOT to be used without due consideration.
-GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-"no"}
-
-# @ECLASS-VARIABLE: ELTCONF
-# @DEFAULT-UNSET
-# @DESCRIPTION:
-# Extra options passed to elibtoolize
-ELTCONF=${ELTCONF:-""}
-
-# @ECLASS-VARIABLE: USE_EINSTALL
-# @DEFAULT-UNSET
-# @DEPRECATED
-# @DESCRIPTION:
-# Should we use EINSTALL instead of DESTDIR
-USE_EINSTALL=${USE_EINSTALL:-""}
-
-# @ECLASS-VARIABLE: SCROLLKEEPER_UPDATE
-# @DEPRECATED
-# @DESCRIPTION:
-# Whether to run scrollkeeper for this package or not.
-SCROLLKEEPER_UPDATE=${SCROLLKEEPER_UPDATE:-"1"}
-
-# @ECLASS-VARIABLE: DOCS
-# @DEFAULT-UNSET
-# @DESCRIPTION:
-# String containing documents passed to dodoc command.
-
-# @ECLASS-VARIABLE: GCONF_DEBUG
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Whether to handle debug or not.
-# Some gnome applications support various levels of debugging (yes, no, minimum,
-# etc), but using --disable-debug also removes g_assert which makes debugging
-# harder. This variable should be set to yes for such packages for the eclass
-# to handle it properly. It will enable minimal debug with USE=-debug.
-# Note that this is most commonly found in configure.ac as GNOME_DEBUG_CHECK.
-
-
-if [[ ${GCONF_DEBUG} != "no" ]]; then
-	IUSE="debug"
-fi
-
-
-# @FUNCTION: gnome2_src_unpack
-# @DESCRIPTION:
-# Stub function for old EAPI.
-gnome2_src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	has ${EAPI:-0} 0 1 && gnome2_src_prepare
-}
-
-# @FUNCTION: gnome2_src_prepare
-# @DESCRIPTION:
-# Prepare environment for build, fix build of scrollkeeper documentation,
-# run elibtoolize.
-gnome2_src_prepare() {
-	# Prevent assorted access violations and test failures
-	gnome2_environment_reset
-
-	# Prevent scrollkeeper access violations
-	gnome2_omf_fix
-
-	# Run libtoolize
-	if has ${EAPI:-0} 0 1 2 3; then
-		elibtoolize ${ELTCONF}
-	else
-		# Everything is fatal EAPI 4 onwards
-		nonfatal elibtoolize ${ELTCONF}
-	fi
-
-}
-
-# @FUNCTION: gnome2_src_configure
-# @DESCRIPTION:
-# Gnome specific configure handling
-gnome2_src_configure() {
-	# Update the GNOME configuration options
-	if [[ ${GCONF_DEBUG} != 'no' ]] ; then
-		if use debug ; then
-			G2CONF="${G2CONF} --enable-debug=yes"
-		fi
-	fi
-
-	# Prevent a QA warning
-	if has doc ${IUSE} ; then
-		grep -q "enable-gtk-doc" configure && G2CONF="${G2CONF} $(use_enable doc gtk-doc)"
-	fi
-
-	# Pass --disable-maintainer-mode when needed
-	if grep -q "^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" configure.*; then
-		G2CONF="${G2CONF} --disable-maintainer-mode"
-	fi
-
-	# Pass --disable-scrollkeeper when possible
-	if grep -q "disable-scrollkeeper" configure; then
-		G2CONF="${G2CONF} --disable-scrollkeeper"
-	fi
-
-	# Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659)
-	addwrite "$(unset HOME; echo ~)/.gnome2"
-
-	econf "$@" ${G2CONF}
-}
-
-# @FUNCTION: gnome2_src_compile
-# @DESCRIPTION:
-# Stub function for old EAPI.
-gnome2_src_compile() {
-	has ${EAPI:-0} 0 1 && gnome2_src_configure "$@"
-	emake || die "compile failure"
-}
-
-# @FUNCTION: gnome2_src_install
-# @DESCRIPTION:
-# Gnome specific install. Handles typical GConf and scrollkeeper setup
-# in packages and removal of .la files if requested
-gnome2_src_install() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
-	# if this is not present, scrollkeeper-update may segfault and
-	# create bogus directories in /var/lib/
-	local sk_tmp_dir="/var/lib/scrollkeeper"
-	dodir "${sk_tmp_dir}" || die "dodir failed"
-
-	# we must delay gconf schema installation due to sandbox
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
-
-	if [[ -z "${USE_EINSTALL}" || "${USE_EINSTALL}" = "0" ]]; then
-		debug-print "Installing with 'make install'"
-		emake DESTDIR="${D}" "scrollkeeper_localstate_dir=${ED}${sk_tmp_dir} " "$@" install || die "install failed"
-	else
-		debug-print "Installing with 'einstall'"
-		einstall "scrollkeeper_localstate_dir=${ED}${sk_tmp_dir} " "$@" || die "einstall failed"
-	fi
-
-	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-	# Manual document installation
-	if [[ -n "${DOCS}" ]]; then
-		dodoc ${DOCS} || die "dodoc failed"
-	fi
-
-	# Do not keep /var/lib/scrollkeeper because:
-	# 1. The scrollkeeper database is regenerated at pkg_postinst()
-	# 2. ${ED}/var/lib/scrollkeeper contains only indexes for the current pkg
-	#    thus it makes no sense if pkg_postinst ISN'T run for some reason.
-	rm -rf "${ED}${sk_tmp_dir}"
-	rmdir "${ED}/var/lib" 2>/dev/null
-	rmdir "${ED}/var" 2>/dev/null
-
-	# Make sure this one doesn't get in the portage db
-	rm -fr "${ED}/usr/share/applications/mimeinfo.cache"
-
-	# Delete all .la files
-	if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then
-		ebegin "Removing .la files"
-		if ! { has static-libs ${IUSE//+} && use static-libs; }; then
-			find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
-		fi
-		eend
-	fi
-}
-
-# @FUNCTION: gnome2_pkg_preinst
-# @DESCRIPTION:
-# Finds Icons, GConf and GSettings schemas for later handling in pkg_postinst
-gnome2_pkg_preinst() {
-	gnome2_gconf_savelist
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-	gnome2_scrollkeeper_savelist
-}
-
-# @FUNCTION: gnome2_pkg_postinst
-# @DESCRIPTION:
-# Handle scrollkeeper, GConf, GSettings, Icons, desktop and mime
-# database updates.
-gnome2_pkg_postinst() {
-	gnome2_gconf_install
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	gnome2_scrollkeeper_update
-}
-
-# @#FUNCTION: gnome2_pkg_prerm
-# @#DESCRIPTION:
-# # FIXME Handle GConf schemas removal
-#gnome2_pkg_prerm() {
-#	gnome2_gconf_uninstall
-#}
-
-# @FUNCTION: gnome2_pkg_postrm
-# @DESCRIPTION:
-# Handle scrollkeeper, GSettings, Icons, desktop and mime database updates.
-gnome2_pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	gnome2_scrollkeeper_update
-}

diff --git a/eclass/gst-plugins-bad.eclass b/eclass/gst-plugins-bad.eclass
deleted file mode 100644
index 2689d5d..0000000
--- a/eclass/gst-plugins-bad.eclass
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-bad.eclass,v 1.44 2012/06/20 08:49:27 scarabeus Exp $
-
-#
-# Original Author: Saleem Abdulrasool <compnerd@g.o>
-# Based on the work of foser <foser@g.o> and zaheerm <zaheerm@g.o>
-# Purpose: This elcass is designed to help package external gst-plugins per
-# plugin rather than in a single package.
-#
-
-inherit eutils multilib versionator gst-plugins10
-
-GSTBAD_EXPF="src_unpack src_compile src_install"
-case "${EAPI:-0}" in
-	2|3|4|5) GSTBAD_EXPF+=" src_prepare src_configure" ;;
-	0|1) ;;
-	*) die "EAPI=\"${EAPI}\" is not supported yet" ;;
-esac
-
-
-EXPORT_FUNCTIONS ${GSTBAD_EXPF}
-
-# This list is current for gst-plugins-bad-0.10.21.
-my_gst_plugins_bad="directsound directdraw osx_video quicktime vcd
-assrender amrwb apexsink bz2 cdaudio celt cog dc1394 directfb dirac dts divx
-faac faad fbdev flite gsm jp2k kate ladspa lv2 libmms
-modplug mimic mpeg2enc mplex musepack musicbrainz mythtv nas neon ofa rsvg
-timidity wildmidi sdl sdltest sndfile soundtouch spc gme swfdec xvid
-dvb wininet acm vdpau schro zbar resindvd vp8"
-
-# When adding conditionals like below, be careful about having leading spaces
-
-# Changes in 0.10.22:
-# New curlsink element in a new curl plugin
-# New Blackmagic Decklink source and sink
-# New Linear Systems SDI plugin
-if version_is_at_least "0.10.22"; then
-	my_gst_plugins_bad+=" curl decklink linsys"
-fi
-
-# Unused ancient theora decoder, better one in -base long ago
-if ! version_is_at_least "0.10.22"; then
-	my_gst_plugins_bad+=" theoradec"
-fi
-
-# Changes in 0.10.21:
-# New opencv and apple_media plugins
-if version_is_at_least "0.10.21"; then
-	my_gst_plugins_bad+=" opencv apple_media"
-fi
-
-# exif for a specific jifmux tests purpose only.
-# Made automagic in 0.10.22, which is fine as a non-installed test
-if [ ${PV} == "0.10.21" ]; then
-	my_gst_plugins_bad+=" exif"
-fi
-
-# jack moved to -good, metadata removed (functionality in base classes)
-# alsaspdif gone (gst-plugins-alsa from -base can do spdif on its own long ago)
-if ! version_is_at_least "0.10.21"; then
-	my_gst_plugins_bad+=" jack metadata alsa"
-fi
-
-# Changes in 0.10.20:
-# New split plugins rtmp, gsettings and shm
-if version_is_at_least "0.10.20"; then
-	my_gst_plugins_bad+=" rtmp gsettings shm"
-fi
-
-MY_PN="gst-plugins-bad"
-MY_P=${MY_PN}-${PV}
-
-SRC_URI="http://gstreamer.freedesktop.org/src/gst-plugins-bad/${MY_P}.tar.bz2"
-
-# added to remove circular deps
-# 6/2/2006 - zaheerm
-if [ "${PN}" != "${MY_PN}" ]; then
-RDEPEND="=media-libs/gstreamer-0.10*
-		=media-libs/gst-plugins-base-0.10*
-		>=dev-libs/glib-2.6"
-DEPEND="${RDEPEND}
-		sys-apps/sed
-		virtual/pkgconfig
-		sys-devel/gettext"
-
-# -bad-0.10.20 uses orc optionally instead of liboil unconditionally.
-# While <0.10.20 configure always check for liboil, it is used only by non-split
-# plugins in gst/ (legacyresample and mpegdemux), so we only builddep for all
-# old packages, and have a RDEPEND in old versions of media-libs/gst-plugins-bad
-if ! version_is_at_least "0.10.20"; then
-DEPEND="${DEPEND} >=dev-libs/liboil-0.3.8"
-fi
-
-RESTRICT=test
-fi
-S=${WORKDIR}/${MY_P}
-
-gst-plugins-bad_src_unpack() {
-#	local makefiles
-
-	unpack ${A}
-	has src_prepare ${GSTBAD_EXPF} || gst-plugins-bad_src_prepare
-}
-
-gst-plugins-bad_src_prepare() {
-	# Link with the syswide installed gst-libs if needed
-	gst-plugins10_find_plugin_dir
-	sed -e "s:\$(top_builddir)/gst-libs/gst/interfaces/libgstphotography:${ROOT}/usr/$(get_libdir)/libgstphotography:" \
-		-e "s:\$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor:${ROOT}/usr/$(get_libdir)/libgstsignalprocessor:" \
-		-e "s:\$(top_builddir)/gst-libs/gst/video/libgstbasevideo:${ROOT}/usr/$(get_libdir)/libgstbasevideo:" \
-		-e "s:\$(top_builddir)/gst-libs/gst/basecamerabinsrc/libgstbasecamerabinsrc:${ROOT}/usr/$(get_libdir)/libgstbasecamerabinsrc:" \
-		-i Makefile.in
-
-	# Remove generation of any other Makefiles except the plugin's Makefile
-#	if [[ -d "${S}/sys/${GST_PLUGINS_BUILD_DIR}" ]] ; then
-#		makefiles="Makefile sys/Makefile sys/${GST_PLUGINS_BUILD_DIR}/Makefile"
-#	elif [[ -d "${S}/ext/${GST_PLUGINS_BUILD_DIR}" ]] ; then
-#		makefiles="Makefile ext/Makefile ext/${GST_PLUGINS_BUILD_DIR}/Makefile"
-#	fi
-
-#	sed -e "s:ac_config_files=.*:ac_config_files='${makefiles}':" \
-#		-i ${S}/configure
-}
-
-gst-plugins-bad_src_configure() {
-	local plugin gst_conf
-
-	einfo "Configuring to build ${GST_PLUGINS_BUILD} plugin(s) ..."
-
-	for plugin in ${my_gst_plugins_bad} ; do
-		gst_conf+=" --disable-${plugin}"
-	done
-
-	for plugin in ${GST_PLUGINS_BUILD} ; do
-		gst_conf+=" --enable-${plugin}"
-	done
-
-	cd ${S}
-	econf ${@} --with-package-name="Gentoo GStreamer Ebuild" --with-package-origin="http://www.gentoo.org" ${gst_conf}
-}
-
-gst-plugins-bad_src_compile() {
-	has src_configure ${GSTBAD_EXPF} || gst-plugins-bad_src_configure ${@}
-
-	gst-plugins10_find_plugin_dir
-	emake || die "compile failure"
-}
-
-gst-plugins-bad_src_install() {
-	gst-plugins10_find_plugin_dir
-	einstall || die "install failed"
-
-	[[ -e README ]] && dodoc README
-}

diff --git a/eclass/gtk-sharp-module.eclass b/eclass/gtk-sharp-module.eclass
deleted file mode 100644
index 575e3de..0000000
--- a/eclass/gtk-sharp-module.eclass
+++ /dev/null
@@ -1,547 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.35 2012/05/02 18:31:42 jdhore Exp $
-
-# @ECLASS: gtk-sharp-module.eclass
-# @MAINTAINER:
-# dotnet@g.o
-# @BLURB: Manages the modules of the gtk-, gnome-, and gnome-desktop-sharp tarballs
-# @DESCRIPTION:
-# This eclass provides phase functions and helper functions for the modules
-# of the gtk-sharp, gnome-sharp and gnome-desktop-sharp tarballs.
-# PLEASE TAKE NOTE: ONLY FOR EAPI-2 EBUILDS
-
-WANT_AUTOMAKE=none
-WANT_AUTOCONF=none
-
-inherit eutils mono multilib libtool autotools base versionator
-
-case ${EAPI:-0} in
-	2|3|4|5) ;;
-	*) die "Unknown EAPI." ;;
-esac
-
-# @ECLASS-VARIABLE: GTK_SHARP_MODULE
-# @DESCRIPTION:
-# The name of the Gtk# module.
-# Default value: ${PN/-sharp/}
-GTK_SHARP_MODULE=${GTK_SHARP_MODULE:=${PN/-sharp/}}
-
-# @ECLASS-VARIABLE: GTK_SHARP_MODULE_DIR
-# @DESCRIPTION:
-# The subdirectory of S in which GTK_SHARP_MODULE is installed.
-# Default value: ${PN/-sharp/}
-GTK_SHARP_MODULE_DIR=${GTK_SHARP_MODULE_DIR:=${PN/-sharp/}}
-
-# @ECLASS-VARIABLE: GTK_SHARP_REQUIRED_VERSION
-# @DESCRIPTION:
-# The version of the gtk-sharp tarball this package requires.
-# Optional.
-GTK_SHARP_REQUIRED_VERSION="${GTK_SHARP_REQUIRED_VERSION}"
-
-# @ECLASS-VARIABLE: gapi_users_list
-# @DESCRIPTION:
-# List of modules that use one of gapi2-codegen, gapi2-fixup or gapi2-parser
-# No ebuild-serviceable parts inside.
-gapi_users_list="art gnome gnomevfs ${gnome_desktop_sharp_module_list} atk gtk gdk glade pango"
-
-# @ECLASS-VARIABLE: PV_MAJOR
-# @DESCRIPTION:
-# The first two components of the PV variable.
-PV_MAJOR=$(get_version_component_range 1-2)
-
-# @FUNCTION: add_bdepend
-# @USAGE: <package atom>
-# @DESCRIPTION:
-# Adds to the DEPEND variable
-add_bdepend() {
-	[[ ${#@} -eq 1 ]] || die "${FUNCNAME} needs ONE (1) argument"
-	DEPEND="${DEPEND} $@"
-}
-
-# @FUNCTION: add_rdepend
-# @USAGE: <package atom>
-# @DESCRIPTION:
-# Adds to the RDEPEND variable
-add_rdepend() {
-	[[ ${#@} -eq 1 ]] || die "${FUNCNAME} needs ONE (1) argument"
-	RDEPEND="${RDEPEND} $@"
-}
-
-# @FUNCTION: add_depend
-# @USAGE: <package atom>
-# @DESCRIPTION:
-# Adds to the DEPEND and RDEPEND variables
-add_depend() {
-	[[ ${#@} -eq 1 ]] || die "${FUNCNAME} needs ONE (1) argument"
-	DEPEND="${DEPEND} $@"
-	RDEPEND="${RDEPEND} $@"
-}
-
-# @ECLASS-VARIABLE: TARBALL
-# @DESCRIPTION:
-# The GtkSharp modules are currently divided into three seperate tarball
-# distributions. The TARBALL variable holds the name of the tarball
-# to which GTK_SHARP_MODULE belongs.
-case ${GTK_SHARP_MODULE} in
-	glib|glade|gtk|gdk|atk|pango|gtk-dotnet|gtk-gapi|gtk-docs)
-		TARBALL="gtk-sharp"
-		case ${PVR} in
-			2.12.*)
-				SRC_URI="mirror://gentoo/${TARBALL}-2.12.7.patch.bz2"
-				#Upstream: https://bugzilla.novell.com/show_bug.cgi?id=$bugno
-				#Upstream bug #470390 for the gtk-sharp-2.12.7.patch
-				PATCHES=(
-					"${WORKDIR}/${TARBALL}-2.12.7.patch"
-				)
-				EAUTORECONF="YES"
-				add_bdepend "=sys-devel/automake-1.10*"
-				add_bdepend ">=sys-devel/autoconf-2.61"
-				;;
-		esac
-		;;
-	art|gnome|gnomevfs|gconf)
-		TARBALL="gnome-sharp"
-		add_depend "=dev-dotnet/gtk-sharp-${GTK_SHARP_REQUIRED_VERSION}*"
-		has "${GTK_SHARP_MODULE}" "${gapi_users_list}" && \
-			add_bdepend "=dev-dotnet/gtk-sharp-gapi-${GTK_SHARP_REQUIRED_VERSION}*"
-		case ${PVR} in
-			2.24.1*)
-				SRC_URI="mirror://gentoo/${TARBALL}-2.24.1.patch.bz2"
-				# Upstream bug: https://bugzilla.novell.com/show_bug.cgi?id=483251
-				PATCHES=(
-					"${WORKDIR}/${TARBALL}-2.24.1.patch"
-				)
-				EAUTORECONF="YES"
-				add_bdepend "=sys-devel/automake-1.10*"
-				add_bdepend ">=sys-devel/autoconf-2.61"
-				;;
-			2.24.2*)
-				add_depend ">=dev-lang/mono-2.7"
-				;;
-		esac
-		;;
-	gnome-desktop|gnome-print|gnome-panel|gtkhtml|gtksourceview|nautilusburn|rsvg|vte|wnck)
-		TARBALL="gnome-desktop-sharp"
-		add_depend "=dev-dotnet/gtk-sharp-${GTK_SHARP_REQUIRED_VERSION}*"
-		add_depend "=dev-dotnet/gnome-sharp-2.24*"
-		add_depend "gnome-base/gnome-desktop:2"
-		add_bdepend "=dev-dotnet/gtk-sharp-gapi-${GTK_SHARP_REQUIRED_VERSION}*"
-		;;
-	*)
-		eerror "Huh? Sonny boy, looks like your GTK_SHARP_MODULE is not on the approved list. BAILING!"
-		die "How did we get here!!?"
-		;;
-esac
-
-case ${PF} in
-	#gtk-sharp tarball
-	gtk-sharp-docs*)
-		add_depend ">=virtual/monodoc-2.0"
-		;;
-	gtk-sharp-gapi*)
-		add_rdepend "!<=dev-dotnet/gtk-sharp-2.12.7:2"
-		add_depend "dev-perl/XML-LibXML"
-		;;
-	gtk-sharp-*)
-		add_bdepend "~dev-dotnet/gtk-sharp-gapi-${PV}"
-		add_depend "~dev-dotnet/glib-sharp-${PV}"
-		add_depend "~dev-dotnet/atk-sharp-${PV}"
-		add_depend "~dev-dotnet/gdk-sharp-${PV}"
-		add_depend "~dev-dotnet/pango-sharp-${PV}"
-		;;
-	gdk-sharp-*)
-		add_bdepend "~dev-dotnet/gtk-sharp-gapi-${PV}"
-		add_depend "~dev-dotnet/glib-sharp-${PV}"
-		add_depend "x11-libs/gtk+:2"
-		add_depend "~dev-dotnet/pango-sharp-${PV}"
-		add_rdepend "!<=dev-dotnet/gtk-sharp-2.12.7:2"
-		;;
-	atk-sharp-*)
-		add_bdepend "~dev-dotnet/gtk-sharp-gapi-${PV}"
-		add_depend "~dev-dotnet/glib-sharp-${PV}"
-		add_depend "dev-libs/atk"
-		add_rdepend "!<=dev-dotnet/gtk-sharp-2.12.7:2"
-		;;
-	glib-sharp-*)
-		add_rdepend "!<=dev-dotnet/gtk-sharp-2.12.7:2"
-		add_depend "dev-libs/glib:2"
-		;;
-	pango-sharp-*)
-		add_bdepend "~dev-dotnet/gtk-sharp-gapi-${PV}"
-		add_depend "~dev-dotnet/glib-sharp-${PV}"
-		add_depend "x11-libs/pango"
-		add_rdepend "!<=dev-dotnet/gtk-sharp-2.12.7:2"
-		;;
-	gtk-dotnet-*)
-		add_depend "~dev-dotnet/glib-sharp-${PV}"
-		add_depend "~dev-dotnet/gdk-sharp-${PV}"
-		add_depend "~dev-dotnet/pango-sharp-${PV}"
-		add_depend "~dev-dotnet/gtk-sharp-${PV}"
-		add_depend "dev-lang/mono[-minimal]"
-		add_rdepend "!<=dev-dotnet/gtk-sharp-2.12.7:2"
-		;;
-	glade-sharp-*)
-		add_bdepend "~dev-dotnet/gtk-sharp-gapi-${PV}"
-		add_depend "~dev-dotnet/glib-sharp-${PV}"
-		add_depend "~dev-dotnet/atk-sharp-${PV}"
-		add_depend "~dev-dotnet/gdk-sharp-${PV}"
-		add_depend "~dev-dotnet/gtk-sharp-${PV}"
-		add_depend "~dev-dotnet/pango-sharp-${PV}"
-		add_depend ">=gnome-base/libglade-2.3.6:2.0"
-		;;
-	#gnome-sharp tarball
-	art-sharp-*)
-		add_depend ">=media-libs/libart_lgpl-2.3.20"
-		;;
-	gnome-sharp-*)
-		add_depend ">=gnome-base/libgnomeui-${PV_MAJOR}"
-		add_depend "~dev-dotnet/gnomevfs-sharp-${PV}"
-		add_depend "~dev-dotnet/art-sharp-${PV}"
-		add_depend ">=gnome-base/libgnomecanvas-${GNOMECANVAS_REQUIRED_VERSION}"
-		add_depend ">=x11-libs/gtk+-2.14.0:2"
-		;;
-	gconf-sharp-*)
-		add_depend ">=gnome-base/gconf-${PV_MAJOR}:2"
-		add_depend "=dev-dotnet/glade-sharp-${GTK_SHARP_REQUIRED_VERSION}*"
-		add_depend "~dev-dotnet/gnome-sharp-${PV}"
-		add_depend "~dev-dotnet/art-sharp-${PV}"
-		;;
-	gnomevfs-sharp-*)
-		add_depend ">=gnome-base/gnome-vfs-${PV_MAJOR}:2"
-		;;
-	#gnome-desktop-sharp tarball
-	gnome-desktop-sharp-*)
-		# NOTE: libgnome-desktop-2.so has been known to make binary-
-		# incompatible changes, requiring .so bumps. gnome-desktop-sharp
-		# is locked to a specific .so.n version, so strict dependencies
-		# may be required in the future (as it has in the past).
-		add_depend ">=gnome-base/gnome-desktop-${PV_MAJOR}:2"
-		;;
-	gnome-panel-sharp-*)
-		add_depend ">=gnome-base/gnome-panel-${PV_MAJOR}"
-		;;
-	gnome-print-sharp-*)
-		add_depend "gnome-base/libgnomeprint:2.2"
-		add_depend "gnome-base/libgnomeprintui:2.2"
-		;;
-	gtkhtml-sharp-*)
-		#NOTE: gtkhtml dependency must follow gtkhtml-sharp version.
-		#i.e.   gtkhtml-sharp-2.24.0 >=gtkhtml-3.24
-		#       gtkhtml-sharp-2.16.0 >=gtkhtml-3.16
-		#       See bug 249540 for unpleasant side effects.
-		add_depend ">=gnome-extra/gtkhtml-$(($(get_version_component_range 1) + 1 )).$(get_version_component_range 2):3.14"
-		;;
-	gtksourceview-sharp-*)
-		add_depend ">=x11-libs/gtksourceview-${GTKSOURCEVIEW_REQUIRED_VERSION}:2.0"
-		;;
-	nautilusburn-sharp-*)
-		add_depend ">=gnome-extra/nautilus-cd-burner-2.24.0"
-		;;
-	rsvg-sharp-*)
-		add_depend ">=gnome-base/librsvg-${RSVG_REQUIRED_VERSION}:2"
-		;;
-	vte-sharp-*)
-		add_depend ">=x11-libs/vte-${VTE_REQUIRED_VERSION}:0"
-		;;
-	wnck-sharp-*)
-		add_depend ">=x11-libs/libwnck-${PV_MAJOR}:1"
-		;;
-esac
-
-# @ECLASS-VARIABLE: DESCRIPTION
-# @DESCRIPTION:
-# Default value: GtkSharp's ${GTK_SHARP_MODULE} module of the ${TARBALL} tarball
-DESCRIPTION="GtkSharp's ${GTK_SHARP_MODULE} module of the ${TARBALL} tarball"
-# @ECLASS-VARIABLE: HOMEPAGE
-# @DESCRIPTION:
-# Default value: http://www.mono-project.com/GtkSharp
-HOMEPAGE="http://www.mono-project.com/GtkSharp"
-# @ECLASS-VARIABLE: LICENSE
-# @DESCRIPTION:
-# Default value: LGPL-2.1
-LICENSE="LGPL-2.1"
-
-add_depend	">=dev-lang/mono-2.0.1"
-add_bdepend	">=sys-apps/sed-4"
-add_bdepend	"virtual/pkgconfig"
-add_bdepend	">=app-shells/bash-3.1"
-
-IUSE="debug"
-# @ECLASS-VARIABLE: S
-# @DESCRIPTION:
-# Default value: ${WORKDIR}/${TARBALL}-${PV}
-S="${WORKDIR}/${TARBALL}-${PV}"
-# @ECLASS-VARIABLE: SRC_URI
-# @DESCRIPTION:
-# Default value: mirror://gnome/sources/${TARBALL}/${PV_MAJOR}/${TARBALL}-${PV}.tar.bz2
-SRC_URI="${SRC_URI}
-	mirror://gnome/sources/${TARBALL}/${PV_MAJOR}/${TARBALL}-${PV}.tar.bz2"
-
-# @FUNCTION: get_sharp_apis
-# @USAGE: <type> <pkgconfig-package>
-# @RETURN: .NET API files
-# @DESCRIPTION:
-# Given a valid pkg-config package, will return a list of API xml files.
-# <type> can be either --prefixed or --bare. If prefixed, each API file
-# will be prefixed with -I:
-get_sharp_apis() {
-	[[ ${#@} -eq 2 ]] || die "${FUNCNAME} needs two arguments"
-	get_sharp_assemblies "$@"
-}
-
-# @FUNCTION: get_sharp_assemblies
-# @USAGE: <type> <pkgconfig-package>
-# @RETURN: .NET .dll assemblies
-# @DESCRIPTION:
-# Given a valid pkg-config package, will return a list of .dll assemblies.
-# <type> can be either --prefixed or --bare. If prefixed, each .dll file
-# will be prefixed with -r:
-get_sharp_assemblies() {
-	[[ ${#@} -eq 2 ]] || die "${FUNCNAME} needs two arguments"
-	local string config=libs prefix="-r:"
-	local -a rvalue
-	[[ "${FUNCNAME[1]}" = "get_sharp_apis" ]] && config=cflags && prefix="-I:"
-	for string in $(pkg-config --${config} ${2} 2> /dev/null)
-	do
-		rvalue+=( ${string#-?:} )
-	done
-
-	case $1 in
-		--bare)
-			:
-			;;
-		--prefixed)
-			for (( i=0 ; i< ${#rvalue[@]} ; i++ ))
-			do
-				rvalue[$i]=${prefix}${rvalue[$i]}
-			done
-			;;
-		*)
-			die "${FUNCNAME}: Unknown parameter"
-			;;
-	esac
-	echo "${rvalue[@]}"
-}
-
-# @FUNCTION: phase_hook
-# @USAGE: <prefix>
-# @DESCRIPTION:
-# Looks for functions named <prefix>_caller_suffix and executes them.
-# _caller_suffix is the calling function with the prefix
-# gtk-sharp-module removed.
-phase_hook() {
-	[[ ${#@} -eq 1 ]] || die "${FUNCNAME} needs one argument"
-	if [[ "$(type -t ${1}${FUNCNAME[1]#gtk-sharp-module})" = "function" ]]
-	then
-		ebegin "Phase-hook: Running ${1}${FUNCNAME[1]#gtk-sharp-module}"
-		${1}${FUNCNAME[1]#gtk-sharp-module}
-		eend 0
-	fi
-}
-
-# @FUNCTION: ac_path_prog_override
-# @USAGE: <PROG> [path]
-# @DESCRIPTION:
-# Override AC_PATH_PROG() autoconf macros. Path will be set to " " if
-# not specified.
-ac_path_prog_override() {
-	if [[ ${#@} -lt 1 || ${#@} -gt 2 ]]
-	then
-		eerror "${FUNCNAME[0]} requires at least one parameter and takes at most two:"
-		eerror "AC_PATH_PROG(PARAM1, param2)"
-		die "${FUNCNAME[0]} requires at least one parameter and takes at most two:"
-	fi
-	export  ac_cv_path_${1}="${2:- }"
-}
-
-
-# @FUNCTION: pkg_check_modules_override
-# @USAGE: <GROUP> [package1] [package2]
-# @DESCRIPTION:
-# Will export the appropriate variables to override PKG_CHECK_MODULES autoconf
-# macros, with the string " " by default. If packages are specified, they will
-# be looked up with pkg-config and the appropriate LIBS and CFLAGS substituted.
-# LIBS and CFLAGS can also be specified per-package with the following syntax:
-# @CODE
-# 	package=LIBS%CFLAGS
-# @CODE
-# = and % have no effect unless both are specified.
-# Here is an example:
-# @CODE
-# 	pkg_check_modules_override GASH "gtk+-2.0=-jule%" gobject-2.0
-# @CODE
-# The above example will do:
-# export GASH_CFLAGS+=" -jule"
-# export GASH_LIBS+=" "
-# export GASH_CFLAGS+=" $(pkg-config --cflags gobject-2.0)"
-# export GASH_LIBS+=" $(pkg-config --libs gobject-2.0)"
-#
-# NOTE: If a package is not found, the string " " will be inserted in place of
-# <GROUP>_CFLAGS  and <GROUP>_LIBS
-pkg_check_modules_override() {
-	local package
-	local group="${1}"
-	local packages="${*:2}"
-	export ${group}_CFLAGS=" "
-	export ${group}_LIBS=" "
-
-	if [[ ${#@} -lt 1 ]]
-	then
-		eerror "${FUNCNAME[0]} requires at least one parameter: GROUP"
-		eerror "PKG_CHECK_MODULES(GROUP, package1 package2 etc)"
-		die "${FUNCNAME[0]} requires at least one parameter: GROUP"
-	fi
-
-	for package in $packages
-	do
-		if [[ ${package/=} != ${package} && ${package/\%} != ${package} ]]
-		then
-			package_cflag_libs=${package##*=}
-			export ${group}_CFLAGS+=" ${package_cflag_libs%%\%*}"
-			export ${group}_LIBS+=" ${package_cflag_libs##*\%}"
-		else
-			if pkg-config --exists $package
-			then
-				export ${group}_CFLAGS+=" $(pkg-config --cflags $package)"
-				export ${group}_LIBS+=" $(pkg-config --libs $package)"
-			else
-			export ${group}_CFLAGS+=" "
-			export ${group}_LIBS+=" "
-			fi
-		fi
-	done
-}
-
-# @FUNCTION: gtk-sharp-tarball-post_src_prepare
-# @DESCRIPTION:
-# Runs a M-m-m-monster sed on GTK_SHARP_MODULE_DIR to convert references to
-# local assemblies to the installed ones. Is only called by src_prepare when
-# $GTK_SHARP_MODULE is a member of $gtk_sharp_module_list.
-gtk-sharp-tarball-post_src_prepare() {
-	has "${EAPI:-0}" 2 && ! use prefix && EPREFIX=
-	cd "${S}/${GTK_SHARP_MODULE_DIR}"
-	sed -i \
-		-e "s; \$(srcdir)/../glib/glib-api.xml; $(get_sharp_apis --bare glib-sharp-2.0);"			\
-		-e "s; ../pango/pango-api.xml; $(get_sharp_apis --bare pango-sharp-2.0);"				\
-		-e "s; ../atk/atk-api.xml; $(get_sharp_apis --bare atk-sharp-2.0);"					\
-		-e "s; ../gdk/gdk-api.xml; $(get_sharp_apis --bare gdk-sharp-2.0);"					\
-		-e "s; ../gtk/gtk-api.xml; $(get_sharp_apis --bare gtk-sharp-2.0);"					\
-		-e "s; \.\./glib/glib-sharp.dll; $(get_sharp_assemblies --bare glib-sharp-2.0);g"			\
-		-e "s; \.\./pango/pango-sharp.dll; $(get_sharp_assemblies --bare pango-sharp-2.0);g"			\
-		-e "s; \.\./atk/atk-sharp.dll; $(get_sharp_assemblies --bare atk-sharp-2.0);g"				\
-		-e "s; \.\./gdk/gdk-sharp.dll; $(get_sharp_assemblies --bare gdk-sharp-2.0);g"				\
-		-e "s; \.\./gtk/gtk-sharp.dll; $(get_sharp_assemblies --bare gtk-sharp-2.0);g"				\
-		-e "s;\$(RUNTIME) \$(top_builddir)/parser/gapi-fixup.exe;${EPREFIX}/usr/bin/gapi2-fixup;"				\
-		-e "s;\$(RUNTIME) \$(top_builddir)/generator/gapi_codegen.exe;${EPREFIX}/usr/bin/gapi2-codegen;"			\
-		-e "s:\$(SYMBOLS) \$(top_builddir)/parser/gapi-fixup.exe:\$(SYMBOLS):"					\
-		-e "s:\$(INCLUDE_API) \$(top_builddir)/generator/gapi_codegen.exe:\$(INCLUDE_API):"			\
-		$(find . -name Makefile.in) || die "failed to fix ${TARBALL}-tarball makefiles"
-}
-
-# @FUNCTION: gnome-sharp-tarball-post_src_prepare
-# @DESCRIPTION:
-# Runs a M-m-m-monster sed on GTK_SHARP_MODULE_DIR to convert references to
-# local assemblies to the installed ones. Is only called by src_prepare when
-# $GTK_SHARP_MODULE is a member of $gnome_sharp_module_list.
-gnome-sharp-tarball-post_src_prepare() {
-	cd "${S}/${GTK_SHARP_MODULE_DIR}"
-	sed -i	\
-		-e "s; ../gnomevfs/gnome-vfs-api.xml; $(get_sharp_apis --bare gnome-vfs-sharp-2.0);"			\
-		-e "s; ../art/art-api.xml; $(get_sharp_apis --bare art-sharp-2.0);"					\
-		-e "s; \.\./art/art-sharp.dll; $(get_sharp_assemblies --bare art-sharp-2.0);g"				\
-		-e "s; \.\./gnomevfs/gnome-vfs-sharp.dll; $(get_sharp_assemblies --bare gnome-vfs-sharp-2.0);g"		\
-		-e "s;/r:\$(top_builddir)/art/art-sharp.dll;$(get_sharp_assemblies --prefixed art-sharp-2.0);"		\
-		-e "s;/r:\$(top_builddir)/gnome/gnome-sharp.dll;$(get_sharp_assemblies --prefixed gnome-sharp-2.0);"	\
-		$(find . -name Makefile.in) || die "failed to fix ${TARBALL}-tarball makefiles"
-}
-
-# @FUNCTION: gtk-sharp-module_src_prepare
-# @DESCRIPTION:
-# Runs autopatch from base.eclass, eautoreconf if EAUTORECONF is set to any
-# value.
-# Contains a phase_hook, runs very last.
-# phase_hook prefix trigger: ${TARBALL}-tarball-post
-# Is exported.
-gtk-sharp-module_src_prepare() {
-	base_src_prepare
-# @ECLASS-VARIABLE: EAUTORECONF
-# @DESCRIPTION:
-# If set, EAUTORECONF will be run during src_prepare.
-	[[ ${EAUTORECONF} ]] && eautoreconf
-	phase_hook ${TARBALL}-tarball-post
-	elibtoolize
-}
-
-# @FUNCTION: gtk-sharp-tarball_src_configure
-# @DESCRIPTION:
-# Sets some environment variables that will allow us to make the dependencies
-# for each ebuild be only its own dependencies, without patching configure.
-# Is only called by gtk-sharp-module_src_configure when $GTK_SHARP_MODULE
-# is a member of $gtk_sharp_module_list.
-gtk-sharp-tarball_src_configure() {
-	pkg_check_modules_override GLIB gobject-2.0
-	pkg_check_modules_override GIO gio-2.0
-	pkg_check_modules_override PANGO pango
-	pkg_check_modules_override ATK atk
-	pkg_check_modules_override GTK gtk+-2.0
-	pkg_check_modules_override GLADE libglade-2.0
-}
-
-# @FUNCTION: gnome-sharp-tarball_src_configure
-# @DESCRIPTION:
-# Sets some environment variables that will allow us to make the dependencies
-# for each ebuild be only its own dependencies. Without patching configure.
-# Is only called by gtk-sharp-module_src_configure when $GTK_SHARP_MODULE
-# is a member of $gnome_sharp_module_list.
-gnome-sharp-tarball_src_configure() {
-	has "${EAPI:-0}" 2 && ! use prefix && EPREFIX=
-	pkg_check_modules_override GLADESHARP glade-sharp-2.0
-	pkg_check_modules_override GAPI gapi-2.0
-	ac_path_prog_override GAPI_PARSER "${EPREFIX}"/usr/bin/gapi2-parser
-	ac_path_prog_override GAPI_CODEGEN "${EPREFIX}"/usr/bin/gapi2-codegen
-	ac_path_prog_override GAPI_FIXUP "${EPREFIX}"/usr/bin/gapi2-fixup
-}
-
-# @FUNCTION: gtk-sharp-module_src_configure
-# @USAGE: [econf-arguments]
-# @DESCRIPTION:
-# Calls econf with some default values.
-# Contains a phase_hook, run before econf.
-# phase_hook prefix trigger: ${TARBALL}-tarball
-# Is exported.
-gtk-sharp-module_src_configure() {
-	phase_hook ${TARBALL}-tarball
-	econf	--disable-static \
-		--disable-dependency-tracking \
-		--disable-maintainer-mode \
-		$(use debug &&echo "--enable-debug" ) \
-		${@} || die "econf failed"
-}
-
-# @FUNCTION: gtk-sharp-module_src_compile
-# @DESCRIPTION:
-# Calls emake in the subdir of the module.
-# Sets CSC=/usr/bin/gmcs. Deletes top_srcdir Makefiles to prevent recursing in
-# case we missed some dll references.
-# Is exported.
-gtk-sharp-module_src_compile() {
-	rm -f "${S}"/Makefile* &> /dev/null
-	cd "${S}/${GTK_SHARP_MODULE_DIR}"
-	emake CSC=/usr/bin/gmcs || die "emake failed"
-}
-
-# @FUNCTION: gtk-sharp-module_src_install
-# @DESCRIPTION:
-# Installs the module. Fixes up lib paths so they're multilib-safe.
-# Gets rid of .la files.
-# Is exported.
-gtk-sharp-module_src_install() {
-	cd "${S}/${GTK_SHARP_MODULE_DIR}"
-	emake DESTDIR="${D}" install || die "emake install failed"
-	mono_multilib_comply
-	find "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
-	[[  $(find "${D}" -type f|wc -l) -lt 3 ]] && die "Too few files. This smells like a failed install."
-}
-
-EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install

diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass
deleted file mode 100644
index 27ed820..0000000
--- a/eclass/haskell-cabal.eclass
+++ /dev/null
@@ -1,519 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.33 2012/07/08 19:16:46 slyfox Exp $
-
-# @ECLASS: haskell-cabal.eclass
-# @MAINTAINER:
-# Haskell herd <haskell@g.o>
-# @AUTHOR:
-# Original author: Andres Loeh <kosmikus@g.o>
-# Original author: Duncan Coutts <dcoutts@g.o>
-# @BLURB: for packages that make use of the Haskell Common Architecture for Building Applications and Libraries (cabal)
-# @DESCRIPTION:
-# Basic instructions:
-#
-# Before inheriting the eclass, set CABAL_FEATURES to
-# reflect the tools and features that the package makes
-# use of.
-#
-# Currently supported features:
-#   haddock    --  for documentation generation
-#   hscolour   --  generation of colourised sources
-#   alex       --  lexer/scanner generator
-#   happy      --  parser generator
-#   c2hs       --  C interface generator
-#   cpphs      --  C preprocessor clone written in Haskell
-#   profile    --  if package supports to build profiling-enabled libraries
-#   bootstrap  --  only used for the cabal package itself
-#   bin        --  the package installs binaries
-#   lib        --  the package installs libraries
-#   nocabaldep --  don't add dependency on cabal.
-#                  only used for packages that _must_ not pull the dependency
-#                  on cabal, but still use this eclass (e.g. haskell-updater).
-#   test-suite --  add support for cabal test-suites (introduced in Cabal-1.8)
-
-inherit ghc-package multilib
-
-# @ECLASS-VARIABLE: CABAL_EXTRA_CONFIGURE_FLAGS
-# @DESCRIPTION:
-# User-specified additional parameters passed to 'setup configure'.
-# example: /etc/make.conf: CABAL_EXTRA_CONFIGURE_FLAGS=--enable-shared
-: ${CABAL_EXTRA_CONFIGURE_FLAGS:=}
-
-# @ECLASS-VARIABLE: CABAL_EXTRA_BUILD_FLAGS
-# @DESCRIPTION:
-# User-specified additional parameters passed to 'setup build'.
-# example: /etc/make.conf: CABAL_EXTRA_BUILD_FLAGS=-v
-: ${CABAL_EXTRA_BUILD_FLAGS:=}
-
-# @ECLASS-VARIABLE: GHC_BOOTSTRAP_FLAGS
-# @DESCRIPTION:
-# User-specified additional parameters for ghc when building
-# _only_ 'setup' binary bootstrap.
-# example: /etc/make.conf: GHC_BOOTSTRAP_FLAGS=-dynamic to make
-# linking 'setup' faster.
-: ${GHC_BOOTSTRAP_FLAGS:=}
-
-HASKELL_CABAL_EXPF="pkg_setup src_compile src_test src_install"
-
-case "${EAPI:-0}" in
-	2|3|4|5) HASKELL_CABAL_EXPF+=" src_configure" ;;
-	*) ;;
-esac
-
-EXPORT_FUNCTIONS ${HASKELL_CABAL_EXPF}
-
-for feature in ${CABAL_FEATURES}; do
-	case ${feature} in
-		haddock)    CABAL_USE_HADDOCK=yes;;
-		hscolour)   CABAL_USE_HSCOLOUR=yes;;
-		hoogle)     CABAL_USE_HOOGLE=yes;;
-		alex)       CABAL_USE_ALEX=yes;;
-		happy)      CABAL_USE_HAPPY=yes;;
-		c2hs)       CABAL_USE_C2HS=yes;;
-		cpphs)      CABAL_USE_CPPHS=yes;;
-		profile)    CABAL_USE_PROFILE=yes;;
-		bootstrap)  CABAL_BOOTSTRAP=yes;;
-		bin)        CABAL_HAS_BINARIES=yes;;
-		lib)        CABAL_HAS_LIBRARIES=yes;;
-		nocabaldep) CABAL_FROM_GHC=yes;;
-		test-suite) CABAL_TEST_SUITE=yes;;
-		*) CABAL_UNKNOWN="${CABAL_UNKNOWN} ${feature}";;
-	esac
-done
-
-if [[ -n "${CABAL_USE_HADDOCK}" ]]; then
-	IUSE="${IUSE} doc"
-	# don't require depend on itself to build docs.
-	# ebuild bootstraps docs from just built binary
-	[[ ${CATEGORY}/${PN} = "dev-haskell/haddock" ]] || DEPEND="${DEPEND} doc? ( dev-haskell/haddock )"
-fi
-
-if [[ -n "${CABAL_USE_HSCOLOUR}" ]]; then
-	IUSE="${IUSE} hscolour"
-	DEPEND="${DEPEND} hscolour? ( dev-haskell/hscolour )"
-fi
-
-if [[ -n "${CABAL_USE_ALEX}" ]]; then
-	DEPEND="${DEPEND} dev-haskell/alex"
-fi
-
-if [[ -n "${CABAL_USE_HAPPY}" ]]; then
-	DEPEND="${DEPEND} dev-haskell/happy"
-fi
-
-if [[ -n "${CABAL_USE_C2HS}" ]]; then
-	DEPEND="${DEPEND} dev-haskell/c2hs"
-fi
-
-if [[ -n "${CABAL_USE_CPPHS}" ]]; then
-	DEPEND="${DEPEND} dev-haskell/cpphs"
-fi
-
-if [[ -n "${CABAL_USE_PROFILE}" ]]; then
-	IUSE="${IUSE} profile"
-fi
-
-if [[ -n "${CABAL_TEST_SUITE}" ]]; then
-	IUSE="${IUSE} test"
-fi
-
-# We always use a standalone version of Cabal, rather than the one that comes
-# with GHC. But of course we can't depend on cabal when building cabal itself.
-if [[ -z ${CABAL_MIN_VERSION} ]]; then
-	CABAL_MIN_VERSION=1.1.4
-fi
-if [[ -z "${CABAL_BOOTSTRAP}" && -z "${CABAL_FROM_GHC}" ]]; then
-	DEPEND="${DEPEND} >=dev-haskell/cabal-${CABAL_MIN_VERSION}"
-fi
-
-# Libraries require GHC to be installed.
-if [[ -n "${CABAL_HAS_LIBRARIES}" ]]; then
-	RDEPEND="${RDEPEND} dev-lang/ghc"
-fi
-
-# returns the version of cabal currently in use
-_CABAL_VERSION_CACHE=""
-cabal-version() {
-	if [[ -z "${_CABAL_VERSION_CACHE}" ]]; then
-		if [[ "${CABAL_BOOTSTRAP}" ]]; then
-			# We're bootstrapping cabal, so the cabal version is the version
-			# of this package itself.
-			_CABAL_VERSION_CACHE="${PV}"
-		elif [[ "${CABAL_FROM_GHC}" ]]; then
-			local cabal_package=$(echo "$(ghc-libdir)"/Cabal-*)
-			# /path/to/ghc/Cabal-${VER} -> ${VER}
-			_CABAL_VERSION_CACHE="${cabal_package/*Cabal-/}"
-		else
-			# We ask portage, not ghc, so that we only pick up
-			# portage-installed cabal versions.
-			_CABAL_VERSION_CACHE="$(ghc-extractportageversion dev-haskell/cabal)"
-		fi
-	fi
-	echo "${_CABAL_VERSION_CACHE}"
-}
-
-cabal-bootstrap() {
-	local setupmodule
-	local cabalpackage
-	if [[ -f "${S}/Setup.lhs" ]]; then
-		setupmodule="${S}/Setup.lhs"
-	elif [[ -f "${S}/Setup.hs" ]]; then
-		setupmodule="${S}/Setup.hs"
-	else
-		die "No Setup.lhs or Setup.hs found"
-	fi
-
-	if [[ -z "${CABAL_BOOTSTRAP}" && -z "${CABAL_FROM_GHC}" ]] && ! ghc-sanecabal "${CABAL_MIN_VERSION}"; then
-		eerror "The package dev-haskell/cabal is not correctly installed for"
-		eerror "the currently active version of ghc ($(ghc-version)). Please"
-		eerror "run haskell-updater or re-build dev-haskell/cabal."
-		die "cabal is not correctly installed"
-	fi
-
-	# We build the setup program using the latest version of
-	# cabal that we have installed
-	cabalpackage=Cabal-$(cabal-version)
-	einfo "Using cabal-$(cabal-version)."
-
-	make_setup() {
-		set -- -package "${cabalpackage}" --make "${setupmodule}" \
-			${GHC_BOOTSTRAP_FLAGS} \
-			"$@" \
-			-o setup
-		echo $(ghc-getghc) ${HCFLAGS} "$@"
-		$(ghc-getghc) "$@"
-	}
-	if $(ghc-supports-shared-libraries); then
-		# # some custom build systems might use external libraries,
-		# # for which we don't have shared libs, so keep static fallback
-		# Disabled '-dynamic' as ghc does not embed RPATH to used extra-libraries:
-		# bug #411789, http://hackage.haskell.org/trac/ghc/ticket/5743#comment:3
-		# make_setup -dynamic "$@" ||
-		make_setup "$@" || die "compiling ${setupmodule} failed"
-	else
-		make_setup "$@" || die "compiling ${setupmodule} failed"
-	fi
-}
-
-cabal-mksetup() {
-	local setupdir
-
-	if [[ -n $1 ]]; then
-		setupdir=$1
-	else
-		setupdir=${S}
-	fi
-
-	rm -f "${setupdir}"/Setup.{lhs,hs}
-
-	echo 'import Distribution.Simple; main = defaultMainWithHooks defaultUserHooks' \
-		> $setupdir/Setup.hs || die "failed to create default Setup.hs"
-}
-
-cabal-hscolour() {
-	set -- hscolour "$@"
-	echo ./setup "$@"
-	./setup "$@" || die "setup hscolour failed"
-}
-
-cabal-haddock() {
-	set -- haddock "$@"
-	echo ./setup "$@"
-	./setup "$@" || die "setup haddock failed"
-}
-
-cabal-hscolour-haddock() {
-	# --hyperlink-source implies calling 'setup hscolour'
-	set -- haddock --hyperlink-source
-	echo ./setup "$@"
-	./setup "$@" --hyperlink-source || die "setup haddock --hyperlink-source failed"
-}
-
-cabal-configure() {
-	has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
-
-	if [[ -n "${CABAL_USE_HADDOCK}" ]] && use doc; then
-		cabalconf="${cabalconf} --with-haddock=${EPREFIX}/usr/bin/haddock"
-	fi
-	if [[ -n "${CABAL_USE_PROFILE}" ]] && use profile; then
-		cabalconf="${cabalconf} --enable-library-profiling"
-	fi
-	if [[ -n "${CABAL_USE_ALEX}" ]]; then
-		cabalconf="${cabalconf} --with-alex=${EPREFIX}/usr/bin/alex"
-	fi
-
-	if [[ -n "${CABAL_USE_HAPPY}" ]]; then
-		cabalconf="${cabalconf} --with-happy=${EPREFIX}/usr/bin/happy"
-	fi
-
-	if [[ -n "${CABAL_USE_C2HS}" ]]; then
-		cabalconf="${cabalconf} --with-c2hs=${EPREFIX}/usr/bin/c2hs"
-	fi
-	if [[ -n "${CABAL_USE_CPPHS}" ]]; then
-		cabalconf="${cabalconf} --with-cpphs=${EPREFIX}/usr/bin/cpphs"
-	fi
-	if [[ -n "${CABAL_TEST_SUITE}" ]]; then
-		cabalconf="${cabalconf} $(use_enable test tests)"
-	fi
-
-	local option
-	for option in ${HCFLAGS}
-	do
-		cabalconf+=" --ghc-option=$option"
-	done
-
-	# Building GHCi libs on ppc64 causes "TOC overflow".
-	if use ppc64; then
-		cabalconf="${cabalconf} --disable-library-for-ghci"
-	fi
-
-	# currently cabal does not respect CFLAGS and LDFLAGS on it's own (bug #333217)
-	# so translate LDFLAGS to ghc parameters (without filtering)
-	local flag
-	for flag in $LDFLAGS; do cabalconf="${cabalconf} --ghc-option=-optl$flag"; done
-
-	# disable executable stripping for the executables, as portage will
-	# strip by itself, and pre-stripping gives a QA warning.
-	# cabal versions previous to 1.4 does not strip executables, and does
-	# not accept the flag.
-	# this fixes numerous bugs, amongst them;
-	# bug #251881, bug #251882, bug #251884, bug #251886, bug #299494
-	cabalconf="${cabalconf} --disable-executable-stripping"
-
-	cabalconf="${cabalconf} --docdir=${EPREFIX}/usr/share/doc/${PF}"
-	# As of Cabal 1.2, configure is quite quiet. For diagnostic purposes
-	# it's better if the configure chatter is in the build logs:
-	cabalconf="${cabalconf} --verbose"
-
-	# We build shared version of our Cabal where ghc ships it's shared
-	# version of it. We will link ./setup as dynamic binary againt Cabal later.
-	[[ ${CATEGORY}/${PN} == "dev-haskell/cabal" ]] && \
-		$(ghc-supports-shared-libraries) && \
-			cabalconf="${cabalconf} --enable-shared"
-
-	set -- configure \
-		--ghc --prefix="${EPREFIX}"/usr \
-		--with-compiler="$(ghc-getghc)" \
-		--with-hc-pkg="$(ghc-getghcpkg)" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--libsubdir=${P}/ghc-$(ghc-version) \
-		--datadir="${EPREFIX}"/usr/share/ \
-		--datasubdir=${P}/ghc-$(ghc-version) \
-		${cabalconf} \
-		${CABAL_CONFIGURE_FLAGS} \
-		${CABAL_EXTRA_CONFIGURE_FLAGS} \
-		"$@"
-	echo ./setup "$@"
-	./setup "$@" || die "setup configure failed"
-}
-
-cabal-build() {
-	unset LANG LC_ALL LC_MESSAGES
-	set --  build ${CABAL_EXTRA_BUILD_FLAGS} "$@"
-	echo ./setup "$@"
-	./setup "$@" \
-		|| die "setup build failed"
-}
-
-cabal-copy() {
-	has "${EAPI:-0}" 0 1 2 && ! use prefix && ED=${D}
-
-	set -- copy --destdir="${D}" "$@"
-	echo ./setup "$@"
-	./setup "$@" || die "setup copy failed"
-
-	# cabal is a bit eager about creating dirs,
-	# so remove them if they are empty
-	rmdir "${ED}/usr/bin" 2> /dev/null
-}
-
-cabal-pkg() {
-	# This does not actually register since we're using true instead
-	# of ghc-pkg. So it just leaves the .conf file and we can
-	# register that ourselves (if it exists).
-
-	if [[ -n ${CABAL_HAS_LIBRARIES} ]]; then
-		# Newer cabal can generate a package conf for us:
-		./setup register --gen-pkg-config="${T}/${P}.conf"
-		ghc-setup-pkg "${T}/${P}.conf"
-		ghc-install-pkg
-	fi
-}
-
-# Some cabal libs are bundled along with some versions of ghc
-# eg filepath-1.0 comes with ghc-6.6.1
-# by putting CABAL_CORE_LIB_GHC_PV="6.6.1" in an ebuild we are declaring that
-# when building with this version of ghc, the ebuild is a dummy that is it will
-# install no files since the package is already included with ghc.
-# However portage still records the dependency and we can upgrade the package
-# to a later one that's not included with ghc.
-# You can also put a space separated list, eg CABAL_CORE_LIB_GHC_PV="6.6 6.6.1".
-cabal-is-dummy-lib() {
-	for version in ${CABAL_CORE_LIB_GHC_PV[*]}; do
-		[[ "$(ghc-version)" == ${version} ]] && return 0
-	done
-	return 1
-}
-
-# exported function: check if cabal is correctly installed for
-# the currently active ghc (we cannot guarantee this with portage)
-haskell-cabal_pkg_setup() {
-	if [[ -z "${CABAL_HAS_BINARIES}" ]] && [[ -z "${CABAL_HAS_LIBRARIES}" ]]; then
-		eqawarn "QA Notice: Neither bin nor lib are in CABAL_FEATURES."
-	fi
-	if [[ -n "${CABAL_UNKNOWN}" ]]; then
-		eqawarn "QA Notice: Unknown entry in CABAL_FEATURES: ${CABAL_UNKNOWN}"
-	fi
-	if cabal-is-dummy-lib; then
-		einfo "${P} is included in ghc-${CABAL_CORE_LIB_GHC_PV}, nothing to install."
-	fi
-}
-
-haskell-cabal_src_configure() {
-	cabal-is-dummy-lib && return
-
-	pushd "${S}" > /dev/null
-
-	cabal-bootstrap
-
-	cabal-configure "$@"
-
-	popd > /dev/null
-}
-
-# exported function: nice alias
-cabal_src_configure() {
-	haskell-cabal_src_configure "$@"
-}
-
-# exported function: cabal-style bootstrap configure and compile
-cabal_src_compile() {
-	# it's a common mistake when one bumps ebuild to EAPI="2" (and upper)
-	# and forgets to separate src_compile() to src_configure()/src_compile().
-	# Such error leads to default src_configure and we lose all passed flags.
-	if ! has "${EAPI:-0}" 0 1; then
-		local passed_flag
-		for passed_flag in "$@"; do
-			[[ ${passed_flag} == --flags=* ]] && \
-				eqawarn "QA Notice: Cabal option '${passed_flag}' has effect only in src_configure()"
-		done
-	fi
-
-	cabal-is-dummy-lib && return
-
-	has src_configure ${HASKELL_CABAL_EXPF} || haskell-cabal_src_configure "$@"
-	cabal-build
-
-	if [[ -n "${CABAL_USE_HADDOCK}" ]] && use doc; then
-		if [[ -n "${CABAL_USE_HSCOLOUR}" ]] && use hscolour; then
-			# hscolour and haddock
-			cabal-hscolour-haddock
-		else
-			# just haddock
-			cabal-haddock
-		fi
-	else
-		if [[ -n "${CABAL_USE_HSCOLOUR}" ]] && use hscolour; then
-			# just hscolour
-			cabal-hscolour
-		fi
-	fi
-}
-
-haskell-cabal_src_compile() {
-	pushd "${S}" > /dev/null
-
-	cabal_src_compile "$@"
-
-	popd > /dev/null
-}
-
-haskell-cabal_src_test() {
-	pushd "${S}" > /dev/null
-
-	if cabal-is-dummy-lib; then
-		einfo ">>> No tests for dummy library: ${CATEGORY}/${PF}"
-	else
-		einfo ">>> Test phase [cabal test]: ${CATEGORY}/${PF}"
-		set -- test "$@"
-		echo ./setup "$@"
-		./setup "$@" || die "cabal test failed"
-	fi
-
-	popd > /dev/null
-}
-
-# exported function: cabal-style copy and register
-cabal_src_install() {
-	has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
-
-	if ! cabal-is-dummy-lib; then
-		cabal-copy
-		cabal-pkg
-	fi
-
-	# create a dummy local package conf file for haskell-updater
-	# if it does not exist (dummy libraries and binaries w/o libraries)
-	local ghc_confdir_with_prefix="$(ghc-confdir)"
-	# remove EPREFIX
-	dodir ${ghc_confdir_with_prefix#${EPREFIX}}
-	local conf_file="${D}/$(ghc-confdir)/$(ghc-localpkgconf)"
-	[[ -e $conf_file ]] || echo '[]' > "$conf_file" || die
-
-	# make sure installed packages do not destroy ghc's
-	# bundled packages
-	local initial_pkg_db=${ROOT}/$(ghc-libdir)/package.conf.d.initial
-	if [[ -e ${initial_pkg_db} ]]; then
-		local checked_pkg
-		for checked_pkg in $(ghc-listpkg "${conf_file}")
-		do
-			local initial_pkg
-			for initial_pkg in $(ghc-listpkg "${initial_pkg_db}"); do
-				if [[ ${checked_pkg} = ${initial_pkg} ]]; then
-					eerror "Package ${checked_pkg} is shipped with $(ghc-version)."
-					eerror "Ebuild author forgot CABAL_CORE_LIB_GHC_PV entry."
-					eerror "Found in ${initial_pkg_db}."
-					die
-				fi
-			done
-		done
-	fi
-}
-
-haskell-cabal_src_install() {
-	pushd "${S}" > /dev/null
-
-	cabal_src_install
-
-	popd > /dev/null
-}
-
-# ebuild.sh:use_enable() taken as base
-#
-# Usage examples:
-#
-#     CABAL_CONFIGURE_FLAGS=$(cabal_flag gui)
-#  leads to "--flags=gui" or "--flags=-gui" (useflag 'gui')
-#
-#     CABAL_CONFIGURE_FLAGS=$(cabal_flag gtk gui)
-#  also leads to "--flags=gui" or " --flags=-gui" (useflag 'gtk')
-#
-cabal_flag() {
-	if [[ -z "$1" ]]; then
-		echo "!!! cabal_flag() called without a parameter." >&2
-		echo "!!! cabal_flag() <USEFLAG> [<cabal_flagname>]" >&2
-		return 1
-	fi
-
-	local UWORD=${2:-$1}
-
-	if use "$1"; then
-		echo "--flags=${UWORD}"
-	else
-		echo "--flags=-${UWORD}"
-	fi
-
-	return 0
-}

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
deleted file mode 100644
index 14c0db4..0000000
--- a/eclass/kde4-functions.eclass
+++ /dev/null
@@ -1,485 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.61 2012/08/19 11:12:35 johu Exp $
-
-inherit versionator
-
-# @ECLASS: kde4-functions.eclass
-# @MAINTAINER:
-# kde@g.o
-# @BLURB: Common ebuild functions for KDE 4 packages
-# @DESCRIPTION:
-# This eclass contains all functions shared by the different eclasses,
-# for KDE 4 ebuilds.
-
-# @ECLASS-VARIABLE: EAPI
-# @DESCRIPTION:
-# Currently kde4 eclasses support EAPI 3 and 4.
-case ${EAPI:-0} in
-	4|5|3) : ;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-# @ECLASS-VARIABLE: KDE_OVERRIDE_MINIMAL
-# @DESCRIPTION:
-# For use only in very few well-defined cases; normally it should be unset.
-# If this variable is set, all calls to add_kdebase_dep return a dependency on
-# at least this version, independent of the version of the package itself.
-# If you know exactly that one specific NEW KDE component builds and runs fine
-# with all the rest of KDE at an OLDER version, you can set this old version here.
-# Warning- may lead to general instability and kill your pet targh.
-
-# @ECLASS-VARIABLE: KDEBASE
-# @DESCRIPTION:
-# This gets set to a non-zero value when a package is considered a kde or
-# kdevelop ebuild.
-if [[ ${CATEGORY} = kde-base ]]; then
-	debug-print "${ECLASS}: KDEBASE ebuild recognized"
-	KDEBASE=kde-base
-elif [[ ${KMNAME-${PN}} = kdevelop ]]; then
-	debug-print "${ECLASS}: KDEVELOP ebuild recognized"
-	KDEBASE=kdevelop
-fi
-
-# determine the build type
-if [[ ${PV} = *9999* ]]; then
-	KDE_BUILD_TYPE="live"
-else
-	KDE_BUILD_TYPE="release"
-fi
-export KDE_BUILD_TYPE
-
-# Set reponame and SCM for modules that have fully migrated to git
-# (hack - it's here because it needs to be before SCM inherits from kde4-base)
-if [[ ${KDE_BUILD_TYPE} == live ]]; then
-	case "${KMNAME}" in
-		kdebase-workspace)
-			KDE_SCM="git"
-			EGIT_REPONAME=${EGIT_REPONAME:=kde-workspace}
-		;;
-		kdebase-runtime)
-			KDE_SCM="git"
-			EGIT_REPONAME=${EGIT_REPONAME:=kde-runtime}
-		;;
-		kdebase-apps)
-			KDE_SCM="git"
-			EGIT_REPONAME=${EGIT_REPONAME:=kde-baseapps}
-		;;
-		kde-workspace|kde-runtime|kde-baseapps)
-			KDE_SCM="git"
-		;;
-	esac
-fi
-
-# @ECLASS-VARIABLE: KDE_SCM
-# @DESCRIPTION:
-# If this is a live package which scm does it use
-# Everything else uses svn by default
-KDE_SCM="${KDE_SCM:-svn}"
-case ${KDE_SCM} in
-	svn|git) ;;
-	*) die "KDE_SCM: ${KDE_SCM} is not supported" ;;
-esac
-
-# @ECLASS-VARIABLE: KDE_LINGUAS
-# @DESCRIPTION:
-# This is a whitespace-separated list of translations this ebuild supports.
-# These translations are automatically added to IUSE. Therefore ebuilds must set
-# this variable before inheriting any eclasses. To enable only selected
-# translations, ebuilds must call enable_selected_linguas(). kde4-{base,meta}.eclass does
-# this for you.
-#
-# Example: KDE_LINGUAS="de en_GB nl"
-if [[ ${KDE_BUILD_TYPE} != live || -n ${KDE_LINGUAS_LIVE_OVERRIDE} ]]; then
-	for _lingua in ${KDE_LINGUAS}; do
-		IUSE="${IUSE} linguas_${_lingua}"
-	done
-fi
-
-# @FUNCTION: buildsycoca
-# @DESCRIPTION:
-# Function to rebuild the KDE System Configuration Cache.
-# All KDE ebuilds should run this in pkg_postinst and pkg_postrm.
-buildsycoca() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	# We no longer need to run kbuildsycoca4, as kded does that automatically, as needed
-
-	# fix permission for some directories
-	for x in usr/share/{config,kde4}; do
-		DIRS=${EROOT}usr
-		[[ -d "${EROOT}${x}" ]] || break # nothing to do if directory does not exist
-		# fixes Bug 318237
-		if use userland_BSD ; then
-			[[ $(stat -f %p "${EROOT}${x}") != 40755 ]]
-			local stat_rtn="$?"
-		else
-			[[ $(stat --format=%a "${EROOT}${x}") != 755 ]]
-			local stat_rtn=$?
-		fi
-		if [[ $stat_rtn != 1 ]] ; then
-			ewarn "QA Notice:"
-			ewarn "Package ${PN} is breaking ${EROOT}${x} permissions."
-			ewarn "Please report this issue to gentoo bugzilla."
-			einfo "Permissions will get adjusted automatically now."
-			find "${EROOT}${x}" -type d -print0 | xargs -0 chmod 755
-		fi
-	done
-}
-
-# @FUNCTION: comment_all_add_subdirectory
-# @USAGE: [list of directory names]
-# @DESCRIPTION:
-# Recursively comment all add_subdirectory instructions in listed directories,
-# except those in cmake/.
-comment_all_add_subdirectory() {
-	find "$@" -name CMakeLists.txt -print0 | grep -vFzZ "./cmake" | \
-		xargs -0 sed -i \
-			-e '/^[[:space:]]*add_subdirectory/s/^/#DONOTCOMPILE /' \
-			-e '/^[[:space:]]*ADD_SUBDIRECTORY/s/^/#DONOTCOMPILE /' \
-			-e '/^[[:space:]]*macro_optional_add_subdirectory/s/^/#DONOTCOMPILE /' \
-			-e '/^[[:space:]]*MACRO_OPTIONAL_ADD_SUBDIRECTORY/s/^/#DONOTCOMPILE /' \
-			|| die "${LINENO}: Initial sed died"
-}
-
-# @FUNCTION: enable_selected_linguas
-# @DESCRIPTION:
-# Enable translations based on LINGUAS settings and translations supported by
-# the package (see KDE_LINGUAS). By default, translations are found in "${S}"/po
-# but this default can be overridden by defining KDE_LINGUAS_DIR.
-enable_selected_linguas() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local x
-
-	# if there is no linguas defined we enable everything
-	if ! $(env | grep -q "^LINGUAS="); then
-		return 0
-	fi
-
-	# @ECLASS-VARIABLE: KDE_LINGUAS_DIR
-	# @DESCRIPTION:
-	# Specified folder where application translations are located.
-	# Can be defined as array of folders where translations are located.
-	# Note that space separated list of dirs is not supported.
-	# Default value is set to "po".
-	if [[ "$(declare -p KDE_LINGUAS_DIR 2>/dev/null 2>&1)" == "declare -a"* ]]; then
-		debug-print "$FUNCNAME: we have these subfolders defined: ${KDE_LINGUAS_DIR}"
-		for x in ${KDE_LINGUAS_DIR[@]}; do
-			_enable_selected_linguas_dir ${x}
-		done
-	else
-		KDE_LINGUAS_DIR=${KDE_LINGUAS_DIR:="po"}
-		_enable_selected_linguas_dir ${KDE_LINGUAS_DIR}
-	fi
-}
-
-# @FUNCTION: enable_selected_doc_linguas
-# @DESCRIPTION:
-# Enable only selected linguas enabled doc folders.
-enable_selected_doc_linguas() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	# @ECLASS-VARIABLE: KDE_DOC_DIRS
-	# @DESCRIPTION:
-	# Variable specifying whitespace separated patterns for documentation locations.
-	# Default is "doc/%lingua"
-	KDE_DOC_DIRS=${KDE_DOC_DIRS:='doc/%lingua'}
-	local linguas
-	for pattern in ${KDE_DOC_DIRS}; do
-
-		local handbookdir=`dirname ${pattern}`
-		local translationdir=`basename ${pattern}`
-		# Do filename pattern supplied, treat as directory
-		[[ ${handbookdir} = '.' ]] && handbookdir=${translationdir} && translationdir=
-		[[ -d ${handbookdir} ]] || die 'wrong doc dir specified'
-
-		if ! use handbook; then
-			# Disable whole directory
-			sed -e "/add_subdirectory[[:space:]]*([[:space:]]*${handbookdir}[[:space:]]*)/s/^/#DONOTCOMPILE /" \
-				-e "/ADD_SUBDIRECTORY[[:space:]]*([[:space:]]*${handbookdir}[[:space:]]*)/s/^/#DONOTCOMPILE /" \
-				-i CMakeLists.txt || die 'failed to comment out all handbooks'
-		else
-			# if there is no linguas defined we enable everything (i.e. comment out nothing)
-			if ! $(env | grep -q "^LINGUAS="); then
-				return 0
-			fi
-
-			# Disable subdirectories recursively
-			comment_all_add_subdirectory "${handbookdir}"
-			# Add requested translations
-			local lingua
-			for lingua in en ${KDE_LINGUAS}; do
-				if [[ ${lingua} = en ]] || use linguas_${lingua}; then
-					if [[ -d ${handbookdir}/${translationdir//%lingua/${lingua}} ]]; then
-						sed -e "/add_subdirectory[[:space:]]*([[:space:]]*${translationdir//%lingua/${lingua}}/s/^#DONOTCOMPILE //" \
-							-e "/ADD_SUBDIRECTORY[[:space:]]*([[:space:]]*${translationdir//%lingua/${lingua}}/s/^#DONOTCOMPILE //" \
-							-i "${handbookdir}"/CMakeLists.txt && ! has ${lingua} ${linguas} && linguas="${linguas} ${lingua}"
-					fi
-				fi
-			done
-		fi
-
-	done
-	[[ -n "${linguas}" ]] && einfo "Enabling handbook translations:${linguas}"
-}
-
-# @FUNCTION: migrate_store_dir
-# @DESCRIPTION:
-# Universal store dir migration
-# * performs split of kdebase to kdebase-apps when needed
-# * moves playground/extragear kde4-base-style to toplevel dir
-migrate_store_dir() {
-	if [[ ${KDE_SCM} != svn ]]; then
-		die "migrate_store_dir() only makes sense for subversion"
-	fi
-
-	local cleandir="${ESVN_STORE_DIR}/KDE"
-
-	if [[ -d ${cleandir} ]]; then
-		ewarn "'${cleandir}' has been found. Moving contents to new location."
-		addwrite "${ESVN_STORE_DIR}"
-		# Split kdebase
-		local module
-		if pushd "${cleandir}"/kdebase/kdebase > /dev/null; then
-			for module in `find . -maxdepth 1 -type d -name [a-z0-9]\*`; do
-				module="${module#./}"
-				mkdir -p "${ESVN_STORE_DIR}/kdebase-${module}" && mv -f "${module}" "${ESVN_STORE_DIR}/kdebase-${module}" || \
-					die "Failed to move to '${ESVN_STORE_DIR}/kdebase-${module}'."
-			done
-			popd > /dev/null
-			rm -fr "${cleandir}/kdebase" || \
-				die "Failed to remove ${cleandir}/kdebase. You need to remove it manually."
-		fi
-		# Move the rest
-		local pkg
-		for pkg in "${cleandir}"/*; do
-			mv -f "${pkg}" "${ESVN_STORE_DIR}"/ || eerror "Failed to move '${pkg}'"
-		done
-		rmdir "${cleandir}" || die "Could not move obsolete KDE store dir.  Please move '${cleandir}' contents to appropriate location (possibly ${ESVN_STORE_DIR}) and manually remove '${cleandir}' in order to continue."
-	fi
-
-	if ! has kde4-meta ${INHERITED}; then
-		case ${KMNAME} in
-			extragear*|playground*)
-				local scmlocalpath="${ESVN_STORE_DIR}"/"${KMNAME}"/"${PN}"
-				if [[ -d "${scmlocalpath}" ]]; then
-					local destdir="${ESVN_STORE_DIR}"/"${ESVN_PROJECT}"/"`basename "${ESVN_REPO_URI}"`"
-					ewarn "'${scmlocalpath}' has been found."
-					ewarn "Moving contents to new location: ${destdir}"
-					addwrite "${ESVN_STORE_DIR}"
-					mkdir -p "${ESVN_STORE_DIR}"/"${ESVN_PROJECT}" && mv -f "${scmlocalpath}" "${destdir}" \
-						|| die "Failed to move to '${scmlocalpath}'"
-					# Try cleaning empty directories
-					rmdir "`dirname "${scmlocalpath}"`" 2> /dev/null
-				fi
-				;;
-		esac
-	fi
-}
-
-# Functions handling KMLOADLIBS and KMSAVELIBS
-
-# @FUNCTION: save_library_dependencies
-# @DESCRIPTION:
-# Add exporting CMake dependencies for current package
-save_library_dependencies() {
-	local depsfile="${T}/${PN}"
-
-	ebegin "Saving library dependencies in ${depsfile##*/}"
-	echo "EXPORT_LIBRARY_DEPENDENCIES(\"${depsfile}\")" >> "${S}/CMakeLists.txt" || \
-		die "Failed to save the library dependencies."
-	eend $?
-}
-
-# @FUNCTION: install_library_dependencies
-# @DESCRIPTION:
-# Install generated CMake library dependencies to /var/lib/kde
-install_library_dependencies() {
-	local depsfile="${T}/${PN}"
-
-	ebegin "Installing library dependencies as ${depsfile##*/}"
-	insinto /var/lib/kde
-	doins "${depsfile}" || die "Failed to install library dependencies."
-	eend $?
-}
-
-# @FUNCTION: load_library_dependencies
-# @DESCRIPTION:
-# Inject specified library dependencies in current package
-load_library_dependencies() {
-	local pn i depsfile
-	ebegin "Injecting library dependencies from '${KMLOADLIBS}'"
-
-	i=0
-	for pn in ${KMLOADLIBS} ; do
-		((i++))
-		depsfile="${EPREFIX}/var/lib/kde/${pn}"
-		[[ -r ${depsfile} ]] || depsfile="${EPREFIX}/var/lib/kde/${pn}:$(get_kde_version)"
-		[[ -r ${depsfile} ]] || die "Depsfile '${depsfile}' not accessible. You probably need to reinstall ${pn}."
-		sed -i -e "${i}iINCLUDE(\"${depsfile}\")" "${S}/CMakeLists.txt" || \
-			die "Failed to include library dependencies for ${pn}"
-	done
-	eend $?
-}
-
-# @FUNCTION: add_blocker
-# @DESCRIPTION:
-# Create correct RDEPEND value for blocking correct package.
-# Useful for file-collision blocks.
-# Parameters are package and version(s) to block.
-# add_blocker kdelibs 4.2.4
-# If no version is specified, then all versions will be blocked.
-# If the version is 0, then no versions will be blocked.
-# If a second version ending in ":3.5" is passed, then the version listed for
-# that slot will be blocked as well.
-#
-# Examples:
-#    # Block all versions of kdelibs
-#    add_blocker kdelibs
-#
-#    # Block all versions of kdelibs older than 4.3.50
-#    add_blocker kdelibs 4.3.50
-#
-#    # Block kdelibs 3.5.10 and older, but not any version of
-#    # kdelibs from KDE 4
-#    add_blocker kdelibs 0 3.5.10:3.5
-add_blocker() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ -z ${1} ]] && die "Missing parameter"
-	local pkg=kde-base/$1 atom old_ver="unset" use
-	if [[ $pkg == *\[*\] ]]; then
-		use=${pkg/#*\[/[}
-		pkg=${pkg%\[*\]}
-	fi
-
-	[[ "$3" == *:3.5 ]] && old_ver=${3%:3.5}
-
-	# If the version passed is "0", do nothing
-	if [[ ${2} != 0 ]]; then
-		# If no version was passed, block all versions in this slot
-		if [[ -z ${2} ]]; then
-			atom=${pkg}
-		# If the version passed begins with a "<", then use "<" instead of "<="
-		elif [[ ${2::1} == "<" ]]; then
-			# this also removes the first character of the version, which is a "<"
-			atom="<${pkg}-${2:1}"
-		else
-			atom="<=${pkg}-${2}"
-		fi
-		RDEPEND+=" !${atom}:4${use}"
-	fi
-
-	# Do the same thing as above for :3.5, except that we don't want any
-	# output if no parameter was passed.
-	if [[ ${old_ver} != "unset" ]]; then
-		if [[ -z ${old_ver} ]]; then
-			atom=${pkg}
-		elif [[ ${old_ver::1} == "<" ]]; then
-			atom="<${pkg}-${old_ver:1}"
-		else
-			atom="<=${pkg}-${old_ver}"
-		fi
-		RDEPEND+=" !${atom}:3.5${use}"
-	fi
-}
-
-# @FUNCTION: add_kdebase_dep
-# @DESCRIPTION:
-# Create proper dependency for kde-base/ dependencies.
-# This takes 1 to 3 arguments. The first being the package name, the optional
-# second is additional USE flags to append, and the optional third is the
-# version to use instead of the automatic version (use sparingly).
-# The output of this should be added directly to DEPEND/RDEPEND, and may be
-# wrapped in a USE conditional (but not an || conditional without an extra set
-# of parentheses).
-add_kdebase_dep() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local ver
-
-	if [[ -n ${3} ]]; then
-		ver=${3}
-	elif [[ -n ${KDE_OVERRIDE_MINIMAL} ]]; then
-		ver=${KDE_OVERRIDE_MINIMAL}
-	elif [[ ${KDEBASE} != kde-base ]]; then
-		ver=${KDE_MINIMAL}
-	# if building stable-live version depend just on the raw KDE version
-	# to allow merging packages against more stable basic stuff
-	elif [[ ${PV} == *.9999 ]]; then
-		ver=$(get_kde_version)
-	else
-		ver=${PV}
-	fi
-
-	[[ -z ${1} ]] && die "Missing parameter"
-
-	echo " >=kde-base/${1}-${ver}:4[aqua=${2:+,${2}}]"
-}
-
-# local function to enable specified translations for specified directory
-# used from kde4-functions_enable_selected_linguas function
-_enable_selected_linguas_dir() {
-	local lingua linguas sr_mess wp
-	local dir=${1}
-
-	[[ -d  ${dir} ]] || die "linguas dir \"${dir}\" does not exist"
-	comment_all_add_subdirectory "${dir}"
-	pushd "${dir}" > /dev/null
-
-	# fix all various crazy sr@Latn variations
-	# this part is only ease for ebuilds, so there wont be any die when this
-	# fail at any point
-	sr_mess="sr@latn sr@latin sr@Latin"
-	for wp in ${sr_mess}; do
-		[[ -e ${wp}.po ]] && mv "${wp}.po" "sr@××××.po"
-		if [[ -d ${wp} ]]; then
-			# move dir and fix cmakelists
-			mv "${wp}" "sr@Latn"
-			sed -i \
-				-e "s:${wp}:sr@Latn:g" \
-				CMakeLists.txt
-		fi
-	done
-
-	for lingua in ${KDE_LINGUAS}; do
-		if [[ -e ${lingua}.po ]]; then
-			mv "${lingua}.po" "${lingua}.po.old"
-		fi
-	done
-
-	for lingua in ${KDE_LINGUAS}; do
-		if use linguas_${lingua} ; then
-			if [[ -d ${lingua} ]]; then
-				linguas="${linguas} ${lingua}"
-				sed -e "/add_subdirectory([[:space:]]*${lingua}[[:space:]]*)[[:space:]]*$/ s/^#DONOTCOMPILE //" \
-					-e "/ADD_SUBDIRECTORY([[:space:]]*${lingua}[[:space:]]*)[[:space:]]*$/ s/^#DONOTCOMPILE //" \
-					-i CMakeLists.txt || die "Sed to uncomment linguas_${lingua} failed."
-			fi
-			if [[ -e ${lingua}.po.old ]]; then
-				linguas="${linguas} ${lingua}"
-				mv "${lingua}.po.old" "${lingua}.po"
-			fi
-		fi
-	done
-	[[ -n ${linguas} ]] && echo ">>> Enabling languages: ${linguas}"
-
-	popd > /dev/null
-}
-
-# @FUNCTION: get_kde_version
-# @DESCRIPTION:
-# Translates an ebuild version into a major.minor KDE SC
-# release version. If no version is specified, ${PV} is used.
-get_kde_version() {
-	local ver=${1:-${PV}}
-	local major=$(get_major_version ${ver})
-	local minor=$(get_version_component_range 2 ${ver})
-	local micro=$(get_version_component_range 3 ${ver})
-	if [[ ${ver} == 9999 ]]; then
-		echo live
-	else
-		(( micro < 50 )) && echo ${major}.${minor} || echo ${major}.$((minor + 1))
-	fi
-}

diff --git a/eclass/leechcraft.eclass b/eclass/leechcraft.eclass
deleted file mode 100644
index 7b02c0a..0000000
--- a/eclass/leechcraft.eclass
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/leechcraft.eclass,v 1.5 2012/07/17 04:29:05 vapier Exp $
-#
-# @ECLASS: leechcraft.eclass
-# @MAINTAINER:
-# leechcraft@g.o
-# @AUTHOR:
-# 0xd34df00d@×××××.com
-# NightNord@××××××.ru
-# @BLURB: Common functions and setup utilities for the LeechCraft app
-# @DESCRIPTION:
-# The leechcraft eclass contains a common set of functions and steps
-# needed to build LeechCraft core or its plugins.
-#
-# Though this eclass seems to be small at the moment, it seems like a
-# good idea to make all plugins inherit from it, since all plugins
-# have mostly the same configuring/build process.
-#
-# Thanks for original eclass to Andrian Nord <NightNord@××××××.ru>.
-#
-# Only EAPI >1 supported
-
-case ${EAPI:-0} in
-	4|5|3|2) ;;
-	0|1) die "EAPI not supported, bug ebuild mantainer" ;;
-	*) die "Unknown EAPI, bug eclass maintainers" ;;
-esac
-
-inherit cmake-utils versionator
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="git://github.com/0xd34df00d/leechcraft.git"
-	EGIT_PROJECT="leechcraft"
-
-	inherit git-2
-else
-	local suffix
-	if version_is_at_least 0.4.95; then
-		DEPEND="app-arch/xz-utils"
-		suffix="xz"
-	else
-		suffix="bz2"
-	fi
-	SRC_URI="mirror://sourceforge/leechcraft/leechcraft-${PV}.tar.${suffix}"
-	S="${WORKDIR}/leechcraft-${PV}"
-fi
-
-HOMEPAGE="http://leechcraft.org/"
-LICENSE="GPL-3"
-
-# @ECLASS-VARIABLE: LEECHCRAFT_PLUGIN_CATEGORY
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Set this to the category of the plugin, if any.
-: ${LEECHCRAFT_PLUGIN_CATEGORY:=}
-
-if [[ "${LEECHCRAFT_PLUGIN_CATEGORY}" ]]; then
-	CMAKE_USE_DIR="${S}"/src/plugins/${LEECHCRAFT_PLUGIN_CATEGORY}/${PN#leechcraft-}
-elif [[ ${PN} != leechcraft-core ]]; then
-	CMAKE_USE_DIR="${S}"/src/plugins/${PN#leechcraft-}
-else
-	CMAKE_USE_DIR="${S}"/src
-fi

diff --git a/eclass/mozlinguas.eclass b/eclass/mozlinguas.eclass
deleted file mode 100644
index 3648364..0000000
--- a/eclass/mozlinguas.eclass
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozlinguas.eclass,v 1.4 2012/07/19 12:09:05 scarabeus Exp $
-
-# @ECLASS: mozlinguas.eclass
-# @MAINTAINER:
-# mozilla@g.o
-# @AUTHOR:
-# Nirbheek Chauhan <nirbheek@g.o>
-# @BLURB: Handle language packs for mozilla products
-# @DESCRIPTION:
-# Sets IUSE according to MOZ_LANGS (language packs available). Also exports
-# src_unpack and src_install for use in ebuilds.
-
-inherit mozextension
-
-case "${EAPI:-0}" in
-	0|1)
-		die "EAPI ${EAPI:-0} does not support the '->' SRC_URI operator";;
-	2|3|4|5)
-		EXPORT_FUNCTIONS src_unpack src_install;;
-	*)
-		die "EAPI ${EAPI} is not supported, contact eclass maintainers";;
-esac
-
-# @ECLASS-VARIABLE: MOZ_LANGS
-# @DESCRIPTION:
-# Array containing the list of language pack xpis available for
-# this release. The list can be updated with scripts/get_langs.sh from the
-# mozilla overlay.
-# @DEFAULT-UNSET
-: ${MOZ_LANGS:=()}
-
-# @ECLASS-VARIABLE: MOZ_PV
-# @DESCRIPTION:
-# Ebuild package version converted to equivalent upstream version.
-# Defaults to ${PV}, and should be overridden for alphas, betas, and RCs
-: ${MOZ_PV:="${PV}"}
-
-# @ECLASS-VARIABLE: MOZ_PN
-# @DESCRIPTION:
-# Ebuild package name converted to equivalent upstream name.
-# Defaults to ${PN}, and should be overridden for binary ebuilds.
-: ${MOZ_PN:="${PN}"}
-
-# @ECLASS-VARIABLE: MOZ_P
-# @DESCRIPTION:
-# Ebuild package name + version converted to upstream equivalent.
-# Defaults to ${MOZ_PN}-${MOZ_PV}
-: ${MOZ_P:="${MOZ_PN}-${MOZ_PV}"}
-
-# @ECLASS-VARIABLE: MOZ_FTP_URI
-# @DEFAULT-UNSET
-# @DESCRIPTION:
-# The ftp URI prefix for the release tarballs and language packs.
-: ${MOZ_FTP_URI:=""}
-
-# @ECLASS-VARIABLE: MOZ_LANGPACK_PREFIX
-# @DESCRIPTION:
-# The relative path till the lang code in the langpack file URI.
-# Defaults to ${MOZ_PV}/linux-i686/xpi/
-: ${MOZ_LANGPACK_PREFIX:="${MOZ_PV}/linux-i686/xpi/"}
-
-# @ECLASS-VARIABLE: MOZ_LANGPACK_SUFFIX
-# @DESCRIPTION:
-# The suffix after the lang code in the langpack file URI.
-# Defaults to '.xpi'
-: ${MOZ_LANGPACK_SUFFIX:=".xpi"}
-
-# Add linguas_* to IUSE according to available language packs
-# No language packs for alphas and betas
-if ! [[ ${PV} =~ alpha|beta ]] || { [[ ${PN} == seamonkey ]] && ! [[ ${PV} =~ alpha ]] ; } ; then
-	for x in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${x} == en ]] || [[ ${x} == en-US ]]; then
-			continue
-		fi
-		SRC_URI+="
-			linguas_${x/-/_}?
-				( ${MOZ_FTP_URI}/${MOZ_LANGPACK_PREFIX}${x}${MOZ_LANGPACK_SUFFIX} -> ${MOZ_P}-${x}.xpi )"
-		IUSE+=" linguas_${x/-/_}"
-		# We used to do some magic if specific/generic locales were missing, but
-		# we stopped doing that due to bug 325195.
-	done
-fi
-unset x
-
-# @FUNCTION: mozlinguas_export
-# @INTERNAL
-# @DESCRIPTION:
-# Generate the list of language packs called "mozlinguas"
-# This list is used to unpack and install the xpi language packs
-mozlinguas_export() {
-	if [[ ${PN} == seamonkey ]] ; then
-		[[ ${PV} =~ alpha ]] && return
-	else
-		[[ ${PV} =~ alpha|beta ]] && return
-	fi
-	local lingua
-	mozlinguas=()
-	for lingua in ${LINGUAS}; do
-		if has ${lingua} en en_US; then
-			# For mozilla products, en and en_US are handled internally
-			continue
-		# If this language is supported by ${P},
-		elif has ${lingua} "${MOZ_LANGS[@]//-/_}"; then
-			# Add the language to mozlinguas, if it isn't already there
-			has ${lingua//_/-} "${mozlinguas[@]}" || mozlinguas+=(${lingua//_/-})
-			continue
-		# For each short lingua that isn't in MOZ_LANGS,
-		# We used to add *all* long MOZ_LANGS to the mozlinguas list,
-		# but we stopped doing that due to bug 325195.
-		else
-			:
-		fi
-		ewarn "Sorry, but ${P} does not support the ${lingua} locale"
-	done
-}
-
-# @FUNCTION: mozlinguas_src_unpack
-# @DESCRIPTION:
-# Unpack xpi language packs according to the user's LINGUAS settings
-mozlinguas_src_unpack() {
-	local x
-	mozlinguas_export
-	for x in "${mozlinguas[@]}"; do
-		# FIXME: Add support for unpacking xpis to portage
-		xpi_unpack "${MOZ_P}-${x}.xpi"
-	done
-	if [[ "${mozlinguas[*]}" != "" && "${mozlinguas[*]}" != "en" ]]; then
-		einfo "Selected language packs (first will be default): ${mozlinguas[*]}"
-	fi
-}
-
-# @FUNCTION: mozlinguas_src_install
-# @DESCRIPTION:
-# Install xpi language packs according to the user's LINGUAS settings
-mozlinguas_src_install() {
-	local x
-	mozlinguas_export
-	for x in "${mozlinguas[@]}"; do
-		xpi_install "${WORKDIR}/${MOZ_P}-${x}"
-	done
-}

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
deleted file mode 100644
index f292775..0000000
--- a/eclass/mysql-v2.eclass
+++ /dev/null
@@ -1,702 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.18 2012/09/10 02:07:08 ferringb Exp $
-
-# @ECLASS: mysql-v2.eclass
-# @MAINTAINER:
-# Maintainers:
-#	- MySQL Team <mysql-bugs@g.o>
-#	- Robin H. Johnson <robbat2@g.o>
-#	- Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o>
-# @BLURB: This eclass provides most of the functions for mysql ebuilds
-# @DESCRIPTION:
-# The mysql-v2.eclass is the base eclass to build the mysql and
-# alternative projects (mariadb) ebuilds.
-# This eclass uses the mysql-autotools and mysql-cmake eclasses for the
-# specific bits related to the build system.
-# It provides the src_unpack, src_prepare, src_configure, src_compile,
-# src_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm
-# phase hooks.
-
-# @ECLASS-VARIABLE: BUILD
-# @DESCRIPTION:
-# Build type of the mysql version
-: ${BUILD:=autotools}
-
-case ${BUILD} in
-	"cmake")
-		BUILD_INHERIT="mysql-cmake"
-		;;
-	"autotools")
-		BUILD_INHERIT="mysql-autotools"
-
-		WANT_AUTOCONF="latest"
-		WANT_AUTOMAKE="latest"
-		;;
-	*)
-		die "${BUILD} is not a valid build system for mysql"
-		;;
-esac
-
-MYSQL_EXTRAS=""
-
-# @ECLASS-VARIABLE: MYSQL_EXTRAS_VER
-# @DESCRIPTION:
-# The version of the MYSQL_EXTRAS repo to use to build mysql
-# Use "none" to disable it's use
-[[ "${MY_EXTRAS_VER}" == "live" ]] && MYSQL_EXTRAS="git-2"
-
-inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs
-
-#
-# Supported EAPI versions and export functions
-#
-
-case "${EAPI:-0}" in
-	3|4|5) ;;
-	*) die "Unsupported EAPI: ${EAPI}" ;;
-esac
-
-EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_config pkg_postrm
-
-#
-# VARIABLES:
-#
-
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
-if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
-	EGIT_PROJECT=mysql-extras
-	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
-fi
-
-# @ECLASS-VARIABLE: MYSQL_PV_MAJOR
-# @DESCRIPTION:
-# Upstream MySQL considers the first two parts of the version number to be the
-# major version. Upgrades that change major version should always run
-# mysql_upgrade.
-MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})"
-
-# @ECLASS-VARIABLE: MYSQL_VERSION_ID
-# @DESCRIPTION:
-# MYSQL_VERSION_ID will be:
-# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
-# This is an important part, because many of the choices the MySQL ebuild will do
-# depend on this variable.
-# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803"
-# We also strip off upstream's trailing letter that they use to respin tarballs
-MYSQL_VERSION_ID=""
-tpv="${PV%[a-z]}"
-tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
-for vatom in 0 1 2 3 ; do
-	# pad to length 2
-	tpv[${vatom}]="00${tpv[${vatom}]}"
-	MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
-done
-# strip leading "0" (otherwise it's considered an octal number by BASH)
-MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
-
-# This eclass should only be used with at least mysql-5.1.50
-mysql_version_is_at_least "5.1.50" || die "This eclass should only be used with >=mysql-5.1.50"
-
-# @ECLASS-VARIABLE: XTRADB_VER
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Version of the XTRADB storage engine
-
-# @ECLASS-VARIABLE: PERCONA_VER
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Designation by PERCONA for a MySQL version to apply an XTRADB release
-
-# Work out the default SERVER_URI correctly
-if [ -z "${SERVER_URI}" ]; then
-	[ -z "${MY_PV}" ] && MY_PV="${PV//_/-}"
-	if [ "${PN}" == "mariadb" ]; then
-		MARIA_FULL_PV="$(replace_version_separator 3 '-' ${MY_PV})"
-		MARIA_FULL_P="${PN}-${MARIA_FULL_PV}"
-		SERVER_URI="
-		http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://ftp.rediris.es/mirror/MariaDB/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://maria.llarian.net/download/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/${MARIA_FULL_P}.tar.gz
-		http://mirrors.fe.up.pt/pub/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://ftp-stud.hs-esslingen.de/pub/Mirrors/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		"
-	else
-		URI_DIR="MySQL"
-		URI_FILE="mysql"
-		URI_A="${URI_FILE}-${MY_PV}.tar.gz"
-		MIRROR_PV=$(get_version_component_range 1-2 ${PV})
-		# Recently upstream switched to an archive site, and not on mirrors
-		SERVER_URI="http://downloads.mysql.com/archives/${URI_FILE}-${MIRROR_PV}/${URI_A}
-					mirror://mysql/Downloads/${URI_DIR}-${PV%.*}/${URI_A}"
-	fi
-fi
-
-# Define correct SRC_URIs
-SRC_URI="${SERVER_URI}"
-
-# Gentoo patches to MySQL
-[[ ${MY_EXTRAS_VER} != live ]] && [[ ${MY_EXTRAS_VER} != none ]] \
-&& SRC_URI="${SRC_URI}
-		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
-HOMEPAGE="http://www.mysql.com/"
-if [[ "${PN}" == "mariadb" ]]; then
-	HOMEPAGE="http://mariadb.org/"
-	DESCRIPTION="MariaDB is a MySQL fork with 3rd-party patches and additional storage engines merged."
-fi
-LICENSE="GPL-2"
-SLOT="0"
-
-case "${BUILD}" in
-	"autotools")
-		IUSE="big-tables debug embedded minimal +perl selinux ssl static test"
-		;;
-	"cmake")
-		IUSE="debug embedded minimal +perl selinux ssl static test"
-		;;
-esac
-
-IUSE="${IUSE} latin1"
-
-IUSE="${IUSE} extraengine"
-IUSE="${IUSE} cluster"
-
-IUSE="${IUSE} max-idx-128"
-IUSE="${IUSE} berkdb"
-IUSE="${IUSE} +community profiling"
-
-[[ ${PN} == "mariadb" ]] \
-&& IUSE="${IUSE} libevent"
-
-[[ ${PN} == "mariadb" ]] \
-&& mysql_version_is_at_least "5.2" \
-&& IUSE="${IUSE} oqgraph"
-
-[[ ${PN} == "mariadb" ]] \
-&& mysql_version_is_at_least "5.2.5" \
-&& IUSE="${IUSE} sphinx"
-
-mysql_version_is_at_least "5.5.7" \
-&& IUSE="${IUSE} systemtap"
-
-#
-# DEPENDENCIES:
-#
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-DEPEND="
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	kernel_linux? ( sys-process/procps )
-	>=sys-apps/sed-4
-	>=sys-apps/texinfo-4.7-r1
-	>=sys-libs/readline-4.1
-	>=sys-libs/zlib-1.2.3
-"
-
-[[ ${PN} == mariadb ]] \
-&& DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
-
-# Having different flavours at the same time is not a good idea
-for i in "mysql" "mariadb" ; do
-	[[ ${i} == ${PN} ]] ||
-	DEPEND="${DEPEND} !dev-db/${i}"
-done
-
-# prefix: first need to implement something for #196294
-RDEPEND="${DEPEND}
-	!minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )
-	selinux? ( sec-policy/selinux-mysql )
-"
-
-DEPEND="${DEPEND}
-	virtual/yacc
-"
-
-DEPEND="${DEPEND} static? ( sys-libs/ncurses[static-libs] )"
-
-# compile-time-only
-DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
-
-# compile-time-only
-mysql_version_is_at_least "5.5.8" \
-&& DEPEND="${DEPEND} >=dev-util/cmake-2.6.3"
-
-[[ "${PN}" == "mariadb" ]] \
-&& mysql_version_is_at_least "5.2" \
-&& DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )"
-
-[[ "${PN}" == "mariadb" ]] \
-&& mysql_version_is_at_least "5.2.5" \
-&& DEPEND="${DEPEND} sphinx? ( app-misc/sphinx )"
-
-mysql_version_is_at_least "5.5.7" \
-&& DEPEND="${DEPEND} systemtap? ( >=dev-util/systemtap-1.3 )"
-
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-# For other stuff to bring us in
-PDEPEND="${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}"
-
-#
-# External patches
-#
-
-# MariaDB has integrated PBXT
-# PBXT_VERSION means that we have a PBXT patch for this PV
-# PBXT was only introduced after 5.1.12
-pbxt_patch_available() {
-	[[ ${PN} != "mariadb" ]] \
-	&& [[ -n "${PBXT_VERSION}" ]]
-	return $?
-}
-
-pbxt_available() {
-	pbxt_patch_available || [[ ${PN} == "mariadb" ]]
-	return $?
-}
-
-# Get the percona tarball if XTRADB_VER and PERCONA_VER are both set
-# MariaDB has integrated XtraDB
-# XTRADB_VERS means that we have a XTRADB patch for this PV
-# XTRADB was only introduced after 5.1.26
-xtradb_patch_available() {
-	[[ ${PN} != "mariadb" ]] \
-	&& [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]]
-	return $?
-}
-
-
-if pbxt_patch_available; then
-
-	PBXT_P="pbxt-${PBXT_VERSION}"
-	PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz"
-	SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )"
-
-fi
-
-# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
-# vs. built outside the dir
-if pbxt_available; then
-
-	IUSE="${IUSE} pbxt"
-	PBXT_NEWSTYLE=1
-fi
-
-if xtradb_patch_available; then
-	XTRADB_P="percona-xtradb-${XTRADB_VER}"
-	XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz"
-	XTRADB_SRC_B1="http://www.percona.com/"
-	XTRADB_SRC_B2="${XTRADB_SRC_B1}/percona-builds/"
-	XTRADB_SRC_URI1="${XTRADB_SRC_B2}/Percona-Server/Percona-Server-${XTRADB_SRC_URI_COMMON}"
-	XTRADB_SRC_URI2="${XTRADB_SRC_B2}/xtradb/${XTRADB_SRC_URI_COMMON}"
-	XTRADB_SRC_URI3="${XTRADB_SRC_B1}/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}"
-	SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} ${XTRADB_SRC_URI3} )"
-	IUSE="${IUSE} xtradb"
-fi
-
-#
-# HELPER FUNCTIONS:
-#
-
-# @FUNCTION: mysql-v2_disable_test
-# @DESCRIPTION:
-# Helper function to disable specific tests.
-mysql-v2_disable_test() {
-	${BUILD_INHERIT}_disable_test "$@"
-}
-
-# @FUNCTION: mysql-v2_configure_minimal
-# @DESCRIPTION:
-# Helper function to configure minimal build
-configure_minimal() {
-	${BUILD_INHERIT}_configure_minimal "$@"
-}
-
-# @FUNCTION: mysql-v2_configure_common
-# @DESCRIPTION:
-# Helper function to configure common builds
-configure_common() {
-	${BUILD_INHERIT}_configure_common "$@"
-}
-
-#
-# EBUILD FUNCTIONS
-#
-
-# @FUNCTION: mysql-v2_pkg_setup
-# @DESCRIPTION:
-# Perform some basic tests and tasks during pkg_setup phase:
-#   die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv"
-#   check for conflicting use flags
-#   create new user and group for mysql
-#   warn about deprecated features
-mysql-v2_pkg_setup() {
-
-	if has test ${FEATURES} ; then
-		if ! use minimal ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-			fi
-		fi
-	fi
-
-	# Check for USE flag problems in pkg_setup
-	if use static && use ssl ; then
-		M="MySQL does not support being built statically with SSL support enabled!"
-		eerror "${M}"
-		die "${M}"
-	fi
-
-	if ! mysql_version_is_at_least "5.2" \
-		&& use debug ; then
-		# Also in package.use.mask
-		die "Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51"
-	fi
-
-	if ( use cluster || use extraengine || use embedded ) \
-	&& use minimal ; then
-		M="USE flags 'cluster', 'extraengine', 'embedded' conflict with 'minimal' USE flag!"
-		eerror "${M}"
-		die "${M}"
-	fi
-
-	if xtradb_patch_available \
-	&& use xtradb \
-	&& use embedded ; then
-		M="USE flags 'xtradb' and 'embedded' conflict and cause build failures"
-		eerror "${M}"
-		die "${M}"
-	fi
-
-	# This should come after all of the die statements
-	enewgroup mysql 60 || die "problem adding 'mysql' group"
-	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
-
-	if use cluster; then
-		ewarn "Upstream has noted that the NDB cluster support in the 5.0 and"
-		ewarn "5.1 series should NOT be put into production. In the near"
-		ewarn "future, it will be disabled from building."
-	fi
-}
-
-# @FUNCTION: mysql-v2_src_unpack
-# @DESCRIPTION:
-# Unpack the source code
-mysql-v2_src_unpack() {
-
-	# Initialize the proper variables first
-	mysql_init_vars
-
-	unpack ${A}
-	# Grab the patches
-	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-2_src_unpack
-
-	mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
-}
-
-# @FUNCTION: mysql-v2_src_prepare
-# @DESCRIPTION:
-# Apply patches to the source code and remove unneeded bundled libs.
-mysql-v2_src_prepare() {
-	${BUILD_INHERIT}_src_prepare "$@"
-}
-
-# @FUNCTION: mysql-v2_src_configure
-# @DESCRIPTION:
-# Configure mysql to build the code for Gentoo respecting the use flags.
-mysql-v2_src_configure() {
-	${BUILD_INHERIT}_src_configure "$@"
-}
-
-# @FUNCTION: mysql-v2_src_compile
-# @DESCRIPTION:
-# Compile the mysql code.
-mysql-v2_src_compile() {
-	${BUILD_INHERIT}_src_compile "$@"
-}
-
-# @FUNCTION: mysql-v2_src_install
-# @DESCRIPTION:
-# Install mysql.
-mysql-v2_src_install() {
-	${BUILD_INHERIT}_src_install "$@"
-}
-
-# @FUNCTION: mysql-v2_pkg_preinst
-# @DESCRIPTION:
-# Create the user and groups for mysql - die if that fails.
-mysql-v2_pkg_preinst() {
-	enewgroup mysql 60 || die "problem adding 'mysql' group"
-	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
-}
-
-# @FUNCTION: mysql-v2_pkg_postinst
-# @DESCRIPTION:
-# Run post-installation tasks:
-#   create the dir for logfiles if non-existant
-#   touch the logfiles and secure them
-#   install scripts
-#   issue required steps for optional features
-#   issue deprecation warnings
-mysql-v2_pkg_postinst() {
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Check FEATURES="collision-protect" before removing this
-	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
-
-	# Secure the logfiles
-	touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
-	chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
-	chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
-
-	# Minimal builds don't have the MySQL server
-	if ! use minimal ; then
-		docinto "support-files"
-		for script in \
-			support-files/my-*.cnf \
-			support-files/magic \
-			support-files/ndb-config-2-node.ini
-		do
-			[[ -f "${script}" ]] \
-			&& dodoc "${script}"
-		done
-
-		docinto "scripts"
-		for script in scripts/mysql* ; do
-			[[ -f "${script}" ]] \
-			&& [[ "${script%.sh}" == "${script}" ]] \
-			&& dodoc "${script}"
-		done
-
-		einfo
-		elog "You might want to run:"
-		elog "\"emerge --config =${CATEGORY}/${PF}\""
-		elog "if this is a new install."
-		einfo
-
-		einfo
-		elog "If you are upgrading major versions, you should run the"
-		elog "mysql_upgrade tool."
-		einfo
-	fi
-
-	if pbxt_available && use pbxt ; then
-		# TODO: explain it better
-		elog "    mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';"
-		elog "    mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;"
-		elog "if, after that, you cannot start the MySQL server,"
-		elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
-		elog "use the MySQL upgrade script to restore the table"
-		elog "or execute the following SQL command:"
-		elog "    CREATE TABLE IF NOT EXISTS plugin ("
-		elog "      name char(64) binary DEFAULT '' NOT NULL,"
-		elog "      dl char(128) DEFAULT '' NOT NULL,"
-		elog "      PRIMARY KEY (name)"
-		elog "    ) CHARACTER SET utf8 COLLATE utf8_bin;"
-	fi
-
-	mysql_check_version_range "4.0 to 5.0.99.99" \
-	&& use berkdb \
-	&& elog "Berkeley DB support is deprecated and will be removed in future versions!"
-}
-
-# @FUNCTION: mysql-v2_pkg_config
-# @DESCRIPTION:
-# Configure mysql environment.
-mysql-v2_pkg_config() {
-
-	local old_MY_DATADIR="${MY_DATADIR}"
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
-
-	if built_with_use ${CATEGORY}/${PN} minimal ; then
-		die "Minimal builds do NOT include the MySQL server"
-	fi
-
-	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
-		local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
-		MY_DATADIR_s="${MY_DATADIR_s%%/}"
-		local old_MY_DATADIR_s="${ROOT}/old_MY_DATADIR}"
-		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
-
-		if [[ -d "${old_MY_DATADIR_s}" ]]; then
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
-				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
-			else
-				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
-				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
-				|| die "Moving MY_DATADIR failed"
-			fi
-		else
-			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Attempting to use ${MY_DATADIR_s}"
-			else
-				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
-				die "Configuration Failed!  Please reinstall ${CATEGORY}/${PN}"
-			fi
-		fi
-	fi
-
-	local pwd1="a"
-	local pwd2="b"
-	local maxtry=15
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${EROOT}/root/.my.cnf" ]; then
-		MYSQL_ROOT_PASSWORD="$(sed -n -e '/^password=/s,^password=,,gp' "${EROOT}/root/.my.cnf")"
-	fi
-
-	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
-		ewarn "You have already a MySQL database in place."
-		ewarn "(${ROOT}/${MY_DATADIR}/*)"
-		ewarn "Please rename or delete it if you wish to replace it."
-		die "MySQL database already exists!"
-	fi
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-
-		einfo "Please provide a password for the mysql 'root' user now, in the"
-		einfo "MYSQL_ROOT_PASSWORD env var or through the /root/.my.cnf file."
-		ewarn "Avoid [\"'\\_%] characters in the password"
-		read -rsp "    >" pwd1 ; echo
-
-		einfo "Retype the password"
-		read -rsp "    >" pwd2 ; echo
-
-		if [[ "x$pwd1" != "x$pwd2" ]] ; then
-			die "Passwords are not the same"
-		fi
-		MYSQL_ROOT_PASSWORD="${pwd1}"
-		unset pwd1 pwd2
-	fi
-
-	local options=""
-	local sqltmp="$(emktemp)"
-
-	local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
-	[[ -r "${help_tables}" ]] \
-	&& cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
-	|| touch "${TMPDIR}/fill_help_tables.sql"
-	help_tables="${TMPDIR}/fill_help_tables.sql"
-
-	pushd "${TMPDIR}" &>/dev/null
-	"${EROOT}/usr/bin/mysql_install_db" "--basedir=${EPREFIX}/usr" >"${TMPDIR}"/mysql_install_db.log 2>&1
-	if [ $? -ne 0 ]; then
-		grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
-		die "Failed to run mysql_install_db. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
-	fi
-	popd &>/dev/null
-	[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
-	|| die "MySQL databases not installed"
-	chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
-	chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
-
-	# Figure out which options we need to disable to do the setup
-	helpfile="${TMPDIR}/mysqld-help"
-	${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
-	for opt in grant-tables host-cache name-resolve networking slave-start bdb \
-		federated innodb ssl log-bin relay-log slow-query-log external-locking \
-		ndbcluster \
-		; do
-		optexp="--(skip-)?${opt}" optfull="--skip-${opt}"
-		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
-	done
-	# But some options changed names
-	egrep -sq external-locking "${helpfile}" && \
-	options="${options/skip-locking/skip-external-locking}"
-
-	# Filling timezones, see
-	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
-	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
-
-	if [[ -r "${help_tables}" ]] ; then
-		cat "${help_tables}" >> "${sqltmp}"
-	fi
-
-	einfo "Creating the mysql database and setting proper"
-	einfo "permissions on it ..."
-
-	local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
-	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
-	local mysqld="${EROOT}/usr/sbin/mysqld \
-		${options} \
-		--user=mysql \
-		--basedir=${EROOT}/usr \
-		--datadir=${ROOT}/${MY_DATADIR} \
-		--max_allowed_packet=8M \
-		--net_buffer_length=16K \
-		--default-storage-engine=MyISAM \
-		--socket=${socket} \
-		--pid-file=${pidfile}"
-	#einfo "About to start mysqld: ${mysqld}"
-	ebegin "Starting mysqld"
-	${mysqld} &
-	rc=$?
-	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
-		maxtry=$((${maxtry}-1))
-		echo -n "."
-		sleep 1
-	done
-	eend $rc
-
-	if ! [[ -S "${socket}" ]]; then
-		die "Completely failed to start up mysqld with: ${mysqld}"
-	fi
-
-	ebegin "Setting root password"
-	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
-	"${EROOT}/usr/bin/mysql" \
-		--socket=${socket} \
-		-hlocalhost \
-		-e "${sql}"
-	eend $?
-
-	ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
-	"${EROOT}/usr/bin/mysql" \
-		--socket=${socket} \
-		-hlocalhost \
-		-uroot \
-		-p"${MYSQL_ROOT_PASSWORD}" \
-		mysql < "${sqltmp}"
-	rc=$?
-	eend $?
-	[ $rc -ne 0 ] && ewarn "Failed to load zoneinfo!"
-
-	# Stop the server and cleanup
-	einfo "Stopping the server ..."
-	kill $(< "${pidfile}" )
-	rm -f "${sqltmp}"
-	wait %1
-	einfo "Done"
-}
-
-# @FUNCTION: mysql-v2_pkg_postrm
-# @DESCRIPTION:
-# Remove mysql symlinks.
-mysql-v2_pkg_postrm() {
-
-	: # mysql_lib_symlinks "${ED}"
-}

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
deleted file mode 100644
index 332ac4c..0000000
--- a/eclass/mysql.eclass
+++ /dev/null
@@ -1,1478 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.174 2012/09/10 02:07:08 ferringb Exp $
-
-# @ECLASS: mysql.eclass
-# @MAINTAINER:
-# MySQL Team <mysql-bugs@g.o>
-# Luca Longinotti <chtekk@g.o>
-# Robin H. Johnson <robbat2@g.o>
-# @AUTHOR:
-# Francesco Riosa (Retired) <vivo@g.o>
-# @BLURB: This eclass provides most of the functions for mysql ebuilds
-# @DESCRIPTION:
-# The mysql.eclass provides almost all the code to build the mysql ebuilds
-# including the src_unpack, src_prepare, src_configure, src_compile,
-# scr_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm
-# phase hooks.
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils flag-o-matic gnuconfig autotools multilib mysql_fx versionator toolchain-funcs
-
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
-if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
-	EGIT_PROJECT=mysql-extras
-	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
-	inherit git-2
-fi
-
-case "${EAPI:-0}" in
-	2 | 3 | 4 | 5)
-		EXPORT_FUNCTIONS pkg_setup \
-					src_unpack src_prepare \
-					src_configure src_compile \
-					src_install \
-					pkg_preinst pkg_postinst \
-					pkg_config pkg_postrm
-		IUSE_DEFAULT_ON='+'
-		;;
-	0 | 1)
-		EXPORT_FUNCTIONS pkg_setup \
-					src_unpack \
-					src_compile \
-					src_install \
-					pkg_preinst pkg_postinst \
-					pkg_config pkg_postrm
-		;;
-	*)
-		die "Unsupported EAPI: ${EAPI}" ;;
-esac
-
-
-# @ECLASS-VARIABLE: MYSQL_PV_MAJOR
-# @DESCRIPTION:
-# Upstream MySQL considers the first two parts of the version number to be the
-# major version. Upgrades that change major version should always run
-# mysql_upgrade.
-MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})"
-
-# Cluster is a special case...
-if [[ "${PN}" == "mysql-cluster" ]]; then
-	case $PV in
-		6.1*|7.0*|7.1*) MYSQL_PV_MAJOR=5.1 ;;
-	esac
-fi
-
-
-# @ECLASS-VARIABLE: MYSQL_VERSION_ID
-# @DESCRIPTION:
-# MYSQL_VERSION_ID will be:
-# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
-# This is an important part, because many of the choices the MySQL ebuild will do
-# depend on this variable.
-# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803"
-# We also strip off upstream's trailing letter that they use to respin tarballs
-
-MYSQL_VERSION_ID=""
-tpv="${PV%[a-z]}"
-tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
-for vatom in 0 1 2 3 ; do
-	# pad to length 2
-	tpv[${vatom}]="00${tpv[${vatom}]}"
-	MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
-done
-# strip leading "0" (otherwise it's considered an octal number by BASH)
-MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
-
-# @ECLASS-VARIABLE: MYSQL_COMMUNITY_FEATURES
-# @DESCRIPTION:
-# Specifiy if community features are available. Possible values are 1 (yes)
-# and 0 (no).
-# Community features are available in mysql-community
-# AND in the re-merged mysql-5.0.82 and newer
-if [ "${PN}" == "mysql-community" -o "${PN}" == "mariadb" ]; then
-	MYSQL_COMMUNITY_FEATURES=1
-elif [ "${PV#5.0}" != "${PV}" ] && mysql_version_is_at_least "5.0.82"; then
-	MYSQL_COMMUNITY_FEATURES=1
-elif [ "${PV#5.1}" != "${PV}" ] && mysql_version_is_at_least "5.1.28"; then
-	MYSQL_COMMUNITY_FEATURES=1
-elif [ "${PV#5.4}" != "${PV}" ] ; then
-	MYSQL_COMMUNITY_FEATURES=1
-elif [ "${PV#5.5}" != "${PV}" ] ; then
-	MYSQL_COMMUNITY_FEATURES=1
-elif [ "${PV#6}" != "${PV}" ] ; then
-	MYSQL_COMMUNITY_FEATURES=1
-elif [ "${PV#7}" != "${PV}" ] ; then
-	MYSQL_COMMUNITY_FEATURES=1
-else
-	MYSQL_COMMUNITY_FEATURES=0
-fi
-
-# @ECLASS-VARIABLE: XTRADB_VER
-# @DESCRIPTION:
-# Version of the XTRADB storage engine
-XTRADB_VER="${XTRADB_VER}"
-
-# @ECLASS-VARIABLE: PERCONA_VER
-# @DESCRIPTION:
-# Designation by PERCONA for a MySQL version to apply an XTRADB release
-PERCONA_VER="${PERCONA_VER}"
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
-		kernel_linux? ( sys-process/procps )
-		>=sys-apps/sed-4
-		>=sys-apps/texinfo-4.7-r1
-		>=sys-libs/readline-4.1
-		>=sys-libs/zlib-1.2.3"
-
-[[ "${PN}" == "mariadb" ]] \
-&& DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
-
-# Having different flavours at the same time is not a good idea
-for i in "mysql" "mysql-community" "mysql-cluster" "mariadb" ; do
-	[[ "${i}" == ${PN} ]] ||
-	DEPEND="${DEPEND} !dev-db/${i}"
-done
-
-# prefix: first need to implement something for #196294
-RDEPEND="${DEPEND}
-		!minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )
-		selinux? ( sec-policy/selinux-mysql )"
-
-DEPEND="${DEPEND}
-		virtual/yacc"
-
-if [ "${EAPI:-0}" = "2" ]; then
-	DEPEND="${DEPEND} static? ( sys-libs/ncurses[static-libs] )"
-fi
-
-# compile-time-only
-mysql_version_is_at_least "5.1" \
-|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
-
-# compile-time-only
-mysql_version_is_at_least "5.1.12" \
-&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
-
-[[ "${PN}" == "mariadb" ]] \
-&& mysql_version_is_at_least "5.2" \
-&& DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )"
-#SphinxSE is included but is not available in 5.2.4 due to a missing plug.in file
-#	sphinx? ( app-misc/sphinx )"
-
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-# For other stuff to bring us in
-PDEPEND="${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}"
-
-# Work out the default SERVER_URI correctly
-if [ -z "${SERVER_URI}" ]; then
-	[ -z "${MY_PV}" ] && MY_PV="${PV//_/-}"
-	if [ "${PN}" == "mariadb" ]; then
-		MARIA_FULL_PV="$(replace_version_separator 3 '-' ${PV})"
-		MARIA_FULL_P="${PN}-${MARIA_FULL_PV}"
-		SERVER_URI="
-		http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://ftp.rediris.es/mirror/MariaDB/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://maria.llarian.net/download/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/${MARIA_FULL_P}.tar.gz
-		http://mirrors.fe.up.pt/pub/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		http://ftp-stud.hs-esslingen.de/pub/Mirrors/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-		"
-	# The community and cluster builds are on the mirrors
-	elif [[ "${MYSQL_COMMUNITY_FEATURES}" == "1" || ${PN} == "mysql-cluster" ]] ; then
-		if [[ "${PN}" == "mysql-cluster" ]] ; then
-			URI_DIR="MySQL-Cluster"
-			URI_FILE="mysql-cluster-gpl"
-		else
-			URI_DIR="MySQL"
-			URI_FILE="mysql"
-		fi
-		URI_A="${URI_FILE}-${MY_PV}.tar.gz"
-		MIRROR_PV=$(get_version_component_range 1-2 ${PV})
-		# Recently upstream switched to an archive site, and not on mirrors
-		SERVER_URI="http://downloads.mysql.com/archives/${URI_FILE}-${MIRROR_PV}/${URI_A}
-					mirror://mysql/Downloads/${URI_DIR}-${PV%.*}/${URI_A}"
-	# The (old) enterprise source is on the primary site only
-	elif [ "${PN}" == "mysql" ]; then
-		SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${MY_PV}.tar.gz"
-	fi
-fi
-
-# Define correct SRC_URIs
-SRC_URI="${SERVER_URI}"
-
-# Gentoo patches to MySQL
-[[ ${MY_EXTRAS_VER} != live ]] \
-&& SRC_URI="${SRC_URI}
-		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
-HOMEPAGE="http://www.mysql.com/"
-if [[ "${PN}" == "mariadb" ]]; then
-	HOMEPAGE="http://askmonty.org/"
-	DESCRIPTION="MariaDB is a MySQL fork with 3rd-party patches and additional storage engines merged."
-fi
-if [[ "${PN}" == "mysql-community" ]]; then
-	DESCRIPTION="${DESCRIPTION} (obsolete, move to dev-db/mysql)"
-fi
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static test"
-
-mysql_version_is_at_least "4.1" \
-&& IUSE="${IUSE} latin1"
-
-if mysql_version_is_at_least "4.1.3" ; then
-	IUSE="${IUSE} extraengine"
-	if [[ "${PN}" != "mysql-cluster" ]] ; then
-		IUSE="${IUSE} cluster"
-	fi
-fi
-
-mysql_version_is_at_least "5.0" \
-|| IUSE="${IUSE} raid"
-
-mysql_version_is_at_least "5.0.18" \
-&& IUSE="${IUSE} max-idx-128"
-
-mysql_version_is_at_least "5.1" \
-|| IUSE="${IUSE} berkdb"
-
-[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
-&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling"
-
-[[ "${PN}" == "mariadb" ]] \
-&& IUSE="${IUSE} libevent"
-
-[[ "${PN}" == "mariadb" ]] \
-&& mysql_version_is_at_least "5.2" \
-&& IUSE="${IUSE} oqgraph"
-#SphinxSE is included but is not available in 5.2.4 due to a missing plug.in file
-#&& IUSE="${IUSE} oqgraph sphinx"
-
-# MariaDB has integrated PBXT
-# PBXT_VERSION means that we have a PBXT patch for this PV
-# PBXT was only introduced after 5.1.12
-pbxt_patch_available() {
-	[[ "${PN}" != "mariadb" ]] \
-	&& mysql_version_is_at_least "5.1.12" \
-	&& [[ -n "${PBXT_VERSION}" ]]
-	return $?
-}
-
-pbxt_available() {
-	pbxt_patch_available || [[ "${PN}" == "mariadb" ]]
-	return $?
-}
-
-# Get the percona tarball if XTRADB_VER and PERCONA_VER are both set
-# MariaDB has integrated XtraDB
-# XTRADB_VERS means that we have a XTRADB patch for this PV
-# XTRADB was only introduced after 5.1.26
-xtradb_patch_available() {
-	[[ "${PN}" != "mariadb" ]] \
-	&& mysql_version_is_at_least "5.1.26" \
-	&& [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]]
-	return $?
-}
-
-
-pbxt_patch_available \
-&& PBXT_P="pbxt-${PBXT_VERSION}" \
-&& PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \
-&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )" \
-
-# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
-# vs. built outside the dir
-pbxt_available \
-&& IUSE="${IUSE} pbxt" \
-&& mysql_version_is_at_least "5.1.40" \
-&& PBXT_NEWSTYLE=1
-
-xtradb_patch_available \
-&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \
-&& XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \
-&& XTRADB_SRC_B1="http://www.percona.com/" \
-&& XTRADB_SRC_B2="${XTRADB_SRC_B1}/percona-builds/" \
-&& XTRADB_SRC_URI1="${XTRADB_SRC_B2}/Percona-Server/Percona-Server-${XTRADB_SRC_URI_COMMON}" \
-&& XTRADB_SRC_URI2="${XTRADB_SRC_B2}/xtradb/${XTRADB_SRC_URI_COMMON}" \
-&& XTRADB_SRC_URI3="${XTRADB_SRC_B1}/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}" \
-&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} ${XTRADB_SRC_URI3} )" \
-&& IUSE="${IUSE} xtradb"
-
-#
-# HELPER FUNCTIONS:
-#
-
-# @FUNCTION: mysql_disable_test
-# @DESCRIPTION:
-# Helper function to disable specific tests.
-mysql_disable_test() {
-	local rawtestname testname testsuite reason mysql_disable_file
-	rawtestname="${1}" ; shift
-	reason="${@}"
-	ewarn "test '${rawtestname}' disabled: '${reason}'"
-
-	testsuite="${rawtestname/.*}"
-	testname="${rawtestname/*.}"
-	mysql_disable_file="${S}/mysql-test/t/disabled.def"
-	#einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
-	echo ${testname} : ${reason} >> "${mysql_disable_file}"
-
-	# ${S}/mysql-tests/t/disabled.def
-	#
-	# ${S}/mysql-tests/suite/federated/disabled.def
-	#
-	# ${S}/mysql-tests/suite/jp/t/disabled.def
-	# ${S}/mysql-tests/suite/ndb/t/disabled.def
-	# ${S}/mysql-tests/suite/rpl/t/disabled.def
-	# ${S}/mysql-tests/suite/parts/t/disabled.def
-	# ${S}/mysql-tests/suite/rpl_ndb/t/disabled.def
-	# ${S}/mysql-tests/suite/ndb_team/t/disabled.def
-	# ${S}/mysql-tests/suite/binlog/t/disabled.def
-	# ${S}/mysql-tests/suite/innodb/t/disabled.def
-	if [ -n "${testsuite}" ]; then
-		for mysql_disable_file in \
-			${S}/mysql-test/suite/${testsuite}/disabled.def  \
-			${S}/mysql-test/suite/${testsuite}/t/disabled.def  \
-			FAILED ; do
-			[ -f "${mysql_disable_file}" ] && break
-		done
-		if [ "${mysql_disabled_file}" != "FAILED" ]; then
-			echo "${testname} : ${reason}" >> "${mysql_disable_file}"
-		else
-			ewarn "Could not find testsuite disabled.def location for ${rawtestname}"
-		fi
-	fi
-}
-
-# @FUNCTION: mysql_init_vars
-# @DESCRIPTION:
-# void mysql_init_vars()
-# Initialize global variables
-# 2005-11-19 <vivo@g.o>
-mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
-	MY_LIBDIR=${MY_LIBDIR="${EPREFIX}/usr/$(get_libdir)/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-	MY_INCLUDEDIR=${MY_INCLUDEDIR="${EPREFIX}/usr/include/mysql"}
-
-	if [[ -z "${MY_DATADIR}" ]] ; then
-		MY_DATADIR=""
-		if [[ -f ${MY_SYSCONFDIR}/my.cnf ]] ; then
-			MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-			if [[ -z "${MY_DATADIR}" ]] ; then
-				MY_DATADIR=`grep ^datadir ${MY_SYSCONFDIR}/my.cnf \
-				| sed -e 's/.*=\s*//' \
-				| tail -n1`
-			fi
-		fi
-		if [[ -z "${MY_DATADIR}" ]] ; then
-			MY_DATADIR="${MY_LOCALSTATEDIR}"
-			einfo "Using default MY_DATADIR"
-		fi
-		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
-
-		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
-			if [[ -e "${MY_DATADIR}" ]] ; then
-				# If you get this and you're wondering about it, see bug #207636
-				elog "MySQL datadir found in ${MY_DATADIR}"
-				elog "A new one will not be created."
-				PREVIOUS_DATADIR="yes"
-			else
-				PREVIOUS_DATADIR="no"
-			fi
-			export PREVIOUS_DATADIR
-		fi
-	else
-		if [[ ${EBUILD_PHASE} == "config" ]]; then
-			local new_MY_DATADIR
-			new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-
-			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
-				ewarn "MySQL MY_DATADIR has changed"
-				ewarn "from ${MY_DATADIR}"
-				ewarn "to ${new_MY_DATADIR}"
-				MY_DATADIR="${new_MY_DATADIR}"
-			fi
-		fi
-	fi
-
-	if [ "${MY_SOURCEDIR:-unset}" == "unset" ]; then
-		MY_SOURCEDIR=${SERVER_URI##*/}
-		MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
-	fi
-
-	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-	export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
-	export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
-}
-
-configure_minimal() {
-	# These are things we exclude from a minimal build, please
-	# note that the server actually does get built and installed,
-	# but we then delete it before packaging.
-	local minimal_exclude_list="server embedded-server extra-tools innodb bench berkeley-db row-based-replication readline"
-
-	for i in ${minimal_exclude_list} ; do
-		myconf="${myconf} --without-${i}"
-	done
-	myconf="${myconf} --with-extra-charsets=none"
-	myconf="${myconf} --enable-local-infile"
-
-	if use static ; then
-		myconf="${myconf} --with-client-ldflags=-all-static"
-		myconf="${myconf} --disable-shared --with-pic"
-	else
-		myconf="${myconf} --enable-shared --enable-static"
-	fi
-
-	if mysql_version_is_at_least "4.1" && ! use latin1 ; then
-		myconf="${myconf} --with-charset=utf8"
-		myconf="${myconf} --with-collation=utf8_general_ci"
-	else
-		myconf="${myconf} --with-charset=latin1"
-		myconf="${myconf} --with-collation=latin1_swedish_ci"
-	fi
-}
-
-configure_common() {
-	myconf="${myconf} $(use_with big-tables)"
-	myconf="${myconf} --enable-local-infile"
-	myconf="${myconf} --with-extra-charsets=all"
-	myconf="${myconf} --with-mysqld-user=mysql"
-	myconf="${myconf} --with-server"
-	myconf="${myconf} --with-unix-socket-path=${EPREFIX}/var/run/mysqld/mysqld.sock"
-	myconf="${myconf} --without-libwrap"
-
-	if use static ; then
-		myconf="${myconf} --with-mysqld-ldflags=-all-static"
-		myconf="${myconf} --with-client-ldflags=-all-static"
-		myconf="${myconf} --disable-shared --with-pic"
-	else
-		myconf="${myconf} --enable-shared --enable-static"
-	fi
-
-	if use debug ; then
-		myconf="${myconf} --with-debug=full"
-	else
-		myconf="${myconf} --without-debug"
-		mysql_version_is_at_least "4.1.3" \
-		&& ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) \
-		&& myconf="${myconf} --without-ndb-debug"
-	fi
-
-	if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then
-		ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
-		ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-		ewarn "You MUST file bugs without these variables set."
-		myconf="${myconf} --with-charset=${MYSQL_DEFAULT_CHARSET}"
-		myconf="${myconf} --with-collation=${MYSQL_DEFAULT_COLLATION}"
-	elif mysql_version_is_at_least "4.1" && ! use latin1 ; then
-		myconf="${myconf} --with-charset=utf8"
-		myconf="${myconf} --with-collation=utf8_general_ci"
-	else
-		myconf="${myconf} --with-charset=latin1"
-		myconf="${myconf} --with-collation=latin1_swedish_ci"
-	fi
-
-	if use embedded ; then
-		myconf="${myconf} --with-embedded-privilege-control"
-		myconf="${myconf} --with-embedded-server"
-	else
-		myconf="${myconf} --without-embedded-privilege-control"
-		myconf="${myconf} --without-embedded-server"
-	fi
-
-}
-
-configure_40_41_50() {
-	myconf="${myconf} --with-zlib-dir=${EPREFIX}/usr"
-	myconf="${myconf} $(use_with perl bench)"
-	myconf="${myconf} --enable-assembler"
-	myconf="${myconf} --with-extra-tools"
-	myconf="${myconf} --with-innodb"
-	myconf="${myconf} --without-readline"
-	myconf="${myconf} $(use_with ssl openssl "${EPREFIX}/usr")"
-	mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)"
-
-	# --with-vio is not needed anymore, it's on by default and
-	# has been removed from configure
-	#  Apply to 4.x and 5.0.[0-3]
-	if use ssl ; then
-		 mysql_version_is_at_least "5.0.4" || myconf="${myconf} --with-vio"
-	fi
-
-	if mysql_version_is_at_least "5.0.60" ; then
-			if use berkdb ; then
-				elog "Berkeley DB support was disabled due to build failures"
-				elog "on multiple arches, go to a version earlier than 5.0.60"
-				elog "if you want it again. Gentoo bug #224067."
-			fi
-			myconf="${myconf} --without-berkeley-db"
-	elif use berkdb ; then
-		# The following fix is due to a bug with bdb on SPARC's. See:
-		# http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
-		# It comes down to non-64-bit safety problems.
-		if use alpha || use amd64 || use hppa || use mips || use sparc ; then
-			elog "Berkeley DB support was disabled due to compatibility issues on this arch"
-			myconf="${myconf} --without-berkeley-db"
-		else
-			myconf="${myconf} --with-berkeley-db=./bdb"
-		fi
-	else
-		myconf="${myconf} --without-berkeley-db"
-	fi
-
-	if mysql_version_is_at_least "4.1.3" ; then
-		myconf="${myconf} --with-geometry"
-		if [[ "${PN}" != "mysql-cluster" ]] ; then
-			myconf="${myconf} $(use_with cluster ndbcluster)"
-		fi
-	fi
-
-	if mysql_version_is_at_least "4.1.3" && use extraengine ; then
-		# http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
-		myconf="${myconf} --with-archive-storage-engine"
-
-		# http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
-		myconf="${myconf} --with-csv-storage-engine"
-
-		# http://dev.mysql.com/doc/mysql/en/blackhole-storage-engine.html
-		myconf="${myconf} --with-blackhole-storage-engine"
-
-		# http://dev.mysql.com/doc/mysql/en/federated-storage-engine.html
-		# http://dev.mysql.com/doc/mysql/en/federated-description.html
-		# http://dev.mysql.com/doc/mysql/en/federated-limitations.html
-		if mysql_version_is_at_least "5.0.3" ; then
-			elog "Before using the Federated storage engine, please be sure to read"
-			elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
-			myconf="${myconf} --with-federated-storage-engine"
-		fi
-	fi
-
-	if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
-		myconf="${myconf} `use_enable community community-features`"
-		if use community; then
-			myconf="${myconf} `use_enable profiling`"
-		else
-			myconf="${myconf} --disable-profiling"
-		fi
-	fi
-
-	mysql_version_is_at_least "5.0.18" \
-	&& use max-idx-128 \
-	&& myconf="${myconf} --with-max-indexes=128"
-}
-
-configure_51() {
-	# TODO: !!!! readd --without-readline
-	# the failure depend upon config/ac-macros/readline.m4 checking into
-	# readline.h instead of history.h
-	myconf="${myconf} $(use_with ssl ssl "${EPREFIX}"/usr)"
-	myconf="${myconf} --enable-assembler"
-	myconf="${myconf} --with-geometry"
-	myconf="${myconf} --with-readline"
-	myconf="${myconf} --with-zlib-dir=${EPREFIX}/usr/"
-	myconf="${myconf} --without-pstack"
-	myconf="${myconf} --with-plugindir=${EPREFIX}/usr/$(get_libdir)/mysql/plugin"
-
-	# This is an explict die here, because if we just forcibly disable it, then the
-	# user's data is not accessible.
-	use max-idx-128 && die "Bug #336027: upstream has a corruption issue with max-idx-128 presently"
-	#use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
-	if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
-		myconf="${myconf} $(use_enable community community-features)"
-		if use community; then
-			myconf="${myconf} $(use_enable profiling)"
-		else
-			myconf="${myconf} --disable-profiling"
-		fi
-	fi
-
-	# Scan for all available plugins
-	local plugins_avail="$(
-	LANG=C \
-	find "${S}" \
-		\( \
-		-name 'plug.in' \
-		-o -iname 'configure.in' \
-		-o -iname 'configure.ac' \
-		\) \
-		-print0 \
-	| xargs -0 sed -r -n \
-		-e '/^MYSQL_STORAGE_ENGINE/{
-			s~MYSQL_STORAGE_ENGINE\([[:space:]]*\[?([-_a-z0-9]+)\]?.*,~\1 ~g ;
-			s~^([^ ]+).*~\1~gp;
-		}' \
-	| tr -s '\n' ' '
-	)"
-
-	# 5.1 introduces a new way to manage storage engines (plugins)
-	# like configuration=none
-	# This base set are required, and will always be statically built.
-	local plugins_sta="csv myisam myisammrg heap"
-	local plugins_dyn=""
-	local plugins_dis="example ibmdb2i"
-
-	# These aren't actually required by the base set, but are really useful:
-	plugins_sta="${plugins_sta} archive blackhole"
-
-	# default in 5.5.4
-	if mysql_version_is_at_least "5.5.4" ; then
-		plugins_sta="${plugins_sta} partition"
-	fi
-	# Now the extras
-	if use extraengine ; then
-		# like configuration=max-no-ndb, archive and example removed in 5.1.11
-		# not added yet: ibmdb2i
-		# Not supporting as examples: example,daemon_example,ftexample
-		plugins_sta="${plugins_sta} partition"
-
-		if [[ "${PN}" != "mariadb" ]] ; then
-			elog "Before using the Federated storage engine, please be sure to read"
-			elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
-			plugins_dyn="${plugins_sta} federated"
-		else
-			elog "MariaDB includes the FederatedX engine. Be sure to read"
-			elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine"
-			plugins_dyn="${plugins_sta} federatedx"
-		fi
-	else
-		plugins_dis="${plugins_dis} partition federated"
-	fi
-
-	# Upstream specifically requests that InnoDB always be built:
-	# - innobase, innodb_plugin
-	# Build falcon if available for 6.x series.
-	for i in innobase falcon ; do
-		[ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
-	done
-	for i in innodb_plugin ; do
-		[ -e "${S}"/storage/${i} ] && plugins_dyn="${plugins_dyn} ${i}"
-	done
-
-	# like configuration=max-no-ndb
-	if ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) ; then
-		plugins_sta="${plugins_sta} ndbcluster partition"
-		plugins_dis="${plugins_dis//partition}"
-		myconf="${myconf} --with-ndb-binlog"
-	else
-		plugins_dis="${plugins_dis} ndbcluster"
-	fi
-
-	if [[ "${PN}" == "mariadb" ]] ; then
-		# In MariaDB, InnoDB is packaged in the xtradb directory, so it's not
-		# caught above.
-		# This is not optional, without it several upstream testcases fail.
-		# Also strongly recommended by upstream.
-		if [[ "${PV}" < "5.2.0" ]] ; then
-			myconf="${myconf} --with-maria-tmp-tables"
-			plugins_sta="${plugins_sta} maria"
-		else
-			myconf="${myconf} --with-aria-tmp-tables"
-			plugins_sta="${plugins_sta} aria"
-		fi
-
-		[ -e "${S}"/storage/innobase ] || [ -e "${S}"/storage/xtradb ] ||
-			die "The ${P} package doesn't provide innobase nor xtradb"
-
-		for i in innobase xtradb ; do
-			[ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
-		done
-
-		myconf="${myconf} $(use_with libevent)"
-
-		if mysql_version_is_at_least "5.2" ; then
-			#This should include sphinx, but the 5.2.4 archive forgot the plug.in file
-			#for i in oqgraph sphinx ; do
-			for i in oqgraph ; do
-				use ${i} \
-				&& plugins_dyn="${plugins_dyn} ${i}" \
-				|| plugins_dis="${plugins_dis} ${i}"
-			done
-		fi
-	fi
-
-	if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then
-		use pbxt \
-		&& plugins_dyn="${plugins_dyn} pbxt" \
-		|| plugins_dis="${plugins_dis} pbxt"
-	fi
-
-	use static && \
-	plugins_sta="${plugins_sta} ${plugins_dyn}" && \
-	plugins_dyn=""
-
-	einfo "Available plugins: ${plugins_avail}"
-	einfo "Dynamic plugins: ${plugins_dyn}"
-	einfo "Static plugins: ${plugins_sta}"
-	einfo "Disabled plugins: ${plugins_dis}"
-
-	# These are the static plugins
-	myconf="${myconf} --with-plugins=${plugins_sta// /,}"
-	# And the disabled ones
-	for i in ${plugins_dis} ; do
-		myconf="${myconf} --without-plugin-${i}"
-	done
-}
-
-pbxt_src_configure() {
-	mysql_init_vars
-
-	pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
-
-	einfo "Reconfiguring dir '${PWD}'"
-	eautoreconf
-
-	local myconf=""
-	myconf="${myconf} --with-mysql=${S} --libdir=${EPREFIX}/usr/$(get_libdir)"
-	use debug && myconf="${myconf} --with-debug=full"
-	econf ${myconf} || die "Problem configuring PBXT storage engine"
-}
-
-pbxt_src_compile() {
-
-	# Be backwards compatible for now
-	if [[ $EAPI != 2 ]]; then
-		pbxt_src_configure
-	fi
-	# TODO: is it safe/needed to use emake here ?
-	make || die "Problem making PBXT storage engine (${myconf})"
-
-	popd
-	# TODO: modify test suite for PBXT
-}
-
-pbxt_src_install() {
-	pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
-		emake install DESTDIR="${D}" || die "Failed to install PBXT"
-	popd
-}
-
-#
-# EBUILD FUNCTIONS
-#
-# @FUNCTION: mysql_pkg_setup
-# @DESCRIPTION:
-# Perform some basic tests and tasks during pkg_setup phase:
-#   die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv"
-#   check for conflicting use flags
-#   create new user and group for mysql
-#   warn about deprecated features
-mysql_pkg_setup() {
-	if has test ${FEATURES} ; then
-		if ! use minimal ; then
-			if [[ $UID -eq 0 ]]; then
-				eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-			fi
-		fi
-	fi
-
-	# bug 350844
-	case "${EAPI:-0}" in
-		0 | 1)
-			if use static && ! built_with_use sys-libs/ncurses static-libs; then
-				die "To build MySQL statically you need to enable static-libs for sys-libs/ncurses"
-			fi
-			;;
-	esac
-
-	# Check for USE flag problems in pkg_setup
-	if use static && use ssl ; then
-		M="MySQL does not support being built statically with SSL support enabled!"
-		eerror "${M}"
-		die "${M}"
-	fi
-
-	if mysql_version_is_at_least "5.1.51" \
-	   && ! mysql_version_is_at_least "5.2" \
-	   && use debug ; then
-	   # Also in package.use.mask
-	   die "Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51"
-	fi
-
-	if ! mysql_version_is_at_least "5.0" \
-	&& use raid \
-	&& use static ; then
-		eerror "USE flags 'raid' and 'static' conflict, you cannot build MySQL statically"
-		eerror "with RAID support enabled."
-		die "USE flags 'raid' and 'static' conflict!"
-	fi
-
-	if mysql_version_is_at_least "4.1.3" \
-	&& ( use cluster || use extraengine || use embedded ) \
-	&& use minimal ; then
-		M="USE flags 'cluster', 'extraengine', 'embedded' conflict with 'minimal' USE flag!"
-		eerror "${M}"
-		die "${M}"
-	fi
-
-	if mysql_version_is_at_least "5.1" \
-	&& xtradb_patch_available \
-	&& use xtradb \
-	&& use embedded ; then
-		M="USE flags 'xtradb' and 'embedded' conflict and cause build failures"
-		eerror "${M}"
-		die "${M}"
-	fi
-
-	# Bug #290570, 284946, 307251
-	# Upstream changes made us need a fairly new GCC4.
-	# But only for 5.0.8[3-6]!
-	if mysql_version_is_at_least "5.0.83"  && ! mysql_version_is_at_least 5.0.87 ; then
-		GCC_VER=$(gcc-version)
-		case ${CHOST}:${GCC_VER} in
-			*-darwin*:4.*) : ;; # bug #310615
-			*:2*|*:3*|*:4.0|*:4.1|*:4.2)
-			eerror "Some releases of MySQL required a very new GCC, and then"
-			eerror "later release relaxed that requirement again. Either pick a"
-			eerror "MySQL >=5.0.87, or use a newer GCC."
-			die "Active GCC too old!" ;;
-		esac
-	fi
-
-	# This should come after all of the die statements
-	enewgroup mysql 60 || die "problem adding 'mysql' group"
-	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
-
-	mysql_check_version_range "4.0 to 5.0.99.99" \
-	&& use berkdb \
-	&& elog "Berkeley DB support is deprecated and will be removed in future versions!"
-
-	if [ "${PN}" != "mysql-cluster" ] && use cluster; then
-		ewarn "Upstream has noted that the NDB cluster support in the 5.0 and"
-		ewarn "5.1 series should NOT be put into production. In the near"
-		ewarn "future, it will be disabled from building."
-		ewarn ""
-		ewarn "If you need NDB support, you should instead move to the new"
-		ewarn "mysql-cluster package that represents that upstream NDB"
-		ewarn "development."
-	fi
-}
-
-# @FUNCTION: mysql_src_unpack
-# @DESCRIPTION:
-# Unpack the source code and call mysql_src_prepare for EAPI < 2.
-mysql_src_unpack() {
-	# Initialize the proper variables first
-	mysql_init_vars
-
-	unpack ${A}
-	# Grab the patches
-	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
-
-	mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
-
-	# Be backwards compatible for now
-	case ${EAPI:-0} in
-        	2) : ;;
-        	0 | 1) mysql_src_prepare ;;
-	esac
-}
-
-# @FUNCTION: mysql_src_prepare
-# @DESCRIPTION:
-# Apply patches to the source code and remove unneeded bundled libs.
-mysql_src_prepare() {
-	cd "${S}"
-
-	# Apply the patches for this MySQL version
-	EPATCH_SUFFIX="patch"
-	mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
-	# Clean out old items
-	rm -f "${EPATCH_SOURCE}"/*
-	# Now link in right patches
-	mysql_mv_patches
-	# And apply
-	epatch
-
-	# last -fPIC fixup, per bug #305873
-	i="${S}"/storage/innodb_plugin/plug.in
-	[ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
-
-	# Additional checks, remove bundled zlib (Cluster needs this, for static
-	# memory management in zlib, leave available for Cluster)
-	if [[ "${PN}" != "mysql-cluster" ]] ; then
-		rm -f "${S}/zlib/"*.[ch]
-		sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
-	fi
-	rm -f "scripts/mysqlbug"
-
-	# Make charsets install in the right place
-	find . -name 'Makefile.am' \
-		-exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
-
-	if mysql_version_is_at_least "4.1" ; then
-		# Remove what needs to be recreated, so we're sure it's actually done
-		einfo "Cleaning up old buildscript files"
-		find . -name Makefile \
-			-o -name Makefile.in \
-			-o -name configure \
-			-exec rm -f {} \;
-		rm -f "ltmain.sh"
-		rm -f "scripts/mysqlbug"
-	fi
-
-	local rebuilddirlist d
-
-	if xtradb_patch_available && use xtradb ; then
-		einfo "Adding storage engine: Percona XtraDB (replacing InnoDB)"
-		pushd "${S}"/storage >/dev/null
-		i="innobase"
-		o="${WORKDIR}/storage-${i}.mysql-upstream"
-		# Have we been here already?
-		[ -d "${o}" ] && rm -f "${i}"
-		# Or maybe we haven't
-		[ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}"
-		cp -ral "${WORKDIR}/${XTRADB_P}" "${i}"
-		popd >/dev/null
-	fi
-
-	if pbxt_patch_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then
-		einfo "Adding storage engine: PBXT"
-		pushd "${S}"/storage >/dev/null
-		i='pbxt'
-		[ -d "${i}" ] && rm -rf "${i}"
-		cp -ral "${WORKDIR}/${PBXT_P}" "${i}"
-		popd >/dev/null
-	fi
-
-	if mysql_version_is_at_least "5.1.12" ; then
-		rebuilddirlist="."
-		# This does not seem to be needed presently. robbat2 2010/02/23
-		#einfo "Updating innobase cmake"
-		## TODO: check this with a cmake expert
-		#cmake \
-		#	-DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
-		#	-DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
-		#	"storage/innobase"
-	else
-		rebuilddirlist=". innobase"
-	fi
-
-	for d in ${rebuilddirlist} ; do
-		einfo "Reconfiguring dir '${d}'"
-		pushd "${d}" &>/dev/null
-		eautoreconf
-		popd &>/dev/null
-	done
-
-	if mysql_check_version_range "4.1 to 5.0.99.99" \
-	&& use berkdb ; then
-		einfo "Fixing up berkdb buildsystem"
-		[[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
-		cp -f "${EPREFIX}/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
-		|| die "Could not copy libtool.m4 to bdb/dist/"
-		#These files exist only with libtool-2*, and need to be included.
-		if [ -f ${EPREFIX}'/usr/share/aclocal/ltsugar.m4' ]; then
-			cat "${EPREFIX}/usr/share/aclocal/ltsugar.m4" >>  "bdb/dist/aclocal/libtool.ac"
-			cat "${EPREFIX}/usr/share/aclocal/ltversion.m4" >>  "bdb/dist/aclocal/libtool.ac"
-			cat "${EPREFIX}/usr/share/aclocal/lt~obsolete.m4" >>  "bdb/dist/aclocal/libtool.ac"
-			cat "${EPREFIX}/usr/share/aclocal/ltoptions.m4" >>  "bdb/dist/aclocal/libtool.ac"
-		fi
-		pushd "bdb/dist" &>/dev/null
-		sh s_all \
-		|| die "Failed bdb reconfigure"
-		popd &>/dev/null
-	fi
-}
-
-# @FUNCTION: mysql_src_configure
-# @DESCRIPTION:
-# Configure mysql to build the code for Gentoo respecting the use flags.
-mysql_src_configure() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# $myconf is modified by the configure_* functions
-	local myconf=""
-
-	if use minimal ; then
-		configure_minimal
-	else
-		configure_common
-		if mysql_version_is_at_least "5.1.10" ; then
-			configure_51
-		else
-			configure_40_41_50
-		fi
-	fi
-
-	# Bug #114895, bug #110149
-	filter-flags "-O" "-O[01]"
-
-	# glib-2.3.2_pre fix, bug #16496
-	append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
-
-	# As discovered by bug #246652, doing a double-level of SSP causes NDB to
-	# fail badly during cluster startup.
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		filter-flags "-fstack-protector-all"
-	fi
-
-	CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
-	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
-	mysql_version_is_at_least "5.0" \
-	&& CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
-	export CXXFLAGS
-
-	# bug #283926, with GCC4.4, this is required to get correct behavior.
-	append-flags -fno-strict-aliasing
-
-	# bug #335185, #335995, with >= GCC4.3.3 on x86 only, omit-frame-pointer
-	# causes a mis-compile.
-	# Upstream bugs:
-	# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38562
-	# http://bugs.mysql.com/bug.php?id=45205
-	use x86 && version_is_at_least "4.3.3" "$(gcc-fullversion)" && \
-		append-flags -fno-omit-frame-pointer && \
-		filter-flags -fomit-frame-pointer
-
-	econf \
-		--libexecdir="${EPREFIX}"/usr/sbin \
-		--sysconfdir=${MY_SYSCONFDIR} \
-		--localstatedir=${MY_LOCALSTATEDIR} \
-		--sharedstatedir=${MY_SHAREDSTATEDIR} \
-		--libdir=${MY_LIBDIR} \
-		--includedir=${MY_INCLUDEDIR} \
-		--with-low-memory \
-		--with-client-ldflags=-lstdc++ \
-		--enable-thread-safe-client \
-		--with-comment="Gentoo Linux ${PF}" \
-		--without-docs \
-		--with-LIBDIR="$(get_libdir)" \
-		${myconf} || die "econf failed"
-
-	# TODO: Move this before autoreconf !!!
-	find . -type f -name Makefile -print0 \
-	| xargs -0 -n100 sed -i \
-	-e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|'
-
-	if [[ $EAPI == 2 ]] && [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
-		pbxt_patch_available && use pbxt && pbxt_src_configure
-	fi
-}
-
-# @FUNCTION: mysql_src_compile
-# @DESCRIPTION:
-# Compile the mysql code.
-mysql_src_compile() {
-	# Be backwards compatible for now
-	case ${EAPI:-0} in
-		2) : ;;
-		0 | 1) mysql_src_configure ;;
-	esac
-
-	emake || die "emake failed"
-
-	if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
-		pbxt_patch_available && use pbxt && pbxt_src_compile
-	fi
-}
-
-# @FUNCTION: mysql_src_install
-# @DESCRIPTION:
-# Install mysql.
-mysql_src_install() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	emake install \
-		DESTDIR="${D}" \
-		benchdir_root=${MY_SHAREDSTATEDIR} \
-		testroot="${MY_SHAREDSTATEDIR}" \
-		|| die "emake install failed"
-
-	if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
-		pbxt_patch_available && use pbxt && pbxt_src_install
-	fi
-
-	# Convenience links
-	einfo "Making Convenience links for mysqlcheck multi-call binary"
-	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
-	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
-	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
-
-	# Various junk (my-*.cnf moved elsewhere)
-	einfo "Removing duplicate /usr/share/mysql files"
-	rm -Rf "${ED}/usr/share/info"
-	for removeme in  "mysql-log-rotate" mysql.server* \
-		binary-configure* my-*.cnf mi_test_all*
-	do
-		rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme}
-	done
-
-	# Clean up stuff for a minimal build
-	if use minimal ; then
-		einfo "Remove all extra content for minimal build"
-		rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
-		rm -f "${ED}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
-		rm -f "${ED}/usr/sbin/mysqld"
-		rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
-	fi
-
-	# Unless they explicitly specific USE=test, then do not install the
-	# testsuite. It DOES have a use to be installed, esp. when you want to do a
-	# validation of your database configuration after tuning it.
-	if use !test ; then
-		rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
-	fi
-
-	# Configuration stuff
-	case ${MYSQL_PV_MAJOR} in
-		3*|4.0) mysql_mycnf_version="4.0" ;;
-		4.[1-9]|5.0) mysql_mycnf_version="4.1" ;;
-		5.[1-9]|6*|7*) mysql_mycnf_version="5.1" ;;
-	esac
-	einfo "Building default my.cnf (${mysql_mycnf_version})"
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-	doins scripts/mysqlaccess.conf
-	mycnf_src="my.cnf-${mysql_mycnf_version}"
-	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-		-e "s!/tmp!${EPREFIX}/tmp!" \
-		-e "s!/usr!${EPREFIX}/usr!" \
-		-e "s!= /var!= ${EPREFIX}/var!" \
-		"${FILESDIR}/${mycnf_src}" \
-		> "${TMPDIR}/my.cnf.ok"
-	use prefix && sed -i -e '/^user[ 	]*= mysql$/d' "${TMPDIR}/my.cnf.ok"
-	if use latin1 ; then
-		sed -i \
-			-e "/character-set/s|utf8|latin1|g" \
-			"${TMPDIR}/my.cnf.ok"
-	fi
-	newins "${TMPDIR}/my.cnf.ok" my.cnf
-
-	# Minimal builds don't have the MySQL server
-	if ! use minimal ; then
-		einfo "Creating initial directories"
-		# Empty directories ...
-		diropts "-m0750"
-		if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
-			dodir "${MY_DATADIR#${EPREFIX}}"
-			keepdir "${MY_DATADIR#${EPREFIX}}"
-			chown -R mysql:mysql "${D}/${MY_DATADIR}"
-		fi
-
-		diropts "-m0755"
-		for folder in "${MY_LOGDIR#${EPREFIX}}" "/var/run/mysqld" ; do
-			dodir "${folder}"
-			keepdir "${folder}"
-			chown -R mysql:mysql "${ED}/${folder}"
-		done
-	fi
-
-	# Docs
-	einfo "Installing docs"
-	for i in README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE ; do
-		[[ -f "$i" ]] && dodoc "$i"
-	done
-	doinfo "${S}"/Docs/mysql.info
-
-	# Minimal builds don't have the MySQL server
-	if ! use minimal ; then
-		einfo "Including support files and sample configurations"
-		docinto "support-files"
-		for script in \
-			"${S}"/support-files/my-*.cnf \
-			"${S}"/support-files/magic \
-			"${S}"/support-files/ndb-config-2-node.ini
-		do
-			[[ -f "$script" ]] && dodoc "${script}"
-		done
-
-		docinto "scripts"
-		for script in "${S}"/scripts/mysql* ; do
-			[[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
-		done
-
-	fi
-
-	mysql_lib_symlinks "${ED}"
-}
-
-# @FUNCTION: mysql_pkg_preinst
-# @DESCRIPTION:
-# Create the user and groups for mysql - die if that fails.
-mysql_pkg_preinst() {
-	enewgroup mysql 60 || die "problem adding 'mysql' group"
-	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
-}
-
-# @FUNCTION: mysql_pkg_postinst
-# @DESCRIPTION:
-# Run post-installation tasks:
-#   create the dir for logfiles if non-existant
-#   touch the logfiles and secure them
-#   install scripts
-#   issue required steps for optional features
-#   issue deprecation warnings
-mysql_pkg_postinst() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Check FEATURES="collision-protect" before removing this
-	[[ -d "${EROOT}/var/log/mysql" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
-
-	# Secure the logfiles
-	touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
-	chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
-	chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
-
-	# Minimal builds don't have the MySQL server
-	if ! use minimal ; then
-		docinto "support-files"
-		for script in \
-			support-files/my-*.cnf \
-			support-files/magic \
-			support-files/ndb-config-2-node.ini
-		do
-			[[ -f "${script}" ]] \
-			&& dodoc "${script}"
-		done
-
-		docinto "scripts"
-		for script in scripts/mysql* ; do
-			[[ -f "${script}" ]] \
-			&& [[ "${script%.sh}" == "${script}" ]] \
-			&& dodoc "${script}"
-		done
-
-		einfo
-		elog "You might want to run:"
-		elog "\"emerge --config =${CATEGORY}/${PF}\""
-		elog "if this is a new install."
-		einfo
-
-		einfo
-		elog "If you are upgrading major versions, you should run the"
-		elog "mysql_upgrade tool."
-		einfo
-	fi
-
-	if pbxt_available && use pbxt ; then
-		# TODO: explain it better
-		elog "    mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';"
-		elog "    mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;"
-		elog "if, after that, you cannot start the MySQL server,"
-		elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
-		elog "use the MySQL upgrade script to restore the table"
-		elog "or execute the following SQL command:"
-		elog "    CREATE TABLE IF NOT EXISTS plugin ("
-		elog "      name char(64) binary DEFAULT '' NOT NULL,"
-		elog "      dl char(128) DEFAULT '' NOT NULL,"
-		elog "      PRIMARY KEY (name)"
-		elog "    ) CHARACTER SET utf8 COLLATE utf8_bin;"
-	fi
-
-	mysql_check_version_range "4.0 to 5.0.99.99" \
-	&& use berkdb \
-	&& elog "Berkeley DB support is deprecated and will be removed in future versions!"
-}
-
-# @FUNCTION: mysql_pkg_config
-# @DESCRIPTION:
-# Configure mysql environment.
-mysql_pkg_config() {
-	local old_MY_DATADIR="${MY_DATADIR}"
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
-
-	if built_with_use ${CATEGORY}/${PN} minimal ; then
-		die "Minimal builds do NOT include the MySQL server"
-	fi
-
-	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
-		local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
-		MY_DATADIR_s="${MY_DATADIR_s%%/}"
-		local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
-		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
-
-		if [[ -d "${old_MY_DATADIR_s}" ]]; then
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
-				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
-			else
-				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
-				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
-				|| die "Moving MY_DATADIR failed"
-			fi
-		else
-			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Attempting to use ${MY_DATADIR_s}"
-			else
-				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
-				die "Configuration Failed!  Please reinstall ${CATEGORY}/${PN}"
-			fi
-		fi
-	fi
-
-	local pwd1="a"
-	local pwd2="b"
-	local maxtry=15
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${EROOT}/root/.my.cnf" ]; then
-		MYSQL_ROOT_PASSWORD="$(sed -n -e '/^password=/s,^password=,,gp' "${EROOT}/root/.my.cnf")"
-	fi
-
-	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
-		ewarn "You have already a MySQL database in place."
-		ewarn "(${ROOT}/${MY_DATADIR}/*)"
-		ewarn "Please rename or delete it if you wish to replace it."
-		die "MySQL database already exists!"
-	fi
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-
-		einfo "Please provide a password for the mysql 'root' user now, in the"
-		einfo "MYSQL_ROOT_PASSWORD env var or through the /root/.my.cnf file."
-		ewarn "Avoid [\"'\\_%] characters in the password"
-		read -rsp "    >" pwd1 ; echo
-
-		einfo "Retype the password"
-		read -rsp "    >" pwd2 ; echo
-
-		if [[ "x$pwd1" != "x$pwd2" ]] ; then
-			die "Passwords are not the same"
-		fi
-		MYSQL_ROOT_PASSWORD="${pwd1}"
-		unset pwd1 pwd2
-	fi
-
-	local options=""
-	local sqltmp="$(emktemp)"
-
-	local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
-	[[ -r "${help_tables}" ]] \
-	&& cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
-	|| touch "${TMPDIR}/fill_help_tables.sql"
-	help_tables="${TMPDIR}/fill_help_tables.sql"
-
-	pushd "${TMPDIR}" &>/dev/null
-	"${EROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>&1
-	if [ $? -ne 0 ]; then
-		grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
-		die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
-	fi
-	popd &>/dev/null
-	[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
-	|| die "MySQL databases not installed"
-	chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
-	chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
-
-	# Figure out which options we need to disable to do the setup
-	helpfile="${TMPDIR}/mysqld-help"
-	${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
-	for opt in grant-tables host-cache name-resolve networking slave-start bdb \
-		federated innodb ssl log-bin relay-log slow-query-log external-locking \
-		ndbcluster \
-		; do
-		optexp="--(skip-)?${opt}" optfull="--skip-${opt}"
-		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
-	done
-	# But some options changed names
-	egrep -sq external-locking "${helpfile}" && \
-	options="${options/skip-locking/skip-external-locking}"
-
-	if mysql_version_is_at_least "4.1.3" ; then
-		# Filling timezones, see
-		# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
-		"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
-
-		if [[ -r "${help_tables}" ]] ; then
-			cat "${help_tables}" >> "${sqltmp}"
-		fi
-	fi
-
-	einfo "Creating the mysql database and setting proper"
-	einfo "permissions on it ..."
-
-	use prefix || options="${options} --user=mysql"
-
-	local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
-	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
-	local mysqld="${EROOT}/usr/sbin/mysqld \
-		${options} \
-		--user=mysql \
-		--basedir=${EROOT}/usr \
-		--datadir=${ROOT}/${MY_DATADIR} \
-		--max_allowed_packet=8M \
-		--net_buffer_length=16K \
-		--default-storage-engine=MyISAM \
-		--socket=${socket} \
-		--pid-file=${pidfile}"
-	#einfo "About to start mysqld: ${mysqld}"
-	ebegin "Starting mysqld"
-	${mysqld} &
-	rc=$?
-	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
-		maxtry=$((${maxtry}-1))
-		echo -n "."
-		sleep 1
-	done
-	eend $rc
-
-	if ! [[ -S "${socket}" ]]; then
-		die "Completely failed to start up mysqld with: ${mysqld}"
-	fi
-
-	ebegin "Setting root password"
-	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
-	"${EROOT}/usr/bin/mysql" \
-		--socket=${socket} \
-		-hlocalhost \
-		-e "${sql}"
-	eend $?
-
-	ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
-	"${EROOT}/usr/bin/mysql" \
-		--socket=${socket} \
-		-hlocalhost \
-		-uroot \
-		-p"${MYSQL_ROOT_PASSWORD}" \
-		mysql < "${sqltmp}"
-	rc=$?
-	eend $?
-	[ $rc -ne 0 ] && ewarn "Failed to load zoneinfo!"
-
-	# Stop the server and cleanup
-	einfo "Stopping the server ..."
-	kill $(< "${pidfile}" )
-	rm -f "${sqltmp}"
-	wait %1
-	einfo "Done"
-}
-
-# @FUNCTION: mysql_pkg_postrm
-# @DESCRIPTION:
-# Remove mysql symlinks.
-mysql_pkg_postrm() {
-	: # mysql_lib_symlinks "${ED}"
-}

diff --git a/eclass/obs-service.eclass b/eclass/obs-service.eclass
deleted file mode 100644
index f3384b8..0000000
--- a/eclass/obs-service.eclass
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/obs-service.eclass,v 1.3 2012/08/17 13:04:25 scarabeus Exp $
-
-# @ECLASS: obs-service.eclass
-# @MAINTAINER:
-# suse@g.o
-# @BLURB: Reduces code duplication in the Open Build Service services.
-# @DESCRIPTION:
-# This eclass makes it easier to package Open Build Service services. Based on
-# provided information it will set all needed variables and takes care of
-# installation.
-#
-# @EXAMPLE:
-# Typical ebuild using obs-service.eclass:
-#
-# @CODE
-# EAPI=4
-#
-# inherit obs-service
-#
-# KEYWORDS=""
-#
-# DEPEND=""
-# RDEPEND="${DEPEND}"
-#
-# @CODE
-
-# @ECLASS-VARIABLE: OBS_SERVICE_NAME
-# @DESCRIPTION:
-# Name of the service. If not set, it is taken from ${PN}.
-
-# @ECLASS-VARIABLE: OPENSUSE_RELEASE
-# @DESCRIPTION:
-# From which stable openSUSE realease to take a package.
-
-# @ECLASS-VARIABLE: ADDITIONAL_FILES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# If any additional files are needed.
-
-case "${EAPI:-0}" in
-	4|5) : ;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-HOMEPAGE="http://en.opensuse.org/openSUSE:OSC"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-RDEPEND="dev-util/osc"
-
-[[ -n ${OBS_SERVICE_NAME} ]] || OBS_SERVICE_NAME=${PN/obs-service-/}
-[[ -n ${OPENSUSE_RELEASE} ]] || OBS_PROJECT="openSUSE:Tools"
-
-DESCRIPTION="Open Build Service client module - ${OBS_SERVICE_NAME} service"
-OBS_PACKAGE="obs-service-${OBS_SERVICE_NAME}"
-
-inherit obs-download
-
-SRC_URI="${OBS_URI}/${OBS_SERVICE_NAME}"
-SRC_URI+=" ${OBS_URI}/${OBS_SERVICE_NAME}.service"
-
-for i in ${ADDITIONAL_FILES}; do
-	SRC_URI+=" ${OBS_URI}/${i}"
-done
-
-# @FUNCTION: obs-service_src_unpack
-# @DESCRIPTION:
-# Just copy files. Files are not compressed.
-obs-service_src_unpack() {
-	debug-print-function ${FUNCNAME} "$@"
-	cd "${DISTDIR}"
-	mkdir -p "${S}"
-	cp ${A} "${S}"
-}
-
-# @FUNCTION: obs-service_src_prepare
-# @DESCRIPTION:
-# Replaces all /usr/lib/build directories with /usr/share/suse-build to reflect
-# where suse-build is installed in Gentoo.
-obs-service_src_prepare() {
-	debug-print-function ${FUNCNAME} "$@"
-	debug-print "Replacing all paths to find suse-build in Gentoo"
-	find "${S}" -type f -exec \
-		sed -i 's|/usr/lib/build|/usr/share/suse-build|g' {} +
-}
-
-# @FUNCTION: obs-service_src_install
-# @DESCRIPTION:
-# Does the installation of the downloaded files.
-obs-service_src_install() {
-	debug-print-function ${FUNCNAME} "$@"
-	debug-print "Installing service \"${OBS_SERVICE_NAME}\""
-	exeinto /usr/lib/obs/service
-	doexe "${S}"/${OBS_SERVICE_NAME}
-	insinto /usr/lib/obs/service
-	doins "${S}"/${OBS_SERVICE_NAME}.service
-	if [[ -n ${ADDITIONAL_FILES} ]]; then
-		debug-print "Installing following additional files:"
-		debug-print "	${ADDITIONAL_FILES}"
-		exeinto /usr/lib/obs/service/${OBS_SERVICE_NAME}.files
-		for i in ${ADDITIONAL_FILES}; do
-			doexe "${S}"/${i}
-		done
-	fi
-}
-
-EXPORT_FUNCTIONS src_install src_prepare src_unpack

diff --git a/eclass/office-ext.eclass b/eclass/office-ext.eclass
deleted file mode 100644
index c10b7a9..0000000
--- a/eclass/office-ext.eclass
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/office-ext.eclass,v 1.6 2012/06/08 03:36:09 vapier Exp $
-
-# @ECLASS: office-ext.eclass
-# @MAINTAINER:
-# The office team <openoffice@g.o>
-# @AUTHOR:
-# Tomáš Chvátal <scarabeus@g.o>
-# @BLURB: Eclass for installing libreoffice/openoffice extensions
-# @DESCRIPTION:
-# Eclass for easing maitenance of libreoffice/openoffice extensions.
-
-case "${EAPI:-0}" in
-	4|5) OEXT_EXPORTED_FUNCTIONS="src_unpack src_install pkg_postinst pkg_prerm" ;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-inherit eutils multilib
-
-UNOPKG_BINARY="${EPREFIX}/usr/bin/unopkg"
-
-# @ECLASS-VARIABLE: OO_EXTENSIONS
-# @REQUIRED
-# @DESCRIPTION:
-# Array containing list of extensions to install.
-[[ -z ${OO_EXTENSIONS} ]] && die "OO_EXTENSIONS variable is unset."
-if [[ "$(declare -p OO_EXTENSIONS 2>/dev/null 2>&1)" != "declare -a"* ]]; then
-	die "OO_EXTENSIONS variable is not an array."
-fi
-
-DEPEND="virtual/ooo"
-RDEPEND="virtual/ooo"
-
-# Most projects actually do not provide any workdir and we do not unpack the
-# .oxt file at all.
-S="${WORKDIR}"
-
-# @FUNCTION: office-ext_src_unpack
-# @DESCRIPTION:
-# Flush the cache after removal of an extension.
-office-ext_src_unpack() {
-	debug-print-function ${FUNCNAME} "$@"
-	local i
-
-	default
-
-	for i in ${OO_EXTENSIONS[@]}; do
-		# Copy only if the oxt is present, sometimes they are in tarballs
-		# so we want to fail only when we do need to do the cp.
-		if [[ -f "${DISTDIR}/${i}" ]] ; then
-			debug-print "${FUNCNAME}: cp -v \"${DISTDIR}/${i}\" \"${S}\""
-			cp -v "${DISTDIR}/${i}" "${S}" || die
-		fi
-	done
-}
-
-# @FUNCTION: office-ext_flush_unopkg_cache
-# @DESCRIPTION:
-# Flush the cache after removal of an extension.
-office-ext_flush_unopkg_cache() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	debug-print "${FUNCNAME}: ${UNOPKG_BINARY} list --shared > /dev/null"
-	${UNOPKG_BINARY} list --shared > /dev/null
-}
-
-# @FUNCTION: office-ext_get_implementation
-# @DESCRIPTION:
-# Determine the implementation we are building against.
-office-ext_get_implementation() {
-	debug-print-function ${FUNCNAME} "$@"
-	local implementations=(
-		"libreoffice"
-		"openoffice"
-	)
-	local i
-
-	for i in "${implementations[@]}"; do
-		if [[ -d "${EPREFIX}/usr/$(get_libdir)/${i}" ]]; then
-			debug-print "${FUNCNAME}: Determined implementation is: \"${EPREFIX}/usr/$(get_libdir)/${i}\""
-			echo "${EPREFIX}/usr/$(get_libdir)/${i}"
-			return
-		fi
-	done
-
-	die "Unable to determine libreoffice/openoffice implementation!"
-}
-
-# @FUNCTION: office-ext_add_extension
-# @DESCRIPTION:
-# Install the extension into the libreoffice/openoffice.
-office-ext_add_extension() {
-	debug-print-function ${FUNCNAME} "$@"
-	local ext=$1
-	local tmpdir=$(mktemp -d --tmpdir="${T}")
-
-	debug-print "${FUNCNAME}: ${UNOPKG_BINARY} add --shared \"${ext}\""
-	ebegin "Adding office extension: \"${ext}\""
-	${UNOPKG_BINARY} add --suppress-license \
-		--shared "${ext}" \
-		"-env:UserInstallation=file:///${tmpdir}" \
-		"-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
-	eend $?
-	rm -rf "${tmpdir}"
-}
-
-# @FUNCTION: office-ext_remove_extension
-# @DESCRIPTION:
-# Remove the extension from the libreoffice/openoffice.
-office-ext_remove_extension() {
-	debug-print-function ${FUNCNAME} "$@"
-	local ext=$1
-	local tmpdir=$(mktemp -d --tmpdir="${T}")
-
-	debug-print "${FUNCNAME}: ${UNOPKG_BINARY} remove --shared \"${ext}\""
-	ebegin "Removing office extension: \"${ext}\""
-	${UNOPKG_BINARY} remove --suppress-license \
-		--shared "${ext}" \
-		"-env:UserInstallation=file:///${tmpdir}" \
-		"-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
-	eend $?
-	office-ext_flush_unopkg_cache
-	rm -rf "${tmpdir}"
-}
-
-# @FUNCTION: office-ext_src_install
-# @DESCRIPTION:
-# Install the extension source to the proper location.
-office-ext_src_install() {
-	debug-print-function ${FUNCNAME} "$@"
-	debug-print "Extensions: ${OO_EXTENSIONS[@]}"
-	local i
-
-	# subshell to not pollute rest of the env with the insinto redefinition
-	(
-		dodir $(office-ext_get_implementation)/share/extension/install/
-		insinto $(office-ext_get_implementation)/share/extension/install/
-		for i in ${OO_EXTENSIONS[@]}; do
-			doins "${i}"
-		done
-	)
-
-	einfo "Remember that if you replace your office implementation,"
-	einfo "you need to recompile all the extensions."
-	einfo "Your current implementation location is: "
-	einfo "    $(office-ext_get_implementation)"
-}
-
-# @FUNCTION: office-ext_pkg_postinst
-# @DESCRIPTION:
-# Add the extensions to the libreoffice/openoffice.
-office-ext_pkg_postinst() {
-	debug-print-function ${FUNCNAME} "$@"
-	debug-print "Extensions: ${OO_EXTENSIONS[@]}"
-	local i
-
-	for i in ${OO_EXTENSIONS[@]}; do
-		office-ext_add_extension "$(office-ext_get_implementation)/share/extension/install/${i}"
-	done
-
-}
-
-# @FUNCTION: office-ext_pkg_prerm
-# @DESCRIPTION:
-# Remove the extensions from the libreoffice/openoffice.
-office-ext_pkg_prerm() {
-	debug-print-function ${FUNCNAME} "$@"
-	debug-print "Extensions: ${OO_EXTENSIONS[@]}"
-	local i
-
-	for i in ${OO_EXTENSIONS[@]}; do
-		office-ext_remove_extension "${i}"
-	done
-}
-
-EXPORT_FUNCTIONS ${OEXT_EXPORTED_FUNCTIONS}
-unset OEXT_EXPORTED_FUNCTIONS

diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index 16b23bb..8df7b05 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.134 2012/09/15 16:16:53 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.135 2012/09/27 16:35:41 axs Exp $
 
 # @ECLASS: perl-module.eclass
 # @MAINTAINER:
@@ -35,7 +35,7 @@ case "${EAPI:-0}" in
 					DEPEND="dev-lang/perl:=[-build]"
 					;;
 				*)
-					DEPEND="dev-lang/perl:*[-build]"
+					DEPEND="dev-lang/perl[-build]"
 					;;
 				esac
 				;;

diff --git a/eclass/php-ext-source-r2.eclass b/eclass/php-ext-source-r2.eclass
deleted file mode 100644
index f734537..0000000
--- a/eclass/php-ext-source-r2.eclass
+++ /dev/null
@@ -1,372 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.29 2012/08/22 15:06:20 olemarkus Exp $
-
-# @ECLASS: php-ext-source-r2.eclass
-# @MAINTAINER:
-# Gentoo PHP team <php-bugs@g.o>
-# @AUTHOR:
-# Author: Tal Peer <coredumb@g.o>
-# Author: Stuart Herbert <stuart@g.o>
-# Author: Luca Longinotti <chtekk@g.o>
-# Author: Jakub Moc <jakub@g.o> (documentation)
-# Author: Ole Markus With <olemarkus@g.o>
-# @BLURB: A unified interface for compiling and installing standalone PHP extensions.
-# @DESCRIPTION:
-# This eclass provides a unified interface for compiling and installing standalone
-# PHP extensions (modules).
-
-inherit flag-o-matic autotools multilib
-
-EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install
-
-DEPEND=">=sys-devel/m4-1.4.3
-		>=sys-devel/libtool-1.5.18"
-RDEPEND=""
-
-# Because of USE deps, we require at least EAPI 2
-case ${EAPI} in
-	2|3|4|5) ;;
-	*)
-		die "php-ext-source-r2 is not compatible with EAPI=${EAPI}"
-esac
-
-# @ECLASS-VARIABLE: PHP_EXT_NAME
-# @DESCRIPTION:
-# The extension name. This must be set, otherwise the eclass dies.
-# Only automagically set by php-ext-pecl-r2.eclass, so unless your ebuild
-# inherits that eclass, you must set this manually before inherit.
-[[ -z "${PHP_EXT_NAME}" ]] && die "No module name specified for the php-ext-source-r2 eclass"
-
-# @ECLASS-VARIABLE: PHP_EXT_INI
-# @DESCRIPTION:
-# Controls whether or not to add a line to php.ini for the extension.
-# Defaults to "yes" and should not be changed in most cases.
-[[ -z "${PHP_EXT_INI}" ]] && PHP_EXT_INI="yes"
-
-# @ECLASS-VARIABLE: PHP_EXT_ZENDEXT
-# @DESCRIPTION:
-# Controls whether the extension is a ZendEngine extension or not.
-# Defaults to "no" and if you don't know what is it, you don't need it.
-[[ -z "${PHP_EXT_ZENDEXT}" ]] && PHP_EXT_ZENDEXT="no"
-
-# @ECLASS-VARIABLE: USE_PHP
-# @DESCRIPTION:
-# Lists the PHP slots compatibile the extension is compatibile with
-[[ -z "${USE_PHP}" ]] && USE_PHP="php5-3"
-
-# @ECLASS-VARIABLE: PHP_EXT_OPTIONAL_USE
-# @DESCRIPTION:
-# If set, this is the USE flag that the PHP dependencies are behind
-# Most commonly set as PHP_EXT_OPTIONAL_USE=php to get the dependencies behind
-# USE=php.
-
-# @ECLASS-VARIABLE: PHP_EXT_S
-# @DESCRIPTION:
-# The relative location of the temporary build directory for the PHP extension within
-# the source package. This is useful for packages that bundle the PHP extension.
-# Defaults to ${S}
-[[ -z "${PHP_EXT_S}" ]] && PHP_EXT_S="${S}"
-
-#Make sure at least one target is installed. Abuses USE dependencies.
-for target in ${USE_PHP}; do
-	IUSE="${IUSE} php_targets_${target}"
-	target=${target/+}
-	SELFDEPEND="${SELFDEPEND} =${CATEGORY}/${PF}[php_targets_${target}]"
-	slot=${target/php}
-	slot=${slot/-/.}
-	PHPDEPEND="${PHPDEPEND}
-	php_targets_${target}? ( dev-lang/php:${slot} )"
-done
-
-RDEPEND="${RDEPEND}
-	${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }
-	|| ( ${SELFDEPEND} )
-	${PHPDEPEND}
-	${PHP_EXT_OPTIONAL_USE:+ )}"
-
-DEPEND="${DEPEND}
-	${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }
-	${PHPDEPEND}
-	${PHP_EXT_OPTIONAL_USE:+ )}
-"
-
-# @FUNCTION: php-ext-source-r2_src_unpack
-# @DESCRIPTION:
-# runs standard src_unpack + _phpize
-
-# @VARIABLE: PHP_EXT_SKIP_PHPIZE
-# @DESCRIPTION:
-# phpize will be run by default for all ebuilds that use
-# php-ext-source-r2_src_unpack
-# Set PHP_EXT_SKIP_PHPIZE="yes" in your ebuild if you do not want to run phpize.
-php-ext-source-r2_src_unpack() {
-	unpack ${A}
-	local slot orig_s="${PHP_EXT_S}"
-	for slot in $(php_get_slots); do
-		cp -r "${orig_s}" "${WORKDIR}/${slot}" || die "Failed to copy source ${orig_s} to PHP target directory"
-	done
-}
-
-php-ext-source-r2_src_prepare() {
-	local slot orig_s="${PHP_EXT_S}"
-	for slot in $(php_get_slots); do
-		php_init_slot_env ${slot}
-		php-ext-source-r2_phpize
-	done
-}
-
-# @FUNCTION: php-ext-source-r2_phpize
-# @DESCRIPTION:
-# Runs phpize and autotools in addition to the standard src_unpack
-php-ext-source-r2_phpize() {
-	if [[ "${PHP_EXT_SKIP_PHPIZE}" != 'yes' ]] ; then
-		# Create configure out of config.m4
-		# I wish I could run this to solve #329071, but I cannot
-		#autotools_run_tool ${PHPIZE}
-		${PHPIZE}
-		# force run of libtoolize and regeneration of related autotools
-		# files (bug 220519)
-		rm aclocal.m4
-		eautoreconf
-	fi
-}
-
-# @FUNCTION: php-ext-source-r2_src_configure
-# @DESCRIPTION:
-# Takes care of standard configure for PHP extensions (modules).
-
-# @VARIABLE: my_conf
-# @DESCRIPTION:
-# Set this in the ebuild to pass configure options to econf.
-php-ext-source-r2_src_configure() {
-	# net-snmp creates this file #385403
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env ${slot}
-		# Set the correct config options
-		econf --with-php-config=${PHPCONFIG} ${my_conf}  || die "Unable to configure code to compile"
-	done
-}
-
-# @FUNCTION: php-ext-source-r2_src_compile
-# @DESCRIPTION:
-# Takes care of standard compile for PHP extensions (modules).
-php-ext-source-r2_src_compile() {
-	# net-snmp creates this file #324739
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	# shm extension createss a semaphore file #173574
-	addpredict /session_mm_cli0.sem
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env ${slot}
-		emake || die "Unable to make code"
-
-	done
-}
-
-# @FUNCTION: php-ext-source-r2_src_install
-# @DESCRIPTION:
-# Takes care of standard install for PHP extensions (modules).
-
-# @VARIABLE: DOCS
-# @DESCRIPTION:
-# Set in ebuild if you wish to install additional, package-specific documentation.
-php-ext-source-r2_src_install() {
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env ${slot}
-
-		# Let's put the default module away
-		insinto "${EXT_DIR}"
-		newins "modules/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension"
-
-		local doc
-		for doc in ${DOCS} ; do
-			[[ -s ${doc} ]] && dodoc ${doc}
-		done
-
-		INSTALL_ROOT="${D}" emake install-headers
-	done
-	php-ext-source-r2_createinifiles
-}
-
-
-php_get_slots() {
-	local s slot
-	for slot in ${USE_PHP}; do
-		use php_targets_${slot} && s+=" ${slot/-/.}"
-	done
-	echo $s
-}
-
-php_init_slot_env() {
-	libdir=$(get_libdir)
-
-	PHPIZE="/usr/${libdir}/${1}/bin/phpize"
-	PHPCONFIG="/usr/${libdir}/${1}/bin/php-config"
-	PHPCLI="/usr/${libdir}/${1}/bin/php"
-	PHPCGI="/usr/${libdir}/${1}/bin/php-cgi"
-	PHP_PKG="$(best_version =dev-lang/php-${1:3}*)"
-	PHPPREFIX="/usr/${libdir}/${slot}"
-	EXT_DIR="$(${PHPCONFIG} --extension-dir 2>/dev/null)"
-	PHP_CURRENTSLOT=${1:3}
-
-	PHP_EXT_S="${WORKDIR}/${1}"
-	cd "${PHP_EXT_S}"
-}
-
-php-ext-source-r2_buildinilist() {
-	# Work out the list of <ext>.ini files to edit/add to
-	if [[ -z "${PHPSAPILIST}" ]] ; then
-		PHPSAPILIST="apache2 cli cgi fpm embed"
-	fi
-
-	PHPINIFILELIST=""
-	local x
-	for x in ${PHPSAPILIST} ; do
-		if [[ -f "/etc/php/${x}-${1}/php.ini" ]] ; then
-			PHPINIFILELIST="${PHPINIFILELIST} etc/php/${x}-${1}/ext/${PHP_EXT_NAME}.ini"
-		fi
-	done
-	PHPFULLINIFILELIST="${PHPFULLINIFILELIST} ${PHPINIFILELIST}"
-}
-
-# @FUNCTION: php-ext-source-r2_createinifiles
-# @DESCRIPTION:
-# Builds ini files for every enabled slot and SAPI
-php-ext-source-r2_createinifiles() {
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env ${slot}
-		# Pull in the PHP settings
-
-		# Build the list of <ext>.ini files to edit/add to
-		php-ext-source-r2_buildinilist ${slot}
-
-
-		# Add the needed lines to the <ext>.ini files
-		local file
-		if [[ "${PHP_EXT_INI}" = "yes" ]] ; then
-			for file in ${PHPINIFILELIST}; do
-				php-ext-source-r2_addextension "${PHP_EXT_NAME}.so" "${file}"
-			done
-		fi
-
-		# Symlink the <ext>.ini files from ext/ to ext-active/
-		local inifile
-		for inifile in ${PHPINIFILELIST} ; do
-			if [[ -n "${PHP_EXT_INIFILE}" ]]; then
-				cat "${FILESDIR}/${PHP_EXT_INIFILE}" > "${inifile}"
-				einfo "Added content of ${FILESDIR}/${PHP_EXT_INIFILE} to ${inifile}"
-			fi
-
-
-
-
-			inidir="${inifile/${PHP_EXT_NAME}.ini/}"
-			inidir="${inidir/ext/ext-active}"
-			dodir "/${inidir}"
-			dosym "/${inifile}" "/${inifile/ext/ext-active}"
-		done
-
-		# Add support for installing PHP files into a version dependant directory
-		PHP_EXT_SHARED_DIR="/usr/share/php/${PHP_EXT_NAME}"
-	done
-}
-
-php-ext-source-r2_addextension() {
-	if [[ "${PHP_EXT_ZENDEXT}" = "yes" ]] ; then
-		# We need the full path for ZendEngine extensions
-		# and we need to check for debugging enabled!
-		if has_version "dev-lang/php:${PHP_CURRENTSLOT}[threads]" ; then
-			if has_version "dev-lang/php:${PHP_CURRENTSLOT}[debug]" ; then
-				ext_type="zend_extension_debug_ts"
-			else
-				ext_type="zend_extension_ts"
-			fi
-			ext_file="${EXT_DIR}/${1}"
-		else
-			if has_version "dev-lang/php:${PHP_CURRENTSLOT}[debug]"; then
-				ext_type="zend_extension_debug"
-			else
-				ext_type="zend_extension"
-			fi
-			ext_file="${EXT_DIR}/${1}"
-		fi
-
-		# php-5.3 unifies zend_extension loading and just requires the
-		# zend_extension keyword with no suffix
-		# TODO: drop previous code and this check once <php-5.3 support is
-		# discontinued
-		if has_version '>=dev-lang/php-5.3' ; then
-			ext_type="zend_extension"
-		fi
-	else
-		# We don't need the full path for normal extensions!
-		ext_type="extension"
-		ext_file="${1}"
-	fi
-
-	php-ext-source-r2_addtoinifile "${ext_type}" "${ext_file}" "${2}" "Extension added"
-}
-
-# $1 - Setting name
-# $2 - Setting value
-# $3 - File to add to
-# $4 - Sanitized text to output
-php-ext-source-r2_addtoinifile() {
-	local inifile="${WORKDIR}/${3}"
-	if [[ ! -d $(dirname ${inifile}) ]] ; then
-		mkdir -p $(dirname ${inifile})
-	fi
-
-	# Are we adding the name of a section?
-	if [[ ${1:0:1} == "[" ]] ; then
-		echo "${1}" >> "${inifile}"
-		my_added="${1}"
-	else
-		echo "${1}=${2}" >> "${inifile}"
-		my_added="${1}=${2}"
-	fi
-
-	if [[ -z "${4}" ]] ; then
-		einfo "Added '${my_added}' to /${3}"
-	else
-		einfo "${4} to /${3}"
-	fi
-
-	insinto /$(dirname ${3})
-	doins "${inifile}"
-}
-
-# @FUNCTION: php-ext-source-r2_addtoinifiles
-# @USAGE: <setting name> <setting value> [message to output]; or just [section name]
-# @DESCRIPTION:
-# Add value settings to php.ini file installed by the extension (module).
-# You can also add a [section], see examples below.
-#
-# @CODE
-# Add some settings for the extension:
-#
-# php-ext-source-r2_addtoinifiles "zend_optimizer.optimization_level" "15"
-# php-ext-source-r2_addtoinifiles "zend_optimizer.enable_loader" "0"
-# php-ext-source-r2_addtoinifiles "zend_optimizer.disable_licensing" "0"
-#
-# Adding values to a section in php.ini file installed by the extension:
-#
-# php-ext-source-r2_addtoinifiles "[Debugger]"
-# php-ext-source-r2_addtoinifiles "debugger.enabled" "on"
-# php-ext-source-r2_addtoinifiles "debugger.profiler_enabled" "on"
-# @CODE
-php-ext-source-r2_addtoinifiles() {
-	local x
-	for x in ${PHPFULLINIFILELIST} ; do
-		php-ext-source-r2_addtoinifile "${1}" "${2}" "${x}" "${3}"
-	done
-}

diff --git a/eclass/python-distutils-ng.eclass b/eclass/python-distutils-ng.eclass
deleted file mode 100644
index f27b980..0000000
--- a/eclass/python-distutils-ng.eclass
+++ /dev/null
@@ -1,391 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.26 2012/06/10 14:23:43 floppym Exp $
-
-# @ECLASS: python-distutils-ng
-# @MAINTAINER:
-# Python herd <python@g.o>
-# @AUTHOR:
-# Author: Krzysztof Pawlik <nelchael@g.o>
-# @BLURB: Install Python packages using distutils.
-# @DESCRIPTION:
-# The Python eclass is designed to allow an easier installation of Python
-# packages and their incorporation into the Gentoo Linux system.
-#
-# This eclass provides functions for following phases:
-#  - src_prepare - you can define python_prepare_all function that will be run
-#    before creating implementation-specific directory and python_prepare
-#    function that will be run for each implementation
-#  - src_configure - you can define python_configure function that will be run
-#    for each implementation
-#  - src_compile - you can define python_compile function that will be run for
-#    each implementation, default function will run `setup.py build'
-#  - src_test - you can define python_test function that will be run for each
-#    implementation
-#  - src_install - you can define python_install function that will be run for
-#    each implementation and python_install_all that will be run in original
-#    directory (so it will not contain any implementation-specific files)
-
-# @ECLASS-VARIABLE: PYTHON_COMPAT
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# This variable contains a space separated list of implementations (see above) a
-# package is compatible to. It must be set before the `inherit' call. The
-# default is to enable all implementations.
-
-if [[ -z "${PYTHON_COMPAT}" ]]; then
-	# Default: pure python, support all implementations
-	PYTHON_COMPAT="  python2_5 python2_6 python2_7"
-	PYTHON_COMPAT+=" python3_1 python3_2"
-	PYTHON_COMPAT+=" jython2_5"
-	PYTHON_COMPAT+=" pypy1_8 pypy1_9"
-fi
-
-# @ECLASS-VARIABLE: PYTHON_OPTIONAL
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Set the value to "yes" to make the dependency on a Python interpreter
-# optional.
-
-# @ECLASS-VARIABLE: PYTHON_DISABLE_COMPILATION
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Set the value to "yes" to skip compilation and/or optimization of Python
-# modules.
-
-# @ECLASS-VARIABLE: PYTHON_DISABLE_SCRIPT_REDOS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Set to any value to disable automatic reinstallation of scripts in bin
-# directories. See python-distutils-ng_src_install function.
-
-EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
-
-case "${EAPI}" in
-	0|1|2|3)
-		die "Unsupported EAPI=${EAPI} (too old) for python-distutils-ng.eclass" ;;
-	4|5)
-		# EAPI=4 needed for REQUIRED_USE
-		S="${S:-${WORKDIR}/${P}}"
-		;;
-	*)
-		die "Unsupported EAPI=${EAPI} (unknown) for python-distutils-ng.eclass" ;;
-esac
-
-DEPEND="${DEPEND} !<sys-apps/portage-2.1.10.58"
-
-# @FUNCTION: _python-distutils-ng_get_binary_for_implementation
-# @USAGE: implementation
-# @RETURN: Full path to Python binary for given implementation.
-# @DESCRIPTION:
-# This function returns full path for Python binary for given implementation.
-#
-# Binary returned by this function should be used instead of simply calling
-# `python'.
-_python-distutils-ng_get_binary_for_implementation() {
-	local impl="${1/_/.}"
-	case "${impl}" in
-		python?.?|jython?.?)
-			echo "/usr/bin/${impl}" ;;
-		pypy?.?)
-			echo "/usr/bin/pypy-c${impl: -3}" ;;
-		*)
-			die "Unsupported implementation: ${1}" ;;
-	esac
-}
-
-required_use_str=""
-for impl in ${PYTHON_COMPAT}; do
-	required_use_str+=" python_targets_${impl}"
-done
-required_use_str=" || ( ${required_use_str} )"
-if [[ "${PYTHON_OPTIONAL}" = "yes" ]]; then
-	IUSE+=" python"
-	REQUIRED_USE+=" python? ( ${required_use_str} )"
-else
-	REQUIRED_USE+=" ${required_use_str}"
-fi
-unset required_use_str
-
-for impl in ${PYTHON_COMPAT}; do
-	IUSE+=" python_targets_${impl}"
-	dep_str="${impl/_/.}"
-	case "${dep_str}" in
-		python?.?)
-			dep_str="dev-lang/python:${dep_str: -3}" ;;
-		jython?.?)
-			dep_str="dev-java/jython:${dep_str: -3}" ;;
-		pypy?.?)
-			dep_str="dev-python/pypy:${dep_str: -3}" ;;
-		*)
-			die "Unsupported implementation: ${impl}" ;;
-	esac
-	dep_str="python_targets_${impl}? ( ${dep_str} )"
-
-	if [[ "${PYTHON_OPTIONAL}" = "yes" ]]; then
-		RDEPEND="${RDEPEND} python? ( ${dep_str} )"
-		DEPEND="${DEPEND} python? ( ${dep_str} )"
-	else
-		RDEPEND="${RDEPEND} ${dep_str}"
-		DEPEND="${DEPEND} ${dep_str}"
-	fi
-	unset dep_str
-done
-
-_PACKAGE_SPECIFIC_S="${S#${WORKDIR}/}"
-
-# @FUNCTION: _python-distutils-ng_run_for_impl
-# @USAGE: implementation command_to_run
-# @DESCRIPTION:
-# Run command_to_run using specified Python implementation.
-#
-# This will run the command_to_run in implementation-specific working directory.
-_python-distutils-ng_run_for_impl() {
-	local impl="${1}"
-	local command="${2}"
-
-	local S="${WORKDIR}/impl_${impl}/${_PACKAGE_SPECIFIC_S}"
-	PYTHON="$(_python-distutils-ng_get_binary_for_implementation "${impl}")"
-	EPYTHON="${impl/_/.}"
-
-	einfo "Running ${command} in ${S} for ${impl}"
-
-	pushd "${S}" &> /dev/null
-	"${command}" "${impl}" "${PYTHON}"
-	popd &> /dev/null
-}
-
-# @FUNCTION: _python-distutils-ng_run_for_each_impl
-# @USAGE: command_to_run
-# @DESCRIPTION:
-# Run command_to_run for all enabled Python implementations.
-#
-# See also _python-distutils-ng_run_for_impl
-_python-distutils-ng_run_for_each_impl() {
-	local command="${1}"
-
-	for impl in ${PYTHON_COMPAT}; do
-		use "python_targets_${impl}" ${PYTHON_COMPAT} || continue
-		_python-distutils-ng_run_for_impl "${impl}" "${command}"
-	done
-}
-
-# @FUNCTION: _python-distutils-ng_default_distutils_compile
-# @DESCRIPTION:
-# Default src_compile for distutils-based packages.
-_python-distutils-ng_default_distutils_compile() {
-	"${PYTHON}" setup.py build || die
-}
-
-# @FUNCTION: _python-distutils-ng_default_distutils_install
-# @DESCRIPTION:
-# Default src_install for distutils-based packages.
-_python-distutils-ng_default_distutils_install() {
-	local compile_flags="--compile -O2"
-
-	case "${1}" in
-		jython*)
-			# Jython does not support optimizations
-			compile_flags="--compile" ;;
-	esac
-
-	unset PYTHONDONTWRITEBYTECODE
-	[[ -n "${PYTHON_DISABLE_COMPILATION}" ]] && compile_flags="--no-compile"
-	"${PYTHON}" setup.py install ${compile_flags} --root="${D}" || die
-}
-
-# @FUNCTION: python-distutils-ng_rewrite_hashbang
-# @USAGE: script_file_name implementation
-# @DESCRIPTION:
-# Rewrite #! line in named script, dies if #! line is not for Python or missing.
-python-distutils-ng_rewrite_hashbang() {
-	[[ -n "${1}" ]] || die "Missing file name"
-	[[ -n "${2}" ]] || die "Missing implementation"
-	local file_name="${1}"
-	local binary="$(_python-distutils-ng_get_binary_for_implementation "${2}")"
-	[[ $(head -n 1 "${file_name}") == '#!'*(python|jython|pypy-c)* ]] || \
-		die "Missing or invalid #! line in ${file_name}"
-	sed -i -e "1c#!${binary}" "${file_name}" || die
-}
-
-# @FUNCTION: python-distutils-ng_redoscript
-# @USAGE: script_file_path [destination_directory]
-# @DESCRIPTION:
-# Reinstall script installed already by setup.py. This works by first moving the
-# script to ${T} directory and later running python-distutils-ng_doscript on it.
-# script_file_path has to be a full path relative to ${D}.
-# Warning: this function can be run automatically by the eclass in src_install,
-# see python-distutils-ng_src_install and PYTHON_DISABLE_SCRIPT_REDOS variable.
-python-distutils-ng_redoscript() {
-	local sbn="$(basename "${1}")"
-	mkdir -p "${T}/_${sbn}/" || die "failed to create directory"
-	mv "${D}${1}" "${T}/_${sbn}/${sbn}" || die "failed to move file"
-	python-distutils-ng_doscript "${T}/_${sbn}/${sbn}" "${2}"
-}
-
-# @FUNCTION: python-distutils-ng_doscript
-# @USAGE: script_file_name [destination_directory]
-# @DESCRIPTION:
-# Install given script file in destination directory (for default value check
-# python-distutils-ng_newscript) for all enabled implementations using original
-# script name as a base name.
-#
-# See also python-distutils-ng_newscript for more details.
-python-distutils-ng_doscript() {
-	python-distutils-ng_newscript "${1}" "$(basename "${1}")" "${2}"
-}
-
-# @FUNCTION: python-distutils-ng_newscript
-# @USAGE: script_file_name new_file_name [destination_directory]
-# @DESCRIPTION:
-# Install given script file in destination directory for all enabled
-# implementations using new_file_name as a base name.
-#
-# Destination directory defaults to /usr/bin.
-#
-# If only one Python implementation is enabled the script will be installed
-# as-is. Otherwise each script copy will have the name mangled to
-# "new_file_name-IMPLEMENTATION". For every installed script new hash-bang line
-# will be inserted to reference specific Python interpreter.
-#
-# In case of multiple implementations there will be also a symlink with name
-# equal to new_file_name that will be a symlink to default implementation, which
-# defaults to value of PYTHON_DEFAULT_IMPLEMENTATION, if not specified the
-# function will pick default implementation: it will the be first enabled one
-# from the following list:
-#   python2_7, python2_6, python2_5, python3_2, python3_1, pypy1_8, pypy1_7, jython2_5
-python-distutils-ng_newscript() {
-	[[ -n "${1}" ]] || die "Missing source file name"
-	[[ -n "${2}" ]] || die "Missing destination file name"
-	local source_file="${1}"
-	local destination_file="${2}"
-	local default_impl="${PYTHON_DEFAULT_IMPLEMENTATION}"
-	local enabled_impls=0
-	local destination_directory="/usr/bin"
-	[[ -n "${3}" ]] && destination_directory="${3}"
-
-	for impl in ${PYTHON_COMPAT}; do
-		use "python_targets_${impl}" || continue
-		enabled_impls=$((enabled_impls + 1))
-	done
-
-	if [[ -z "${default_impl}" ]]; then
-		for impl in python{2_7,2_6,2_5,3_2,3_1} pypy{1_9,1_8,1_7} jython2_5; do
-			use "python_targets_${impl}" || continue
-			default_impl="${impl}"
-			break
-		done
-	else
-		use "python_targets_${default_impl}" || \
-			die "default implementation ${default_impl} not enabled"
-	fi
-
-	[[ -n "${default_impl}" ]] || die "Could not select default implementation"
-
-	dodir "${destination_directory}"
-	insinto "${destination_directory}"
-	if [[ "${enabled_impls}" = "1" ]]; then
-		einfo "Installing ${source_file} for single implementation (${default_impl}) in ${destination_directory}"
-		newins "${source_file}" "${destination_file}"
-		fperms 755 "${destination_directory}/${destination_file}"
-		python-distutils-ng_rewrite_hashbang "${D}${destination_directory}/${destination_file}" "${default_impl}"
-	else
-		einfo "Installing ${source_file} for multiple implementations (default: ${default_impl}) in ${destination_directory}"
-		for impl in ${PYTHON_COMPAT}; do
-			use "python_targets_${impl}" ${PYTHON_COMPAT} || continue
-
-			newins "${source_file}" "${destination_file}-${impl}"
-			fperms 755 "${destination_directory}/${destination_file}-${impl}"
-			python-distutils-ng_rewrite_hashbang "${D}${destination_directory}/${destination_file}-${impl}" "${impl}"
-		done
-
-		dosym "${destination_file}-${default_impl}" "${destination_directory}/${destination_file}"
-	fi
-}
-
-# Phase function: src_prepare
-python-distutils-ng_src_prepare() {
-	[[ "${PYTHON_OPTIONAL}" = "yes" ]] && { use python || return; }
-
-	# Try to run binary for each implementation:
-	for impl in ${PYTHON_COMPAT}; do
-		use "python_targets_${impl}" ${PYTHON_COMPAT} || continue
-		$(_python-distutils-ng_get_binary_for_implementation "${impl}") \
-			-c "import sys" || die
-	done
-
-	# Run prepare shared by all implementations:
-	if type python_prepare_all &> /dev/null; then
-		einfo "Running python_prepare_all in ${S} for all"
-		python_prepare_all
-	fi
-
-	# Create a copy of S for each implementation:
-	for impl in ${PYTHON_COMPAT}; do
-		use "python_targets_${impl}" ${PYTHON_COMPAT} || continue
-
-		einfo "Creating copy for ${impl} in ${WORKDIR}/impl_${impl}"
-		mkdir -p "${WORKDIR}/impl_${impl}" || die
-		cp -pr "${S}" "${WORKDIR}/impl_${impl}/${_PACKAGE_SPECIFIC_S}" || die
-	done
-
-	# Run python_prepare for each implementation:
-	if type python_prepare &> /dev/null; then
-		_python-distutils-ng_run_for_each_impl python_prepare
-	fi
-}
-
-# Phase function: src_configure
-python-distutils-ng_src_configure() {
-	[[ "${PYTHON_OPTIONAL}" = "yes" ]] && { use python || return; }
-
-	if type python_configure &> /dev/null; then
-		_python-distutils-ng_run_for_each_impl python_configure
-	fi
-}
-
-# Phase function: src_compile
-python-distutils-ng_src_compile() {
-	[[ "${PYTHON_OPTIONAL}" = "yes" ]] && { use python || return; }
-
-	if type python_compile &> /dev/null; then
-		_python-distutils-ng_run_for_each_impl python_compile
-	else
-		_python-distutils-ng_run_for_each_impl \
-			_python-distutils-ng_default_distutils_compile
-	fi
-}
-
-# Phase function: src_test
-python-distutils-ng_src_test() {
-	[[ "${PYTHON_OPTIONAL}" = "yes" ]] && { use python || return; }
-
-	if type python_test &> /dev/null; then
-		_python-distutils-ng_run_for_each_impl python_test
-	fi
-}
-
-# Phase function: src_install
-python-distutils-ng_src_install() {
-	[[ "${PYTHON_OPTIONAL}" = "yes" ]] && { use python || return; }
-
-	if type python_install &> /dev/null; then
-		_python-distutils-ng_run_for_each_impl python_install
-	else
-		_python-distutils-ng_run_for_each_impl \
-			_python-distutils-ng_default_distutils_install
-	fi
-
-	if type python_install_all &> /dev/null; then
-		einfo "Running python_install_all in ${S} for all"
-		pushd "${S}" &> /dev/null
-		python_install_all
-		popd &> /dev/null
-	fi
-
-	if [[ -z "${PYTHON_DISABLE_SCRIPT_REDOS}" ]]; then
-		for script_file in $(find "${D}"{,usr/}{,s}bin/ -type f -executable 2> /dev/null); do
-			python-distutils-ng_redoscript "/${script_file#${D}}"
-		done
-	fi
-}

diff --git a/eclass/python.eclass b/eclass/python.eclass
deleted file mode 100644
index fb15953..0000000
--- a/eclass/python.eclass
+++ /dev/null
@@ -1,3191 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.157 2012/08/16 23:57:32 floppym Exp $
-
-# @ECLASS: python.eclass
-# @MAINTAINER:
-# Gentoo Python Project <python@g.o>
-# @BLURB: Eclass for Python packages
-# @DESCRIPTION:
-# The python eclass contains miscellaneous, useful functions for Python packages.
-
-# Must call inherit before EXPORT_FUNCTIONS to avoid QA warning.
-if [[ -z "${_PYTHON_ECLASS_INHERITED}" ]]; then
-	inherit multilib
-fi
-
-# Export pkg_setup every time to avoid issues with eclass inheritance order.
-if ! has "${EAPI:-0}" 0 1 2 3 || { has "${EAPI:-0}" 2 3 && [[ -n "${PYTHON_USE_WITH}" || -n "${PYTHON_USE_WITH_OR}" ]]; }; then
-	EXPORT_FUNCTIONS pkg_setup
-fi
-
-# Avoid processing this eclass more than once.
-if [[ -z "${_PYTHON_ECLASS_INHERITED}" ]]; then
-_PYTHON_ECLASS_INHERITED="1"
-
-if ! has "${EAPI:-0}" 0 1 2 3 4 5; then
-	die "API of python.eclass in EAPI=\"${EAPI}\" not established"
-fi
-
-_CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.4 2.5 2.6 2.7)
-_CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.1 3.2)
-_JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython)
-_PYPY_GLOBALLY_SUPPORTED_ABIS=(2.7-pypy-1.7 2.7-pypy-1.8 2.7-pypy-1.9)
-_PYTHON_GLOBALLY_SUPPORTED_ABIS=(${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]} ${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]} ${_JYTHON_GLOBALLY_SUPPORTED_ABIS[@]} ${_PYPY_GLOBALLY_SUPPORTED_ABIS[@]})
-
-# ================================================================================================
-# ===================================== HANDLING OF METADATA =====================================
-# ================================================================================================
-
-_PYTHON_ABI_PATTERN_REGEX="([[:alnum:]]|\.|-|\*|\[|\])+"
-
-_python_check_python_abi_matching() {
-	local pattern patterns patterns_list="0" PYTHON_ABI
-
-	while (($#)); do
-		case "$1" in
-			--patterns-list)
-				patterns_list="1"
-				;;
-			--)
-				shift
-				break
-				;;
-			-*)
-				die "${FUNCNAME}(): Unrecognized option '$1'"
-				;;
-			*)
-				break
-				;;
-		esac
-		shift
-	done
-
-	if [[ "$#" -ne 2 ]]; then
-		die "${FUNCNAME}() requires 2 arguments"
-	fi
-
-	PYTHON_ABI="$1"
-
-	if [[ "${patterns_list}" == "0" ]]; then
-		pattern="$2"
-
-		if [[ "${pattern}" == *"-cpython" ]]; then
-			[[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+$ && "${PYTHON_ABI}" == ${pattern%-cpython} ]]
-		elif [[ "${pattern}" == *"-jython" ]]; then
-			[[ "${PYTHON_ABI}" == ${pattern} ]]
-		elif [[ "${pattern}" == *"-pypy-"* ]]; then
-			[[ "${PYTHON_ABI}" == ${pattern} ]]
-		else
-			if [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+$ ]]; then
-				[[ "${PYTHON_ABI}" == ${pattern} ]]
-			elif [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+-jython$ ]]; then
-				[[ "${PYTHON_ABI%-jython}" == ${pattern} ]]
-			elif [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+-pypy-[[:digit:]]+\.[[:digit:]]+$ ]]; then
-				[[ "${PYTHON_ABI%-pypy-*}" == ${pattern} ]]
-			else
-				die "${FUNCNAME}(): Unrecognized Python ABI '${PYTHON_ABI}'"
-			fi
-		fi
-	else
-		patterns="${2// /$'\n'}"
-
-		while read pattern; do
-			if _python_check_python_abi_matching "${PYTHON_ABI}" "${pattern}"; then
-				return 0
-			fi
-		done <<< "${patterns}"
-
-		return 1
-	fi
-}
-
-_python_implementation() {
-	if [[ "${CATEGORY}/${PN}" == "dev-lang/python" ]]; then
-		return 0
-	elif [[ "${CATEGORY}/${PN}" == "dev-java/jython" ]]; then
-		return 0
-	elif [[ "${CATEGORY}/${PN}" == "dev-python/pypy" ]]; then
-		return 0
-	else
-		return 1
-	fi
-}
-
-_python_package_supporting_installation_for_multiple_python_abis() {
-	if has "${EAPI:-0}" 0 1 2 3 4 5; then
-		if [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then
-			return 0
-		else
-			return 1
-		fi
-	else
-		die "${FUNCNAME}(): Support for EAPI=\"${EAPI}\" not implemented"
-	fi
-}
-
-# @ECLASS-VARIABLE: PYTHON_DEPEND
-# @DESCRIPTION:
-# Specification of dependency on dev-lang/python.
-# Syntax:
-#   PYTHON_DEPEND:             [[!]USE_flag? ]<version_components_group>[ version_components_group]
-#   version_components_group:  <major_version[:[minimal_version][:maximal_version]]>
-#   major_version:             <2|3|*>
-#   minimal_version:           <minimal_major_version.minimal_minor_version>
-#   maximal_version:           <maximal_major_version.maximal_minor_version>
-
-_python_parse_PYTHON_DEPEND() {
-	local major_version maximal_version minimal_version python_all="0" python_maximal_version python_minimal_version python_versions=() python2="0" python2_maximal_version python2_minimal_version python3="0" python3_maximal_version python3_minimal_version USE_flag= version_components_group version_components_group_regex version_components_groups
-
-	version_components_group_regex="(2|3|\*)(:([[:digit:]]+\.[[:digit:]]+)?(:([[:digit:]]+\.[[:digit:]]+)?)?)?"
-	version_components_groups="${PYTHON_DEPEND}"
-
-	if [[ "${version_components_groups}" =~ ^((\!)?[[:alnum:]_-]+\?\ )?${version_components_group_regex}(\ ${version_components_group_regex})?$ ]]; then
-		if [[ "${version_components_groups}" =~ ^(\!)?[[:alnum:]_-]+\? ]]; then
-			USE_flag="${version_components_groups%\? *}"
-			version_components_groups="${version_components_groups#* }"
-		fi
-		if [[ "${version_components_groups}" =~ ("*".*" "|" *"|^2.*\ (2|\*)|^3.*\ (3|\*)) ]]; then
-			die "Invalid syntax of PYTHON_DEPEND: Incorrectly specified groups of versions"
-		fi
-
-		version_components_groups="${version_components_groups// /$'\n'}"
-		while read version_components_group; do
-			major_version="${version_components_group:0:1}"
-			minimal_version="${version_components_group:2}"
-			minimal_version="${minimal_version%:*}"
-			maximal_version="${version_components_group:$((3 + ${#minimal_version}))}"
-
-			if [[ "${major_version}" =~ ^(2|3)$ ]]; then
-				if [[ -n "${minimal_version}" && "${major_version}" != "${minimal_version:0:1}" ]]; then
-					die "Invalid syntax of PYTHON_DEPEND: Minimal version '${minimal_version}' not in specified group of versions"
-				fi
-				if [[ -n "${maximal_version}" && "${major_version}" != "${maximal_version:0:1}" ]]; then
-					die "Invalid syntax of PYTHON_DEPEND: Maximal version '${maximal_version}' not in specified group of versions"
-				fi
-			fi
-
-			if [[ "${major_version}" == "2" ]]; then
-				python2="1"
-				python_versions=("${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]}")
-				python2_minimal_version="${minimal_version}"
-				python2_maximal_version="${maximal_version}"
-			elif [[ "${major_version}" == "3" ]]; then
-				python3="1"
-				python_versions=("${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]}")
-				python3_minimal_version="${minimal_version}"
-				python3_maximal_version="${maximal_version}"
-			else
-				python_all="1"
-				python_versions=("${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]}" "${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]}")
-				python_minimal_version="${minimal_version}"
-				python_maximal_version="${maximal_version}"
-			fi
-
-			if [[ -n "${minimal_version}" ]] && ! has "${minimal_version}" "${python_versions[@]}"; then
-				die "Invalid syntax of PYTHON_DEPEND: Unrecognized minimal version '${minimal_version}'"
-			fi
-			if [[ -n "${maximal_version}" ]] && ! has "${maximal_version}" "${python_versions[@]}"; then
-				die "Invalid syntax of PYTHON_DEPEND: Unrecognized maximal version '${maximal_version}'"
-			fi
-
-			if [[ -n "${minimal_version}" && -n "${maximal_version}" && "${minimal_version}" > "${maximal_version}" ]]; then
-				die "Invalid syntax of PYTHON_DEPEND: Minimal version '${minimal_version}' greater than maximal version '${maximal_version}'"
-			fi
-		done <<< "${version_components_groups}"
-
-		_PYTHON_ATOMS=()
-
-		_append_accepted_versions_range() {
-			local accepted_version="0" i
-			for ((i = "${#python_versions[@]}"; i >= 0; i--)); do
-				if [[ "${python_versions[${i}]}" == "${python_maximal_version}" ]]; then
-					accepted_version="1"
-				fi
-				if [[ "${accepted_version}" == "1" ]]; then
-					_PYTHON_ATOMS+=("=dev-lang/python-${python_versions[${i}]}*")
-				fi
-				if [[ "${python_versions[${i}]}" == "${python_minimal_version}" ]]; then
-					accepted_version="0"
-				fi
-			done
-		}
-
-		if [[ "${python_all}" == "1" ]]; then
-			if [[ -z "${python_minimal_version}" && -z "${python_maximal_version}" ]]; then
-				_PYTHON_ATOMS+=("dev-lang/python")
-			else
-				python_versions=("${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]}" "${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]}")
-				python_minimal_version="${python_minimal_version:-${python_versions[0]}}"
-				python_maximal_version="${python_maximal_version:-${python_versions[${#python_versions[@]}-1]}}"
-				_append_accepted_versions_range
-			fi
-		else
-			if [[ "${python3}" == "1" ]]; then
-				if [[ -z "${python3_minimal_version}" && -z "${python3_maximal_version}" ]]; then
-					_PYTHON_ATOMS+=("=dev-lang/python-3*")
-				else
-					python_versions=("${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]}")
-					python_minimal_version="${python3_minimal_version:-${python_versions[0]}}"
-					python_maximal_version="${python3_maximal_version:-${python_versions[${#python_versions[@]}-1]}}"
-					_append_accepted_versions_range
-				fi
-			fi
-			if [[ "${python2}" == "1" ]]; then
-				if [[ -z "${python2_minimal_version}" && -z "${python2_maximal_version}" ]]; then
-					_PYTHON_ATOMS+=("=dev-lang/python-2*")
-				else
-					python_versions=("${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]}")
-					python_minimal_version="${python2_minimal_version:-${python_versions[0]}}"
-					python_maximal_version="${python2_maximal_version:-${python_versions[${#python_versions[@]}-1]}}"
-					_append_accepted_versions_range
-				fi
-			fi
-		fi
-
-		unset -f _append_accepted_versions_range
-
-		if [[ "${#_PYTHON_ATOMS[@]}" -gt 1 ]]; then
-			DEPEND+="${DEPEND:+ }${USE_flag}${USE_flag:+? ( }|| ( ${_PYTHON_ATOMS[@]} )${USE_flag:+ )}"
-			RDEPEND+="${RDEPEND:+ }${USE_flag}${USE_flag:+? ( }|| ( ${_PYTHON_ATOMS[@]} )${USE_flag:+ )}"
-		else
-			DEPEND+="${DEPEND:+ }${USE_flag}${USE_flag:+? ( }${_PYTHON_ATOMS[@]}${USE_flag:+ )}"
-			RDEPEND+="${RDEPEND:+ }${USE_flag}${USE_flag:+? ( }${_PYTHON_ATOMS[@]}${USE_flag:+ )}"
-		fi
-	else
-		die "Invalid syntax of PYTHON_DEPEND"
-	fi
-}
-
-if _python_implementation; then
-	DEPEND=">=app-admin/eselect-python-20091230"
-	RDEPEND="${DEPEND}"
-	PDEPEND="app-admin/python-updater"
-fi
-
-if [[ -n "${PYTHON_DEPEND}" ]]; then
-	_python_parse_PYTHON_DEPEND
-else
-	_PYTHON_ATOMS=("dev-lang/python")
-fi
-unset -f _python_parse_PYTHON_DEPEND
-
-if [[ -n "${NEED_PYTHON}" ]]; then
-	eerror "Use PYTHON_DEPEND variable instead of NEED_PYTHON variable."
-	die "NEED_PYTHON variable is banned"
-fi
-
-# @ECLASS-VARIABLE: PYTHON_USE_WITH
-# @DESCRIPTION:
-# Set this to a space separated list of USE flags the Python slot in use must be built with.
-
-# @ECLASS-VARIABLE: PYTHON_USE_WITH_OR
-# @DESCRIPTION:
-# Set this to a space separated list of USE flags of which one must be turned on for the slot in use.
-
-# @ECLASS-VARIABLE: PYTHON_USE_WITH_OPT
-# @DESCRIPTION:
-# Set this to a name of a USE flag if you need to make either PYTHON_USE_WITH or
-# PYTHON_USE_WITH_OR atoms conditional under a USE flag.
-
-if ! has "${EAPI:-0}" 0 1 && [[ -n ${PYTHON_USE_WITH} || -n ${PYTHON_USE_WITH_OR} ]]; then
-	_PYTHON_USE_WITH_ATOMS_ARRAY=()
-	if [[ -n "${PYTHON_USE_WITH}" ]]; then
-		for _PYTHON_ATOM in "${_PYTHON_ATOMS[@]}"; do
-			_PYTHON_USE_WITH_ATOMS_ARRAY+=("${_PYTHON_ATOM}[${PYTHON_USE_WITH// /,}]")
-		done
-	elif [[ -n "${PYTHON_USE_WITH_OR}" ]]; then
-		for _USE_flag in ${PYTHON_USE_WITH_OR}; do
-			for _PYTHON_ATOM in "${_PYTHON_ATOMS[@]}"; do
-				_PYTHON_USE_WITH_ATOMS_ARRAY+=("${_PYTHON_ATOM}[${_USE_flag}]")
-			done
-		done
-		unset _USE_flag
-	fi
-	if [[ "${#_PYTHON_USE_WITH_ATOMS_ARRAY[@]}" -gt 1 ]]; then
-		_PYTHON_USE_WITH_ATOMS="|| ( ${_PYTHON_USE_WITH_ATOMS_ARRAY[@]} )"
-	else
-		_PYTHON_USE_WITH_ATOMS="${_PYTHON_USE_WITH_ATOMS_ARRAY[@]}"
-	fi
-	if [[ -n "${PYTHON_USE_WITH_OPT}" ]]; then
-		_PYTHON_USE_WITH_ATOMS="${PYTHON_USE_WITH_OPT}? ( ${_PYTHON_USE_WITH_ATOMS} )"
-	fi
-	DEPEND+="${DEPEND:+ }${_PYTHON_USE_WITH_ATOMS}"
-	RDEPEND+="${RDEPEND:+ }${_PYTHON_USE_WITH_ATOMS}"
-	unset _PYTHON_ATOM _PYTHON_USE_WITH_ATOMS _PYTHON_USE_WITH_ATOMS_ARRAY
-fi
-
-unset _PYTHON_ATOMS
-
-# ================================================================================================
-# =================================== MISCELLANEOUS FUNCTIONS ====================================
-# ================================================================================================
-
-_python_abi-specific_local_scope() {
-	[[ " ${FUNCNAME[@]:2} " =~ " "(_python_final_sanity_checks|python_execute_function|python_mod_optimize|python_mod_cleanup)" " ]]
-}
-
-_python_initialize_prefix_variables() {
-	if has "${EAPI:-0}" 0 1 2; then
-		if [[ -n "${ROOT}" && -z "${EROOT}" ]]; then
-			EROOT="${ROOT%/}${EPREFIX}/"
-		fi
-		if [[ -n "${D}" && -z "${ED}" ]]; then
-			ED="${D%/}${EPREFIX}/"
-		fi
-	fi
-}
-
-unset PYTHON_SANITY_CHECKS_EXECUTED PYTHON_SKIP_SANITY_CHECKS
-
-_python_initial_sanity_checks() {
-	if [[ "$(declare -p PYTHON_SANITY_CHECKS_EXECUTED 2> /dev/null)" != "declare -- PYTHON_SANITY_CHECKS_EXECUTED="* || " ${FUNCNAME[@]:1} " =~ " "(python_set_active_version|python_pkg_setup)" " && -z "${PYTHON_SKIP_SANITY_CHECKS}" ]]; then
-		# Ensure that /usr/bin/python and /usr/bin/python-config are valid.
-		if [[ "$(readlink "${EPREFIX}/usr/bin/python")" != "python-wrapper" ]]; then
-			eerror "'${EPREFIX}/usr/bin/python' is not valid symlink."
-			eerror "Use \`eselect python set \${python_interpreter}\` to fix this problem."
-			die "'${EPREFIX}/usr/bin/python' is not valid symlink"
-		fi
-		if [[ "$(<"${EPREFIX}/usr/bin/python-config")" != *"Gentoo python-config wrapper script"* ]]; then
-			eerror "'${EPREFIX}/usr/bin/python-config' is not valid script"
-			eerror "Use \`eselect python set \${python_interpreter}\` to fix this problem."
-			die "'${EPREFIX}/usr/bin/python-config' is not valid script"
-		fi
-	fi
-}
-
-_python_final_sanity_checks() {
-	if ! _python_implementation && [[ "$(declare -p PYTHON_SANITY_CHECKS_EXECUTED 2> /dev/null)" != "declare -- PYTHON_SANITY_CHECKS_EXECUTED="* || " ${FUNCNAME[@]:1} " =~ " "(python_set_active_version|python_pkg_setup)" " && -z "${PYTHON_SKIP_SANITY_CHECKS}" ]]; then
-		local PYTHON_ABI="${PYTHON_ABI}"
-		for PYTHON_ABI in ${PYTHON_ABIS-${PYTHON_ABI}}; do
-			# Ensure that appropriate version of Python is installed.
-			if ! has_version "$(python_get_implementational_package)"; then
-				die "$(python_get_implementational_package) is not installed"
-			fi
-
-			# Ensure that EPYTHON variable is respected.
-			if [[ "$(EPYTHON="$(PYTHON)" python -c "${_PYTHON_ABI_EXTRACTION_COMMAND}")" != "${PYTHON_ABI}" ]]; then
-				eerror "Path to 'python':                 '$(type -p python)'"
-				eerror "ABI:                              '${ABI}'"
-				eerror "DEFAULT_ABI:                      '${DEFAULT_ABI}'"
-				eerror "EPYTHON:                          '$(PYTHON)'"
-				eerror "PYTHON_ABI:                       '${PYTHON_ABI}'"
-				eerror "Locally active version of Python: '$(EPYTHON="$(PYTHON)" python -c "${_PYTHON_ABI_EXTRACTION_COMMAND}")'"
-				die "'python' does not respect EPYTHON variable"
-			fi
-		done
-	fi
-	PYTHON_SANITY_CHECKS_EXECUTED="1"
-}
-
-# @ECLASS-VARIABLE: PYTHON_COLORS
-# @DESCRIPTION:
-# User-configurable colored output.
-PYTHON_COLORS="${PYTHON_COLORS:-0}"
-
-_python_set_color_variables() {
-	if [[ "${PYTHON_COLORS}" != "0" && "${NOCOLOR:-false}" =~ ^(false|no)$ ]]; then
-		_BOLD=$'\e[1m'
-		_RED=$'\e[1;31m'
-		_GREEN=$'\e[1;32m'
-		_BLUE=$'\e[1;34m'
-		_CYAN=$'\e[1;36m'
-		_NORMAL=$'\e[0m'
-	else
-		_BOLD=
-		_RED=
-		_GREEN=
-		_BLUE=
-		_CYAN=
-		_NORMAL=
-	fi
-}
-
-_python_check_python_pkg_setup_execution() {
-	[[ " ${FUNCNAME[@]:1} " =~ " "(python_set_active_version|python_pkg_setup)" " ]] && return
-
-	if ! has "${EAPI:-0}" 0 1 2 3 && [[ -z "${PYTHON_PKG_SETUP_EXECUTED}" ]]; then
-		die "python_pkg_setup() not called"
-	fi
-}
-
-# @FUNCTION: python_pkg_setup
-# @DESCRIPTION:
-# Perform sanity checks and initialize environment.
-#
-# This function is exported in EAPI 2 and 3 when PYTHON_USE_WITH or PYTHON_USE_WITH_OR variable
-# is set and always in EAPI >=4. Calling of this function is mandatory in EAPI >=4.
-python_pkg_setup() {
-	if [[ "${EBUILD_PHASE}" != "setup" ]]; then
-		die "${FUNCNAME}() can be used only in pkg_setup() phase"
-	fi
-
-	if [[ "$#" -ne 0 ]]; then
-		die "${FUNCNAME}() does not accept arguments"
-	fi
-
-	export JYTHON_SYSTEM_CACHEDIR="1"
-	addwrite "${EPREFIX}/var/cache/jython"
-
-	if _python_package_supporting_installation_for_multiple_python_abis; then
-		_python_calculate_PYTHON_ABIS
-		export EPYTHON="$(PYTHON -f)"
-	else
-		PYTHON_ABI="${PYTHON_ABI:-$(PYTHON --ABI)}"
-	fi
-
-	if ! has "${EAPI:-0}" 0 1 && [[ -n "${PYTHON_USE_WITH}" || -n "${PYTHON_USE_WITH_OR}" ]]; then
-		if [[ "${PYTHON_USE_WITH_OPT}" ]]; then
-			if [[ "${PYTHON_USE_WITH_OPT}" == !* ]]; then
-				use ${PYTHON_USE_WITH_OPT#!} && return
-			else
-				use !${PYTHON_USE_WITH_OPT} && return
-			fi
-		fi
-
-		python_pkg_setup_check_USE_flags() {
-			local python_atom USE_flag
-			python_atom="$(python_get_implementational_package)"
-
-			for USE_flag in ${PYTHON_USE_WITH}; do
-				if ! has_version "${python_atom}[${USE_flag}]"; then
-					eerror "Please rebuild ${python_atom} with the following USE flags enabled: ${PYTHON_USE_WITH}"
-					die "Please rebuild ${python_atom} with the following USE flags enabled: ${PYTHON_USE_WITH}"
-				fi
-			done
-
-			for USE_flag in ${PYTHON_USE_WITH_OR}; do
-				if has_version "${python_atom}[${USE_flag}]"; then
-					return
-				fi
-			done
-
-			if [[ ${PYTHON_USE_WITH_OR} ]]; then
-				eerror "Please rebuild ${python_atom} with at least one of the following USE flags enabled: ${PYTHON_USE_WITH_OR}"
-				die "Please rebuild ${python_atom} with at least one of the following USE flags enabled: ${PYTHON_USE_WITH_OR}"
-			fi
-		}
-
-		if _python_package_supporting_installation_for_multiple_python_abis; then
-			PYTHON_SKIP_SANITY_CHECKS="1" python_execute_function -q python_pkg_setup_check_USE_flags
-		else
-			python_pkg_setup_check_USE_flags
-		fi
-
-		unset -f python_pkg_setup_check_USE_flags
-	fi
-
-	PYTHON_PKG_SETUP_EXECUTED="1"
-}
-
-_PYTHON_SHEBANG_BASE_PART_REGEX='^#![[:space:]]*([^[:space:]]*/usr/bin/env[[:space:]]+)?([^[:space:]]*/)?(jython|pypy-c|python)'
-
-# @FUNCTION: python_convert_shebangs
-# @USAGE: [-q|--quiet] [-r|--recursive] [-x|--only-executables] [--] <Python_ABI|Python_version> <file|directory> [files|directories]
-# @DESCRIPTION:
-# Convert shebangs in specified files. Directories can be specified only with --recursive option.
-python_convert_shebangs() {
-	_python_check_python_pkg_setup_execution
-
-	local argument file files=() only_executables="0" python_interpreter quiet="0" recursive="0" shebangs_converted="0"
-
-	while (($#)); do
-		case "$1" in
-			-r|--recursive)
-				recursive="1"
-				;;
-			-q|--quiet)
-				quiet="1"
-				;;
-			-x|--only-executables)
-				only_executables="1"
-				;;
-			--)
-				shift
-				break
-				;;
-			-*)
-				die "${FUNCNAME}(): Unrecognized option '$1'"
-				;;
-			*)
-				break
-				;;
-		esac
-		shift
-	done
-
-	if [[ "$#" -eq 0 ]]; then
-		die "${FUNCNAME}(): Missing Python version and files or directories"
-	elif [[ "$#" -eq 1 ]]; then
-		die "${FUNCNAME}(): Missing files or directories"
-	fi
-
-	if [[ -n "$(_python_get_implementation --ignore-invalid "$1")" ]]; then
-		python_interpreter="$(PYTHON "$1")"
-	else
-		python_interpreter="python$1"
-	fi
-	shift
-
-	for argument in "$@"; do
-		if [[ ! -e "${argument}" ]]; then
-			die "${FUNCNAME}(): '${argument}' does not exist"
-		elif [[ -f "${argument}" ]]; then
-			files+=("${argument}")
-		elif [[ -d "${argument}" ]]; then
-			if [[ "${recursive}" == "1" ]]; then
-				while read -d $'\0' -r file; do
-					files+=("${file}")
-				done < <(find "${argument}" $([[ "${only_executables}" == "1" ]] && echo -perm /111) -type f -print0)
-			else
-				die "${FUNCNAME}(): '${argument}' is not a regular file"
-			fi
-		else
-			die "${FUNCNAME}(): '${argument}' is not a regular file or a directory"
-		fi
-	done
-
-	for file in "${files[@]}"; do
-		file="${file#./}"
-		[[ "${only_executables}" == "1" && ! -x "${file}" ]] && continue
-
-		if [[ "$(head -n1 "${file}")" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX} ]]; then
-			[[ "$(sed -ne "2p" "${file}")" =~ ^"# Gentoo '".*"' wrapper script generated by python_generate_wrapper_scripts()"$ ]] && continue
-
-			shebangs_converted="1"
-
-			if [[ "${quiet}" == "0" ]]; then
-				einfo "Converting shebang in '${file}'"
-			fi
-
-			sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?\(jython\|pypy-c\|python\)\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${python_interpreter}\6:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
-		fi
-	done
-
-	if [[ "${shebangs_converted}" == "0" ]]; then
-		ewarn "${FUNCNAME}(): Python scripts not found"
-	fi
-}
-
-# @FUNCTION: python_clean_py-compile_files
-# @USAGE: [-q|--quiet]
-# @DESCRIPTION:
-# Clean py-compile files to disable byte-compilation.
-python_clean_py-compile_files() {
-	_python_check_python_pkg_setup_execution
-
-	local file files=() quiet="0"
-
-	while (($#)); do
-		case "$1" in
-			-q|--quiet)
-				quiet="1"
-				;;
-			-*)
-				die "${FUNCNAME}(): Unrecognized option '$1'"
-				;;
-			*)
-				die "${FUNCNAME}(): Invalid usage"
-				;;
-		esac
-		shift
-	done
-
-	while read -d $'\0' -r file; do
-		files+=("${file#./}")
-	done < <(find -name py-compile -type f -print0)
-
-	for file in "${files[@]}"; do
-		if [[ "${quiet}" == "0" ]]; then
-			einfo "Cleaning '${file}' file"
-		fi
-		echo "#!/bin/sh" > "${file}"
-	done
-}
-
-# @FUNCTION: python_clean_installation_image
-# @USAGE: [-q|--quiet]
-# @DESCRIPTION:
-# Delete needless files in installation image.
-#
-# This function can be used only in src_install() phase.
-python_clean_installation_image() {
-	if [[ "${EBUILD_PHASE}" != "install" ]]; then
-		die "${FUNCNAME}() can be used only in src_install() phase"
-	fi
-
-	_python_check_python_pkg_setup_execution
-	_python_initialize_prefix_variables
-
-	local file files=() quiet="0"
-
-	while (($#)); do
-		case "$1" in
-			-q|--quiet)
-				quiet="1"
-				;;
-			-*)
-				die "${FUNCNAME}(): Unrecognized option '$1'"
-				;;
-			*)
-				die "${FUNCNAME}(): Invalid usage"
-				;;
-		esac
-		shift
-	done
-
-	while read -d $'\0' -r file; do
-		files+=("${file}")
-	done < <(find "${ED}" "(" -name "*.py[co]" -o -name "*\$py.class" ")" -type f -print0)
-
-	if [[ "${#files[@]}" -gt 0 ]]; then
-		if [[ "${quiet}" == "0" ]]; then
-			ewarn "Deleting byte-compiled Python modules needlessly generated by build system:"
-		fi
-		for file in "${files[@]}"; do
-			if [[ "${quiet}" == "0" ]]; then
-				ewarn " ${file}"
-			fi
-			rm -f "${file}"
-
-			# Delete empty __pycache__ directories.
-			if [[ "${file%/*}" == *"/__pycache__" ]]; then
-				rmdir "${file%/*}" 2> /dev/null
-			fi
-		done
-	fi
-
-	python_clean_sitedirs() {
-		if [[ -d "${ED}$(python_get_sitedir)" ]]; then
-			find "${ED}$(python_get_sitedir)" "(" -name "*.c" -o -name "*.h" -o -name "*.la" ")" -type f -print0 | xargs -0 rm -f
-		fi
-	}
-	if _python_package_supporting_installation_for_multiple_python_abis; then
-		python_execute_function -q python_clean_sitedirs
-	else
-		python_clean_sitedirs
-	fi
-
-	unset -f python_clean_sitedirs
-}
-
-# ================================================================================================
-# =========== FUNCTIONS FOR PACKAGES SUPPORTING INSTALLATION FOR MULTIPLE PYTHON ABIS ============
-# ================================================================================================
-
-# @ECLASS-VARIABLE: SUPPORT_PYTHON_ABIS
-# @DESCRIPTION:
-# Set this in EAPI <= 4 to indicate that current package supports installation for
-# multiple Python ABIs.
-
-# @ECLASS-VARIABLE: PYTHON_TESTS_RESTRICTED_ABIS
-# @DESCRIPTION:
-# Space-separated list of Python ABI patterns. Testing in Python ABIs matching any Python ABI
-# patterns specified in this list is skipped.
-
-# @ECLASS-VARIABLE: PYTHON_EXPORT_PHASE_FUNCTIONS
-# @DESCRIPTION:
-# Set this to export phase functions for the following ebuild phases:
-# src_prepare(), src_configure(), src_compile(), src_test(), src_install().
-if ! has "${EAPI:-0}" 0 1; then
-	python_src_prepare() {
-		if [[ "${EBUILD_PHASE}" != "prepare" ]]; then
-			die "${FUNCNAME}() can be used only in src_prepare() phase"
-		fi
-
-		if ! _python_package_supporting_installation_for_multiple_python_abis; then
-			die "${FUNCNAME}() cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
-		fi
-
-		_python_check_python_pkg_setup_execution
-
-		if [[ "$#" -ne 0 ]]; then
-			die "${FUNCNAME}() does not accept arguments"
-		fi
-
-		python_copy_sources
-	}
-
-	for python_default_function in src_configure src_compile src_test; do
-		eval "python_${python_default_function}() {
-			if [[ \"\${EBUILD_PHASE}\" != \"${python_default_function#src_}\" ]]; then
-				die \"\${FUNCNAME}() can be used only in ${python_default_function}() phase\"
-			fi
-
-			if ! _python_package_supporting_installation_for_multiple_python_abis; then
-				die \"\${FUNCNAME}() cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs\"
-			fi
-
-			_python_check_python_pkg_setup_execution
-
-			python_execute_function -d -s -- \"\$@\"
-		}"
-	done
-	unset python_default_function
-
-	python_src_install() {
-		if [[ "${EBUILD_PHASE}" != "install" ]]; then
-			die "${FUNCNAME}() can be used only in src_install() phase"
-		fi
-
-		if ! _python_package_supporting_installation_for_multiple_python_abis; then
-			die "${FUNCNAME}() cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
-		fi
-
-		_python_check_python_pkg_setup_execution
-
-		if has "${EAPI:-0}" 0 1 2 3; then
-			python_execute_function -d -s -- "$@"
-		else
-			python_installation() {
-				emake DESTDIR="${T}/images/${PYTHON_ABI}" install "$@"
-			}
-			python_execute_function -s python_installation "$@"
-			unset python_installation
-
-			python_merge_intermediate_installation_images "${T}/images"
-		fi
-	}
-
-	if [[ -n "${PYTHON_EXPORT_PHASE_FUNCTIONS}" ]]; then
-		EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
-	fi
-fi
-
-if has "${EAPI:-0}" 0 1 2 3 4 5; then
-	unset PYTHON_ABIS
-fi
-
-_python_calculate_PYTHON_ABIS() {
-	if ! _python_package_supporting_installation_for_multiple_python_abis; then
-		die "${FUNCNAME}() cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
-	fi
-
-	_python_initial_sanity_checks
-
-	if [[ "$(declare -p PYTHON_ABIS 2> /dev/null)" != "declare -x PYTHON_ABIS="* ]] && has "${EAPI:-0}" 0 1 2 3 4 5; then
-		local PYTHON_ABI
-
-		if [[ "$(declare -p USE_PYTHON 2> /dev/null)" == "declare -x USE_PYTHON="* ]]; then
-			local cpython_enabled="0"
-
-			if [[ -z "${USE_PYTHON}" ]]; then
-				die "USE_PYTHON variable is empty"
-			fi
-
-			for PYTHON_ABI in ${USE_PYTHON}; do
-				if ! has "${PYTHON_ABI}" "${_PYTHON_GLOBALLY_SUPPORTED_ABIS[@]}"; then
-					die "USE_PYTHON variable contains invalid value '${PYTHON_ABI}'"
-				fi
-
-				if has "${PYTHON_ABI}" "${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]}" "${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]}"; then
-					cpython_enabled="1"
-				fi
-
-				if ! _python_check_python_abi_matching --patterns-list "${PYTHON_ABI}" "${RESTRICT_PYTHON_ABIS}"; then
-					export PYTHON_ABIS+="${PYTHON_ABIS:+ }${PYTHON_ABI}"
-				fi
-			done
-
-			if [[ -z "${PYTHON_ABIS//[${IFS}]/}" ]]; then
-				die "USE_PYTHON variable does not enable any Python ABI supported by ${CATEGORY}/${PF}"
-			fi
-
-			if [[ "${cpython_enabled}" == "0" ]]; then
-				die "USE_PYTHON variable does not enable any CPython ABI"
-			fi
-		else
-			local python_version python2_version python3_version support_python_major_version
-
-			if ! has_version "dev-lang/python"; then
-				die "${FUNCNAME}(): 'dev-lang/python' is not installed"
-			fi
-
-			python_version="$("${EPREFIX}/usr/bin/python" -c 'from sys import version_info; print(".".join(str(x) for x in version_info[:2]))')"
-
-			if has_version "=dev-lang/python-2*"; then
-				if [[ "$(readlink "${EPREFIX}/usr/bin/python2")" != "python2."* ]]; then
-					die "'${EPREFIX}/usr/bin/python2' is not valid symlink"
-				fi
-
-				python2_version="$("${EPREFIX}/usr/bin/python2" -c 'from sys import version_info; print(".".join(str(x) for x in version_info[:2]))')"
-
-				support_python_major_version="0"
-				for PYTHON_ABI in "${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]}"; do
-					if ! _python_check_python_abi_matching --patterns-list "${PYTHON_ABI}" "${RESTRICT_PYTHON_ABIS}"; then
-						support_python_major_version="1"
-						break
-					fi
-				done
-				if [[ "${support_python_major_version}" == "1" ]]; then
-					if _python_check_python_abi_matching --patterns-list "${python2_version}" "${RESTRICT_PYTHON_ABIS}"; then
-						die "Active version of CPython 2 is not supported by ${CATEGORY}/${PF}"
-					fi
-				else
-					python2_version=""
-				fi
-			fi
-
-			if has_version "=dev-lang/python-3*"; then
-				if [[ "$(readlink "${EPREFIX}/usr/bin/python3")" != "python3."* ]]; then
-					die "'${EPREFIX}/usr/bin/python3' is not valid symlink"
-				fi
-
-				python3_version="$("${EPREFIX}/usr/bin/python3" -c 'from sys import version_info; print(".".join(str(x) for x in version_info[:2]))')"
-
-				support_python_major_version="0"
-				for PYTHON_ABI in "${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]}"; do
-					if ! _python_check_python_abi_matching --patterns-list "${PYTHON_ABI}" "${RESTRICT_PYTHON_ABIS}"; then
-						support_python_major_version="1"
-						break
-					fi
-				done
-				if [[ "${support_python_major_version}" == "1" ]]; then
-					if _python_check_python_abi_matching --patterns-list "${python3_version}" "${RESTRICT_PYTHON_ABIS}"; then
-						die "Active version of CPython 3 is not supported by ${CATEGORY}/${PF}"
-					fi
-				else
-					python3_version=""
-				fi
-			fi
-
-			if [[ -z "${python2_version}" && -z "${python3_version}" ]]; then
-				eerror "${CATEGORY}/${PF} requires at least one of the following packages:"
-				for PYTHON_ABI in "${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]}" "${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]}"; do
-					if ! _python_check_python_abi_matching --patterns-list "${PYTHON_ABI}" "${RESTRICT_PYTHON_ABIS}"; then
-						eerror "    dev-lang/python:${PYTHON_ABI}"
-					fi
-				done
-				die "No supported version of CPython installed"
-			fi
-
-			if [[ -n "${python2_version}" && "${python_version}" == "2."* && "${python_version}" != "${python2_version}" ]]; then
-				eerror "Python wrapper is configured incorrectly or '${EPREFIX}/usr/bin/python2' symlink"
-				eerror "is set incorrectly. Use \`eselect python\` to fix configuration."
-				die "Incorrect configuration of Python"
-			fi
-			if [[ -n "${python3_version}" && "${python_version}" == "3."* && "${python_version}" != "${python3_version}" ]]; then
-				eerror "Python wrapper is configured incorrectly or '${EPREFIX}/usr/bin/python3' symlink"
-				eerror "is set incorrectly. Use \`eselect python\` to fix configuration."
-				die "Incorrect configuration of Python"
-			fi
-
-			PYTHON_ABIS="${python2_version} ${python3_version}"
-			PYTHON_ABIS="${PYTHON_ABIS# }"
-			export PYTHON_ABIS="${PYTHON_ABIS% }"
-		fi
-	fi
-
-	_python_final_sanity_checks
-}
-
-_python_prepare_flags() {
-	local array=() deleted_flag element flags new_value old_flag old_value operator pattern prefix variable
-
-	for variable in CPPFLAGS CFLAGS CXXFLAGS LDFLAGS; do
-		eval "_PYTHON_SAVED_${variable}=\"\${!variable}\""
-		for prefix in PYTHON_USER_ PYTHON_; do
-			if [[ "$(declare -p ${prefix}${variable} 2> /dev/null)" == "declare -a ${prefix}${variable}="* ]]; then
-				eval "array=(\"\${${prefix}${variable}[@]}\")"
-				for element in "${array[@]}"; do
-					if [[ "${element}" =~ ^${_PYTHON_ABI_PATTERN_REGEX}\ (\+|-)\ .+ ]]; then
-						pattern="${element%% *}"
-						element="${element#* }"
-						operator="${element%% *}"
-						flags="${element#* }"
-						if _python_check_python_abi_matching "${PYTHON_ABI}" "${pattern}"; then
-							if [[ "${operator}" == "+" ]]; then
-								eval "export ${variable}+=\"\${variable:+ }${flags}\""
-							elif [[ "${operator}" == "-" ]]; then
-								flags="${flags// /$'\n'}"
-								old_value="${!variable// /$'\n'}"
-								new_value=""
-								while read old_flag; do
-									while read deleted_flag; do
-										if [[ "${old_flag}" == ${deleted_flag} ]]; then
-											continue 2
-										fi
-									done <<< "${flags}"
-									new_value+="${new_value:+ }${old_flag}"
-								done <<< "${old_value}"
-								eval "export ${variable}=\"\${new_value}\""
-							fi
-						fi
-					else
-						die "Element '${element}' of ${prefix}${variable} array has invalid syntax"
-					fi
-				done
-			elif [[ -n "$(declare -p ${prefix}${variable} 2> /dev/null)" ]]; then
-				die "${prefix}${variable} should be indexed array"
-			fi
-		done
-	done
-}
-
-_python_restore_flags() {
-	local variable
-
-	for variable in CPPFLAGS CFLAGS CXXFLAGS LDFLAGS; do
-		eval "${variable}=\"\${_PYTHON_SAVED_${variable}}\""
-		unset _PYTHON_SAVED_${variable}
-	done
-}
-
-# @FUNCTION: python_execute_function
-# @USAGE: [--action-message message] [-d|--default-function] [--failure-message message] [-f|--final-ABI] [--nonfatal] [-q|--quiet] [-s|--separate-build-dirs] [--source-dir source_directory] [--] <function> [arguments]
-# @DESCRIPTION:
-# Execute specified function for each value of PYTHON_ABIS, optionally passing additional
-# arguments. The specified function can use PYTHON_ABI and BUILDDIR variables.
-python_execute_function() {
-	if ! _python_package_supporting_installation_for_multiple_python_abis; then
-		die "${FUNCNAME}() cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
-	fi
-
-	_python_check_python_pkg_setup_execution
-	_python_set_color_variables
-
-	local action action_message action_message_template default_function="0" failure_message failure_message_template final_ABI="0" function iterated_PYTHON_ABIS nonfatal="0" previous_directory previous_directory_stack previous_directory_stack_length PYTHON_ABI quiet="0" return_code separate_build_dirs="0" source_dir
-
-	while (($#)); do
-		case "$1" in
-			--action-message)
-				action_message_template="$2"
-				shift
-				;;
-			-d|--default-function)
-				default_function="1"
-				;;
-			--failure-message)
-				failure_message_template="$2"
-				shift
-				;;
-			-f|--final-ABI)
-				final_ABI="1"
-				;;
-			--nonfatal)
-				nonfatal="1"
-				;;
-			-q|--quiet)
-				quiet="1"
-				;;
-			-s|--separate-build-dirs)
-				separate_build_dirs="1"
-				;;
-			--source-dir)
-				source_dir="$2"
-				shift
-				;;
-			--)
-				shift
-				break
-				;;
-			-*)
-				die "${FUNCNAME}(): Unrecognized option '$1'"
-				;;
-			*)
-				break
-				;;
-		esac
-		shift
-	done
-
-	if [[ -n "${source_dir}" && "${separate_build_dirs}" == 0 ]]; then
-		die "${FUNCNAME}(): '--source-dir' option can be specified only with '--separate-build-dirs' option"
-	fi
-
-	if [[ "${default_function}" == "0" ]]; then
-		if [[ "$#" -eq 0 ]]; then
-			die "${FUNCNAME}(): Missing function name"
-		fi
-		function="$1"
-		shift
-
-		if [[ -z "$(type -t "${function}")" ]]; then
-			die "${FUNCNAME}(): '${function}' function is not defined"
-		fi
-	else
-		if has "${EAPI:-0}" 0 1; then
-			die "${FUNCNAME}(): '--default-function' option cannot be used in this EAPI"
-		fi
-
-		if [[ "${EBUILD_PHASE}" == "configure" ]]; then
-			if has "${EAPI}" 2 3; then
-				python_default_function() {
-					econf "$@"
-				}
-			else
-				python_default_function() {
-					nonfatal econf "$@"
-				}
-			fi
-		elif [[ "${EBUILD_PHASE}" == "compile" ]]; then
-			python_default_function() {
-				emake "$@"
-			}
-		elif [[ "${EBUILD_PHASE}" == "test" ]]; then
-			python_default_function() {
-				# Stolen from portage's _eapi0_src_test()
-				local emake_cmd="${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE}"
-				if ${emake_cmd} -j1 -n check &> /dev/null; then
-					${emake_cmd} -j1 check "$@"
-				elif ${emake_cmd} -j1 -n test &> /dev/null; then
-					${emake_cmd} -j1 test "$@"
-				fi
-			}
-		elif [[ "${EBUILD_PHASE}" == "install" ]]; then
-			python_default_function() {
-				emake DESTDIR="${D}" install "$@"
-			}
-		else
-			die "${FUNCNAME}(): '--default-function' option cannot be used in this ebuild phase"
-		fi
-		function="python_default_function"
-	fi
-
-	# Ensure that python_execute_function() cannot be directly or indirectly called by python_execute_function().
-	if _python_abi-specific_local_scope; then
-		die "${FUNCNAME}(): Invalid call stack"
-	fi
-
-	if [[ "${quiet}" == "0" ]]; then
-		[[ "${EBUILD_PHASE}" == "setup" ]] && action="Setting up"
-		[[ "${EBUILD_PHASE}" == "unpack" ]] && action="Unpacking"
-		[[ "${EBUILD_PHASE}" == "prepare" ]] && action="Preparation"
-		[[ "${EBUILD_PHASE}" == "configure" ]] && action="Configuration"
-		[[ "${EBUILD_PHASE}" == "compile" ]] && action="Building"
-		[[ "${EBUILD_PHASE}" == "test" ]] && action="Testing"
-		[[ "${EBUILD_PHASE}" == "install" ]] && action="Installation"
-		[[ "${EBUILD_PHASE}" == "preinst" ]] && action="Preinstallation"
-		[[ "${EBUILD_PHASE}" == "postinst" ]] && action="Postinstallation"
-		[[ "${EBUILD_PHASE}" == "prerm" ]] && action="Preuninstallation"
-		[[ "${EBUILD_PHASE}" == "postrm" ]] && action="Postuninstallation"
-	fi
-
-	_python_calculate_PYTHON_ABIS
-	if [[ "${final_ABI}" == "1" ]]; then
-		iterated_PYTHON_ABIS="$(PYTHON -f --ABI)"
-	else
-		iterated_PYTHON_ABIS="${PYTHON_ABIS}"
-	fi
-	for PYTHON_ABI in ${iterated_PYTHON_ABIS}; do
-		if [[ "${EBUILD_PHASE}" == "test" ]] && _python_check_python_abi_matching --patterns-list "${PYTHON_ABI}" "${PYTHON_TESTS_RESTRICTED_ABIS}"; then
-			if [[ "${quiet}" == "0" ]]; then
-				echo " ${_GREEN}*${_NORMAL} ${_BLUE}Testing of ${CATEGORY}/${PF} with $(python_get_implementation_and_version) skipped${_NORMAL}"
-			fi
-			continue
-		fi
-
-		_python_prepare_flags
-
-		if [[ "${quiet}" == "0" ]]; then
-			if [[ -n "${action_message_template}" ]]; then
-				eval "action_message=\"${action_message_template}\""
-			else
-				action_message="${action} of ${CATEGORY}/${PF} with $(python_get_implementation_and_version)..."
-			fi
-			echo " ${_GREEN}*${_NORMAL} ${_BLUE}${action_message}${_NORMAL}"
-		fi
-
-		if [[ "${separate_build_dirs}" == "1" ]]; then
-			if [[ -n "${source_dir}" ]]; then
-				export BUILDDIR="${S}/${source_dir}-${PYTHON_ABI}"
-			else
-				export BUILDDIR="${S}-${PYTHON_ABI}"
-			fi
-			pushd "${BUILDDIR}" > /dev/null || die "pushd failed"
-		else
-			export BUILDDIR="${S}"
-		fi
-
-		previous_directory="$(pwd)"
-		previous_directory_stack="$(dirs -p)"
-		previous_directory_stack_length="$(dirs -p | wc -l)"
-
-		if ! has "${EAPI}" 0 1 2 3 && has "${PYTHON_ABI}" ${FAILURE_TOLERANT_PYTHON_ABIS}; then
-			EPYTHON="$(PYTHON)" nonfatal "${function}" "$@"
-		else
-			EPYTHON="$(PYTHON)" "${function}" "$@"
-		fi
-
-		return_code="$?"
-
-		_python_restore_flags
-
-		if [[ "${return_code}" -ne 0 ]]; then
-			if [[ -n "${failure_message_template}" ]]; then
-				eval "failure_message=\"${failure_message_template}\""
-			else
-				failure_message="${action} failed with $(python_get_implementation_and_version) in ${function}() function"
-			fi
-
-			if [[ "${nonfatal}" == "1" ]]; then
-				if [[ "${quiet}" == "0" ]]; then
-					ewarn "${failure_message}"
-				fi
-			elif [[ "${final_ABI}" == "0" ]] && has "${PYTHON_ABI}" ${FAILURE_TOLERANT_PYTHON_ABIS}; then
-				if [[ "${EBUILD_PHASE}" != "test" ]] || ! has test-fail-continue ${FEATURES}; then
-					local enabled_PYTHON_ABIS= other_PYTHON_ABI
-					for other_PYTHON_ABI in ${PYTHON_ABIS}; do
-						[[ "${other_PYTHON_ABI}" != "${PYTHON_ABI}" ]] && enabled_PYTHON_ABIS+="${enabled_PYTHON_ABIS:+ }${other_PYTHON_ABI}"
-					done
-					export PYTHON_ABIS="${enabled_PYTHON_ABIS}"
-				fi
-				if [[ "${quiet}" == "0" ]]; then
-					ewarn "${failure_message}"
-				fi
-				if [[ -z "${PYTHON_ABIS}" ]]; then
-					die "${function}() function failed with all enabled Python ABIs"
-				fi
-			else
-				die "${failure_message}"
-			fi
-		fi
-
-		# Ensure that directory stack has not been decreased.
-		if [[ "$(dirs -p | wc -l)" -lt "${previous_directory_stack_length}" ]]; then
-			die "Directory stack decreased illegally"
-		fi
-
-		# Avoid side effects of earlier returning from the specified function.
-		while [[ "$(dirs -p | wc -l)" -gt "${previous_directory_stack_length}" ]]; do
-			popd > /dev/null || die "popd failed"
-		done
-
-		# Ensure that the bottom part of directory stack has not been changed. Restore
-		# previous directory (from before running of the specified function) before
-		# comparison of directory stacks to avoid mismatch of directory stacks after
-		# potential using of 'cd' to change current directory. Restoration of previous
-		# directory allows to safely use 'cd' to change current directory in the
-		# specified function without changing it back to original directory.
-		cd "${previous_directory}"
-		if [[ "$(dirs -p)" != "${previous_directory_stack}" ]]; then
-			die "Directory stack changed illegally"
-		fi
-
-		if [[ "${separate_build_dirs}" == "1" ]]; then
-			popd > /dev/null || die "popd failed"
-		fi
-		unset BUILDDIR
-	done
-
-	if [[ "${default_function}" == "1" ]]; then
-		unset -f python_default_function
-	fi
-}
-
-# @FUNCTION: python_copy_sources
-# @USAGE: <directory="${S}"> [directory]
-# @DESCRIPTION:
-# Copy unpacked sources of current package to separate build directory for each Python ABI.
-python_copy_sources() {
-	if ! _python_package_supporting_installation_for_multiple_python_abis; then
-		die "${FUNCNAME}() cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
-	fi
-
-	_python_check_python_pkg_setup_execution
-
-	local dir dirs=() PYTHON_ABI
-
-	if [[ "$#" -eq 0 ]]; then
-		if [[ "${WORKDIR}" == "${S}" ]]; then
-			die "${FUNCNAME}() cannot be used with current value of S variable"
-		fi
-		dirs=("${S%/}")
-	else
-		dirs=("$@")
-	fi
-
-	_python_calculate_PYTHON_ABIS
-	for PYTHON_ABI in ${PYTHON_ABIS}; do
-		for dir in "${dirs[@]}"; do
-			cp -pr "${dir}" "${dir}-${PYTHON_ABI}" > /dev/null || die "Copying of sources failed"
-		done
-	done
-}
-
-# @FUNCTION: python_generate_wrapper_scripts
-# @USAGE: [-E|--respect-EPYTHON] [-f|--force] [-q|--quiet] [--] <file> [files]
-# @DESCRIPTION:
-# Generate wrapper scripts. Existing files are overwritten only with --force option.
-# If --respect-EPYTHON option is specified, then generated wrapper scripts will
-# respect EPYTHON variable at run time.
-#
-# This function can be used only in src_install() phase.
-python_generate_wrapper_scripts() {
-	if [[ "${EBUILD_PHASE}" != "install" ]]; then
-		die "${FUNCNAME}() can be used only in src_install() phase"
-	fi
-
-	if ! _python_package_supporting_installation_for_multiple_python_abis; then
-		die "${FUNCNAME}() cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
-	fi
-
-	_python_check_python_pkg_setup_execution
-	_python_initialize_prefix_variables
-
-	local eselect_python_option file force="0" quiet="0" PYTHON_ABI PYTHON_ABIS_list python2_enabled="0" python3_enabled="0" respect_EPYTHON="0"
-
-	while (($#)); do
-		case "$1" in
-			-E|--respect-EPYTHON)
-				respect_EPYTHON="1"
-				;;
-			-f|--force)
-				force="1"
-				;;
-			-q|--quiet)
-				quiet="1"
-				;;
-			--)
-				shift
-				break
-				;;
-			-*)
-				die "${FUNCNAME}(): Unrecognized option '$1'"
-				;;
-			*)
-				break
-				;;
-		esac
-		shift
-	done
-
-	if [[ "$#" -eq 0 ]]; then
-		die "${FUNCNAME}(): Missing arguments"
-	fi
-
-	_python_calculate_PYTHON_ABIS
-	for PYTHON_ABI in "${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]}"; do
-		if has "${PYTHON_ABI}" ${PYTHON_ABIS}; then
-			python2_enabled="1"
-		fi
-	done
-	for PYTHON_ABI in "${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]}"; do
-		if has "${PYTHON_ABI}" ${PYTHON_ABIS}; then
-			python3_enabled="1"
-		fi
-	done
-
-	if [[ "${python2_enabled}" == "1" && "${python3_enabled}" == "1" ]]; then
-		eselect_python_option=
-	elif [[ "${python2_enabled}" == "1" && "${python3_enabled}" == "0" ]]; then
-		eselect_python_option="--python2"
-	elif [[ "${python2_enabled}" == "0" && "${python3_enabled}" == "1" ]]; then
-		eselect_python_option="--python3"
-	else
-		die "${FUNCNAME}(): Unsupported environment"
-	fi
-
-	PYTHON_ABIS_list="$("$(PYTHON -f)" -c "print(', '.join('\"%s\"' % x for x in reversed('${PYTHON_ABIS}'.split())))")"
-
-	for file in "$@"; do
-		if [[ -f "${file}" && "${force}" == "0" ]]; then
-			die "${FUNCNAME}(): '${file}' already exists"
-		fi
-
-		if [[ "${quiet}" == "0" ]]; then
-			einfo "Generating '${file#${ED%/}}' wrapper script"
-		fi
-
-		cat << EOF > "${file}"
-#!/usr/bin/env python
-# Gentoo '${file##*/}' wrapper script generated by python_generate_wrapper_scripts()
-
-import os
-import re
-import subprocess
-import sys
-
-cpython_ABI_re = re.compile(r"^(\d+\.\d+)$")
-jython_ABI_re = re.compile(r"^(\d+\.\d+)-jython$")
-pypy_ABI_re = re.compile(r"^\d+\.\d+-pypy-(\d+\.\d+)$")
-cpython_interpreter_re = re.compile(r"^python(\d+\.\d+)$")
-jython_interpreter_re = re.compile(r"^jython(\d+\.\d+)$")
-pypy_interpreter_re = re.compile(r"^pypy-c(\d+\.\d+)$")
-cpython_shebang_re = re.compile(r"^#![ \t]*(?:${EPREFIX}/usr/bin/python|(?:${EPREFIX})?/usr/bin/env[ \t]+(?:${EPREFIX}/usr/bin/)?python)")
-python_shebang_options_re = re.compile(r"^#![ \t]*${EPREFIX}/usr/bin/(?:jython|pypy-c|python)(?:\d+(?:\.\d+)?)?[ \t]+(-\S)")
-python_verification_output_re = re.compile("^GENTOO_PYTHON_TARGET_SCRIPT_PATH supported\n$")
-
-pypy_versions_mapping = {
-	"1.5": "2.7",
-	"1.6": "2.7",
-	"1.7": "2.7",
-	"1.8": "2.7",
-	"1.9": "2.7",
-}
-
-def get_PYTHON_ABI(python_interpreter):
-	cpython_matched = cpython_interpreter_re.match(python_interpreter)
-	jython_matched = jython_interpreter_re.match(python_interpreter)
-	pypy_matched = pypy_interpreter_re.match(python_interpreter)
-	if cpython_matched is not None:
-		PYTHON_ABI = cpython_matched.group(1)
-	elif jython_matched is not None:
-		PYTHON_ABI = jython_matched.group(1) + "-jython"
-	elif pypy_matched is not None:
-		PYTHON_ABI = pypy_versions_mapping[pypy_matched.group(1)] + "-pypy-" + pypy_matched.group(1)
-	else:
-		PYTHON_ABI = None
-	return PYTHON_ABI
-
-def get_python_interpreter(PYTHON_ABI):
-	cpython_matched = cpython_ABI_re.match(PYTHON_ABI)
-	jython_matched = jython_ABI_re.match(PYTHON_ABI)
-	pypy_matched = pypy_ABI_re.match(PYTHON_ABI)
-	if cpython_matched is not None:
-		python_interpreter = "python" + cpython_matched.group(1)
-	elif jython_matched is not None:
-		python_interpreter = "jython" + jython_matched.group(1)
-	elif pypy_matched is not None:
-		python_interpreter = "pypy-c" + pypy_matched.group(1)
-	else:
-		python_interpreter = None
-	return python_interpreter
-
-EOF
-		if [[ "$?" != "0" ]]; then
-			die "${FUNCNAME}(): Generation of '$1' failed"
-		fi
-		if [[ "${respect_EPYTHON}" == "1" ]]; then
-			cat << EOF >> "${file}"
-python_interpreter = os.environ.get("EPYTHON")
-if python_interpreter:
-	PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
-	if PYTHON_ABI is None:
-		sys.stderr.write("%s: EPYTHON variable has unrecognized value '%s'\n" % (sys.argv[0], python_interpreter))
-		sys.exit(1)
-else:
-	try:
-		environment = os.environ.copy()
-		environment["ROOT"] = "/"
-		eselect_process = subprocess.Popen(["${EPREFIX}/usr/bin/eselect", "python", "show"${eselect_python_option:+, $(echo "\"")}${eselect_python_option}${eselect_python_option:+$(echo "\"")}], env=environment, stdout=subprocess.PIPE)
-		if eselect_process.wait() != 0:
-			raise ValueError
-	except (OSError, ValueError):
-		sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0])
-		sys.exit(1)
-
-	python_interpreter = eselect_process.stdout.read()
-	if not isinstance(python_interpreter, str):
-		# Python 3
-		python_interpreter = python_interpreter.decode()
-	python_interpreter = python_interpreter.rstrip("\n")
-
-	PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
-	if PYTHON_ABI is None:
-		sys.stderr.write("%s: 'eselect python show${eselect_python_option:+ }${eselect_python_option}' printed unrecognized value '%s'\n" % (sys.argv[0], python_interpreter))
-		sys.exit(1)
-
-wrapper_script_path = os.path.realpath(sys.argv[0])
-target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI)
-if not os.path.exists(target_executable_path):
-	sys.stderr.write("%s: '%s' does not exist\n" % (sys.argv[0], target_executable_path))
-	sys.exit(1)
-EOF
-			if [[ "$?" != "0" ]]; then
-				die "${FUNCNAME}(): Generation of '$1' failed"
-			fi
-		else
-			cat << EOF >> "${file}"
-try:
-	environment = os.environ.copy()
-	environment["ROOT"] = "/"
-	eselect_process = subprocess.Popen(["${EPREFIX}/usr/bin/eselect", "python", "show"${eselect_python_option:+, $(echo "\"")}${eselect_python_option}${eselect_python_option:+$(echo "\"")}], env=environment, stdout=subprocess.PIPE)
-	if eselect_process.wait() != 0:
-		raise ValueError
-except (OSError, ValueError):
-	sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0])
-	sys.exit(1)
-
-python_interpreter = eselect_process.stdout.read()
-if not isinstance(python_interpreter, str):
-	# Python 3
-	python_interpreter = python_interpreter.decode()
-python_interpreter = python_interpreter.rstrip("\n")
-
-PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
-if PYTHON_ABI is None:
-	sys.stderr.write("%s: 'eselect python show${eselect_python_option:+ }${eselect_python_option}' printed unrecognized value '%s'\n" % (sys.argv[0], python_interpreter))
-	sys.exit(1)
-
-wrapper_script_path = os.path.realpath(sys.argv[0])
-for PYTHON_ABI in [PYTHON_ABI, ${PYTHON_ABIS_list}]:
-	target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI)
-	if os.path.exists(target_executable_path):
-		break
-else:
-	sys.stderr.write("%s: No target script exists for '%s'\n" % (sys.argv[0], wrapper_script_path))
-	sys.exit(1)
-
-python_interpreter = get_python_interpreter(PYTHON_ABI)
-if python_interpreter is None:
-	sys.stderr.write("%s: Unrecognized Python ABI '%s'\n" % (sys.argv[0], PYTHON_ABI))
-	sys.exit(1)
-EOF
-			if [[ "$?" != "0" ]]; then
-				die "${FUNCNAME}(): Generation of '$1' failed"
-			fi
-		fi
-		cat << EOF >> "${file}"
-
-target_executable = open(target_executable_path, "rb")
-target_executable_first_line = target_executable.readline()
-target_executable.close()
-if not isinstance(target_executable_first_line, str):
-	# Python 3
-	target_executable_first_line = target_executable_first_line.decode("utf_8", "replace")
-
-options = []
-python_shebang_options_matched = python_shebang_options_re.match(target_executable_first_line)
-if python_shebang_options_matched is not None:
-	options = [python_shebang_options_matched.group(1)]
-
-cpython_shebang_matched = cpython_shebang_re.match(target_executable_first_line)
-
-if cpython_shebang_matched is not None:
-	try:
-		python_interpreter_path = "${EPREFIX}/usr/bin/%s" % python_interpreter
-		os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"] = "1"
-		python_verification_process = subprocess.Popen([python_interpreter_path, "-c", "pass"], stdout=subprocess.PIPE)
-		del os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"]
-		if python_verification_process.wait() != 0:
-			raise ValueError
-
-		python_verification_output = python_verification_process.stdout.read()
-		if not isinstance(python_verification_output, str):
-			# Python 3
-			python_verification_output = python_verification_output.decode()
-
-		if not python_verification_output_re.match(python_verification_output):
-			raise ValueError
-
-		if cpython_interpreter_re.match(python_interpreter) is not None:
-			os.environ["GENTOO_PYTHON_PROCESS_NAME"] = os.path.basename(sys.argv[0])
-			os.environ["GENTOO_PYTHON_WRAPPER_SCRIPT_PATH"] = sys.argv[0]
-			os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH"] = target_executable_path
-
-		if hasattr(os, "execv"):
-			os.execv(python_interpreter_path, [python_interpreter_path] + options + sys.argv)
-		else:
-			sys.exit(subprocess.Popen([python_interpreter_path] + options + sys.argv).wait())
-	except (KeyboardInterrupt, SystemExit):
-		raise
-	except:
-		pass
-	for variable in ("GENTOO_PYTHON_PROCESS_NAME", "GENTOO_PYTHON_WRAPPER_SCRIPT_PATH", "GENTOO_PYTHON_TARGET_SCRIPT_PATH", "GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"):
-		if variable in os.environ:
-			del os.environ[variable]
-
-if hasattr(os, "execv"):
-	os.execv(target_executable_path, sys.argv)
-else:
-	sys.exit(subprocess.Popen([target_executable_path] + sys.argv[1:]).wait())
-EOF
-		if [[ "$?" != "0" ]]; then
-			die "${FUNCNAME}(): Generation of '$1' failed"
-		fi
-		fperms +x "${file#${ED%/}}" || die "fperms '${file}' failed"
-	done
-}
-
-# @ECLASS-VARIABLE: PYTHON_VERSIONED_SCRIPTS
-# @DESCRIPTION:
-# Array of regular expressions of paths to versioned Python scripts.
-# Python scripts in /usr/bin and /usr/sbin are versioned by default.
-
-# @ECLASS-VARIABLE: PYTHON_VERSIONED_EXECUTABLES
-# @DESCRIPTION:
-# Array of regular expressions of paths to versioned executables (including Python scripts).
-
-# @ECLASS-VARIABLE: PYTHON_NONVERSIONED_EXECUTABLES
-# @DESCRIPTION:
-# Array of regular expressions of paths to nonversioned executables (including Python scripts).
-
-# @FUNCTION: python_merge_intermediate_installation_images
-# @USAGE: [-q|--quiet] [--] <intermediate_installation_images_directory>
-# @DESCRIPTION:
-# Merge intermediate installation images into installation image.
-#
-# This function can be used only in src_install() phase.
-python_merge_intermediate_installation_images() {
-	if [[ "${EBUILD_PHASE}" != "install" ]]; then
-		die "${FUNCNAME}() can be used only in src_install() phase"
-	fi
-
-	if ! _python_package_supporting_installation_for_multiple_python_abis; then
-		die "${FUNCNAME}() cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
-	fi
-
-	_python_check_python_pkg_setup_execution
-	_python_initialize_prefix_variables
-
-	local absolute_file b file files=() intermediate_installation_images_directory PYTHON_ABI quiet="0" regex shebang version_executable wrapper_scripts=() wrapper_scripts_set=()
-
-	while (($#)); do
-		case "$1" in
-			-q|--quiet)
-				quiet="1"
-				;;
-			--)
-				shift
-				break
-				;;
-			-*)
-				die "${FUNCNAME}(): Unrecognized option '$1'"
-				;;
-			*)
-				break
-				;;
-		esac
-		shift
-	done
-
-	if [[ "$#" -ne 1 ]]; then
-		die "${FUNCNAME}() requires 1 argument"
-	fi
-
-	intermediate_installation_images_directory="$1"
-
-	if [[ ! -d "${intermediate_installation_images_directory}" ]]; then
-		die "${FUNCNAME}(): Intermediate installation images directory '${intermediate_installation_images_directory}' does not exist"
-	fi
-
-	_python_calculate_PYTHON_ABIS
-	if [[ "$(PYTHON -f --ABI)" == 3.* ]]; then
-		b="b"
-	fi
-
-	while read -d $'\0' -r file; do
-		files+=("${file}")
-	done < <("$(PYTHON -f)" -c \
-"import os
-import sys
-
-if hasattr(sys.stdout, 'buffer'):
-	# Python 3
-	stdout = sys.stdout.buffer
-else:
-	# Python 2
-	stdout = sys.stdout
-
-files_set = set()
-
-os.chdir(${b}'${intermediate_installation_images_directory}')
-
-for PYTHON_ABI in ${b}'${PYTHON_ABIS}'.split():
-	for root, dirs, files in os.walk(PYTHON_ABI + ${b}'${EPREFIX}'):
-		root = root[len(PYTHON_ABI + ${b}'${EPREFIX}')+1:]
-		files_set.update(root + ${b}'/' + file for file in files)
-
-for file in sorted(files_set):
-	stdout.write(file)
-	stdout.write(${b}'\x00')" || die "${FUNCNAME}(): Failure of extraction of files in intermediate installation images")
-
-	for PYTHON_ABI in ${PYTHON_ABIS}; do
-		if [[ ! -d "${intermediate_installation_images_directory}/${PYTHON_ABI}" ]]; then
-			die "${FUNCNAME}(): Intermediate installation image for Python ABI '${PYTHON_ABI}' does not exist"
-		fi
-
-		pushd "${intermediate_installation_images_directory}/${PYTHON_ABI}${EPREFIX}" > /dev/null || die "pushd failed"
-
-		for file in "${files[@]}"; do
-			version_executable="0"
-			for regex in "/usr/bin/.*" "/usr/sbin/.*" "${PYTHON_VERSIONED_SCRIPTS[@]}"; do
-				if [[ "/${file}" =~ ^${regex}$ ]]; then
-					version_executable="1"
-					break
-				fi
-			done
-			for regex in "${PYTHON_VERSIONED_EXECUTABLES[@]}"; do
-				if [[ "/${file}" =~ ^${regex}$ ]]; then
-					version_executable="2"
-					break
-				fi
-			done
-			if [[ "${version_executable}" != "0" ]]; then
-				for regex in "${PYTHON_NONVERSIONED_EXECUTABLES[@]}"; do
-					if [[ "/${file}" =~ ^${regex}$ ]]; then
-						version_executable="0"
-						break
-					fi
-				done
-			fi
-
-			[[ "${version_executable}" == "0" ]] && continue
-
-			if [[ -L "${file}" ]]; then
-				absolute_file="$(readlink "${file}")"
-				if [[ "${absolute_file}" == /* ]]; then
-					absolute_file="${intermediate_installation_images_directory}/${PYTHON_ABI}${EPREFIX}/${absolute_file##/}"
-				else
-					if [[ "${file}" == */* ]]; then
-						absolute_file="${intermediate_installation_images_directory}/${PYTHON_ABI}${EPREFIX}/${file%/*}/${absolute_file}"
-					else
-						absolute_file="${intermediate_installation_images_directory}/${PYTHON_ABI}${EPREFIX}/${absolute_file}"
-					fi
-				fi
-			else
-				absolute_file="${intermediate_installation_images_directory}/${PYTHON_ABI}${EPREFIX}/${file}"
-			fi
-
-			[[ ! -x "${absolute_file}" ]] && continue
-
-			shebang="$(head -n1 "${absolute_file}")" || die "Extraction of shebang from '${absolute_file}' failed"
-
-			if [[ "${version_executable}" == "2" ]]; then
-				wrapper_scripts+=("${ED}${file}")
-			elif [[ "${version_executable}" == "1" ]]; then
-				if [[ "${shebang}" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX}([[:digit:]]+(\.[[:digit:]]+)?)?($|[[:space:]]+) ]]; then
-					wrapper_scripts+=("${ED}${file}")
-				else
-					version_executable="0"
-				fi
-			fi
-
-			[[ "${version_executable}" == "0" ]] && continue
-
-			if [[ -e "${file}-${PYTHON_ABI}" ]]; then
-				die "${FUNCNAME}(): '${EPREFIX}/${file}-${PYTHON_ABI}' already exists"
-			fi
-
-			mv "${file}" "${file}-${PYTHON_ABI}" || die "Renaming of '${file}' failed"
-
-			if [[ "${shebang}" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX}[[:digit:]]*($|[[:space:]]+) ]]; then
-				if [[ -L "${file}-${PYTHON_ABI}" ]]; then
-					python_convert_shebangs $([[ "${quiet}" == "1" ]] && echo --quiet) "${PYTHON_ABI}" "${absolute_file}"
-				else
-					python_convert_shebangs $([[ "${quiet}" == "1" ]] && echo --quiet) "${PYTHON_ABI}" "${file}-${PYTHON_ABI}"
-				fi
-			fi
-		done
-
-		popd > /dev/null || die "popd failed"
-
-		# This is per bug #390691, without the duplication refactor, and with
-		# the 3-way structure per comment #6. This enable users with old
-		# coreutils to upgrade a lot easier (you need to upgrade python+portage
-		# before coreutils can be upgraded).
-		if ROOT="/" has_version '>=sys-apps/coreutils-6.9.90'; then
-			cp -fr --preserve=all --no-preserve=context "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed"
-		elif ROOT="/" has_version sys-apps/coreutils; then
-			cp -fr --preserve=all "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed"
-		else
-			cp -fpr "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed"
-		fi
-	done
-
-	rm -fr "${intermediate_installation_images_directory}"
-
-	if [[ "${#wrapper_scripts[@]}" -ge 1 ]]; then
-		rm -f "${T}/python_wrapper_scripts"
-
-		for file in "${wrapper_scripts[@]}"; do
-			echo -n "${file}" >> "${T}/python_wrapper_scripts"
-			echo -en "\x00" >> "${T}/python_wrapper_scripts"
-		done
-
-		while read -d $'\0' -r file; do
-			wrapper_scripts_set+=("${file}")
-		done < <("$(PYTHON -f)" -c \
-"import sys
-
-if hasattr(sys.stdout, 'buffer'):
-	# Python 3
-	stdout = sys.stdout.buffer
-else:
-	# Python 2
-	stdout = sys.stdout
-
-python_wrapper_scripts_file = open('${T}/python_wrapper_scripts', 'rb')
-files = set(python_wrapper_scripts_file.read().rstrip(${b}'\x00').split(${b}'\x00'))
-python_wrapper_scripts_file.close()
-
-for file in sorted(files):
-	stdout.write(file)
-	stdout.write(${b}'\x00')" || die "${FUNCNAME}(): Failure of extraction of set of wrapper scripts")
-
-		python_generate_wrapper_scripts $([[ "${quiet}" == "1" ]] && echo --quiet) "${wrapper_scripts_set[@]}"
-	fi
-}
-
-# ================================================================================================
-# ========= FUNCTIONS FOR PACKAGES NOT SUPPORTING INSTALLATION FOR MULTIPLE PYTHON ABIS ==========
-# ================================================================================================
-
-unset EPYTHON PYTHON_ABI
-
-# @FUNCTION: python_set_active_version
-# @USAGE: <Python_ABI|2|3>
-# @DESCRIPTION:
-# Set locally active version of Python.
-# If Python_ABI argument is specified, then version of Python corresponding to Python_ABI is used.
-# If 2 argument is specified, then active version of CPython 2 is used.
-# If 3 argument is specified, then active version of CPython 3 is used.
-#
-# This function can be used only in pkg_setup() phase.
-python_set_active_version() {
-	if [[ "${EBUILD_PHASE}" != "setup" ]]; then
-		die "${FUNCNAME}() can be used only in pkg_setup() phase"
-	fi
-
-	if _python_package_supporting_installation_for_multiple_python_abis; then
-		die "${FUNCNAME}() cannot be used in ebuilds of packages supporting installation for multiple Python ABIs"
-	fi
-
-	if [[ "$#" -ne 1 ]]; then
-		die "${FUNCNAME}() requires 1 argument"
-	fi
-
-	_python_initial_sanity_checks
-
-	if [[ -z "${PYTHON_ABI}" ]]; then
-		if [[ -n "$(_python_get_implementation --ignore-invalid "$1")" ]]; then
-			# PYTHON_ABI variable is intended to be used only in ebuilds/eclasses,
-			# so it does not need to be exported to subprocesses.
-			PYTHON_ABI="$1"
-			if ! _python_implementation && ! has_version "$(python_get_implementational_package)"; then
-				die "${FUNCNAME}(): '$(python_get_implementational_package)' is not installed"
-			fi
-			export EPYTHON="$(PYTHON "$1")"
-		elif [[ "$1" == "2" ]]; then
-			if ! _python_implementation && ! has_version "=dev-lang/python-2*"; then
-				die "${FUNCNAME}(): '=dev-lang/python-2*' is not installed"
-			fi
-			export EPYTHON="$(PYTHON -2)"
-			PYTHON_ABI="${EPYTHON#python}"
-			PYTHON_ABI="${PYTHON_ABI%%-*}"
-		elif [[ "$1" == "3" ]]; then
-			if ! _python_implementation && ! has_version "=dev-lang/python-3*"; then
-				die "${FUNCNAME}(): '=dev-lang/python-3*' is not installed"
-			fi
-			export EPYTHON="$(PYTHON -3)"
-			PYTHON_ABI="${EPYTHON#python}"
-			PYTHON_ABI="${PYTHON_ABI%%-*}"
-		else
-			die "${FUNCNAME}(): Unrecognized argument '$1'"
-		fi
-	fi
-
-	_python_final_sanity_checks
-
-	# python-updater checks PYTHON_REQUESTED_ACTIVE_VERSION variable.
-	PYTHON_REQUESTED_ACTIVE_VERSION="$1"
-}
-
-# @FUNCTION: python_need_rebuild
-# @DESCRIPTION:
-# Mark current package for rebuilding by python-updater after
-# switching of active version of Python.
-python_need_rebuild() {
-	if _python_package_supporting_installation_for_multiple_python_abis; then
-		die "${FUNCNAME}() cannot be used in ebuilds of packages supporting installation for multiple Python ABIs"
-	fi
-
-	_python_check_python_pkg_setup_execution
-
-	if [[ "$#" -ne 0 ]]; then
-		die "${FUNCNAME}() does not accept arguments"
-	fi
-
-	export PYTHON_NEED_REBUILD="$(PYTHON --ABI)"
-}
-
-# ================================================================================================
-# ======================================= GETTER FUNCTIONS =======================================
-# ================================================================================================
-
-_PYTHON_ABI_EXTRACTION_COMMAND=\
-'import platform
-import sys
-sys.stdout.write(".".join(str(x) for x in sys.version_info[:2]))
-if platform.system()[:4] == "Java":
-	sys.stdout.write("-jython")
-elif hasattr(platform, "python_implementation") and platform.python_implementation() == "PyPy":
-	sys.stdout.write("-pypy-" + ".".join(str(x) for x in sys.pypy_version_info[:2]))'
-
-_python_get_implementation() {
-	local ignore_invalid="0"
-
-	while (($#)); do
-		case "$1" in
-			--ignore-invalid)
-				ignore_invalid="1"
-				;;
-			--)
-				shift
-				break
-				;;
-			-*)
-				die "${FUNCNAME}(): Unrecognized option '$1'"
-				;;
-			*)
-				break
-				;;
-		esac
-		shift
-	done
-
-	if [[ "$#" -ne 1 ]]; then
-		die "${FUNCNAME}() requires 1 argument"
-	fi
-
-	if [[ "$1" =~ ^[[:digit:]]+\.[[:digit:]]+$ ]]; then
-		echo "CPython"
-	elif [[ "$1" =~ ^[[:digit:]]+\.[[:digit:]]+-jython$ ]]; then
-		echo "Jython"
-	elif [[ "$1" =~ ^[[:digit:]]+\.[[:digit:]]+-pypy-[[:digit:]]+\.[[:digit:]]+$ ]]; then
-		echo "PyPy"
-	else
-		if [[ "${ignore_invalid}" == "0" ]]; then
-			die "${FUNCNAME}(): Unrecognized Python ABI '$1'"
-		fi
-	fi
-}
-
-# @FUNCTION: PYTHON
-# @USAGE: [-2] [-3] [--ABI] [-a|--absolute-path] [-f|--final-ABI] [--] <Python_ABI="${PYTHON_ABI}">
-# @DESCRIPTION:
-# Print filename of Python interpreter for specified Python ABI. If Python_ABI argument
-# is ommitted, then PYTHON_ABI environment variable must be set and is used.
-# If -2 option is specified, then active version of CPython 2 is used.
-# If -3 option is specified, then active version of CPython 3 is used.
-# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used.
-# -2, -3 and --final-ABI options and Python_ABI argument cannot be specified simultaneously.
-# If --ABI option is specified, then only specified Python ABI is printed instead of
-# filename of Python interpreter.
-# If --absolute-path option is specified, then absolute path to Python interpreter is printed.
-# --ABI and --absolute-path options cannot be specified simultaneously.
-PYTHON() {
-	_python_check_python_pkg_setup_execution
-
-	local ABI_output="0" absolute_path_output="0" final_ABI="0" PYTHON_ABI="${PYTHON_ABI}" python_interpreter python2="0" python3="0"
-
-	while (($#)); do
-		case "$1" in
-			-2)
-				python2="1"
-				;;
-			-3)
-				python3="1"
-				;;
-			--ABI)
-				ABI_output="1"
-				;;
-			-a|--absolute-path)
-				absolute_path_output="1"
-				;;
-			-f|--final-ABI)
-				final_ABI="1"
-				;;
-			--)
-				shift
-				break
-				;;
-			-*)
-				die "${FUNCNAME}(): Unrecognized option '$1'"
-				;;
-			*)
-				break
-				;;
-		esac
-		shift
-	done
-
-	if [[ "${ABI_output}" == "1" && "${absolute_path_output}" == "1" ]]; then
-		die "${FUNCNAME}(): '--ABI' and '--absolute-path' options cannot be specified simultaneously"
-	fi
-
-	if [[ "$((${python2} + ${python3} + ${final_ABI}))" -gt 1 ]]; then
-		die "${FUNCNAME}(): '-2', '-3' or '--final-ABI' options cannot be specified simultaneously"
-	fi
-
-	if [[ "$#" -eq 0 ]]; then
-		if [[ "${final_ABI}" == "1" ]]; then
-			if ! _python_package_supporting_installation_for_multiple_python_abis; then
-				die "${FUNCNAME}(): '--final-ABI' option cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
-			fi
-			_python_calculate_PYTHON_ABIS
-			PYTHON_ABI="${PYTHON_ABIS##* }"
-		elif [[ "${python2}" == "1" ]]; then
-			PYTHON_ABI="$(ROOT="/" eselect python show --python2 --ABI)"
-			if [[ -z "${PYTHON_ABI}" ]]; then
-				die "${FUNCNAME}(): Active version of CPython 2 not set"
-			elif [[ "${PYTHON_ABI}" != "2."* ]]; then
-				die "${FUNCNAME}(): Internal error in \`eselect python show --python2\`"
-			fi
-		elif [[ "${python3}" == "1" ]]; then
-			PYTHON_ABI="$(ROOT="/" eselect python show --python3 --ABI)"
-			if [[ -z "${PYTHON_ABI}" ]]; then
-				die "${FUNCNAME}(): Active version of CPython 3 not set"
-			elif [[ "${PYTHON_ABI}" != "3."* ]]; then
-				die "${FUNCNAME}(): Internal error in \`eselect python show --python3\`"
-			fi
-		elif _python_package_supporting_installation_for_multiple_python_abis; then
-			if ! _python_abi-specific_local_scope; then
-				die "${FUNCNAME}() should be used in ABI-specific local scope"
-			fi
-		else
-			PYTHON_ABI="$("${EPREFIX}/usr/bin/python" -c "${_PYTHON_ABI_EXTRACTION_COMMAND}")"
-			if [[ -z "${PYTHON_ABI}" ]]; then
-				die "${FUNCNAME}(): Failure of extraction of locally active version of Python"
-			fi
-		fi
-	elif [[ "$#" -eq 1 ]]; then
-		if [[ "${final_ABI}" == "1" ]]; then
-			die "${FUNCNAME}(): '--final-ABI' option and Python ABI cannot be specified simultaneously"
-		fi
-		if [[ "${python2}" == "1" ]]; then
-			die "${FUNCNAME}(): '-2' option and Python ABI cannot be specified simultaneously"
-		fi
-		if [[ "${python3}" == "1" ]]; then
-			die "${FUNCNAME}(): '-3' option and Python ABI cannot be specified simultaneously"
-		fi
-		PYTHON_ABI="$1"
-	else
-		die "${FUNCNAME}(): Invalid usage"
-	fi
-
-	if [[ "${ABI_output}" == "1" ]]; then
-		echo -n "${PYTHON_ABI}"
-		return
-	else
-		if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
-			python_interpreter="python${PYTHON_ABI}"
-		elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
-			python_interpreter="jython${PYTHON_ABI%-jython}"
-		elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
-			python_interpreter="pypy-c${PYTHON_ABI#*-pypy-}"
-		fi
-
-		if [[ "${absolute_path_output}" == "1" ]]; then
-			echo -n "${EPREFIX}/usr/bin/${python_interpreter}"
-		else
-			echo -n "${python_interpreter}"
-		fi
-	fi
-
-	if [[ -n "${ABI}" && "${ABI}" != "${DEFAULT_ABI}" && "${DEFAULT_ABI}" != "default" ]]; then
-		echo -n "-${ABI}"
-	fi
-}
-
-# @FUNCTION: python_get_implementation
-# @USAGE: [-f|--final-ABI]
-# @DESCRIPTION:
-# Print name of Python implementation.
-# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used.
-python_get_implementation() {
-	_python_check_python_pkg_setup_execution
-
-	local final_ABI="0" PYTHON_ABI="${PYTHON_ABI}"
-
-	while (($#)); do
-		case "$1" in
-			-f|--final-ABI)
-				final_ABI="1"
-				;;
-			-*)
-				die "${FUNCNAME}(): Unrecognized option '$1'"
-				;;
-			*)
-				die "${FUNCNAME}(): Invalid usage"
-				;;
-		esac
-		shift
-	done
-
-	if [[ "${final_ABI}" == "1" ]]; then
-		if ! _python_package_supporting_installation_for_multiple_python_abis; then
-			die "${FUNCNAME}(): '--final-ABI' option cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
-		fi
-		PYTHON_ABI="$(PYTHON -f --ABI)"
-	else
-		if _python_package_supporting_installation_for_multiple_python_abis; then
-			if ! _python_abi-specific_local_scope; then
-				die "${FUNCNAME}() should be used in ABI-specific local scope"
-			fi
-		else
-			PYTHON_ABI="${PYTHON_ABI:-$(PYTHON --ABI)}"
-		fi
-	fi
-
-	echo "$(_python_get_implementation "${PYTHON_ABI}")"
-}
-
-# @FUNCTION: python_get_implementational_package
-# @USAGE: [-f|--final-ABI]
-# @DESCRIPTION:
-# Print category, name and slot of package providing Python implementation.
-# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used.
-python_get_implementational_package() {
-	_python_check_python_pkg_setup_execution
-
-	local final_ABI="0" PYTHON_ABI="${PYTHON_ABI}"
-
-	while (($#)); do
-		case "$1" in
-			-f|--final-ABI)
-				final_ABI="1"
-				;;
-			-*)
-				die "${FUNCNAME}(): Unrecognized option '$1'"
-				;;
-			*)
-				die "${FUNCNAME}(): Invalid usage"
-				;;
-		esac
-		shift
-	done
-
-	if [[ "${final_ABI}" == "1" ]]; then
-		if ! _python_package_supporting_installation_for_multiple_python_abis; then
-			die "${FUNCNAME}(): '--final-ABI' option cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
-		fi
-		PYTHON_ABI="$(PYTHON -f --ABI)"
-	else
-		if _python_package_supporting_installation_for_multiple_python_abis; then
-			if ! _python_abi-specific_local_scope; then
-				die "${FUNCNAME}() should be used in ABI-specific local scope"
-			fi
-		else
-			PYTHON_ABI="${PYTHON_ABI:-$(PYTHON --ABI)}"
-		fi
-	fi
-
-	if [[ "${EAPI:-0}" == "0" ]]; then
-		if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
-			echo "=dev-lang/python-${PYTHON_ABI}*"
-		elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
-			echo "=dev-java/jython-${PYTHON_ABI%-jython}*"
-		elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
-			echo "=dev-python/pypy-${PYTHON_ABI#*-pypy-}*"
-		fi
-	else
-		if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
-			echo "dev-lang/python:${PYTHON_ABI}"
-		elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
-			echo "dev-java/jython:${PYTHON_ABI%-jython}"
-		elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
-			echo "dev-python/pypy:${PYTHON_ABI#*-pypy-}"
-		fi
-	fi
-}
-
-# @FUNCTION: python_get_includedir
-# @USAGE: [-b|--base-path] [-f|--final-ABI]
-# @DESCRIPTION:
-# Print path to Python include directory.
-# If --base-path option is specified, then path not prefixed with "/" is printed.
-# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used.
-python_get_includedir() {
-	_python_check_python_pkg_setup_execution
-
-	local base_path="0" final_ABI="0" prefix PYTHON_ABI="${PYTHON_ABI}"
-
-	while (($#)); do
-		case "$1" in
-			-b|--base-path)
-				base_path="1"
-				;;
-			-f|--final-ABI)
-				final_ABI="1"
-				;;
-			-*)
-				die "${FUNCNAME}(): Unrecognized option '$1'"
-				;;
-			*)
-				die "${FUNCNAME}(): Invalid usage"
-				;;
-		esac
-		shift
-	done
-
-	if [[ "${base_path}" == "0" ]]; then
-		prefix="/"
-	fi
-
-	if [[ "${final_ABI}" == "1" ]]; then
-		if ! _python_package_supporting_installation_for_multiple_python_abis; then
-			die "${FUNCNAME}(): '--final-ABI' option cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
-		fi
-		PYTHON_ABI="$(PYTHON -f --ABI)"
-	else
-		if _python_package_supporting_installation_for_multiple_python_abis; then
-			if ! _python_abi-specific_local_scope; then
-				die "${FUNCNAME}() should be used in ABI-specific local scope"
-			fi
-		else
-			PYTHON_ABI="${PYTHON_ABI:-$(PYTHON --ABI)}"
-		fi
-	fi
-
-	if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
-		echo "${prefix}usr/include/python${PYTHON_ABI}"
-	elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
-		echo "${prefix}usr/share/jython-${PYTHON_ABI%-jython}/Include"
-	elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
-		echo "${prefix}usr/$(get_libdir)/pypy${PYTHON_ABI#*-pypy-}/include"
-	fi
-}
-
-# @FUNCTION: python_get_libdir
-# @USAGE: [-b|--base-path] [-f|--final-ABI]
-# @DESCRIPTION:
-# Print path to Python standard library directory.
-# If --base-path option is specified, then path not prefixed with "/" is printed.
-# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used.
-python_get_libdir() {
-	_python_check_python_pkg_setup_execution
-
-	local base_path="0" final_ABI="0" prefix PYTHON_ABI="${PYTHON_ABI}"
-
-	while (($#)); do
-		case "$1" in
-			-b|--base-path)
-				base_path="1"
-				;;
-			-f|--final-ABI)
-				final_ABI="1"
-				;;
-			-*)
-				die "${FUNCNAME}(): Unrecognized option '$1'"
-				;;
-			*)
-				die "${FUNCNAME}(): Invalid usage"
-				;;
-		esac
-		shift
-	done
-
-	if [[ "${base_path}" == "0" ]]; then
-		prefix="/"
-	fi
-
-	if [[ "${final_ABI}" == "1" ]]; then
-		if ! _python_package_supporting_installation_for_multiple_python_abis; then
-			die "${FUNCNAME}(): '--final-ABI' option cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
-		fi
-		PYTHON_ABI="$(PYTHON -f --ABI)"
-	else
-		if _python_package_supporting_installation_for_multiple_python_abis; then
-			if ! _python_abi-specific_local_scope; then
-				die "${FUNCNAME}() should be used in ABI-specific local scope"
-			fi
-		else
-			PYTHON_ABI="${PYTHON_ABI:-$(PYTHON --ABI)}"
-		fi
-	fi
-
-	if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
-		echo "${prefix}usr/$(get_libdir)/python${PYTHON_ABI}"
-	elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
-		echo "${prefix}usr/share/jython-${PYTHON_ABI%-jython}/Lib"
-	elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
-		die "${FUNCNAME}(): PyPy has multiple standard library directories"
-	fi
-}
-
-# @FUNCTION: python_get_sitedir
-# @USAGE: [-b|--base-path] [-f|--final-ABI]
-# @DESCRIPTION:
-# Print path to Python site-packages directory.
-# If --base-path option is specified, then path not prefixed with "/" is printed.
-# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used.
-python_get_sitedir() {
-	_python_check_python_pkg_setup_execution
-
-	local base_path="0" final_ABI="0" prefix PYTHON_ABI="${PYTHON_ABI}"
-
-	while (($#)); do
-		case "$1" in
-			-b|--base-path)
-				base_path="1"
-				;;
-			-f|--final-ABI)
-				final_ABI="1"
-				;;
-			-*)
-				die "${FUNCNAME}(): Unrecognized option '$1'"
-				;;
-			*)
-				die "${FUNCNAME}(): Invalid usage"
-				;;
-		esac
-		shift
-	done
-
-	if [[ "${base_path}" == "0" ]]; then
-		prefix="/"
-	fi
-
-	if [[ "${final_ABI}" == "1" ]]; then
-		if ! _python_package_supporting_installation_for_multiple_python_abis; then
-			die "${FUNCNAME}(): '--final-ABI' option cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
-		fi
-		PYTHON_ABI="$(PYTHON -f --ABI)"
-	else
-		if _python_package_supporting_installation_for_multiple_python_abis; then
-			if ! _python_abi-specific_local_scope; then
-				die "${FUNCNAME}() should be used in ABI-specific local scope"
-			fi
-		else
-			PYTHON_ABI="${PYTHON_ABI:-$(PYTHON --ABI)}"
-		fi
-	fi
-
-	if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
-		echo "${prefix}usr/$(get_libdir)/python${PYTHON_ABI}/site-packages"
-	elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
-		echo "${prefix}usr/share/jython-${PYTHON_ABI%-jython}/Lib/site-packages"
-	elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
-		echo "${prefix}usr/$(get_libdir)/pypy${PYTHON_ABI#*-pypy-}/site-packages"
-	fi
-}
-
-# @FUNCTION: python_get_library
-# @USAGE: [-b|--base-path] [-f|--final-ABI] [-l|--linker-option]
-# @DESCRIPTION:
-# Print path to Python library.
-# If --base-path option is specified, then path not prefixed with "/" is printed.
-# If --linker-option is specified, then "-l${library}" linker option is printed.
-# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used.
-python_get_library() {
-	_python_check_python_pkg_setup_execution
-
-	local base_path="0" final_ABI="0" linker_option="0" prefix PYTHON_ABI="${PYTHON_ABI}"
-
-	while (($#)); do
-		case "$1" in
-			-b|--base-path)
-				base_path="1"
-				;;
-			-f|--final-ABI)
-				final_ABI="1"
-				;;
-			-l|--linker-option)
-				linker_option="1"
-				;;
-			-*)
-				die "${FUNCNAME}(): Unrecognized option '$1'"
-				;;
-			*)
-				die "${FUNCNAME}(): Invalid usage"
-				;;
-		esac
-		shift
-	done
-
-	if [[ "${base_path}" == "0" ]]; then
-		prefix="/"
-	fi
-
-	if [[ "${base_path}" == "1" && "${linker_option}" == "1" ]]; then
-		die "${FUNCNAME}(): '--base-path' and '--linker-option' options cannot be specified simultaneously"
-	fi
-
-	if [[ "${final_ABI}" == "1" ]]; then
-		if ! _python_package_supporting_installation_for_multiple_python_abis; then
-			die "${FUNCNAME}(): '--final-ABI' option cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
-		fi
-		PYTHON_ABI="$(PYTHON -f --ABI)"
-	else
-		if _python_package_supporting_installation_for_multiple_python_abis; then
-			if ! _python_abi-specific_local_scope; then
-				die "${FUNCNAME}() should be used in ABI-specific local scope"
-			fi
-		else
-			PYTHON_ABI="${PYTHON_ABI:-$(PYTHON --ABI)}"
-		fi
-	fi
-
-	if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
-		if [[ "${linker_option}" == "1" ]]; then
-			echo "-lpython${PYTHON_ABI}"
-		else
-			echo "${prefix}usr/$(get_libdir)/libpython${PYTHON_ABI}$(get_libname)"
-		fi
-	elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
-		die "${FUNCNAME}(): Jython does not have shared library"
-	elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
-		die "${FUNCNAME}(): PyPy does not have shared library"
-	fi
-}
-
-# @FUNCTION: python_get_version
-# @USAGE: [-f|--final-ABI] [-l|--language] [--full] [--major] [--minor] [--micro]
-# @DESCRIPTION:
-# Print version of Python implementation.
-# --full, --major, --minor and --micro options cannot be specified simultaneously.
-# If --full, --major, --minor and --micro options are not specified, then "${major_version}.${minor_version}" is printed.
-# If --language option is specified, then version of Python language is printed.
-# --language and --full options cannot be specified simultaneously.
-# --language and --micro options cannot be specified simultaneously.
-# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used.
-python_get_version() {
-	_python_check_python_pkg_setup_execution
-
-	local final_ABI="0" language="0" language_version full="0" major="0" minor="0" micro="0" PYTHON_ABI="${PYTHON_ABI}" python_command
-
-	while (($#)); do
-		case "$1" in
-			-f|--final-ABI)
-				final_ABI="1"
-				;;
-			-l|--language)
-				language="1"
-				;;
-			--full)
-				full="1"
-				;;
-			--major)
-				major="1"
-				;;
-			--minor)
-				minor="1"
-				;;
-			--micro)
-				micro="1"
-				;;
-			-*)
-				die "${FUNCNAME}(): Unrecognized option '$1'"
-				;;
-			*)
-				die "${FUNCNAME}(): Invalid usage"
-				;;
-		esac
-		shift
-	done
-
-	if [[ "${final_ABI}" == "1" ]]; then
-		if ! _python_package_supporting_installation_for_multiple_python_abis; then
-			die "${FUNCNAME}(): '--final-ABI' option cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
-		fi
-	else
-		if _python_package_supporting_installation_for_multiple_python_abis && ! _python_abi-specific_local_scope; then
-			die "${FUNCNAME}() should be used in ABI-specific local scope"
-		fi
-	fi
-
-	if [[ "$((${full} + ${major} + ${minor} + ${micro}))" -gt 1 ]]; then
-		die "${FUNCNAME}(): '--full', '--major', '--minor' or '--micro' options cannot be specified simultaneously"
-	fi
-
-	if [[ "${language}" == "1" ]]; then
-		if [[ "${final_ABI}" == "1" ]]; then
-			PYTHON_ABI="$(PYTHON -f --ABI)"
-		elif [[ -z "${PYTHON_ABI}" ]]; then
-			PYTHON_ABI="$(PYTHON --ABI)"
-		fi
-		language_version="${PYTHON_ABI%%-*}"
-		if [[ "${full}" == "1" ]]; then
-			die "${FUNCNAME}(): '--language' and '--full' options cannot be specified simultaneously"
-		elif [[ "${major}" == "1" ]]; then
-			echo "${language_version%.*}"
-		elif [[ "${minor}" == "1" ]]; then
-			echo "${language_version#*.}"
-		elif [[ "${micro}" == "1" ]]; then
-			die "${FUNCNAME}(): '--language' and '--micro' options cannot be specified simultaneously"
-		else
-			echo "${language_version}"
-		fi
-	else
-		if [[ "${full}" == "1" ]]; then
-			python_command="import sys; print('.'.join(str(x) for x in getattr(sys, 'pypy_version_info', sys.version_info)[:3]))"
-		elif [[ "${major}" == "1" ]]; then
-			python_command="import sys; print(getattr(sys, 'pypy_version_info', sys.version_info)[0])"
-		elif [[ "${minor}" == "1" ]]; then
-			python_command="import sys; print(getattr(sys, 'pypy_version_info', sys.version_info)[1])"
-		elif [[ "${micro}" == "1" ]]; then
-			python_command="import sys; print(getattr(sys, 'pypy_version_info', sys.version_info)[2])"
-		else
-			if [[ -n "${PYTHON_ABI}" && "${final_ABI}" == "0" ]]; then
-				if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
-					echo "${PYTHON_ABI}"
-				elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
-					echo "${PYTHON_ABI%-jython}"
-				elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
-					echo "${PYTHON_ABI#*-pypy-}"
-				fi
-				return
-			fi
-			python_command="from sys import version_info; print('.'.join(str(x) for x in version_info[:2]))"
-		fi
-
-		if [[ "${final_ABI}" == "1" ]]; then
-			"$(PYTHON -f)" -c "${python_command}"
-		else
-			"$(PYTHON ${PYTHON_ABI})" -c "${python_command}"
-		fi
-	fi
-}
-
-# @FUNCTION: python_get_implementation_and_version
-# @USAGE: [-f|--final-ABI]
-# @DESCRIPTION:
-# Print name and version of Python implementation.
-# If version of Python implementation is not bound to version of Python language, then
-# version of Python language is additionally printed.
-# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used.
-python_get_implementation_and_version() {
-	_python_check_python_pkg_setup_execution
-
-	local final_ABI="0" PYTHON_ABI="${PYTHON_ABI}"
-
-	while (($#)); do
-		case "$1" in
-			-f|--final-ABI)
-				final_ABI="1"
-				;;
-			-*)
-				die "${FUNCNAME}(): Unrecognized option '$1'"
-				;;
-			*)
-				die "${FUNCNAME}(): Invalid usage"
-				;;
-		esac
-		shift
-	done
-
-	if [[ "${final_ABI}" == "1" ]]; then
-		if ! _python_package_supporting_installation_for_multiple_python_abis; then
-			die "${FUNCNAME}(): '--final-ABI' option cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
-		fi
-		PYTHON_ABI="$(PYTHON -f --ABI)"
-	else
-		if _python_package_supporting_installation_for_multiple_python_abis; then
-			if ! _python_abi-specific_local_scope; then
-				die "${FUNCNAME}() should be used in ABI-specific local scope"
-			fi
-		else
-			PYTHON_ABI="${PYTHON_ABI:-$(PYTHON --ABI)}"
-		fi
-	fi
-
-	if [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+-[[:alnum:]]+-[[:digit:]]+\.[[:digit:]]+$ ]]; then
-		echo "$(_python_get_implementation "${PYTHON_ABI}") ${PYTHON_ABI##*-} (Python ${PYTHON_ABI%%-*})"
-	else
-		echo "$(_python_get_implementation "${PYTHON_ABI}") ${PYTHON_ABI%%-*}"
-	fi
-}
-
-# ================================================================================================
-# ================================ FUNCTIONS FOR RUNNING OF TESTS ================================
-# ================================================================================================
-
-# @ECLASS-VARIABLE: PYTHON_TEST_VERBOSITY
-# @DESCRIPTION:
-# User-configurable verbosity of tests of Python modules.
-# Supported values: 0, 1, 2, 3, 4.
-PYTHON_TEST_VERBOSITY="${PYTHON_TEST_VERBOSITY:-1}"
-
-_python_test_hook() {
-	if [[ "$#" -ne 1 ]]; then
-		die "${FUNCNAME}() requires 1 argument"
-	fi
-
-	if _python_package_supporting_installation_for_multiple_python_abis && [[ "$(type -t "${_PYTHON_TEST_FUNCTION}_$1_hook")" == "function" ]]; then
-		"${_PYTHON_TEST_FUNCTION}_$1_hook"
-	fi
-}
-
-# @FUNCTION: python_execute_nosetests
-# @USAGE: [-P|--PYTHONPATH PYTHONPATH] [-s|--separate-build-dirs] [--] [arguments]
-# @DESCRIPTION:
-# Execute nosetests for all enabled Python ABIs.
-# In ebuilds of packages supporting installation for multiple Python ABIs, this function calls
-# python_execute_nosetests_pre_hook() and python_execute_nosetests_post_hook(), if they are defined.
-python_execute_nosetests() {
-	_python_check_python_pkg_setup_execution
-	_python_set_color_variables
-
-	local PYTHONPATH_template separate_build_dirs
-
-	while (($#)); do
-		case "$1" in
-			-P|--PYTHONPATH)
-				PYTHONPATH_template="$2"
-				shift
-				;;
-			-s|--separate-build-dirs)
-				separate_build_dirs="1"
-				;;
-			--)
-				shift
-				break
-				;;
-			-*)
-				die "${FUNCNAME}(): Unrecognized option '$1'"
-				;;
-			*)
-				break
-				;;
-		esac
-		shift
-	done
-
-	python_test_function() {
-		local evaluated_PYTHONPATH
-
-		eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
-
-		_PYTHON_TEST_FUNCTION="python_execute_nosetests" _python_test_hook pre
-
-		if [[ -n "${evaluated_PYTHONPATH}" ]]; then
-			echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL}
-			PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?"
-		else
-			echo ${_BOLD}nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL}
-			nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?"
-		fi
-
-		_PYTHON_TEST_FUNCTION="python_execute_nosetests" _python_test_hook post
-	}
-	if _python_package_supporting_installation_for_multiple_python_abis; then
-		python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
-	else
-		if [[ -n "${separate_build_dirs}" ]]; then
-			die "${FUNCNAME}(): Invalid usage"
-		fi
-		python_test_function "$@" || die "Testing failed"
-	fi
-
-	unset -f python_test_function
-}
-
-# @FUNCTION: python_execute_py.test
-# @USAGE: [-P|--PYTHONPATH PYTHONPATH] [-s|--separate-build-dirs] [--] [arguments]
-# @DESCRIPTION:
-# Execute py.test for all enabled Python ABIs.
-# In ebuilds of packages supporting installation for multiple Python ABIs, this function calls
-# python_execute_py.test_pre_hook() and python_execute_py.test_post_hook(), if they are defined.
-python_execute_py.test() {
-	_python_check_python_pkg_setup_execution
-	_python_set_color_variables
-
-	local PYTHONPATH_template separate_build_dirs
-
-	while (($#)); do
-		case "$1" in
-			-P|--PYTHONPATH)
-				PYTHONPATH_template="$2"
-				shift
-				;;
-			-s|--separate-build-dirs)
-				separate_build_dirs="1"
-				;;
-			--)
-				shift
-				break
-				;;
-			-*)
-				die "${FUNCNAME}(): Unrecognized option '$1'"
-				;;
-			*)
-				break
-				;;
-		esac
-		shift
-	done
-
-	python_test_function() {
-		local evaluated_PYTHONPATH
-
-		eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
-
-		_PYTHON_TEST_FUNCTION="python_execute_py.test" _python_test_hook pre
-
-		if [[ -n "${evaluated_PYTHONPATH}" ]]; then
-			echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@"${_NORMAL}
-			PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@" || return "$?"
-		else
-			echo ${_BOLD}py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@"${_NORMAL}
-			py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@" || return "$?"
-		fi
-
-		_PYTHON_TEST_FUNCTION="python_execute_py.test" _python_test_hook post
-	}
-	if _python_package_supporting_installation_for_multiple_python_abis; then
-		python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
-	else
-		if [[ -n "${separate_build_dirs}" ]]; then
-			die "${FUNCNAME}(): Invalid usage"
-		fi
-		python_test_function "$@" || die "Testing failed"
-	fi
-
-	unset -f python_test_function
-}
-
-# @FUNCTION: python_execute_trial
-# @USAGE: [-P|--PYTHONPATH PYTHONPATH] [-s|--separate-build-dirs] [--] [arguments]
-# @DESCRIPTION:
-# Execute trial for all enabled Python ABIs.
-# In ebuilds of packages supporting installation for multiple Python ABIs, this function
-# calls python_execute_trial_pre_hook() and python_execute_trial_post_hook(), if they are defined.
-python_execute_trial() {
-	_python_check_python_pkg_setup_execution
-	_python_set_color_variables
-
-	local PYTHONPATH_template separate_build_dirs
-
-	while (($#)); do
-		case "$1" in
-			-P|--PYTHONPATH)
-				PYTHONPATH_template="$2"
-				shift
-				;;
-			-s|--separate-build-dirs)
-				separate_build_dirs="1"
-				;;
-			--)
-				shift
-				break
-				;;
-			-*)
-				die "${FUNCNAME}(): Unrecognized option '$1'"
-				;;
-			*)
-				break
-				;;
-		esac
-		shift
-	done
-
-	python_test_function() {
-		local evaluated_PYTHONPATH
-
-		eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
-
-		_PYTHON_TEST_FUNCTION="python_execute_trial" _python_test_hook pre
-
-		if [[ -n "${evaluated_PYTHONPATH}" ]]; then
-			echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL}
-			PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?"
-		else
-			echo ${_BOLD}trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL}
-			trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?"
-		fi
-
-		_PYTHON_TEST_FUNCTION="python_execute_trial" _python_test_hook post
-	}
-	if _python_package_supporting_installation_for_multiple_python_abis; then
-		python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
-	else
-		if [[ -n "${separate_build_dirs}" ]]; then
-			die "${FUNCNAME}(): Invalid usage"
-		fi
-		python_test_function "$@" || die "Testing failed"
-	fi
-
-	unset -f python_test_function
-}
-
-# ================================================================================================
-# ======================= FUNCTIONS FOR HANDLING OF BYTE-COMPILED MODULES ========================
-# ================================================================================================
-
-# @FUNCTION: python_enable_pyc
-# @DESCRIPTION:
-# Tell Python to automatically recompile modules to .pyc/.pyo if the
-# timestamps/version stamps have changed.
-python_enable_pyc() {
-	_python_check_python_pkg_setup_execution
-
-	if [[ "$#" -ne 0 ]]; then
-		die "${FUNCNAME}() does not accept arguments"
-	fi
-
-	unset PYTHONDONTWRITEBYTECODE
-}
-
-# @FUNCTION: python_disable_pyc
-# @DESCRIPTION:
-# Tell Python not to automatically recompile modules to .pyc/.pyo
-# even if the timestamps/version stamps do not match. This is done
-# to protect sandbox.
-python_disable_pyc() {
-	_python_check_python_pkg_setup_execution
-
-	if [[ "$#" -ne 0 ]]; then
-		die "${FUNCNAME}() does not accept arguments"
-	fi
-
-	export PYTHONDONTWRITEBYTECODE="1"
-}
-
-_python_vecho() {
-	[[ -z ${PORTAGE_VERBOSE} ]] || echo "$@"
-}
-
-_python_clean_compiled_modules() {
-	_python_initialize_prefix_variables
-	_python_set_color_variables
-
-	[[ "${FUNCNAME[1]}" =~ ^(python_mod_optimize|python_mod_cleanup)$ ]] || die "${FUNCNAME}(): Invalid usage"
-
-	local base_module_name compiled_file compiled_files=() dir path py_file root
-
-	# Strip trailing slash from EROOT.
-	root="${EROOT%/}"
-
-	for path in "$@"; do
-		compiled_files=()
-		if [[ -d "${path}" ]]; then
-			while read -d $'\0' -r compiled_file; do
-				compiled_files+=("${compiled_file}")
-			done < <(find "${path}" "(" -name "*.py[co]" -o -name "*\$py.class" ")" -print0)
-
-			if [[ "${EBUILD_PHASE}" == "postrm" ]]; then
-				# Delete empty child directories.
-				find "${path}" -type d | sort -r | while read -r dir; do
-					if rmdir "${dir}" 2> /dev/null; then
-						_python_vecho "<<< ${dir}"
-					fi
-				done
-			fi
-		elif [[ "${path}" == *.py ]]; then
-			base_module_name="${path##*/}"
-			base_module_name="${base_module_name%.py}"
-			if [[ -d "${path%/*}/__pycache__" ]]; then
-				while read -d $'\0' -r compiled_file; do
-					compiled_files+=("${compiled_file}")
-				done < <(find "${path%/*}/__pycache__" "(" -name "${base_module_name}.*.py[co]" -o -name "${base_module_name}\$py.class" ")" -print0)
-			fi
-			compiled_files+=("${path}c" "${path}o" "${path%.py}\$py.class")
-		fi
-
-		for compiled_file in "${compiled_files[@]}"; do
-			[[ ! -f "${compiled_file}" ]] && continue
-			dir="${compiled_file%/*}"
-			dir="${dir##*/}"
-			if [[ "${compiled_file}" == *.py[co] ]]; then
-				if [[ "${dir}" == "__pycache__" ]]; then
-					base_module_name="${compiled_file##*/}"
-					base_module_name="${base_module_name%.*py[co]}"
-					base_module_name="${base_module_name%.*}"
-					py_file="${compiled_file%__pycache__/*}${base_module_name}.py"
-				else
-					py_file="${compiled_file%[co]}"
-				fi
-				if [[ "${EBUILD_PHASE}" == "postinst" ]]; then
-					[[ -f "${py_file}" && "${compiled_file}" -nt "${py_file}" ]] && continue
-				else
-					[[ -f "${py_file}" ]] && continue
-				fi
-				_python_vecho "<<< ${compiled_file%[co]}[co]"
-				rm -f "${compiled_file%[co]}"[co]
-			elif [[ "${compiled_file}" == *\$py.class ]]; then
-				if [[ "${dir}" == "__pycache__" ]]; then
-					base_module_name="${compiled_file##*/}"
-					base_module_name="${base_module_name%\$py.class}"
-					py_file="${compiled_file%__pycache__/*}${base_module_name}.py"
-				else
-					py_file="${compiled_file%\$py.class}.py"
-				fi
-				if [[ "${EBUILD_PHASE}" == "postinst" ]]; then
-					[[ -f "${py_file}" && "${compiled_file}" -nt "${py_file}" ]] && continue
-				else
-					[[ -f "${py_file}" ]] && continue
-				fi
-				_python_vecho "<<< ${compiled_file}"
-				rm -f "${compiled_file}"
-			else
-				die "${FUNCNAME}(): Unrecognized file type: '${compiled_file}'"
-			fi
-
-			# Delete empty parent directories.
-			dir="${compiled_file%/*}"
-			while [[ "${dir}" != "${root}" ]]; do
-				if rmdir "${dir}" 2> /dev/null; then
-					_python_vecho "<<< ${dir}"
-				else
-					break
-				fi
-				dir="${dir%/*}"
-			done
-		done
-	done
-}
-
-# @FUNCTION: python_mod_optimize
-# @USAGE: [--allow-evaluated-non-sitedir-paths] [-d directory] [-f] [-l] [-q] [-x regular_expression] [--] <file|directory> [files|directories]
-# @DESCRIPTION:
-# Byte-compile specified Python modules.
-# -d, -f, -l, -q and -x options passed to this function are passed to compileall.py.
-#
-# This function can be used only in pkg_postinst() phase.
-python_mod_optimize() {
-	if [[ "${EBUILD_PHASE}" != "postinst" ]]; then
-		die "${FUNCNAME}() can be used only in pkg_postinst() phase"
-	fi
-
-	_python_check_python_pkg_setup_execution
-	_python_initialize_prefix_variables
-
-	if ! has "${EAPI:-0}" 0 1 2 || _python_package_supporting_installation_for_multiple_python_abis || _python_implementation || [[ "${CATEGORY}/${PN}" == "sys-apps/portage" ]]; then
-		# PYTHON_ABI variable cannot be local in packages not supporting installation for multiple Python ABIs.
-		local allow_evaluated_non_sitedir_paths="0" dir dirs=() evaluated_dirs=() evaluated_files=() file files=() iterated_PYTHON_ABIS options=() other_dirs=() other_files=() previous_PYTHON_ABI="${PYTHON_ABI}" return_code root site_packages_dirs=() site_packages_files=() stderr stderr_line
-
-		if _python_package_supporting_installation_for_multiple_python_abis; then
-			if has "${EAPI:-0}" 0 1 2 3 && [[ -z "${PYTHON_ABIS}" ]]; then
-				die "${FUNCNAME}(): python_pkg_setup() or python_execute_function() not called"
-			fi
-			iterated_PYTHON_ABIS="${PYTHON_ABIS}"
-		else
-			if has "${EAPI:-0}" 0 1 2 3; then
-				iterated_PYTHON_ABIS="${PYTHON_ABI:=$(PYTHON --ABI)}"
-			else
-				iterated_PYTHON_ABIS="${PYTHON_ABI}"
-			fi
-		fi
-
-		# Strip trailing slash from EROOT.
-		root="${EROOT%/}"
-
-		while (($#)); do
-			case "$1" in
-				--allow-evaluated-non-sitedir-paths)
-					allow_evaluated_non_sitedir_paths="1"
-					;;
-				-l|-f|-q)
-					options+=("$1")
-					;;
-				-d|-x)
-					options+=("$1" "$2")
-					shift
-					;;
-				--)
-					shift
-					break
-					;;
-				-*)
-					die "${FUNCNAME}(): Unrecognized option '$1'"
-					;;
-				*)
-					break
-					;;
-			esac
-			shift
-		done
-
-		if [[ "${allow_evaluated_non_sitedir_paths}" == "1" ]] && ! _python_package_supporting_installation_for_multiple_python_abis; then
-			die "${FUNCNAME}(): '--allow-evaluated-non-sitedir-paths' option cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
-		fi
-
-		if [[ "$#" -eq 0 ]]; then
-			die "${FUNCNAME}(): Missing files or directories"
-		fi
-
-		while (($#)); do
-			if [[ "$1" =~ ^($|(\.|\.\.|/)($|/)) ]]; then
-				die "${FUNCNAME}(): Invalid argument '$1'"
-			elif ! _python_implementation && [[ "$1" =~ ^/usr/lib(32|64)?/python[[:digit:]]+\.[[:digit:]]+ ]]; then
-				die "${FUNCNAME}(): Paths of directories / files in site-packages directories must be relative to site-packages directories"
-			elif [[ "$1" =~ ^/ ]]; then
-				if _python_package_supporting_installation_for_multiple_python_abis; then
-					if [[ "${allow_evaluated_non_sitedir_paths}" != "1" ]]; then
-						die "${FUNCNAME}(): Absolute paths cannot be used in ebuilds of packages supporting installation for multiple Python ABIs"
-					fi
-					if [[ "$1" != *\$* ]]; then
-						die "${FUNCNAME}(): '$1' has invalid syntax"
-					fi
-					if [[ "$1" == *.py ]]; then
-						evaluated_files+=("$1")
-					else
-						evaluated_dirs+=("$1")
-					fi
-				else
-					if [[ -d "${root}$1" ]]; then
-						other_dirs+=("${root}$1")
-					elif [[ -f "${root}$1" ]]; then
-						other_files+=("${root}$1")
-					elif [[ -e "${root}$1" ]]; then
-						eerror "${FUNCNAME}(): '${root}$1' is not a regular file or a directory"
-					else
-						eerror "${FUNCNAME}(): '${root}$1' does not exist"
-					fi
-				fi
-			else
-				for PYTHON_ABI in ${iterated_PYTHON_ABIS}; do
-					if [[ -d "${root}$(python_get_sitedir)/$1" ]]; then
-						site_packages_dirs+=("$1")
-						break
-					elif [[ -f "${root}$(python_get_sitedir)/$1" ]]; then
-						site_packages_files+=("$1")
-						break
-					elif [[ -e "${root}$(python_get_sitedir)/$1" ]]; then
-						eerror "${FUNCNAME}(): '$1' is not a regular file or a directory"
-					else
-						eerror "${FUNCNAME}(): '$1' does not exist"
-					fi
-				done
-			fi
-			shift
-		done
-
-		# Set additional options.
-		options+=("-q")
-
-		for PYTHON_ABI in ${iterated_PYTHON_ABIS}; do
-			if ((${#site_packages_dirs[@]})) || ((${#site_packages_files[@]})) || ((${#evaluated_dirs[@]})) || ((${#evaluated_files[@]})); then
-				return_code="0"
-				stderr=""
-				ebegin "Compilation and optimization of Python modules for $(python_get_implementation_and_version)"
-				if ((${#site_packages_dirs[@]})) || ((${#evaluated_dirs[@]})); then
-					for dir in "${site_packages_dirs[@]}"; do
-						dirs+=("${root}$(python_get_sitedir)/${dir}")
-					done
-					for dir in "${evaluated_dirs[@]}"; do
-						eval "dirs+=(\"\${root}${dir}\")"
-					done
-					stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m compileall "${options[@]}" "${dirs[@]}" 2>&1)" || return_code="1"
-					if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
-						"$(PYTHON)" -O -m compileall "${options[@]}" "${dirs[@]}" &> /dev/null || return_code="1"
-					fi
-					_python_clean_compiled_modules "${dirs[@]}"
-				fi
-				if ((${#site_packages_files[@]})) || ((${#evaluated_files[@]})); then
-					for file in "${site_packages_files[@]}"; do
-						files+=("${root}$(python_get_sitedir)/${file}")
-					done
-					for file in "${evaluated_files[@]}"; do
-						eval "files+=(\"\${root}${file}\")"
-					done
-					stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m py_compile "${files[@]}" 2>&1)" || return_code="1"
-					if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
-						"$(PYTHON)" -O -m py_compile "${files[@]}" &> /dev/null || return_code="1"
-					fi
-					_python_clean_compiled_modules "${files[@]}"
-				fi
-				eend "${return_code}"
-				if [[ -n "${stderr}" ]]; then
-					eerror "Syntax errors / warnings in Python modules for $(python_get_implementation_and_version):" &> /dev/null
-					while read stderr_line; do
-						eerror "    ${stderr_line}"
-					done <<< "${stderr}"
-				fi
-			fi
-			unset dirs files
-		done
-
-		if _python_package_supporting_installation_for_multiple_python_abis; then
-			# Restore previous value of PYTHON_ABI.
-			if [[ -n "${previous_PYTHON_ABI}" ]]; then
-				PYTHON_ABI="${previous_PYTHON_ABI}"
-			else
-				unset PYTHON_ABI
-			fi
-		fi
-
-		if ((${#other_dirs[@]})) || ((${#other_files[@]})); then
-			return_code="0"
-			stderr=""
-			ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for $(python_get_implementation_and_version)"
-			if ((${#other_dirs[@]})); then
-				stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m compileall "${options[@]}" "${other_dirs[@]}" 2>&1)" || return_code="1"
-				if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
-					"$(PYTHON ${PYTHON_ABI})" -O -m compileall "${options[@]}" "${other_dirs[@]}" &> /dev/null || return_code="1"
-				fi
-				_python_clean_compiled_modules "${other_dirs[@]}"
-			fi
-			if ((${#other_files[@]})); then
-				stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m py_compile "${other_files[@]}" 2>&1)" || return_code="1"
-				if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
-					"$(PYTHON ${PYTHON_ABI})" -O -m py_compile "${other_files[@]}" &> /dev/null || return_code="1"
-				fi
-				_python_clean_compiled_modules "${other_files[@]}"
-			fi
-			eend "${return_code}"
-			if [[ -n "${stderr}" ]]; then
-				eerror "Syntax errors / warnings in Python modules placed outside of site-packages directories for $(python_get_implementation_and_version):" &> /dev/null
-				while read stderr_line; do
-					eerror "    ${stderr_line}"
-				done <<< "${stderr}"
-			fi
-		fi
-	else
-		# Deprecated part of python_mod_optimize()
-		ewarn
-		ewarn "Deprecation Warning: Usage of ${FUNCNAME}() in packages not supporting installation"
-		ewarn "for multiple Python ABIs in EAPI <=2 is deprecated and will be disallowed on 2011-08-01."
-		ewarn "Use EAPI >=3 and call ${FUNCNAME}() with paths having appropriate syntax."
-		ewarn "The ebuild needs to be fixed. Please report a bug, if it has not been already reported."
-		ewarn
-
-		local myroot mydirs=() myfiles=() myopts=() return_code="0"
-
-		# strip trailing slash
-		myroot="${EROOT%/}"
-
-		# respect EROOT and options passed to compileall.py
-		while (($#)); do
-			case "$1" in
-				-l|-f|-q)
-					myopts+=("$1")
-					;;
-				-d|-x)
-					myopts+=("$1" "$2")
-					shift
-					;;
-				--)
-					shift
-					break
-					;;
-				-*)
-					die "${FUNCNAME}(): Unrecognized option '$1'"
-					;;
-				*)
-					break
-					;;
-			esac
-			shift
-		done
-
-		if [[ "$#" -eq 0 ]]; then
-			die "${FUNCNAME}(): Missing files or directories"
-		fi
-
-		while (($#)); do
-			if [[ "$1" =~ ^($|(\.|\.\.|/)($|/)) ]]; then
-				die "${FUNCNAME}(): Invalid argument '$1'"
-			elif [[ -d "${myroot}/${1#/}" ]]; then
-				mydirs+=("${myroot}/${1#/}")
-			elif [[ -f "${myroot}/${1#/}" ]]; then
-				myfiles+=("${myroot}/${1#/}")
-			elif [[ -e "${myroot}/${1#/}" ]]; then
-				eerror "${FUNCNAME}(): ${myroot}/${1#/} is not a regular file or directory"
-			else
-				eerror "${FUNCNAME}(): ${myroot}/${1#/} does not exist"
-			fi
-			shift
-		done
-
-		# set additional opts
-		myopts+=(-q)
-
-		PYTHON_ABI="${PYTHON_ABI:-$(PYTHON --ABI)}"
-
-		ebegin "Compilation and optimization of Python modules for $(python_get_implementation) $(python_get_version)"
-		if ((${#mydirs[@]})); then
-			"$(PYTHON ${PYTHON_ABI})" "${myroot}$(python_get_libdir)/compileall.py" "${myopts[@]}" "${mydirs[@]}" || return_code="1"
-			"$(PYTHON ${PYTHON_ABI})" -O "${myroot}$(python_get_libdir)/compileall.py" "${myopts[@]}" "${mydirs[@]}" &> /dev/null || return_code="1"
-			_python_clean_compiled_modules "${mydirs[@]}"
-		fi
-
-		if ((${#myfiles[@]})); then
-			"$(PYTHON ${PYTHON_ABI})" "${myroot}$(python_get_libdir)/py_compile.py" "${myfiles[@]}" || return_code="1"
-			"$(PYTHON ${PYTHON_ABI})" -O "${myroot}$(python_get_libdir)/py_compile.py" "${myfiles[@]}" &> /dev/null || return_code="1"
-			_python_clean_compiled_modules "${myfiles[@]}"
-		fi
-
-		eend "${return_code}"
-	fi
-}
-
-# @FUNCTION: python_mod_cleanup
-# @USAGE: [--allow-evaluated-non-sitedir-paths] [--] <file|directory> [files|directories]
-# @DESCRIPTION:
-# Delete orphaned byte-compiled Python modules corresponding to specified Python modules.
-#
-# This function can be used only in pkg_postrm() phase.
-python_mod_cleanup() {
-	if [[ "${EBUILD_PHASE}" != "postrm" ]]; then
-		die "${FUNCNAME}() can be used only in pkg_postrm() phase"
-	fi
-
-	_python_check_python_pkg_setup_execution
-	_python_initialize_prefix_variables
-
-	local allow_evaluated_non_sitedir_paths="0" dir iterated_PYTHON_ABIS PYTHON_ABI="${PYTHON_ABI}" root search_paths=() sitedir
-
-	if _python_package_supporting_installation_for_multiple_python_abis; then
-		if has "${EAPI:-0}" 0 1 2 3 && [[ -z "${PYTHON_ABIS}" ]]; then
-			die "${FUNCNAME}(): python_pkg_setup() or python_execute_function() not called"
-		fi
-		iterated_PYTHON_ABIS="${PYTHON_ABIS}"
-	else
-		if has "${EAPI:-0}" 0 1 2 3; then
-			iterated_PYTHON_ABIS="${PYTHON_ABI:-$(PYTHON --ABI)}"
-		else
-			iterated_PYTHON_ABIS="${PYTHON_ABI}"
-		fi
-	fi
-
-	# Strip trailing slash from EROOT.
-	root="${EROOT%/}"
-
-	while (($#)); do
-		case "$1" in
-			--allow-evaluated-non-sitedir-paths)
-				allow_evaluated_non_sitedir_paths="1"
-				;;
-			--)
-				shift
-				break
-				;;
-			-*)
-				die "${FUNCNAME}(): Unrecognized option '$1'"
-				;;
-			*)
-				break
-				;;
-		esac
-		shift
-	done
-
-	if [[ "${allow_evaluated_non_sitedir_paths}" == "1" ]] && ! _python_package_supporting_installation_for_multiple_python_abis; then
-		die "${FUNCNAME}(): '--allow-evaluated-non-sitedir-paths' option cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
-	fi
-
-	if [[ "$#" -eq 0 ]]; then
-		die "${FUNCNAME}(): Missing files or directories"
-	fi
-
-	if ! has "${EAPI:-0}" 0 1 2 || _python_package_supporting_installation_for_multiple_python_abis || _python_implementation || [[ "${CATEGORY}/${PN}" == "sys-apps/portage" ]]; then
-		while (($#)); do
-			if [[ "$1" =~ ^($|(\.|\.\.|/)($|/)) ]]; then
-				die "${FUNCNAME}(): Invalid argument '$1'"
-			elif ! _python_implementation && [[ "$1" =~ ^/usr/lib(32|64)?/python[[:digit:]]+\.[[:digit:]]+ ]]; then
-				die "${FUNCNAME}(): Paths of directories / files in site-packages directories must be relative to site-packages directories"
-			elif [[ "$1" =~ ^/ ]]; then
-				if _python_package_supporting_installation_for_multiple_python_abis; then
-					if [[ "${allow_evaluated_non_sitedir_paths}" != "1" ]]; then
-						die "${FUNCNAME}(): Absolute paths cannot be used in ebuilds of packages supporting installation for multiple Python ABIs"
-					fi
-					if [[ "$1" != *\$* ]]; then
-						die "${FUNCNAME}(): '$1' has invalid syntax"
-					fi
-					for PYTHON_ABI in ${iterated_PYTHON_ABIS}; do
-						eval "search_paths+=(\"\${root}$1\")"
-					done
-				else
-					search_paths+=("${root}$1")
-				fi
-			else
-				for PYTHON_ABI in ${iterated_PYTHON_ABIS}; do
-					search_paths+=("${root}$(python_get_sitedir)/$1")
-				done
-			fi
-			shift
-		done
-	else
-		# Deprecated part of python_mod_cleanup()
-		ewarn
-		ewarn "Deprecation Warning: Usage of ${FUNCNAME}() in packages not supporting installation"
-		ewarn "for multiple Python ABIs in EAPI <=2 is deprecated and will be disallowed on 2011-08-01."
-		ewarn "Use EAPI >=3 and call ${FUNCNAME}() with paths having appropriate syntax."
-		ewarn "The ebuild needs to be fixed. Please report a bug, if it has not been already reported."
-		ewarn
-
-		search_paths=("${@#/}")
-		search_paths=("${search_paths[@]/#/${root}/}")
-	fi
-
-	_python_clean_compiled_modules "${search_paths[@]}"
-}
-
-# ================================================================================================
-# ===================================== DEPRECATED FUNCTIONS =====================================
-# ================================================================================================
-
-fi # _PYTHON_ECLASS_INHERITED

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
deleted file mode 100644
index 5da320e..0000000
--- a/eclass/qt4-build.eclass
+++ /dev/null
@@ -1,882 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.135 2012/09/06 08:30:00 kensington Exp $
-
-# @ECLASS: qt4-build.eclass
-# @MAINTAINER:
-# Qt herd <qt@g.o>
-# @BLURB: Eclass for Qt4 split ebuilds.
-# @DESCRIPTION:
-# This eclass contains various functions that are used when building Qt4.
-
-case ${EAPI} in
-	2|3|4|5)	: ;;
-	*)	die "qt4-build.eclass requires EAPI 2, 3 or 4." ;;
-esac
-
-inherit eutils flag-o-matic multilib toolchain-funcs versionator
-
-if [[ ${PV} == *9999* ]]; then
-	QT4_BUILD_TYPE="live"
-	inherit git-2
-else
-	QT4_BUILD_TYPE="release"
-fi
-
-HOMEPAGE="http://qt-project.org/ http://qt.nokia.com/"
-LICENSE="|| ( LGPL-2.1 GPL-3 )"
-
-MY_PV=${PV/_/-}
-MY_P=qt-everywhere-opensource-src-${MY_PV}
-
-case ${QT4_BUILD_TYPE} in
-	live)
-		EGIT_REPO_URI="git://gitorious.org/qt/qt.git
-			https://git.gitorious.org/qt/qt.git"
-		EGIT_BRANCH=${PV%.9999}
-		;;
-	release)
-		if version_is_at_least 4.8.1; then
-			SRC_URI="http://releases.qt-project.org/qt4/source/${MY_P}.tar.gz"
-		else
-			SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
-		fi
-		;;
-esac
-
-IUSE="aqua debug pch"
-[[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] && IUSE+=" +exceptions"
-if version_is_at_least 4.8; then
-	[[ ${CATEGORY}/${PN} != x11-libs/qt-webkit ]] && IUSE+=" c++0x"
-	version_is_at_least 4.8.3 || IUSE+=" qpa"
-fi
-
-DEPEND="virtual/pkgconfig"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	DEPEND+=" dev-lang/perl"
-fi
-
-RDEPEND="
-	!<x11-libs/qt-assistant-${PV}:4
-	!>x11-libs/qt-assistant-${PV}-r9999:4
-	!<x11-libs/qt-bearer-${PV}:4
-	!>x11-libs/qt-bearer-${PV}-r9999:4
-	!<x11-libs/qt-core-${PV}:4
-	!>x11-libs/qt-core-${PV}-r9999:4
-	!<x11-libs/qt-dbus-${PV}:4
-	!>x11-libs/qt-dbus-${PV}-r9999:4
-	!<x11-libs/qt-declarative-${PV}:4
-	!>x11-libs/qt-declarative-${PV}-r9999:4
-	!<x11-libs/qt-demo-${PV}:4
-	!>x11-libs/qt-demo-${PV}-r9999:4
-	!<x11-libs/qt-gui-${PV}:4
-	!>x11-libs/qt-gui-${PV}-r9999:4
-	!<x11-libs/qt-multimedia-${PV}:4
-	!>x11-libs/qt-multimedia-${PV}-r9999:4
-	!<x11-libs/qt-opengl-${PV}:4
-	!>x11-libs/qt-opengl-${PV}-r9999:4
-	!<x11-libs/qt-openvg-${PV}:4
-	!>x11-libs/qt-openvg-${PV}-r9999:4
-	!<x11-libs/qt-phonon-${PV}:4
-	!>x11-libs/qt-phonon-${PV}-r9999:4
-	!<x11-libs/qt-qt3support-${PV}:4
-	!>x11-libs/qt-qt3support-${PV}-r9999:4
-	!<x11-libs/qt-script-${PV}:4
-	!>x11-libs/qt-script-${PV}-r9999:4
-	!<x11-libs/qt-sql-${PV}:4
-	!>x11-libs/qt-sql-${PV}-r9999:4
-	!<x11-libs/qt-svg-${PV}:4
-	!>x11-libs/qt-svg-${PV}-r9999:4
-	!<x11-libs/qt-test-${PV}:4
-	!>x11-libs/qt-test-${PV}-r9999:4
-	!<x11-libs/qt-webkit-${PV}:4
-	!>x11-libs/qt-webkit-${PV}-r9999:4
-	!<x11-libs/qt-xmlpatterns-${PV}:4
-	!>x11-libs/qt-xmlpatterns-${PV}-r9999:4
-"
-
-S=${WORKDIR}/${MY_P}
-
-# @FUNCTION: qt4-build_pkg_setup
-# @DESCRIPTION:
-# Sets up PATH and LD_LIBRARY_PATH.
-qt4-build_pkg_setup() {
-	[[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
-
-	# Protect users by not allowing downgrades between releases.
-	# Downgrading revisions within the same release should be allowed.
-	if has_version ">${CATEGORY}/${P}-r9999:4"; then
-		if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
-			eerror "    ***  Sanity check to keep you from breaking your system  ***"
-			eerror "Downgrading Qt is completely unsupported and will break your system!"
-			die "aborting to save your system"
-		else
-			ewarn "Downgrading Qt is completely unsupported and will break your system!"
-		fi
-	fi
-
-	PATH="${S}/bin${PATH:+:}${PATH}"
-	if [[ ${CHOST} != *-darwin* ]]; then
-		LD_LIBRARY_PATH="${S}/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
-	else
-		DYLD_LIBRARY_PATH="${S}/lib${DYLD_LIBRARY_PATH:+:}${DYLD_LIBRARY_PATH}"
-		# On MacOS we *need* at least src/gui/kernel/qapplication_mac.mm for
-		# platform detection. Note: needs to come before any directories to
-		# avoid extract failure.
-		[[ ${CHOST} == *-apple-darwin* ]] && \
-			QT4_EXTRACT_DIRECTORIES="src/gui/kernel/qapplication_mac.mm
-				${QT4_EXTRACT_DIRECTORIES}"
-	fi
-}
-
-# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Space-separated list including the directories that will be extracted from
-# Qt tarball.
-
-# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Arguments for build_target_directories. Takes the directories in which the
-# code should be compiled. This is a space-separated list.
-
-# @FUNCTION: qt4-build_src_unpack
-# @DESCRIPTION:
-# Unpacks the sources.
-qt4-build_src_unpack() {
-	setqtenv
-
-	if ! version_is_at_least 4.1 $(gcc-version); then
-		ewarn "Using a GCC version lower than 4.1 is not supported."
-	fi
-
-	if [[ ${PN} == qt-webkit ]]; then
-		eshopts_push -s extglob
-		if is-flagq '-g?(gdb)?([1-9])'; then
-			echo
-			ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
-			ewarn "You may experience really long compilation times and/or increased memory usage."
-			ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
-			ewarn "For more info check out https://bugs.gentoo.org/307861"
-			echo
-		fi
-		eshopts_pop
-	fi
-
-	case ${QT4_BUILD_TYPE} in
-		live)
-			git-2_src_unpack
-			;;
-		release)
-			local tarball="${MY_P}.tar.gz" target= targets=
-			for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \
-				src/{qbase,qt_targets,qt_install}.pri bin config.tests \
-				mkspecs qmake ${QT4_EXTRACT_DIRECTORIES}
-			do
-				targets+="${MY_P}/${target} "
-			done
-
-			ebegin "Unpacking parts of ${tarball}:" ${targets//${MY_P}\/}
-			tar -xzf "${DISTDIR}/${tarball}" ${targets}
-			eend $? || die "failed to unpack"
-			;;
-	esac
-}
-
-# @ECLASS-VARIABLE: PATCHES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# PATCHES array variable containing all various patches to be applied.
-# This variable is expected to be defined in global scope of ebuild.
-# Make sure to specify the full path. This variable is utilised in
-# src_unpack/src_prepare phase, based on EAPI.
-#
-# @CODE
-#   PATCHES=( "${FILESDIR}/mypatch.patch"
-#             "${FILESDIR}/patches_folder/" )
-# @CODE
-
-# @FUNCTION: qt4-build_src_prepare
-# @DESCRIPTION:
-# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix
-# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in /etc/make.conf.
-qt4-build_src_prepare() {
-	setqtenv
-
-	if [[ ${QT4_BUILD_TYPE} == live ]]; then
-		QTDIR="." ./bin/syncqt || die "syncqt failed"
-	fi
-
-	if version_is_at_least 4.7; then
-		# avoid X11 dependency in non-gui packages
-		local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns"
-		has ${PN} ${nolibx11_pkgs} && qt_nolibx11
-	fi
-
-	if use aqua; then
-		# provide a proper macx-g++-64
-		use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir)
-
-		sed -e '/^CONFIG/s:app_bundle::' \
-			-e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \
-			-i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
-	fi
-
-	if [[ ${PN} != qt-core ]]; then
-		skip_qmake_build
-		skip_project_generation
-		symlink_binaries_to_buildtree
-	fi
-
-	if [[ ${CHOST} == *86*-apple-darwin* ]]; then
-		# qmake bus errors with -O2 or -O3 but -O1 works
-		# Bug 373061
-		replace-flags -O[23] -O1
-	fi
-
-	# Bug 178652
-	if [[ $(gcc-major-version) == 3 ]] && use amd64; then
-		ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
-		append-flags -fno-gcse
-	fi
-
-	if use_if_iuse c++0x; then
-		append-cxxflags -std=c++0x
-	fi
-
-	# Unsupported old gcc versions - hardened needs this :(
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		ewarn "Appending -fno-stack-protector to CXXFLAGS"
-		append-cxxflags -fno-stack-protector
-		# Bug 253127
-		sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \
-			-i mkspecs/common/g++.conf || die
-	fi
-
-	# Bug 261632
-	if use ppc64; then
-		ewarn "Appending -mminimal-toc to CFLAGS/CXXFLAGS"
-		append-flags -mminimal-toc
-	fi
-
-	# Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
-	sed -e "/^SYSTEM_VARIABLES=/i \
-		CC='$(tc-getCC)'\n\
-		CXX='$(tc-getCXX)'\n\
-		CFLAGS='${CFLAGS}'\n\
-		CXXFLAGS='${CXXFLAGS}'\n\
-		LDFLAGS='${LDFLAGS}'\n\
-		QMakeVar set QMAKE_CFLAGS_RELEASE\n\
-		QMakeVar set QMAKE_CFLAGS_DEBUG\n\
-		QMakeVar set QMAKE_CXXFLAGS_RELEASE\n\
-		QMakeVar set QMAKE_CXXFLAGS_DEBUG\n\
-		QMakeVar set QMAKE_LFLAGS_RELEASE\n\
-		QMakeVar set QMAKE_LFLAGS_DEBUG\n"\
-		-i configure \
-		|| die "sed SYSTEM_VARIABLES failed"
-
-	# Respect CC, CXX, LINK and *FLAGS in config.tests
-	find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
-		sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=: \
-			'QMAKE_CC=$(tc-getCC)'    'QMAKE_CXX=$(tc-getCXX)'      'QMAKE_LINK=$(tc-getCXX)' \
-			'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
-		|| die "sed config.tests failed"
-
-	if ! version_is_at_least 4.8; then
-		# Strip predefined CFLAGS from mkspecs (bugs 312689 and 352778)
-		sed -i -e '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf || die
-	fi
-
-	# Bug 172219
-	sed -e 's:/X11R6/:/:' -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# Set FLAGS *and* remove -arch, since our gcc-apple is multilib
-		# crippled (by design) :/
-		local mac_gpp_conf=
-		if [[ -f mkspecs/common/mac-g++.conf ]]; then
-			# qt < 4.8 has mac-g++.conf
-			mac_gpp_conf="mkspecs/common/mac-g++.conf"
-		elif [[ -f mkspecs/common/g++-macx.conf ]]; then
-			# qt >= 4.8 has g++-macx.conf
-			mac_gpp_conf="mkspecs/common/g++-macx.conf"
-		else
-			die "no known conf file for mac found"
-		fi
-		sed \
-			-e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
-			-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
-			-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=-headerpad_max_install_names ${LDFLAGS}:" \
-			-e "s:-arch\s\w*::g" \
-			-i ${mac_gpp_conf} \
-			|| die "sed ${mac_gpp_conf} failed"
-
-		# Fix configure's -arch settings that appear in qmake/Makefile and also
-		# fix arch handling (automagically duplicates our -arch arg and breaks
-		# pch). Additionally disable Xarch support.
-		local mac_gcc_confs="${mac_gpp_conf}"
-		if [[ -f mkspecs/common/gcc-base-macx.conf ]]; then
-			mac_gcc_confs+=" mkspecs/common/gcc-base-macx.conf"
-		fi
-		sed \
-			-e "s:-arch i386::" \
-			-e "s:-arch ppc::" \
-			-e "s:-arch x86_64::" \
-			-e "s:-arch ppc64::" \
-			-e "s:-arch \$i::" \
-			-e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \
-			-e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \
-			-e "s:-Xarch_x86_64::g" \
-			-e "s:-Xarch_ppc64::g" \
-			-i configure ${mac_gcc_confs} \
-			|| die "sed -arch/-Xarch failed"
-
-		# On Snow Leopard don't fall back to 10.5 deployment target.
-		if [[ ${CHOST} == *-apple-darwin10 ]]; then
-			sed -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \
-				-e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \
-				-i configure ${mac_gpp_conf} \
-				|| die "sed deployment target failed"
-		fi
-	fi
-
-	# this one is needed for all systems with a separate -liconv, apart from
-	# Darwin, for which the sources already cater for -liconv
-	if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
-		sed -e 's|mac:\(LIBS += -liconv\)|\1|g' \
-			-i config.tests/unix/iconv/iconv.pro \
-			|| die "sed iconv.pro failed"
-	fi
-
-	# we need some patches for Solaris
-	sed -i -e '/^QMAKE_LFLAGS_THREAD/a\QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \
-		mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
-	# use GCC over SunStudio
-	sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die
-	# do not flirt with non-Prefix stuff, we're quite possessive
-	sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \
-		mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
-
-	# apply patches
-	[[ -n ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
-	epatch_user
-}
-
-# @FUNCTION: qt4-build_src_configure
-# @DESCRIPTION:
-# Default configure phase
-qt4-build_src_configure() {
-	setqtenv
-
-	local conf="
-		-prefix ${QTPREFIXDIR}
-		-bindir ${QTBINDIR}
-		-libdir ${QTLIBDIR}
-		-docdir ${QTDOCDIR}
-		-headerdir ${QTHEADERDIR}
-		-plugindir ${QTPLUGINDIR}
-		$(version_is_at_least 4.7 && echo -importdir ${QTIMPORTDIR})
-		-datadir ${QTDATADIR}
-		-translationdir ${QTTRANSDIR}
-		-sysconfdir ${QTSYSCONFDIR}
-		-examplesdir ${QTEXAMPLESDIR}
-		-demosdir ${QTDEMOSDIR}
-		-opensource -confirm-license
-		-shared -fast -largefile -stl -verbose
-		-nomake examples -nomake demos"
-
-	# ARCH is set on Gentoo. Qt now falls back to generic on an unsupported
-	# $(tc-arch). Therefore we convert it to supported values.
-	case "$(tc-arch)" in
-		amd64|x64-*)		  conf+=" -arch x86_64" ;;
-		ppc-macos)		  conf+=" -arch ppc" ;;
-		ppc|ppc64|ppc-*)	  conf+=" -arch powerpc" ;;
-		sparc|sparc-*|sparc64-*)  conf+=" -arch sparc" ;;
-		x86-macos)		  conf+=" -arch x86" ;;
-		x86|x86-*)		  conf+=" -arch i386" ;;
-		alpha|arm|ia64|mips|s390) conf+=" -arch $(tc-arch)" ;;
-		hppa|sh)		  conf+=" -arch generic" ;;
-		*) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
-	esac
-
-	conf+=" -platform $(qt_mkspecs_dir)"
-
-	[[ $(get_libdir) != lib ]] && conf+=" -L${EPREFIX}/usr/$(get_libdir)"
-
-	# debug/release
-	if use debug; then
-		conf+=" -debug"
-	else
-		conf+=" -release"
-	fi
-	conf+=" -no-separate-debug-info"
-
-	# exceptions USE flag
-	conf+=" $(in_iuse exceptions && qt_use exceptions || echo -exceptions)"
-
-	# disable rpath on Qt >= 4.8 (bug 380415)
-	# but leave it enabled on prefix (bug 417169)
-	version_is_at_least 4.8 && use !prefix && conf+=" -no-rpath"
-
-	# precompiled headers don't work on hardened, where the flag is masked
-	conf+=" $(qt_use pch)"
-
-	# -reduce-relocations
-	# This flag seems to introduce major breakage to applications,
-	# mostly to be seen as a core dump with the message "QPixmap: Must
-	# construct a QApplication before a QPaintDevice" on Solaris.
-	#   -- Daniel Vergien
-	[[ ${CHOST} != *-solaris* ]] && conf+=" -reduce-relocations"
-
-	# this one is needed for all systems with a separate -liconv, apart from
-	# Darwin, for which the sources already cater for -liconv
-	if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
-		conf+=" -liconv"
-	fi
-
-	if use_if_iuse glib; then
-		local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)"
-		# avoid the -pthread argument
-		conf+=" ${glibflags//-pthread}"
-		unset glibflags
-	fi
-
-	if use_if_iuse qpa; then
-		echo
-		ewarn "The qpa useflag enables the Qt Platform Abstraction, formely"
-		ewarn "known as Qt Lighthouse. If you are not sure what that is, then"
-		ewarn "disable it before reporting any bugs related to this useflag."
-		echo
-		conf+=" -qpa"
-	fi
-
-	if use aqua; then
-		# On (snow) leopard use the new (frameworked) cocoa code.
-		if [[ ${CHOST##*-darwin} -ge 9 ]]; then
-			conf+=" -cocoa -framework"
-			# We need the source's headers, not the installed ones.
-			conf+=" -I${S}/include"
-			# Add hint for the framework location.
-			conf+=" -F${QTLIBDIR}"
-
-			# We are crazy and build cocoa + qt3support :-)
-			if use qt3support; then
-				sed -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \
-					-i configure || die
-			fi
-		else
-			conf+=" -no-framework"
-		fi
-	else
-		# freetype2 include dir is non-standard, thus pass it to configure
-		conf+=" $(pkg-config --cflags-only-I freetype2)"
-	fi
-
-	conf+=" ${myconf}"
-	myconf=
-
-	echo ./configure ${conf}
-	./configure ${conf} || die "./configure failed"
-
-	prepare_directories ${QT4_TARGET_DIRECTORIES}
-}
-
-# @FUNCTION: qt4-build_src_compile
-# @DESCRIPTION:
-# Actual compile phase
-qt4-build_src_compile() {
-	setqtenv
-
-	build_directories ${QT4_TARGET_DIRECTORIES}
-}
-
-# @FUNCTION: qt4-build_src_test
-# @DESCRIPTION:
-# Runs tests only in target directories.
-qt4-build_src_test() {
-	# QtMultimedia does not have any test suite (bug #332299)
-	[[ ${PN} == qt-multimedia ]] && return
-
-	for dir in ${QT4_TARGET_DIRECTORIES}; do
-		emake -j1 check -C ${dir}
-	done
-}
-
-# @FUNCTION: fix_includes
-# @DESCRIPTION:
-# For MacOS X we need to add some symlinks when frameworks are
-# being used, to avoid complications with some more or less stupid packages.
-fix_includes() {
-	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
-		local frw dest f h rdir
-		# Some packages tend to include <Qt/...>
-		dodir "${QTHEADERDIR#${EPREFIX}}"/Qt
-
-		# Fake normal headers when frameworks are installed... eases life later
-		# on, make sure we use relative links though, as some ebuilds assume
-		# these dirs exist in src_install to add additional files
-		f=${QTHEADERDIR}
-		h=${QTLIBDIR}
-		while [[ -n ${f} && ${f%%/*} == ${h%%/*} ]] ; do
-			f=${f#*/}
-			h=${h#*/}
-		done
-		rdir=${h}
-		f="../"
-		while [[ ${h} == */* ]] ; do
-			f="${f}../"
-			h=${h#*/}
-		done
-		rdir="${f}${rdir}"
-
-		for frw in "${D}${QTLIBDIR}"/*.framework; do
-			[[ -e "${frw}"/Headers ]] || continue
-			f=$(basename ${frw})
-			dest="${QTHEADERDIR#${EPREFIX}}"/${f%.framework}
-			dosym "${rdir}"/${f}/Headers "${dest}"
-
-			# Link normal headers as well.
-			for hdr in "${D}/${QTLIBDIR}/${f}"/Headers/*; do
-				h=$(basename ${hdr})
-				dosym "../${rdir}"/${f}/Headers/${h} \
-					"${QTHEADERDIR#${EPREFIX}}"/Qt/${h}
-			done
-		done
-	fi
-}
-
-# @FUNCTION: qt4-build_src_install
-# @DESCRIPTION:
-# Perform the actual installation including some library fixes.
-qt4-build_src_install() {
-	[[ ${EAPI} == 2 ]] && use !prefix && ED=${D}
-	setqtenv
-
-	install_directories ${QT4_TARGET_DIRECTORIES}
-	install_qconfigs
-	fix_library_files
-	fix_includes
-
-	# remove .la files since we are building only shared Qt libraries
-	find "${D}"${QTLIBDIR} -type f -name '*.la' -print0 | xargs -0 rm -f
-}
-
-# @FUNCTION: setqtenv
-# @INTERNAL
-setqtenv() {
-	# Set up installation directories
-	QTPREFIXDIR=${EPREFIX}/usr
-	QTBINDIR=${EPREFIX}/usr/bin
-	QTLIBDIR=${EPREFIX}/usr/$(get_libdir)/qt4
-	QTPCDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig
-	QTDOCDIR=${EPREFIX}/usr/share/doc/qt-${PV}
-	QTHEADERDIR=${EPREFIX}/usr/include/qt4
-	QTPLUGINDIR=${QTLIBDIR}/plugins
-	QTIMPORTDIR=${QTLIBDIR}/imports
-	QTDATADIR=${EPREFIX}/usr/share/qt4
-	QTTRANSDIR=${QTDATADIR}/translations
-	QTSYSCONFDIR=${EPREFIX}/etc/qt4
-	QTEXAMPLESDIR=${QTDATADIR}/examples
-	QTDEMOSDIR=${QTDATADIR}/demos
-	QMAKE_LIBDIR_QT=${QTLIBDIR}
-	QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4
-
-	PLATFORM=$(qt_mkspecs_dir)
-	unset QMAKESPEC
-
-	export XDG_CONFIG_HOME="${T}"
-}
-
-# @FUNCTION: prepare_directories
-# @USAGE: < directories >
-# @INTERNAL
-# @DESCRIPTION:
-# Generates Makefiles for the given list of directories.
-prepare_directories() {
-	for x in "$@"; do
-		pushd "${S}"/${x} >/dev/null || die
-		einfo "Running qmake in: ${x}"
-		# avoid running over the maximum argument number, bug #299810
-		{
-			echo "${S}"/mkspecs/common/*.conf
-			find "${S}" -name '*.pr[io]'
-		} | xargs sed -i \
-			-e "s:\$\$\[QT_INSTALL_LIBS\]:${QTLIBDIR}:g" \
-			-e "s:\$\$\[QT_INSTALL_PLUGINS\]:${QTPLUGINDIR}:g" \
-			|| die
-		"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
-		popd >/dev/null || die
-	done
-}
-
-
-# @FUNCTION: build_directories
-# @USAGE: < directories >
-# @INTERNAL
-# @DESCRIPTION:
-# Compiles the code in the given list of directories.
-build_directories() {
-	for x in "$@"; do
-		pushd "${S}"/${x} >/dev/null || die
-		emake CC="$(tc-getCC)" \
-			CXX="$(tc-getCXX)" \
-			LINK="$(tc-getCXX)" || die "emake failed"
-		popd >/dev/null || die
-	done
-}
-
-# @FUNCTION: install_directories
-# @USAGE: < directories >
-# @INTERNAL
-# @DESCRIPTION:
-# Runs emake install in the given directories, which are separated by spaces.
-install_directories() {
-	for x in "$@"; do
-		pushd "${S}"/${x} >/dev/null || die
-		emake INSTALL_ROOT="${D}" install || die "emake install failed"
-		popd >/dev/null || die
-	done
-}
-
-# @ECLASS-VARIABLE: QCONFIG_ADD
-# @DESCRIPTION:
-# List options that need to be added to QT_CONFIG in qconfig.pri
-: ${QCONFIG_ADD:=}
-
-# @ECLASS-VARIABLE: QCONFIG_REMOVE
-# @DESCRIPTION:
-# List options that need to be removed from QT_CONFIG in qconfig.pri
-: ${QCONFIG_REMOVE:=}
-
-# @ECLASS-VARIABLE: QCONFIG_DEFINE
-# @DESCRIPTION:
-# List variables that should be defined at the top of QtCore/qconfig.h
-: ${QCONFIG_DEFINE:=}
-
-# @FUNCTION: install_qconfigs
-# @INTERNAL
-# @DESCRIPTION:
-# Install gentoo-specific mkspecs configurations.
-install_qconfigs() {
-	local x
-	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
-		for x in QCONFIG_ADD QCONFIG_REMOVE; do
-			[[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
-		done
-		insinto ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo
-		doins "${T}"/${PN}-qconfig.pri || die "installing ${PN}-qconfig.pri failed"
-	fi
-
-	if [[ -n ${QCONFIG_DEFINE} ]]; then
-		for x in ${QCONFIG_DEFINE}; do
-			echo "#define ${x}" >> "${T}"/gentoo-${PN}-qconfig.h
-		done
-		insinto ${QTHEADERDIR#${EPREFIX}}/Gentoo
-		doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed"
-	fi
-}
-
-# @FUNCTION: generate_qconfigs
-# @INTERNAL
-# @DESCRIPTION:
-# Generates gentoo-specific qconfig.{h,pri}.
-generate_qconfigs() {
-	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${PN} == qt-core ]]; then
-		local x qconfig_add qconfig_remove qconfig_new
-		for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
-			[[ -f ${x} ]] || continue
-			qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")"
-			qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
-		done
-
-		# these error checks do not use die because dying in pkg_post{inst,rm}
-		# just makes things worse.
-		if [[ -e "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qconfig.pri ]]; then
-			# start with the qconfig.pri that qt-core installed
-			if ! cp "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qconfig.pri \
-				"${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then
-				eerror "cp qconfig failed."
-				return 1
-			fi
-
-			# generate list of QT_CONFIG entries from the existing list
-			# including qconfig_add and excluding qconfig_remove
-			for x in $(sed -n 's/^QT_CONFIG +=//p' \
-				"${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do
-					has ${x} ${qconfig_remove} || qconfig_new+=" ${x}"
-			done
-
-			# replace the existing QT_CONFIG list with qconfig_new
-			if ! sed -i -e "s/QT_CONFIG +=.*/QT_CONFIG += ${qconfig_new}/" \
-				"${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then
-				eerror "Sed for QT_CONFIG failed"
-				return 1
-			fi
-
-			# create Gentoo/qconfig.h
-			if [[ ! -e ${ROOT}${QTHEADERDIR}/Gentoo ]]; then
-				if ! mkdir -p "${ROOT}${QTHEADERDIR}"/Gentoo; then
-					eerror "mkdir ${QTHEADERDIR}/Gentoo failed"
-					return 1
-				fi
-			fi
-			: > "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h
-			for x in "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-*-qconfig.h; do
-				[[ -f ${x} ]] || continue
-				cat "${x}" >> "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h
-			done
-		else
-			rm -f "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri
-			rm -f "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h
-			rmdir "${ROOT}${QTDATADIR}"/mkspecs \
-				"${ROOT}${QTDATADIR}" \
-				"${ROOT}${QTHEADERDIR}"/Gentoo \
-				"${ROOT}${QTHEADERDIR}" 2>/dev/null
-		fi
-	fi
-}
-
-# @FUNCTION: qt4-build_pkg_postrm
-# @DESCRIPTION:
-# Regenerate configuration when the package is completely removed.
-qt4-build_pkg_postrm() {
-	generate_qconfigs
-}
-
-# @FUNCTION: qt4-build_pkg_postinst
-# @DESCRIPTION:
-# Regenerate configuration, plus throw a message about possible
-# breakages and proposed solutions.
-qt4-build_pkg_postinst() {
-	generate_qconfigs
-}
-
-# @FUNCTION: skip_qmake_build
-# @INTERNAL
-# @DESCRIPTION:
-# Patches configure to skip qmake compilation, as it's already installed by qt-core.
-skip_qmake_build() {
-	sed -i -e "s:if true:if false:g" "${S}"/configure || die
-}
-
-# @FUNCTION: skip_project_generation
-# @INTERNAL
-# @DESCRIPTION:
-# Exit the script early by throwing in an exit before all of the .pro files are scanned.
-skip_project_generation() {
-	sed -i -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" "${S}"/configure || die
-}
-
-# @FUNCTION: symlink_binaries_to_buildtree
-# @INTERNAL
-# @DESCRIPTION:
-# Symlinks generated binaries to buildtree, so they can be used during compilation time.
-symlink_binaries_to_buildtree() {
-	for bin in qmake moc uic rcc; do
-		ln -s "${QTBINDIR}"/${bin} "${S}"/bin/ || die "symlinking ${bin} to ${S}/bin failed"
-	done
-}
-
-# @FUNCTION: fix_library_files
-# @INTERNAL
-# @DESCRIPTION:
-# Fixes the paths in *.la, *.prl, *.pc, as they are wrong due to sandbox and
-# moves the *.pc files into the pkgconfig directory.
-fix_library_files() {
-	local libfile
-	for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do
-		if [[ -e ${libfile} ]]; then
-			sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${libfile} || die "sed on ${libfile} failed"
-		fi
-	done
-
-	# pkgconfig files refer to WORKDIR/bin as the moc and uic locations
-	for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do
-		if [[ -e ${libfile} ]]; then
-			sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "sed on ${libfile} failed"
-
-		# Move .pc files into the pkgconfig directory
-		dodir ${QTPCDIR#${EPREFIX}}
-		mv ${libfile} "${D}"/${QTPCDIR}/ || die "moving ${libfile} to ${D}/${QTPCDIR}/ failed"
-		fi
-	done
-
-	# Don't install an empty directory
-	rmdir "${D}"/${QTLIBDIR}/pkgconfig
-}
-
-# @FUNCTION: qt_use
-# @USAGE: < flag > [ feature ] [ enableval ]
-# @DESCRIPTION:
-# This will echo "-${enableval}-${feature}" if <flag> is enabled, or
-# "-no-${feature}" if it's disabled. If [feature] is not specified, <flag>
-# will be used for that. If [enableval] is not specified, it omits the
-# "-${enableval}" part.
-qt_use() {
-	use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
-}
-
-# @FUNCTION: qt_mkspecs_dir
-# @RETURN: the specs-directory w/o path
-# @DESCRIPTION:
-# Allows us to define which mkspecs dir we want to use.
-qt_mkspecs_dir() {
-	local spec=
-
-	case "${CHOST}" in
-		*-freebsd*|*-dragonfly*)
-			spec=freebsd ;;
-		*-openbsd*)
-			spec=openbsd ;;
-		*-netbsd*)
-			spec=netbsd ;;
-		*-darwin*)
-			if use aqua; then
-				# mac with carbon/cocoa
-				spec=macx
-			else
-				# darwin/mac with x11
-				spec=darwin
-			fi
-			;;
-		*-solaris*)
-			spec=solaris ;;
-		*-linux-*|*-linux)
-			spec=linux ;;
-		*)
-			die "${FUNCNAME}(): Unknown CHOST '${CHOST}'" ;;
-	esac
-
-	case "$(tc-getCXX)" in
-		*g++*)
-			spec+=-g++ ;;
-		*icpc*)
-			spec+=-icc ;;
-		*)
-			die "${FUNCNAME}(): Unknown compiler '$(tc-getCXX)'" ;;
-	esac
-
-	# Add -64 for 64bit profiles
-	if use x64-freebsd ||
-		use amd64-linux ||
-		use x64-macos ||
-		use x64-solaris ||
-		use sparc64-solaris
-	then
-		spec+=-64
-	fi
-
-	echo "${spec}"
-}
-
-# @FUNCTION: qt_nolibx11
-# @INTERNAL
-# @DESCRIPTION:
-# Ignore X11 tests for packages that don't need X libraries installed.
-qt_nolibx11() {
-	sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S}"/configure ||
-		die "x11 check sed failed"
-}
-
-EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst

diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass
deleted file mode 100644
index 1622cf3..0000000
--- a/eclass/qt4-r2.eclass
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v 1.21 2012/07/23 12:53:13 yngwin Exp $
-
-# @ECLASS: qt4-r2.eclass
-# @MAINTAINER:
-# Qt herd <qt@g.o>
-# @BLURB: Eclass for Qt4-based packages, second edition.
-# @DESCRIPTION:
-# This eclass contains various functions that may be useful when
-# dealing with packages using Qt4 libraries. Requires EAPI=2 or later.
-
-case ${EAPI} in
-	2|3|4|5)	: ;;
-	*)	die "EAPI=${EAPI} is not supported by ${ECLASS} eclass." ;;
-esac
-
-inherit base eutils multilib toolchain-funcs
-
-export XDG_CONFIG_HOME="${T}"
-
-# @ECLASS-VARIABLE: DOCS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Array containing documents passed to dodoc command.
-# Paths can be absolute or relative to ${S}.
-#
-# Example: DOCS=( ChangeLog README "${WORKDIR}/doc_folder/" )
-
-# @ECLASS-VARIABLE: HTML_DOCS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Array containing documents passed to dohtml command.
-# Paths can be absolute or relative to ${S}.
-#
-# Example: HTML_DOCS=( "doc/document.html" "${WORKDIR}/html_folder/" )
-
-# @ECLASS-VARIABLE: LANGS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# In case your Qt4 application provides various translations, use this variable
-# to specify them in order to populate "linguas_*" IUSE automatically. Make sure
-# that you set this variable before inheriting qt4-r2 eclass.
-# Example:
-# @CODE
-#   LANGS="en el de"
-# @CODE
-for x in ${LANGS}; do
-	IUSE+=" linguas_${x}"
-done
-
-# @ECLASS-VARIABLE: LANGSLONG
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Same as above, but this variable is for LINGUAS that must be in long format.
-# Remember to set this variable before inheriting qt4-r2 eclass.
-# Look at ${PORTDIR}/profiles/desc/linguas.desc for details.
-for x in ${LANGSLONG}; do
-	IUSE+=" linguas_${x%_*}"
-done
-unset x
-
-# @ECLASS-VARIABLE: PATCHES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Array variable containing all the patches to be applied. This variable
-# is expected to be defined in the global scope of ebuilds. Make sure to
-# specify the full path. This variable is used in src_prepare phase.
-#
-# Example:
-# @CODE
-#   PATCHES=(
-#       "${FILESDIR}/mypatch.patch"
-#       "${FILESDIR}/mypatch2.patch"
-#   )
-# @CODE
-
-# @FUNCTION: qt4-r2_src_unpack
-# @DESCRIPTION:
-# Default src_unpack function for packages that depend on qt4. If you have to
-# override src_unpack in your ebuild (probably you don't need to), call
-# qt4-r2_src_unpack in it.
-qt4-r2_src_unpack() {
-	debug-print-function $FUNCNAME "$@"
-
-	base_src_unpack "$@"
-}
-
-# @FUNCTION: qt4-r2_src_prepare
-# @DESCRIPTION:
-# Default src_prepare function for packages that depend on qt4. If you have to
-# override src_prepare in your ebuild, you should call qt4-r2_src_prepare in it,
-# otherwise autopatcher will not work!
-qt4-r2_src_prepare() {
-	debug-print-function $FUNCNAME "$@"
-
-	base_src_prepare "$@"
-}
-
-# @FUNCTION: qt4-r2_src_configure
-# @DESCRIPTION:
-# Default src_configure function for packages that depend on qt4. If you have to
-# override src_configure in your ebuild, call qt4-r2_src_configure in it.
-qt4-r2_src_configure() {
-	debug-print-function $FUNCNAME "$@"
-
-	local project_file=$(_find_project_file)
-
-	if [[ -n ${project_file} ]]; then
-		eqmake4 "${project_file}"
-	else
-		base_src_configure "$@"
-	fi
-}
-
-# @FUNCTION: qt4-r2_src_compile
-# @DESCRIPTION:
-# Default src_compile function for packages that depend on qt4. If you have to
-# override src_compile in your ebuild (probably you don't need to), call
-# qt4-r2_src_compile in it.
-qt4-r2_src_compile() {
-	debug-print-function $FUNCNAME "$@"
-
-	base_src_compile "$@"
-}
-
-# @FUNCTION: qt4-r2_src_install
-# @DESCRIPTION:
-# Default src_install function for qt4-based packages. Installs compiled code
-# documentation (via DOCS and HTML_DOCS variables).
-
-qt4-r2_src_install() {
-	debug-print-function $FUNCNAME "$@"
-
-	base_src_install INSTALL_ROOT="${D}" "$@"
-
-	# backward compatibility for non-array variables
-	if [[ -n ${DOCS} ]] && [[ "$(declare -p DOCS 2>/dev/null 2>&1)" != "declare -a"* ]]; then
-		dodoc ${DOCS} || die "dodoc failed"
-	fi
-	if [[ -n ${HTML_DOCS} ]] && [[ "$(declare -p HTML_DOCS 2>/dev/null 2>&1)" != "declare -a"* ]]; then
-		dohtml -r ${HTML_DOCS} || die "dohtml failed"
-	fi
-}
-
-# Internal function, used by eqmake4 and qt4-r2_src_configure
-# Look for project files:
-#   0 *.pro files found - output null string
-#   1 *.pro file found - output its name
-#   2 or more *.pro files found - if ${PN}.pro or $(basename ${S}).pro
-#     are there, output any of them
-# Outputs a project file argument used by eqmake4. Sets nullglob locally
-# to avoid expanding *.pro as "*.pro" when there are no matching files.
-_find_project_file() {
-	local dir_name=$(basename "${S}")
-
-	eshopts_push -s nullglob
-	local pro_files=(*.pro)
-	eshopts_pop
-
-	case ${#pro_files[@]} in
-	1)
-		echo "${pro_files[0]}"
-		;;
-	*)
-		for pro_file in "${pro_files[@]}"; do
-			if [[ ${pro_file} == "${dir_name}.pro" || ${pro_file} == "${PN}.pro" ]]; then
-				echo "${pro_file}"
-				break
-			fi
-		done
-		;;
-	esac
-}
-
-# @FUNCTION: eqmake4
-# @USAGE: [project_file] [parameters to qmake]
-# @DESCRIPTION:
-# Wrapper for Qt4's qmake. If project_file isn't specified, eqmake4 will
-# look for it in the current directory (${S}, non-recursively). If more
-# than one project file are found, then ${PN}.pro is processed, provided
-# that it exists. Otherwise eqmake4 fails.
-#
-# All other arguments are appended unmodified to qmake command line. For
-# recursive build systems, i.e. those based on the subdirs template, you
-# should run eqmake4 on the top-level project file only, unless you have
-# strong reasons to do things differently. During the building, qmake
-# will be automatically re-invoked with the right arguments on every
-# directory specified inside the top-level project file.
-eqmake4() {
-	[[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
-
-	ebegin "Running qmake"
-
-	local qmake_args=("$@")
-
-	# check if project file was passed as a first argument
-	# if not, then search for it
-	local regexp='.*\.pro'
-	if ! [[ ${1} =~ ${regexp} ]]; then
-		local project_file=$(_find_project_file)
-		if [[ -z ${project_file} ]]; then
-			echo
-			eerror "No project files found in '${PWD}'!"
-			eerror "This shouldn't happen - please send a bug report to http://bugs.gentoo.org/"
-			echo
-			die "eqmake4 failed"
-		fi
-		qmake_args+=("${project_file}")
-	fi
-
-	# make sure CONFIG variable is correctly set
-	# for both release and debug builds
-	local config_add="release"
-	local config_remove="debug"
-	if has debug ${IUSE} && use debug; then
-		config_add="debug"
-		config_remove="release"
-	fi
-	local awkscript='BEGIN {
-				printf "### eqmake4 was here ###\n" > file;
-				printf "CONFIG -= debug_and_release %s\n", remove >> file;
-				printf "CONFIG += %s\n\n", add >> file;
-				fixed=0;
-			}
-			/^[[:blank:]]*CONFIG[[:blank:]]*[\+\*]?=/ {
-				if (gsub("\\<((" remove ")|(debug_and_release))\\>", "") > 0) {
-					fixed=1;
-				}
-			}
-			/^[[:blank:]]*CONFIG[[:blank:]]*-=/ {
-				if (gsub("\\<" add "\\>", "") > 0) {
-					fixed=1;
-				}
-			}
-			{
-				print >> file;
-			}
-			END {
-				print fixed;
-			}'
-	local file=
-	while read file; do
-		grep -q '^### eqmake4 was here ###$' "${file}" && continue
-		local retval=$({
-				rm -f "${file}" || echo FAIL
-				awk -v file="${file}" \
-					-v add=${config_add} \
-					-v remove=${config_remove} \
-					-- "${awkscript}" || echo FAIL
-				} < "${file}")
-		if [[ ${retval} == 1 ]]; then
-			einfo " - fixed CONFIG in ${file}"
-		elif [[ ${retval} != 0 ]]; then
-			eerror " - error while processing ${file}"
-			die "eqmake4 failed to process ${file}"
-		fi
-	done < <(find . -type f -name '*.pr[io]' -printf '%P\n' 2>/dev/null)
-
-	"${EPREFIX}"/usr/bin/qmake \
-		-makefile \
-		QTDIR="${EPREFIX}"/usr/$(get_libdir) \
-		QMAKE="${EPREFIX}"/usr/bin/qmake \
-		QMAKE_CC="$(tc-getCC)" \
-		QMAKE_CXX="$(tc-getCXX)" \
-		QMAKE_LINK="$(tc-getCXX)" \
-		QMAKE_CFLAGS="${CFLAGS}" \
-		QMAKE_CFLAGS_RELEASE= \
-		QMAKE_CFLAGS_DEBUG= \
-		QMAKE_CXXFLAGS="${CXXFLAGS}" \
-		QMAKE_CXXFLAGS_RELEASE= \
-		QMAKE_CXXFLAGS_DEBUG= \
-		QMAKE_LFLAGS="${LDFLAGS}" \
-		QMAKE_LFLAGS_RELEASE= \
-		QMAKE_LFLAGS_DEBUG= \
-		QMAKE_LIBDIR_QT="${EPREFIX}"/usr/$(get_libdir)/qt4 \
-		QMAKE_LIBDIR_X11="${EPREFIX}"/usr/$(get_libdir) \
-		QMAKE_LIBDIR_OPENGL="${EPREFIX}"/usr/$(get_libdir) \
-		QMAKE_STRIP= \
-		"${qmake_args[@]}"
-
-	# was qmake successful?
-	if ! eend $? ; then
-		echo
-		eerror "Running qmake has failed! (see above for details)"
-		eerror "This shouldn't happen - please send a bug report to http://bugs.gentoo.org/"
-		echo
-		die "eqmake4 failed"
-	fi
-
-	return 0
-}
-
-EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install

diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
deleted file mode 100644
index e3c24d4..0000000
--- a/eclass/ruby-ng.eclass
+++ /dev/null
@@ -1,734 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.50 2012/08/13 22:21:26 flameeyes Exp $
-
-# @ECLASS: ruby-ng.eclass
-# @MAINTAINER:
-# Ruby herd <ruby@g.o>
-# @AUTHOR:
-# Author: Diego E. Pettenò <flameeyes@g.o>
-# Author: Alex Legler <a3li@g.o>
-# Author: Hans de Graaff <graaff@g.o>
-# @BLURB: An eclass for installing Ruby packages with proper support for multiple Ruby slots.
-# @DESCRIPTION:
-# The Ruby eclass is designed to allow an easier installation of Ruby packages
-# and their incorporation into the Gentoo Linux system.
-#
-# Currently available targets are:
-#  * ruby18 - Ruby (MRI) 1.8.x
-#  * ruby19 - Ruby (MRI) 1.9.x
-#  * ree18  - Ruby Enterprise Edition 1.8.x
-#  * jruby  - JRuby
-#  * rbx    - Rubinius
-#
-# This eclass does not define the implementation of the configure,
-# compile, test, or install phases. Instead, the default phases are
-# used.  Specific implementations of these phases can be provided in
-# the ebuild either to be run for each Ruby implementation, or for all
-# Ruby implementations, as follows:
-#
-#  * each_ruby_configure
-#  * all_ruby_configure
-
-# @ECLASS-VARIABLE: USE_RUBY
-# @REQUIRED
-# @DESCRIPTION:
-# This variable contains a space separated list of targets (see above) a package
-# is compatible to. It must be set before the `inherit' call. There is no
-# default. All ebuilds are expected to set this variable.
-
-# @ECLASS-VARIABLE: RUBY_PATCHES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# A String or Array of filenames of patches to apply to all implementations.
-
-# @ECLASS-VARIABLE: RUBY_OPTIONAL
-# @DESCRIPTION:
-# Set the value to "yes" to make the dependency on a Ruby interpreter
-# optional and then ruby_implementations_depend() to help populate
-# DEPEND and RDEPEND.
-
-# @ECLASS-VARIABLE: RUBY_S
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# If defined this variable determines the source directory name after
-# unpacking. This defaults to the name of the package. Note that this
-# variable supports a wildcard mechanism to help with github tarballs
-# that contain the commit hash as part of the directory name.
-
-# @ECLASS-VARIABLE: RUBY_QA_ALLOWED_LIBS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# If defined this variable contains a whitelist of shared objects that
-# are allowed to exist even if they don't link to libruby. This avoids
-# the QA check that makes this mandatory. This is most likely not what
-# you are looking for if you get the related "Missing links" QA warning,
-# since the proper fix is almost always to make sure the shared object
-# is linked against libruby. There are cases were this is not the case
-# and the shared object is generic code to be used in some other way
-# (e.g. selenium's firefox driver extension). When set this argument is
-# passed to "grep -E" to remove reporting of these shared objects.
-
-inherit eutils java-utils-2 multilib toolchain-funcs
-
-EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test src_install pkg_setup
-
-case ${EAPI} in
-	0|1)
-		die "Unsupported EAPI=${EAPI} (too old) for ruby-ng.eclass" ;;
-	2|3) ;;
-	4|5)
-		# S is no longer automatically assigned when it doesn't exist.
-		S="${WORKDIR}"
-		;;
-	*)
-		die "Unknown EAPI=${EAPI} for ruby-ng.eclass"
-esac
-
-# @FUNCTION: ruby_implementation_depend
-# @USAGE: target [comparator [version]]
-# @RETURN: Package atom of a Ruby implementation to be used in dependencies.
-# @DESCRIPTION:
-# This function returns the formal package atom for a Ruby implementation.
-#
-# `target' has to be one of the valid values for USE_RUBY (see above)
-#
-# Set `comparator' and `version' to include a comparator (=, >=, etc.) and a
-# version string to the returned string
-ruby_implementation_depend() {
-	local rubypn=
-	local rubyslot=
-
-	case $1 in
-		ruby18)
-			rubypn="dev-lang/ruby"
-			rubyslot=":1.8"
-			;;
-		ruby19)
-			rubypn="dev-lang/ruby"
-			rubyslot=":1.9"
-			;;
-		ree18)
-			rubypn="dev-lang/ruby-enterprise"
-			rubyslot=":1.8"
-			;;
-		jruby)
-			rubypn="dev-java/jruby"
-			rubyslot=""
-			;;
-		rbx)
-			rubypn="dev-lang/rubinius"
-			rubyslot=""
-			;;
-		*) die "$1: unknown Ruby implementation"
-	esac
-
-	echo "$2${rubypn}$3${rubyslot}"
-}
-
-# @FUNCTION: ruby_samelib
-# @RETURN: use flag string with current ruby implementations
-# @DESCRIPTION:
-# Convenience function to output the use dependency part of a
-# dependency. Used as a building block for ruby_add_rdepend() and
-# ruby_add_bdepend(), but may also be useful in an ebuild to specify
-# more complex dependencies.
-ruby_samelib() {
-	local res=
-	for _ruby_implementation in $USE_RUBY; do
-		has -${_ruby_implementation} $@ || \
-			res="${res}ruby_targets_${_ruby_implementation}?,"
-	done
-
-	echo "[${res%,}]"
-}
-
-_ruby_atoms_samelib_generic() {
-	eshopts_push -o noglob
-	echo "RUBYTARGET? ("
-	for token in $*; do
-		case "$token" in
-			"||" | "(" | ")" | *"?")
-				echo "${token}" ;;
-			*])
-				echo "${token%[*}[RUBYTARGET,${token/*[}" ;;
-			*)
-				echo "${token}[RUBYTARGET]" ;;
-		esac
-	done
-	echo ")"
-	eshopts_pop
-}
-
-# @FUNCTION: ruby_implementation_command
-# @RETURN: the path to the given ruby implementation
-# @DESCRIPTION:
-# Not all implementations have the same command basename as the
-# target; namely Ruby Enterprise 1.8 uses ree18 and rubyee18
-# respectively. This function translate between the two
-ruby_implementation_command() {
-	local _ruby_name=$1
-
-		# Add all USE_RUBY values where the flag name diverts from the binary here
-	case $1 in
-		ree18)
-			_ruby_name=rubyee18
-			;;
-	esac
-
-	echo $(type -p ${_ruby_name} 2>/dev/null)
-}
-
-_ruby_atoms_samelib() {
-	local atoms=$(_ruby_atoms_samelib_generic "$*")
-
-	for _ruby_implementation in $USE_RUBY; do
-		echo "${atoms//RUBYTARGET/ruby_targets_${_ruby_implementation}}"
-	done
-}
-
-_ruby_wrap_conditions() {
-	local conditions="$1"
-	local atoms="$2"
-
-	for condition in $conditions; do
-		atoms="${condition}? ( ${atoms} )"
-	done
-
-	echo "$atoms"
-}
-
-# @FUNCTION: ruby_add_rdepend
-# @USAGE: dependencies
-# @DESCRIPTION:
-# Adds the specified dependencies, with use condition(s) to RDEPEND,
-# taking the current set of ruby targets into account. This makes sure
-# that all ruby dependencies of the package are installed for the same
-# ruby targets. Use this function for all ruby dependencies instead of
-# setting RDEPEND yourself. The list of atoms uses the same syntax as
-# normal dependencies.
-#
-# Note: runtime dependencies are also added as build-time test
-# dependencies.
-ruby_add_rdepend() {
-	case $# in
-		1) ;;
-		2)
-			[[ "${GENTOO_DEV}" == "yes" ]] && eqawarn "You can now use the usual syntax in ruby_add_rdepend for $CATEGORY/$PF"
-			ruby_add_rdepend "$(_ruby_wrap_conditions "$1" "$2")"
-			return
-			;;
-		*)
-			die "bad number of arguments to $0"
-			;;
-	esac
-
-	local dependency=$(_ruby_atoms_samelib "$1")
-
-	RDEPEND="${RDEPEND} $dependency"
-
-	# Add the dependency as a test-dependency since we're going to
-	# execute the code during test phase.
-	DEPEND="${DEPEND} test? ( ${dependency} )"
-	has test "$IUSE" || IUSE="${IUSE} test"
-}
-
-# @FUNCTION: ruby_add_bdepend
-# @USAGE: dependencies
-# @DESCRIPTION:
-# Adds the specified dependencies, with use condition(s) to DEPEND,
-# taking the current set of ruby targets into account. This makes sure
-# that all ruby dependencies of the package are installed for the same
-# ruby targets. Use this function for all ruby dependencies instead of
-# setting DEPEND yourself. The list of atoms uses the same syntax as
-# normal dependencies.
-ruby_add_bdepend() {
-	case $# in
-		1) ;;
-		2)
-			[[ "${GENTOO_DEV}" == "yes" ]] && eqawarn "You can now use the usual syntax in ruby_add_bdepend for $CATEGORY/$PF"
-			ruby_add_bdepend "$(_ruby_wrap_conditions "$1" "$2")"
-			return
-			;;
-		*)
-			die "bad number of arguments to $0"
-			;;
-	esac
-
-	local dependency=$(_ruby_atoms_samelib "$1")
-
-	DEPEND="${DEPEND} $dependency"
-	RDEPEND="${RDEPEND}"
-}
-
-# @FUNCTION: ruby_get_use_implementations
-# @DESCRIPTION:
-# Gets an array of ruby use targets enabled by the user
-ruby_get_use_implementations() {
-	local i implementation
-	for implementation in ${USE_RUBY}; do
-		use ruby_targets_${implementation} && i+=" ${implementation}"
-	done
-	echo $i
-}
-
-# @FUNCTION: ruby_get_use_targets
-# @DESCRIPTION:
-# Gets an array of ruby use targets that the ebuild sets
-ruby_get_use_targets() {
-	local t implementation
-	for implementation in ${USE_RUBY}; do
-		t+=" ruby_targets_${implementation}"
-	done
-	echo $t
-}
-
-# @FUNCTION: ruby_implementations_depend
-# @RETURN: Dependencies suitable for injection into DEPEND and RDEPEND.
-# @DESCRIPTION:
-# Produces the dependency string for the various implementations of ruby
-# which the package is being built against. This should not be used when
-# RUBY_OPTIONAL is unset but must be used if RUBY_OPTIONAL=yes. Do not
-# confuse this function with ruby_implementation_depend().
-#
-# @EXAMPLE:
-# EAPI=4
-# RUBY_OPTIONAL=yes
-#
-# inherit ruby-ng
-# ...
-# DEPEND="ruby? ( $(ruby_implementations_depend) )"
-# RDEPEND="${DEPEND}"
-ruby_implementations_depend() {
-	local depend
-	for _ruby_implementation in ${USE_RUBY}; do
-		depend="${depend}${depend+ }ruby_targets_${_ruby_implementation}? ( $(ruby_implementation_depend $_ruby_implementation) )"
-	done
-	echo "${depend}"
-}
-
-IUSE+=" $(ruby_get_use_targets)"
-# If you specify RUBY_OPTIONAL you also need to take care of
-# ruby useflag and dependency.
-if [[ ${RUBY_OPTIONAL} != yes ]]; then
-	DEPEND="${DEPEND} $(ruby_implementations_depend)"
-	RDEPEND="${RDEPEND} $(ruby_implementations_depend)"
-
-	case ${EAPI:-0} in
-		4|5)
-			REQUIRED_USE+=" || ( $(ruby_get_use_targets) )"
-			;;
-	esac
-fi
-
-_ruby_invoke_environment() {
-	old_S=${S}
-	case ${EAPI} in
-		4|5)
-			if [ -z ${RUBY_S} ]; then
-				sub_S=${P}
-			else
-				sub_S=${RUBY_S}
-			fi
-			;;
-		*)
-			sub_S=${S#${WORKDIR}/}
-			;;
-	esac
-
-	# Special case, for the always-lovely GitHub fetches. With this,
-	# we allow the star glob to just expand to whatever directory it's
-	# called.
-	if [[ ${sub_S} = *"*"* ]]; then
-		case ${EAPI} in
-			2|3)
-				#The old method of setting S depends on undefined package
-				# manager behaviour, so encourage upgrading to EAPI=4.
-				eqawarn "Using * expansion of S is deprecated. Use EAPI and RUBY_S instead."
-				;;
-		esac
-		pushd "${WORKDIR}"/all &>/dev/null
-		sub_S=$(eval ls -d ${sub_S} 2>/dev/null)
-		popd &>/dev/null
-	fi
-
-	environment=$1; shift
-
-	my_WORKDIR="${WORKDIR}"/${environment}
-	S="${my_WORKDIR}"/"${sub_S}"
-
-	if [[ -d "${S}" ]]; then
-		pushd "$S" &>/dev/null
-	elif [[ -d "${my_WORKDIR}" ]]; then
-		pushd "${my_WORKDIR}" &>/dev/null
-	else
-		pushd "${WORKDIR}" &>/dev/null
-	fi
-
-	ebegin "Running ${_PHASE:-${EBUILD_PHASE}} phase for $environment"
-	"$@"
-	popd &>/dev/null
-
-	S=${old_S}
-}
-
-_ruby_each_implementation() {
-	local invoked=no
-	for _ruby_implementation in ${USE_RUBY}; do
-		# only proceed if it's requested
-		use ruby_targets_${_ruby_implementation} || continue
-
-		RUBY=$(ruby_implementation_command ${_ruby_implementation})
-		invoked=yes
-
-		if [[ -n "$1" ]]; then
-			_ruby_invoke_environment ${_ruby_implementation} "$@"
-		fi
-
-		unset RUBY
-	done
-
-	if [[ ${invoked} == "no" ]]; then
-		eerror "You need to select at least one compatible Ruby installation target via RUBY_TARGETS in make.conf."
-		eerror "Compatible targets for this package are: ${USE_RUBY}"
-		eerror
-		eerror "See http://www.gentoo.org/proj/en/prog_lang/ruby/index.xml#doc_chap3 for more information."
-		eerror
-		die "No compatible Ruby target selected."
-	fi
-}
-
-# @FUNCTION: ruby-ng_pkg_setup
-# @DESCRIPTION:
-# Check whether at least one ruby target implementation is present.
-ruby-ng_pkg_setup() {
-	# This only checks that at least one implementation is present
-	# before doing anything; by leaving the parameters empty we know
-	# it's a special case.
-	_ruby_each_implementation
-
-	has ruby_targets_jruby ${IUSE} && use ruby_targets_jruby && java-pkg_setup-vm
-}
-
-# @FUNCTION: ruby-ng_src_unpack
-# @DESCRIPTION:
-# Unpack the source archive.
-ruby-ng_src_unpack() {
-	mkdir "${WORKDIR}"/all
-	pushd "${WORKDIR}"/all &>/dev/null
-
-	# We don't support an each-unpack, it's either all or nothing!
-	if type all_ruby_unpack &>/dev/null; then
-		_ruby_invoke_environment all all_ruby_unpack
-	else
-		[[ -n ${A} ]] && unpack ${A}
-	fi
-
-	popd &>/dev/null
-}
-
-_ruby_apply_patches() {
-	for patch in "${RUBY_PATCHES[@]}"; do
-		if [ -f "${patch}" ]; then
-			epatch "${patch}"
-		elif [ -f "${FILESDIR}/${patch}" ]; then
-			epatch "${FILESDIR}/${patch}"
-		else
-			die "Cannot find patch ${patch}"
-		fi
-	done
-
-	# This is a special case: instead of executing just in the special
-	# "all" environment, this will actually copy the effects on _all_
-	# the other environments, and is thus executed before the copy
-	type all_ruby_prepare &>/dev/null && all_ruby_prepare
-}
-
-_ruby_source_copy() {
-	# Until we actually find a reason not to, we use hardlinks, this
-	# should reduce the amount of disk space that is wasted by this.
-	cp -prl all ${_ruby_implementation} \
-		|| die "Unable to copy ${_ruby_implementation} environment"
-}
-
-# @FUNCTION: ruby-ng_src_prepare
-# @DESCRIPTION:
-# Apply patches and prepare versions for each ruby target
-# implementation. Also carry out common clean up tasks.
-ruby-ng_src_prepare() {
-	# Way too many Ruby packages are prepared on OSX without removing
-	# the extra data forks, we do it here to avoid repeating it for
-	# almost every other ebuild.
-	find . -name '._*' -delete
-
-	_ruby_invoke_environment all _ruby_apply_patches
-
-	_PHASE="source copy" \
-		_ruby_each_implementation _ruby_source_copy
-
-	if type each_ruby_prepare &>/dev/null; then
-		_ruby_each_implementation each_ruby_prepare
-	fi
-}
-
-# @FUNCTION: ruby-ng_src_configure
-# @DESCRIPTION:
-# Configure the package.
-ruby-ng_src_configure() {
-	if type each_ruby_configure &>/dev/null; then
-		_ruby_each_implementation each_ruby_configure
-	fi
-
-	type all_ruby_configure &>/dev/null && \
-		_ruby_invoke_environment all all_ruby_configure
-}
-
-# @FUNCTION: ruby-ng_src_compile
-# @DESCRIPTION:
-# Compile the package.
-ruby-ng_src_compile() {
-	if type each_ruby_compile &>/dev/null; then
-		_ruby_each_implementation each_ruby_compile
-	fi
-
-	type all_ruby_compile &>/dev/null && \
-		_ruby_invoke_environment all all_ruby_compile
-}
-
-# @FUNCTION: ruby-ng_src_test
-# @DESCRIPTION:
-# Run tests for the package.
-ruby-ng_src_test() {
-	if type each_ruby_test &>/dev/null; then
-		_ruby_each_implementation each_ruby_test
-	fi
-
-	type all_ruby_test &>/dev/null && \
-		_ruby_invoke_environment all all_ruby_test
-}
-
-_each_ruby_check_install() {
-	local scancmd=scanelf
-	# we have a Mach-O object here
-	[[ ${CHOST} == *-darwin ]] && scancmd=scanmacho
-
-	has "${EAPI}" 2 && ! use prefix && EPREFIX=
-
-	local libruby_basename=$(${RUBY} -rrbconfig -e 'puts RbConfig::CONFIG["LIBRUBY_SO"]')
-	local libruby_soname=$(basename $(${scancmd} -F "%S#F" -qS "${EPREFIX}/usr/$(get_libdir)/${libruby_basename}") 2>/dev/null)
-	local sitedir=$(${RUBY} -rrbconfig -e 'puts RbConfig::CONFIG["sitedir"]')
-	local sitelibdir=$(${RUBY} -rrbconfig -e 'puts RbConfig::CONFIG["sitelibdir"]')
-
-	# Look for wrong files in sitedir
-	# if [[ -d "${D}${sitedir}" ]]; then
-	# 	local f=$(find "${D}${sitedir}" -mindepth 1 -maxdepth 1 -not -wholename "${D}${sitelibdir}")
-	# 	if [[ -n ${f} ]]; then
-	# 		eerror "Found files in sitedir, outsite sitelibdir:"
-	# 		eerror "${f}"
-	# 		die "Misplaced files in sitedir"
-	# 	fi
-	# fi
-
-	# The current implementation lacks libruby (i.e.: jruby)
-	[[ -z ${libruby_soname} ]] && return 0
-
-	# Check also the gems directory, since we could be installing compiled
-	# extensions via ruby-fakegem; make sure to check only in sitelibdir, since
-	# that's what changes between two implementations (otherwise you'd get false
-	# positives now that Ruby 1.9.2 installs with the same sitedir as 1.8)
-	${scancmd} -qnR "${D}${sitelibdir}" "${D}${sitelibdir/site_ruby/gems}" \
-		| fgrep -v "${libruby_soname}" \
-		| grep -E -v "${RUBY_QA_ALLOWED_LIBS}" \
-		> "${T}"/ruby-ng-${_ruby_implementation}-mislink.log
-
-	if [[ -s "${T}"/ruby-ng-${_ruby_implementation}-mislink.log ]]; then
-		ewarn "Extensions installed for ${_ruby_implementation} with missing links to ${libruby_soname}"
-		ewarn $(< "${T}"/ruby-ng-${_ruby_implementation}-mislink.log )
-		die "Missing links to ${libruby_soname}"
-	fi
-}
-
-# @FUNCTION: ruby-ng_src_install
-# @DESCRIPTION:
-# Install the package for each ruby target implementation.
-ruby-ng_src_install() {
-	if type each_ruby_install &>/dev/null; then
-		_ruby_each_implementation each_ruby_install
-	fi
-
-	type all_ruby_install &>/dev/null && \
-		_ruby_invoke_environment all all_ruby_install
-
-	_PHASE="check install" \
-		_ruby_each_implementation _each_ruby_check_install
-}
-
-# @FUNCTION: ruby_rbconfig_value
-# @USAGE: rbconfig item
-# @RETURN: Returns the value of the given rbconfig item of the Ruby interpreter in ${RUBY}.
-ruby_rbconfig_value() {
-	echo $(${RUBY} -rrbconfig -e "puts RbConfig::CONFIG['$1']")
-}
-
-# @FUNCTION: doruby
-# @USAGE: file [file...]
-# @DESCRIPTION:
-# Installs the specified file(s) into the sitelibdir of the Ruby interpreter in ${RUBY}.
-doruby() {
-	[[ -z ${RUBY} ]] && die "\$RUBY is not set"
-	has "${EAPI}" 2 && ! use prefix && EPREFIX=
-	( # don't want to pollute calling env
-		sitelibdir=$(ruby_rbconfig_value 'sitelibdir')
-		insinto ${sitelibdir#${EPREFIX}}
-		insopts -m 0644
-		doins "$@"
-	) || die "failed to install $@"
-}
-
-# @FUNCTION: ruby_get_libruby
-# @RETURN: The location of libruby*.so belonging to the Ruby interpreter in ${RUBY}.
-ruby_get_libruby() {
-	${RUBY} -rrbconfig -e 'puts File.join(RbConfig::CONFIG["libdir"], RbConfig::CONFIG["LIBRUBY"])'
-}
-
-# @FUNCTION: ruby_get_hdrdir
-# @RETURN: The location of the header files belonging to the Ruby interpreter in ${RUBY}.
-ruby_get_hdrdir() {
-	local rubyhdrdir=$(ruby_rbconfig_value 'rubyhdrdir')
-
-	if [[ "${rubyhdrdir}" = "nil" ]] ; then
-		rubyhdrdir=$(ruby_rbconfig_value 'archdir')
-	fi
-
-	echo "${rubyhdrdir}"
-}
-
-# @FUNCTION: ruby_get_version
-# @RETURN: The version of the Ruby interpreter in ${RUBY}, or what 'ruby' points to.
-ruby_get_version() {
-	local ruby=${RUBY:-$(type -p ruby 2>/dev/null)}
-
-	echo $(${ruby} -e 'puts RUBY_VERSION')
-}
-
-# @FUNCTION: ruby_get_implementation
-# @RETURN: The implementation of the Ruby interpreter in ${RUBY}, or what 'ruby' points to.
-ruby_get_implementation() {
-	local ruby=${RUBY:-$(type -p ruby 2>/dev/null)}
-
-	case $(${ruby} --version) in
-		*Enterprise*)
-			echo "ree"
-			;;
-		*jruby*)
-			echo "jruby"
-			;;
-		*rubinius*)
-			echo "rbx"
-			;;
-		*)
-			echo "mri"
-			;;
-	esac
-}
-
-# @FUNCTION: ruby-ng_rspec
-# @DESCRIPTION:
-# This is simply a wrapper around the rspec command (executed by $RUBY})
-# which also respects TEST_VERBOSE and NOCOLOR environment variables.
-ruby-ng_rspec() {
-	if [[ ${DEPEND} != *"dev-ruby/rspec"* ]]; then
-		ewarn "Missing dev-ruby/rspec in \${DEPEND}"
-	fi
-
-	local rspec_params=
-	case ${NOCOLOR} in
-		1|yes|true)
-			rspec_params+=" --no-color"
-			;;
-		*)
-			rspec_params+=" --color"
-			;;
-	esac
-
-	case ${TEST_VERBOSE} in
-		1|yes|true)
-			rspec_params+=" --format documentation"
-			;;
-		*)
-			rspec_params+=" --format progress"
-			;;
-	esac
-
-	${RUBY} -S rspec ${rspec_params} "$@" || die "rspec failed"
-}
-
-# @FUNCTION: ruby-ng_cucumber
-# @DESCRIPTION:
-# This is simply a wrapper around the cucumber command (executed by $RUBY})
-# which also respects TEST_VERBOSE and NOCOLOR environment variables.
-ruby-ng_cucumber() {
-	if [[ ${DEPEND} != *"dev-util/cucumber"* ]]; then
-		ewarn "Missing dev-util/cucumber in \${DEPEND}"
-	fi
-
-	local cucumber_params=
-	case ${NOCOLOR} in
-		1|yes|true)
-			cucumber_params+=" --no-color"
-			;;
-		*)
-			cucumber_params+=" --color"
-			;;
-	esac
-
-	case ${TEST_VERBOSE} in
-		1|yes|true)
-			cucumber_params+=" --format pretty"
-			;;
-		*)
-			cucumber_params+=" --format progress"
-			;;
-	esac
-
-	if [[ ${RUBY} == *jruby ]]; then
-		ewarn "Skipping cucumber tests on JRuby (unsupported)."
-		return 0
-	fi
-
-	${RUBY} -S cucumber ${cucumber_params} "$@" || die "cucumber failed"
-}
-
-# @FUNCTION: ruby-ng_testrb-2
-# @DESCRIPTION:
-# This is simply a replacement for the testrb command that load the test
-# files and execute them, with test-unit 2.x. This actually requires
-# either an old test-unit-2 version or 2.5.1-r1 or later, as they remove
-# their script and we installed a broken wrapper for a while.
-# This also respects TEST_VERBOSE and NOCOLOR environment variables.
-ruby-ng_testrb-2() {
-	if [[ ${DEPEND} != *"dev-ruby/test-unit"* ]]; then
-		ewarn "Missing dev-ruby/test-unit in \${DEPEND}"
-	fi
-
-	local testrb_params=
-	case ${NOCOLOR} in
-		1|yes|true)
-			testrb_params+=" --no-use-color"
-			;;
-		*)
-			testrb_params+=" --use-color=auto"
-			;;
-	esac
-
-	case ${TEST_VERBOSE} in
-		1|yes|true)
-			testrb_params+=" --verbose=verbose"
-			;;
-		*)
-			testrb_params+=" --verbose=normal"
-			;;
-	esac
-
-	${RUBY} -S testrb-2 ${testrb_params} "$@" || die "testrb-2 failed"
-}

diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass
deleted file mode 100644
index 0d58527..0000000
--- a/eclass/scons-utils.eclass
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/scons-utils.eclass,v 1.10 2011/12/13 18:37:25 mgorny Exp $
-
-# @ECLASS: scons-utils.eclass
-# @MAINTAINER:
-# mgorny@g.o
-# @BLURB: helper functions to deal with SCons buildsystem
-# @DESCRIPTION:
-# This eclass provides a set of function to help developers sanely call
-# dev-util/scons and pass parameters to it.
-# @EXAMPLE:
-#
-# @CODE
-# inherit scons-utils toolchain-funcs
-#
-# EAPI=4
-#
-# src_configure() {
-# 	myesconsargs=(
-# 		CC="$(tc-getCC)"
-# 		$(use_scons nls ENABLE_NLS)
-# 	)
-# }
-#
-# src_compile() {
-# 	escons
-# }
-#
-# src_install() {
-# 	# note: this can be DESTDIR, INSTALL_ROOT, ... depending on package
-# 	escons DESTDIR="${D}" install
-# }
-# @CODE
-
-# -- public variables --
-
-# @ECLASS-VARIABLE: SCONS_MIN_VERSION
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# The minimal version of SCons required for the build to work.
-
-# @VARIABLE: myesconsargs
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# List of package-specific options to pass to all SCons calls. Supposed to be
-# set in src_configure().
-
-# @ECLASS-VARIABLE: SCONSOPTS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# The default set of options to pass to scons. Similar to MAKEOPTS,
-# supposed to be set in make.conf. If unset, escons() will use cleaned
-# up MAKEOPTS instead.
-
-# @ECLASS-VARIABLE: EXTRA_ESCONS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# The additional parameters to pass to SCons whenever escons() is used.
-# Much like EXTRA_EMAKE, this is not supposed to be used in make.conf
-# and not in ebuilds!
-
-# @ECLASS-VARIABLE: USE_SCONS_TRUE
-# @DESCRIPTION:
-# The default value for truth in scons-use() (1 by default).
-: ${USE_SCONS_TRUE:=1}
-
-# @ECLASS-VARIABLE: USE_SCONS_FALSE
-# @DESCRIPTION:
-# The default value for false in scons-use() (0 by default).
-: ${USE_SCONS_FALSE:=0}
-
-# -- EAPI support check --
-
-case ${EAPI:-0} in
-	0|1|2|3|4|5) ;;
-	*) die "EAPI ${EAPI} unsupported."
-esac
-
-# -- ebuild variables setup --
-
-if [[ -n ${SCONS_MIN_VERSION} ]]; then
-	DEPEND=">=dev-util/scons-${SCONS_MIN_VERSION}"
-else
-	DEPEND="dev-util/scons"
-fi
-
-# -- public functions --
-
-# @FUNCTION: escons
-# @USAGE: [scons-arg] ...
-# @DESCRIPTION:
-# Call scons, passing the supplied arguments, ${myesconsargs[@]},
-# filtered ${MAKEOPTS}, ${EXTRA_ESCONS}. Similar to emake. Like emake,
-# this function does die on failure in EAPI 4 (unless called nonfatal).
-escons() {
-	local ret
-
-	debug-print-function ${FUNCNAME} "${@}"
-
-	# if SCONSOPTS are _unset_, use cleaned MAKEOPTS
-	set -- scons ${SCONSOPTS-$(scons_clean_makeopts)} ${EXTRA_ESCONS} \
-		"${myesconsargs[@]}" "${@}"
-	echo "${@}" >&2
-	"${@}"
-	ret=${?}
-
-	[[ ${ret} -ne 0 ]] && has "${EAPI:-0}" 4 5 && die "escons failed."
-	return ${ret}
-}
-
-# @FUNCTION: scons_clean_makeopts
-# @USAGE: [makeflags] [...]
-# @DESCRIPTION:
-# Strip the supplied makeflags (or ${MAKEOPTS} if called without
-# an argument) of options not supported by SCons and make sure --jobs
-# gets an argument. Output the resulting flag list (suitable
-# for an assignment to SCONSOPTS).
-scons_clean_makeopts() {
-	local new_makeopts
-
-	debug-print-function ${FUNCNAME} "${@}"
-
-	if [[ ${#} -eq 0 ]]; then
-		debug-print "Using MAKEOPTS: [${MAKEOPTS}]"
-		set -- ${MAKEOPTS}
-	else
-		# unquote if necessary
-		set -- ${*}
-	fi
-
-	# empty MAKEOPTS give out empty SCONSOPTS
-	# thus, we do need to worry about the initial setup
-	if [[ ${*} = ${_SCONS_CACHE_MAKEOPTS} ]]; then
-		set -- ${_SCONS_CACHE_SCONSOPTS}
-		debug-print "Cache hit: [${*}]"
-		echo ${*}
-		return
-	fi
-	export _SCONS_CACHE_MAKEOPTS=${*}
-
-	while [[ ${#} -gt 0 ]]; do
-		case ${1} in
-			# clean, simple to check -- we like that
-			--jobs=*|--keep-going)
-				new_makeopts=${new_makeopts+${new_makeopts} }${1}
-				;;
-			# need to take a look at the next arg and guess
-			--jobs)
-				if [[ ${#} -gt 1 && ${2} =~ ^[0-9]+$ ]]; then
-					new_makeopts="${new_makeopts+${new_makeopts} }${1} ${2}"
-					shift
-				else
-					# no value means no limit, let's pass a random int
-					new_makeopts=${new_makeopts+${new_makeopts} }${1}=5
-				fi
-				;;
-			# strip other long options
-			--*)
-				;;
-			# short option hell
-			-*)
-				local str new_optstr
-				new_optstr=
-				str=${1#-}
-
-				while [[ -n ${str} ]]; do
-					case ${str} in
-						k*)
-							new_optstr=${new_optstr}k
-							;;
-						# -j needs to come last
-						j)
-							if [[ ${#} -gt 1 && ${2} =~ ^[0-9]+$ ]]; then
-								new_optstr="${new_optstr}j ${2}"
-								shift
-							else
-								new_optstr="${new_optstr}j 5"
-							fi
-							;;
-						# otherwise, everything after -j is treated as an arg
-						j*)
-							new_optstr=${new_optstr}${str}
-							break
-							;;
-					esac
-					str=${str#?}
-				done
-
-				if [[ -n ${new_optstr} ]]; then
-					new_makeopts=${new_makeopts+${new_makeopts} }-${new_optstr}
-				fi
-				;;
-		esac
-		shift
-	done
-
-	set -- ${new_makeopts}
-	export _SCONS_CACHE_SCONSOPTS=${*}
-	debug-print "New SCONSOPTS: [${*}]"
-	echo ${*}
-}
-
-# @FUNCTION: use_scons
-# @USAGE: <use-flag> [var-name] [var-opt-true] [var-opt-false]
-# @DESCRIPTION:
-# Output a SCons parameter with value depending on the USE flag state.
-# If the USE flag is set, output <var-name>=<var-opt-true>; otherwise
-# <var-name>=<var-opt-false>.
-#
-# If <var-name> is omitted, <use-flag> will be used instead. However,
-# if <use-flag> starts with an exclamation mark (!flag), 'no' will be
-# prepended to the name (e.g. noflag).
-#
-# If <var-opt-true> and/or <var-opt-false> are omitted,
-# ${USE_SCONS_TRUE} and/or ${USE_SCONS_FALSE} will be used instead.
-use_scons() {
-	local flag=${1}
-	local varname=${2:-${flag/\!/no}}
-	local vartrue=${3:-${USE_SCONS_TRUE}}
-	local varfalse=${4:-${USE_SCONS_FALSE}}
-
-	debug-print-function ${FUNCNAME} "${@}"
-
-	if [[ ${#} -eq 0 ]]; then
-		eerror "Usage: scons-use <use-flag> [var-name] [var-opt-true] [var-opt-false]"
-		die 'scons-use(): not enough arguments'
-	fi
-
-	if use "${flag}"; then
-		echo "${varname}=${vartrue}"
-	else
-		echo "${varname}=${varfalse}"
-	fi
-}

diff --git a/eclass/selinux-policy-2.eclass b/eclass/selinux-policy-2.eclass
deleted file mode 100644
index c152b58..0000000
--- a/eclass/selinux-policy-2.eclass
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/selinux-policy-2.eclass,v 1.14 2012/09/08 18:36:12 swift Exp $
-
-# Eclass for installing SELinux policy, and optionally
-# reloading the reference-policy based modules.
-
-# @ECLASS: selinux-policy-2.eclass
-# @MAINTAINER:
-# selinux@g.o
-# @BLURB: This eclass supports the deployment of the various SELinux modules in sec-policy
-# @DESCRIPTION:
-# The selinux-policy-2.eclass supports deployment of the various SELinux modules
-# defined in the sec-policy category. It is responsible for extracting the
-# specific bits necessary for single-module deployment (instead of full-blown
-# policy rebuilds) and applying the necessary patches.
-#
-# Also, it supports for bundling patches to make the whole thing just a bit more
-# manageable.
-
-# @ECLASS-VARIABLE: MODS
-# @DESCRIPTION:
-# This variable contains the (upstream) module name for the SELinux module.
-# This name is only the module name, not the category!
-: ${MODS:="_illegal"}
-
-# @ECLASS-VARIABLE: BASEPOL
-# @DESCRIPTION:
-# This variable contains the version string of the selinux-base-policy package
-# that this module build depends on. It is used to patch with the appropriate
-# patch bundle(s) that are part of selinux-base-policy.
-: ${BASEPOL:=""}
-
-# @ECLASS-VARIABLE: POLICY_PATCH
-# @DESCRIPTION:
-# This variable contains the additional patch(es) that need to be applied on top
-# of the patchset already contained within the BASEPOL variable. The variable
-# can be both a simple string (space-separated) or a bash array.
-: ${POLICY_PATCH:=""}
-
-# @ECLASS-VARIABLE: POLICY_FILES
-# @DESCRIPTION:
-# When defined, this contains the files (located in the ebuilds' files/
-# directory) which should be copied as policy module files into the store.
-# Generally, users would want to include at least a .te and .fc file, but .if
-# files are supported as well. The variable can be both a simple string
-# (space-separated) or a bash array.
-: ${POLICY_FILES:=""}
-
-# @ECLASS-VARIABLE: POLICY_TYPES
-# @DESCRIPTION:
-# This variable informs the eclass for which SELinux policies the module should
-# be built. Currently, Gentoo supports targeted, strict, mcs and mls.
-# This variable is the same POLICY_TYPES variable that we tell SELinux
-# users to set in /etc/make.conf. Therefor, it is not the module that should
-# override it, but the user.
-: ${POLICY_TYPES:="targeted strict mcs mls"}
-
-extra_eclass=""
-case ${BASEPOL} in
-	9999)	extra_eclass="git-2";
-			EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/hardened-refpolicy.git";
-			EGIT_SOURCEDIR="${WORKDIR}/refpolicy";;
-esac
-
-inherit eutils ${extra_eclass}
-
-IUSE=""
-
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/"
-if [[ -n ${BASEPOL} ]] && [[ "${BASEPOL}" != "9999" ]];
-then
-	SRC_URI="http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2
-		http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-${BASEPOL}.tar.bz2"
-elif [[ "${BASEPOL}" != "9999" ]];
-then
-	SRC_URI="http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2"
-else
-	SRC_URI=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-S="${WORKDIR}/"
-PATCHBUNDLE="${DISTDIR}/patchbundle-selinux-base-policy-${BASEPOL}.tar.bz2"
-
-# Modules should always depend on at least the first release of the
-# selinux-base-policy for which they are generated.
-if [[ -n ${BASEPOL} ]];
-then
-	RDEPEND=">=sys-apps/policycoreutils-2.0.82
-		>=sec-policy/selinux-base-policy-${BASEPOL}"
-else
-	RDEPEND=">=sys-apps/policycoreutils-2.0.82
-		>=sec-policy/selinux-base-policy-${PV}"
-fi
-DEPEND="${RDEPEND}
-	sys-devel/m4
-	>=sys-apps/checkpolicy-2.0.21"
-
-SELINUX_EXPF="src_unpack src_compile src_install pkg_postinst"
-case "${EAPI:-0}" in
-	2|3|4|5) SELINUX_EXPF+=" src_prepare" ;;
-	*) ;;
-esac
-
-EXPORT_FUNCTIONS ${SELINUX_EXPF}
-
-# @FUNCTION: selinux-policy-2_src_unpack
-# @DESCRIPTION:
-# Unpack the policy sources as offered by upstream (refpolicy). In case of EAPI
-# older than 2, call src_prepare too.
-selinux-policy-2_src_unpack() {
-	if [[ "${BASEPOL}" != "9999" ]];
-	then
-		unpack ${A}
-	else
-		git-2_src_unpack
-	fi
-
-	# Call src_prepare explicitly for EAPI 0 or 1
-	has "${EAPI:-0}" 0 1 && selinux-policy-2_src_prepare
-}
-
-# @FUNCTION: selinux-policy-2_src_prepare
-# @DESCRIPTION:
-# Patch the reference policy sources with our set of enhancements. Start with
-# the base patchbundle referred to by the ebuilds through the BASEPOL variable,
-# then apply the additional patches as offered by the ebuild.
-#
-# Next, extract only those files needed for this particular module (i.e. the .te
-# and .fc files for the given module in the MODS variable).
-#
-# Finally, prepare the build environments for each of the supported SELinux
-# types (such as targeted or strict), depending on the POLICY_TYPES variable
-# content.
-selinux-policy-2_src_prepare() {
-	local modfiles
-	local add_interfaces=0;
-
-	# Create 3rd_party location for user-contributed policies
-	cd "${S}/refpolicy/policy/modules" && mkdir 3rd_party;
-
-	# Patch the sources with the base patchbundle
-	if [[ -n ${BASEPOL} ]] && [[ "${BASEPOL}" != "9999" ]];
-	then
-		cd "${S}"
-		EPATCH_MULTI_MSG="Applying SELinux policy updates ... " \
-		EPATCH_SUFFIX="patch" \
-		EPATCH_SOURCE="${WORKDIR}" \
-		EPATCH_FORCE="yes" \
-		epatch
-	fi
-
-	# Copy additional files to the 3rd_party/ location
-	if [[ "$(declare -p POLICY_FILES 2>/dev/null 2>&1)" == "declare -a"* ]] ||
-	   [[ -n ${POLICY_FILES} ]];
-	then
-	    add_interfaces=1;
-		cd "${S}/refpolicy/policy/modules"
-		for POLFILE in ${POLICY_FILES[@]};
-		do
-			cp "${FILESDIR}/${POLFILE}" 3rd_party/ || die "Could not copy ${POLFILE} to 3rd_party/ location";
-		done
-	fi
-
-	# Apply the additional patches refered to by the module ebuild.
-	# But first some magic to differentiate between bash arrays and strings
-	if [[ "$(declare -p POLICY_PATCH 2>/dev/null 2>&1)" == "declare -a"* ]] ||
-	   [[ -n ${POLICY_PATCH} ]];
-	then
-		cd "${S}/refpolicy/policy/modules"
-		for POLPATCH in ${POLICY_PATCH[@]};
-		do
-			epatch "${POLPATCH}"
-		done
-	fi
-
-	# Collect only those files needed for this particular module
-	for i in ${MODS}; do
-		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.te) $modfiles"
-		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
-		if [ ${add_interfaces} -eq 1 ];
-		then
-			modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.if) $modfiles"
-		fi
-	done
-
-	for i in ${POLICY_TYPES}; do
-		mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}"
-		cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \
-			|| die "Failed to copy Makefile.example to ${S}/${i}/Makefile"
-
-		cp ${modfiles} "${S}"/${i} \
-			|| die "Failed to copy the module files to ${S}/${i}"
-	done
-}
-
-# @FUNCTION: selinux-policy-2_src_compile
-# @DESCRIPTION:
-# Build the SELinux policy module (.pp file) for just the selected module, and
-# this for each SELinux policy mentioned in POLICY_TYPES
-selinux-policy-2_src_compile() {
-	for i in ${POLICY_TYPES}; do
-		# Parallel builds are broken, so we need to force -j1 here
-		emake -j1 NAME=$i -C "${S}"/${i} || die "${i} compile failed"
-	done
-}
-
-# @FUNCTION: selinux-policy-2_src_install
-# @DESCRIPTION:
-# Install the built .pp files in the correct subdirectory within
-# /usr/share/selinux.
-selinux-policy-2_src_install() {
-	local BASEDIR="/usr/share/selinux"
-
-	for i in ${POLICY_TYPES}; do
-		for j in ${MODS}; do
-			einfo "Installing ${i} ${j} policy package"
-			insinto ${BASEDIR}/${i}
-			doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}"
-
-			if [[ "${POLICY_FILES[@]}" == *"${j}.if"* ]];
-			then
-				insinto ${BASEDIR}/${i}/include/3rd_party
-				doins "${S}"/${i}/${j}.if || die "Failed to add ${j}.if to ${i}"
-			fi
-		done
-	done
-}
-
-# @FUNCTION: selinux-policy-2_pkg_postinst
-# @DESCRIPTION:
-# Install the built .pp files in the SELinux policy stores, effectively
-# activating the policy on the system.
-selinux-policy-2_pkg_postinst() {
-	# build up the command in the case of multiple modules
-	local COMMAND
-	for i in ${MODS}; do
-		COMMAND="-i ${i}.pp ${COMMAND}"
-	done
-
-	for i in ${POLICY_TYPES}; do
-		einfo "Inserting the following modules into the $i module store: ${MODS}"
-
-		cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}"
-		semodule -s ${i} ${COMMAND}
-		if [ $? -ne 0 ];
-		then
-			ewarn "SELinux module load failed. Trying full reload...";
-			if [ "${i}" == "targeted" ];
-			then
-				semodule -s ${i} -b base.pp -i $(ls *.pp | grep -v base.pp);
-			else
-				semodule -s ${i} -b base.pp -i $(ls *.pp | grep -v base.pp | grep -v unconfined.pp);
-			fi
-			if [ $? -ne 0 ];
-			then
-				ewarn "Failed to reload SELinux policies."
-				ewarn ""
-				ewarn "If this is *not* the last SELinux module package being installed,"
-				ewarn "then you can safely ignore this as the reloads will be retried"
-				ewarn "with other, recent modules."
-				ewarn ""
-				ewarn "If it is the last SELinux module package being installed however,"
-				ewarn "then it is advised to look at the error above and take appropriate"
-				ewarn "action since the new SELinux policies are not loaded until the"
-				ewarn "command finished succesfully."
-				ewarn ""
-				ewarn "To reload, run the following command from within /usr/share/selinux/${i}:"
-				ewarn "  semodule -b base.pp -i \$(ls *.pp | grep -v base.pp)"
-				ewarn "or"
-				ewarn "  semodule -b base.pp -i \$(ls *.pp | grep -v base.pp | grep -v unconfined.pp)"
-				ewarn "depending on if you need the unconfined domain loaded as well or not."
-			else
-				einfo "SELinux modules reloaded succesfully."
-			fi
-		else
-			einfo "SELinux modules loaded succesfully."
-		fi
-	done
-}
-

diff --git a/eclass/systemd.eclass b/eclass/systemd.eclass
deleted file mode 100644
index eb8214b..0000000
--- a/eclass/systemd.eclass
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.14 2012/08/27 21:55:01 mgorny Exp $
-
-# @ECLASS: systemd.eclass
-# @MAINTAINER:
-# mgorny@g.o
-# @BLURB: helper functions to install systemd units
-# @DESCRIPTION:
-# This eclass provides a set of functions to install unit files for
-# sys-apps/systemd within ebuilds.
-# @EXAMPLE:
-#
-# @CODE
-# inherit autotools-utils systemd
-#
-# src_configure() {
-#	local myeconfargs=(
-#		--enable-foo
-#		--disable-bar
-#	)
-#
-#	systemd_to_myeconfargs
-#	autotools-utils_src_configure
-# }
-# @CODE
-
-case ${EAPI:-0} in
-	0|1|2|3|4|5) ;;
-	*) die "${ECLASS}.eclass API in EAPI ${EAPI} not yet established."
-esac
-
-# @FUNCTION: _systemd_get_unitdir
-# @INTERNAL
-# @DESCRIPTION:
-# Get unprefixed unitdir.
-_systemd_get_unitdir() {
-	echo -n /usr/lib/systemd/system
-}
-
-# @FUNCTION: systemd_get_unitdir
-# @DESCRIPTION:
-# Output the path for the systemd unit directory (not including ${D}).
-# This function always succeeds, even if systemd is not installed.
-systemd_get_unitdir() {
-	has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
-	debug-print-function ${FUNCNAME} "${@}"
-
-	echo -n "${EPREFIX}$(_systemd_get_unitdir)"
-}
-
-# @FUNCTION: systemd_dounit
-# @USAGE: unit1 [...]
-# @DESCRIPTION:
-# Install systemd unit(s). Uses doins, thus it is fatal in EAPI 4
-# and non-fatal in earlier EAPIs.
-systemd_dounit() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	(
-		insinto "$(_systemd_get_unitdir)"
-		doins "${@}"
-	)
-}
-
-# @FUNCTION: systemd_newunit
-# @USAGE: oldname newname
-# @DESCRIPTION:
-# Install systemd unit with a new name. Uses newins, thus it is fatal
-# in EAPI 4 and non-fatal in earlier EAPIs.
-systemd_newunit() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	(
-		insinto "$(_systemd_get_unitdir)"
-		newins "${@}"
-	)
-}
-
-# @FUNCTION: systemd_dotmpfilesd
-# @USAGE: tmpfilesd1 [...]
-# @DESCRIPTION:
-# Install systemd tmpfiles.d files. Uses doins, thus it is fatal
-# in EAPI 4 and non-fatal in earlier EAPIs.
-systemd_dotmpfilesd() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	for f; do
-		[[ ${f} == *.conf ]] \
-			|| die 'tmpfiles.d files need to have .conf suffix.'
-	done
-
-	(
-		insinto /usr/lib/tmpfiles.d/
-		doins "${@}"
-	)
-}
-
-# @FUNCTION: systemd_newtmpfilesd
-# @USAGE: oldname newname.conf
-# @DESCRIPTION:
-# Install systemd tmpfiles.d file under a new name. Uses newins, thus it
-# is fatal in EAPI 4 and non-fatal in earlier EAPIs.
-systemd_newtmpfilesd() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	[[ ${2} == *.conf ]] \
-		|| die 'tmpfiles.d files need to have .conf suffix.'
-
-	(
-		insinto /usr/lib/tmpfiles.d/
-		newins "${@}"
-	)
-}
-
-# @FUNCTION: systemd_enable_service
-# @USAGE: target service
-# @DESCRIPTION:
-# Enable service in desired target, e.g. install a symlink for it.
-# Uses dosym, thus it is fatal in EAPI 4 and non-fatal in earlier
-# EAPIs.
-systemd_enable_service() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	[[ ${#} -eq 2 ]] || die "Synopsis: systemd_enable_service target service"
-
-	local target=${1}
-	local service=${2}
-	local ud=$(_systemd_get_unitdir)
-	local destname=$(basename "${service}")
-
-	dodir "${ud}"/"${target}".wants && \
-	dosym ../"${service}" "${ud}"/"${target}".wants/"${destname}"
-}
-
-# @FUNCTION: systemd_with_unitdir
-# @USAGE: [configure option]
-# @DESCRIPTION:
-# Output '--with-systemdsystemunitdir' as expected by systemd-aware configure
-# scripts. This function always succeeds. Its output may be quoted in order
-# to preserve whitespace in paths. systemd_to_myeconfargs() is preferred over
-# this function.
-#
-# If upstream does use invalid configure option to handle installing systemd
-# units (e.g. `--with-systemdunitdir'), you can pass the 'suffix' as an optional
-# argument to this function (`$(systemd_with_unitdir systemdunitdir)'). Please
-# remember to report a bug upstream as well.
-systemd_with_unitdir() {
-	debug-print-function ${FUNCNAME} "${@}"
-	local optname=${1:-systemdsystemunitdir}
-
-	echo -n --with-${optname}="$(systemd_get_unitdir)"
-}
-
-# @FUNCTION: systemd_to_myeconfargs
-# @DESCRIPTION:
-# Add '--with-systemdsystemunitdir' as expected by systemd-aware configure
-# scripts to the myeconfargs variable used by autotools-utils eclass. Handles
-# quoting automatically.
-systemd_to_myeconfargs() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	myeconfargs=(
-		"${myeconfargs[@]}"
-		--with-systemdsystemunitdir="$(systemd_get_unitdir)"
-	)
-}

diff --git a/eclass/vcs-snapshot.eclass b/eclass/vcs-snapshot.eclass
deleted file mode 100644
index d86d8e4..0000000
--- a/eclass/vcs-snapshot.eclass
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vcs-snapshot.eclass,v 1.4 2012/06/11 14:22:19 mgorny Exp $
-
-# @ECLASS: vcs-snapshot.eclass
-# @MAINTAINER:
-# mgorny@g.o
-# @BLURB: support eclass for unpacking VCS snapshot tarballs
-# @DESCRIPTION:
-# This eclass provides a convenience src_unpack() which does unpack all
-# the tarballs in SRC_URI to locations matching their (local) names,
-# discarding the original parent directory.
-#
-# The typical use case are VCS snapshots, coming from github, bitbucket
-# and similar services. They have hash appended to the directory name
-# which makes extracting them a painful experience. But if you just use
-# a SRC_URI arrow to rename it (which you're likely have to do anyway),
-# vcs-snapshot will just extract it into a matching directory.
-#
-# Please note that this eclass handles only tarballs (.tar, .tar.gz,
-# .tar.bz2 & .tar.xz). For any other file format (or suffix) it will
-# fall back to regular unpack. Support for additional formats may be
-# added at some point so please keep your SRC_URIs clean.
-#
-# @EXAMPLE:
-#
-# @CODE
-# EAPI=4
-# AUTOTOOLS_AUTORECONF=1
-# inherit autotools-utils vcs-snapshot
-#
-# SRC_URI="http://github.com/example/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-# @CODE
-#
-# and however the tarball was originally named, all files will appear
-# in ${WORKDIR}/${P}.
-
-case ${EAPI:-0} in
-	0|1|2|3|4|5) ;;
-	*) die "vcs-snapshot.eclass API in EAPI ${EAPI} not yet established."
-esac
-
-EXPORT_FUNCTIONS src_unpack
-
-vcs-snapshot_src_unpack() {
-	local f
-
-	for f in ${A}
-	do
-		case "${f}" in
-			*.tar|*.tar.gz|*.tar.bz2|*.tar.xz)
-				local destdir=${WORKDIR}/${f%.tar*}
-
-				# XXX: check whether the directory structure inside is
-				# fine? i.e. if the tarball has actually a parent dir.
-				mkdir "${destdir}" || die
-				tar -C "${destdir}" -x --strip-components 1 \
-					-f "${DISTDIR}/${f}" || die
-				;;
-			*)
-				# fall back to the default method
-				unpack "${f}"
-				;;
-		esac
-	done
-}

diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass
deleted file mode 100644
index ef93ba6..0000000
--- a/eclass/vdr-plugin-2.eclass
+++ /dev/null
@@ -1,614 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.11 2012/09/19 17:54:46 hd_brummy Exp $
-
-# @ECLASS: vdr-plugin-2.eclass
-# @MAINTAINER:
-# vdr@g.o
-# @BLURB: common vdr plugin ebuild functions
-# @DESCRIPTION:
-# Eclass for easing maitenance of vdr plugin ebuilds
-
-# Authors:
-# Matthias Schwarzott <zzam@g.o>
-# Joerg Bornkessel <hd_brummy@g.o>
-# Christian Ruppert <idl0r@g.o>
-
-# Plugin config file installation:
-#
-# A plugin config file can be specified through the $VDR_CONFD_FILE variable, it
-# defaults to ${FILESDIR}/confd. Each config file will be installed as e.g.
-# ${D}/etc/conf.d/vdr.${VDRPLUGIN}
-
-# Installation of rc-addon files:
-# NOTE: rc-addon files must be valid shell scripts!
-#
-# Installing rc-addon files is basically the same as for plugin config files
-# (see above), it's just using the $VDR_RCADDON_FILE variable instead.
-# The default value when $VDR_RCADDON_FILE is undefined is:
-# ${FILESDIR}/rc-addon.sh and will be installed as
-# ${VDR_RC_DIR}/plugin-${VDRPLUGIN}.sh
-#
-# The rc-addon files will be sourced by the startscript when the specific plugin
-# has been enabled.
-# rc-addon files may be used to prepare everything that is necessary for the
-# plugin start/stop, like passing extra command line options and so on.
-
-# Applying your own local/user patches:
-# This is done by using the epatch_user() function of the eutils.eclass.
-# Simply put your patches into one of these directories:
-# /etc/portage/patches/<CATEGORY>/<PF|P|PN>/
-# Quote: where the first of these three directories to exist will be the one to
-# use, ignoring any more general directories which might exist as well.
-#
-# For more details about it please take a look at the eutils.class.
-
-inherit base eutils flag-o-matic multilib toolchain-funcs
-
-case ${EAPI:-0} in
-    4|5) ;;
-    *) die "EAPI ${EAPI} unsupported."
-esac
-
-EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_compile src_install pkg_postinst pkg_postrm pkg_config
-
-IUSE=""
-
-# Name of the plugin stripped from all vdrplugin-, vdr- and -cvs pre- and postfixes
-VDRPLUGIN="${PN/#vdrplugin-/}"
-VDRPLUGIN="${VDRPLUGIN/#vdr-/}"
-VDRPLUGIN="${VDRPLUGIN/%-cvs/}"
-
-DESCRIPTION="vdr Plugin: ${VDRPLUGIN} (based on vdr-plugin-2.eclass)"
-
-# Works in most cases
-S="${WORKDIR}/${VDRPLUGIN}-${PV}"
-
-# depend on headers for DVB-driver
-COMMON_DEPEND=">=media-tv/gentoo-vdr-scripts-0.4.2"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/linuxtv-dvb-headers"
-RDEPEND="${COMMON_DEPEND}
-	>=app-admin/eselect-vdr-0.0.2"
-
-# This is a hack for ebuilds like vdr-xineliboutput that want to
-# conditionally install a vdr-plugin
-if [[ "${GENTOO_VDR_CONDITIONAL:-no}" = "yes" ]]; then
-	IUSE="${IUSE} vdr"
-	DEPEND="vdr? ( ${DEPEND} )"
-	RDEPEND="vdr? ( ${RDEPEND} )"
-fi
-
-# New method of storing plugindb
-#   Called from src_install
-#   file maintained by normal portage-methods
-create_plugindb_file() {
-	local NEW_VDRPLUGINDB_DIR=/usr/share/vdr/vdrplugin-rebuild/
-	local DB_FILE="${NEW_VDRPLUGINDB_DIR}/${CATEGORY}-${PF}"
-	insinto "${NEW_VDRPLUGINDB_DIR}"
-
-#	BUG: portage-2.1.4_rc9 will delete the EBUILD= line, so we cannot use this code.
-#	cat <<-EOT > "${D}/${DB_FILE}"
-#		VDRPLUGIN_DB=1
-#		CREATOR=ECLASS
-#		EBUILD=${CATEGORY}/${PN}
-#		EBUILD_V=${PVR}
-#	EOT
-	{
-		echo "VDRPLUGIN_DB=1"
-		echo "CREATOR=ECLASS"
-		echo "EBUILD=${CATEGORY}/${PN}"
-		echo "EBUILD_V=${PVR}"
-		echo "PLUGINS=\"$@\""
-	} > "${D}/${DB_FILE}"
-}
-
-# Delete files created outside of vdr-plugin-2.eclass
-#   vdrplugin-rebuild.ebuild converted plugindb and files are
-#   not deleted by portage itself - should only be needed as
-#   long as not every system has switched over to
-#   vdrplugin-rebuild-0.2 / gentoo-vdr-scripts-0.4.2
-delete_orphan_plugindb_file() {
-	#elog Testing for orphaned plugindb file
-	local NEW_VDRPLUGINDB_DIR=/usr/share/vdr/vdrplugin-rebuild/
-	local DB_FILE="${ROOT}/${NEW_VDRPLUGINDB_DIR}/${CATEGORY}-${PF}"
-
-	# file exists
-	[[ -f ${DB_FILE} ]] || return
-
-	# will portage handle the file itself
-	if grep -q CREATOR=ECLASS "${DB_FILE}"; then
-		#elog file owned by eclass - don't touch it
-		return
-	fi
-
-	elog "Removing orphaned plugindb-file."
-	elog "\t#rm ${DB_FILE}"
-	rm "${DB_FILE}"
-}
-
-
-create_header_checksum_file() {
-	# Danger: Not using $ROOT here, as compile will also not use it !!!
-	# If vdr in $ROOT and / differ, plugins will not run anyway
-
-	local CHKSUM="header-md5-vdr"
-
-	if [[ -f ${VDR_CHECKSUM_DIR}/header-md5-vdr ]]; then
-		cp "${VDR_CHECKSUM_DIR}/header-md5-vdr" "${CHKSUM}"
-	elif type -p md5sum >/dev/null 2>&1; then
-		(
-			cd "${VDR_INCLUDE_DIR}"
-			md5sum *.h libsi/*.h|LC_ALL=C sort --key=2
-		) > "${CHKSUM}"
-	else
-		die "Could not create md5 checksum of headers"
-	fi
-
-	insinto "${VDR_CHECKSUM_DIR}"
-	local p_name
-	for p_name; do
-		newins "${CHKSUM}" "header-md5-${p_name}"
-	done
-}
-
-fix_vdr_libsi_include() {
-	dev_check "Fixing include of libsi-headers"
-	local f
-	for f; do
-		sed -i "${f}" \
-			-e '/#include/s:"\(.*libsi.*\)":<\1>:' \
-			-e '/#include/s:<.*\(libsi/.*\)>:<vdr/\1>:'
-	done
-}
-
-vdr_patchmakefile() {
-	einfo "Patching Makefile"
-	[[ -e Makefile ]] || die "Makefile of plugin can not be found!"
-	cp Makefile "${WORKDIR}"/Makefile.before
-
-	# plugin makefiles use VDRDIR in strange ways
-	# assumptions:
-	#   1. $(VDRDIR) contains Make.config
-	#   2. $(VDRDIR) contains config.h
-	#   3. $(VDRDIR)/include/vdr contains the headers
-	#   4. $(VDRDIR) contains main vdr Makefile
-	#   5. $(VDRDIR)/locale exists
-	#   6. $(VDRDIR) allows to access vdr source files
-	#
-	# We only have one directory (for now /usr/include/vdr),
-	# that contains vdr-headers and Make.config.
-	# To satisfy 1-3 we do this:
-	#   Set VDRDIR=/usr/include/vdr
-	#   Set VDRINCDIR=/usr/include
-	#   Change $(VDRDIR)/include to $(VDRINCDIR)
-
-	sed -i Makefile \
-		-e "s:^VDRDIR.*$:VDRDIR = ${VDR_INCLUDE_DIR}:" \
-		-e "/^VDRDIR/a VDRINCDIR = ${VDR_INCLUDE_DIR%/vdr}" \
-		-e '/VDRINCDIR.*=/!s:$(VDRDIR)/include:$(VDRINCDIR):' \
-		\
-		-e 's:-I$(DVBDIR)/include::' \
-		-e 's:-I$(DVBDIR)::'
-
-	# may be needed for multiproto:
-	#sed -i Makefile \
-	#	-e "s:^DVBDIR.*$:DVBDIR = ${DVB_INCLUDE_DIR}:" \
-	#	-e 's:-I$(DVBDIR)/include:-I$(DVBDIR):'
-
-	if ! grep -q APIVERSION Makefile; then
-		ebegin "  Converting to APIVERSION"
-		sed -i Makefile \
-			-e 's:^APIVERSION = :APIVERSION ?= :' \
-			-e 's:$(LIBDIR)/$@.$(VDRVERSION):$(LIBDIR)/$@.$(APIVERSION):' \
-			-e '/VDRVERSION =/a\APIVERSION = $(shell sed -ne '"'"'/define APIVERSION/s/^.*"\\(.*\\)".*$$/\\1/p'"'"' $(VDRDIR)/config.h)'
-		eend $?
-	fi
-
-	# Correcting Compile-Flags
-	# Do not overwrite CXXFLAGS, add LDFLAGS if missing
-	sed -i Makefile \
-		-e '/^CXXFLAGS[[:space:]]*=/s/=/?=/' \
-		-e '/LDFLAGS/!s:-shared:$(LDFLAGS) -shared:'
-
-	# Disabling file stripping, the package manager takes care of it
-	sed -i Makefile \
-		-e '/@.*strip/d' \
-		-e '/strip \$(LIBDIR)\/\$@/d' \
-		-e 's/STRIP.*=.*$/STRIP = true/'
-
-	# Use a file instead of a variable as single-stepping via ebuild
-	# destroys environment.
-	touch "${WORKDIR}"/.vdr-plugin_makefile_patched
-}
-
-# Begin new vdr-plugin-2.eclass content
-dev_check() {
-	# A lot useful debug infos
-	# set VDR_MAINTAINER_MODE="1" in /etc/make.conf
-	if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-		eerror "\t Maintainer Info: $@"
-	fi
-}
-
-gettext_missing() {
-	# plugins without converting to gettext
-
-	local GETTEXT_MISSING=$( grep xgettext Makefile )
-	if [[ -z ${GETTEXT_MISSING} ]]; then
-		dev_check "Plugin isn't converted to gettext handling \n"
-	fi
-}
-
-linguas_support() {
-#	Patching Makefile for linguas support.
-#	Only locales, enabled through the LINGUAS (make.conf) variable will be
-#	"compiled" and installed.
-#
-#	Some plugins have po/ in a subdir
-#	set PO_SUBDIR in .ebuild
-#	i.e media-plugins/vdr-streamdev
-#	PO_SUBDIR="client server"
-
-	einfo "Patching for Linguas support"
-	einfo "available Languages for ${P} are:"
-
-	[[ -f po ]] && local po_dir="${S}"
-	local po_subdir=( ${S}/${PO_SUBDIR} )
-	local f
-
-	makefile_dir=( ${po_dir} ${po_subdir[*]} )
-
-	for f in ${makefile_dir[*]}; do
-
-		PLUGIN_LINGUAS=$( ls ${f}/po --ignore="*.pot" | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-		einfo "LINGUAS=\"${PLUGIN_LINGUAS}\""
-
-		sed -i ${f}/Makefile \
-			-e 's:\$(wildcard[[:space:]]*\$(PODIR)/\*.po):\$(foreach dir,\$(LINGUAS),\$(wildcard \$(PODIR)\/\$(dir)\*.po)):' \
-			|| die "sed failed for Linguas"
-	done
-
-	strip-linguas ${PLUGIN_LINGUAS} en
-
-	# maintainer check
-	if [[ ! -d po ]]; then
-		dev_check "po dir not found? May be in subdir? \n"
-	fi
-}
-
-vdr_i18n() {
-# 	i18n handling was deprecated since >=media-video/vdr-1.5.9,
-#	finally with >=media-video/vdr-1.7.27 it has been dropped entirely and some
-#	plugins will fail to "compile" because they're still using the old variant.
-#	Simply remove the i18n.o object from Makefile (OBJECT) and
-#	remove "static const tI18nPhrase*" from i18n.h.
-#
-#	Plugins that are still using the old method will be pmasked until they're
-#	fixed or in case of maintainer timeout they'll be masked for removal.
-
-	gettext_missing
-
-	local I18N_OBJECT=$( grep i18n.o Makefile )
-	if [[ -n ${I18N_OBJECT} ]]; then
-
-		if [[ "${KEEP_I18NOBJECT:-no}" = "yes" ]]; then
-			dev_check "Forced to keep i18n.o"
-		else
-			sed -i "s:i18n.o::g" Makefile
-			dev_check "OBJECT i18n.o found"
-			dev_check "removed per sed \n"
-		fi
-
-	else
-		dev_check "OBJECT i18n.o not found in Makefile"
-		dev_check "all fine or manual review needed? \n"
-	fi
-
-	local I18N_STRING=$( [[ -e i18n.h ]] && grep tI18nPhrase i18n.h )
-	if [[ -n ${I18N_STRING} ]]; then
-		sed -i "s:^extern[[:space:]]*const[[:space:]]*tI18nPhrase://static const tI18nPhrase:" i18n.h
-		dev_check "obsolete tI18nPhrase found"
-		dev_check "disabled per sed, please recheck \n"
-	else
-		dev_check "obsolete tI18nPhrase not found, fine..."
-		dev_check "please review, may be in subdir... \n"
-	fi
-}
-# end new vdr-plugin-2.eclass content
-
-vdr-plugin-2_copy_source_tree() {
-	pushd . >/dev/null
-	cp -r "${S}" "${T}"/source-tree
-	cd "${T}"/source-tree
-	cp "${WORKDIR}"/Makefile.before Makefile
-	# TODO: Fix this, maybe no longer needed
-	sed -i Makefile \
-		-e "s:^DVBDIR.*$:DVBDIR = ${DVB_INCLUDE_DIR}:" \
-		-e 's:^CXXFLAGS:#CXXFLAGS:' \
-		-e 's:-I$(DVBDIR)/include:-I$(DVBDIR):' \
-		-e 's:-I$(VDRDIR) -I$(DVBDIR):-I$(DVBDIR) -I$(VDRDIR):'
-	popd >/dev/null
-}
-
-vdr-plugin-2_install_source_tree() {
-	einfo "Installing sources"
-	destdir="${VDRSOURCE_DIR}/vdr-${VDRVERSION}/PLUGINS/src/${VDRPLUGIN}"
-	insinto "${destdir}-${PV}"
-	doins -r "${T}"/source-tree/*
-
-	dosym "${VDRPLUGIN}-${PV}" "${destdir}"
-}
-
-vdr-plugin-2_print_enable_command() {
-	local p_name c=0 l=""
-	for p_name in ${vdr_plugin_list}; do
-		c=$(( c+1 ))
-		l="$l ${p_name#vdr-}"
-	done
-
-	elog
-	case $c in
-	1)	elog "Installed plugin${l}" ;;
-	*)	elog "Installed $c plugins:${l}" ;;
-	esac
-	elog "To activate a plugin execute this command:"
-	elog "\teselect vdr-plugin enable <plugin_name> ..."
-	elog
-}
-
-has_vdr() {
-	[[ -f "${VDR_INCLUDE_DIR}"/config.h ]]
-}
-
-## exported functions
-
-vdr-plugin-2_pkg_setup() {
-	# -fPIC is needed for shared objects on some platforms (amd64 and others)
-	append-flags -fPIC
-
-	# Plugins need to be compiled with position independent code, otherwise linking
-	# VDR against it will fail
-	if has_version ">=media-video/vdr-1.7.13"; then
-		append-lfs-flags
-	fi
-
-	# missing ${chost}- tag
-	tc-export CC CXX
-
-	# Where should the plugins live in the filesystem
-	VDR_PLUGIN_DIR="/usr/$(get_libdir)/vdr/plugins"
-	VDR_CHECKSUM_DIR="${VDR_PLUGIN_DIR%/plugins}/checksums"
-
-	# was /usr/lib/... some time ago
-	# since gentoo-vdr-scripts-0.3.6 it works with /usr/share/...
-	VDR_RC_DIR="/usr/share/vdr/rcscript"
-
-	# Pathes to includes
-	VDR_INCLUDE_DIR="/usr/include/vdr"
-	DVB_INCLUDE_DIR="/usr/include"
-
-	TMP_LOCALE_DIR="${WORKDIR}/tmp-locale"
-	LOCDIR="/usr/share/locale"
-
-	if ! has_vdr; then
-		# set to invalid values to detect abuses
-		VDRVERSION="eclass_no_vdr_installed"
-		APIVERSION="eclass_no_vdr_installed"
-
-		if [[ "${GENTOO_VDR_CONDITIONAL:-no}" = "yes" ]] && ! use vdr; then
-			einfo "VDR not found!"
-		else
-			# if vdr is required
-			die "VDR not found!"
-		fi
-		return
-	fi
-
-	VDRVERSION=$(awk -F'"' '/define VDRVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
-	APIVERSION=$(awk -F'"' '/define APIVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
-	[[ -z ${APIVERSION} ]] && APIVERSION="${VDRVERSION}"
-
-	einfo "Compiling against"
-	einfo "\tvdr-${VDRVERSION} [API version ${APIVERSION}]"
-
-	if [[ -n "${VDR_LOCAL_PATCHES_DIR}" ]]; then
-		eerror "Using VDR_LOCAL_PATCHES_DIR is deprecated!"
-		eerror "Please move all your patches into"
-		eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}"
-		eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable."
-		die
-	fi
-}
-
-vdr-plugin-2_src_util() {
-	while [ "$1" ]; do
-		case "$1" in
-		all)
-			vdr-plugin-2_src_util unpack add_local_patch patchmakefile linguas_patch i18n
-			;;
-		prepare)
-			vdr-plugin-2_src_util add_local_patch patchmakefile linguas_patch i18n
-			;;
-		unpack)
-			base_src_unpack
-			;;
-		add_local_patch)
-			cd "${S}" || die "Could not change to plugin-source-directory!"
-			epatch_user
-			;;
-		patchmakefile)
-			cd "${S}" || die "Could not change to plugin-source-directory!"
-			vdr_patchmakefile
-			;;
-		i18n)
-			vdr_i18n
-			;;
-		linguas_patch)
-			linguas_support
-			;;
-		esac
-
-		shift
-	done
-}
-
-vdr-plugin-2_src_unpack() {
-	if [[ -z ${VDR_INCLUDE_DIR} ]]; then
-		eerror "Wrong use of vdr-plugin-2.eclass."
-		eerror "An ebuild for a vdr-plugin will not work without calling vdr-plugin-2_src_unpack."
-		echo
-		eerror "Please report this at bugs.gentoo.org."
-		die "vdr-plugin-2_src_unpack not called!"
-	fi
-
-	if [ -z "$1" ]; then
-		vdr-plugin-2_src_util unpack
-	else
-		vdr-plugin-2_src_util $@
-	fi
-}
-
-vdr-plugin-2_src_prepare() {
-	if [[ -z ${VDR_INCLUDE_DIR} ]]; then
-		eerror "Wrong use of vdr-plugin-2.eclass."
-		eerror "An ebuild for a vdr-plugin will not work without calling vdr-plugin-2_src_prepare."
-		echo
-		eerror "Please report this at bugs.gentoo.org."
-		die "vdr-plugin-2_src_prepare not called!"
-	fi
-
-	base_src_prepare
-	vdr-plugin-2_src_util prepare
-}
-
-vdr-plugin-2_src_compile() {
-	[ -z "$1" ] && vdr-plugin-2_src_compile copy_source compile
-
-	while [ "$1" ]; do
-		case "$1" in
-		copy_source)
-			[[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin-2_copy_source_tree
-			;;
-		compile)
-			if [[ ! -f ${WORKDIR}/.vdr-plugin_makefile_patched ]]; then
-				eerror "Wrong use of vdr-plugin-2.eclass."
-				eerror "An ebuild for a vdr-plugin will not work without"
-				eerror "calling vdr-plugin-2_src_compile to patch the Makefile."
-				echo
-				eerror "Please report this at bugs.gentoo.org."
-				die "vdr-plugin-2_src_compile not called!"
-			fi
-			cd "${S}"
-
-			BUILD_TARGETS=${BUILD_TARGETS:-${VDRPLUGIN_MAKE_TARGET:-all}}
-
-			emake ${BUILD_PARAMS} \
-				${BUILD_TARGETS} \
-				LOCALEDIR="${TMP_LOCALE_DIR}" \
-				LIBDIR="${S}" \
-				TMPDIR="${T}" \
-			|| die "emake failed"
-			;;
-		esac
-
-		shift
-	done
-}
-
-vdr-plugin-2_src_install() {
-	if [[ -z ${VDR_INCLUDE_DIR} ]]; then
-		eerror "Wrong use of vdr-plugin-2.eclass."
-		eerror "An ebuild for a vdr-plugin will not work without calling vdr-plugin-2_src_install."
-		echo
-		eerror "Please report this at bugs.gentoo.org."
-		die "vdr-plugin-2_src_install not called!"
-	fi
-
-	[[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin-2_install_source_tree
-	cd "${WORKDIR}"
-
-	if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-		local mname="${P}-Makefile"
-		cp "${S}"/Makefile "${mname}.patched"
-		cp Makefile.before "${mname}.before"
-
-		diff -u "${mname}.before" "${mname}.patched" > "${mname}.diff"
-
-		insinto "/usr/share/vdr/maintainer-data/makefile-changes"
-		doins "${mname}.diff"
-
-		insinto "/usr/share/vdr/maintainer-data/makefile-before"
-		doins "${mname}.before"
-
-		insinto "/usr/share/vdr/maintainer-data/makefile-patched"
-		doins "${mname}.patched"
-
-	fi
-
-	cd "${S}"
-	insinto "${VDR_PLUGIN_DIR}"
-	doins libvdr-*.so.*
-
-	# create list of all created plugin libs
-	vdr_plugin_list=""
-	local p_name
-	for p in libvdr-*.so.*; do
-		p_name="${p%.so*}"
-		p_name="${p_name#lib}"
-		vdr_plugin_list="${vdr_plugin_list} ${p_name}"
-	done
-
-	create_header_checksum_file ${vdr_plugin_list}
-	create_plugindb_file ${vdr_plugin_list}
-
-	if [[ -d ${TMP_LOCALE_DIR} ]]; then
-		einfo "Installing locales"
-		cd "${TMP_LOCALE_DIR}"
-		local linguas
-		for linguas in ${LINGUAS[*]}; do
-			insinto "${LOCDIR}"
-			cp -r --parents ${linguas}* ${D}/${LOCDIR}
-		done
-	fi
-
-	cd "${S}"
-	local docfile
-	for docfile in README* HISTORY CHANGELOG; do
-		[[ -f ${docfile} ]] && dodoc ${docfile}
-	done
-
-	# if VDR_CONFD_FILE is empty and ${FILESDIR}/confd exists take it
-	[[ -z ${VDR_CONFD_FILE} ]] && [[ -e ${FILESDIR}/confd ]] && VDR_CONFD_FILE=${FILESDIR}/confd
-
-	if [[ -n ${VDR_CONFD_FILE} ]]; then
-		newconfd "${VDR_CONFD_FILE}" vdr.${VDRPLUGIN}
-	fi
-
-	# if VDR_RCADDON_FILE is empty and ${FILESDIR}/rc-addon.sh exists take it
-	[[ -z ${VDR_RCADDON_FILE} ]] && [[ -e ${FILESDIR}/rc-addon.sh ]] && VDR_RCADDON_FILE=${FILESDIR}/rc-addon.sh
-
-	if [[ -n ${VDR_RCADDON_FILE} ]]; then
-		insinto "${VDR_RC_DIR}"
-		newins "${VDR_RCADDON_FILE}" plugin-${VDRPLUGIN}.sh
-	fi
-}
-
-vdr-plugin-2_pkg_postinst() {
-	vdr-plugin-2_print_enable_command
-
-	if [[ -n "${VDR_CONFD_FILE}" ]]; then
-		elog "Please have a look at the config-file"
-		elog "\t/etc/conf.d/vdr.${VDRPLUGIN}"
-		elog
-	fi
-}
-
-vdr-plugin-2_pkg_postrm() {
-	delete_orphan_plugindb_file
-}
-
-vdr-plugin-2_pkg_config() {
-:
-}

diff --git a/eclass/vdr-plugin.eclass b/eclass/vdr-plugin.eclass
deleted file mode 100644
index e9cd760..0000000
--- a/eclass/vdr-plugin.eclass
+++ /dev/null
@@ -1,601 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.89 2012/09/19 17:54:46 hd_brummy Exp $
-
-# @ECLASS: vdr-plugin.eclass
-# @MAINTAINER:
-# vdr@g.o
-# @BLURB: common vdr plugin ebuild functions
-# @DESCRIPTION:
-# Eclass for easing maitenance of vdr plugin ebuilds
-
-# Authors:
-# Matthias Schwarzott <zzam@g.o>
-# Joerg Bornkessel <hd_brummy@g.o>
-# Christian Ruppert <idl0r@g.o>
-
-# Plugin config file installation:
-#
-# A plugin config file can be specified through the $VDR_CONFD_FILE variable, it
-# defaults to ${FILESDIR}/confd. Each config file will be installed as e.g.
-# ${D}/etc/conf.d/vdr.${VDRPLUGIN}
-
-# Installation of rc-addon files:
-# NOTE: rc-addon files must be valid shell scripts!
-#
-# Installing rc-addon files is basically the same as for plugin config files
-# (see above), it's just using the $VDR_RCADDON_FILE variable instead.
-# The default value when $VDR_RCADDON_FILE is undefined is:
-# ${FILESDIR}/rc-addon.sh and will be installed as
-# ${VDR_RC_DIR}/plugin-${VDRPLUGIN}.sh
-#
-# The rc-addon files will be sourced by the startscript when the specific plugin
-# has been enabled.
-# rc-addon files may be used to prepare everything that is necessary for the
-# plugin start/stop, like passing extra command line options and so on.
-
-# Applying your own local/user patches:
-# This is done by using the epatch_user() function of the eutils.eclass.
-# Simply put your patches into one of these directories:
-# /etc/portage/patches/<CATEGORY>/<PF|P|PN>/
-# Quote: where the first of these three directories to exist will be the one to
-# use, ignoring any more general directories which might exist as well.
-#
-# For more details about it please take a look at the eutils.class.
-
-inherit base multilib eutils flag-o-matic
-
-if ! has "${EAPI:-0}" 0 1 2 3 4 5; then
-	die "API of vdr-plugin.eclass in EAPI=\"${EAPI}\" not established"
-fi
-
-IUSE=""
-
-# Name of the plugin stripped from all vdrplugin-, vdr- and -cvs pre- and postfixes
-VDRPLUGIN="${PN/#vdrplugin-/}"
-VDRPLUGIN="${VDRPLUGIN/#vdr-/}"
-VDRPLUGIN="${VDRPLUGIN/%-cvs/}"
-
-DESCRIPTION="vdr Plugin: ${VDRPLUGIN} (based on vdr-plugin.eclass)"
-
-# works in most cases
-S="${WORKDIR}/${VDRPLUGIN}-${PV}"
-
-# depend on headers for DVB-driver
-COMMON_DEPEND=">=media-tv/gentoo-vdr-scripts-0.4.2"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/linuxtv-dvb-headers"
-RDEPEND="${COMMON_DEPEND}
-	>=app-admin/eselect-vdr-0.0.2"
-
-# this is a hack for ebuilds like vdr-xineliboutput that want to
-# conditionally install a vdr-plugin
-if [[ "${GENTOO_VDR_CONDITIONAL:-no}" = "yes" ]]; then
-	# make DEPEND conditional
-	IUSE="${IUSE} vdr"
-	DEPEND="vdr? ( ${DEPEND} )"
-	RDEPEND="vdr? ( ${RDEPEND} )"
-fi
-
-# New method of storing plugindb
-#   Called from src_install
-#   file maintained by normal portage-methods
-create_plugindb_file() {
-	local NEW_VDRPLUGINDB_DIR=/usr/share/vdr/vdrplugin-rebuild/
-	local DB_FILE="${NEW_VDRPLUGINDB_DIR}/${CATEGORY}-${PF}"
-	insinto "${NEW_VDRPLUGINDB_DIR}"
-
-#	BUG: portage-2.1.4_rc9 will delete the EBUILD= line, so we cannot use this code.
-#	cat <<-EOT > "${D}/${DB_FILE}"
-#		VDRPLUGIN_DB=1
-#		CREATOR=ECLASS
-#		EBUILD=${CATEGORY}/${PN}
-#		EBUILD_V=${PVR}
-#	EOT
-	{
-		echo "VDRPLUGIN_DB=1"
-		echo "CREATOR=ECLASS"
-		echo "EBUILD=${CATEGORY}/${PN}"
-		echo "EBUILD_V=${PVR}"
-		echo "PLUGINS=\"$@\""
-	} > "${D}/${DB_FILE}"
-}
-
-# Delete files created outside of vdr-plugin.eclass
-#   vdrplugin-rebuild.ebuild converted plugindb and files are
-#   not deleted by portage itself - should only be needed as
-#   long as not every system has switched over to
-#   vdrplugin-rebuild-0.2 / gentoo-vdr-scripts-0.4.2
-delete_orphan_plugindb_file() {
-	#elog Testing for orphaned plugindb file
-	local NEW_VDRPLUGINDB_DIR=/usr/share/vdr/vdrplugin-rebuild/
-	local DB_FILE="${ROOT}/${NEW_VDRPLUGINDB_DIR}/${CATEGORY}-${PF}"
-
-	# file exists
-	[[ -f ${DB_FILE} ]] || return
-
-	# will portage handle the file itself
-	if grep -q CREATOR=ECLASS "${DB_FILE}"; then
-		#elog file owned by eclass - don't touch it
-		return
-	fi
-
-	elog "Removing orphaned plugindb-file."
-	elog "\t#rm ${DB_FILE}"
-	rm "${DB_FILE}"
-}
-
-
-create_header_checksum_file()
-{
-	# Danger: Not using $ROOT here, as compile will also not use it !!!
-	# If vdr in $ROOT and / differ, plugins will not run anyway
-
-	local CHKSUM="header-md5-vdr"
-
-	if [[ -f ${VDR_CHECKSUM_DIR}/header-md5-vdr ]]; then
-		cp "${VDR_CHECKSUM_DIR}/header-md5-vdr" "${CHKSUM}"
-	elif type -p md5sum >/dev/null 2>&1; then
-		(
-			cd "${VDR_INCLUDE_DIR}"
-			md5sum *.h libsi/*.h|LC_ALL=C sort --key=2
-		) > "${CHKSUM}"
-	else
-		die "Could not create md5 checksum of headers"
-	fi
-
-	insinto "${VDR_CHECKSUM_DIR}"
-	local p_name
-	for p_name; do
-		newins "${CHKSUM}" "header-md5-${p_name}"
-	done
-}
-
-fix_vdr_libsi_include()
-{
-	#einfo "Fixing include of libsi-headers"
-	local f
-	for f; do
-		sed -i "${f}" \
-			-e '/#include/s:"\(.*libsi.*\)":<\1>:' \
-			-e '/#include/s:<.*\(libsi/.*\)>:<vdr/\1>:'
-	done
-}
-
-vdr_patchmakefile() {
-	einfo "Patching Makefile"
-	[[ -e Makefile ]] || die "Makefile of plugin can not be found!"
-	cp Makefile "${WORKDIR}"/Makefile.before
-
-	# plugin makefiles use VDRDIR in strange ways
-	# assumptions:
-	#   1. $(VDRDIR) contains Make.config
-	#   2. $(VDRDIR) contains config.h
-	#   3. $(VDRDIR)/include/vdr contains the headers
-	#   4. $(VDRDIR) contains main vdr Makefile
-	#   5. $(VDRDIR)/locale exists
-	#   6. $(VDRDIR) allows to access vdr source files
-	#
-	# We only have one directory (for now /usr/include/vdr),
-	# that contains vdr-headers and Make.config.
-	# To satisfy 1-3 we do this:
-	#   Set VDRDIR=/usr/include/vdr
-	#   Set VDRINCDIR=/usr/include
-	#   Change $(VDRDIR)/include to $(VDRINCDIR)
-
-	sed -i Makefile \
-		-e "s:^VDRDIR.*$:VDRDIR = ${VDR_INCLUDE_DIR}:" \
-		-e "/^VDRDIR/a VDRINCDIR = ${VDR_INCLUDE_DIR%/vdr}" \
-		-e '/VDRINCDIR.*=/!s:$(VDRDIR)/include:$(VDRINCDIR):' \
-		\
-		-e 's:-I$(DVBDIR)/include::' \
-		-e 's:-I$(DVBDIR)::'
-
-	# maybe needed for multiproto:
-	#sed -i Makefile \
-	#	-e "s:^DVBDIR.*$:DVBDIR = ${DVB_INCLUDE_DIR}:" \
-	#	-e 's:-I$(DVBDIR)/include:-I$(DVBDIR):'
-
-	if ! grep -q APIVERSION Makefile; then
-		ebegin "  Converting to APIVERSION"
-		sed -i Makefile \
-			-e 's:^APIVERSION = :APIVERSION ?= :' \
-			-e 's:$(LIBDIR)/$@.$(VDRVERSION):$(LIBDIR)/$@.$(APIVERSION):' \
-			-e '/VDRVERSION =/a\APIVERSION = $(shell sed -ne '"'"'/define APIVERSION/s/^.*"\\(.*\\)".*$$/\\1/p'"'"' $(VDRDIR)/config.h)'
-		eend $?
-	fi
-
-	# Correcting Compile-Flags
-	# Do not overwrite CXXFLAGS, add LDFLAGS if missing
-	sed -i Makefile \
-		-e '/^CXXFLAGS[[:space:]]*=/s/=/?=/' \
-		-e '/LDFLAGS/!s:-shared:$(LDFLAGS) -shared:'
-
-	# Disabling file stripping, useful for debugging
-	sed -i Makefile \
-		-e '/@.*strip/d' \
-		-e '/strip \$(LIBDIR)\/\$@/d' \
-		-e 's/STRIP.*=.*$/STRIP = true/'
-
-	# Use a file instead of a variable as single-stepping via ebuild
-	# destroys environment.
-	touch "${WORKDIR}"/.vdr-plugin_makefile_patched
-}
-
-vdr_has_gettext() {
-	has_version ">=media-video/vdr-1.5.7"
-}
-
-plugin_has_gettext() {
-	[[ -d po ]]
-}
-
-vdr_i18n_convert_to_gettext() {
-	if has_version ">=media-video/vdr-1.7.22"; then
-		local i18n_tool="${ROOT}/usr/share/vdr/bin/i18n-to-gettext"
-	else
-		local i18n_tool="${ROOT}/usr/share/vdr/bin/i18n-to-gettext.pl"
-	fi
-
-	if [[ ${NO_GETTEXT_HACK} == "1" ]]; then
-		ewarn "Conversion to gettext disabled in ebuild"
-		return 1
-	fi
-
-	if [[ ! -x ${i18n_tool} ]]; then
-		eerror "Missing ${i18n_tool}"
-		eerror "Please re-emerge vdr"
-		die "Missing ${i18n_tool}"
-	fi
-
-	ebegin "Auto converting translations to gettext"
-	# call i18n-to-gettext tool
-	# take all texts missing tr call into special file
-	"${i18n_tool}" 2>/dev/null \
-		|sed -e '/^"/!d' \
-			-e '/^""$/d' \
-			-e 's/\(.*\)/trNOOP(\1)/' \
-		> dummy-translations-trNOOP.c
-
-	# if there were untranslated texts just run it again
-	# now the missing calls are listed in
-	# dummy-translations-trNOOP.c
-	if [[ -s dummy-translations-trNOOP.c ]]; then
-		"${i18n_tool}" &>/dev/null
-	fi
-
-	# now use the modified Makefile
-	if [[ -f Makefile.new ]]; then
-		mv Makefile.new Makefile
-		eend 0 ""
-	else
-		eend 1 "Conversion to gettext failed. Plugin needs fixing."
-		return 1
-	fi
-}
-
-vdr_i18n_disable_gettext() {
-	#einfo "Disabling gettext support in plugin"
-
-	# Remove i18n Target if using older vdr
-	sed -i Makefile \
-		-e '/^all:/s/ i18n//'
-}
-
-vdr_i18n() {
-	if vdr_has_gettext; then
-		#einfo "VDR has gettext support"
-		if plugin_has_gettext; then
-			#einfo "Plugin has gettext support, fine"
-			if [[ ${NO_GETTEXT_HACK} == "1" ]]; then
-				ewarn "Please remove unneeded NO_GETTEXT_HACK from ebuild."
-			fi
-		else
-			vdr_i18n_convert_to_gettext
-			if [[ $? != 0 ]]; then
-				einfo "Plugin has no OSD texts or will have only english OSD texts"
-			fi
-		fi
-	else
-		#einfo "VDR has no gettext support"
-		if plugin_has_gettext; then
-			vdr_i18n_disable_gettext
-		fi
-	fi
-}
-
-vdr-plugin_copy_source_tree() {
-	pushd . >/dev/null
-	cp -r "${S}" "${T}"/source-tree
-	cd "${T}"/source-tree
-	cp "${WORKDIR}"/Makefile.before Makefile
-	# TODO: Fix this, maybe no longer needed
-	sed -i Makefile \
-		-e "s:^DVBDIR.*$:DVBDIR = ${DVB_INCLUDE_DIR}:" \
-		-e 's:^CXXFLAGS:#CXXFLAGS:' \
-		-e 's:-I$(DVBDIR)/include:-I$(DVBDIR):' \
-		-e 's:-I$(VDRDIR) -I$(DVBDIR):-I$(DVBDIR) -I$(VDRDIR):'
-	popd >/dev/null
-}
-
-vdr-plugin_install_source_tree() {
-	einfo "Installing sources"
-	destdir="${VDRSOURCE_DIR}/vdr-${VDRVERSION}/PLUGINS/src/${VDRPLUGIN}"
-	insinto "${destdir}-${PV}"
-	doins -r "${T}"/source-tree/*
-
-	dosym "${VDRPLUGIN}-${PV}" "${destdir}"
-}
-
-vdr-plugin_print_enable_command() {
-	local p_name c=0 l=""
-	for p_name in ${vdr_plugin_list}; do
-		c=$(( c+1 ))
-		l="$l ${p_name#vdr-}"
-	done
-
-	elog
-	case $c in
-	1)	elog "Installed plugin${l}" ;;
-	*)	elog "Installed $c plugins:${l}" ;;
-	esac
-	elog "To activate a plugin execute this command:"
-	elog "\teselect vdr-plugin enable <plugin_name> ..."
-	elog
-}
-
-has_vdr() {
-	[[ -f "${VDR_INCLUDE_DIR}"/config.h ]]
-}
-
-## exported functions
-
-vdr-plugin_pkg_setup() {
-	# -fPIC is needed for shared objects on some platforms (amd64 and others)
-	append-flags -fPIC
-
-	# Plugins need to be compiled with position independent code, otherwise linking
-	# VDR against it will fail
-	if has_version ">=media-video/vdr-1.7.13"; then
-		append-lfs-flags
-	fi
-
-	# Where should the plugins live in the filesystem
-	VDR_PLUGIN_DIR="/usr/$(get_libdir)/vdr/plugins"
-	VDR_CHECKSUM_DIR="${VDR_PLUGIN_DIR%/plugins}/checksums"
-
-	# was /usr/lib/... some time ago
-	# since gentoo-vdr-scripts-0.3.6 it works with /usr/share/...
-	VDR_RC_DIR="/usr/share/vdr/rcscript"
-
-	# Pathes to includes
-	VDR_INCLUDE_DIR="/usr/include/vdr"
-	DVB_INCLUDE_DIR="/usr/include"
-
-	TMP_LOCALE_DIR="${WORKDIR}/tmp-locale"
-	LOCDIR="/usr/share/locale"
-
-	if ! has_vdr; then
-		# set to invalid values to detect abuses
-		VDRVERSION="eclass_no_vdr_installed"
-		APIVERSION="eclass_no_vdr_installed"
-
-		if [[ "${GENTOO_VDR_CONDITIONAL:-no}" = "yes" ]] && ! use vdr; then
-			einfo "VDR not found!"
-		else
-			# if vdr is required
-			die "VDR not found!"
-		fi
-		return
-	fi
-
-	VDRVERSION=$(awk -F'"' '/define VDRVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
-	APIVERSION=$(awk -F'"' '/define APIVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
-	[[ -z ${APIVERSION} ]] && APIVERSION="${VDRVERSION}"
-
-	einfo "Compiling against"
-	einfo "\tvdr-${VDRVERSION} [API version ${APIVERSION}]"
-
-
-	if [ -n "${VDR_LOCAL_PATCHES_DIR}" ]; then
-		eerror "Using VDR_LOCAL_PATCHES_DIR is deprecated!"
-		eerror "Please move all your patches into"
-		eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}"
-		eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable."
-		die
-	fi
-}
-
-vdr-plugin_src_util() {
-	while [ "$1" ]; do
-		case "$1" in
-		all)
-			vdr-plugin_src_util unpack add_local_patch patchmakefile i18n
-			;;
-		prepare|all_but_unpack)
-			vdr-plugin_src_util add_local_patch patchmakefile i18n
-			;;
-		unpack)
-			base_src_unpack
-			;;
-		add_local_patch)
-			cd "${S}" || die "Could not change to plugin-source-directory!"
-			epatch_user
-			;;
-		patchmakefile)
-			cd "${S}" || die "Could not change to plugin-source-directory!"
-			vdr_patchmakefile
-			;;
-		i18n)
-			# i18n-to-gettext tool removed starting with version 1.7.27
-			if has_version "<media-video/vdr-1.7.27"; then
-				cd "${S}" || die "Could not change to plugin-source-directory!"
-				vdr_i18n
-			fi
-			;;
-		esac
-
-		shift
-	done
-}
-
-vdr-plugin_src_unpack() {
-	if [[ -z ${VDR_INCLUDE_DIR} ]]; then
-		eerror "Wrong use of vdr-plugin.eclass."
-		eerror "An ebuild for a vdr-plugin will not work without calling vdr-plugin_pkg_setup."
-		echo
-		eerror "Please report this at bugs.gentoo.org."
-		die "vdr-plugin_pkg_setup not called!"
-	fi
-	if [ -z "$1" ]; then
-		case "${EAPI:-0}" in
-			2|3|4|5)
-				vdr-plugin_src_util unpack
-				;;
-			*)
-				vdr-plugin_src_util all
-				;;
-		esac
-
-	else
-		vdr-plugin_src_util $@
-	fi
-}
-
-vdr-plugin_src_prepare() {
-	base_src_prepare
-	vdr-plugin_src_util prepare
-}
-
-vdr-plugin_src_compile() {
-	[ -z "$1" ] && vdr-plugin_src_compile copy_source compile
-
-	while [ "$1" ]; do
-
-		case "$1" in
-		copy_source)
-			[[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin_copy_source_tree
-			;;
-		compile)
-			if [[ ! -f ${WORKDIR}/.vdr-plugin_makefile_patched ]]; then
-				eerror "Wrong use of vdr-plugin.eclass."
-				eerror "An ebuild for a vdr-plugin will not work without"
-				eerror "calling vdr-plugin_src_unpack to patch the Makefile."
-				echo
-				eerror "Please report this at bugs.gentoo.org."
-				die "vdr-plugin_src_unpack not called!"
-			fi
-			cd "${S}"
-
-			BUILD_TARGETS=${BUILD_TARGETS:-${VDRPLUGIN_MAKE_TARGET:-all}}
-
-			emake ${BUILD_PARAMS} \
-				${BUILD_TARGETS} \
-				LOCALEDIR="${TMP_LOCALE_DIR}" \
-				LIBDIR="${S}" \
-				TMPDIR="${T}" \
-			|| die "emake failed"
-			;;
-		esac
-
-		shift
-	done
-}
-
-vdr-plugin_src_install() {
-	[[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin_install_source_tree
-	cd "${WORKDIR}"
-
-	if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-		local mname="${P}-Makefile"
-		cp "${S}"/Makefile "${mname}.patched"
-		cp Makefile.before "${mname}.before"
-
-		diff -u "${mname}.before" "${mname}.patched" > "${mname}.diff"
-
-		insinto "/usr/share/vdr/maintainer-data/makefile-changes"
-		doins "${mname}.diff"
-
-		insinto "/usr/share/vdr/maintainer-data/makefile-before"
-		doins "${mname}.before"
-
-		insinto "/usr/share/vdr/maintainer-data/makefile-patched"
-		doins "${mname}.patched"
-
-	fi
-
-
-
-	cd "${S}"
-	insinto "${VDR_PLUGIN_DIR}"
-	doins libvdr-*.so.*
-
-	# create list of all created plugin libs
-	vdr_plugin_list=""
-	local p_name
-	for p in libvdr-*.so.*; do
-		p_name="${p%.so*}"
-		p_name="${p_name#lib}"
-		vdr_plugin_list="${vdr_plugin_list} ${p_name}"
-	done
-
-	create_header_checksum_file ${vdr_plugin_list}
-	create_plugindb_file ${vdr_plugin_list}
-
-	if vdr_has_gettext && [[ -d ${TMP_LOCALE_DIR} ]]; then
-		einfo "Installing locales"
-		cd "${TMP_LOCALE_DIR}"
-		insinto "${LOCDIR}"
-		doins -r *
-	fi
-
-	cd "${S}"
-	local docfile
-	for docfile in README* HISTORY CHANGELOG; do
-		[[ -f ${docfile} ]] && dodoc ${docfile}
-	done
-
-	# if VDR_CONFD_FILE is empty and ${FILESDIR}/confd exists take it
-	[[ -z ${VDR_CONFD_FILE} ]] && [[ -e ${FILESDIR}/confd ]] && VDR_CONFD_FILE=${FILESDIR}/confd
-
-	if [[ -n ${VDR_CONFD_FILE} ]]; then
-		newconfd "${VDR_CONFD_FILE}" vdr.${VDRPLUGIN}
-	fi
-
-
-	# if VDR_RCADDON_FILE is empty and ${FILESDIR}/rc-addon.sh exists take it
-	[[ -z ${VDR_RCADDON_FILE} ]] && [[ -e ${FILESDIR}/rc-addon.sh ]] && VDR_RCADDON_FILE=${FILESDIR}/rc-addon.sh
-
-	if [[ -n ${VDR_RCADDON_FILE} ]]; then
-		insinto "${VDR_RC_DIR}"
-		newins "${VDR_RCADDON_FILE}" plugin-${VDRPLUGIN}.sh
-	fi
-}
-
-vdr-plugin_pkg_postinst() {
-	vdr-plugin_print_enable_command
-
-	if [[ -n "${VDR_CONFD_FILE}" ]]; then
-		elog "Please have a look at the config-file"
-		elog "\t/etc/conf.d/vdr.${VDRPLUGIN}"
-		elog
-	fi
-}
-
-vdr-plugin_pkg_postrm() {
-	delete_orphan_plugindb_file
-}
-
-vdr-plugin_pkg_config() {
-:
-}
-
-case "${EAPI:-0}" in
-	2|3|4|5)
-		EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_compile src_install pkg_postinst pkg_postrm pkg_config
-		;;
-	*)
-		EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postinst pkg_postrm pkg_config
-		;;
-esac

diff --git a/eclass/virtuoso.eclass b/eclass/virtuoso.eclass
deleted file mode 100644
index 8e5d2de..0000000
--- a/eclass/virtuoso.eclass
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/virtuoso.eclass,v 1.13 2012/05/13 18:53:58 creffett Exp $
-
-# @ECLASS: virtuoso.eclass
-# @MAINTAINER:
-# Maciej Mrozowski <reavertm@g.o>
-# Chris Reffett <creffett@g.o>
-#
-# @BLURB: Provides splitting functionality for Virtuoso
-# @DESCRIPTION:
-# This eclass provides common code for splitting Virtuoso OpenSource database
-
-case ${EAPI:-0} in
-	2|3|4|5) : ;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-inherit base autotools multilib
-
-MY_P="virtuoso-opensource-${PV}"
-
-case ${PV} in
-	*9999*)
-		ECVS_SERVER="virtuoso.cvs.sourceforge.net:/cvsroot/virtuoso"
-		ECVS_PROJECT='virtuoso'
-		SRC_URI=""
-		inherit cvs
-		;;
-	*)
-		# Use this variable to determine distribution method (live or tarball)
-		TARBALL="${MY_P}.tar.gz"
-		SRC_URI="mirror://sourceforge/virtuoso/${TARBALL} mirror://gentoo/VOS-genpatches-${PV}.tar.bz2"
-		;;
-esac
-
-EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install
-
-# Set some defaults
-HOMEPAGE='http://virtuoso.openlinksw.com/wiki/main/Main/'
-LICENSE='GPL-2'
-SLOT='0'
-
-DEPEND='
-	>=sys-devel/libtool-2.2.6a
-'
-RDEPEND=''
-
-S="${WORKDIR}/${MY_P}"
-
-# @FUNCTION: virtuoso_src_prepare
-# @DESCRIPTION:
-# 1. Applies common release patches
-# 2. Applies package-specific patches (from ${FILESDIR}/, PATCHES can be used)
-# 3. Applies user patches from /etc/portage/patches/${CATEGORY}/${PN}/
-# 4. Modifies makefiles for split build. Uses VOS_EXTRACT
-# 5. eautoreconf
-virtuoso_src_prepare() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	EPATCH_SUFFIX='patch' EPATCH_FORCE='yes' epatch
-	base_src_prepare
-
-	# @ECLASS-VARIABLE: VOS_EXTRACT
-	# @DESCRIPTION:
-	# Lists any subdirectories that are required to be extracted
-	# and enabled in Makefile.am's for current package.
-	if [[ -n ${VOS_EXTRACT} ]]; then
-		# Comment out everything
-		find . -name Makefile.am -exec \
-			sed -e '/SUBDIRS\s*=/s/^/# DISABLED /g' -i {} + \
-				|| die 'failed to disable subdirs'
-
-		# Uncomment specified
-		local path
-		for path in ${VOS_EXTRACT}; do
-			if [[ -d "${path}" ]]; then
-				# Uncomment leaf
-				if [[ -f "${path}"/Makefile.am ]]; then
-					sed -e '/^# DISABLED \s*SUBDIRS\s*=/s/# DISABLED //g' \
-						-i "${path}"/Makefile.am || die "failed to uncomment leaf in ${path}/Makefile.am"
-				fi
-				# Process remaining path elements
-				while true; do
-					local subdir=`basename "${path}"`
-					path=`dirname "${path}"`
-					if [[ -f "${path}"/Makefile.am ]]; then
-						# Uncomment if necessary
-						sed -e '/^# DISABLED \s*SUBDIRS\s*=/s/.*/SUBDIRS =/g' \
-							-i "${path}"/Makefile.am
-						# Append subdirs if not there already
-						if [[ -z `sed -ne "/SUBDIRS\s*=.*${subdir}\b/p" "${path}"/Makefile.am` ]]; then
-							sed -e "/^SUBDIRS\s*=/s|$| ${subdir}|" \
-								-i "${path}"/Makefile.am || die "failed to append ${subdir}"
-						fi
-					fi
-					[[ "${path}" = . ]] && break
-				done
-			fi
-		done
-	fi
-
-	eautoreconf
-}
-
-# @FUNCTION: virtuoso_src_configure
-# @DESCRIPTION:
-# Runs ./configure with common and user options specified via myconf variable
-virtuoso_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	# Override some variables to make tests work
-	if [[ ${PN} != virtuoso-server ]]; then
-		[[ ${EAPI} == 2 ]] && ! use prefix && EPREFIX=
-		export ISQL="${EPREFIX}"/usr/bin/isql-v
-		export SERVER="${EPREFIX}"/usr/bin/virtuoso-t
-	fi
-
-	econf \
-		--with-layout=gentoo \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-shared \
-		--with-pthreads \
-		--without-internal-zlib \
-		${myconf}
-}
-
-# @FUNCTION: virtuoso_src_compile
-# @DESCRIPTION:
-# Runs make for specified subdirs
-virtuoso_src_compile() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	base_src_compile
-}
-
-# @FUNCTION: virtuoso_src_install
-# @DESCRIPTION:
-# Default src_install
-virtuoso_src_install() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	base_src_install
-}

diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass
deleted file mode 100644
index 3748ba6..0000000
--- a/eclass/waf-utils.eclass
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.13 2012/07/20 01:37:43 vapier Exp $
-
-# @ECLASS: waf-utils.eclass
-# @MAINTAINER:
-# gnome@g.o
-# @AUTHOR:
-# Original Author: Gilles Dartiguelongue <eva@g.o>
-# Various improvements based on cmake-utils.eclass: Tomáš Chvátal <scarabeus@g.o>
-# Proper prefix support: Jonathan Callen <abcd@g.o>
-# @BLURB: common ebuild functions for waf-based packages
-# @DESCRIPTION:
-# The waf-utils eclass contains functions that make creating ebuild for
-# waf-based packages much easier.
-# Its main features are support of common portage default settings.
-
-inherit base eutils multilib toolchain-funcs multiprocessing
-
-case ${EAPI:-0} in
-	4|5|3) EXPORT_FUNCTIONS src_configure src_compile src_install ;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-# Python with threads is required to run waf. We do not know which python slot
-# is being used as the system interpreter, so we are forced to block all
-# slots that have USE=-threads.
-DEPEND="${DEPEND}
-	dev-lang/python
-	!dev-lang/python[-threads]"
-
-# @FUNCTION: waf-utils_src_configure
-# @DESCRIPTION:
-# General function for configuring with waf.
-waf-utils_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	# @ECLASS-VARIABLE: WAF_BINARY
-	# @DESCRIPTION:
-	# Eclass can use different waf executable. Usually it is located in "${S}/waf".
-	: ${WAF_BINARY:="${S}/waf"}
-
-	tc-export AR CC CPP CXX RANLIB
-	echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr --libdir=${EPREFIX}/usr/$(get_libdir) $@ configure"
-
-	CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \
-		"--prefix=${EPREFIX}/usr" \
-		"--libdir=${EPREFIX}/usr/$(get_libdir)" \
-		"$@" \
-		configure || die "configure failed"
-}
-
-# @FUNCTION: waf-utils_src_compile
-# @DESCRIPTION:
-# General function for compiling with waf.
-waf-utils_src_compile() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local jobs="--jobs=$(makeopts_jobs)"
-	echo "\"${WAF_BINARY}\" build ${jobs}"
-	"${WAF_BINARY}" ${jobs} || die "build failed"
-}
-
-# @FUNCTION: waf-utils_src_install
-# @DESCRIPTION:
-# Function for installing the package.
-waf-utils_src_install() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	echo "\"${WAF_BINARY}\" --destdir=\"${D}\" install"
-	"${WAF_BINARY}" --destdir="${D}" install  || die "Make install failed"
-
-	# Manual document installation
-	base_src_install_docs
-}

diff --git a/eclass/xfconf.eclass b/eclass/xfconf.eclass
deleted file mode 100644
index ac6d46e..0000000
--- a/eclass/xfconf.eclass
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.43 2012/09/02 07:58:15 ssuominen Exp $
-
-# @ECLASS: xfconf.eclass
-# @MAINTAINER:
-# XFCE maintainers <xfce@g.o>
-# @BLURB: Default XFCE ebuild layout
-# @DESCRIPTION:
-# Default XFCE ebuild layout
-
-# @ECLASS-VARIABLE: EAUTORECONF
-# @DESCRIPTION:
-# Run eautoreconf instead of elibtoolize if the variable is set
-
-# @ECLASS-VARIABLE: XFCONF
-# @DESCRIPTION:
-# This should be an array defining arguments for econf
-
-AUTOTOOLS_AUTO_DEPEND=no
-
-unset _xfconf_live
-[[ $PV == *9999* ]] && _xfconf_live=git-2
-
-inherit ${_xfconf_live} autotools base eutils fdo-mime gnome2-utils libtool
-
-EGIT_BOOTSTRAP=autogen.sh
-EGIT_REPO_URI="git://git.xfce.org/xfce/${MY_PN:-${PN}}"
-
-_xfconf_deps=""
-_xfconf_m4=">=dev-util/xfce4-dev-tools-4.10 ${AUTOTOOLS_DEPEND}"
-
-[[ -n $_xfconf_live ]] && _xfconf_deps+=" dev-util/gtk-doc ${_xfconf_m4}"
-[[ -n $EAUTORECONF ]] && _xfconf_deps+=" ${_xfconf_m4}"
-
-RDEPEND=""
-DEPEND="${_xfconf_deps}"
-
-unset _xfconf_deps
-unset _xfconf_m4
-
-case ${EAPI:-0} in
-	4|5) ;;
-	*) die "Unknown EAPI." ;;
-esac
-
-[[ -n $_xfconf_live ]] && _xfconf_live=src_unpack
-
-EXPORT_FUNCTIONS ${_xfconf_live} src_prepare src_configure src_install pkg_preinst pkg_postinst pkg_postrm
-
-# @FUNCTION: xfconf_use_debug
-# @DESCRIPTION:
-# If IUSE has debug, return --enable-debug=minimum.
-# If USE debug is enabled, return --enable-debug which is the same as --enable-debug=yes.
-# If USE debug is enabled and the XFCONF_FULL_DEBUG variable is set, return --enable-debug=full.
-xfconf_use_debug() {
-	if has debug ${IUSE}; then
-		if use debug; then
-			if [[ -n $XFCONF_FULL_DEBUG ]]; then
-				echo "--enable-debug=full"
-			else
-				echo "--enable-debug"
-			fi
-		else
-			echo "--enable-debug=minimum"
-		fi
-	else
-		ewarn "${FUNCNAME} called without debug in IUSE"
-	fi
-}
-
-# @FUNCTION: xfconf_src_unpack
-# @DESCRIPTION:
-# Run git-2_src_unpack if required
-xfconf_src_unpack() {
-	NOCONFIGURE=1 git-2_src_unpack
-}
-
-# @FUNCTION: xfconf_src_prepare
-# @DESCRIPTION:
-# Run base_src_prepare and eautoreconf or elibtoolize
-xfconf_src_prepare() {
-	debug-print-function ${FUNCNAME} "$@"
-	base_src_prepare
-
-	if [[ -n $EAUTORECONF ]]; then
-		AT_M4DIR=${EPREFIX}/usr/share/xfce4/dev-tools/m4macros eautoreconf
-	else
-		elibtoolize
-	fi
-}
-
-# @FUNCTION: xfconf_src_configure
-# @DESCRIPTION:
-# Run econf with opts from the XFCONF array
-xfconf_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-	[[ -n $_xfconf_live ]] && XFCONF+=( --enable-maintainer-mode )
-	econf "${XFCONF[@]}"
-}
-
-# @FUNCTION: xfconf_src_install
-# @DESCRIPTION:
-# Run emake install and install documentation in the DOCS array
-xfconf_src_install() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	# FIXME
-	if [[ -n $_xfconf_live ]] && ! [[ -e ChangeLog ]]; then
-		touch ChangeLog
-	fi
-
-	base_src_install "$@" || die
-
-	prune_libtool_files --all
-}
-
-# @FUNCTION: xfconf_pkg_preinst
-# @DESCRIPTION:
-# Run gnome2_icon_savelist
-xfconf_pkg_preinst() {
-	debug-print-function ${FUNCNAME} "$@"
-	gnome2_icon_savelist
-}
-
-# @FUNCTION: xfconf_pkg_postinst
-# @DESCRIPTION:
-# Run fdo-mime_{desktop,mime}_database_update and gnome2_icon_cache_update
-xfconf_pkg_postinst() {
-	debug-print-function ${FUNCNAME} "$@"
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-# @FUNCTION: xfconf_pkg_postrm
-# @DESCRIPTION:
-# Run fdo-mime_{desktop,mime}_database_update and gnome2_icon_cache_update
-xfconf_pkg_postrm() {
-	debug-print-function ${FUNCNAME} "$@"
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}

diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass
index 4723278..6dd3146 100644
--- a/eclass/xorg-2.eclass
+++ b/eclass/xorg-2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.58 2012/08/14 06:34:16 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.59 2012/09/27 16:35:42 axs Exp $
 
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:

diff --git a/games-engines/gargoyle/Manifest b/games-engines/gargoyle/Manifest
index 61af677..bf5034b 100644
--- a/games-engines/gargoyle/Manifest
+++ b/games-engines/gargoyle/Manifest
@@ -2,6 +2,6 @@ AUX gargoyle-2011.1-desktopfile.patch 1265 SHA256 b9f0eba5af34a7703c2d3bd38e216f
 DIST gargoyle-2010.1-sources.zip 10771623 SHA256 1646565625cf963bf27f0cbe91735523e1c83ea2d49bef9ff534c1ac78aa7e1d SHA512 45a24eae5b02864e8e0df2833ff53cc8aad28aed8e404bb6dd95caa48c9522989196b60b9d70702af4d5e0f7bc06af48e8067dc0580fd23d8612513305b72079 WHIRLPOOL 5cc4e2018c58b1080c5338981ea3543b45adc8bff6b7e3e6546387ad29c63dec978eddd048ccd484628645d274394ca3735c1bb1c617e691dd05787c0cb7b248
 DIST gargoyle-2011.1-sources.zip 11291660 SHA256 8642ac38add31d47bfd531d4121dc1e956d06895a9352ce573b5007e9cae4634 SHA512 65159580cf3494944f841c44320135580557258e37ad5523ae3ea30555c19834a2793231a8e42c217e5c1d055d50ed6a20d372d6302e880a2818bc4ea59b226f WHIRLPOOL 19e572d52ec6436c5b41d767e45d509bd965a0d4009b4445db08e79125eabb20636374bbb818ef7115a1ca9ac983a29cb2eaa3848a22e17d5e7d26284200b86f
 EBUILD gargoyle-2010.1.ebuild 3220 SHA256 ba682b03bb416431f7a220262b25d9e6f4e75e77b6ad8294b4115dcfe551e242 SHA512 3ab099b26177bf2e709e52712a48b3542b17232582397612c9df8c9c53868d599944c78d3bfd496fc014eb0774f43249fd50cabe8be9a1e39542d3ac3f0f712e WHIRLPOOL e365537f7971d06f2d17ca9de759fe10fd30f41d3ead9564f55f5b8385f362ef9c37f3c5716310286780f0e74dc894125f15e7d4348675ad395c6d34ec6036e7
-EBUILD gargoyle-2011.1.ebuild 3266 SHA256 2bad9563e69815d05e0e75f233cce0d2ea0e5e449134e5532a61ff65bfb6626c SHA512 0912d8a9081e760a5b3d962466eebe4f527296152797c2fd98f7931773954b2c2b57a8f7897f6746dd42759e15165e3e499ea9e9a9801b887b6a98c19ded9fe6 WHIRLPOOL 0339e3e524b7263a0c4a9142c3fbca8444b9dbb0ba3e9c86a9b53d8a12c7a9f08176f15a195e25c69adc6b1e60636d8a68becbe51a998d7d263b3dfe3331c571
-MISC ChangeLog 3705 SHA256 1f38e280fb7f599d98724f1bca0610a2a9ce825f2e2dc98f53c514e682a10a90 SHA512 822e1c19bcbe367076702524a089443d6b88024d8d5a524fa151ee126c7c781f9ea29c69a7f3f0d6c62180404c5597146966647ddc8abe3a6643c36e071920c9 WHIRLPOOL 3852491b213f84b3889b70f18c201ddb049fb84a0fd2268b627d4876ca75192b65635db0c832314069c6113c50a0e4b7ddb8c1842d4fddc033089a32ca6872e6
+EBUILD gargoyle-2011.1.ebuild 3272 SHA256 04f54722f2a0ec889072edecfaed7238c8ab33e13bfbd737dd7f5d018bb416d9 SHA512 d4052dceeada46378a9d623cf6d6d794cf367578bcc8bfb439ddd46220ab64c35ae762d9eebb4259c6afbdf61662784b7c194bc406fdeb89f9bfcbd66668a8a6 WHIRLPOOL 96b271c2a1b88ec8c5ad590f1925249d65d095ea6d431daac8cc2ac8bb59364f39c13d7beaeae5f258c7c31f3f9729daf508e152866e7f37828c48ddae715034
+MISC ChangeLog 3820 SHA256 abe70fa0d4472e382d61d149e5b8ac402bfc7baf4780b6403fbf841390c2da63 SHA512 79dc28fa09621572eef8632fd2ee5ad14d8b9f3d8973442fbd14f415133b9d266aefd14185ff09b774cd2435c8d37242d20dda7db55551c29ff30d3d4df40954 WHIRLPOOL 29afd4181259c9068f8d06e939123f0dcc494d45c5b07f5823758ab79b29074f5a714f619d9c9e153ce7c7d0d60a9064e66897f699468271958e0d4bda9cea19
 MISC metadata.xml 331 SHA256 51cc1262568afa65da7057a6ff1799d5e09251f97eb7d15c4708b8140aa5993d SHA512 d7dd2d4155c4c41730c9e03d51239c275458d82e0ca3448aa54078937cbaef3256f599ef47fb5ee50c6f2cb3734270de9dc0face1e7444bd7c67a459ce4c41f1 WHIRLPOOL 0c2e76db27725d24fd24685f56305949a1fef04f87c5e0db8ebe5bd88e16a73b4d16b9109d3237a1968f466d36d3bc7660e03cecc2f9f8d479e4138ed38ee8f9

diff --git a/games-engines/gargoyle/gargoyle-2011.1.ebuild b/games-engines/gargoyle/gargoyle-2011.1.ebuild
index d75626a..839d0e7 100644
--- a/games-engines/gargoyle/gargoyle-2011.1.ebuild
+++ b/games-engines/gargoyle/gargoyle-2011.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/gargoyle-2011.1.ebuild,v 1.6 2012/08/22 18:05:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/gargoyle-2011.1.ebuild,v 1.7 2012/09/23 08:54:41 phajdan.jr Exp $
 
 # Regarding licenses: libgarglk is licensed under the GPLv2. Bundled
 # interpreters are licensed under GPLv2, BSD or MIT license, except:
@@ -18,7 +18,7 @@ SRC_URI="http://garglk.googlecode.com/files/${P}-sources.zip"
 
 LICENSE="BSD GPL-2 MIT Hugo Glulxe"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="

diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 6e7c629..7327ca5 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -5,6 +5,6 @@ DIST FlightGear-data-2.8.0.tar.bz2 685330156 SHA256 ad9ba1d12b5c771193561d452ec3
 DIST flightgear-2.4.0.tar.bz2 1909473 SHA256 3f2fdad171b86746b0dfa67510aabfb0c24731951a6d5646c6f0a4f98f01dbe1 SHA512 e1a2618891606f16d35db501cc7f08f226fb53da25a669f0b426fbec84a36538b483c7178dbdc35f988f0b0344d3dbd7c403601afcdba6d465255f827fc4a8f0 WHIRLPOOL b7c5f1585693b9d74e18c4ded6a21fb8db18e6083450a4956c17cc6710c94cf56c25759aff947f5d1c0b20b6c2adbfc61c4814f7c0586c513f1dc9734ff036cc
 DIST flightgear-2.8.0.tar.bz2 2311023 SHA256 bfda4f269d90128f4e4cb828de692a49dc0b93db41fe20a2b5272f3f271f3a01 SHA512 4d9b2584dd7c2fa4ad28d9769a9429809e420c7bf858967a5bb461f8ecb78dd079ff01c78febb95b7c3edce40dbf01e077bf7423324958e0b0a3cc74df12e1c1 WHIRLPOOL 615467c08d7b5f4f9e85d8248359452f2b9dc438e2184a7f8d126e57369f9b5d16b49c3779f0f58915236435f83610b3c76671cf049e5dffcb9428cd4bf82823
 EBUILD flightgear-2.4.0.ebuild 1477 SHA256 4c1ecebbd0c97aa443a68515f9fbe455e1edd58b455985e0e2ff769dcba66ddf SHA512 ddb19d194cdbb2b5aff0b81350993506495d63c6f6ae80379753bc5d281bf99205d9497beca9d59a2620107a53516e2baf7eee0165d1a1190fb4e95f9d07e9d9 WHIRLPOOL 153c84f2ec6d1cb7d0730b00b15f6f1d122a53d7ebf012a62163994f59866b92f18e782ee76e2d4e46e372d7c17184ac2ae57449707184d8b265d34d19b7702e
-EBUILD flightgear-2.8.0.ebuild 2038 SHA256 ed0cb3911c0f81ac41c641b6a49510ea4a2eaefce758c72ca648528f74a3c682 SHA512 ccb7326be33e8e5f2307313a296f572f60968dafd44dd72219ed6cb1c90ed26e801b5c6644638a03a304f29e9d514fc6458472191653ed68387b29f92b0a5367 WHIRLPOOL e566e92902cba3607fd902a76749781802e9eed8bd1967beafb9aef212ed89f8ae363acbfd8fa402c88bee581ce079dd85b901eb6b942ba185a307d07ff462b7
-MISC ChangeLog 9894 SHA256 2a2da9507a638295d61cb5f594d450448d25e21125c5940f1fa49d4ebdab872c SHA512 a78a377bb03831fe394f0f7e9b0608de3220290f0a5d55d484c2f0d857819e999b33b4cb9fa68c5002446e2026f35a14a2e1006f5cee32f00ab85a1ca9c5dc4f WHIRLPOOL dde452f0982fd5b88b2cc409bb97c0acd9f31e68b7b4e2f44c53a6fd1cbc6c02e0ec057c0629f1e0372d08fbbea2513442fc2b1a8b625fc44c06ffc57bb9f64f
+EBUILD flightgear-2.8.0.ebuild 2032 SHA256 35a0d1a2b8bb0feeb58c3f572668f5cec73b7de4a6c4bdc7b03ceece9ec8ca4f SHA512 197393772e19d52bd61f9700ada52d46e75ffcf4a7b6b46a4bd59bece3645a4b3dd046b752bba628b652eae7df0a3c83078380087eb9f19b90b3d3af66f9abe3 WHIRLPOOL c46524143806606c2d27cf070dcbdbc457347044d3dfa773a55f3eaf78a858401f6ccb681a22659655db0fba8eb267b4d10d4136d6f3a362d80cf773b2fddcfc
+MISC ChangeLog 10000 SHA256 967b40099b105570fd402a28a67a0c41d2c8d12359093e91940e8a0506e0b353 SHA512 b0daf9172e7144625233c6bd836237d3c7221c89cad4d644ac864a5af150fb16651a6685848c86ca16c43ed7035ee79da17493defe70c5f9470250c5a7ef6d12 WHIRLPOOL 49edecb8836b66187efc22e8cd1bc99e84fd3f999ca9b03e97b6c2e7b146a35b285c6c99b4a1ebaa8db17952732006cd295caff489eaac03913423cfb431f0a6
 MISC metadata.xml 786 SHA256 6a829fc8b295a3a8b45b1fefadba9a147cd08b6f68a9cf7b876910c501ef9a55 SHA512 5b815f6b9b25ac3448021d94298a526dc9ac5a54faff1f133debc8f299ffcc0720d5f9bdd26d8af7468e1f03fb141f21ed063ede3414ae2b1b0934615aef2622 WHIRLPOOL 4dc0a5b6c6f4bb7466d7392f0e72dba0bac6709532abd3ae78efedd572edbdc9bcfc52fc5164b83fd161561915abaea9502f28f36bef2cbdcbbb498c0880634a

diff --git a/games-simulation/flightgear/flightgear-2.8.0.ebuild b/games-simulation/flightgear/flightgear-2.8.0.ebuild
index a6b73f8..689580f 100644
--- a/games-simulation/flightgear/flightgear-2.8.0.ebuild
+++ b/games-simulation/flightgear/flightgear-2.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-2.8.0.ebuild,v 1.2 2012/09/03 20:11:18 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-2.8.0.ebuild,v 1.3 2012/09/22 21:26:14 ago Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://flightgear/Source/${P}.tar.bz2 mirror://flightgear/Shared/Flig
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="debug jpeg +jsbsim larcsim subversion test +udev uiuc +yasim"
 #fgpanel - disabled for now, doesn't link
 #fgpanel? (

diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index d3593c6..3791203 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -1,8 +1,11 @@
-DIST feh-2.5.tar.bz2 2227722 SHA256 529a6a349bfec87a8a07b17752686149b702cf2468ac56d7306b2f0400f077aa
+AUX feh-2.6.2-debug-cflags.patch 197 SHA256 77a833f28852c3ad6b0fbd03ce93098f31efd3ecdaf9a50a14e3d0b032b04873 SHA512 eb09a90a9ff3ba2ae7a40c8ef9e5b361d42bb045e194ddb5823111d780da265371ee087c6f80963d80f5cd1d0427478f46fec9b0f0607ad2bb122415a9c2e397 WHIRLPOOL 6a95e12ea4c3fc4a4f552740527155437df6a3a4ba0e848bc976de3c9b985f3dbaa5f43016bfa4444647d1253760531b9de10d5bf2c5176383e3b57d5b5e3fe7
+DIST feh-2.5.tar.bz2 2227722 SHA256 529a6a349bfec87a8a07b17752686149b702cf2468ac56d7306b2f0400f077aa SHA512 0371185612ad052bd74b9056c2820b60a9529727130910abb55e7df1f2440fe00f1e04448428cf2c33624c467b486c6c66528d5dc116fef92cd6e879f28c77f6 WHIRLPOOL 9373d85815c237f41393bf00351a16bc3f824dbe98298ceb56f69b941e5cf34376ce20ff213a0f419283c873c81ba7504ec21299aff14dceeb6ad85711bb8cfd
 DIST feh-2.6.1.tar.bz2 2238724 SHA256 36edacec2f8d0d13035202e68f09ccf5d2ee5dc1d95157e8ee6bcde9c0a5283a SHA512 821fd1a5965cc66c1fe74f14b3dbf059379504c0d2d85b0299505c9616dfe340e61e07efc7b9317b9a556d687f9059c628b0afc738acee3c634aad2f9a097266 WHIRLPOOL 785b74065958757026f8e0775194cf3ae77f817058cc0b35179f002e7ea3e51c07006b8a3371c48f5b70979a13a81a298a35fd9a69b78ad401d962a0ef78ef1e
+DIST feh-2.6.2.tar.bz2 2239073 SHA256 6758b68ec133bbedc3373966129a521f35dea2f354ed6a571dbe7a9bd4ddf5ca SHA512 4a4f7d905bd922857e08b4422f8c5b019c9e62cb56022f0c29dabec1ca60ccab4b0f73387d782962aef8bbcd3d37f86d5e287f329e40fb4edfc3e5cc3edfe499 WHIRLPOOL 63f6df47197f0d546d64167554333622bc70d858be229e5bbd9182a33b6e3dd7afc4af3629c139f2ba25c4e65f6d1ab92c8f666f5fe1e18a5e2d7363d1c5fe5e
 DIST feh-2.6.tar.bz2 2238237 SHA256 172e248a2f2f2b87652598823a3bc51058ea9d4f0378e6900723bfa34e345e7c SHA512 34da10440843ee55a5a3e35de33bdb47e868c9f4081772bb53c012eedd64f02ba28eb646d6e5efa61b4e5462d3c5d035ccb02becce2604fb4f6bcf71ff76a461 WHIRLPOOL 62879c942c2de155451c24d05cb21456b24f0b7052545e665b43c287a8524e17c48739d74e99b5ff66ccaa2c53505971fc8df75234b0fa61790a6d8a958cbf09
 EBUILD feh-2.5.ebuild 1251 SHA256 da2b5db2db2187233c5225146767618a13aeb7ac79047d2fe47f8384e054d2b6 SHA512 23f70609da7b632f5f991bf8a760e3514ce467ff3e50fbf04e627c3caea909e6fbdd0026dfe73edf82927225ceef4cff4673c82d2f10cc48084ad6331ba1bd04 WHIRLPOOL c68c49b2f446795a420615bb4eb0e8e3268dbe5c675fcd50460be9f2490a0409faddca34743de7bc131e16f58a917ff863f682531b93e8f7d805fada4e981e9a
 EBUILD feh-2.6.1.ebuild 1341 SHA256 04fa8ff4df95c21e135e976cddff50706cb1f2a12bc0d101070c96998976c0d8 SHA512 9d540a5801fd6e6bfa9d874ba0551f17c47266eee4a4a275cb34448d2952a878e54ae9182de1676043fd69c1a169544ce46cf90da02b73fe9515ec9b9221c6d5 WHIRLPOOL 5bb44802d4574b9fbf625c846c7e3f2fcd7948d253986301ec251a54bb903550180486901b9f3133ebe13c9506242d2fc67a542f719b529c309746851d80e625
+EBUILD feh-2.6.2.ebuild 1403 SHA256 df2a7819c00e50d8e85c1d1cb02e183d7a9c4b68e1b884c9f30b133a4ef2d935 SHA512 1a4ef4a0ed671062d36eae9faf85d5786876c57d703c7df39fdecb9510e2a4139754de9cc83db25e73a8c213776c952f4eedc4045b4e37b2529395d1148d1028 WHIRLPOOL ba4aa4e34ae030d91aee835576768006c266a76d5ede09fbf8973fd72e7950de147cf49bc20f16e518970f0fa1fd68b7e82aaebe47b3eda59cc0762abb018c18
 EBUILD feh-2.6.ebuild 1338 SHA256 4c717c2915394fe49ae95bcb9c1a1c7a7ce51d62a7bee003088384729439e1c8 SHA512 0a6959537d67c458137f4183096754347d272fe3ef04fab8f68c409e0ab0fb6f264b019754ab6bd856259b61be188eec6906926094fcf23838f3b0169a9bffa6 WHIRLPOOL ef683bb7de476dc2fcc337860af41a9b0d819176097e954a3c81dcff546989ac66980838f70037a16078930837de021cd9b8381df97461192c694d4a41770a61
-MISC ChangeLog 12975 SHA256 373f78fd377a7cad4443dcde28b9c20fb80060b9f657b39cd48ab5065f8510ce SHA512 e9f9e79eed0fd6b6252a40b87aeab905f8a8e59985c5968580fc5a3a5c4223d05908f4ca5799a025f39b472f5eb3b17ded460dc40f7077762424e0926edfa969 WHIRLPOOL 74e3c6f8762b09280e751f41bcf6598706c2540d1fbd6bd70c38699d681771811b689aebd0b7ed478b7e140af3686c8112340a4eeb3d791ee54d6eab43dacd94
+MISC ChangeLog 13125 SHA256 0ca39dde52dfab232b9765889e299ee8a50fef270b1c311ce28de9874cf4e598 SHA512 ea966d2eeb5083d822eaf8ea618bd14a69a10ddc003596be6023afa824157c38b100f13172cf4c580b6161a34327cdb69a441de9f2942b8004d1adee55314f23 WHIRLPOOL 5b5abc5569e4aa1e200dfa377b3909d53cf696a8553fcde7f090eb90cca9ff07fcc3bda96cd036262ba145a0087a0c0afff639dbf95214d493ba8f7b2b0023fd
 MISC metadata.xml 357 SHA256 91c6ea742ef1f0bf7cf47634ccb91eadcb32624c300f782511121d7420e322bd SHA512 db8eb56cb6d97712ca557dacd10c8705058cfdae7a3136721606096580c89bf3199575ddae0e0b37389885e98abd60946ef106ec9e5f392091a965705f8f6719 WHIRLPOOL c703225cac865456c5c63d7d777dc04df9e556bb7661fe4137fbfafab65bc76c7a6e9b7ca7e12aef184d521cc22a2123f4abdb178241d3fcf27ef6c3773696df

diff --git a/media-gfx/feh/feh-2.6.2.ebuild b/media-gfx/feh/feh-2.6.2.ebuild
new file mode 100644
index 0000000..f7d0493
--- /dev/null
+++ b/media-gfx/feh/feh-2.6.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-2.6.2.ebuild,v 1.1 2012/09/26 22:18:24 radhermit Exp $
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A fast, lightweight imageviewer using imlib2"
+HOMEPAGE="http://feh.finalrewind.org/"
+SRC_URI="http://feh.finalrewind.org/${P}.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="debug curl exif test xinerama"
+
+COMMON_DEPEND=">=media-libs/giblib-1.2.4
+	media-libs/imlib2
+	>=media-libs/libpng-1.2:0
+	x11-libs/libX11
+	curl? ( net-misc/curl )
+	exif? ( media-libs/libexif )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+	virtual/jpeg"
+DEPEND="${COMMON_DEPEND}
+	x11-libs/libXt
+	x11-proto/xproto
+	test? (
+		>=dev-lang/perl-5.10
+		dev-perl/Test-Command
+		)"
+
+# requires the mandoc utility which we don't have at the moment
+RESTRICT="test"
+
+pkg_setup() {
+	use_feh() { usex $1 1 0; }
+
+	fehopts=(
+		DESTDIR="${D}"
+		PREFIX=/usr
+		doc_dir='${main_dir}'/share/doc/${PF}
+		example_dir='${main_dir}'/share/doc/${PF}/examples
+		curl=$(use_feh curl)
+		debug=$(use_feh debug)
+		xinerama=$(use_feh xinerama)
+		exif=$(use_feh exif)
+		)
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-debug-cflags.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake "${fehopts[@]}"
+}
+
+src_install() {
+	emake "${fehopts[@]}" install
+}

diff --git a/media-gfx/feh/files/feh-2.6.2-debug-cflags.patch b/media-gfx/feh/files/feh-2.6.2-debug-cflags.patch
new file mode 100644
index 0000000..a4a71ac
--- /dev/null
+++ b/media-gfx/feh/files/feh-2.6.2-debug-cflags.patch
@@ -0,0 +1,11 @@
+--- feh-2.6.2/config.mk
++++ feh-2.6.2/config.mk
+@@ -32,7 +32,7 @@
+ endif
+ 
+ ifeq (${debug},1)
+-	CFLAGS += -DDEBUG -O0
++	CFLAGS += -DDEBUG
+ 	MAN_DEBUG = . This is a debug build.
+ else
+ 	MAN_DEBUG =

diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 86ebd9b..5f4752e 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -3,6 +3,8 @@ AUX graphite2-1.0.3-no-test-binaries.patch 620 SHA256 c51a69ed5e8ff6301d35aa97ca
 AUX graphite2-1.1.0-includes-libs-perl.patch 685 SHA256 da7a24551fa9029214a909ae6a49070c12f889eae287ce2c392555b0299db32e SHA512 b041b81fd6cb787305ff2b08e32a99c2977b1c456c9f95e5909ade203403ac1f88d4ed88bd76e2062ef0149ce3d1256c254546e4dda14eaf808c17b8700570b1 WHIRLPOOL 284ba0607dc65d6c9eb4b0fd1ddeed45600be48cb3a1478f3f931b4cbdd0b41a3e4029ee5812f6d4f391fe5521af5242c0389691f3facb591d77eaf9f20f5fa1
 AUX graphite2-fix_wrong_linker_opts.patch 760 SHA256 95c943e57043f7368c44e1cd5fbadd5fabeb91ba4799072d1ffc2ef8d818454d SHA512 d194041213a439a50a58edd699d17e0c07bb4b2bb65dcc969e6f551187207763a151db25b116f2809a54b13bbc8b1cd8621187fa30ee46fc42fa324c0718e1d6 WHIRLPOOL bdf27de3672958af7b256b01d2d86b332bcc665fc786f67df038cbc6ecfe6a664480e7dfdbd6adbf88452af3095a0deae0b8b0aa93e0664d4e164647cea8b37f
 DIST graphite2-1.1.3.tgz 3680838 SHA256 0eb19282a1941bdd5e6d7165718c5d4692d62bac6c1eea56d9e522715cb144f7 SHA512 0e7c29f4a8421c937ee5255c0708a60fdb903272c3084d18185d4910e9b527751ed44d8d6ac3c64a13e3093ac51137ddc7b6f7beac60be5952fd473b750d21a6 WHIRLPOOL 995a4b0b1c040c95d0c2ca07c8c98d2673ba1d93d892f7166523cfdb8a502ff2214c38317107b849d7675f815c0b80fa0eb74588687a565fa1acd1726bf1059d
+DIST graphite2-1.2.0.tgz 4663935 SHA256 630fba251c7e570f2b0c4a0c63a7abb4d45b0246d390f53188b1a9b73de7b96e SHA512 56b88e1665f4aa7316ec4b3975dd5aa24b4420bbb86991ade0130f28c082c9121f651a351cffa893f32b1fc28085315c7b7521a9976eacd066e34bc54febdd21 WHIRLPOOL 8a679b9455cafb5bd2ca6d460bca5ea004191e81d353e38c6712c364b2e0334581d59c578e956bdd3317af0ca3a1d8d62c0f676bb768fe37065e9c972e944901
 EBUILD graphite2-1.1.3.ebuild 1945 SHA256 de8820b272e702286edeb37cd07c18b087d09b0df82dcaa5d35b4421ede3ef8b SHA512 a9b27f37a894329dde64fe6704cb270b264fe70f8de81d0b8c3801889ff8210fe08122cd51bedf16f874f8509535de912275ddc6a73c905846f9de9cd2545a9e WHIRLPOOL 26808d387a986e245417e11f86f4a5d796b1480c2f62e72b66facd8b2f5ad2bdc99c75629caecf8e51ef86608a9c325ac523ed9fd4de5ce47b886aca2aec26b3
-MISC ChangeLog 5864 SHA256 2d31bc7f5df390d8806b62b2358e68b174ec2f6f05af174c7edfd64fb4d72e32 SHA512 55eb7f9898b9339bceed7fbc4a2396b2cb4c7064da9cc55ab2b0b0480d7ee432234c678ca263fd18a427dd54e95a2c896212eeae626f5f13cd30a2125e68f7be WHIRLPOOL d661da3cbe1d8c8a35eeb43f2ad16200d10d0264c2bee82148a1485a7190bb80acef01213a800f3aebb5dc52956e4c63f79d7a2f15fc227cb7426675898e95e3
+EBUILD graphite2-1.2.0.ebuild 1895 SHA256 a694dcf494af127a267dc73acb6992432835913bccfdf881008e97af70f9cbc5 SHA512 8eae6de05732f91954efdadcbd582b3c4bafb47dd0f9201e39597499fd3dcb819fdf2e36dc987a8031a098389dda7b9d1873c5f76d502f89c179512ec1248c11 WHIRLPOOL 2c37e9718dff45d8293b2f53633142362aeb9b1c437b06be16b528b48818c2e886aa700de717676423806f5b1b2963b1e60d984823ef4a1f3c2a2c6fb19ab2eb
+MISC ChangeLog 6011 SHA256 8ef34f70ebe080f95d535deb4b05b7432bebe83f3144fb7b84cef380f6fbc200 SHA512 0b39f8e7218b59006b6543318e8c7b6eb7bf8ad863f96bc041fb3d243a4f40b0be19de87f9912761e16bbded4840277860bdd8f62d744a4c89342abdcca2c9d5 WHIRLPOOL c83efb6bb6e1aced1dfb2355fb1cb6e092b3c77fd663f4352eeec27b040f70a0f55296cb149f16f50ee01d0f41b60e57fdf1177018601d9330e1f6b42d19d994
 MISC metadata.xml 163 SHA256 4539da09a369d01dcec488c471eeaaef71b60686482101eba357344538e994e2 SHA512 44b0091513637625b4b535bbe66410dde135890a60411dcdffc2cfd1750b840bc9655c90b032612ff41499007f45db7bbff28d0874e287ae7411230eea9e0446 WHIRLPOOL 142e95052e96ae05c79dc2e03bb300cc5fcf9a4fa751a55f1f85cad7ab1e597d21acec98517bf92d28a44742b98c7ff0756b660b8e7a86f77e15ed94b6e183a8

diff --git a/media-gfx/graphite2/graphite2-1.2.0.ebuild b/media-gfx/graphite2/graphite2-1.2.0.ebuild
new file mode 100644
index 0000000..2430048
--- /dev/null
+++ b/media-gfx/graphite2/graphite2-1.2.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-1.2.0.ebuild,v 1.1 2012/09/25 13:56:58 scarabeus Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="test? 2"
+GENTOO_DEPEND_ON_PERL="no"
+inherit base cmake-utils perl-module python
+
+DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems"
+HOMEPAGE="http://graphite.sil.org/"
+SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="perl test"
+
+RDEPEND="
+	perl? ( dev-lang/perl )
+"
+DEPEND="${RDEPEND}
+	perl? ( virtual/perl-Module-Build )
+	test? (
+		dev-libs/glib:2
+		media-libs/fontconfig
+		media-libs/silgraphite
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.0-includes-libs-perl.patch"
+	"${FILESDIR}/${PN}-1.0.2-no_harfbuzz_tests.patch"
+	"${FILESDIR}/${PN}-1.0.3-no-test-binaries.patch"
+)
+
+pkg_setup() {
+	use perl && perl-module_pkg_setup
+	if use test; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	base_src_prepare
+
+	# fix perl linking
+	if use perl; then
+		_check_build_dir init
+		sed -i \
+			-e "s:@BUILD_DIR@:\"${CMAKE_BUILD_DIR}/src\":" \
+			contrib/perl/Build.PL || die
+	fi
+
+	# make tests optional
+	if ! use test; then
+		sed -i \
+			-e '/tests/d' \
+			CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DVM_MACHINE_TYPE=direct"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use perl; then
+		cd contrib/perl
+		perl-module_src_prep
+		perl-module_src_compile
+	fi
+}
+
+src_test() {
+	cmake-utils_src_test
+	if use perl; then
+		cd contrib/perl
+		perl-module_src_test
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use perl; then
+		cd contrib/perl
+		perl-module_src_install
+		fixlocalpod
+	fi
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+}

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index bfc30bd..3f80670 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,11 +1,8 @@
 AUX inkscape-0.48.0-spell.patch 1815 SHA256 697c781a7aa378f0e65160838fd13919f70b4d886dd77b8b9bdfe7f3181f1a4f SHA512 17f0f9397eebbd5a322757db9f574e4fc848bc1f53e2e0f603eb3c5d7bdf6772b8461189365533fbaa5adb4fdce5264b0c3da015c9ed5ca54873d64cc860880c WHIRLPOOL 6868334e146f00b81c521e54bc261e0153c17e8fd6b176fda826e75203674b8e6904fa092db2856b6512dfe2040b9f268781af909a9a2690bdd8e9152fbdfded
-AUX inkscape-0.48.1-lcms.patch 368 SHA256 10afc0e2c125229cd9bd7f34cd8ec743ff9188af81e2d6184298374c58102363 SHA512 f902fb242d2b124034c428f5efa4e8aeac3bde106eb087bc2bf2aa1adca78585569a402ab523fbdcf87b730d7887c152fa43a639f8f3ebfbadbf29b0b7bd2f88 WHIRLPOOL 3d159abefaf16e30ce3ed4f24f113195dd7f0596f12f862d65712b26cdd84ab987527a4f0fb4e705292e6f95f7c04bc39f9922cc542fc66e102a5766f9b6343f
 AUX inkscape-0.48.1-libpng15.patch 1616 SHA256 55e113db90267d6789cdb6a54a6c744bd0e9d755b2a7b5835a3713ea04e98c87 SHA512 f783982c8cf2cfc805cb56b6f93e5ecfdce676955f5ddd150f8d9868aa3d7d5ad571dcb1fe12c9c03e35cc05609625ea129894c95b002f0897571016d177c58e WHIRLPOOL d8f3576bb78c9e2491adc0778987f3c72846a3dc1b561c9d4550ef85aca6c8d5fff5a24a8b1854a302891339aecee4aefd4d80121c0db23cb85e2f29a6a10e1c
 AUX inkscape-0.48.2-libwpg.patch 1006 SHA256 12cea23c64ef880bbd02e67002ca05c33475701e489d9d0ba3e057b6c2c71c9d SHA512 268df3061749cd5940612b098565d8005de55a1ab7ef9d0f6a51ff93c0535afdcc4943231e019137282ccce0a8cacf0e0176f55926d792590cd22f37bf648c19 WHIRLPOOL a25e107731eab0f7fc5b3652387f090b78f6838f118f6807ad369b599091781f8d0258b8f9a5aa219dd5c57da7cb5661fe482a650d06683b1ab2d9850f067a92
-DIST inkscape-0.48.2.tar.bz2 19583331 SHA256 223a42ba6e3644bb2956c485ca0c210edc14e90fa882cdc57c1bb9f35b8f6783
 DIST inkscape-0.48.3.1-poppler-0.20.patch.bz2 3831 SHA256 c48c8ac90c4d5759bc96facb584db50ad7e32a29398553bf8465f1c5c81548ef SHA512 6f64eea80f19734824de4565698da53d9b033cadef6de0913c88ede5c50a34feb5f500a6c3fe3312f6c8bbaf3a7b6d54680ea0386349076c162c0ecc7b8547d9 WHIRLPOOL dabe6c089491250b3555214beb3e2f45e42bc1a915e7ea8cd89f1e34d2d622c940918808f8a8eb963013769fa218acb3bea1bbf28ce6b5f867b84ab815809aa7
 DIST inkscape-0.48.3.1.tar.bz2 19688778 SHA256 073bf585b6a708747485f2de1f5a1b77c3f45a79e6ee128bf946bae99476db88 SHA512 8b1d75daf2ea6f84d70117381b9e1674a70de5783e08f4095f0ca6f81726096951459cfbde43be3e578fbc3a0b1a02f205de8570e70e167a795296a3eca5c8c3 WHIRLPOOL 427b57006df728bba05c0e79b2c7aa6f81f63ed3475393f1bae1356e6b0af07d1bc0aaee73111902d82d28ccd1c9ce4db51ce10333e03221e60d786007738b4f
-EBUILD inkscape-0.48.2.ebuild 2582 SHA256 61d052baac3c8855cd0382ab8f62e5ddf7280375d361c87c89c9597991416651 SHA512 98b302ec285b6fc23d618e056e5d840723d93e01b99897bc103313871534004dada2b294ce65b6a70cb4aaf06b766407038e06f999b4202204ebb4e61c169c60 WHIRLPOOL 9d9bd392d825119f7b205f48da94856b77041c1c4f37595379a257e121542318ac491611f05fcc6208c50782fbbe75d7b8bd044e99294b00b29e8bf8f74540ea
-EBUILD inkscape-0.48.3.1.ebuild 2678 SHA256 e04e95d1ebe75aeafd6dcc5401dfe0cfe97365e110eacd446e712eec022a19f8 SHA512 bfa651cd6622b99292332d206bfb822126849e295202a3afdd51860ea4981940330fe876a0d05f436224a5f89b7996ef929dcd1033a68d8b6967806fb147d439 WHIRLPOOL b7ca6ab32e08149ce66b6a20361c245e38d6cc3f7c5af7dc63374d46b396a51088c541c60ad6b0a19d3f6b4db251264e19d6a34238b34008d31f34086728d590
-MISC ChangeLog 25993 SHA256 0258451ca6b9cbbacd474e2b0c0d177f9f219723afc3cc2d919ea3650842203b SHA512 42a81fa4d9de641c031afcd88ca54fba5e582706180c750e11b6705b6a9053f6f8be08b80febd0fe5d6cabad3938e258d244ab6c6d4c65122b9ddc5d0e9b221f WHIRLPOOL 2058e0434d2fb73a6caa47800a5fa84d6bbb5afe51b3206c7f7f6308b481ba0a3b5c2b082421d7c4ca01ba40acd57c1b2c2cec1fd3b0831ff912adcd1190ebde
+EBUILD inkscape-0.48.3.1.ebuild 2638 SHA256 300401cfaa79b71badfb0a06826cf03a1f5509aa634c35096c30557f9da969cc SHA512 4fbe1e7b6383252c2f89931dc98e4b51ca455ed0be9a890794f503d9636b1445fac89c887802a311b00dcf70fc5676e5db8410d68b3728a678e3f0f28eeb387c WHIRLPOOL b33c9a86da55f280ac74457d4fa4b994ebcd07dde45308c2201a1ce7fb31d40e37b1820f09f5aa310173ff28336f8822b96870f22c411598c661598b2ecaed4d
+MISC ChangeLog 26259 SHA256 043efc0ece02f309a1f1f2d6b935d44790da95b70a5023a0e1d4793b0d4dcfe2 SHA512 761d7bcb06598c74286ecc063488d4c21d04b93c00ca71e6b61c3adfcdcad93d17f05c5d9c90ea218705f65d08ee3cae1068d958d5dc086eb4799dedd8184675 WHIRLPOOL 9ede8888a1abc762acf388897a543508724be6d9b3e096e5915ab11e4085cc9a42fc15c1f9b7fd433ce535438300775249668e6dba0d79a52217ae95654e00c7
 MISC metadata.xml 354 SHA256 705fec37c8550d17c1ef9260c24a45843351908700c9fe3eb1d652e4a601e007 SHA512 e8798a3aa2a76aed27f2b7124792d7b4972300146b7cfec3e8e86c42196e8746f63a45a64c12161d1c2b2f4bd211d43eedbb29738277cd319d899dd156089bd3 WHIRLPOOL c1d998bc9e5fdadaaf70bd0f8cf2e7b41a0495f73a1d6ff0c55d1c006b11d263a2fa1c405cf5eacd0a490e6300578a126303ce47dcbc844a362b7e07ee506608

diff --git a/media-gfx/inkscape/files/inkscape-0.48.1-lcms.patch b/media-gfx/inkscape/files/inkscape-0.48.1-lcms.patch
deleted file mode 100644
index 0b19188..0000000
--- a/media-gfx/inkscape/files/inkscape-0.48.1-lcms.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- inkscape-0.48.1/src/color-profile.cpp.orig
-+++ inkscape-0.48.1/src/color-profile.cpp
-@@ -31,6 +31,7 @@
- #include "inkscape.h"
- #include "document.h"
- #include "preferences.h"
-+#include "io/sys.h"
- 
- #include "dom/uri.h"
- #include "dom/util/digest.h"
-@@ -557,9 +558,6 @@
-     return (outofgamut == 255);
- }
- 
--
--#include <io/sys.h>
--
- class ProfileInfo
- {
- public:

diff --git a/media-gfx/inkscape/inkscape-0.48.2.ebuild b/media-gfx/inkscape/inkscape-0.48.2.ebuild
deleted file mode 100644
index 8133926..0000000
--- a/media-gfx/inkscape/inkscape-0.48.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.2.ebuild,v 1.14 2012/08/08 16:31:42 dilfridge Exp $
-
-EAPI="5"
-inherit eutils flag-o-matic autotools gnome2
-
-MY_P="${P/_/}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-DESCRIPTION="A SVG based generic vector-drawing program"
-HOMEPAGE="http://www.inkscape.org/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="dia gnome postscript inkjar lcms nls spell wmf"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=app-text/poppler-0.12.3-r3[cairo,xpdf-headers(+)]
-	dev-cpp/glibmm
-	>=dev-cpp/gtkmm-2.18.0:2.4
-	>=dev-libs/boehm-gc-6.4
-	>=dev-libs/glib-2.6.5
-	>=dev-libs/libsigc++-2.0.12
-	>=dev-libs/libxml2-2.6.20
-	>=dev-libs/libxslt-1.0.15
-	dev-libs/popt
-	dev-python/lxml
-	media-gfx/imagemagick[cxx]
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/libpng-1.2:=
-	app-text/libwpd:0.9
-	app-text/libwpg:0.2
-	sci-libs/gsl
-	x11-libs/libXft
-	>=x11-libs/gtk+-2.10.7:2
-	>=x11-libs/pango-1.4.0
-	|| ( dev-lang/python[xml] dev-python/pyxml )
-	gnome? ( >=gnome-base/gnome-vfs-2.0 )
-	lcms? ( media-libs/lcms:0 )
-	spell? (
-		app-text/aspell
-		app-text/gtkspell:2
-	)"
-
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-python/numpy
-	media-gfx/uniconvertor
-	dia? ( app-office/dia )
-	postscript? ( app-text/ghostscript-gpl )
-	wmf? ( media-libs/libwmf )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-libs/libX11
-	>=dev-util/intltool-0.29"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --without-perl"
-	G2CONF="${G2CONF} --enable-poppler-cairo"
-	G2CONF="${G2CONF} --with-xft"
-	G2CONF="${G2CONF} $(use_with gnome gnome-vfs)"
-	G2CONF="${G2CONF} $(use_with inkjar)"
-	G2CONF="${G2CONF} $(use_enable lcms)"
-	G2CONF="${G2CONF} $(use_enable nls)"
-	G2CONF="${G2CONF} $(use_with spell aspell)"
-	G2CONF="${G2CONF} $(use_with spell gtkspell)"
-	DOCS="AUTHORS ChangeLog NEWS README*"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	epatch "${FILESDIR}"/${PN}-0.48.0-spell.patch \
-		"${FILESDIR}"/${PN}-0.48.1-libpng15.patch:= \
-		"${FILESDIR}"/${PN}-0.48.1-lcms.patch \
-		"${FILESDIR}"/${P}-libwpg.patch
-	eautoreconf
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-	gnome2_src_configure
-}

diff --git a/media-gfx/inkscape/inkscape-0.48.3.1.ebuild b/media-gfx/inkscape/inkscape-0.48.3.1.ebuild
index 8cfcdc2..b9de093 100644
--- a/media-gfx/inkscape/inkscape-0.48.3.1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.48.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.3.1.ebuild,v 1.12 2012/08/08 16:31:43 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.3.1.ebuild,v 1.13 2012/09/24 04:56:49 radhermit Exp $
 
 EAPI="5"
 
@@ -9,7 +9,7 @@ PYTHON_USE_WITH="xml"
 
 GCONF_DEBUG=no
 
-inherit autotools eutils flag-o-matic gnome2 python
+inherit autotools eutils flag-o-matic gnome2 python boost-utils
 
 MY_P="${P/_/}"
 S="${WORKDIR}/${MY_P}"
@@ -72,17 +72,7 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	>=dev-util/intltool-0.29"
 
-pkg_setup() {
-	G2CONF="${G2CONF} --without-perl"
-	G2CONF="${G2CONF} --enable-poppler-cairo"
-	G2CONF="${G2CONF} $(use_with gnome gnome-vfs)"
-	G2CONF="${G2CONF} $(use_with inkjar)"
-	G2CONF="${G2CONF} $(use_enable lcms)"
-	G2CONF="${G2CONF} $(use_enable nls)"
-	G2CONF="${G2CONF} $(use_with spell aspell)"
-	G2CONF="${G2CONF} $(use_with spell gtkspell)"
-	DOCS="AUTHORS ChangeLog NEWS README*"
-}
+DOCS="AUTHORS ChangeLog NEWS README*"
 
 src_prepare() {
 	gnome2_src_prepare
@@ -96,6 +86,19 @@ src_prepare() {
 }
 
 src_configure() {
+	G2CONF="${G2CONF}
+		--without-perl
+		--enable-poppler-cairo
+		$(use_with gnome gnome-vfs)
+		$(use_with inkjar)
+		$(use_enable lcms)
+		$(use_enable nls)
+		$(use_with spell aspell)
+		$(use_with spell gtkspell)"
+
+	# support building with >=boost-1.50
+	append-cppflags -I$(boost-utils_get_includedir)
+
 	# aliasing unsafe wrt #310393
 	append-flags -fno-strict-aliasing
 	gnome2_src_configure

diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 2f119f3..63c7953 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -6,7 +6,7 @@ AUX iscan-usb.sh 826 SHA256 8ece8711de7ebfd7d9266e96d8cdf4c7bc12ad52ab2125901625
 DIST iscan_2.26.2-1.tar.gz 1106921 SHA256 e528070f588fe6166c321610dcdeed6c7cf8110152303fdbf03240e68a593659
 DIST iscan_2.28.1-3.tar.gz 1195938 SHA256 97fbaf4d66697762a32768b96f3ecb59c3582b6fdc1c1919119f8b73aa2d3b13
 DIST userg_revL_e.pdf 574224 SHA256 e68a45d600f702311d10a0e13d42c5b32036df172e8f07728604291b823ec876
-EBUILD iscan-2.26.2.ebuild 4349 SHA256 3de863d05cc004e529186a1782a59e320be1b5ece3d4457806d4a923bac6d52b SHA512 07a278c3df67ccc774bde5f4dddc7cd03ff34d4835c4c148b9a4117a3e89e33a501069b7e4e7137fa69905a86d8dcfe36c1f9efc4a974bea93358072fca2af60 WHIRLPOOL 04922c4d0b4d65b6b577ab594368573752b450d87c001da44b1b4423171cc15b50079a4a68cce2db279daf0bcf00478ef32bdedafdfab879052ef23046415c6f
-EBUILD iscan-2.28.1.3.ebuild 4424 SHA256 fd7d23f08501d6d856d999beb3fd2665d1ada5b98f988cf6d6ecd174c08fbae4 SHA512 3509d007fefbe24c27222559a62a70b541c3fe9094bbdaff7a469174065dbb168988a489775a8aca67851338f291ddaa21c421cf6969f5905a6950c0b1419661 WHIRLPOOL 5a6c5a2bf42c284312df22db1cdd1e249c936df89561d6d34f2f8e71e0c5437dd82471d0c3ec6b89c5526535fb3ffc8579da880bece96347b203f891946159ed
-MISC ChangeLog 8894 SHA256 9d450a2d61eccf8852eb716c789c72fdd4dc42f7a7501adba8977698bbb8e83e SHA512 691f164182bfff225096a990ba3f44bc6dd799a5b8d55b3cdc2cac204e4c2c3e5fc7276f9e525853b1dc50dd5ecc04ef75c97d4b2d0d3cfb1df99797ce060199 WHIRLPOOL 04f21270616d8302b7b105a83e0dae32bfd5c5aa992511d386f9e9aba0f1219f947bb235c2407c2e71d04212570b700af990939e85561bd826c6740bd350f2c0
+EBUILD iscan-2.26.2.ebuild 4352 SHA256 2b7f0c93cae19786b1b71e1218b0c2f162b568c5d48e29bd8c56cca3b1b20809 SHA512 f56dfb7080d2bfed5dd57e970fa0dba6a2b9c14fd453df9837a90ac45d4806fd90a9fcbbff39dd66e18ab1760987a005672959552bb0d59c34d0186ff8bb7fd9 WHIRLPOOL 24ceb85df0c46554c52a524fa48a3c519956ed01b0f43e651b3dd97671d9d2e637a599d0d54987e4ff0849bc32047a48b5bc21e6f81f833d5f00c6a31aa0e9e3
+EBUILD iscan-2.28.1.3.ebuild 4427 SHA256 c7de3983cb1ac6d1395c8ec802a254a0fd0190fae98502bcaf3737223cb4482e SHA512 8518f2b92039b43f9c1ad2c9797bf6ab9014d8f8af7691bdfc5cda4855f092111246beeeb55ff6b0ed72b254e845c5b8e56c41c243370937d3e62d3fcd0ef383 WHIRLPOOL 3670f5fe723c2a7343a709a576fb255e6e6a93b5aa7487143b896bc3dab6b6cbc2307543347a089c8f81edf2ff6e43eee4479c2ae7a1e5663d9e2826b3d28341
+MISC ChangeLog 9053 SHA256 af3fde023d32330ec8ad92b6528c1ce07a6d7d5decdd044c0807975a1e6b6bf5 SHA512 6b0b781e73ec7ee0a5adea73f770f8c701a593746482352ca48808af58f1003116205d26512213381ea37b8624adbf67fd6b630d4724b16c5efb87fe6ed97151 WHIRLPOOL b512d6422ebb6f0b0d3bf37d1d3760d6e213954f1dab72ab0cb80d10298be1b408c2ce69d7d8665eb0d51894f9ff8f8e48c27b9c482f7c2042f7b6854d8d89c9
 MISC metadata.xml 652 SHA256 2eb198fd36ab27077883685af440e0fdfc372c05b4f2df7b8d27ee51eb9bda63 SHA512 04145cd6e675054c4da522093a6e2e61d9f2aa8598dd145127a39f389e3799bb2ce3bb294a2320fa6c7e133e28fced649341b2388f6cda1f1096ab110190895a WHIRLPOOL 50f1de575dda02127e7768a96504446b77aa5c7ab6c23702259845cb872df51f212c9e502ecc656dc7ae6083cced4b7c77eeb79b77f44c4ef276dc8679633dc7

diff --git a/media-gfx/iscan/iscan-2.26.2.ebuild b/media-gfx/iscan/iscan-2.26.2.ebuild
index 8d4bea4..d9ed1e5 100644
--- a/media-gfx/iscan/iscan-2.26.2.ebuild
+++ b/media-gfx/iscan/iscan-2.26.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/iscan-2.26.2.ebuild,v 1.7 2012/05/22 16:17:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/iscan-2.26.2.ebuild,v 1.8 2012/09/24 00:45:14 vapier Exp $
 
 EAPI="2"
 
@@ -39,7 +39,7 @@ for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done
 
 QA_PRESTRIPPED="usr/$(get_libdir)/libesmod.so.*"
 QA_TEXTRELS="${QA_PRESTRIPPED}"
-QA_DT_HASH="${QA_PRESTRIPPED}"
+QA_FLAGS_IGNORED="${QA_PRESTRIPPED}"
 
 # Upstream ships broken sanity test
 RESTRICT="test"

diff --git a/media-gfx/iscan/iscan-2.28.1.3.ebuild b/media-gfx/iscan/iscan-2.28.1.3.ebuild
index 4203085..154cce7 100644
--- a/media-gfx/iscan/iscan-2.28.1.3.ebuild
+++ b/media-gfx/iscan/iscan-2.28.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/iscan-2.28.1.3.ebuild,v 1.2 2012/07/01 12:49:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/iscan-2.28.1.3.ebuild,v 1.3 2012/09/24 00:45:14 vapier Exp $
 
 EAPI="5"
 
@@ -40,7 +40,7 @@ for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done
 
 QA_PRESTRIPPED="usr/$(get_libdir)/libesmod.so.*"
 QA_TEXTRELS="${QA_PRESTRIPPED}"
-QA_DT_HASH="${QA_PRESTRIPPED}"
+QA_FLAGS_IGNORED="${QA_PRESTRIPPED}"
 
 # Upstream ships broken sanity test
 RESTRICT="test"

diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
index be99734..813c8e6 100644
--- a/media-gfx/luminance-hdr/Manifest
+++ b/media-gfx/luminance-hdr/Manifest
@@ -1,12 +1,7 @@
 AUX luminance-hdr-2.2.1-docs.patch 750 SHA256 9d7ab37083944ad4faa813af51301ee896400b7bb38a07b7143a3a4ca08d511c SHA512 9c7732d1985639e5b7f9ec853f3afd0d0e0cd07a143b165b6183a7697b9fb4c5cd494b443f60e81da522fcf2242a62631cf1d30a9ce733aa285874bf63f24555 WHIRLPOOL e873d2a2b15bc71af24df4c52f0a5db3fa182b7971c43936594137ebe60a0c3a3471e6fc709ea8f75036fe2cd2eeebb4da71e5cf68df717afa4f4b2508d4bf9a
-AUX luminance-hdr-2.2.1-no-git.patch 2427 SHA256 8c03e1ef4506067c3e40db3aade991fb1c9f9e170d3686d00eeb8bf7b9f006d5 SHA512 7d948aa3cb946555c7618b5b23825d63ba0375b598a41dff149ef0362e72a41eec537f7cdaa7a617dd707e7e3915e85ee71e7239ed4b676362ea0d435ccc6e6b WHIRLPOOL 915c1debf98ea59db5235b7deeefe54346477c1ece37573716f7473ae2cdf9c41f51fa56414abb553f7349f18b2d9b558dc82c20b588f08b78f1e04083148ea9
 AUX luminance-hdr-2.2.1-openmp-automagic.patch 1719 SHA256 45c316653de319d61d47618598fa4e665508311efdf412d9e31ea817acb1e496 SHA512 0045ec1b9b07c0fe91364f93e3cdf5eeb1301da76cbddf97be6651bf4b87f1e5b7eb42c5b82161ebe4592322937ceca468f7e462b31d004ab2e4f17b8183e692 WHIRLPOOL 7b6f9afee3c39684fd0d719470c5a5a1f877e516d0a04cb2b0a87e3b9e49b1eac60a7d294c45acf45a9a5435cc59993dad47fe873d4108fad8930cb777c0adfc
 AUX luminance-hdr-2.3.0_beta1-no-git.patch 2361 SHA256 fa49258af1f68972024309804309dec5783e7e04c9984471c14f353c780759ab SHA512 e8dab5ce3de975348e0f75b281e17e1d410ce4d25ced5ff89057369e751bb4ac15e7c73bb7cbf30fdf79536de3c13c3f91a4a891a919ed3da2424bcb6d667769 WHIRLPOOL c058c684837cede728f1b01fea9833f8bcb5c2d66c61f907d6f2ed9cfe6f0f54f03eb32b7ae7ef858874ba5725158e98ae1203d4ca89975f1edd8db7a01560ef
-DIST luminance-hdr-2.2.1.tar.bz2 3942721 SHA256 e6f8439eb03455676eaebfe7b41bfcc3d3ac61d1fb296f12b28783292e75a903 SHA512 78e98d7b5c46c81f3b84cc19337d2f860f88eb6d3626a8d33122137cde6d269d06b2f33cc5cf9541a28d5d760685637915e9a850f486e93e023fc8faadb4f94d WHIRLPOOL 7910961fff636cb48e309ba29758a4a6e17b4fc6b42db06602a6c5fda4a1b97ccb225247ffe5a354145c2f37f0e20af47b149b3cacb822d13edbd4cd129035ad
 DIST luminance-hdr-2.3.0.tar.bz2 5398576 SHA256 dada0795b58843912bcb57ce61dcd615bcb9f9437b610a37ff813ad2c899c676 SHA512 6806782bec25cde92eeafc1e6a6aeb801226c0db27bd9163829b4556209267a9f5f0ecaae934fbb42a25a780cd131bc34880bc48d6d68867fe1ab117bb4cde08 WHIRLPOOL 8f1430b0e46d53e79e7ba565b73e190b0ad6efb9f2937f8612b0ddda4d442fbc4c31b055a4904c48338e00dc8719cefb94b7f43fff040255f403ebeb4e8aac95
-DIST luminance-hdr_2.0.0.tar.gz 2450689 SHA256 6e6f6dadbe54d2c14e1c98c2dba928b3bc09ba4dbe5c63a071a32f5c372e16e8
-EBUILD luminance-hdr-2.0.0.ebuild 1409 SHA256 4db5cd2ce0c0d249022f4c050fb21d36ef45fb0a0b440fba248961a5cb77f467 SHA512 47c65eccfd194c4c688d63bc150e98981ccad6664204d73fb2ac57674240f1cd5d3941cd0596eff0b55006dee164259a650a826146d45fa12b38c07d7635d97e WHIRLPOOL 0833f2d0b75dab5dbd780a1344adbc0971d83516a796875b5ed1e10beaf015fea7e7caf5386b515869e6b93b0b8ea33df33d3e56215aab71c7cd79b745d00e45
-EBUILD luminance-hdr-2.2.1.ebuild 1596 SHA256 e3d116d879da8dce8c873b4b2b9b4904bc9a94155c911ae0bcc85e1a53fb8771 SHA512 03c6890c08ee506c70932e5953df53362a81fab7da901ad3577adecab0df02a08add1bb8452e38fbfdd3c52f06af0856d081824cccae02a2e3b2efc18dadf4dc WHIRLPOOL 1496db07aedede55be904ac8b258b8528a20b579a712caad25dee08ee2caf3776a849b76a8479d87602becf4d46d2a286b2cd5cb8e455e392e54b43bd162b21c
-EBUILD luminance-hdr-2.3.0.ebuild 1916 SHA256 65cf481ae7f333f5480bef9e3c3b8cf96e7a91de110c02cc11893b513b60ff88 SHA512 5f70124d3ec8dc0be835100e268f3573c948e4da321fa15bee4bfc14119e24478b27d1dcd974f667be85bb4b1f9c254e9bbadff212ac7d58e39addc76881be14 WHIRLPOOL fa7c88a99fb6144169eb3bd6c43d7e6444fc61fc324e3e9dd16f7aec5487b0e88658e464d284c32975b084e57c6c316f5d01f0cb1ea7dac1f269ab51744ba5a3
-MISC ChangeLog 6707 SHA256 2f53aea4e086d209606649c814ba3ebd5523242d52d2ced0af55bf2871c3dfd0 SHA512 9c004102a1c6185adca3087cab7876d6c5b344c7a477c43300d14671aa3826b73d9038fac7f70b32ee50cc61e5aa3b42c1b996f48eab3a640b439a1cc9d8aa3d WHIRLPOOL c9b1ef0196f7058f6facbcdb3dcdab577876c2c7e07a8a26e57c7e43f299f5c90aca4af3e19561daad15e8fc516ff0bf72b63828759fce6d06a5da89c5138055
+EBUILD luminance-hdr-2.3.0.ebuild 1916 SHA256 02296f7711918dbc3a5b63906373adb80e46d551fe67e49d6f060e489367583e SHA512 26408b0af773a6d6e9aaab326fc8ce193c8f4057e063edb874472f23174da52255de95ce4778e3918fcde5fb0f38ef4ff2469da2aa80d834c23b9927767becaf WHIRLPOOL 3e625be967e59359e1efb66fe488ff2c2eaee1172be32ee09edadc8253e7da4350829a3d10628f87b1f550621f31c1561c429b89d1c610ea3ca81f46359a5bee
+MISC ChangeLog 6987 SHA256 29e55eaf436937c1767756f37a4eeafc477e907d9fd5173f28d2a049f2880069 SHA512 dbc95c13ed1c529b5b77bf460e49f1fddb822f58b900f63a9fa084fb8ed05a282aaf4f2384ed8c61397f3431c9d342b681abe233f9dc2a5d9762d67298bc9753 WHIRLPOOL e196677c39959b8c3b28418d46be6c02ece4b1c59f7dd989f8ac8d0da0acdca8a001c339a7a83ff6753b1d1fd033990c0e2695e0dbc158689d754437fc6f0928
 MISC metadata.xml 937 SHA256 03752b3db20bdd5f73b81a4c7ac7a6173b7825c55aef76758cd48db98e778ef6 SHA512 3fe1641ac29499d1558edcfb5d51c461ce3b0da83627b1d4c3ae06adedbad95014d0e31353e207f86d882ae1b9df3b51a1cd8ef1619eac94327afa284eb1b351 WHIRLPOOL 007fce14ede771ed8d8b4e64e0de03837745b5c6a9629e080d41757f5c2d61628a8d0c29b84e5f5720e7bff18ee58b78abb22e503b4e885c5e48a8e977e62dfb

diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.2.1-no-git.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.2.1-no-git.patch
deleted file mode 100644
index b339200..0000000
--- a/media-gfx/luminance-hdr/files/luminance-hdr-2.2.1-no-git.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- luminance-hdr-2.2.1/CMakeLists.txt
-+++ luminance-hdr-2.2.1/CMakeLists.txt
-@@ -34,30 +34,6 @@
- 
- set(LIBS ${LIBS} ${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES} ${QT_QTWEBKIT_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_QTSQL_LIBRARIES})
- 
--FIND_PACKAGE(Git)
--#FIND_PACKAGE(Git QUIET)
--IF(NOT GIT_FOUND)
--	message(STATUS "Git not found")
--    FIND_FILE(GIT_EXECUTABLE git.exe 
--        $ENV{CYGWIN_DIR}\\bin
--        $ENV{CYGWIN_DIR}
--    )
--    IF (EXISTS ${GIT_EXECUTABLE})
--        SET(GIT_FOUND 1)
--    ENDIF()
--    FIND_FILE(GIT_EXE git
--        $ENV{/usr/bin}
--    )
--    IF (EXISTS ${GIT_EXE})
--        SET(GIT_FOUND 1)
--    ENDIF()
--ENDIF()
--
--IF(GIT_FOUND)
--    include(GetGitRevisionDescription)
--    get_git_head_revision(GIT_REFSPEC GIT_SHA1)
--ENDIF()
--
- IF(WIN32)
- # Windows Section
-     SET(OPENEXR_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/../DEPs/include/OpenEXR")
---- luminance-hdr-2.2.1/src/Common/CMakeLists.txt
-+++ luminance-hdr-2.2.1/src/Common/CMakeLists.txt
-@@ -1,4 +1,3 @@
--CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/GitSHA1.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/GitSHA1.cpp @ONLY)
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/global.hxx.in ${CMAKE_CURRENT_BINARY_DIR}/global.hxx @ONLY)
- 
- #SET(FILES_UI )
-@@ -22,7 +21,6 @@
- 
- ADD_LIBRARY(common ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_HXX}
-+${CMAKE_CURRENT_BINARY_DIR}/global.hxx)
--${CMAKE_CURRENT_BINARY_DIR}/global.hxx
--${CMAKE_CURRENT_BINARY_DIR}/GitSHA1.cpp)
- 
- SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} ${FILES_HXX} PARENT_SCOPE)
- SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} common PARENT_SCOPE)
---- luminance-hdr-2.2.1/src/UI/UMessageBox.cpp
-+++ luminance-hdr-2.2.1/src/UI/UMessageBox.cpp
-@@ -28,7 +28,6 @@
- 
- #include "UI/UMessageBox.h"
- 
--#include "Common/GitSHA1.h"
- #include "Common/config.h"
- #include "Common/archs.h"
- #include "ui_about.h"
-@@ -78,7 +77,7 @@
-     ui.authorsBox->setOpenExternalLinks(true);
-     ui.thanksToBox->setOpenExternalLinks(true);
-     ui.GPLbox->setTextInteractionFlags(Qt::TextSelectableByMouse);
--    ui.label_version->setText(ui.label_version->text().append(QString(LUMINANCEVERSION)).append(" [Build ").append(QString(g_GIT_SHA1).left(6)).append("]"));
-+    ui.label_version->setText(ui.label_version->text().append(QString(LUMINANCEVERSION)));
- 
-     bool license_file_not_found=true;
-     QString docDir = QCoreApplication::applicationDirPath();

diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.0.0.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.0.0.ebuild
deleted file mode 100644
index 44a04e3..0000000
--- a/media-gfx/luminance-hdr/luminance-hdr-2.0.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/luminance-hdr-2.0.0.ebuild,v 1.5 2010/11/14 17:02:55 fauli Exp $
-
-EAPI="2"
-
-LANGS="cs de es fr hu id it pl ru tr"
-inherit qt4-r2
-
-OLD_PN="qtpfsgui"
-
-DESCRIPTION="Luminance HDR is a graphical user interface that provides a workflow for HDR imaging."
-HOMEPAGE="http://qtpfsgui.sourceforge.net"
-SRC_URI="mirror://sourceforge/${OLD_PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug openmp"
-
-DEPEND="
-	media-gfx/dcraw
-	>=media-gfx/exiv2-0.14
-	>=media-libs/openexr-1.2.2-r2
-	>=media-libs/tiff-3.8.2-r2
-	>=sci-libs/fftw-3.0.1-r2
-	sci-libs/gsl
-	>=sys-devel/gcc-4.2[openmp?]
-	virtual/jpeg
-	x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	x11-libs/qt-webkit:4"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS Changelog README TODO"
-
-S="${WORKDIR}/${PN}_${PV}"
-
-src_prepare() {
-	qt4-r2_src_prepare
-
-	# no insane CXXFLAGS
-	sed -i -e '/QMAKE_CXXFLAGS/d' project.pro || die
-
-	if ! use openmp ; then
-		sed -i -e '/QMAKE_LFLAGS/d' project.pro || die
-	fi
-}
-
-src_configure() {
-	lrelease project.pro || die
-	eqmake4 project.pro \
-		PREFIX=/usr \
-		ENABLE_DEBUG="$(use debug && echo YES || echo NO)"
-}
-
-src_install() {
-	qt4-r2_src_install
-
-	for lang in ${LANGS} ; do
-		use linguas_${lang} || rm "${D}"/usr/share/luminance/i18n/lang_${lang}.qm
-	done
-}

diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.2.1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.2.1.ebuild
deleted file mode 100644
index 08f829c..0000000
--- a/media-gfx/luminance-hdr/luminance-hdr-2.2.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/luminance-hdr-2.2.1.ebuild,v 1.1 2012/03/13 07:58:17 radhermit Exp $
-
-EAPI="4"
-
-inherit cmake-utils toolchain-funcs eutils
-
-DESCRIPTION="Luminance HDR is a graphical user interface that provides a workflow for HDR imaging."
-HOMEPAGE="http://qtpfsgui.sourceforge.net"
-SRC_URI="mirror://sourceforge/qtpfsgui/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LANGS=" cs de es fr fi hu id it pl ro ru tr"
-IUSE="${LANGS// / linguas_} openmp"
-
-DEPEND="
-	>=media-gfx/exiv2-0.14
-	>=media-libs/libraw-0.13.4
-	>=media-libs/openexr-1.2.2-r2
-	>=media-libs/tiff-3.8.2-r2
-	sci-libs/fftw:3.0
-	sci-libs/gsl
-	virtual/jpeg
-	x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	x11-libs/qt-sql:4
-	x11-libs/qt-webkit:4"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS BUGS Changelog README TODO )
-
-pkg_setup() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	# Don't try to define the git version of the release
-	epatch "${FILESDIR}"/${P}-no-git.patch
-
-	# Don't install extra docs and fix install dir
-	epatch "${FILESDIR}"/${P}-docs.patch
-
-	# Fix openmp automagic support
-	epatch "${FILESDIR}"/${P}-openmp-automagic.patch
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_use openmp OPENMP)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	for lang in ${LANGS} ; do
-		use linguas_${lang} || { rm "${D}"/usr/share/${PN}/i18n/lang_${lang}.qm || die ; }
-	done
-}

diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.3.0.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.3.0.ebuild
index a848807..acf6978 100644
--- a/media-gfx/luminance-hdr/luminance-hdr-2.3.0.ebuild
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/luminance-hdr-2.3.0.ebuild,v 1.4 2012/09/09 21:10:56 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/luminance-hdr-2.3.0.ebuild,v 1.5 2012/09/23 08:51:14 phajdan.jr Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/qtpfsgui/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 LANGS=" cs de es fi fr hi hu id it pl ro ru sk tr zh"
 IUSE="sse2 ${LANGS// / linguas_} openmp"
 

diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 438fd4b..9b23949 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -8,6 +8,6 @@ DIST allegro-5.0.5.tar.gz 3065983 SHA256 4bcd3cc5f8da528e9880e65b1bf3847fd7226d0
 DIST allegro-5.0.7.tar.gz 3109765 SHA256 47f29e564d9a4babfbbf024f34fc8a04eea932a073af921d17caffbec0c3ad9b SHA512 7dde68160d675c6bb9a4e4e91149f5bc37330a7329e6fc4bd0aa79f75c5a3e1ed673e60a95b045ac19494ba2c790704cd7b18227aa09ed3b8338c54ce4be05b9 WHIRLPOOL f808b953b3763218ebd777db5574aa078c3b34b6b3f244c91e27d10a8c21092bee74a20d95dbec60c7af4beae91b563d78cfa4f87e0e60f839b99157a6e755f4
 EBUILD allegro-4.4.2-r1.ebuild 2728 SHA256 2831d7ccf0a73f0724226447ee0f71344d0e29aa6ca4a26f9a56f642d4098155 SHA512 e72114583d15c0515bfbd1bc4c09afb5d3487e73df4f6b142114ceb7e90f9ed93b7b9155afe3fa1aa6edf798913f308de06e00c19909e4fe4841d8b36bf15290 WHIRLPOOL ab9b65f7dea51ac02c190fea313f70c794c575f409144ccc3451cef987dd70a1b57a6bf29101049c41b17416f2109d1154a71359c7a3b168a57d5705985c5ca9
 EBUILD allegro-5.0.5.ebuild 2000 SHA256 bab429588d3ca9bc230d6d242b1c63474053fcf6e0a4b3fd6f9abc1de62619d5 SHA512 1bea7b521d108139e971ce6e33253e896f8fdf4cd79187f8e2e2a4768ea3bf1f1b290f575729cdb467e84006570eea5950198afb395b25350f3b575f191e6e39 WHIRLPOOL 4ca97e4dcfdf7e60c77be38454d7d2c9d68226239e0c9851250a0d250a45dcc50ed263712d866892ea41bf074275bc5449d72468980381a78a0806bfee305ad0
-EBUILD allegro-5.0.7.ebuild 2006 SHA256 e4e6fc88d9b2c66104a736dc155fb7954226de86eb3d4387e7c6e50c43fa8ead SHA512 e46816956e3c94742fe3b72d0e798e471432370797950310552bef32ee1b4347da8d00b5255b72b672dd66963c91eb37fa36bdb54ec397be97fb5a4b37b45eed WHIRLPOOL 796016eb7e327b4df451101ecced34f4c638672977a26f138e4a3c6ce0c7e8c4172df5509ec14c983a0685ab5fb9a8eaea868e5b8d663a29908b813a6a5c871d
-MISC ChangeLog 17596 SHA256 9830b313daf61960d1324db8279a17c197c6a2a8bea1c7ea946545e4a603901c SHA512 8b24919d50a40550a48189c6432250d065da59b4d55e305625f7ad9640658fdaf4ef61e090cf807a7a66dfeb43e2924e07e543dfb2b0605fd3498c3771aabda6 WHIRLPOOL 9b24e330286d7b0a03a8ab977001a6cef1970e74115c901e857dfe6fd650ca6c7e51f42f6c459fe2815da9ca89644d47788c045c830da4b77125a4376dbbb888
+EBUILD allegro-5.0.7.ebuild 2012 SHA256 67c368b2a12f828a61cd62158ed78dce64828690bf792bc2e77fa8b3adde47dc SHA512 4d152ee317bd3d57e2556fc7309bf05b4d5d964802536af5857024c572a38e24089dc602a737e91705d888bee3b03f87a26ae8e50b40bdace8b570994d12d181 WHIRLPOOL 0ca0ca974d2584de7d1640c7952bbdb2f10f0b47cbd4313d8067de4641599f3f62059485fb97970e081b252474c900189332afedff7c5333c513c682d6e28579
+MISC ChangeLog 17710 SHA256 071950544b8e75d288e7343e3395eb33e1f707afcce58443b4472a624cc1bc4e SHA512 76afef50e2ccd50a170650d5953d3b70a2dcc40a96c1ad3849aa0db32bf8da099aed2cca80704773df9d924e48781274c25e6c64df97fd8fb7b1e0b074c4ba80 WHIRLPOOL 09cc892993d2171773c486c207656c04d89400d36dc9113d8433547e31c69ee6cb7cc90ba1d0902cb4514bc5370a900f4ba59376c741e02b798a8e6ac3ead863
 MISC metadata.xml 856 SHA256 5a9ff2cd7ed67f377dd3ac080aaff9cefbef7c26ef04463467d31482c0dd5493 SHA512 4ba8961638fa9f764fa4b9cc60dd603f74beb5e19407934ad86142b1cc0a21350e405ede0f11a7f5c9f9d9396b687aa5c2e481c77eb478129659f2d545e9ec32 WHIRLPOOL fdfd2d40a713d0d17f27bfac30d5e6bebb5b2917dfb0ed4e9ade9a3ddcda35bbd3188584abf56a76ea368eefe7961700450b105cce75e779dc6ea53e10415414

diff --git a/media-libs/allegro/allegro-5.0.7.ebuild b/media-libs/allegro/allegro-5.0.7.ebuild
index 4582a21..4117ebc 100644
--- a/media-libs/allegro/allegro-5.0.7.ebuild
+++ b/media-libs/allegro/allegro-5.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-5.0.7.ebuild,v 1.2 2012/08/21 12:47:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-5.0.7.ebuild,v 1.3 2012/09/23 08:52:53 phajdan.jr Exp $
 
 EAPI="5"
 inherit cmake-utils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/alleg/${P}.tar.gz"
 
 LICENSE="BSD ZLIB"
 SLOT="5"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="alsa dumb flac gtk jpeg openal oss physfs png pulseaudio test truetype vorbis X xinerama"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )

diff --git a/media-libs/opengtl/Manifest b/media-libs/opengtl/Manifest
index c168f75..0228f01 100644
--- a/media-libs/opengtl/Manifest
+++ b/media-libs/opengtl/Manifest
@@ -1,10 +1,8 @@
 AUX opengtl-0.9.17-gcc-4.7.patch 1996 SHA256 36c0889bda87d746f7d33720efe863673def99be03da7435cec7a065a5076fa7 SHA512 28f75a2e96f1bb5f0cebbc11808cbc0384685ea46c26e1544541c7a0d0b0b079a80de7197eaa5395152ab5377a06aa5c1c3afa5a16907f3f1a1b2fd3257a7c89 WHIRLPOOL 6ca20003720d6799b140f6a865e8fd712e2108cf41749dbf11118e525a0c6efe835e225d6d8cd2dae9540f7e77353e538a7bc4b64c0c388573bde6314c182577
 AUX opengtl-0.9.17-ldflags.patch 613 SHA256 d563584386bd04294f4f8934f78b290c2950120934353026a79857f14453d9d8 SHA512 d9ac388b8d8814a50ccd9d577168626c03361ef05dce611b0fe90f65d6514a338d968135a5ee0dbd906048e0e5ed052269a7616c7d5634c45df9a1d93ce17620 WHIRLPOOL b85108c6906bfea4151c3c49bc4c777b0e175e4e332a9f45fee8562eaf5757a25dc0f84a99791d45bc6b3dcef3f183c2d0b63c8a4a1955ed6ad9643b8d26ab00
-DIST OpenGTL-0.9.15.2.tar.bz2 495966 SHA256 306427f2814439703f13b6ee17092c466172c4df57cdb896b6e5eadfa1154ae2 SHA512 7229308bc14f56074152a7fe982925853ff79bcced8db8d95fcf5a882307bd944517faad1dbc74dc6a7d16e3849b53ed9862edbd33bcacb11e2629da2983d2cb WHIRLPOOL 27ff9d05b18e32654f6947bc35943f3c881e41035a8eb123f8de7550dc739355463c0bfbfb311c253389a97848126520b1c05c2a9458920bc84599a46cd729c2
 DIST OpenGTL-0.9.16.tar.bz2 533833 SHA256 81e81a53eeeb07e9e6a6ecfd0d960c10453fedc041ab7d885e66ee3053757107 SHA512 8d1ca8cdf352f04a90cf6fb3eaeb1684e333cbd3b8e46a19dc8d28d7891a5eb79072d4d2fc3d76a1628f22f0e07cca8139e84f01006f0f6de1402b371efaa2b5 WHIRLPOOL 82b8a962696b35b89ba14bc311d00c08717f7ed0f98260c59d439445208919cb1bccb1408e4dd47c61b08e15e29a7bf466dc6a868a0ba04d13d68eeaa33e3a78
 DIST OpenGTL-0.9.17.tar.bz2 534132 SHA256 89a37394fe71f2e771d7230333c86b93706f0083f86a58a86a670bca7e4f905e
-EBUILD opengtl-0.9.15.2.ebuild 963 SHA256 96d02070172448a5535c6c108357d4ec3fed43b8c545465c231a949f9104db1d SHA512 336b2af14529978358444d62fe048d16931a7853f092b796cb7dde3741752b4914d2475ada4ddd1fcc81bfdd57fcc73dabaa7988ed268d166a0feec29a1d8eb7 WHIRLPOOL eb93705e45806acaa676d7f9ae96b28ad9dca97220ccc12cebd5635d948dfb4ef721ae05624a0b3f1eb8bcdec1b88da14ad881bd6b8d1786a9d59bd710697ffb
-EBUILD opengtl-0.9.16.ebuild 963 SHA256 cd66f32f396a3875a5522afe38508f91633be630007543630e57ab4a7ff4bafb SHA512 11ebfd3c5e60e028cad56036e8051d04f28fb6d1fe1fb4ed7754bfa6ea1132148200069bc30fb05f305416d2bc46ebef9bc65c42d73d1ae4f9843275952c1e01 WHIRLPOOL 7930a476af60b9dc916af84b0b156005fb8f8a8ebe11fab33f9603bd72dd17a24935479028aac5213f680d8aaa85b8dbc7ee45950fc2377a23117698363aa5d3
+EBUILD opengtl-0.9.16.ebuild 968 SHA256 886f7dcd789c1a863e47120d85c7bdcdab201d0129a6636d2758b31322708746 SHA512 c97530428746246bf75d13ad273bb42dddec126dc563d2e0d56751870c9ffa5bf40d66366968f3c45f1f7cd6c8577392c0ec6d4c9669202b1da67f34885a53bd WHIRLPOOL ee6f6f238486b39c87c21d375b374c406d0b390cf7ab2820a2fc36c878639b7591b142df7fb0799ae0e2e3be602882f4ed9b5ed914aab1044663b5fb2426eccf
 EBUILD opengtl-0.9.17.ebuild 1037 SHA256 991cb20cb9313d3957b2fe61dbbfeb470f996726349201d1144e84c3f9734e0a SHA512 c6e3d4be1ef99e09208610c606c9edcc66e5f00b0c9b161c0b3ad91e30d89dd614d5575ce4eb7abf1011087e4ebe11937618e7d06f611a7efd92717eeebbd73b WHIRLPOOL 448de31597996e2f320c6e41ddd3282f5a96771d4a45a9ea33f81bbed4dbc87dfc0ed853a9c5b76dea93fa047edee99728f4fc5b043af2b4442c937ce04a76e1
-MISC ChangeLog 1670 SHA256 f500e83cfa8c105a4a0ef5dcccd6e63efd391ae45bc8bf7e9e3aa056f0b21259 SHA512 03845875d08d0ff5866052fbc0e5263fd281b2ec5ad85f06e1daf2a03b9c5cdd4e955ccc0c9d9ebee8a93f98505be347c44a334fab6cbc9715d90aa6440e6c04 WHIRLPOOL 0350abe69646a80b808c1b38a76d412ac9960f4c86fa55e4e2f416f4fb4ed6710e103b25d6b0538e65b98ab59cd897595b4d679867e4701b8857104536d6f4a7
+MISC ChangeLog 1890 SHA256 c6148318d0fcb43b924740ccf06f20f391474a849bf7eac9ba2e6c1c6253baaf SHA512 4fae195e5f83935743bb8bcf4efbd131a207be27a1dbc5a9a3a5bae1cc63b05dd6200f9caa74cc74d200d7292a32dfe390d4e040a0f3dbbac2702eef6609455c WHIRLPOOL 266f078317cc039c22f8c39ddfd2950799fe30c75d37701aa23199c2ca3b76bf88839efec16de0a0614e5a3c65edcfd39c44c11209fd56ad86cae7f09d86e85a
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642

diff --git a/media-libs/opengtl/opengtl-0.9.15.2.ebuild b/media-libs/opengtl/opengtl-0.9.15.2.ebuild
deleted file mode 100644
index 01da935..0000000
--- a/media-libs/opengtl/opengtl-0.9.15.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opengtl/opengtl-0.9.15.2.ebuild,v 1.3 2012/05/27 16:24:45 ago Exp $
-
-EAPI="5"
-
-MY_P="OpenGTL-${PV}"
-
-inherit cmake-utils
-
-DESCRIPTION="Collection of libraries for graphics transformation algorithms"
-HOMEPAGE="http://opengtl.org/"
-SRC_URI="http://download.opengtl.org/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug test"
-
-RDEPEND="
-	media-libs/libpng:=
-	<sys-devel/llvm-3.0
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	test? ( dev-util/lcov )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use debug OPENGTL_ENABLE_DEBUG_OUTPUT)
-		$(cmake-utils_use test OPENGTL_BUILD_TESTS)
-		$(cmake-utils_use test OPENGTL_CODE_COVERAGE)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newdoc OpenShiva/doc/reference/region.pdf OpenShiva.pdf
-}

diff --git a/media-libs/opengtl/opengtl-0.9.16.ebuild b/media-libs/opengtl/opengtl-0.9.16.ebuild
index 78f1dfe..5c0120c 100644
--- a/media-libs/opengtl/opengtl-0.9.16.ebuild
+++ b/media-libs/opengtl/opengtl-0.9.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opengtl/opengtl-0.9.16.ebuild,v 1.3 2012/08/24 14:24:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opengtl/opengtl-0.9.16.ebuild,v 1.4 2012/09/24 11:41:31 nativemad Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ SRC_URI="http://download.opengtl.org/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug test"
 
 RDEPEND="

diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index e2ce845..b1d37b5 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -1,8 +1,10 @@
 DIST fldigi-3.21.42.tar.gz 1665053 SHA256 864ffdab48e352116347fef80bd34e6b1c55ac35b83b9770767da3827e7d639e SHA512 5cc641e2aea8b94044cc65f59785b09b8c7acd4e5152c650fec2ab942b1e99b577cd18fed2d66c63a72648ddafa5a14d5eeeabe860a3453df5580b8a0c9ec272 WHIRLPOOL 12d0e5aecdbcb668e91529e5ff1884b75ea9dfee3e503a838c3889d22ff9ef113f64b4430c4b973a1056d9700c30b2af08f5c9cbbbba8eaeaa8f9e5b7bfbe00a
 DIST fldigi-3.21.50.tar.gz 1790564 SHA256 244921f705f70cd48e2ade44f853a7e092775f7a61d3e214f5faaf74853606c5 SHA512 4852528590192758711b59a201ef5af5c9469b5fc4007b75cca783877d45de3091f930395ee02446c81bc6a433a58006ebc0a2cecc4f01dff49594c5ee983126 WHIRLPOOL b89b026e64c227e30da18fc8059b81e8937e805013cebb6cc28ccef97d4a4b061b8d63ee74b2c8efa993f60c68672db2a57f2e5a0f184b2015b817f38faab73b
 DIST fldigi-3.21.51.tar.gz 1794375 SHA256 20313338d25bb60ce01962d454ea09929d065344a5cf34f2e631945b4ec82f4d SHA512 fada02c9931be5ccc33aba1f334aaf55a6c26c50b19b3a3058ca5405b6fe2aa1a5c9447a6a9f4ab1c8f23366ef446ff90cef0e6a36368f6a9dfe5492b8428d4a WHIRLPOOL c29ce8e1a1fcb7547030feecde73aef96071fd04ddf90574cfcfd06176c9e6eb13077ef792714d3750e467005d0b099068b481dff2a472c00304a9df98cde940
+DIST fldigi-3.21.52.tar.gz 1794366 SHA256 036957456133eefd7b75076f6e1495c1b4b446ed1609f9b83b3056d05aaea9ae SHA512 46dfdceb346990b7417a26f2cf00352f690610353573e970d891d04e32452e9bedfc43659d34b33e1e3b10650d10b06a0b527e7d9ca48bc0ca4f9f7783a2edeb WHIRLPOOL 6b0f3a06b0a5157c7dd408b224298fc5d0d31f5a290765bea57ba87f262d708d1f493ea1b7f66410f6c51866939ee0498a9faf1e898ccad8b824312b63a0ad07
 EBUILD fldigi-3.21.42.ebuild 1223 SHA256 234b3e2f2d17afd43403ff174d6a847cb9a311de270e3d8591d451afb233aa60 SHA512 982c070f93a5e547619182d94bcf0cc4a95217f9be1038efda2418976727fefac07e8d107411468553d1fb578d38e9483899bc052ce3e4723d55306975e1f78c WHIRLPOOL ca4daa6cacb6c3130fce18de2f381d94c34d016562a7b707a93aa554db4b3912fd2b00ac75ebd63a7c76a78f279e1af44d9a8569273b79163128f322d4f49686
-EBUILD fldigi-3.21.50.ebuild 1225 SHA256 3bea8d271e375561105b2f86c4d2fffc9624e108718fcd885bb66a7fe28439c7 SHA512 840941abb909f07cb9f95347731b50bf507cc57634554a64e3b93f164b5fc113f230e14f9de94be948a115bc7844d90e741568c800f362ce8f5bf63d3bf69ee5 WHIRLPOOL 9a0a0b6c11d0b9b1cfb4d87ef67eea1ef30bfc172bb4784f2795ec24e12fec97cf503244d43e44e6cb4de67221aee7dca7fea3c5730d0c8e467ac43c79af7d53
+EBUILD fldigi-3.21.50.ebuild 1226 SHA256 e8a89164480fba8a40c518d5fac425ffc300b80f5d5aa1b7164bc81509dcba5b SHA512 821948b0662170e6d19e3ad2e2ff065880d7a0fbf66f8fbdc46b4c1c527c5aab36b144448215a104752fd27a03fbd30e1cfcd80ca18fd8f76bc470752247e6d0 WHIRLPOOL 7dcb0847b14fa2a533f15f9ac4549a34eda5255db6266212acf85b5a5e309b3a217d957ba962dc186236b8b7d39084c719fdc12290e99632469a12d3a8b3042d
 EBUILD fldigi-3.21.51.ebuild 1225 SHA256 94cafeea04e364612e48190883b8cba46881f60ad3181d3c2019f334d9e8dae3 SHA512 61ad6c2d47d9e7eedea08d6b83a2c9217f5315b433a4edaf13b16b28865438ca8e36184c243f996739079b4d56d8158fc034a93740e2a5c59c32dde461887b5c WHIRLPOOL 4870894b2136c020916713932084dadf0c906754bfc6d8437e2f47b85db15baef6c040e33b03cb9c4373111e762dc1522e701511a6463c166f178babbe390fd3
-MISC ChangeLog 8015 SHA256 34e1bd9accb61ad24ca86467f97a5058eca87830ca759ca56db21746850304f0 SHA512 33b93af992652d6dfd1d1b26942df0141393a5d1bcc1feb9e04c17f68240f5ed37ec7474dbb4b59f197a1b369b8a8e02de3791aaa981531fd1ab36b4eb0f93cc WHIRLPOOL 9356e02d5fac33b0325d14e78d253df468cd5d439da88214337542cbe310447a9c076d2ae32dc4fea4c4971352d4134814a828dd4f8de398483bd42c57043d72
+EBUILD fldigi-3.21.52.ebuild 1225 SHA256 d2dc71615b8a076844d9c2eff9e2d0d36679e7658e6769217870dfbb31c10c3a SHA512 03043f99a32689d3d128a4f3344e28ccd72272886f24d56c954c193767b95910d9166c0c28e6ed91af4a67bef062d3a254af2223df8908feb86a73ac149195fa WHIRLPOOL eaf256fa9611e1e6b06dc34574b77f0188a0ad0eaa36c26ec61b0ec10e0941aa48ea89c8bb953ad75b93442638fc85566b3a6204124db82b318e72d9d21b8cc4
+MISC ChangeLog 8253 SHA256 128fa056000cc5e1e07a943c50c839a71fe05a4cc25cf0cc379877c171c101f7 SHA512 304cbb8d70877ac1915e65a9e5b999020cc1912dff6edcdc785f8b6d067ab072861b56ef68dc0e31a81836efc62cfc20384c848202606946b58d5116e2a1230d WHIRLPOOL 09ad95133349105f019130f09751a83ae25aa20359f47d4424bb734013e8439a67e09d86a2aee1b2af6d5f6b48aa003f6331a0442f7692bd4973591b37faf35c
 MISC metadata.xml 405 SHA256 bf191cb45badf521b9ecf320be39d252558f325477dde842c815b8db0447a8d7 SHA512 14d4a18063e929ff828fce20e6f18b20f9fcfdbb8ff130046b399f59ff30834c008e8d8e9800ccde31676cec9389d0efda9826ee2cb80558f11b7ef9b249af68 WHIRLPOOL c2ce3d5b6fb9d07888157297baed0e583687f27230e78a30ba8b177a871f506978cd8e989278c80d4e258a5b7470a850eead9ad6e0ef39a2a2b5533ffd9a76cb

diff --git a/media-radio/fldigi/fldigi-3.21.50.ebuild b/media-radio/fldigi/fldigi-3.21.50.ebuild
index 4a914ad..eaadcbe 100644
--- a/media-radio/fldigi/fldigi-3.21.50.ebuild
+++ b/media-radio/fldigi/fldigi-3.21.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/fldigi/fldigi-3.21.50.ebuild,v 1.1 2012/08/08 18:07:39 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/fldigi/fldigi-3.21.50.ebuild,v 1.2 2012/09/22 09:59:47 hwoarang Exp $
 
 EAPI="5"
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.w1hkj.com/downloads/fldigi/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="hamlib nls portaudio pulseaudio sndfile xmlrpc"
 
 RDEPEND="x11-libs/fltk:1[threads,xft]

diff --git a/media-radio/fldigi/fldigi-3.21.50.ebuild b/media-radio/fldigi/fldigi-3.21.52.ebuild
similarity index 95%
copy from media-radio/fldigi/fldigi-3.21.50.ebuild
copy to media-radio/fldigi/fldigi-3.21.52.ebuild
index 4a914ad..a9a626c 100644
--- a/media-radio/fldigi/fldigi-3.21.50.ebuild
+++ b/media-radio/fldigi/fldigi-3.21.52.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/fldigi/fldigi-3.21.50.ebuild,v 1.1 2012/08/08 18:07:39 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/fldigi/fldigi-3.21.52.ebuild,v 1.1 2012/09/22 07:49:36 tomjbe Exp $
 
 EAPI="5"
 

diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index f93e5dc..874250a 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -8,6 +8,6 @@ AUX xbmc-9999-no-arm-flags.patch 478 SHA256 075db2562d31914d86b4394500d4b3168ea7
 AUX xbmc-9999-nomythtv.patch 1680 SHA256 fe0289d1361b0dde3c261bc082bcad123c9cc9a2b7398e4eb48773f976be93a2 SHA512 403389bb1bf1442be1a8d23106bd78dc672c66fcf588b6076e6105023a69a92ca58cdaa91c9e2664123f244c3d5f42a9de6f72845c702339e3f8a0e976330ca1 WHIRLPOOL dcf13b59133f2b7288bc734803ad1317d6e943f7cd85b0428ec257b2ec9fb6a23311fbdd8574dbfb985a473dac7cf8ca30c2ac6d59b62797adb1f63d8bcc0b12
 DIST xbmc-11.0.tar.gz 63012044 SHA256 1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19 SHA512 ba738129f70dd171b3fae385ab44317f62c9041a116bfe809d6d07c99ea69c663ad5d598552a17be0b942251ce12a68f34d0be21b303b256055849a6dde90043 WHIRLPOOL 4dd068749c86542e39b8fc42b45bbb56e885813b17876d3583cb4d91c902ff075e1f16f1c19720e3430dc149c40e52e7d1ab3323f666263fb353a59e2ef94a8e
 EBUILD xbmc-11.0.ebuild 6232 SHA256 2cd524a2f6948e5e1b037e0ebdf1c074fc5524b91893182394f45b84417c6a81 SHA512 2bb1e72a795284ee23dc05b83de952b5a9c1b6cf1da97f7f2f5f4a5dd17917a708f6693f4487fc0440d2aa687ab28d1f69542dba307f04cf355b14db7d3a2463 WHIRLPOOL bcd8d1c95146a290ba07b912d484856120ebaa795b3c9ff5309869ca6ce347fe7d04c525e6683fb171fcd240ebf4830363c4e9f3c1bb834fc57c41f2d08f796a
-EBUILD xbmc-9999.ebuild 5958 SHA256 a1183490c2c8fcf97d1be39f9a1868bb62766344de007fc64eb2a123d6cd444e SHA512 a2d1f9abdca8ec3da3c885bdb8743520763efe364e1db8b7f4fe9621613ab5901e81b7b9871e04487d17ef14655bc5910b9b80d563c97d33f7aa68f9bc28a4b7 WHIRLPOOL e585a851e212f8352f19b700fba263c5b8f59e43c2bea92cfaee6059f4779769576f6a9e536ffe47ffeee69bc806aeb4b88a4b48b81cad2f679f31d7334d9ca2
-MISC ChangeLog 23478 SHA256 554206d6f4af0c81abada64edd83ee7dec4dc833ff11b6c6169426d5008ecc77 SHA512 c01931e016b19fb3df7847e0e97462807ff8471831596742e12c985deb34c90c322b26ad9e0b20d8e1b31bc157f0f5062b43099456cd6baf8a861e804c2bd812 WHIRLPOOL 6650dd9c76524e8f86a358ab3b32cf8415139fb8d52a26684fe9e997ac8d9e04cdef2ad7d0af9d4195d3b5bef499a51b2a38cf6f5d67eea059c03dccc4ee31ed
-MISC metadata.xml 1004 SHA256 e0fe06415e25d223ea299f1eecf4de6a8e8609d5ec038cc295f61002cd7d7a5e SHA512 f13daa4939dda43a19384a0295171430cdcff2dab90882a2d98c053c45da53732453108edbcdfa93f5a1af061acaa2b5bc973909aafb8359606951e8e70d21dc WHIRLPOOL b307c432b5e1d46e7462d25bd9d4b5ba705fe4c4fbd71701d7a7591daf21a1a152df44fb3bce9cc51703f28cb1a37105630bc9a070d5dd3cb7772585a0c6c517
+EBUILD xbmc-9999.ebuild 6008 SHA256 941f597699d75a3953458a5306cb55f74df813bf2d686603000d93f8ac479a3e SHA512 69b1ee788352d9137546cebc88f34f325f245a084e3b708d077ec16345df0abbc52142a0436883e0eeec377f7a8a5b49f406d6ee9f15592149248485d1d17468 WHIRLPOOL 48c57f44ad29a38166c7c94ccf2f2afc13f36c10413c43406dc09d049fdcb3a3a7206be67a72c1853546bdace0850ff38fe8efc95c4e72a5b1dc499f9b18cee8
+MISC ChangeLog 23620 SHA256 e643e2941d9d5a1c16d501387d70393f6c6065a03e3eebd7b9cc23bef5523a20 SHA512 3757b3843b75af8dc9fa7f1793bbd12069c25dcb57e61665e0f7b1c1d238851b48f87c3393edb0a21438d56cf336ad57725e435556eccdff2627d620b7661533 WHIRLPOOL 6600ec01d55698ce7f5f8d40df14cccd94479d0e027024ba381c8a674bb833647446fea2cc3c32548dd80e9bd6fa339d846c9af4fa0f3baef8ddf30c61122f48
+MISC metadata.xml 1055 SHA256 ed787aaaad022ed9386aa49031356c39e378c94651624d753a21891ea33ca4c1 SHA512 590c3d163bd7c5f8fa7867012b1248297424abce53802e21dfcf92e354b53ed8e90d1312df848a3004792c242cb0c8951acb638fffeffba563695dc53fc5b8c8 WHIRLPOOL b69700bf42a2ef988f335325740e9ae23ef738f27cc90af90c1a6f98ea1e44e5405f0b114a11bec57b6fcce6b846a6d4a95b3b9d58d970ca0e8098119f656bcc

diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index 638c306..658fd0b 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.118 2012/09/16 20:19:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.119 2012/09/24 18:02:24 vapier Exp $
 
 EAPI="5"
 
@@ -26,7 +26,7 @@ HOMEPAGE="http://xbmc.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="airplay alsa altivec avahi bluetooth bluray cec css debug goom joystick midi mysql profile +projectm pulseaudio pvr +rsxs rtmp +samba sse sse2 udev upnp vaapi vdpau webserver +xrandr"
+IUSE="airplay alsa altivec avahi bluetooth bluray cec css debug goom joystick midi mysql nfs profile +projectm pulseaudio pvr +rsxs rtmp +samba sse sse2 udev upnp vaapi vdpau webserver +xrandr"
 REQUIRED_USE="pvr? ( mysql )"
 
 COMMON_DEPEND="virtual/opengl
@@ -78,6 +78,7 @@ COMMON_DEPEND="virtual/opengl
 	>=virtual/ffmpeg-0.6[encode]
 	rtmp? ( media-video/rtmpdump )
 	avahi? ( net-dns/avahi )
+	nfs? ( net-fs/libnfs )
 	webserver? ( net-libs/libmicrohttpd )
 	net-misc/curl
 	samba? ( >=net-fs/samba-3.4.6[smbclient] )
@@ -197,6 +198,7 @@ src_configure() {
 		$(use_enable joystick) \
 		$(use_enable midi mid) \
 		$(use_enable mysql) \
+		$(use_enable nfs) \
 		$(use_enable profile profiling) \
 		$(use_enable projectm) \
 		$(use_enable pulseaudio pulse) \

diff --git a/media-video/tsmuxer/Manifest b/media-video/tsmuxer/Manifest
index 407de5b..9d7eef7 100644
--- a/media-video/tsmuxer/Manifest
+++ b/media-video/tsmuxer/Manifest
@@ -1,5 +1,5 @@
-DIST tsMuxeR_shared_1.10.6.tar.gz 640010 SHA256 40871629da0968488c90600a0870b6f9e3ed09d30522c56a97d7397365af0910
+DIST tsMuxeR_shared_1.10.6.tar.gz 640010 SHA256 40871629da0968488c90600a0870b6f9e3ed09d30522c56a97d7397365af0910 SHA512 64d5214a84ae1d2fdbaad214ff9586007ed1d88e7d0e18d866dfe4e75cf371de52e4c05eb1d67d0b9c7c2f9cd5ca87b4dbb2b113e81361ba658aa1fecca115d6 WHIRLPOOL ca4993cf04a22051f9a5c8b7cbe8537156263d2b3e0c9f27a889a519eb7b171df7dbca5841a7345237b1623ce46c547ace886ce07bba3e92717513f87fd1cd15
 DIST tsmuxer-icon.png 1634 SHA256 ff166c09d7e5218ee566d876c20873e26ccf6242a3f37a7f01e6514c4396a753
-EBUILD tsmuxer-1.10.6-r1.ebuild 1537 SHA256 c0bd0cbe6a5ad1bb11752d4e98242d82103217e70a8e2f278e2d3cadc0b6caf1 SHA512 e0c26e2c0dd8524e3148b833b326fb6b299910b5633fa2dca1755a3ccb26bf257a7d85a81eb873e703516a90fc5bfce43699231c1c69d9becf52ddbe8336d312 WHIRLPOOL 9c6b35a6b0537a7d892ed10500dddfe561f699ce135276256e71dea6e80aa3c49753b05420e1924fd6de7a1ac9c37fc6ca991ec09010012f70dbdeb1465aec12
-MISC ChangeLog 1276 SHA256 0f1a347383cf977e6af34c69645e06bc4204d7c5ff41a34eeeddb45f600601a1 SHA512 2265e856f1bb17fa35bd7f5ae2fce9be0ada930aed3f947c5cfcb0bb90a2d8d4b480847edab3c570be6f892814eb327a3c43e913640f9a6a8168867058045fad WHIRLPOOL 2956af8468f793ea9078ac699d94b4451b4c0532046b8e47836da4eea607ef15f7d41777019d93c633ffb7738448b0103eba242b3990009a4c888461f9c283a9
+EBUILD tsmuxer-1.10.6-r1.ebuild 1540 SHA256 c7d66bcb3dd1634778afdae6267408f1e048d983ac4bb851ef6191be79b5e6eb SHA512 5992152e15f72ce51c346716fc4135adba6ee4d077e53a1cb1bb7a0443bc0525ca605002a277ede272a2b4aefa309116410ee90ee15b850d6d168741273fa537 WHIRLPOOL 636b3451773e01f82c861b4a943cab685c3b5b92ed6fb165f6969b10f0a0ff6d77750a502517b2e6731dccf1b29dd8ebfe8cb330d1cff8eb0fe945d989e57a6e
+MISC ChangeLog 1414 SHA256 b2d11f6ee7501ada3f9e5e7a5859fe425d815e2a96de5903edd5072e12aa35fd SHA512 2591c9e39277a349343bd3178d97a62f4e7acf96f0e1015aa70e7eaccf4e85fafd7bcebcf716085a42f361382b999d15e703a6ba85e96f0343b769d062876cc0 WHIRLPOOL b298f9398e018673ab5b0ef5a5e62b70ef311dee8b950e469130a1f9aa5d3a1f8d6891b6e51087d70e0016c811cb2ab3974c9ee0d825d10cd61f3121078dbcf1
 MISC metadata.xml 644 SHA256 68e11f2bde67a6954b613b1de28a2bd36e933c9b98e3b08de68c65321940c25c SHA512 ec094b88cfa73f35ef93df86322b7f7e33c7c9ddf58f8be3826e00795737dd2f9852ea20e1c95ec1694eec6b13bdde526fb7ae9e9d99768ccbc0dab890dac373 WHIRLPOOL fb8f3a4dea9e0b53d892094c57d28d22171e16bfe6b10e4dcabda4093a3d7ede91d9bf4981d92643b8d8b16c3b2e451d09554ba6f137deec77cd0afbc14d25fa

diff --git a/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild b/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild
index c98c4c5..63c93c4 100644
--- a/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild
+++ b/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild,v 1.6 2012/05/21 20:01:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild,v 1.7 2012/09/24 00:45:45 vapier Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="qt4 linguas_ru"
 
-QA_DT_HASH="opt/${PN}/bin/tsMuxeR opt/${PN}/bin/tsMuxerGUI"
+QA_FLAGS_IGNORED="opt/${PN}/bin/tsMuxeR opt/${PN}/bin/tsMuxerGUI"
 
 DEPEND="|| (
 	>=app-arch/upx-ucl-3.01

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index dab1e88..0bffac3 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -6,9 +6,9 @@ DIST vlc-patches-108.tar.bz2 3189 SHA256 18de61bb0e0d7b4d79b516096c44db4b083510c
 DIST vlc-patches-109.tar.bz2 5292 SHA256 264423f9ec76004d1bbe9549e5c7f935e951ad22ca8377b77271981c92403b6e SHA512 9b48d7290bf284fe27e802e7e720fb68bb4b4b38b1aa3dcd0e58bfc4096454b3caf79322ae33865d1c99ac050d14207052ed0748436540f4847cbc68babd5f82 WHIRLPOOL c493948158818779ced60d11f0a9d559c98f937f1137d78b99ca825fec1c94e80c455e2bb29e52d2dbe7eace8fe47bac3bcb373142eab3c1cadd190073e82f37
 EBUILD vlc-2.0.1.ebuild 11096 SHA256 3c3cf9cd9738f616eff7afdc2335a1a4b66e33e518f36478f8122762e70e714d SHA512 b30d0e28f541f7cb2d5d0e20d6bad5cc6d26561af5c87ac7f605af4de504aa586a2525e7718fd473f110f9b726334bc576af2b7741f7d4525a99cc5093fa6c2f WHIRLPOOL 5746fa2e68eeedbea11a3cb8c72e6a4f1c91319b579ac57a00736005a71a013b06a60a800ff80a2924af188564773d4bd130864457dcb54d5cea633a117880b0
 EBUILD vlc-2.0.2.ebuild 11052 SHA256 8f91921a08abcc36097af3f12ede7a53cf0efe27fdd98aa1e2ea72254d989e20 SHA512 f7aa391e046d81dc0c388f0f9e3a1930c1f5c5b5b0209ab13455d483acf72bdd240cf1a6d3157d08a1db41c5d2e71975f1f58eb5a4a9bbf805b004a769ead1ad WHIRLPOOL fb265c498a96ef330c20af9a07cec0df01eeeff0dfa5ae7114f0472be62b6819724ea62a8b86f3dd6c9cd5e4ba80852c1454d2d1cc1670d9fc7f50393a374869
-EBUILD vlc-2.0.3.ebuild 11076 SHA256 8e0266a5badd9ab0a1e2b8c9515718be8b279866fb896425b19b624440d82e8a SHA512 f42671e6582a1ba8cb420236bf282bddfea816f0a206cb48b471d614189d460fa601d3453987f6d641088b31a9784b66ddfd6bf196aab0a6c7d2f6d2fc211795 WHIRLPOOL a5d7150133a4c5872532e2cdbb9dd9ece95dcf7005f03a9d1838dc597e8b1b1044b53227ab017673d9356c6a86e1690330ed92c279a3488f18d5e5e4d2495e17
+EBUILD vlc-2.0.3.ebuild 11070 SHA256 cb065dd791624ea134584044297154c5416969439ff3a2b133d1efc465456efa SHA512 9a87a48791a95d7fa5de3d75ceb815abacfe315b91b63f360cb154129811ab1c3d7ca5e0b42e877620f9da8f2ebf4358b103b3aebe4f53798f4879f44bc5d696 WHIRLPOOL 72fbe6108dcc510659ecce46c5f9f24c7aa31996051af2f9931a93571a6b1d40e09bd65e103de6c9ab6f180014f53145f8aade5bbe2548013a85f483803729e1
 EBUILD vlc-2.0.9999.ebuild 11082 SHA256 a33f0e98c9965b38807da1dbd693ec042ce586ba3d917b2e81728785f949f1af SHA512 18c37e34fb6b5eeae69cea28e706955796048999e8ce0a9477a7a19f9eab409eeb3be3fc243c940e6aae5ffaca2d0c8ae52b603e8e247d09340654c3cdf02ecb WHIRLPOOL b2ecf1185480c450d4ae814a09b73ff595caecd6422621e7d053e42123daa5dc920351591fd9b1ee0472f30bad624bbc2ee7adf3c753790b099d2bfcf61492cd
 EBUILD vlc-9999.ebuild 10873 SHA256 9300901dde840b22190af816128aae36ca8961932ae0b3249a0acdef6f07ee49 SHA512 470e29d3c821d732f4235b921b28cd7396097d86628c2619875b84a0c28ab2eea7c9a06dabdc3361996b48fecb29505ffaf806560a2215b21a103d74b6acf993 WHIRLPOOL 3da2c273ccc049f99468afa7f787602bca3eaef01c4d6e8cd29887a45f72104bf9ba5c9762fd3702478df03e7057a26d3ac1e5c382114d7821c18e6797a4da6f
-MISC ChangeLog 7749 SHA256 e7b71849685f3227a4b94a94f3a5937e223a86d8528da9e7c9a353208376ab70 SHA512 88d94e3e39a7a8b858631f71f161111cb4408e1c9c2e4131babda17d435bc34e507fa97324fbef06a46726b4e2a0b970f5eb0079f9e5def9ce7f13760e80437f WHIRLPOOL ea1b244decbd6929f1f12c01c232679485ab7f6e26cdca0847d3e54c68bfa7f05867eb321bab87c378d04f57705294848f6d0f836bbdd3652ed0d66d270c9c6d
+MISC ChangeLog 7950 SHA256 10a10e7ff0bd199afbe8a89a4a359efb03a8c5bfab6cdc81cc16d298455ae09e SHA512 d6bb88c30ff60750ef6210210fc71178cd1b10ea536feb6122a100d7dfcfb17c1f8ede66642398fda85f150effb36835bc214bbdbf3c866dfa1b80c1a8e5780f WHIRLPOOL 0cfa73f41192963a7c5103d2aee3454c92c1e760a63ad49a4278f1da947e797e25f8b9b991a76439ced1bd5ccb6bdd23c5c204c54c72f74963f522d9c8392167
 MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe
 MISC metadata.xml 6379 SHA256 05de310ca847b4d9f46124c47fb5e38eb01bdeec6b937760d1d1bfb5189cf442 SHA512 aa507fe94b44b0750e3ba5f3abc60e72eeaa8e15fd9dbd010d36dac30bc361c90d933f1699a753e3070065f1f1f716ca12e4cbef604da8a8039f926d6f681fc5 WHIRLPOOL 416bc2e8f446ed6a148e9849a4305d3b20924bf46d5cf902cbbe68925bf9d64a465884d325d4a735a59274396956e8f7c536f5de4d12ffccdb0ecc69969a28d9

diff --git a/media-video/vlc/vlc-2.0.3.ebuild b/media-video/vlc/vlc-2.0.3.ebuild
index 558f439..fb240ef 100644
--- a/media-video/vlc/vlc-2.0.3.ebuild
+++ b/media-video/vlc/vlc-2.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.3.ebuild,v 1.3 2012/09/11 15:34:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.3.ebuild,v 1.5 2012/09/24 20:08:14 ago Exp $
 
 EAPI="5"
 
@@ -39,7 +39,7 @@ LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
 
 if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 -sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 -sparc x86 ~amd64-fbsd ~x86-fbsd"
 else
 	KEYWORDS=""
 fi

diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index e6c6445..d843513 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -9,6 +9,6 @@ DIST rrdtool-1.4.5.tar.gz 1348713 SHA256 1267af420533d846432e55352db89b0f2507c71
 DIST rrdtool-1.4.7.tar.gz 1349040 SHA256 956aaf431c955ba88dd7d98920ade3a8c4bad04adb1f9431377950a813a7af11 SHA512 5be26ba4d54700553e3d25fe416aa5e752de4b035c91ccda98cdefb0df09321528abef188cfd2049ba40f8a71edb253ff75ada4a5305fdbc6acade64cdf45d32 WHIRLPOOL 236c33d514e3e826bf2047cb20ca7bea29ef9bdabc1b2a4ebf7f14278698bddd6ad927f97a427f35044cdaaa91bd743ac8985ef7201678cae1830b29d9040b74
 EBUILD rrdtool-1.4.5-r1.ebuild 3644 SHA256 83af71703bd2b8939a9c5fe32b113407371f486ca5119290b35f664c2caf99cf SHA512 7afea2d78c344f71dbff12fcd2be8b38d346343927e5412eee7cf390ced27ef2e5f3a85e19f6d5b5d0e179388a0ea66c6a17ad3111768c4906505e7a3afb844a WHIRLPOOL 42bbcae0887f80681cd1463ae6c2faeeaab579be1fa82fb55cca62b1da987c4a64de0e504440ca645eab4835194de5e37d2baaac409c11387356b78c1a5ea6ca
 EBUILD rrdtool-1.4.5-r2.ebuild 3716 SHA256 e4f5e13d11e09fb02fa7c8753e182ca9eb8c92a27d6f40795e4a6c6da970f4ce SHA512 3c4dafe59beb7b3e75829cbb8439e2172412c483e03908b650af12f1d038d6b3e3f970e0603c32b462384fe293d89e78cfd0c2b9f102cac243d5be820dcfa9fc WHIRLPOOL 992ebcb1d4b66c9c6e691c2333792cc281802b4230fa75a4ece4623a1fb1a190de70e88916b7a24fef155947afa2bf7a169c65c33cf098bb6b1b0820eed57ae3
-EBUILD rrdtool-1.4.7-r1.ebuild 4022 SHA256 9a06cfc23bb2d13d132a9366372cca9e4b83094c806c66e6ca6a2b2f6d4d29f2 SHA512 387fd5883ad19281fb201d56419febbc044f1a9be30c9ee186145459dd02776828e66f22f67484c62987d5ccfa9a78f5fcd6851582d035fd0ce80c2594c1b776 WHIRLPOOL 7ecf59d76b36394663697d6ffbc1e068eb6dd13e230e25816894b907e377ccd2ea75fd3a0335262c26a8309188c3c8fa268d86cd9ea6cba6896ac683a1217374
-MISC ChangeLog 35868 SHA256 68af9ed3e096b35fa23f7743a38ff3fd84bd3cc6bdbf061047c599132f6466f8 SHA512 3d93eea4c8309776490a1a19d50ce6319a278ae3b471482727c634025c6fd1dfe66d9eaed120c95d169c18061313466d2871b551c0bce88d2c01892aed94acdb WHIRLPOOL 4b262cbddd028768e2d3ee1001f38c28fb4474bf646d885cbe8e1d16fe3a2c07037e3f01fbbc1490c946eb8ed54e051dbbfc0100cd958e2cd26a33bce8c7aa22
+EBUILD rrdtool-1.4.7-r1.ebuild 4023 SHA256 8e39c94e15c87d697acfaeacb74d3057ca330525f40884f552e2bf66009595d1 SHA512 96c3b6a85c3277e850af8f276b9c97ee563aa43aaaa8c8417d569903b44c3c53fddc6858a0ef5f4735b19bedecffe653c1846e88f843ba4a3163a3ac93e25e4d WHIRLPOOL 097f85a85e58da6189afa8c36fdd5c0676b6fb48495fe69c8c2c9cb3ec304cb27594beda7aa9f003aebf7dc9d63ee2b8c727b375aa2c0f5b7ab71f190d82a236
+MISC ChangeLog 35982 SHA256 4fb6c99a408344728634bc6d432f2c13a8d97dd74f5386e5e4ca36c73263c725 SHA512 ae1c18959ce8fdf745f02cce8f8b7747100a3373e9396fa29295d05f6d096ebb192972448ddea0c1dafd6064af7bcd6712fccee89efc58eddff22b5690309389 WHIRLPOOL 280ab9689ad2b4e6fb227ca3e4c5fa3504ca6f252a9321fa00203e30238881104462e861c7c01ca0d565a25aecdfcdb12e07cd3eb432ef3ba5c4fe485a671f41
 MISC metadata.xml 314 SHA256 e08a5acfe66fb546b0ea85e9598baca57ff3979094399e1c60507a718a5151c5 SHA512 2eb70d707167c60e86ff9e13139a57858d0f6382413434d877f11b63c47d1bce38da67165fbb0b9754840e7661d733ef40c7c0112f5b974d245f8c97d5082f0d WHIRLPOOL b026e9b4394948337e3cddb988419df464bae13b8d620b493599f58dca6491eed7e57e3fbc8fdf710847f7d2ecaa6858a2614d4bf1f7839402fe9b13501e57c6

diff --git a/net-analyzer/rrdtool/rrdtool-1.4.7-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.7-r1.ebuild
index 8344532..ac031de 100644
--- a/net-analyzer/rrdtool/rrdtool-1.4.7-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.4.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.7-r1.ebuild,v 1.7 2012/09/15 18:18:59 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.7-r1.ebuild,v 1.8 2012/09/26 15:07:00 xarthisius Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="dbi doc lua perl python ruby rrdcgi tcl tcpd"
 
 # This versions are minimal versions upstream tested with.

diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 3ab26ed..77afb6e 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -8,9 +8,9 @@ DIST dropbox-lnx.x86_64-1.2.48.tar.gz 16574521 SHA256 406ec2b10bf1c19572a9977483
 DIST dropbox-lnx.x86_64-1.2.51.tar.gz 16578440 SHA256 692862a685f4ef0424ea43eb3025244db3ae8078a70ad82a7f17d6de8febab00
 DIST dropbox-lnx.x86_64-1.4.3.tar.gz 18546137 SHA256 7b93436027d961eb7ec097f1695a1361b3262b45d90ea445a3170a0faea878ba
 DIST dropbox-lnx.x86_64-1.4.7.tar.gz 18570864 SHA256 a9ca298ec869cabe1232e42c2ab7d5f84935f75602f6464b7926a7e5b2ca84c2 SHA512 b05f2d909f3c3b51acadbf715312afa18385f9366e82b4ed9f14bc42d8197a38744263f793552793889bdf9ece4dff0d97ad57f584d6d5f5fced5549e4e4b358 WHIRLPOOL 89483c05a5b843190a3c11bfb04290b9253a7ffab03bbbb76f4a6de00ad957b3c4aa29775c2c8cf5c95ff84feb2f24ee65d66ea2754ddf4b95cd0650f0a4796b
-EBUILD dropbox-1.2.48-r1.ebuild 1392 SHA256 c7c7ba7c97802390a2f6d5fe30dd6c67612f11df8caba9b6a26373003a504c1d SHA512 d967f7b8c8892005ec1770d364ab216399b44105293b67955c56898921038c5c9da001fc5b88ef957e695e9b91470353c1138c1652648a910954955b4e26ae7d WHIRLPOOL 2248fcc6f6dc8f0134bb7f5c3a3cc5b473f359f40c8ec536839f780290b3fd991f785b4e33c371b722c73bd27cdcb55e8766a557f24d0d998be4624c074bf35f
-EBUILD dropbox-1.2.51-r2.ebuild 1879 SHA256 c01d4fa922f8add80fd48d5f2845cc256775cc5b7b8aff18d5420359460ab5e4 SHA512 741b62c14a86f7cc76d13bd48d139a40432294c75869a82489c8f85f7c56763d722d9bd9eaa860a88c3a93a5a145161f460a551ed363dc47f9fe38681029c8ca WHIRLPOOL 6ea4e8577411bd8399ad0e3baf0b649b90879ec5d42853e730642646d1f2a73da9a2ce864d7452852782e5b19b2d45f4550f70bf02dc628886dab830c05d2d3e
-EBUILD dropbox-1.4.3-r1.ebuild 1993 SHA256 b77059240bb5eda9004fa1df2d43aa33a889289936eb39122f2034e368952420 SHA512 a24dca079057a63dd99999fc2017722101e827e4f7d78f449f4c3f08919b5d2e1c18753d85eb6bc5582aa520447df39b7912b705bd5af99ba66ffe8420524311 WHIRLPOOL d7eca070dcb4aedfd3b934d645e3f122b78747bc92ac46cebdfe08f557379dc59206fb525b246e94dacd515f5026e8a9f77106a745b8839e09a55bc62c734034
-EBUILD dropbox-1.4.7-r1.ebuild 2005 SHA256 d92ecf4e7aac4b41cad511d0546764101c5d53473c4956a78f7387018cf3e64e SHA512 b8eff6a0308a28b4a8f7743d9095d429b25bb2b47d862b53facbc10434d2d4e1b153c251400cc848d60be3a97ee3896a0849469ba43618f102787dbaa7653be0 WHIRLPOOL a8a994af9eb6c7e4a376ec2526234c701484f0b0bbadb74e3545604308f1dc21af1b5b5448f3ab497b0351b7c7172bd42c2f50146ac4551813dc1210d62498f9
-MISC ChangeLog 4481 SHA256 44f314cb956ad8f279805c9e24afd2f817fa2c25d922c8fb37639f764c54db01 SHA512 582f31b47d245e98f3d2d13db4354cb13839dbfe39db9deb742115e96702d2e2aac8714d96ccd98fbdd5998821a53b6941d6464c8e6b28120c285a12751dc1d3 WHIRLPOOL 5a7cb32255e25cf5e964caa72750652c1398ff4466b0d75f6796ade9f22a325de33c40ffebb90170fec6c30b13602f23e56ce5d687cf17c6d5fd927e1c335e90
+EBUILD dropbox-1.2.48-r1.ebuild 1394 SHA256 159c913edf0bbad677d9da7d856242318f9d5169e42c6137c94f624f4d232692 SHA512 73c5a80ce3887e3eec53058010ce6e85e6af4a03e74224d89bcca80c0e150465c3508df6a85a6135ea74799e68498732166c1297ff38d61bdbff8db481e8d434 WHIRLPOOL e4c77b798457a6663237c0724db62379419b572a68f47dbd3b5f0feadc841683d0da08cf33c09fc3b08dc3e6fcbba831a9f5c50f46766b5a986201a584aa8074
+EBUILD dropbox-1.2.51-r2.ebuild 1886 SHA256 ae1cf0ca1531ca90acb19c292a793b9cf3a5bb115ca949063b78421cf17484e9 SHA512 645dd193cde9bf1b27aa6fc44ab5a38b1dd5b66b4fa66c5c0d7b6bd63431e8d25a893fb627b0ed662b6f17f87d3e875b9559dad41efcbe547788dae9428d5faa WHIRLPOOL 5c761d9dccbf97f2bd80b7b4b51308099f9447a2b0c1fadd8e44ae630578770f94e1d0371f211c1eb7c694a986432c75675732d42a73d1265776ff5487f39e0b
+EBUILD dropbox-1.4.3-r1.ebuild 2000 SHA256 4662166931b77e713661e7269b569b57709089470c27472d16972811eaecfdad SHA512 4ea7aa744262472e5157c38cfb39d8b337a0d61f0c0dea15a97c6784967e5f96bc6231b435ba3c3137af9ef41790688f61859a0c54e9902762bc90c3a8142eaa WHIRLPOOL f16755e1e876b9d21244872777c878904fe6f6046be60d8cf08f54408224204c5f480d6dffa2304683863c3730eccf2e76ff150988259c3956f49a06776ef5db
+EBUILD dropbox-1.4.7-r1.ebuild 2011 SHA256 69842005dc6173df4c54ea56317f5d67ea8684c51f4aeae18878bf867934f35f SHA512 34d800ebbf5fc98fa5e344cc3d43e1569d279dafeeca9bac13e17f14b9fca31917810e2e2d390045d4b4ebb5c441e427b77e08c8fe64313350aa653f25b5fae7 WHIRLPOOL 145e0646caf14491aabdb438e4bc4157a649bce3d67dd345d62480a81d11bc7375fc6da4ea609fd2d7497906b0d6aa78c1b8cf0b90e9a1b02cfa963abd167f89
+MISC ChangeLog 4701 SHA256 fcbfbf5fb1305ea235a23d6e8c4da975d3da1704afd6b2e1c8a57e159d69fdd7 SHA512 e5d3e44173b407b3728b2753e0297f4fc371177697cb471498144fc3076723378c01e6a29d1c1306169099f3845845f06958bdf2cb8c878b615b6ad8f02bc099 WHIRLPOOL 8e798eab60c07c629e3b371af13d789ffb89208fed26b3a01e8122426d8f825c16aa96dcc159ed49a42b611c542eaeb8deb758acfc42ec97e62f4f44fa6b9209
 MISC metadata.xml 285 SHA256 9aea162d0e73c42a22183dac59a6e57f5e695bc4020d41377aedd731a1a4ad5f SHA512 d5b85b34badc10a4e18457c94c47d13bac2a7a30c3d33ddd0d505d23e6faf60746d650fa2085bbd3a292cc0187bd03d099a211264f858273bed8d4ec1dd506da WHIRLPOOL 1e44d0937c7d2913c22025197d39b09eed3af3afa6cf6047ede0dd6bf17505af05422af26fe24729a1fa2085f374662cf432ebf37bac955dc0f9d8b4c146cba9

diff --git a/net-misc/dropbox/dropbox-1.2.48-r1.ebuild b/net-misc/dropbox/dropbox-1.2.48-r1.ebuild
index edb05bf..b297f2a 100644
--- a/net-misc/dropbox/dropbox-1.2.48-r1.ebuild
+++ b/net-misc/dropbox/dropbox-1.2.48-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/dropbox-1.2.48-r1.ebuild,v 1.3 2012/03/08 08:49:09 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/dropbox-1.2.48-r1.ebuild,v 1.4 2012/09/24 00:46:46 vapier Exp $
 
 EAPI="4"
 
@@ -17,7 +17,7 @@ KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="mirror strip"
 
-QA_DT_HASH="opt/${PN}/.*"
+QA_FLAGS_IGNORED="opt/${PN}/.*"
 QA_EXECSTACK_x86="opt/dropbox/_ctypes.so"
 QA_EXECSTACK_amd64="opt/dropbox/_ctypes.so"
 

diff --git a/net-misc/dropbox/dropbox-1.2.51-r2.ebuild b/net-misc/dropbox/dropbox-1.2.51-r2.ebuild
index f3a1101..dd79c3f 100644
--- a/net-misc/dropbox/dropbox-1.2.51-r2.ebuild
+++ b/net-misc/dropbox/dropbox-1.2.51-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/dropbox-1.2.51-r2.ebuild,v 1.4 2012/07/08 20:44:32 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/dropbox-1.2.51-r2.ebuild,v 1.5 2012/09/24 00:46:46 vapier Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+librsync-bundled"
 RESTRICT="mirror strip"
 
-QA_DT_HASH="opt/${PN}/.*"
+QA_FLAGS_IGNORED="opt/${PN}/.*"
 QA_EXECSTACK_x86="opt/dropbox/_ctypes.so"
 QA_EXECSTACK_amd64="opt/dropbox/_ctypes.so"
 

diff --git a/net-misc/dropbox/dropbox-1.4.3-r1.ebuild b/net-misc/dropbox/dropbox-1.4.3-r1.ebuild
index 22b10d9..e757a7d 100644
--- a/net-misc/dropbox/dropbox-1.4.3-r1.ebuild
+++ b/net-misc/dropbox/dropbox-1.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/dropbox-1.4.3-r1.ebuild,v 1.1 2012/07/25 02:39:58 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/dropbox-1.4.3-r1.ebuild,v 1.2 2012/09/24 00:46:46 vapier Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+librsync-bundled"
 RESTRICT="mirror strip"
 
-QA_DT_HASH="opt/${PN}/.*"
+QA_FLAGS_IGNORED="opt/${PN}/.*"
 QA_EXECSTACK_x86="opt/dropbox/_ctypes.so"
 QA_EXECSTACK_amd64="opt/dropbox/_ctypes.so"
 

diff --git a/net-misc/dropbox/dropbox-1.4.7-r1.ebuild b/net-misc/dropbox/dropbox-1.4.7-r1.ebuild
index 3a20937..b94c472 100644
--- a/net-misc/dropbox/dropbox-1.4.7-r1.ebuild
+++ b/net-misc/dropbox/dropbox-1.4.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/dropbox-1.4.7-r1.ebuild,v 1.2 2012/08/23 03:31:07 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/dropbox-1.4.7-r1.ebuild,v 1.3 2012/09/24 00:46:46 vapier Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86 ~x86-linux"
 IUSE="+librsync-bundled"
 RESTRICT="mirror strip"
 
-QA_DT_HASH="opt/${PN}/.*"
+QA_FLAGS_IGNORED="opt/${PN}/.*"
 QA_EXECSTACK_x86="opt/dropbox/_ctypes.so"
 QA_EXECSTACK_amd64="opt/dropbox/_ctypes.so"
 

diff --git a/net-misc/gcap/Manifest b/net-misc/gcap/Manifest
index eefa73f..8bcd823 100644
--- a/net-misc/gcap/Manifest
+++ b/net-misc/gcap/Manifest
@@ -1,4 +1,4 @@
 DIST gcap-0.1.1.tar.gz 20612 SHA256 2941788de17f74fcd245290b233e4039ae71ca7ba5e90a400a19d551cfb545c3 SHA512 5206bdbc7cd5265456dd0b1a2c028c9ffb5e1324a0527c16ae2d74ff93e82e56bfc9e498f94d9895108265ce5e87c5510aece5ef61011f3128bf260eeaaee52d WHIRLPOOL 89c40c45b4026a601ffddc09254300ec990371c11095ac441392a06fcb11d63dc802749c7e7a7267dddb79129b37a07ead81d37b50d6ec39d8cb53e1457f7982
-EBUILD gcap-0.1.1.ebuild 611 SHA256 27b2c5ffc51f0f07fd5a4274bbf35e6e9a1c167378cde06fa8047ee209f11da7 SHA512 04ff06aac0b0288ae38eb0fba864fa130f19537267018122ed5a486c8acfe87acef005ae4f2057c3051d5c87ba3a06c62d4e3e327d03e4f659cf56f1786e26d5 WHIRLPOOL 63df0b0da11aa2e55f7b5eebb84280e2b04c65990d1bf221b9f30b60e5e5aac80747eff1c8bfcc95a698435b3875ee0d136e59cb425755fc3f3c2e5b459fa008
-MISC ChangeLog 334 SHA256 ffa3715dc41ff62ff0fc2fdda27a950e5ff7e8406dd6ae7f0ed936097dc283d5 SHA512 b38bcae1359deca9be3d7e3eb1b2ac08773da52c0d51cb1ddc088446b5cec01c4299e4af740da07649ad207baa770c5bcade60f9d7c8430184af662b7570b329 WHIRLPOOL 131e4d6b4bcdb36de2851062398661f48dabaafd19c85b7117aa8f0fb3d8043d688e3b4eab7b7a827388670e089bb2ae5fcd5be175b649ae3ecc1ff9d1885435
+EBUILD gcap-0.1.1.ebuild 605 SHA256 8857b02b07025004108d2c5df5c947717ce502c0192ab245974b569b8d6fbc47 SHA512 d7158d87741633541a76d806935d3c2b7d5774684f592b05365b68eb3657dc87188170fc0f64df8e72949488c66a71f64a3b97270754f7c140221e0dfa78a707 WHIRLPOOL ac013650876f7c5d0866a956753e537159e89cb075594143284413f41235f144295ea5ca69db67884c88c2764b725ed0aab31c2e183f66b51c88bc75364d6cd3
+MISC ChangeLog 433 SHA256 17f0ee878bf88562d29627a430d71204f135589734ac1947b32c47edbc94898b SHA512 bb3eb9a96720d1fb7ad74585627dc5b6dff1b99bbb3c46e51ea50abf28cc350f1412380ec5079a56cbdde62d78aaa8673c2eea5f88a8f467ab598a477928ca5a WHIRLPOOL 780ee3d4c90c99e60737af04be85b28e7ddc2a9cd0f1d5db1962639c33e7d8ef2def82af4ac76065ddd3cf6cb27461442029e914c098daa3912ff51baa059891
 MISC metadata.xml 235 SHA256 11ffaf6c7e9d3f8dbb48fb60cd443d87b61015bc3197206ca230f5c2b0c1e013 SHA512 8ff2114c96567a53f83cd07149d1530286182f54b3d1286b9ceccea41e85734be19d0f60876c73880d76baac48e698de91114bfda459e2ee6ade9c3237847133 WHIRLPOOL bd4bb26791fe245f1c2407aa690887524eef3e76de87b4f2b7049f436661ee78a669e4fe4415e227aa50ee404bbfbaf1822fa648792919f93cb3674fa0f55858

diff --git a/net-misc/gcap/gcap-0.1.1.ebuild b/net-misc/gcap/gcap-0.1.1.ebuild
index d792829..abf767a 100644
--- a/net-misc/gcap/gcap-0.1.1.ebuild
+++ b/net-misc/gcap/gcap-0.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gcap/gcap-0.1.1.ebuild,v 1.1 2012/08/20 15:08:29 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gcap/gcap-0.1.1.ebuild,v 1.2 2012/09/25 11:15:43 ago Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="http://gcap.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-perl/Getopt-ArgvFile

diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index e748ace..cdd8b89 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -5,6 +5,7 @@ AUX nx-3.3.0-cflags.patch 1322 SHA256 88e9506a5809e1357c29b4f0ec1777b69335e35e90
 AUX nx-3.5.0-libpng15.patch 835 SHA256 04333308521101d7ed751d98c45ed4e34ca6e1f940a2e5914ad1c10b9d7a83db SHA512 c5feca65878aafed44817209cb5f17f57216d55c6ac889fbb878c3762a59b4d99a29e7c5c576e996b4bf70b60a79f85bd6427ce75354c9b9ac3dbf587cbaa043 WHIRLPOOL ccbdd01ace6d3d29006a34b77438c805354ec11e79a339ff2e6bd1f48d2beb6aba458ee719c0cbd276496201719eae7b9627c459c876cea0c2a39eccb0a25006
 DIST nx-X11-3.5.0-2.tar.gz 20345475 SHA256 11a48ea553c31da9f04a1dfa0a190efa7eed3b6bd4280a22ddbd602a754cbe22 SHA512 908566ab3ee0b03098516e92531d4234237ae854c6a83a11d829efb8ababa00e704380d25b28ef072eadd489c160a414806dbeb1f70102fabe35779b3a1a168d WHIRLPOOL a543d555cee4cb62c07de762e1a19201b98047328a33bb971670fe5c2b7484893941f9216b076b93d4a14e8072d1102ee3633e48b508e45e476c1350c019c316
 DIST nx-libs-3.5.0.14-full.tar.gz 21888558 SHA256 afdc51cfe0a881492517bfead58358d57191c9f2f3220e44bc85605a6cfe7b8d SHA512 2b3d9f7b18a4a07cad826c6b3f0c47085922ed9642f743c1ba8b3a2ecc621a3d95d24cfd70fb1c14f6b4252dd16c56e3c86d2b12f1a6a703d336243e466a39ee WHIRLPOOL cd0aaecc0cd969f48ef9a77515b4e98ff5b14669495b4efbcb36985578a6985045e4208c1ca08ff731b589c3a8fe0223e33af9d52307632222426a0721b43009
+DIST nx-libs-3.5.0.15-full.tar.gz 21887518 SHA256 0edfe8031e917bec5f9b1fb3750022b9460c0321d53fcd08111c69f49fa6837e SHA512 1d221c3a6cd970a092a368f1fe5a129401f21894785b2df5a243e7dea91edf7a36d937dc0ad498698b5d6ead5e79488c433594907b2244eb7f134b7f2fe3b9da WHIRLPOOL 9ed089bbb2c793109b056075a19ae5e5c9124b2bd42f2c7db6140b80a70342a78becb48e29f132e58d87a59bdac2b53d3fa05244d07431068ef64460cdb7b491
 DIST nxagent-3.5.0-5.tar.gz 1515411 SHA256 74ebd64d350002433e93a4a13dddbbee416547e6a33048a044272bf4412ad864
 DIST nxagent-3.5.0-9.tar.gz 1510400 SHA256 05c8c1b46eec9496dd6be87f523db0acab5ee18e182fd1128637d7f1b74b138b SHA512 8c49e475397bba39a55809798bd54bf7274d19912d9c413b7ab88393b42ae59bed7cd91124e4ff083ad5ab7a6075b7c2ac7ccd7c2c98a44d8844cc675c0f6e86 WHIRLPOOL 5009c6bfdaa71dc009815890af539272f5a71e44c95e7429c300f335e79d1e381fe9246d5e639f8bb04cc50386af3a9bf1f0306a11d1d549a9b250391ae82a12
 DIST nxauth-3.5.0-1.tar.gz 30671 SHA256 93d730075c486dba7c8fdd41e1465f0712237cb9580d195f65784ce203ce3257 SHA512 4c1b2dfd95beb40f010134fbbda011fd2de43263eec0843457525114199eab56af9c84b69fd826a7f089d053e1437674850f20ae38dcf236e0624d5aeaeb964d WHIRLPOOL 326453ce08180b5c06d6033097dedbfe3df2c1f9182c6addb69af2ff0d1a601ca1b6c58f80b9b78850eea2398393b979a8eced84b801e83bea0587a5d10845d7
@@ -15,5 +16,6 @@ DIST nxproxy-3.5.0-1.tar.gz 80194 SHA256 8aa59727dfcd914d73447992120e100c20d17df
 EBUILD nx-3.5.0-r1.ebuild 3380 SHA256 8ffcfffa5b5da8e5667f7b022a6b3e68ad8a637e44a0bdeebe443023cf6aafe8 SHA512 ba4153876c46ab6ba5c6d08bdfd2f947c712018217563926adb9ad797290cd6b5744d055173e747402e153e73491c866c8fed66a10917968eb72d6063b9e9913 WHIRLPOOL 21216421f3348acf809b4209ee5c6e023212936fc9c31e7d2bac2df8e68f4dcbbc19af748fd055274cc7ad254182f358b7b88f4618ca3a765edfe0968bc3be19
 EBUILD nx-3.5.0-r3.ebuild 3380 SHA256 5145b195eb38aa225ab9757400d0a4f59f198db7c9caae1886eb6e04b0ce9753 SHA512 41d6acc25784df46c224dd2c8493732fbf37d693caeea4bf1c0501b0f24ccc3d379bf705b3d7f104bf595e6c9d789eb8b96b45e5e1577efd05e607905f69f53f WHIRLPOOL a34125195464e97378439b1ac31ab3202f2451f183688be5b1d66e58771d4b2e1192cb9ece6ed20ae78ad380c0666885a311e293b95323c571e5ef970a5f1040
 EBUILD nx-3.5.0.14-r1.ebuild 2587 SHA256 64a090f387bf415000499887390d970176b214c27085a185a0c6f09572e769e3 SHA512 ab23455b9bd52629edf7afeb45bfd3a2d86d881a00c9db714d3d7f20a56cd2ccd955c6c28e6b7d662fa209b3cdcce95097623b2d06945454e8b4d00e1138a47f WHIRLPOOL 834b05075aa153bd2742f92214ce87af3c4915d58369d98791af6a102e602f04d72b8d3a7c7998b1efa12d209005f2a56a0f9d14393f95700632fa78684bb009
-MISC ChangeLog 10780 SHA256 de4d5f4ffd828ac7d713d2ccbf136645ae4efab46a45b974e7bf1d6dce99c5e4 SHA512 ce04e8c041b832529ccaff9dcd6b96b918757837063c5eda8e31e533b2e728de595e279e3c4f520e3746d02636b865ebad46ce1c112e00339b375b1dfebb2b88 WHIRLPOOL e42ff5389c2f78def811456bd4d29befbf2718f8047a4a22d0b1a8b1299c4d9a308cbc3b9d1f33a8a5999034d1a849d412d02f37e355444059793fc293ef09c2
+EBUILD nx-3.5.0.15.ebuild 2580 SHA256 59816a65dace25c6dbc0c15dcd79c4b72a5fb4a998d4d2694b78190b2c4bad08 SHA512 09530e511b836bf747a0932e45cf3da3c307318f087c64f67125ce771e751c950e706c5120b2ba81ba9016fe1871b88793a6ca873b7a26db7f6fe851dacc31de WHIRLPOOL a1959837ac8c384897ad2c48820d3179198a1e013aeaeb911b7a5bbc006a2bebc3be7de3fc628b16f9ac8f7bc218df0006cc7dab03c5f3be098a5de38ca3bfac
+MISC ChangeLog 10934 SHA256 d6cb7a6f00a299910dc376c2d04e1e2fe3924970d40fb527664a7d503abce738 SHA512 3da962417972c3be5dbc97d46ba1c1b0b5c16d376b144581dff6615e0eaeec5fe8eed3262e7a880e06ab2b7270b367cd652fb792ff4f49dba6c8c488a9aceecf WHIRLPOOL 2ee58d623eb1d4482bdb510d75b6924bf13eddb7a81fffab6e7e745fb09e72bce1ce24e9ea1ff42e25f0ac01fb214f842cfbc0001bd9032e062539dc8144e984
 MISC metadata.xml 254 SHA256 2952f5071f21b100d9704142bb38a3e126a2ed3f41b4232e213ce607f7780033 SHA512 ec6af573e67162251786be7ef21a5ea10a4c5ca8b9f080828fa5b72f5d20862150b5033f80afdb6665b243bd24d1c82348b65c91855f4756c5585738a7ce4286 WHIRLPOOL 4456b9fe62e80868740cabd66c246a77ebdab37904be853b977a38a974f07e89d3abcd82e3502e741bc7004016b455768b08ba9cda76bd42a535b1d3ac6ca2ec

diff --git a/net-misc/nx/nx-3.5.0.15.ebuild b/net-misc/nx/nx-3.5.0.15.ebuild
new file mode 100644
index 0000000..411e774
--- /dev/null
+++ b/net-misc/nx/nx-3.5.0.15.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.5.0.15.ebuild,v 1.1 2012/09/25 14:11:17 voyageur Exp $
+
+EAPI=4
+inherit autotools eutils multilib
+
+DESCRIPTION="NX compression technology core libraries"
+HOMEPAGE="http://www.nomachine.com/developers.php
+	http://www.x2go.org/doku.php/wiki:libs:nx-libs"
+
+SRC_URI="http://code.x2go.org/releases/source/nx-libs/nx-libs-${PV}-full.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="elibc_glibc"
+
+RDEPEND="elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) )
+	>=media-libs/libpng-1.2.8
+	>=sys-libs/zlib-1.2.3
+	virtual/jpeg"
+
+DEPEND="${RDEPEND}
+		x11-misc/gccmakedep
+		x11-misc/imake
+		x11-proto/inputproto"
+
+S=${WORKDIR}/nx-libs-${PV}
+
+src_prepare() {
+	# For nxcl/qtnx
+	cd "${S}"/nxproxy
+	epatch "${FILESDIR}"/${PN}-3.2.0-nxproxy_read_from_stdin.patch
+
+	cd "${S}"
+	# Fix sandbox violation
+	epatch "${FILESDIR}"/1.5.0/nx-x11-1.5.0-tmp-exec.patch
+	# -fPIC
+	epatch "${FILESDIR}"/1.5.0/nxcomp-1.5.0-pic.patch
+	# Respect CFLAGS/CXXFLAGS
+	epatch "${FILESDIR}"/${PN}-3.3.0-cflags.patch
+	# Run autoreconf in all neeed folders
+	for i in nxcomp nxcompext nxcompshad nxproxy; do
+		cd "${S}"/${i}
+		eautoreconf ${i}
+		cd "${S}"
+	done
+
+	# From xorg-x11-6.9.0-r3.ebuild
+	cd "${S}/nx-X11"
+	HOSTCONF="config/cf/host.def"
+	echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
+	echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+	echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+	# Respect LDFLAGS
+	echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
+	echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
+}
+
+src_configure() {
+	cd "${S}"/nxproxy
+	econf
+}
+
+src_compile() {
+	cd "${S}/nx-X11"
+	FAST=1 emake World WORLDOPTS="" MAKE="make"
+
+	cd "${S}"/nxproxy
+	emake
+}
+
+src_install() {
+	NX_ROOT=/usr/$(get_libdir)/NX
+
+	for x in nxagent nxauth nxproxy; do
+		make_wrapper $x ./$x ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||
+			die " $x wrapper creation failed"
+	done
+
+	into ${NX_ROOT}
+	dobin "${S}"/nx-X11/programs/Xserver/nxagent
+	dobin "${S}"/nx-X11/programs/nxauth/nxauth
+	dobin "${S}"/nxproxy/nxproxy
+
+	for lib in X11 Xau Xcomposite Xdamage Xdmcp Xext Xfixes Xinerama Xpm Xrandr Xrender Xtst;
+	do
+		dolib.so "${S}"/nx-X11/lib/${lib}/libNX_${lib}.so*
+	done
+	dolib.so "${S}"/nx-X11/lib/freetype2/libNX_freetype.so*
+
+	dolib.so "${S}"/nxcomp/libXcomp.so*
+	dolib.so "${S}"/nxcompext/libXcompext.so*
+	dolib.so "${S}"/nxcompshad/libXcompshad.so*
+}

diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest
index f1ce517..e8f4e6b 100644
--- a/net-misc/youtube-viewer/Manifest
+++ b/net-misc/youtube-viewer/Manifest
@@ -1,7 +1,10 @@
+AUX youtube-viewer-3.0.1_p20120924-desktopfile.patch 547 SHA256 2690f3382533f2fd20c16e11488d46897cb9e4b47cc1b12174ccfd316b10458c SHA512 556a1c7db4ec98f774bc7efb66c1581325b6a0979b2160e819209b94aae484c431248a1dbfe05979d41ab2d7ffb1547a86f7651e54714751e0f05599b396a6ce WHIRLPOOL d1d713c114e15e8b2bffbf2ca5d6eb19a50f691c7453231c2412324500151ee9723b84d7b862229f733565f2972759c0dbd428092ee4b07808dc4c43a7a39d9f
 DIST youtube-viewer-2.5.9.xz 17520 SHA256 874c04add55f7f0c911047e5efc62dc005d1a8b8237cca7d56629e31469d1831 SHA512 debd5b07689773ce4cfbf2df9a45bb9e95239a42ffc88d1c8150d2b005f54e0d6caf7c86f86a5cb597d75b5b926c4d3b69dbc5f953c04791cdec968cf7508d3a WHIRLPOOL 2d390175c928f39c3445bd5c91f17ce35bb06e46951456af0e6efd47fedeb9e218d9704220effa34e89888eff00c0073247844a649a7eae1112b50b8cafb6f89
 DIST youtube-viewer-3.0.0_p20120820.tar.xz 25872 SHA256 5931f8b6159793d8f9780d8e7577c2e02588930bedbba0e4afe8f73add14e805 SHA512 bb50004e40a799ec9d8aa48f7a39c07472f00d8ad226bb86fca5f6b5460d690fa0864318cbbc336c1e0655ecebadc0eeb6f4638734440ebcb09c75bffea22c95 WHIRLPOOL 91c850f5438e577d53ddad6d21707968ba2040aec88550cc7e203b0af51f647fc8d2953e8ff85dead2e2bf4818afc3e85bfd4d7406184f182606349617a5ed92
+DIST youtube-viewer-3.0.1_p20120924.tar.xz 86748 SHA256 ed02d328c3cf728a94f7f0b3d6eddedee3b2139ebd0b4667d4ea1173b2aa0025 SHA512 5a5a18651f2cfd2adbb903443e12223df42fdf99b2eedbf32d88c3685a8580b93c9dbbc149d392e979ec044bd9aea431704047d48e525ab97e8f3c289faf8968 WHIRLPOOL 787ce8fa6a25e154d80c3983ee0df329ae163ad4439cd2c8e3026148cffafdbc086c5748674e98d69834d7f4c78dd98c83dad8eadd9c1cf419ea58ad5b3c5516
 EBUILD youtube-viewer-2.5.9.ebuild 663 SHA256 1bf3d4b560d5d14810a57fddc6ce6ab61494b452997229168d5c90834c8a979e SHA512 831801f5a815db9e2a4cbd3d3f9a267ecf466c63c7abc6695fc2d27ef13515255dee7fa0cf73ed9bc64e2c262f5b4228080db92de493d05bcca09b81b4706ab9 WHIRLPOOL c1f10ebed2079106cc71e81f6cfd9b1ab2b75494d7e9dbff6b3dc39e59908dbf5af8f9abe186f7e79c6e97881b984a4d588ad1659a76f1474d557447ba815dbb
 EBUILD youtube-viewer-3.0.0_p20120820.ebuild 1106 SHA256 b51ec77f98886392911260621197002493e14c87c95ee706b8a46879f46b8384 SHA512 f1cad2e53de2d38f4132d27c2e72b856a135ad9bb54c67af7826fb7966a03e288124ab1ec4f701d0c70f8c2f74c42418d31ca4332ffe19103727449f96fb46fb WHIRLPOOL 5efb37a5c213b1b1d0ea20bcc686d053ecf3d02384341d503ac190363078eceecdf076c1a56aafc03db891a96c75a777e00709fec98990f71c526eeb532d51a1
+EBUILD youtube-viewer-3.0.1_p20120924.ebuild 1581 SHA256 6422f4303d8143ae3bb6f5b09c2600bb43c1e251727690fafe4b4a40961e475c SHA512 4a80e32a4d60265d8e2fd99f643b0307b866e87c6cd040c0e70d5670b4f1eeb790078ad1c2b88e4841259115d2a57ef28ceadb76ed61e2543d903a5c65cc85c7 WHIRLPOOL 0b67d44f5a0df6a7c4765bdde53a09bab85da6fae8fa4e5eee1ea4d97341723ce9234d332ad558f76dc91decc17e2406c4a7e89227cfc2d403eb0afc04841713
 EBUILD youtube-viewer-9999.ebuild 1148 SHA256 66ad56124e07659262427845672422ed8f596d57277066be8f21084e546b1bdb SHA512 e653af9ca4e1b2ede7cbadcab6464f2c92094ad3b44ef66a244ee629d0ad9c5dc0f6420a6a2f233bcc12370cd45e86c2f57b431d577d247c2b193ff69929a88b WHIRLPOOL c90b12fc03ee009fad9fba458f6d9a9796d94e061046e6a5c0f787d251820d45042b805df85e9a7f36559c94a0e4241e72e58f05e95e346b0bbd4040f3dbd54f
-MISC ChangeLog 1769 SHA256 675f1536afd83cf2c93836a10b4954406774f8c052f3447bb55c84da12aa0c87 SHA512 364f6faf9cadac98ae95bbe8b756b6454a8b79b022f8a25f0d7405e865ee15955d930ad16340895ddb2ae2bc993d0528a62253ed1c5d98a1785ba8475be4bde9 WHIRLPOOL f6cd2bc99b92cbcc814fc6e7f6db5855895ee1af8dc55ebb10a9870b9c8c754882e24ade4b56b81cbbcef1cf75060786e90bbe1c633a2962ec923500e49bad43
+MISC ChangeLog 1984 SHA256 e13045f2004a8f766c511fce9b2af479bc2b54061f499118caaa0267a231d312 SHA512 fec928bb4fc204a1a6f5867809336d20e4316294d1fdfdbb93b9b7802f2db5f4a5da0eaa806126c62bd0fb9853c553891ea5cb3c6318dd345d83f726c9f22e3c WHIRLPOOL f11bdab30f775e3629f666e80f9f23b716a3c740de45bf49060ca2731e7e3400b3c6cf6b8034433f25a46f100a1a48e975278b9ac0fc0940bc88332d675242df
 MISC metadata.xml 708 SHA256 7bed4577f83f9c1a55a170f5d2e55fb04d86484c95f4a6924536d1b0c7f3e714 SHA512 6bb45dbc64c4572aed09dda27ed559c2565f662a29af6d27226dd9245d52d03ae56bde09fad2cbc35ef2d54cf6cd1e632e467b93df5750c5ce0b3849425470d0 WHIRLPOOL a698abc1877258c64d429e5acc858c99ca0069c70b3171d346c4aada1d3ee1bd93d58f0747b858a70cf4bf5311e7950f7cdd94fb8aeac4cda37872e7b21efd40

diff --git a/net-misc/youtube-viewer/files/youtube-viewer-3.0.1_p20120924-desktopfile.patch b/net-misc/youtube-viewer/files/youtube-viewer-3.0.1_p20120924-desktopfile.patch
new file mode 100644
index 0000000..f0a5b7e
--- /dev/null
+++ b/net-misc/youtube-viewer/files/youtube-viewer-3.0.1_p20120924-desktopfile.patch
@@ -0,0 +1,21 @@
+From: Julian Ospald <hasufell@g.o>
+Date: Mon Sep 24 23:14:08 UTC 2012
+Subject: fix desktop file
+
+https://github.com/trizen/youtube-viewer/issues/12
+
+--- share/gtk-youtube-viewer.desktop
++++ share/gtk-youtube-viewer.desktop
+@@ -1,11 +1,10 @@
+ [Desktop Entry]
+ Name=GTK Youtube Viewer
+ Version=1.0
+-Encoding=UTF-8
+ Comment=A Gtk2 application to search and play Youtube videos with MPlayer.
+ Exec=gtk-youtube-viewer
+ Icon=gtk-youtube-viewer
+ StartupNotify=false
+ Terminal=false
+ Type=Application
+-Categories=AudioVideo
++Categories=AudioVideo;

diff --git a/net-misc/youtube-viewer/youtube-viewer-3.0.1_p20120924.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.0.1_p20120924.ebuild
new file mode 100644
index 0000000..a2b3b13
--- /dev/null
+++ b/net-misc/youtube-viewer/youtube-viewer-3.0.1_p20120924.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-viewer/youtube-viewer-3.0.1_p20120924.ebuild,v 1.1 2012/09/24 23:39:29 hasufell Exp $
+
+EAPI=4
+
+inherit eutils perl-module
+
+DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer"
+HOMEPAGE="http://trizen.googlecode.com"
+SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND="
+	dev-perl/Data-Dump
+	dev-perl/libwww-perl
+	dev-perl/XML-Fast
+	|| ( media-video/mplayer[X,network]
+		media-video/mplayer2[X,network] )
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Term-ANSIColor
+	gtk? (
+		dev-perl/gtk2-perl
+		!net-misc/gtk-youtube-viewer
+		virtual/freedesktop-icon-theme
+		x11-libs/gdk-pixbuf:2[X,jpeg]
+	)"
+DEPEND="virtual/perl-Module-Build"
+
+SRC_TEST="do"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-desktopfile.patch
+	perl-module_src_prepare
+}
+
+# build system installs files on "perl Build.PL" too
+# do all the work in src_install
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	use gtk && local myconf="--gtk-youtube-viewer"
+	perl-module_src_configure
+	perl-module_src_install
+}
+
+pkg_postinst() {
+	perl-module_pkg_postinst
+	einfo
+	elog "optional dependencies:"
+	elog "  dev-perl/TermReadKey (to get the terminal width size)"
+	elog "  dev-perl/Term-ReadLine-Gnu (for a better STDIN support)"
+	elog "  net-misc/gcap (for retrieving Youtube closed captions)"
+	einfo
+}

diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index 4d84524..dc87f85 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -28,7 +28,7 @@ EBUILD pymol-1.3.1_pre3925-r1.ebuild 2698 SHA256 f6f88b0f0715096f6ad6ee74033b0f7
 EBUILD pymol-1.4.1.ebuild 2807 SHA256 c4713c5d289c6a00093a2c89afb918c5411de8dee91082fe22fc708b38463067 SHA512 77e50d6556f0581c98ab2793fea5290c8ed093702084daea5ece78c31a3858580fcc11b6eb81635ccce3f02faba3e122bf74a13eea33b586d4fe526ab4482b13 WHIRLPOOL fd3bc7bccf2721655ccf4c0f7b782a64fab92900ac0adf29b5892111f4a6d2c43c496e39cbc4888e7627c80c37a3275c3ea0fdaa229e47dc5750b9a92a8ae211
 EBUILD pymol-1.5.0.1.ebuild 2825 SHA256 c19f0fbd375cb89e9e6c9b4c57c56c5bff2decc58bb2980d97ff181bf240786b SHA512 2d7a278ad005e259444dfc9f1a45acb5af099f3657dbdb3a82874ddee2967108974f97519022b594bd5180d88c9d2f00c96b34aee3e4f4105258bdec908476ef WHIRLPOOL 3206984f6af8107b59782046e34cabab902735cd10b5305414a9ef75ccd90a1ed56230ebe8f26938c257ff7116411b63dbebebe05b6b5ed81e49c4126ab6fb11
 EBUILD pymol-1.5.0.2.ebuild 2839 SHA256 83f3812fdaf5a45579b446b093f43e083d1e0f031a4541cf445c76b160851ed2 SHA512 79547734142df1391e139a3a3dc2aeed8c95b25a93a71b9926d3f0dc1b8bc0e769c1283fb4c7deb6337150c3bdd347bab936648f6b650d581f4ff8f4232dfccb WHIRLPOOL aeba53ff8f5aa3bc8e1a883225c586ca7e6725721c4084ab0d7a4a98fa33d87cc2e94495ed1b82ac5f254543729287a80e3e755ee981d26808d77207b3d98b32
-EBUILD pymol-1.5.0.3-r1.ebuild 2982 SHA256 3dd99d5554e1ffe32da91284ff30b7b1004d7265a67285b8208abf8f91b95d78 SHA512 49fbe9ce00436049162ed5ab4b85982979a1d2e487e968454f3a0bb2e56f4f50feba07fcdd8630479ad473047aed5f650e7c8768112e2152f20eda510eb71959 WHIRLPOOL d4634566a15d62e46379dc89168db365365426b47fda6c80f2437437ecc9b51e94ebfa1cd9ef13ea968e343a70d29ad167f8ddf03fa8f23378281baf8b87774e
+EBUILD pymol-1.5.0.3-r1.ebuild 2983 SHA256 fd29437529388db43402e252260047db0824efa50014f31203c307e46e178d74 SHA512 8e247f5abe2255ff4b4250d36cb7b18ef5a98c0461e51871e401b0e565277497741559d373d3dc5a01b7ddbf261f09300ea38f9d6f35ab46e57061eb0b8d3ddc WHIRLPOOL e3af537a2bd40887004d26ec1c7594cb78099e4d50bc5b8c9e105e78bac2f73e8b74397ce0a9213381d5de851b3554749f0e3eac7264692ae5d7a48981cb6766
 EBUILD pymol-1.5.0.3.ebuild 2821 SHA256 71cbbce3b3e6c4478bca572f2011289375aa95947eee549d294c072e79850025 SHA512 34362fba6f556778b8999e38248a7e017182b48cd7e8be37a07a8b1441c651bc3897c1ca925c931e9f26f7f28646585a5a8c9988ddd759bd5a4ae23c1b1bfd98 WHIRLPOOL a3640e42216b18da91dca5b0bde771f114fa640f66c76d602e9d85d9f4e87040489e5be0831a8ce7dfae0eb12d5090789e898f38757495a2a208a75ec98b4192
-MISC ChangeLog 3087 SHA256 04b1f510084e2b562c32c6f399902d03c5b3819c583afb6189976b1799f86844 SHA512 ead9ad6edf39817676276adcd09bb1c5ed642e4d1b326fbf869b72bae086f45d0706edc05441e83022f044edb76e82e7238e975361ce81a7bd9d5170aeb264a1 WHIRLPOOL c4b6da6551223c08bff842871ca084312ab50d44dd81b94476e4b5b1946778e5510ee58906c8e176d7044248487014c964104afe307aecc16b37882ddf0d7b1c
+MISC ChangeLog 3199 SHA256 b2369951bbeb8ea668eec0f0d934b1a993eaf919905fee474a9043e475ffa919 SHA512 9fb5cfb42394f6b196d3b242a81561f29f44d78d6706203ca663c44e58cb5810c78c5d97f212778f9c7d69bce41b1184bda500d988c2fcf4009c3fbdf8f92c1a WHIRLPOOL b492b783af2764a24361d8b0c65817b81dc6f2b90074baa778c7bfc6fa94927da3ae08edc1ed4a5deb28bcdef0c06de0b2dbe7d172bdab31f2d0c5f57d40ffe8
 MISC metadata.xml 569 SHA256 6f2b2746c7b2182262554076f11159b11d671695c40509bf7014c7546d719ff2 SHA512 3d8783ff6a1da73ae10d9c4b9600034045eb601d5a87755205a4d7f4cd44ccdc6dec27365f6631036689dcf05d62f440b9fda4e053b53c26fa0f018d9f176737 WHIRLPOOL 04ce89b34118d29bdbffb42556b607d295dd875e49c130aa11f3a2f14796c16bcef3d120d2f8b0b2ee123f2dd9e6102aa344bebb2f925b2ea1fe094aad447187

diff --git a/sci-chemistry/pymol/pymol-1.5.0.3-r1.ebuild b/sci-chemistry/pymol/pymol-1.5.0.3-r1.ebuild
index 1643bbd..2b07294 100644
--- a/sci-chemistry/pymol/pymol-1.5.0.3-r1.ebuild
+++ b/sci-chemistry/pymol/pymol-1.5.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.5.0.3-r1.ebuild,v 1.6 2012/08/14 20:18:57 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.5.0.3-r1.ebuild,v 1.7 2012/09/23 07:50:50 phajdan.jr Exp $
 
 EAPI="5"
 
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="PSF-2.2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="apbs numpy vmd web"
 
 DEPEND="

diff --git a/sci-visualization/grace/Manifest b/sci-visualization/grace/Manifest
index 4ba8358..5e62228 100644
--- a/sci-visualization/grace/Manifest
+++ b/sci-visualization/grace/Manifest
@@ -8,7 +8,7 @@ AUX grace.desktop 161 SHA256 0e522ef577b5658559b6e4a4be531ae4989b294935897e84e03
 DIST grace-5.1.22.tar.gz 2516576 SHA256 4ce8f058b6c1267a842419a3edbf471421dea9cf5744783745b6cb375cdf5f25 SHA512 0187f0305ff5e404e9adab60e9f3d328121c9ab8352f0b65fa523e2e9078dcee073d347a252a5e8b516728cae24b1ac0718b5011ab17247ae9ea9149336866d4 WHIRLPOOL 206ceb7dee5572e756fe67d528925705ab3b56913f26d8c9b066b07423cdd6b4e70c0739e3b66bdf7aa992dae243755f81ea097e1a33b94817322bc30b33274a
 DIST grace.png 338 SHA256 70130b7ddb7a64cf2d866aaf472d8badb12d72ac288275709689c631e23da9bc SHA512 804a693b867ad63f34964c7388f61719c558d253cb2c7bc7b6bd0647ad9b3ddc6b23d3950091b6804e4a94736f024486cf3dcce5f877135def34712ee95e4031 WHIRLPOOL 6cef65fc9329e7f49541e193a84c4f86498f422951ced1bd228ce854bab43a9ba5d9dfb44f780b1dcb030892cebd657d6de385df92710062f56c38f1e6cccd94
 DIST grace.png.tar 10240 SHA256 05215c72a2f45b513ba508287b5f693af145719b7a85497320d1e1e17695e99c SHA512 e94970b92894e58fd481d2f81e615c38b77fab7039985516a2ad9b2bb2bb7a82f4e3e8cdb639e7c0d55eaad6bf8abc636a342c94a356e3bd0520824252faddcf WHIRLPOOL 448e1c659475e38331c3ff2f050de52feb01db9623c0a250c7702debe920abf7e9bc56373f442d91d11ad6f55da3e9bbc58f52c1251223bdf405202ae8309556
-EBUILD grace-5.1.22-r2.ebuild 2850 SHA256 8f1b70762c8263ff9475922f8655080766554244af3fafdf47b6ba0385dcf187 SHA512 857f8dead3377272f6219b7cd5a50dbebaf2b72b963c2bbb965a8a65d48cb2e1e0d0255fc72880d91186eea29d708d297c2510b1f716dfb287dd092616e1be35 WHIRLPOOL 3f421a669a72cf55045dcc663996d6fbe065e2deaad77f1587d7cf123c93e06974a08b32ee00c08b28947aa7950932dcbe59352e49d538e4489c5400b6f27276
-EBUILD grace-5.1.22-r3.ebuild 2945 SHA256 38ea66da0242bccc710122cca01669902c7d37ed331cdec55cae9620d73f5aaf SHA512 73383e3b6eecaa017b38f66d5b1dd403a9c876eff4fa617647ff15f787fbb5d3d01f6d32d96c6401856793e8c33ee0dd1ad7b06712f6f216c9390b2be7373081 WHIRLPOOL 6e8be072c79eb44c9317ca94ba711a12055d8297737208699144bd786a1ab8935f7bcf3f272498f5a132932a5ec02c699684c29226243e660670b951bf4db955
-MISC ChangeLog 15949 SHA256 223ba5a70e2608ef2a06f7182800f059cf2d7a8d605e4ca6f28218059533be85 SHA512 104bd5bb5d3b6c7aa641b9dd625545db17e65411d4319b5b2ec03a69914ff44cf6f151456a43e85b369e31c8864ef188b7bf4c75bd7e43420bac147dff3ab277 WHIRLPOOL 106f2678e5f249e19b9c443048b34db31fdb0ddd7bccee53bddfb231b38844de5e7f6d7834749f1f8c001c6a239c4ab3e6a1c95c0658ad24a7dae3bbbc11c24a
+EBUILD grace-5.1.22-r2.ebuild 2848 SHA256 e7f40160c127006a669c7d129b46721f760fb7b80879fbff84cfdca0d3b4f605 SHA512 2a4e9966661bbb1cb1a57c07d38dd4ecf9cb06573b0a896492486c1ced7f7da32fe10332ce876c1a549fb2deb176a6a430826c1f2bf03fc5342656ccd8590d2d WHIRLPOOL 435029b048fed4bafa052d7ab5898912205abf778b4fc9e094c290b2abada658587cdb2ecc7fb3ca042d8fb7d620372b31b7328ed648a20176be31735b3dd084
+EBUILD grace-5.1.22-r3.ebuild 2942 SHA256 c41415c4b227e5f4bf082b44c7f313ca4777006689f72bf84bef031c070a392a SHA512 ab0f97c20e2c1e38f5e1ed735d2c48eadee48dd2c0f6d1281618c3b0c83cbf3e54056289c6880418fa6463f73572bdab4d6bb50e9a5d88924761a73ede2a2bea WHIRLPOOL 47c7fa69a75f4204c3b0dd646c71d797203d057544397b2757d82a4710a5a90f04bfae7438a3f3a871940221ccabe87639e28e16e6d9b5e5cd1ad0bb280e26f0
+MISC ChangeLog 16076 SHA256 ca65d76bfc5ecb6fec37eaa7ac335ca767b57bd8d77a7b1dd6672dba2caabdb7 SHA512 b50545464807b187632fba18f016227016eb259a9b4fd5c33c730402b2eb3af6746bec6918e395920624cc1f917b9139ce77f74340ff3d92fc880c54ebd0f921 WHIRLPOOL 11756f2f30c87fe4f45cacd3c9935d3d0439a7528e3f7ee17773439a462ea20a730464d3a76d8cb64d311eb60aa3adfc5e39e6eff84211fa75ae96cfec6a1878
 MISC metadata.xml 648 SHA256 6e6b7236e3ee83b5d72ca91593bcbc7009f648ab2d4eb99a50f70a0d3c580290 SHA512 be245ac48652fd636eaed28a9a29ba2797df74d79c3305eb27ba9a5ed07be1f2901ba8e332b242fb920406257b16240cea0255b57472bf6e7a5fee0381a93762 WHIRLPOOL 56d8ae0b49319907302272f0f6e6c253eb88a5e540b57309f84433c726c40e2b30812aceebfa95e39b5ab35933c88f8da1c16580483ade452ab11ba87b49e4ae

diff --git a/sci-visualization/grace/grace-5.1.22-r2.ebuild b/sci-visualization/grace/grace-5.1.22-r2.ebuild
index 27161d1..dc02bb6 100644
--- a/sci-visualization/grace/grace-5.1.22-r2.ebuild
+++ b/sci-visualization/grace/grace-5.1.22-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/grace-5.1.22-r2.ebuild,v 1.17 2012/09/05 06:50:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/grace-5.1.22-r2.ebuild,v 1.18 2012/09/27 04:51:12 mattst88 Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="fortran fftw jpeg netcdf png"
 
 DEPEND="

diff --git a/sci-visualization/grace/grace-5.1.22-r3.ebuild b/sci-visualization/grace/grace-5.1.22-r3.ebuild
index 262ce5e..b8fda5c 100644
--- a/sci-visualization/grace/grace-5.1.22-r3.ebuild
+++ b/sci-visualization/grace/grace-5.1.22-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/grace-5.1.22-r3.ebuild,v 1.1 2012/09/05 06:50:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/grace-5.1.22-r3.ebuild,v 1.2 2012/09/27 04:51:12 mattst88 Exp $
 
 EAPI="5"
 
@@ -15,7 +15,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="fortran fftw jpeg netcdf png"
 
 DEPEND="

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 21a27fc..9f532f5 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,6 +1,7 @@
 AUX chromium-alignment-r0.patch 565 SHA256 c679dd4ea0ac6e8ac330372da63a5c821ec54ed704287c392195a4a60db41062 SHA512 a3c7626f8335fcb5b2fe4664916fa07bbd717b57088dafc7092fa11e9873a911162a146f3f5b8531c0ae338d794c669854d8672ee31f00ccf2313b4e663bb6e8 WHIRLPOOL 30003851a02fff863ae01a174cad95280a89fe866fc5af6e6c8cb8f66bdee3e5ad4f1def2b813a77430744b41ff8a753c23b5c1c1bae86e7c1dbe0e0ce23f8de
 AUX chromium-bison-2.6-r0.patch 15135 SHA256 b016abb0ff68fc7d1fe153fe7e4a4395809363bb6c310a5c921a4e30175fd854 SHA512 e16539855cd43d063a9b504b8f08a76b57b5110b3ad1f56dff164cea06b33ca7a62adb37267d37d8c5992a9258108280ffebb2121308e2546f7b5f2606822f25 WHIRLPOOL d8f80adf1b5038891479519d85076f98110a0865b9cd4cae4ed77f7d4f0a3294e76ad6f94153cea5ac39105e8251e9f69f5257c9e6dbfcb9950da7670c928492
 AUX chromium-browser.xml 407 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca WHIRLPOOL be37cd2e7d02c510e84c484f32ab6ab2e1f38a2a03c0cdbc9b6b485d64feaf79944d8ce097f0838ae9bc71c42401b633350b847ad316b8e23cf5614e3913e7ec
+AUX chromium-dbus-glib-r0.patch 1630 SHA256 ab71465374c9d03a3764798bf7d2f28d76512f15181a0f34152420c238ef18ba SHA512 e79d1ad32b07e559416b326400dc1bbfbce45d5c903d061907afcd6c753896dbde54f2fd6eda8e3f3d866214ffea46d95ff3f7143bc10354266388ab5f17cc88 WHIRLPOOL bb993ed5ec801b41ae2b7abc0327b978930149054e693a7e1a5def0f370faf9e5d5349bd4965e1f6266a570d4308bcc9181adfa095e635b49cb657a799b419f9
 AUX chromium-expat-r0.patch 513 SHA256 af117c11c385a8d401601118ed0d31ea7486684c0c32b78c3089dd3229e0945a SHA512 67a9bec3deb025b5686e8c1b83effdff2bbba7343a6a6dd265ad417f814319ddb3abde7072280218caadc965ae22be102f1e572aac551917150294a722a973e3 WHIRLPOOL 1e113cebf5ec8a6a197969d434f84e41e516b0854113d0f45aa976054ded798d202f982ddbe2e609e0687af440253c60cd46d6128a88af511a94bbf2c70a252a
 AUX chromium-glib-r0.patch 451 SHA256 42469853c5cb1d4376567419f78af848b0f4a1b9f68ce9b5c8ce8c0b3d506193 SHA512 cddac3fa7a2b9b62e73a3ae36d67a29469d76d8c48378a7c08db617325c2b193d0f4ebb81b3b0c9a375ef6d9bd922e9f4d8a3177083ce260bf94336f17792432 WHIRLPOOL d31c9fbcaa7561e8f44273966740f63be93970518c177a449ff6164a2dd0792aba2e171b3df3187960388ce4c5a1e677017951d96d44ff40b1f35e7ec03735bd
 AUX chromium-gyp-settings-r0.patch 383 SHA256 709e4c8937d7f839f0dd16db905e1834a502bc2cf192329d720b508ef006cfc6 SHA512 7d1d640ea6c5e442f1fce20b3689bdebc108ea3a03444f5a638b21a9a73cfc8739b7e01351fc9a724eb006f78b1c2ea7277c1a44f0a6ac10e7c8f5b820d99e53 WHIRLPOOL e35acd35e2ca208bb9c1852cc4b4299eb4df574fe70d172961303dd0f30b97675482157755662f304a6021199293c4e33f45c8af1e0984cd4265b87e9559d9cc
@@ -11,6 +12,7 @@ AUX chromium-ppapi-r0.patch 422 SHA256 1f4b57670d317959bc2dc60e5d2a44aa8fc6028f7
 AUX chromium-revert-jpeg-swizzle-r2.patch 2233 SHA256 d99162aa6bae562f116a42347254bbec3752464f0a3e4d8675e2b287b2a838a2 SHA512 587c892ef76bd3042fb12daf4a52aace556674207b2b3164d20d46037b26e7b06b56dc8b7f176f8640d08a980276182c346b2e2b24808c3dbf0526db2e4b1596 WHIRLPOOL dde8d31c1ebbc535b67f695efc1cf87e2df5db7c399b61bb0489d090577aea97588f8313933fbd8e05111ea24c4b3da07dc0888cba2c2cf6c82ecb13c2306f23
 AUX chromium-selinux-r0.patch 411 SHA256 f6ea97bbbc36579a74790338aebea8d090a0729a3f3cfc36086338007a4f9545 SHA512 a0168ec144369b8d9c88a6c8205b47758e80f7077809972776b15ea4b61a692a2a6775638692d5a2a5ac5a7fdc3961de6d19a43b6d01f9057c3ede48d2a7da67 WHIRLPOOL de5fa4ba46ea3cbd3a51ae2c03c85dfc10fe5b421765018b7a568bc3f0882ca063dab1214923a60785214bc8c801cd3aa578c686f400d51f37c4484b3982f48f
 AUX chromium-svnversion-r0.patch 480 SHA256 f265a9ea756810f623289523d58b0c58b4ea1a001a693321b9cec4810fdc46de SHA512 1ed5770f717db1c2eb650c0a75bb52902fcc3956733afd8511e2bc9a57a6aae420824b4a4dba92ef59dc32eb156efb58826e6e77c29893db1080f04b803ec3fb WHIRLPOOL b4d8815cfc8fb8d8f82d57e19bc692e0f49d5349d27ae473ec2202c0ff0b8f7ce02e49c5c9baa46d823dadeae6ea07b3157a17d7717cf3554948013f84d42417
+AUX chromium-system-icu-r0.patch 337 SHA256 d634929ca192d867588a8eeaecb0c36de3f146e72cbc056896ce64ca1967f8a2 SHA512 179ac2e36606f300f9a381586713d8a32e27a9c4c5471cb81017f826bd4bdd4a4500d6fe0f0d4086c398ab4f21aa92a4d91a6388b97921940e0fb0e0ee0196d6 WHIRLPOOL afcd379f0c4d7e91a19201fd49793926ddc45d836ba139d6223558b224d919381606086534273aa39d2b5e0a9b73552eb946b006ad004fb6001aa376223bfbf2
 AUX chromium-tcmalloc-r0.patch 916 SHA256 ae37da023f0b5cda27c3396b5a197d6aba9f3810a32238450f490a8e93f92b63 SHA512 947bd1176863ef7320c0007e0ba906d86a90f47f23932a581613bb1ca28965d8ecdbe285a118bc6d212a6ba59fa55760fe4a71be46d64a6322fffa29e9737ac3 WHIRLPOOL f1761ba96fd3bad70160ecc4d45cf06c9b3b30de0762228cadb5065377a2d3c48e7106400bbc50e6c591988d1d2f24bb7331fb3f6d36223c2351f9fd8dfd09c5
 AUX chromium-tcmalloc-r1.patch 2412 SHA256 df57cc238905c027b844ab680f6c66d879cc7bd9d03603f1ae2c4b10b7715f5b SHA512 b4b47b217c4511c5ff00358ad3d0ebc7e9272d41ef39c3e680fc618843fa5fa1a7ccb88681d2e9bf8b67abcc34f03042f924c977240e87005f621a507330dd9b WHIRLPOOL 1acd99c27ceaf2ab0837fc888d04bb3ef5b48946df96e0981b1698cab986126fe02b3157c5c10dff19c8444b41e1f6053541d6020dcc42bc2ee08eafdd2b477a
 AUX chromium-unistd-r0.patch 354 SHA256 45c11f845424a7e197e3ea826066a5987fff6b309f4091a9a775038543a0656d SHA512 949517b25aac38fcdd229b71f1a7eeefad57b7896aa066258ca6d35972c9a5d97b6432e6317b8d086575a0c7f94f317f068136902327ef747bb380e46d143e70 WHIRLPOOL 271362646f6c5af2e41081e77c6307e87330c43149573b162bee26c6b716a9dd43dd302539a63e7de9aeab04a7af4e4dff25b6e575dd4192d744a6a33ba2066b
@@ -18,17 +20,15 @@ AUX chromium-webkit-zlib-r0.patch 1750 SHA256 7a44c63d96b6fd4b12afcd06a81f410ff1
 AUX chromium-zlib-r0.patch 511 SHA256 ec2795bfc47c516401fd2c9648caa3b06e64794392b41a11b2664d9968171534 SHA512 d06c7551d1976404b07f4cbcb5f385cbc565884d34d3fd49bd4c1c2b96e2b660f4d8f778c5f7ac9bd34d66ad46a1f1235d89f1c2b026fbc3bd9c2b7ab7087fc4 WHIRLPOOL a394e499ca1bb3304716087f1a7b6e91847fbc7425e6d0e1bad00acb9a0e8690559687726fe41d49031f51e3eccdcbcd290a27e366613dfce4d2e89aab92375d
 AUX chromium.default 147 SHA256 de16d72d77ac9fe04f781df4f50dfb714ba33574755932df950c1d9472b589d9 SHA512 26cdfd05da7f33ba94cd710ae52a1b345cdea4928500af791cff10ca8f9f44036497d9520f690d4d40be5774e77cf9be77f21233b7f804b1dee7d81b8382a9fa WHIRLPOOL 162deb65f97efca4db35dae64e46e0cd21d02a3dd1ae0ec6fa2f9ee7660fbeeb771a1afa3d07cb0d904cd8d7c16ff4b462bc6be3cf9a4143833e909ab89ac5fd
 AUX dot-gclient 253 SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298734126e62cf SHA512 96d4ffd01fec2773d7beaf2bc82b8eb969556f6e859e39136b4044521c5b8bfd36c13a7f2fcc64613935d4703d8ede8a56c7ce581a7732642cb8ee71039c801e WHIRLPOOL 6a65521487fa353a22f192c567b487c77a405e068c88898e0d8045b3de26bdd54ed736f104e495598e0cc8703d3f6abc80f8b2ea1e254007dfb18f50294e8c07
-DIST chromium-21.0.1180.89.tar.bz2 192638239 SHA256 16cca8d90a3369840f79a6f06d11756515fc8a4c3595060778dcab21e59235c5 SHA512 c4bba7b145c5bd43cd63f9ddbb20a805c59e10f16f5ad61e813529c59e56e8c53d161bc50d4d6aa563289b41add51deb8c1f1654522f54d445e64e64b042059d WHIRLPOOL 9646e728637eea4ede8fc9668bdd13f955025647c8e35b7976dc17cf9d53c58fa16e7d2e4d71571a2454a7ca37e52fa1926ae0c57343378b21a7e13616b774e0
-DIST chromium-22.0.1229.52.tar.bz2 210177691 SHA256 c4e3feaf9b9e3fbbf43e1abee20f9275ef92c4c53ede716d499b36639884181e SHA512 9b262fabac2687fb7792377d0f8d9d2131990831a8d00a24a7f61ae361558cc68754a872d717b9ec3fcf99f86cd4437abb8b339085dadff5febfefefec70cc81 WHIRLPOOL b3930aafe366212dc3c3fec76a71a5034e4af4e1f51ea748ef759c48fa5102d806de1008be4b93a0adeadef1ccbd1614c2f5fdcd65698a8434b73ac848de5305
-DIST chromium-22.0.1229.56.tar.bz2 210192006 SHA256 fba520dbab04203ac47e750ad5a2bb74d1b7783bc45599ada65a85ef8fc0d673 SHA512 2ae2b2801a432990a9df31d7d33d9d1ad5f943ec19460e0fb7bed4bff60c829a52a6022754db07af149544cd9e5f81e2145c4e1a0388d5a6fdcd9f9608d8ecdb WHIRLPOOL 305618eb4147f07fdffd75d1ddd7db11c30d12760d413bdc753a4720c238f0c37caaf014ceeca91072a5f80b2795cb63fa31904aefac5e6a3b0c7586632a3d74
-DIST chromium-23.0.1255.0.tar.bz2 214978942 SHA256 ef04f056e1abd5491a7ac324c92f583b3a266a8a3cbe59da6f5059636b297a8a SHA512 3b3aa589ca5372a11ddadab27d7dc12de7699a0a849c6db8b0f74e29670de0493b33feeae0216bf916844519396c6207f52359513dc12fb55b73054d4413fe17 WHIRLPOOL 6c97a28c5113c0bfea2e1be5c63bebe43fef744479960738ee2a515da2f7dd8b1e7e43e759af2773b1f0f882ba7765110077876767d5630f43602583250e43c0
-DIST chromium-23.0.1262.0.tar.bz2 215892826 SHA256 064adce9d9ee46522effda08ee9349e36e3b55c15a046de40c1ea7b7c58e58a7 SHA512 511218126d1dfce26f2fba7e4ba66fdb91fdda45ca0f9fd36340443e4c0d3a860c1353fa7bf82fcecbb8e85c3dcf9595a129770e7b9bca0f4f694a0f97d45f12 WHIRLPOOL 1b2557a7ec12027f025afc60efab0999b5537451fde3a12afbc8b4d20ba15e604f0ea6b8e072959f3128695dcecc77010f6884fbf2f2d12ca6dae1e606bcce63
-EBUILD chromium-21.0.1180.89.ebuild 14037 SHA256 a435e45d547baeab644aeb210fb18d69b5d854cd5b37ddad4cca85fb2be269ce SHA512 dd8579a215e611a8c79d79deae40782778f39e81279aa67a2ba05681bf227941b1a5ba3ddc3e772c98a85d761b1e5f125083545ffcf9f1786cfd6752f8b0f2a3 WHIRLPOOL 2ba5c0c3f4eb5a1ce3a1c3d4ad4428936f30e3ea45a25dd2a74c83a101b4b6481e651755e2750c722f4948e71edf69691f9f172d50f2f39986dcc266b66f2560
-EBUILD chromium-22.0.1229.52.ebuild 13923 SHA256 1201cf3ffe8c9de2f81b024a9222c8df7a28dca2b87bb724a16f1147cb25119b SHA512 13523588fdeb1b49c369a56114e7ac6a391d05885f042dd4939a3d76d6b789767043d81474e518a85946fab6b68452c54b8aacc0f6c7dde6a26e0e349d47ce17 WHIRLPOOL 04ee3a8657a3319609edc9738bee70a59ac60967425d30376b720cb34def89bc69d6839dfad11b87571b7473a039d7998860aa930d495f62c5e1778639ad237a
-EBUILD chromium-22.0.1229.56.ebuild 13923 SHA256 c8cbffa9d09bc363f2721aed0b7bdb9dac04d2c888e09cddd2888bb0a8817b9c SHA512 6f6ff74baf16c6ba227c6e01da33eb10a1ff29240b7d111584175195017365ae5fe2d4245bed9a93fc2e5f35c3a268062d8a7dcb8d2e49483571d4ff2f1efc6d WHIRLPOOL 71bd0fe78f8713385de8677a42df7d00144e04d088fefd43d9ae63f0fe19269ca4ae0c8714772e0db960e9cc7984929d24cc121272a76e8137bd8e88293c68e9
-EBUILD chromium-23.0.1255.0.ebuild 14693 SHA256 adf4457a305a28122ff118c0eb61092d4c9c812692fc91eafb729e5d5c847369 SHA512 725aa2c3777c0ced6c056471fbb90b2f7fc38bf128086677193c8eb23ad48f2d162ac5d7375fc335d1b17928f894c078452aaf7f398797c1a0b4778dfd217a33 WHIRLPOOL 83fce59fc7da8d39167ac902e18915fe59a77fd3c28cb4ce735536c86c16038db5e0a4830fd440e5e27573e14641e4b1d6c580dcd99ebf6ac1f7b47f52f5e3f0
-EBUILD chromium-23.0.1262.0.ebuild 14693 SHA256 b79944bb49dbb88eff490191ebb4cf4689f90179c1f1d8d8f08060214058c2a1 SHA512 a15009fd9550aecc31f0b5935edb8784260864ddb3c707b20c91df295de2b7dcb78679fced2592ea2eb2dace4369636512e3b35dd9fa75978a604027af8949fe WHIRLPOOL eff94f2ffa399909c603aae184a0d1fc8f8bca3a2d8e5b49bc5967052c000634e9c274966ee1a30ad15fd2eeafd46ce5bf10879b79ccbae4976303144ccdb3ec
-EBUILD chromium-9999-r1.ebuild 15856 SHA256 969ae8a5c8c844efee0ff496e243a2a87be17d615f0da3ad5dc5e9c9af1877b5 SHA512 4ca4080fc7598d0d045c17aba5fe5b5dde2baf422d3be116e710c42c5975ea54868043cf2c3093b03663c1a50ae206dff45d17fede12434f4602f6ce8f403365 WHIRLPOOL 21ab825196a3139af4cebc44a71c5d487a1fb9012b316fff64bba4101049b2de757ee0f9c620d6a2f1e8c6422bb6d24f07442fe5b31377b839c5f9b326c1f10f
-MISC ChangeLog 36765 SHA256 cb69856d21e155437e879a0f8f20bd9504bc65dcc7b06f1cca11dfe95db702a7 SHA512 4436cbcb268a950825ad564261e7fe97d7fd1adf58c6d5a589f5741fb31738fc26b542a639e178d822137155c33835dce46eb6563944516151a22ee1b715b903 WHIRLPOOL 2943edb46d9c32e58ff30534661f6f2d270f389f15bbeee52d393f873ade32eac23d5a59d16a0835fad59b4630ece9d58f020ca4de68d46076bf30921837455c
+DIST chromium-22.0.1229.79.tar.bz2 210410507 SHA256 06cab1c48092def5bd94e9f4aa764f6ff5728ce35bbcdcc12fddbad3a0f0f738 SHA512 149666d8e185e4080c1cd7ab153edca2f4833be5beceef51b20e8cbd238030330ec1230cd3a9640bea2d02134683437bba7c809b2f5e13178d4a4e169321c717 WHIRLPOOL acf93160f2b096090a90e2718474477b40b67e8486a8ab7edca777268d4cd2799081cef8a73592302bd07248bdf831486f95873c6ac9b8e031587f3b1e5f739f
+DIST chromium-22.0.1229.91.tar.bz2 210386491 SHA256 dc375b6120352247bccc754863fe7c1d57b87abdb26e49187762020ecbca87ac SHA512 85d1f6f945ca906c7379f8c5933d3e6195853dfabe7e53b26ded32d68cdb55325c019b010c6b0c90ed7f7eca56b7108505114551ab876963c4c21574b0749016 WHIRLPOOL a23cc10ca767255d56b41cdfd0106cd0e294d6ede78d30ce49eebc55b106f8efba0bee8c48aceda6fe390ee428aa81703063733c221b0488907f2cc5e03477e8
+DIST chromium-23.0.1271.1.tar.bz2 217461161 SHA256 090a5002269d175325bca0573c4cbbd5e26d058a356c539d32a6facc82dc5aa6 SHA512 e5874538f027e1dc0cfeee97654af0fc7e4e99b38eae316912fd6fa6aa56dc0fa39b91d7d1828e5a6be16cb246f4161beea1d2cd436bd976e1c6a4575f2c4259 WHIRLPOOL a123ceefd9c18f5e250b3448a8c2fc6577a519d7db8a09a8cc9d7c288cc7e350b0fdf4077c2f885dcd6c9690dddd2f7438752d707fd8efb47692791f90b76922
+DIST chromium-23.0.1271.6.tar.bz2 217450125 SHA256 d8e4ac36745fecefe05b793a396129ad0c985ae4bb52ffa28362f1cd0b6160d3 SHA512 bbbd931da280d62fbc6076a5723b4b006fb7da033ba79f7284951841e06d21fe405b830e55066d739c53ff558135b3e7b354bfd55b2666b74734b807630725e3 WHIRLPOOL cff15211be1fd990eff55001cc4125ac5bce0aff155bee21bc0980c3688311bdd0158b406d6eef2238de3c562d83fc0ea43d775ae49f9796f4970e56332ca377
+EBUILD chromium-22.0.1229.79.ebuild 14060 SHA256 6a2110467e314b8188127323a39e8461e62e13d38097de3359cd071065221bc6 SHA512 932ae897862acaf510c1f530367b2f81678ef246cc077e614cb0a6b8cd47f81f54d7a03a0975bd20b5c370aa7955dd86adfd6018314dcef88237fcc2619bf22f WHIRLPOOL f561d4316d29fbf4ec3959d44eed4b3cfd15706c944e7105ae0e6d8990b8c99a47f5b441d9a6f142d748b252a7e5d696be47352a6957d0bb0d75ac3aedf28ee0
+EBUILD chromium-22.0.1229.91.ebuild 14059 SHA256 e84a71bef9cba30b9e65aa23264c7937adea47c500300925d1c7c5bb727e41ef SHA512 32a9cf899162cad4a341d02b5e0d5402e9277253e9de77e3ac7e41d56a4e93489bbe6bdf1626b07c753a6cd05aaad8d8bae1f97bf4f5c092eca67e38834064a9 WHIRLPOOL 84f4524175d4778f99c7adf6e31f1fa15f759be1c850fd5f174b398b414a9cc9fc8a7bc21eff3b2784ec5734726b74a2f92e6c37e23511801b8ae096f3913293
+EBUILD chromium-23.0.1271.1.ebuild 14934 SHA256 8798191ccb68d0d3c5071718f01416615eaad99a63ccbcfae7bd16090529668f SHA512 d215a1554ce960b9f249fc2cd3299b5c1fd3bd0c50613e8037b2e402ae3eec971193a16e3ac502e0ef193d857eb83f5bd3aea23056cc4374113ed73699566a30 WHIRLPOOL 704572a03502eada66186a78aa54fd7c293170f328d778de85ba2e0168861ccb602650d211f86e425aa28051ff9b3fe29afbefa653aff982236125a2488dfc92
+EBUILD chromium-23.0.1271.6.ebuild 15098 SHA256 1f74c94ae2ad043365a196198f60d21642276c688d8c4b15b88c2722a4e3ed3e SHA512 1c5de343570b5f52e22159ea2af8bed4d75419656dff732e9daa3951b07c02c575a6cf0ad2f60dbab144ac8f91f8ebb3092fa69fb324befa04071e4d893d6fd2 WHIRLPOOL ee8f6ca1197a30ed904a4b9b5c448ab2f57c985540d6cd8e02a61077287fce34bc4e0850d9e3a3406482934dd6099d00b9fa912a01804b7b3cf84bce94df0d8d
+EBUILD chromium-9999-r1.ebuild 16058 SHA256 51c72d3782d3d15d002b9231b980eccbcbe65c11a0575f1ea965d354a7ceee7e SHA512 5d694b9076a5435c202f6567d7578d9a451626d91ff1cd85459fc02b4c69034af2b410d42db2b764a02b2b2f89cd4a4df4802ea49a7aae1153f94d6efd4e1986 WHIRLPOOL 7b2f43ef54d10baa41507103979fe3301c1816b4a94c5ba01ef5d85dd967adb85851745457282892f4290ea70d46dcf1836b1301fdf2c331e92bfd1ab369709e
+MISC ChangeLog 38425 SHA256 ba6a48b64c0f186f191b852dfe78d3ef881c310f0db791d336591d4cab1ca2eb SHA512 5f9d7b21285d403fee02d5d262fbe5b615e1aba4058c2b22a43e35c225a606d4b5586473c5a119312006028dc2dd5ade9f6a2b700be9f1906a880ea23d4d6d5f WHIRLPOOL f8d8bea929fcd045ef452394144829dc75a7524afb40bc97ee0aaf32b9a50d8818e94fe9a4452ac2629e566d87aec70ff8bdc15b993b77b8290516cfdfcc17f8
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 267 SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8 SHA512 f6d64d50bfbfad74db0ca0454fcba335a1744d11a44f921f19545c478219c507994cfcaba13160215cbb5a77d0bc82cdbf64a90a4b1b169184e404e404f9029e WHIRLPOOL 66a5cdeac3a86b910040d4c601fef50465fb0e0a0805e6b1c22cde2a83a63a2a1d441643af5454775becdfc65c71116d00b27703a7dd15ced183fb223c32f075

diff --git a/www-client/chromium/chromium-21.0.1180.89.ebuild b/www-client/chromium/chromium-21.0.1180.89.ebuild
deleted file mode 100644
index ae1bd15..0000000
--- a/www-client/chromium/chromium-21.0.1180.89.ebuild
+++ /dev/null
@@ -1,435 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-21.0.1180.89.ebuild,v 1.3 2012/09/02 06:30:58 phajdan.jr Exp $
-
-EAPI="5"
-PYTHON_DEPEND="2:2.6"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh_CN zh_TW"
-
-inherit chromium eutils flag-o-matic multilib \
-	pax-utils portability python toolchain-funcs versionator virtualx
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux"
-
-RDEPEND="app-arch/bzip2
-	cups? (
-		dev-libs/libgcrypt
-		>=net-print/cups-1.3.11
-	)
-	>=dev-lang/v8-3.11.10.6
-	dev-libs/dbus-glib
-	>=dev-libs/elfutils-0.149
-	dev-libs/expat
-	>=dev-libs/icu-49.1.1-r1
-	>=dev-libs/libevent-1.4.13
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
-	>=dev-libs/nss-3.12.3
-	gnome? ( >=gnome-base/gconf-2.24.0 )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
-	>=media-libs/alsa-lib-1.0.19
-	media-libs/flac
-	>=media-libs/libjpeg-turbo-1.2.0-r1
-	media-libs/libpng:=
-	>=media-libs/libwebp-0.2.0_rc1
-	media-libs/speex
-	pulseaudio? ( media-sound/pulseaudio )
-	sys-fs/udev
-	sys-libs/zlib
-	virtual/libusb:1
-	x11-libs/gtk+:2
-	x11-libs/libXinerama
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	kerberos? ( virtual/krb5 )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	>=dev-lang/nacl-toolchain-newlib-0_p7311
-	dev-lang/perl
-	dev-lang/yasm
-	dev-python/ply
-	dev-python/simplejson
-	>=dev-util/gperf-3.0.3
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	>=sys-devel/make-3.81-r2
-	virtual/pkgconfig
-	test? (
-		dev-python/pyftpdlib
-	)"
-RDEPEND+="
-	!=www-client/chromium-9999
-	x11-misc/xdg-utils
-	virtual/ttf-fonts"
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-pkg_setup() {
-	if [[ "${SLOT}" == "0" ]]; then
-		CHROMIUM_SUFFIX=""
-	else
-		CHROMIUM_SUFFIX="-${SLOT}"
-	fi
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX RANLIB
-
-	# Make sure the build system will use the right python, bug #344367.
-	python_set_active_version 2
-	python_pkg_setup
-
-	if ! use selinux; then
-		chromium_suid_sandbox_check_kernel_config
-	fi
-
-	if use bindist; then
-		elog "bindist enabled: H.264 video support will be disabled."
-	else
-		elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
-	fi
-}
-
-src_prepare() {
-	ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
-		native_client/toolchain/linux_x86_newlib || die
-
-	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
-	sed -i '1i#define OF(x) x' \
-		third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die
-
-	# Fix build without NaCl glibc toolchain.
-	epatch "${FILESDIR}/${PN}-ppapi-r0.patch"
-
-	# Bug 427438.
-	epatch "${FILESDIR}/${PN}-bison-2.6-r0.patch"
-
-	epatch_user
-
-	# Remove most bundled libraries. Some are still needed.
-	find third_party -type f \! -iname '*.gyp*' \
-		\! -path 'third_party/WebKit/*' \
-		\! -path 'third_party/angle/*' \
-		\! -path 'third_party/cacheinvalidation/*' \
-		\! -path 'third_party/cld/*' \
-		\! -path 'third_party/ffmpeg/*' \
-		\! -path 'third_party/flac/flac.h' \
-		\! -path 'third_party/gpsd/*' \
-		\! -path 'third_party/harfbuzz/*' \
-		\! -path 'third_party/hunspell/*' \
-		\! -path 'third_party/iccjpeg/*' \
-		\! -path 'third_party/jsoncpp/*' \
-		\! -path 'third_party/khronos/*' \
-		\! -path 'third_party/launchpad_translations/*' \
-		\! -path 'third_party/leveldatabase/*' \
-		\! -path 'third_party/libjingle/*' \
-		\! -path 'third_party/libphonenumber/*' \
-		\! -path 'third_party/libsrtp/*' \
-		\! -path 'third_party/libusb/libusb.h' \
-		\! -path 'third_party/libvpx/*' \
-		\! -path 'third_party/libxml/chromium/*' \
-		\! -path 'third_party/libyuv/*' \
-		\! -path 'third_party/lss/*' \
-		\! -path 'third_party/mesa/*' \
-		\! -path 'third_party/modp_b64/*' \
-		\! -path 'third_party/mongoose/*' \
-		\! -path 'third_party/npapi/*' \
-		\! -path 'third_party/openmax/*' \
-		\! -path 'third_party/ots/*' \
-		\! -path 'third_party/protobuf/*' \
-		\! -path 'third_party/scons-2.0.1/*' \
-		\! -path 'third_party/sfntly/*' \
-		\! -path 'third_party/skia/*' \
-		\! -path 'third_party/smhasher/*' \
-		\! -path 'third_party/speex/speex.h' \
-		\! -path 'third_party/sqlite/*' \
-		\! -path 'third_party/tlslite/*' \
-		\! -path 'third_party/trace-viewer/*' \
-		\! -path 'third_party/undoview/*' \
-		\! -path 'third_party/v8-i18n/*' \
-		\! -path 'third_party/webdriver/*' \
-		\! -path 'third_party/webgl_conformance/*' \
-		\! -path 'third_party/webrtc/*' \
-		\! -path 'third_party/zlib/contrib/minizip/*' \
-		-delete || die
-
-	local v8_bundled="$(chromium_bundled_v8_version)"
-	local v8_installed="$(chromium_installed_v8_version)"
-	einfo "V8 version: bundled - ${v8_bundled}; installed - ${v8_installed}"
-
-	# Remove bundled v8.
-	find v8 -type f \! -iname '*.gyp*' -delete || die
-
-	# The implementation files include v8 headers with full path,
-	# like #include "v8/include/v8.h". Make sure the system headers
-	# will be used.
-	# TODO: find a solution that can be upstreamed.
-	rmdir v8/include || die
-	ln -s /usr/include v8/include || die
-
-	# Make sure the build system will use the right python, bug #344367.
-	# Only convert directories that need it, to save time.
-	python_convert_shebangs -q -r 2 build tools
-}
-
-src_configure() {
-	local myconf=""
-
-	# Never tell the build system to "enable" SSE2, it has a few unexpected
-	# additions, bug #336871.
-	myconf+=" -Ddisable_sse2=1"
-
-	# Disable tcmalloc, it causes problems with e.g. NVIDIA
-	# drivers, bug #413637.
-	myconf+=" -Dlinux_use_tcmalloc=0"
-
-	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
-	myconf+=" -Ddisable_glibc=1"
-
-	# Make it possible to remove third_party/adobe.
-	echo > "${T}/flapper_version.h" || die
-	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
-
-	# Use system-provided libraries.
-	# TODO: use_system_ffmpeg
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	# TODO: use_system_vpx
-	myconf+="
-		-Duse_system_bzip2=1
-		-Duse_system_flac=1
-		-Duse_system_icu=1
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1:=
-		-Duse_system_libusb=1
-		-Duse_system_libwebp=1
-		-Duse_system_libxml=1
-		-Duse_system_speex=1
-		-Duse_system_v8=1
-		-Duse_system_xdg_utils=1
-		-Duse_system_yasm=1
-		-Duse_system_zlib=1"
-
-	# Optional dependencies.
-	# TODO: linux_link_kerberos, bug #381289.
-	myconf+="
-		$(gyp_use cups)
-		$(gyp_use gnome use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use kerberos)
-		$(gyp_use pulseaudio)
-		$(gyp_use selinux selinux)"
-
-	# Use explicit library dependencies instead of dlopen.
-	# This makes breakages easier to detect by revdep-rebuild.
-	myconf+="
-		-Dlinux_link_gsettings=1"
-
-	if ! use selinux; then
-		# Enable SUID sandbox.
-		myconf+="
-			-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
-			-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	myconf+="
-		-Dlinux_use_gold_binary=0
-		-Dlinux_use_gold_flags=0"
-
-	if ! use bindist; then
-		# Enable H.624 support in bundled ffmpeg.
-		myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome"
-	fi
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		myconf+=" -Dtarget_arch=x64"
-	elif [[ $myarch = x86 ]] ; then
-		myconf+=" -Dtarget_arch=ia32"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-	fi
-
-	egyp_chromium ${myconf} || die
-}
-
-src_compile() {
-	local test_targets
-	for x in base cacheinvalidation crypto \
-		googleurl gpu media net printing sql; do
-		test_targets+=" ${x}_unittests"
-	done
-
-	local make_targets="chrome chromedriver"
-	if ! use selinux; then
-		make_targets+=" chrome_sandbox"
-	fi
-	if use test; then
-		make_targets+=$test_targets
-	fi
-
-	# See bug #410883 for more info about the .host mess.
-	emake ${make_targets} BUILDTYPE=Release V=1 \
-		CC.host="$(tc-getCC)" CFLAGS.host="${CFLAGS}" \
-		CXX.host="$(tc-getCXX)" CXXFLAGS.host="${CXXFLAGS}" \
-		LINK.host="$(tc-getCXX)" LDFLAGS.host="${LDFLAGS}" \
-		AR.host="$(tc-getAR)" || die
-
-	pax-mark m out/Release/chrome
-	if use test; then
-		for x in $test_targets; do
-			pax-mark m out/Release/${x}
-		done
-	fi
-}
-
-src_test() {
-	# For more info see bug #350349.
-	local mylocale='en_US.utf8'
-	if ! locale -a | grep -q "$mylocale"; then
-		eerror "${PN} requires ${mylocale} locale for tests"
-		eerror "Please read the following guides for more information:"
-		eerror "  http://www.gentoo.org/doc/en/guide-localization.xml"
-		eerror "  http://www.gentoo.org/doc/en/utf-8.xml"
-		die "locale ${mylocale} is not supported"
-	fi
-
-	# For more info see bug #370957.
-	if [[ $UID -eq 0 ]]; then
-		die "Tests must be run as non-root. Please use FEATURES=userpriv."
-	fi
-
-	# ICUStringConversionsTest: bug #350347.
-	# MessagePumpLibeventTest: bug #398501.
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \
-		'--gtest_filter=-ICUStringConversionsTest.*:MessagePumpLibeventTest.*'
-
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/cacheinvalidation_unittests virtualmake
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/googleurl_unittests virtualmake
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/gpu_unittests virtualmake
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/media_unittests virtualmake
-
-	# NetUtilTest: bug #361885.
-	# DnsConfigServiceTest.GetSystemConfig: bug #394883.
-	# CertDatabaseNSSTest.ImportServerCert_SelfSigned: bug #399269.
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \
-		'--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:DnsConfigServiceTest.GetSystemConfig:CertDatabaseNSSTest.ImportServerCert_SelfSigned:URLFetcher*'
-
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/printing_unittests virtualmake
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/sql_unittests virtualmake
-}
-
-src_install() {
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome || die
-
-	if ! use selinux; then
-		doexe out/Release/chrome_sandbox || die
-		fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
-	fi
-
-	doexe out/Release/chromedriver || die
-
-	doexe out/Release/nacl_helper{,_bootstrap} || die
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/nacl_irt_*.nexe || die
-	doins out/Release/libppGoogleNaClPluginChrome.so || die
-
-	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
-	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
-		sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \
-			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
-		sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \
-			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
-		sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \
-			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
-	fi
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
-
-	# Allow users to override command-line options, bug #357629.
-	dodir /etc/chromium || die
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default" || die
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.pak || die
-
-	doins -r out/Release/locales || die
-	doins -r out/Release/resources || die
-
-	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
-	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
-
-	doexe out/Release/libffmpegsumo.so || die
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser${CHROMIUM_SUFFIX}.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Chromium${CHROMIUM_SUFFIX}" \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	if use gnome; then
-		dodir /usr/share/gnome-control-center/default-apps || die
-		insinto /usr/share/gnome-control-center/default-apps
-		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
-		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
-			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
-				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
-		fi
-	fi
-}

diff --git a/www-client/chromium/chromium-22.0.1229.52.ebuild b/www-client/chromium/chromium-22.0.1229.79.ebuild
similarity index 97%
rename from www-client/chromium/chromium-22.0.1229.52.ebuild
rename to www-client/chromium/chromium-22.0.1229.79.ebuild
index e1f0ec3..fc1ec39 100644
--- a/www-client/chromium/chromium-22.0.1229.52.ebuild
+++ b/www-client/chromium/chromium-22.0.1229.79.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-22.0.1229.52.ebuild,v 1.1 2012/09/13 02:08:23 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-22.0.1229.79.ebuild,v 1.4 2012/09/26 11:12:00 phajdan.jr Exp $
 
-EAPI="5"
+EAPI="4"
 PYTHON_DEPEND="2:2.6"
 
 CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
@@ -18,7 +18,7 @@ SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux"
 
 RDEPEND="app-arch/bzip2
@@ -40,7 +40,7 @@ RDEPEND="app-arch/bzip2
 	>=media-libs/alsa-lib-1.0.19
 	media-libs/flac
 	>=media-libs/libjpeg-turbo-1.2.0-r1
-	media-libs/libpng:=
+	media-libs/libpng
 	>=media-libs/libwebp-0.2.0_rc1
 	media-libs/speex
 	pulseaudio? ( media-sound/pulseaudio )
@@ -215,7 +215,7 @@ src_configure() {
 		-Duse_system_icu=1
 		-Duse_system_libevent=1
 		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1:=
+		-Duse_system_libpng=1
 		-Duse_system_libusb=1
 		-Duse_system_libwebp=1
 		-Duse_system_libxml=1
@@ -345,7 +345,11 @@ src_test() {
 	runtest out/Release/crypto_unittests
 	runtest out/Release/googleurl_unittests
 	runtest out/Release/gpu_unittests
-	runtest out/Release/media_unittests
+
+	local excluded_media_unittests=(
+		"ChunkDemuxerTest.TestDurationChangeTimestampOffset" # bug #431042
+	)
+	runtest out/Release/media_unittests "${excluded_media_unittests[@]}"
 
 	local excluded_net_unittests=(
 		"NetUtilTest.IDNToUnicode*" # bug 361885

diff --git a/www-client/chromium/chromium-22.0.1229.56.ebuild b/www-client/chromium/chromium-22.0.1229.91.ebuild
similarity index 97%
rename from www-client/chromium/chromium-22.0.1229.56.ebuild
rename to www-client/chromium/chromium-22.0.1229.91.ebuild
index d05ba6e..8669315 100644
--- a/www-client/chromium/chromium-22.0.1229.56.ebuild
+++ b/www-client/chromium/chromium-22.0.1229.91.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-22.0.1229.56.ebuild,v 1.1 2012/09/15 04:48:02 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-22.0.1229.91.ebuild,v 1.1 2012/09/27 02:31:37 floppym Exp $
 
-EAPI="5"
+EAPI="4"
 PYTHON_DEPEND="2:2.6"
 
 CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
@@ -40,7 +40,7 @@ RDEPEND="app-arch/bzip2
 	>=media-libs/alsa-lib-1.0.19
 	media-libs/flac
 	>=media-libs/libjpeg-turbo-1.2.0-r1
-	media-libs/libpng:=
+	media-libs/libpng
 	>=media-libs/libwebp-0.2.0_rc1
 	media-libs/speex
 	pulseaudio? ( media-sound/pulseaudio )
@@ -215,7 +215,7 @@ src_configure() {
 		-Duse_system_icu=1
 		-Duse_system_libevent=1
 		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1:=
+		-Duse_system_libpng=1
 		-Duse_system_libusb=1
 		-Duse_system_libwebp=1
 		-Duse_system_libxml=1
@@ -345,7 +345,11 @@ src_test() {
 	runtest out/Release/crypto_unittests
 	runtest out/Release/googleurl_unittests
 	runtest out/Release/gpu_unittests
-	runtest out/Release/media_unittests
+
+	local excluded_media_unittests=(
+		"ChunkDemuxerTest.TestDurationChangeTimestampOffset" # bug #431042
+	)
+	runtest out/Release/media_unittests "${excluded_media_unittests[@]}"
 
 	local excluded_net_unittests=(
 		"NetUtilTest.IDNToUnicode*" # bug 361885

diff --git a/www-client/chromium/chromium-23.0.1255.0.ebuild b/www-client/chromium/chromium-23.0.1271.1.ebuild
similarity index 92%
rename from www-client/chromium/chromium-23.0.1255.0.ebuild
rename to www-client/chromium/chromium-23.0.1271.1.ebuild
index aee297e..079c79d 100644
--- a/www-client/chromium/chromium-23.0.1255.0.ebuild
+++ b/www-client/chromium/chromium-23.0.1271.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-23.0.1255.0.ebuild,v 1.1 2012/09/05 18:33:23 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-23.0.1271.1.ebuild,v 1.1 2012/09/23 12:37:33 phajdan.jr Exp $
 
-EAPI="5"
+EAPI="4"
 PYTHON_DEPEND="2:2.6"
 
 CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
@@ -40,7 +40,7 @@ RDEPEND="app-arch/bzip2
 	>=media-libs/alsa-lib-1.0.19
 	media-libs/flac
 	>=media-libs/libjpeg-turbo-1.2.0-r1
-	media-libs/libpng:=
+	media-libs/libpng
 	>=media-libs/libwebp-0.2.0_rc1
 	pulseaudio? ( media-sound/pulseaudio )
 	sys-fs/udev
@@ -52,7 +52,6 @@ RDEPEND="app-arch/bzip2
 	kerberos? ( virtual/krb5 )
 	selinux? ( sys-libs/libselinux )"
 DEPEND="${RDEPEND}
-	!arm? ( >=dev-lang/nacl-toolchain-newlib-0_p9093 )
 	dev-lang/perl
 	dev-lang/yasm
 	dev-python/ply
@@ -99,35 +98,35 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if ! use arm; then
-		ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
-			native_client/toolchain/linux_x86_newlib || die
-	fi
+	# if ! use arm; then
+	#	ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
+	#		native_client/toolchain/linux_x86_newlib || die
+	# fi
 
 	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
 	# sed -i '1i#define OF(x) x' \
 	#	third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die
 
 	# Fix build without NaCl glibc toolchain.
-	epatch "${FILESDIR}/${PN}-ppapi-r0.patch"
+	# epatch "${FILESDIR}/${PN}-ppapi-r0.patch"
 
 	# Missing gyp files in tarball.
 	# https://code.google.com/p/chromium/issues/detail?id=144823
-	if [[ -e chrome/test/data/nacl/nacl_test_data.gyp ]]; then
-		die "tarball fixed, please remove workaround"
-	fi
-
-	mkdir -p chrome/test/data/nacl
-	cat > chrome/test/data/nacl/nacl_test_data.gyp <<-EOF
-	{
-	  'targets': [
-	    {
-	      'target_name': 'nacl_tests',
-	      'type': 'none',
-	    },
-	  ],
-	}
-	EOF
+	# if [[ -e chrome/test/data/nacl/nacl_test_data.gyp ]]; then
+	#	die "tarball fixed, please remove workaround"
+	# fi
+
+	# mkdir -p chrome/test/data/nacl
+	# cat > chrome/test/data/nacl/nacl_test_data.gyp <<-EOF
+	# {
+	#  'targets': [
+	#    {
+	#      'target_name': 'nacl_tests',
+	#      'type': 'none',
+	#    },
+	#  ],
+	# }
+	# EOF
 
 	epatch_user
 
@@ -215,6 +214,10 @@ src_configure() {
 	# drivers, bug #413637.
 	myconf+=" -Dlinux_use_tcmalloc=0"
 
+	# TODO: re-enable nacl after fixing build errors, see
+	# http://forums.gentoo.org/viewtopic-t-937222-highlight-chromium.html
+	myconf+=" -Ddisable_nacl=1"
+
 	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
 	myconf+=" -Ddisable_glibc=1"
 
@@ -236,7 +239,7 @@ src_configure() {
 		-Duse_system_icu=1
 		-Duse_system_libevent=1
 		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1:=
+		-Duse_system_libpng=1
 		-Duse_system_libusb=1
 		-Duse_system_libwebp=1
 		-Duse_system_libxml=1
@@ -379,6 +382,9 @@ src_test() {
 		"DnsConfigServiceTest.GetSystemConfig" # bug #394883
 		"CertDatabaseNSSTest.ImportServerCert_SelfSigned" # bug #399269
 		"URLFetcher*" # bug #425764
+		"HTTPSOCSPTest.*" # bug #426630
+		"HTTPSEVCRLSetTest.*" # see above
+		"HTTPSCRLSetTest.*" # see above
 	)
 	runtest out/Release/net_unittests "${excluded_net_unittests[@]}"
 
@@ -397,12 +403,12 @@ src_install() {
 
 	doexe out/Release/chromedriver || die
 
-	if ! use arm; then
-		doexe out/Release/nacl_helper{,_bootstrap} || die
-		insinto "${CHROMIUM_HOME}"
-		doins out/Release/nacl_irt_*.nexe || die
-		doins out/Release/libppGoogleNaClPluginChrome.so || die
-	fi
+	# if ! use arm; then
+	#	doexe out/Release/nacl_helper{,_bootstrap} || die
+	#	insinto "${CHROMIUM_HOME}"
+	#	doins out/Release/nacl_irt_*.nexe || die
+	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
+	# fi
 
 	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
 	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then

diff --git a/www-client/chromium/chromium-23.0.1262.0.ebuild b/www-client/chromium/chromium-23.0.1271.6.ebuild
similarity index 91%
rename from www-client/chromium/chromium-23.0.1262.0.ebuild
rename to www-client/chromium/chromium-23.0.1271.6.ebuild
index 5c639ac..6b4c3bb 100644
--- a/www-client/chromium/chromium-23.0.1262.0.ebuild
+++ b/www-client/chromium/chromium-23.0.1271.6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-23.0.1262.0.ebuild,v 1.1 2012/09/12 11:44:02 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-23.0.1271.6.ebuild,v 1.1 2012/09/27 11:24:50 phajdan.jr Exp $
 
-EAPI="5"
+EAPI="4"
 PYTHON_DEPEND="2:2.6"
 
 CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
@@ -27,7 +27,6 @@ RDEPEND="app-arch/bzip2
 		>=net-print/cups-1.3.11
 	)
 	>=dev-lang/v8-3.11.10.6
-	dev-libs/dbus-glib
 	>=dev-libs/elfutils-0.149
 	dev-libs/expat
 	>=dev-libs/icu-49.1.1-r1
@@ -40,7 +39,7 @@ RDEPEND="app-arch/bzip2
 	>=media-libs/alsa-lib-1.0.19
 	media-libs/flac
 	>=media-libs/libjpeg-turbo-1.2.0-r1
-	media-libs/libpng:=
+	media-libs/libpng
 	>=media-libs/libwebp-0.2.0_rc1
 	pulseaudio? ( media-sound/pulseaudio )
 	sys-fs/udev
@@ -52,7 +51,6 @@ RDEPEND="app-arch/bzip2
 	kerberos? ( virtual/krb5 )
 	selinux? ( sys-libs/libselinux )"
 DEPEND="${RDEPEND}
-	!arm? ( >=dev-lang/nacl-toolchain-newlib-0_p9093 )
 	dev-lang/perl
 	dev-lang/yasm
 	dev-python/ply
@@ -99,35 +97,41 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if ! use arm; then
-		ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
-			native_client/toolchain/linux_x86_newlib || die
-	fi
+	# if ! use arm; then
+	#	ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
+	#		native_client/toolchain/linux_x86_newlib || die
+	# fi
 
 	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
 	# sed -i '1i#define OF(x) x' \
 	#	third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die
 
 	# Fix build without NaCl glibc toolchain.
-	epatch "${FILESDIR}/${PN}-ppapi-r0.patch"
+	# epatch "${FILESDIR}/${PN}-ppapi-r0.patch"
+
+	# Fix unnecessary dependency on dbus-glib, bug #434346.
+	epatch "${FILESDIR}/${PN}-dbus-glib-r0.patch"
+
+	# Fix build with system ICU.
+	epatch "${FILESDIR}/${PN}-system-icu-r0.patch"
 
 	# Missing gyp files in tarball.
 	# https://code.google.com/p/chromium/issues/detail?id=144823
-	if [[ -e chrome/test/data/nacl/nacl_test_data.gyp ]]; then
-		die "tarball fixed, please remove workaround"
-	fi
-
-	mkdir -p chrome/test/data/nacl
-	cat > chrome/test/data/nacl/nacl_test_data.gyp <<-EOF
-	{
-	  'targets': [
-	    {
-	      'target_name': 'nacl_tests',
-	      'type': 'none',
-	    },
-	  ],
-	}
-	EOF
+	# if [[ -e chrome/test/data/nacl/nacl_test_data.gyp ]]; then
+	#	die "tarball fixed, please remove workaround"
+	# fi
+
+	# mkdir -p chrome/test/data/nacl
+	# cat > chrome/test/data/nacl/nacl_test_data.gyp <<-EOF
+	# {
+	#  'targets': [
+	#    {
+	#      'target_name': 'nacl_tests',
+	#      'type': 'none',
+	#    },
+	#  ],
+	# }
+	# EOF
 
 	epatch_user
 
@@ -215,6 +219,10 @@ src_configure() {
 	# drivers, bug #413637.
 	myconf+=" -Dlinux_use_tcmalloc=0"
 
+	# TODO: re-enable nacl after fixing build errors, see
+	# http://forums.gentoo.org/viewtopic-t-937222-highlight-chromium.html
+	myconf+=" -Ddisable_nacl=1"
+
 	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
 	myconf+=" -Ddisable_glibc=1"
 
@@ -236,7 +244,7 @@ src_configure() {
 		-Duse_system_icu=1
 		-Duse_system_libevent=1
 		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1:=
+		-Duse_system_libpng=1
 		-Duse_system_libusb=1
 		-Duse_system_libwebp=1
 		-Duse_system_libxml=1
@@ -379,6 +387,9 @@ src_test() {
 		"DnsConfigServiceTest.GetSystemConfig" # bug #394883
 		"CertDatabaseNSSTest.ImportServerCert_SelfSigned" # bug #399269
 		"URLFetcher*" # bug #425764
+		"HTTPSOCSPTest.*" # bug #426630
+		"HTTPSEVCRLSetTest.*" # see above
+		"HTTPSCRLSetTest.*" # see above
 	)
 	runtest out/Release/net_unittests "${excluded_net_unittests[@]}"
 
@@ -397,12 +408,12 @@ src_install() {
 
 	doexe out/Release/chromedriver || die
 
-	if ! use arm; then
-		doexe out/Release/nacl_helper{,_bootstrap} || die
-		insinto "${CHROMIUM_HOME}"
-		doins out/Release/nacl_irt_*.nexe || die
-		doins out/Release/libppGoogleNaClPluginChrome.so || die
-	fi
+	# if ! use arm; then
+	#	doexe out/Release/nacl_helper{,_bootstrap} || die
+	#	insinto "${CHROMIUM_HOME}"
+	#	doins out/Release/nacl_irt_*.nexe || die
+	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
+	# fi
 
 	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
 	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then

diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 55e5a25..de24b3e 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.134 2012/09/12 11:44:02 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.136 2012/09/27 11:24:50 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_DEPEND="2:2.6"
@@ -27,7 +27,6 @@ RDEPEND="app-arch/bzip2
 		>=net-print/cups-1.3.11
 	)
 	>=dev-lang/v8-3.11.10.6
-	dev-libs/dbus-glib
 	>=dev-libs/elfutils-0.149
 	dev-libs/expat
 	>=dev-libs/icu-49.1.1-r1
@@ -52,7 +51,6 @@ RDEPEND="app-arch/bzip2
 	kerberos? ( virtual/krb5 )
 	selinux? ( sys-libs/libselinux )"
 DEPEND="${RDEPEND}
-	!arm? ( >=dev-lang/nacl-toolchain-newlib-0_p9093 )
 	dev-lang/perl
 	dev-lang/yasm
 	dev-python/ply
@@ -157,10 +155,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if ! use arm; then
-		ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
-			native_client/toolchain/linux_x86_newlib || die
-	fi
+	# if ! use arm; then
+	#	ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
+	#		native_client/toolchain/linux_x86_newlib || die
+	# fi
 
 	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
 	# sed -i '1i#define OF(x) x' \
@@ -252,6 +250,10 @@ src_configure() {
 	# drivers, bug #413637.
 	myconf+=" -Dlinux_use_tcmalloc=0"
 
+	# TODO: re-enable nacl after fixing build errors, see
+	# http://forums.gentoo.org/viewtopic-t-937222-highlight-chromium.html
+	myconf+=" -Ddisable_nacl=1"
+
 	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
 	myconf+=" -Ddisable_glibc=1"
 
@@ -416,6 +418,9 @@ src_test() {
 		"DnsConfigServiceTest.GetSystemConfig" # bug #394883
 		"CertDatabaseNSSTest.ImportServerCert_SelfSigned" # bug #399269
 		"URLFetcher*" # bug #425764
+		"HTTPSOCSPTest.*" # bug #426630
+		"HTTPSEVCRLSetTest.*" # see above
+		"HTTPSCRLSetTest.*" # see above
 	)
 	runtest out/Release/net_unittests "${excluded_net_unittests[@]}"
 
@@ -434,12 +439,12 @@ src_install() {
 
 	doexe out/Release/chromedriver || die
 
-	if ! use arm; then
-		doexe out/Release/nacl_helper{,_bootstrap} || die
-		insinto "${CHROMIUM_HOME}"
-		doins out/Release/nacl_irt_*.nexe || die
-		doins out/Release/libppGoogleNaClPluginChrome.so || die
-	fi
+	# if ! use arm; then
+	#	doexe out/Release/nacl_helper{,_bootstrap} || die
+	#	insinto "${CHROMIUM_HOME}"
+	#	doins out/Release/nacl_irt_*.nexe || die
+	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
+	# fi
 
 	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
 	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then

diff --git a/www-client/chromium/files/chromium-dbus-glib-r0.patch b/www-client/chromium/files/chromium-dbus-glib-r0.patch
new file mode 100644
index 0000000..e221e1e
--- /dev/null
+++ b/www-client/chromium/files/chromium-dbus-glib-r0.patch
@@ -0,0 +1,59 @@
+Index: build/linux/system.gyp
+===================================================================
+--- build/linux/system.gyp	(revision 158796)
++++ build/linux/system.gyp	(working copy)
+@@ -112,7 +112,28 @@
+           ],
+         },
+       ],  # targets
+-    }]  # chromeos==0
++    }, {  # chromeos==1
++      'targets': [
++        {
++          # TODO(satorux): Remove this once dbus-glib clients are gone.
++          'target_name': 'dbus-glib',
++          'type': 'none',
++          'direct_dependent_settings': {
++            'cflags': [
++              '<!@(<(pkg-config) --cflags dbus-glib-1)',
++            ],
++          },
++          'link_settings': {
++            'ldflags': [
++              '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-glib-1)',
++            ],
++            'libraries': [
++              '<!@(<(pkg-config) --libs-only-l dbus-glib-1)',
++            ],
++          },
++        },
++      ],
++    }]
+   ],  # conditions
+   'targets': [
+     {
+@@ -477,24 +498,6 @@
+       },
+     },
+     {
+-      # TODO(satorux): Remove this once dbus-glib clients are gone.
+-      'target_name': 'dbus-glib',
+-      'type': 'none',
+-      'direct_dependent_settings': {
+-        'cflags': [
+-          '<!@(<(pkg-config) --cflags dbus-glib-1)',
+-        ],
+-      },
+-      'link_settings': {
+-        'ldflags': [
+-          '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-glib-1)',
+-        ],
+-        'libraries': [
+-          '<!@(<(pkg-config) --libs-only-l dbus-glib-1)',
+-        ],
+-      },
+-    },
+-    {
+       'target_name': 'glib',
+       'type': 'none',
+       'toolsets': ['host', 'target'],

diff --git a/www-client/chromium/files/chromium-system-icu-r0.patch b/www-client/chromium/files/chromium-system-icu-r0.patch
new file mode 100644
index 0000000..4f2c6d0
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-icu-r0.patch
@@ -0,0 +1,12 @@
+--- printing/backend/print_backend.cc.orig	2012-09-27 09:40:47.000000000 +0200
++++ printing/backend/print_backend.cc	2012-09-27 09:41:26.000000000 +0200
+@@ -6,8 +6,8 @@
+ 
+ #include <algorithm>
+ 
+-#include "third_party/icu/public/common/unicode/uchar.h"
+ #include "ui/base/text/text_elider.h"
++#include "unicode/uchar.h"
+ 
+ namespace {
+ 

diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
deleted file mode 100644
index 4262fa3..0000000
--- a/www-client/google-chrome/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST google-chrome-beta_22.0.1229.64-r157476_amd64.deb 34632982 SHA256 d3a21e141629dc171a555848370a79c6339aea8f2bd067fd646e13b6b74a4a04 SHA512 0d7cb114f5024276ad821b4bce4e1f5b9d60d77aff79e1c6f12d84942c5d22265f259a0a0bc9ef08977085eef9cc6682a20cb02eb31a4f86f1d62d394a57fe70 WHIRLPOOL 4c1e8f01f5a4ed25b043c4d315d3f470f68c3106593ddff7e6ba1e87aa5665a80fbe1a2da70862e09a5334aed36af7c7161e3f967cc45eb55820f2e7cd5a8f86
-DIST google-chrome-beta_22.0.1229.64-r157476_i386.deb 32952486 SHA256 7de4a32548e2d6497f4f68ed9ce82524e621a379b871f0cc987adc98778bc0da SHA512 17f707eab2703347b3b6fe5ccf6cfe0125a0aa3ffaba27caf25f21773050816a5cba91baeefe9025926618f6842bd0487220ac5d59d80a405f34faf40faf154e WHIRLPOOL c06486a7f38e3b207cf93d20e2e8f3f47f930512fdda96d4e828c6ce1ddff0a32793ea801dede75dd93d216b623f07f03ea1f579e618fad12642d726eea61982
-DIST google-chrome-stable_21.0.1180.89-r154005_amd64.deb 34025748 SHA256 5ddcfb7aa8d29b1dfc5ebc269bf3d717d899e640e107a55bac89a471e4361060 SHA512 65ac6849b6309ddf5e9e78ac3f6fd69bc0705d82918c903b1846e7baf987221cca504b306131ebe06ecf5e4c552651ab8c2b736faded9a0b276e01b1119fa02c WHIRLPOOL f48da50cc61c26b28c85376d22256e2b039baac3524daa5a102474fca3e5efdf7ebecd91aac3dc4a0ef70435a7faa7a0534ac4cc7bc401bb78f6207901c80754
-DIST google-chrome-stable_21.0.1180.89-r154005_i386.deb 32363342 SHA256 d4588ebb938f1abb44633bf4924b12263e90d94d77607446144db69eb0a26a87 SHA512 c478c5e78d2761ca95108c83487de215c20f524c43d22cb1de9388b03a2b2ab2e1075cc37fdb081a8c4487705de0fbba4d7cd23e35c40619e19685ea4d36e45b WHIRLPOOL 42dc63d36b7fc54a300aff91e05fea0c62590e178d32ee12d7369c4b69820042c3c2a4fb5338db747cd86721282a1b3a721c88a9ba1e23b6f2cd45cf56f63f2c
-DIST google-chrome-unstable_23.0.1271.1-r157674_amd64.deb 35894020 SHA256 7f057296fde3d69148d94d115b0cf32df1a38ab1561af4e4dd0682b8b0fa323e SHA512 4d67393cbd1bade725ff7c7ba2a49e11f9d313b1c77ade1ee7415d87acb4b151020399494dc37edbb846f8904f085b3f904de572f226ab2260381568c41ae9dc WHIRLPOOL 7897a7497eb87b10e03e89107ad0a229f215c6062925dfc92f2cbc12eec1c159f2ab7e875e6b921af0473addcd4f8430e0e1d8c9e0434b8f88e4607d128de454
-DIST google-chrome-unstable_23.0.1271.1-r157674_i386.deb 34205662 SHA256 ec5b39bb14c74dc29f5667288a1e6d57ebfae81c1ad035b320b9170245cda8ad SHA512 7ef1866a3812f2aaa85ed60f13729f03232cfb46b9096957e221c4fbdc3813885c4361449dcc8d29af28a93ef6ad3ed5f675b1590284b4837a6056c941698cbd WHIRLPOOL b942eb7102830bb4dc6b6270c35e8134e2cf9304f3e893c3353276a0c9dbbf41bd57c2cad86a9873af97e15a82bb4d79a99fa1ec193202f33955ac6516a89892
-EBUILD google-chrome-21.0.1180.89_p154005.ebuild 3741 SHA256 17047d8c03ffb2bea408e2d23db448f93974f49751b586f4f30040ee21528fe8 SHA512 f32ed5d61f88b39e1c5b6a43b692d33946f18d32184f2ec1ab825aeb4209fe6af0aa4f3599ac18b9a299248a3f361fea5689564cccb223ed4223b20805cf3ae7 WHIRLPOOL 1dcf0984ee0fe7f003c58231358692005edd9dab2edd0029775feb3f85064bc3bb9135b92db56d0f48f39f7f245c8712ca98b5f49977aaa3153fbee53b3737af
-EBUILD google-chrome-22.0.1229.64_beta157476.ebuild 3744 SHA256 41e6d3264bfb82de663acd8c6de3dadb3f83f1ebd0a9f511b3876f1529519257 SHA512 3c503271f31a47dd4cbcc8e215fb8367b85670e00d6e38e1868d844023c8d94a34119802a30bff3594b4839aaf368442281bfc16ce002b050f338c3368f94320 WHIRLPOOL 94dcc82a717d9ecc9e0e09c1647eb897a7a4f4ba9fcebdab6c11b2902b044c9374468e26968138c930ce236937d5b41bb5252dbf46ab2c3de9241200db228819
-EBUILD google-chrome-23.0.1271.1_alpha157674.ebuild 3701 SHA256 f2bc5cc5787b54b9732e31a52faaa704296d821a589835e83cba1e3ae9051598 SHA512 2e559b4057e50cf8e6400a02d7102493d54f927c235bbd93f273409311a747390de1a0c837febae7e1e8b9129f4634e508157fdfa1a34019ae1453bd28766990 WHIRLPOOL fc0afd0f85bdde6da28d63285878fec0ed9ef73c5ece7539f2edd389af9a7b06a24a92d9cafd2c3b928b18b841ae7f41e519dd9013854be9598260964cb6c214
-MISC ChangeLog 45921 SHA256 d7f9c2f2703a5848e14374d75138cf85f0fb99117c743e84eda9156568d9456b SHA512 598a5cd2c52735ad221ce27197bc890b5364f59b42efcf7af6c90f7535e20de89957f610a1df407bdcea1d0ad6ee8a65346fb081da74bba8dfe8ba13d80fe4b0 WHIRLPOOL aea5801b8ad43009b9b5eae1fc792150148d92330d6e915a0c9e33a7b474df3c5307a5cba62642eebf9c17c16060d9495fa0109bb58f6c3acd08e9bd8819261a
-MISC metadata.xml 600 SHA256 e3dffcb8db012d64e4dbb7df2566b800b2a9476aaf0447b1d40a6e94d2733806 SHA512 350bb629bee41ac320d1a870d3d7f34ead23edb1b7cf6ac6379363b01435015c58e249ba1375e9ed3b3023107ef5f3f29f646143a9e2622769923aa5fb21d846 WHIRLPOOL 05772be4e662813e5a0231e46d272931f0ccce9a13f7244ddda8a40e43e8d141293d0a70d4aa8b640ace773d3f68d663bd8cd4558f3bc3c65e5126834bf05129

diff --git a/www-client/google-chrome/google-chrome-21.0.1180.89_p154005.ebuild b/www-client/google-chrome/google-chrome-21.0.1180.89_p154005.ebuild
deleted file mode 100644
index c432c96..0000000
--- a/www-client/google-chrome/google-chrome-21.0.1180.89_p154005.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-21.0.1180.89_p154005.ebuild,v 1.2 2012/09/07 16:46:08 floppym Exp $
-
-EAPI="5"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh_CN zh_TW"
-
-inherit chromium eutils multilib pax-utils unpacker
-
-DESCRIPTION="The web browser from Google"
-HOMEPAGE="http://www.google.com/chrome"
-
-case ${PV} in
-	*_alpha*)
-		SLOT="unstable"
-		MY_PV=${PV/_alpha/-r}
-		;;
-	*_beta*)
-		SLOT="beta"
-		MY_PV=${PV/_beta/-r}
-		;;
-	*_p*)
-		SLOT="stable"
-		MY_PV=${PV/_p/-r}
-		;;
-	*)
-		die "Invalid value for \${PV}: ${PV}"
-		;;
-esac
-
-MY_PN="${PN}-${SLOT}"
-MY_P="${MY_PN}_${MY_PV}"
-
-SRC_BASE="http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_"
-SRC_URI="amd64? ( ${SRC_BASE}amd64.deb ) x86? ( ${SRC_BASE}i386.deb )"
-
-LICENSE="google-chrome"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+plugins"
-RESTRICT="mirror strip"
-
-RDEPEND="
-	media-libs/alsa-lib
-	app-arch/bzip2
-	x11-libs/cairo
-	net-print/cups
-	sys-apps/dbus
-	dev-libs/expat
-	media-libs/fontconfig
-	media-libs/freetype
-	app-misc/ca-certificates
-	gnome-base/gconf:2
-	dev-libs/libgcrypt
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	x11-libs/pango
-	media-libs/libpng:1.2
-	|| ( >=sys-devel/gcc-4.4.0[-nocxx] >=sys-devel/gcc-4.4.0[cxx] )
-	sys-fs/udev
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	sys-libs/zlib
-	x11-misc/xdg-utils
-	net-misc/curl
-	dev-libs/openssl:0.9.8
-"
-
-# Add blockers for the other slots.
-for x in 0 beta stable unstable; do
-	if [[ ${SLOT} != ${x} ]]; then
-		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
-	fi
-done
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-pkg_nofetch() {
-	eerror "Please do not report bugs for google-chrome fetch failures."
-	eerror "The problem will be resolved with the next version bump."
-	eerror "Sync your portage tree and try again."
-}
-
-pkg_setup() {
-	CHROME_HOME="opt/google/chrome/"
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_install() {
-	pax-mark m ${CHROME_HOME}chrome || die
-	rm -rf usr/share/menu || die
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-
-	pushd "${CHROME_HOME}locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	mv opt usr "${D}" || die
-
-	fperms u+s "/${CHROME_HOME}chrome-sandbox" || die
-
-	if use plugins ; then
-		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
-		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
-			-i "${D}${CHROME_HOME}google-chrome" || die
-	fi
-
-	domenu "${D}${CHROME_HOME}google-chrome.desktop" || die
-	local size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		insinto /usr/share/icons/hicolor/${size}x${size}/apps
-		newins "${D}${CHROME_HOME}product_logo_${size}.png" google-chrome.png
-	done
-
-	# Compatibility symlink for newer udev, bug 423415.
-	dosym "/usr/$(get_libdir)/libudev.so" "${CHROME_HOME}libudev.so.0"
-}
-
-any_cpu_missing_flag() {
-	local value=$1
-	grep '^flags' /proc/cpuinfo | grep -qv "$value"
-}
-
-pkg_preinst() {
-	chromium_pkg_preinst
-	if any_cpu_missing_flag sse2; then
-		ewarn "The bundled PepperFlash plugin requires a CPU that supports the"
-		ewarn "SSE2 instruction set, and at least one of your CPUs does not"
-		ewarn "support this feature. Disabling PepperFlash."
-		sed -e "/^exec/ i set -- --disable-bundled-ppapi-flash \"\$@\"" \
-			-i "${D}${CHROME_HOME}google-chrome" || die
-	fi
-}
-
-pkg_postinst() {
-	chromium_pkg_postinst
-
-	einfo
-	elog "Please notice the bundled flash player (PepperFlash)."
-	elog "You can (de)activate all flash plugins via chrome://plugins"
-	einfo
-}

diff --git a/www-client/google-chrome/google-chrome-22.0.1229.64_beta157476.ebuild b/www-client/google-chrome/google-chrome-22.0.1229.64_beta157476.ebuild
deleted file mode 100644
index d2b75f9..0000000
--- a/www-client/google-chrome/google-chrome-22.0.1229.64_beta157476.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-22.0.1229.64_beta157476.ebuild,v 1.1 2012/09/21 04:07:50 floppym Exp $
-
-EAPI="5"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh_CN zh_TW"
-
-inherit chromium eutils multilib pax-utils unpacker
-
-DESCRIPTION="The web browser from Google"
-HOMEPAGE="http://www.google.com/chrome"
-
-case ${PV} in
-	*_alpha*)
-		SLOT="unstable"
-		MY_PV=${PV/_alpha/-r}
-		;;
-	*_beta*)
-		SLOT="beta"
-		MY_PV=${PV/_beta/-r}
-		;;
-	*_p*)
-		SLOT="stable"
-		MY_PV=${PV/_p/-r}
-		;;
-	*)
-		die "Invalid value for \${PV}: ${PV}"
-		;;
-esac
-
-MY_PN="${PN}-${SLOT}"
-MY_P="${MY_PN}_${MY_PV}"
-
-SRC_BASE="http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_"
-SRC_URI="amd64? ( ${SRC_BASE}amd64.deb ) x86? ( ${SRC_BASE}i386.deb )"
-
-LICENSE="google-chrome"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+plugins"
-RESTRICT="mirror strip"
-
-RDEPEND="
-	media-libs/alsa-lib
-	app-arch/bzip2
-	x11-libs/cairo
-	net-print/cups
-	sys-apps/dbus
-	dev-libs/expat
-	media-libs/fontconfig
-	media-libs/freetype
-	app-misc/ca-certificates
-	gnome-base/gconf:2
-	dev-libs/libgcrypt
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	x11-libs/pango
-	media-libs/libpng:1.2
-	|| ( >=sys-devel/gcc-4.4.0[-nocxx] >=sys-devel/gcc-4.4.0[cxx] )
-	sys-fs/udev
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	sys-libs/zlib
-	x11-misc/xdg-utils
-	net-misc/curl
-	dev-libs/openssl:0.9.8
-"
-
-# Add blockers for the other slots.
-for x in 0 beta stable unstable; do
-	if [[ ${SLOT} != ${x} ]]; then
-		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
-	fi
-done
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-pkg_nofetch() {
-	eerror "Please do not report bugs for google-chrome fetch failures."
-	eerror "The problem will be resolved with the next version bump."
-	eerror "Sync your portage tree and try again."
-}
-
-pkg_setup() {
-	CHROME_HOME="opt/google/chrome/"
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_install() {
-	pax-mark m ${CHROME_HOME}chrome || die
-	rm -rf usr/share/menu || die
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-
-	pushd "${CHROME_HOME}locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	mv opt usr "${D}" || die
-
-	fperms u+s "/${CHROME_HOME}chrome-sandbox" || die
-
-	if use plugins ; then
-		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
-		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
-			-i "${D}${CHROME_HOME}google-chrome" || die
-	fi
-
-	domenu "${D}${CHROME_HOME}google-chrome.desktop" || die
-	local size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		insinto /usr/share/icons/hicolor/${size}x${size}/apps
-		newins "${D}${CHROME_HOME}product_logo_${size}.png" google-chrome.png
-	done
-
-	# Compatibility symlink for newer udev, bug 423415.
-	dosym "/usr/$(get_libdir)/libudev.so" "${CHROME_HOME}libudev.so.0"
-}
-
-any_cpu_missing_flag() {
-	local value=$1
-	grep '^flags' /proc/cpuinfo | grep -qv "$value"
-}
-
-pkg_preinst() {
-	chromium_pkg_preinst
-	if any_cpu_missing_flag sse2; then
-		ewarn "The bundled PepperFlash plugin requires a CPU that supports the"
-		ewarn "SSE2 instruction set, and at least one of your CPUs does not"
-		ewarn "support this feature. Disabling PepperFlash."
-		sed -e "/^exec/ i set -- --disable-bundled-ppapi-flash \"\$@\"" \
-			-i "${D}${CHROME_HOME}google-chrome" || die
-	fi
-}
-
-pkg_postinst() {
-	chromium_pkg_postinst
-
-	einfo
-	elog "Please notice the bundled flash player (PepperFlash)."
-	elog "You can (de)activate all flash plugins via chrome://plugins"
-	einfo
-}

diff --git a/www-client/google-chrome/google-chrome-23.0.1271.1_alpha157674.ebuild b/www-client/google-chrome/google-chrome-23.0.1271.1_alpha157674.ebuild
deleted file mode 100644
index 4173025..0000000
--- a/www-client/google-chrome/google-chrome-23.0.1271.1_alpha157674.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-23.0.1271.1_alpha157674.ebuild,v 1.1 2012/09/21 04:07:50 floppym Exp $
-
-EAPI="4"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh_CN zh_TW"
-
-inherit chromium eutils multilib pax-utils unpacker
-
-DESCRIPTION="The web browser from Google"
-HOMEPAGE="http://www.google.com/chrome"
-
-case ${PV} in
-	*_alpha*)
-		SLOT="unstable"
-		MY_PV=${PV/_alpha/-r}
-		;;
-	*_beta*)
-		SLOT="beta"
-		MY_PV=${PV/_beta/-r}
-		;;
-	*_p*)
-		SLOT="stable"
-		MY_PV=${PV/_p/-r}
-		;;
-	*)
-		die "Invalid value for \${PV}: ${PV}"
-		;;
-esac
-
-MY_PN="${PN}-${SLOT}"
-MY_P="${MY_PN}_${MY_PV}"
-
-SRC_BASE="http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_"
-SRC_URI="amd64? ( ${SRC_BASE}amd64.deb ) x86? ( ${SRC_BASE}i386.deb )"
-
-LICENSE="google-chrome"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+plugins"
-RESTRICT="mirror strip"
-
-RDEPEND="
-	app-arch/bzip2
-	app-misc/ca-certificates
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libgcrypt
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-print/cups
-	sys-apps/dbus
-	|| ( >=sys-devel/gcc-4.4.0[-nocxx] >=sys-devel/gcc-4.4.0[cxx] )
-	sys-fs/udev
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/pango
-	x11-misc/xdg-utils
-"
-
-# Add blockers for the other slots.
-for x in 0 beta stable unstable; do
-	if [[ ${SLOT} != ${x} ]]; then
-		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
-	fi
-done
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-pkg_nofetch() {
-	eerror "Please do not report bugs for google-chrome fetch failures."
-	eerror "The problem will be resolved with the next version bump."
-	eerror "Sync your portage tree and try again."
-}
-
-pkg_setup() {
-	CHROME_HOME="opt/google/chrome/"
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_install() {
-	pax-mark m ${CHROME_HOME}chrome || die
-	rm -rf usr/share/menu || die
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-
-	pushd "${CHROME_HOME}locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	mv opt usr "${D}" || die
-
-	fperms u+s "/${CHROME_HOME}chrome-sandbox" || die
-
-	if use plugins ; then
-		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
-		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
-			-i "${D}${CHROME_HOME}google-chrome" || die
-	fi
-
-	domenu "${D}${CHROME_HOME}google-chrome.desktop" || die
-	local size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		insinto /usr/share/icons/hicolor/${size}x${size}/apps
-		newins "${D}${CHROME_HOME}product_logo_${size}.png" google-chrome.png
-	done
-
-	# Compatibility symlink for newer udev, bug 423415.
-	dosym "/usr/$(get_libdir)/libudev.so" "${CHROME_HOME}libudev.so.0"
-}
-
-any_cpu_missing_flag() {
-	local value=$1
-	grep '^flags' /proc/cpuinfo | grep -qv "$value"
-}
-
-pkg_preinst() {
-	chromium_pkg_preinst
-	if any_cpu_missing_flag sse2; then
-		ewarn "The bundled PepperFlash plugin requires a CPU that supports the"
-		ewarn "SSE2 instruction set, and at least one of your CPUs does not"
-		ewarn "support this feature. Disabling PepperFlash."
-		sed -e "/^exec/ i set -- --disable-bundled-ppapi-flash \"\$@\"" \
-			-i "${D}${CHROME_HOME}google-chrome" || die
-	fi
-}
-
-pkg_postinst() {
-	chromium_pkg_postinst
-
-	einfo
-	elog "Please notice the bundled flash player (PepperFlash)."
-	elog "You can (de)activate all flash plugins via chrome://plugins"
-	einfo
-}

diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 69e5dbc..73db1e5 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -3,6 +3,6 @@ DIST links-2.7.tar.bz2 3884511 SHA256 0c182b1cbcdfd5cdcd2f75a6032d1a4b660d07c122
 DIST links2_2.5-1.debian.tar.gz 20869 SHA256 28fb3fe213b3ba2a2274353a810bcd23d4fd39d949d8cb608c3a366f09651b7e SHA512 e4f0995ffb9d6564cbc94193cf4097789d5e367c3f06223e71cdb707b4dcebdc1ab5df468b659e3a926c33a223361fdbedf1c501e6ae40cb3ce2599dadd8e80b WHIRLPOOL 801a2cb5d11b2ad6873252f304966c6b787ecd2e6c2c34a3c3086d1cc7d5ddc006a4046a2352c747f6ac6850cdcfb745240de5f1a7c949d8919d98408f6e0e53
 DIST links2_2.7-1.debian.tar.gz 12430 SHA256 87955ae64b20beeb5abbfc7223eb8e7f8a8f6343bb511d7bc954a5f8085d8a8a SHA512 7a9a13dd9fcaf76e7692a82c6bd480846b7adf23d9b81b2ba2bfdd15c4fcb3fbff44f0443dbca484237c53fffc07749e23cbe828eb1d656c5823b9491d47a0ae WHIRLPOOL e9889825d923420d50af990a324d0befff4f79738eb67fbc479287fc2a23155ecae6d6100b9a2bc4ae262e9e547913caaf7bddc73eadaffbdc5fdc0f8e87294a
 EBUILD links-2.6.ebuild 3230 SHA256 95e383e7fc2a600d8d802fae482da2f52dde1a4974767530df749c333ca3aecb SHA512 646c121abac069132d090c4973fcba7850a872f4e26e3e40604aed495131ee2c1d043485a9c310a96c7d2dca785fdb48586f3e15ab8ce26c36994bbee1550653 WHIRLPOOL d2f903aff06014a6a4c7987959b7f75f3bc3040d2445088c3c6cab9ac978bbd96cd5f4d01595334248f7ce9859b6add33a33d06e07ffafe54a6577f89c4f0386
-EBUILD links-2.7.ebuild 3275 SHA256 171e07c5e2bab4c5ebb35e6158e0802d5b685e754efc55acf0510d3470f7ca21 SHA512 c5e4926f45c96ee21134d8a8dd1dfe1de88176140ffb190fe8304343ecd8ec70b45f90b077abadb8af7c9bc2e94ff88c08788ff09dd0d8d87897f1da0705e43f WHIRLPOOL 54639f6c5e59420422de6d6238e264af8a4c698f41efc2f7164c8739e42afbc98e23501f4315cecf8be278e4736297f895ab448c1fa3a0ccac2aae3ded6ab43e
-MISC ChangeLog 35054 SHA256 074ec37643f1b8411814331f266d4f26e53d66d0a7582f012d898fbd0cabaa3d SHA512 80ca668f62b8aa8c8d97f2faccee5509a6d07bd3a044779d34be7c68113055d80a731690e92d3247932b998cec46fa54000ef23ab83af7d7a3df817afcea835a WHIRLPOOL 7da69c2f9ebe606e41f01368e818ed8f84cff47d41a04bc21e1d228a0e0dd9d55efbbbb6c43183ffe0bb6a21a92b1edad3b2bfd5609d0093e53b0c52be614017
+EBUILD links-2.7.ebuild 3269 SHA256 11e22da2df8973123a6ce6eabda665765e6170a6c218182316d54507c4254b51 SHA512 0b22d8c87f60b311c629926211b05fb0d31797c9b38105b7fa6de44110a901c8fc2e04546a15ac55aca591efad705cd0e3b8c1d0d7a5e4ba6a38391e2e4f1394 WHIRLPOOL c451f3a7a9aa7034412f1f5f8633623127a8733cb0c95682abdb522cecae3eb761eb925c300e1f3471f22f53d74c5696792b0299514361697dcdada701e90833
+MISC ChangeLog 35166 SHA256 5b697f11251bc61872e08fd18fb593aaf7dc0c0edc5a7e9ee43645e041bf556b SHA512 a73fc816eba7820c459a3e6b46eb1d4cd840a5d385319007977e6293e3bccf29a7f2cea9876ee16c206bce3e38dae40947f68c93dbc5841476d867ea34a8c106 WHIRLPOOL 03a9770883cd636b191439f1143d22417bbb641e344a459b35b9b4fa2e35f7c7a7f000ff57793eb06a3cff0162c1801cbfccb3b2f105522623e3963ec3f6505f
 MISC metadata.xml 475 SHA256 47cdac116651eba8a04d0e7a0560d5013bc967ce3aa2d86f61ee8688649a3916 SHA512 f2708fbdcbcdadb6dcc11945e84a72d5371e1ddb50c85d51c42d554d11e9f6c4ab5178e90d516442a68b3f49e11ca171abebc6842f7920b75ac9151253ab2dd9 WHIRLPOOL e1dc8232c53e4585c4cc2258722217f242349c0de12a2b67f005eb5ef7bf79f227263d50adedb34fc6c6f6597f4e8b95be5baf1a94c206d33f781e77af7168fb

diff --git a/www-client/links/links-2.7.ebuild b/www-client/links/links-2.7.ebuild
index d2e7338..0cc6473 100644
--- a/www-client/links/links-2.7.ebuild
+++ b/www-client/links/links-2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.7.ebuild,v 1.9 2012/09/12 11:08:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.7.ebuild,v 1.10 2012/09/24 18:44:31 armin76 Exp $
 
 EAPI="5"
 inherit autotools eutils fdo-mime
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +deprecated directfb fbcon gpm jpeg livecd lzma ssl suid svga tiff unicode X zlib"
 
 GRAPHICS_DEPEND="media-libs/libpng:0="

diff --git a/www-plugins/google-talkplugin/Manifest b/www-plugins/google-talkplugin/Manifest
index fbf90ca..3c7afe1 100644
--- a/www-plugins/google-talkplugin/Manifest
+++ b/www-plugins/google-talkplugin/Manifest
@@ -2,8 +2,8 @@ DIST google-talkplugin_3.5.1.0-1_amd64.deb 12626896 SHA256 32e3b9ab917ed30beb5f7
 DIST google-talkplugin_3.5.1.0-1_i386.deb 11119864 SHA256 a7d81acad6ca7f9c1940d684e332f8abc064cf3c6e58942d8ee6ace7bf11cdcd SHA512 5a52a068200c06756c28ac9145d3b2ed2a3571ae3258df4abf0ebdc464a5f2cd89e0bf0d3a731655a08e35e4503c560f1d6eb028bfeb09a984f193cc25a5f8b7 WHIRLPOOL 92d5bbf5ecd5b74fd8f57acd6c2d8305ba7789530f4e9975df43a5bae281f931cd2796caa19593c562cb3d597e1f03354c82a5569bb5882d0378d4b351e612c7
 DIST google-talkplugin_3.6.1.0-1_amd64.deb 12640622 SHA256 7b310f4ce0a27a0cc7970c516977b63be9981eb6a6541875d770ad007752d8c0 SHA512 5f027a43c2287fe0554f3c22915d68495f11c298b6a507abcbd57e70a92c409e5f4736ae5c935acfa7639b03eeebd6a83c3c7f721e5070e013d8d497649fb6f7 WHIRLPOOL 36f9951d910d0a8d0fba75b9c2dcb25a7a2fd6764c9246f3af0affef42aec18550cc9e056e0ae1f9ca5f6bd7bda871ac3da6c3e660db8bebd9985fc597ad127e
 DIST google-talkplugin_3.6.1.0-1_i386.deb 11137300 SHA256 a2a32d9b35cd5580ee8e4f5a4638fa2801c309d0780d24f6755f815a7774cd34 SHA512 d542294c49f44996d8b8e9dabc903113b34ae66c3787b84bd66c0ff1e3652f8ffc31e7d522cf233d80ffceb04d61b9f9830db1dc1e4b195b802981f5b03bcf28 WHIRLPOOL 7a19029a5b64c2fe3debfd23ccdfc2635c95092bcdf729d80e363ee59a9079ad3dac72b6940b191ba1166c5ef50f7f75153bc72fed1498876a9fe38cc16fd0eb
-EBUILD google-talkplugin-3.5.1.0.ebuild 4006 SHA256 4bd56be9e33e6bc6b3008251a33ae8f8d6c545ea58677112629ef395cf70fb95 SHA512 6dbeafcb138710af4fdf94252a47e7cf6472fe8605a321877879190524852825b5e5175f152b0f942e53bcfad51952e308fc83cd8ff2c4f15ebae81c6c33fd73 WHIRLPOOL b036add88322a40edb39da7338158a6abd709282cfdb1aaa0a65d2f4c884ee206ddbae0465a83f77714cb736898e36a3d85e254e628fced79f5a1ece0ef3969d
-EBUILD google-talkplugin-3.6.1.0.ebuild 3807 SHA256 da91486313c0005f6191d8e6aba87f22fc3325cf888a2a3912ad46d5b1fac6c0 SHA512 73e836155636655db7031de9e875a237d16f44e23b57bafcd41997f2a05604a9feffda789c5bea9d450c7aea2b3d513d51ec0d4ac73da7a33f2ffe17ccb5f495 WHIRLPOOL bbdb13dc9b3494a0b263aeecc673eeeec0a78582be398b18d878697a077879ce567d0b6a8f55c2912d46478cd5635301a47c203eb9c2a37444c49437e0c24ec5
-EBUILD google-talkplugin-9999.ebuild 3804 SHA256 9389fab61cbdf176537584dd3d561ccbfb840a0d78280d879d1e6b1edb6ec1f0 SHA512 1ad01d9763beb4c06984f5e5ff0b3373b3ddfe45be23dd3c4c6f47cb1795fffa5f54152813b5a8411513acf603d2361e2fe156aea96e0e7142f21779cce3eaba WHIRLPOOL e45f40501a3a60b320e1ee954bf608287c339a93981b19ff71d26e9af1a171d7d6f7e68fcd37c83a68d38669d0e3085974c3ad5a8b49667aa654b3fb0b01de67
-MISC ChangeLog 5897 SHA256 005c858acea94df7ffe631d78ad14bf1a2b84112242bea8eb03e535b02aa02c5 SHA512 2361d16898d4b0be7f5a393e932c8129ca79dd4f5121f35e0dd1215e03bad2de09d9fe7d4d0723b835f49f79f2ceadb0711a66f82160fc1c263a47c16951832a WHIRLPOOL f2cadbf14a0cabdfd1a6a32cd5cec4aa98b652d8c730cc3521b486641272b50e8124467e3039e670f25f815723b667054358e7b19685d3b8e49ef1e9677959d3
+EBUILD google-talkplugin-3.5.1.0.ebuild 4012 SHA256 3f3beaa1be326182b6de324fa271e745eebf2132ab4542b2207c9f64fb1d9dd5 SHA512 dc0091120f8a494c84ecc779d7948995eb040058f59c341a1d645f8d5dcf6f8b4967f0ac9a9b782e9a8f9d87678e4b9f6dfc720fac31926751cc213afe6dffe6 WHIRLPOOL edaab413d908aa632e376cbad1e1d2455159b3a24cdac30a54af59d72ba8d7c9ed731cc30dc074be454e48869dedc86bba430a47b099eb6224765008e03f163d
+EBUILD google-talkplugin-3.6.1.0.ebuild 3813 SHA256 54ebda52204b1df46cebe9a6d0a2aebcb563ad0f028c00bd9bd24f10e8bd62a3 SHA512 ac621fb6820c976770214c9547929ca5fb98b7a0b17f49685029c8d035c8cd7acda8a776e9084d6062064f205f5f84f33c2fdc51c553bd30d15ba3804ba9b9e9 WHIRLPOOL ee4856531e2c75cf42daa83c21c494119ee7e13052776ffc14a46ece3fa79207ebf0c7e4bfe820f34f1aca280d3d10c00f5366ee47f3241b9e54d09a7c69f30c
+EBUILD google-talkplugin-9999.ebuild 3810 SHA256 9d682627679af391606703be8c244f640dd8d17347d88111b5f48ad0b0145700 SHA512 4de47eee816db5a0e6876ff4c83dba9d8d5666463c581da79cf2815e6a87720d28c8531ee9fb9790b40ede5030a2f05493b126f410c9513486e92b93a1c5a5b6 WHIRLPOOL b75b4612dca1db758c298a0776cd39be0cb983b03fc030b7d9e68784e3a8a73787593654165b5deaef27f494748c285278fab35d97fd444be38b5cca44687264
+MISC ChangeLog 6116 SHA256 8a3ed82dd8fe7631f4e5c2e59e328b22bb17db79c1e851114714c03dfc8f242e SHA512 3abb6709b8659ae1ae4c855ff8e27c01437a4876275713162a5b947e88cad1804b9f85f4bb51a1c5be00cad9765f7aef3c428d5bc118c678692c934c0aea5cc2 WHIRLPOOL a270d049d06c6fbf737c32e714ac057d9730572806ccf54e4c0e919d63ddd3d77536cc78f5ec18361b7e31df5216c932bb791958d48f757771ca033322d40482
 MISC metadata.xml 354 SHA256 d7d1330a39cf9ec3f0e53a8a5b1b6a0a259367edb897c3fec76ca07223a0dce2 SHA512 cc86eee04c852fb1e40620e481712c5fc2c175fe637fb2ec1c627b88d25bf94f257a717191488981795f49488ddf6fb918b0d1d89ec05f23ba681b293a634066 WHIRLPOOL 503502973ebe813a597a56a6d013af48101902a04782c9fbcc54512b39b2fc3ae0440b63b819090ae145d54f276eca77ebf8ba6f17e9d3e05082969e28a210cf

diff --git a/www-plugins/google-talkplugin/google-talkplugin-3.5.1.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-3.5.1.0.ebuild
index c42a053..dcdc1d8 100644
--- a/www-plugins/google-talkplugin/google-talkplugin-3.5.1.0.ebuild
+++ b/www-plugins/google-talkplugin/google-talkplugin-3.5.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-3.5.1.0.ebuild,v 1.2 2012/09/16 19:06:50 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-3.5.1.0.ebuild,v 1.3 2012/09/24 00:49:11 vapier Exp $
 
 EAPI="5"
 
@@ -59,7 +59,7 @@ QA_EXECSTACK="${INSTALL_BASE}/GoogleTalkPlugin"
 
 QA_TEXTRELS="${INSTALL_BASE}/libnpg*.so"
 
-QA_DT_HASH="${INSTALL_BASE}/libnpg.*so
+QA_FLAGS_IGNORED="${INSTALL_BASE}/libnpg.*so
 	${INSTALL_BASE}/lib/libCg.*so
 	${INSTALL_BASE}/GoogleTalkPlugin"
 

diff --git a/www-plugins/google-talkplugin/google-talkplugin-3.6.1.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-3.6.1.0.ebuild
index 80dfdde..187b98f 100644
--- a/www-plugins/google-talkplugin/google-talkplugin-3.6.1.0.ebuild
+++ b/www-plugins/google-talkplugin/google-talkplugin-3.6.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-3.6.1.0.ebuild,v 1.1 2012/09/16 19:06:50 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-3.6.1.0.ebuild,v 1.2 2012/09/24 00:49:11 vapier Exp $
 
 EAPI="5"
 
@@ -59,7 +59,7 @@ QA_EXECSTACK="${INSTALL_BASE}/GoogleTalkPlugin"
 
 QA_TEXTRELS="${INSTALL_BASE}/libnpg*.so"
 
-QA_DT_HASH="${INSTALL_BASE}/libnpg.*so
+QA_FLAGS_IGNORED="${INSTALL_BASE}/libnpg.*so
 	${INSTALL_BASE}/lib/libCg.*so
 	${INSTALL_BASE}/GoogleTalkPlugin"
 

diff --git a/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild b/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild
index d6690ab..f4533fb 100644
--- a/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild
+++ b/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild,v 1.8 2012/09/16 19:06:50 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild,v 1.9 2012/09/24 00:49:11 vapier Exp $
 
 EAPI="5"
 
@@ -59,7 +59,7 @@ QA_EXECSTACK="${INSTALL_BASE}/GoogleTalkPlugin"
 
 QA_TEXTRELS="${INSTALL_BASE}/libnpg*.so"
 
-QA_DT_HASH="${INSTALL_BASE}/libnpg.*so
+QA_FLAGS_IGNORED="${INSTALL_BASE}/libnpg.*so
 	${INSTALL_BASE}/lib/libCg.*so
 	${INSTALL_BASE}/GoogleTalkPlugin"
 

diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 33353d7..b6cceac 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -8,14 +8,14 @@ AUX ati-powermode-opt-path-3.patch 1471 SHA256 35e73fef3d8e39714e8d6e73afaa7b205
 AUX atieventsd.init 533 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3 SHA512 9f8990bb5619f99524e0759a1c4b41b0b2c081c6eecb3916ab60df8e6b59d99e3615af61e0ba5b71d003ccaaf41e2143237b26f36f64f00a47e0fe94f83473dd WHIRLPOOL 21979818a19bc27e3527958c66bf45654df4a307862897530bc02be6616f45ee210590a9d1bcab84336c6061482034010efbb251770bfaf023f20ffae8212ecd
 AUX switchlibGL 1349 SHA256 a4aa2107fdb903da77fea432bc809a1155e213db460fdec72fd1c3c7cc0d13a0 SHA512 51d2912aa6ec2002b096c0483be69650d682feec54486ed5226b91988bc1516f718c71d9f58a2b28e0dbc512c0300ea271f9a97885776dd045fe324f1549b85d WHIRLPOOL d335ea9c57a28f8450423089bbf798da77cc72fff6bad1221989412808abcd6bcb7afa41aa2b04231feff3dac6eaaff58a7595173e53b6cf0f5d3d591997b43d
 DIST amd-driver-installer-12-2-x86.x86_64.run 107213014 SHA256 054796cbf2d99e4b545d062ce8eabfd973e74e2e21a159092816238b001618fd
-DIST amd-driver-installer-12-4-x86.x86_64.run 108360519 SHA256 7f3ba3d96eba30fc09aec03ba72f5482d3b192bb0ea63a5e7b79454b053cb63c
+DIST amd-driver-installer-12-4-x86.x86_64.run 108360519 SHA256 7f3ba3d96eba30fc09aec03ba72f5482d3b192bb0ea63a5e7b79454b053cb63c SHA512 fe466df547a05efb37b0dd1c685f819ceb51af83acefd65f2e500ab9165feac841d4b07afc32dc26391762963e929624e55115c0f505acb78289540baaadcfb5 WHIRLPOOL 7aa8817e75943977b753a93015a7d1e0f7a95383e6aaae7317da29eb07caa520a5376b2ab80e7caded543939d3c9428b80d915d5ba3d8377068349189890729c
 DIST amd-driver-installer-12-6-x86.x86_64.run 106660241 SHA256 b5c6070dc75e9296d0f04e7e0b3c6697f6c21872d50b1dcf4d7b3b0ab7ce7155 SHA512 920b4613844afeffe1493f6c1811722734bb878817945077a46d3922be2e9bad85eb3c02bfeec57b55371cfd81d87332b9c7845dd9a079744e491979ef02f4d7 WHIRLPOOL a7b722ed9fed881498e91c5bb706b973eade890f9dfd49862c46cc2822417cf1b80011db79d4a449331c9b191e6e7ff98aa8f3fcb6bc90ebda3125f46f6d2800
 DIST amd-driver-installer-12-8-x86.x86_64.zip 105413213 SHA256 62525173b2b7602aa4e7e46a109204d0f349abfbb135c86d03db5cd57642bb41 SHA512 41d9b5ee472a3172746f04bdf43a595eb9090c03021f4dfdecd3ff0a938e45a9ace57b99c7255cec2ace68645adcc0d6eb2f420173b4b41fcfc4745fb62cf230 WHIRLPOOL 8f904858da340c7bb1f502f831b4ef2afefe7dc1eb3545c877056e4bae18934e9f54430efdb39069c5beb6d214399095602ce7806561fe7562d3b99a871208ca
 DIST amd-driver-installer-12.6-legacy-x86.x86_64.zip 106888385 SHA256 5353a3f874d31f0fde46c390ce17cc2f27875156dbf3e7c20b5cca494a058102 SHA512 81032c1b15f2d3a1da84066bf2682913ea4ea48bfdf7f50902e9471eb70ffb87a3a1501c45defb2ff15ee27bcbb1820ef2ab6391251b68de45655ace1f4fff0a WHIRLPOOL a34ec3bb761644ffa2c0bfd5a7a61cce33ba76c139fc66db12d1c35a5b4f9ee3ca74c0d8b0ef66f892b7de7e5c9564f2061698c1b347265c7ad422b9838bc21b
-EBUILD ati-drivers-12.2.ebuild 19136 SHA256 9f39e6debe51b0587acf743e0b54ad6737d4de5d1dd8ec540473ae66bd8a08d3 SHA512 a8968193becd974d4d12d38e288e09003f173e73f170dce3e57a28709b5f72d1fe3d982a7b26d1e51ff47dbcb180d78a994cf33bb6a5112ec6df0827275ad978 WHIRLPOOL 101f5d290c929d417b86fede8538b46e562e266014830055b787710b70fb2992104ec218fcfe632e2d92c2deaee04a6527e9c7407e019999238f52ca4180317d
-EBUILD ati-drivers-12.4.ebuild 19746 SHA256 a767a9411ffbeff85b6ae2e09d6d958b339468370432e46eecce11100d821a85 SHA512 bc6aa54d64fdf2f0e2bea478fb6cf507f567cc1ddd6208ee25ad7e08e1e63f2b2d5684619c13897d70b950b55535194a3136cb170c55d49152de16ab7e54aa08 WHIRLPOOL 8ffd2958f6375e34c8a6d819fe429362e37dfbe44196cce4f738bd992a26d310a42911fab5860974b890bab56aa3255a764bfc5681f3888a2fcf1d477722228a
-EBUILD ati-drivers-12.6.ebuild 20039 SHA256 2ba2f6e63c6cf31dcadd64a37d6a42d205250ffa650b8cf6cae54eba9782eaa1 SHA512 30e587f71cae805bbffcf3f099d85241a274b74baf4676ac34cd8cb570c6f621bd9c3dd12e06e13457d102c7f7edc8d5f2ca15d9c76a2568eb0eeccd6d2ca201 WHIRLPOOL 5a97c849e4eef12351dfc015e19711799abb294c12119b0800f30fc1290c60c7f0a06489853cc0d93a48c8c112f66d0e1f8f8effb5e489b4126f8b6d06d33fea
-EBUILD ati-drivers-12.6_beta_pre897.ebuild 19652 SHA256 af7e89ebb32b02a7eeaa22ad4e59e897306b70c8ca33c277b517da92497fea6a SHA512 34f85e39c091550f346bbc7d73d83d7cc2ff45c958c8d1acb420ec51cb612679882536074cf9064dd6b2f5ffb2b2eb82d5942488403d719893ae52946dd07fb0 WHIRLPOOL 2e47a1c898d6b617168caf574ab2952dc2537a98644d779745e2a7b706c5a0c7fb9bd2444f5a079f0d517d93b9ca09783674382692ed01d7825bd776764a5715
-EBUILD ati-drivers-12.8.ebuild 20319 SHA256 fb38b331126e085dcb39bf66ef346efebcc4ee4213dc7f79ea77abe0bd43a719 SHA512 3613a4cb98fa04f7946990f7cb8c83b3a151223ee845e7c155e332ac7644c53d85007867d6216dcca386b1f0c21377d68075e7f264e0d146f2c52d929c5b5e6b WHIRLPOOL a82fdd82a2a4e5ef662cf512803636b58bb1fd4dde4ac5b60698a197b92bd4885f97045c6610155db5868ed8fb52426de571ade20c9c10ddebfafed15026e84e
-MISC ChangeLog 78882 SHA256 c895be7d5683470d4ce1985ab52039cad74cd5eee9043ff66107769bf798c931 SHA512 f171d4a4145bb3178054e8abc84a548ef53d0cb99f78a0c384c99a87b3c341cc28b505aaa070064ecc3f6f0d2eb15f7cbeb2437f2c0038d149ea6229342f3928 WHIRLPOOL d33fe30023b4a7b6af3939cb5b361dabdf1fcefabb2c4d986fd98f90e61d443e6acce0745e85319dd4a78c4cd4c2fd1223cb8bce93ce6590813b1db408279e64
+EBUILD ati-drivers-12.2.ebuild 19144 SHA256 79a8eec363d1d7770bece8e70d1c00df4e93508c6a5be2a1c2dd393fb2f30bd1 SHA512 10f60ac29f35fc155fcca58a3caf11a235a244dc97c9d6eef9eecac898cfe0d42073ef5ea450aae7c5c1f313c376b9b5606734aa38eb7c22ced39e864af24550 WHIRLPOOL eb8b465ed98c33e30399fe7ac8820589a50b3ad88db718d3a35e9bfe773d1b80e78bb97cc0ee45b4c459eca740208d8a4ead5d51fb5f178589a08fd1c6b65fba
+EBUILD ati-drivers-12.4.ebuild 19754 SHA256 e96081241979a2465f16abd37820beaa32f35795a1a47808aee0391c1f5965b6 SHA512 107188d3de15012de07a4af9376a57eb93692b6b4329f6bb75e0af392d0b6cc0eae24c6fc688eb38a6b80b41fca59518ded485ea93895614d57c916a683d3a2c WHIRLPOOL 665b549f4d7a14e022ef2e5714cb28791ef7943fb62c4939003b3557f4a63eb58ab5d3ed78cc41b61ae4183b488387b4ec368f7b19ef970c9462b363dbbb967c
+EBUILD ati-drivers-12.6.ebuild 20047 SHA256 8baba0665ebe3b984e8d0446321538ee2738b77afe138ab1cd42934b2dcc09b9 SHA512 17d08057613524ad9531a46534a98d90d9894abe7afebbdfdd237853331beec009116c851cb1e51729be883d95434b2c09950d4e52f3879ae1d527af88bd97ad WHIRLPOOL a97a57570672c13bb0ff4cb5bd1fc6eeef8dec54739d9a5e70001747d991d89feb5b0dd18dae5e2e0c8caa356fef8b1289f3970c2a8e86590a81c2abe29706ca
+EBUILD ati-drivers-12.6_beta_pre897.ebuild 19659 SHA256 e77a768240435b45890530840d73f84fde46ecccd879cfd040a64d5bdbbd1f6d SHA512 71a831cf9db69ffb9bde82910c1663e9dda42fc4b5e906cec63f9cd89219a7d8afcd759be6488679fa4d9fa7a1af0736c9e0bcf29553e46e68659a68f704dec9 WHIRLPOOL 779f1009ce763afa97d2e201bf4b89f95adf78f1b3e88d4f95e5db81722313edad672dbae0ee5ecd1c67ede3f7ace892ba228f880e45b68ea3429ddc32480a35
+EBUILD ati-drivers-12.8.ebuild 20322 SHA256 742922126b93e404b90b51d62d4b7e657ebd7bbdb808a67053a13e7a6bfe0d17 SHA512 d463f42479929c73c1c4a3253fba3f2c5562e16b3711fdffefbb9403dec6ba9eb8f9c6edaad4aa3cc39b9bbacc50584c273edde54246640c39d42bc14bc796cb WHIRLPOOL 8671e7b378111af1af26dee3eafe9eba1fc2d89c2402071a4d1d5add07bfc1ecf58781d7d6d7837f2685a763255f13f00a8830371e6907a4830045e701944880
+MISC ChangeLog 79260 SHA256 2b6cc7da4c0501877275df41da79ee82737e8936030b40a094f985d58882719a SHA512 846d68e49b56f7fbde9763e99142c27dfa4b2c7faa67fc789738d997abeb8eb0e300ed9c7ce8577652e113fb358cf76f0d12c453fbf550c9c5456a026f4da32d WHIRLPOOL 00d71460ae7f99b84b149538ce61d36f6f696689b0074e8fc27ba215b85a3c11ab38a8fb10630013d5180cc76ae70916e67f5954af5485bf07cc41a7d0b6c17e
 MISC metadata.xml 541 SHA256 ba4c28cc8c58ba9cc56b8283e49bd615d2881c84e4116659da3a123ccfa76fa3 SHA512 3b98adca31077d1224b2d813133aee3279745e86755561d9924726b3ec05e24b3ef05938872d5656a1c8b17cc0f2b7c2d5890e6ea0f2370056aef78ec29c1865 WHIRLPOOL 4bc45b91a4d599dba3c3d2d13a55ba4a0e7dd8f5d03695bedba336b7c13fdc313dc5b7e9fcc86926817dca92306d37c001630669b3c147a4dc17df902bbdaa20

diff --git a/x11-drivers/ati-drivers/ati-drivers-12.2.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.2.ebuild
index 74b8224..b958dbe 100644
--- a/x11-drivers/ati-drivers/ati-drivers-12.2.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.2.ebuild,v 1.4 2012/07/26 15:08:38 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.2.ebuild,v 1.5 2012/09/24 00:48:41 vapier Exp $
 
 EAPI="5"
 
@@ -102,7 +102,7 @@ QA_SONAME="
 	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
 "
 
-QA_DT_HASH="
+QA_FLAGS_IGNORED="
 	opt/bin/amdcccle
 	opt/bin/aticonfig
 	opt/bin/atiodcli

diff --git a/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild
index 33ccd04..f5c94c2 100644
--- a/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild,v 1.5 2012/07/26 15:08:38 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild,v 1.6 2012/09/24 00:48:41 vapier Exp $
 
 EAPI="5"
 
@@ -102,7 +102,7 @@ QA_SONAME="
 	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
 "
 
-QA_DT_HASH="
+QA_FLAGS_IGNORED="
 	opt/bin/amdcccle
 	opt/bin/aticonfig
 	opt/bin/atiodcli

diff --git a/x11-drivers/ati-drivers/ati-drivers-12.6.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.6.ebuild
index 2c65407..4dbc101 100644
--- a/x11-drivers/ati-drivers/ati-drivers-12.6.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-12.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.6.ebuild,v 1.3 2012/07/26 15:08:38 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.6.ebuild,v 1.4 2012/09/24 00:48:41 vapier Exp $
 
 EAPI="5"
 
@@ -105,7 +105,7 @@ QA_SONAME="
 	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
 "
 
-QA_DT_HASH="
+QA_FLAGS_IGNORED="
 	opt/bin/amdcccle
 	opt/bin/aticonfig
 	opt/bin/atiodcli

diff --git a/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild
index d9d3440..83eef68 100644
--- a/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild,v 1.2 2012/07/26 15:08:38 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild,v 1.4 2012/09/24 00:48:41 vapier Exp $
 
 EAPI="5"
 
@@ -21,7 +21,7 @@ fi
 IUSE="debug +modules multilib qt4 static-libs"
 
 LICENSE="AMD GPL-2 QPL-1.0 as-is"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 SLOT="1"
 
 RDEPEND="
@@ -103,7 +103,7 @@ QA_SONAME="
 	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
 "
 
-QA_DT_HASH="
+QA_FLAGS_IGNORED="
 	opt/bin/amdcccle
 	opt/bin/aticonfig
 	opt/bin/atiodcli

diff --git a/x11-drivers/ati-drivers/ati-drivers-12.8.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.8.ebuild
index 1cf82e3..aa50434 100644
--- a/x11-drivers/ati-drivers/ati-drivers-12.8.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-12.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.8.ebuild,v 1.1 2012/09/09 22:42:15 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.8.ebuild,v 1.2 2012/09/24 00:48:41 vapier Exp $
 
 EAPI="5"
 
@@ -106,7 +106,7 @@ QA_SONAME="
 	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
 "
 
-QA_DT_HASH="
+QA_FLAGS_IGNORED="
 	opt/bin/amdcccle
 	opt/bin/aticonfig
 	opt/bin/atiodcli

diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index e860ff2..15334d2 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -20,18 +20,21 @@ DIST NVIDIA-FreeBSD-x86-302.17.tar.gz 32072917 SHA256 b0d50c3333ee7c485bfd5287b3
 DIST NVIDIA-FreeBSD-x86-304.37.tar.gz 33291575 SHA256 e6c3a1d4a757b5d4f2ab54a43d5d7008fcb1b481f14515f58adcd31f3edc6576 SHA512 4370cc805b428f331402f5adde386813e40272ab30744f38442b706b1f80c45e2b44ab56477fe7f3ddeb437b5a97cc088ba2f9a67834a45cf42377d450d3f8bf WHIRLPOOL e41ac7c8cbd207483503da81b64ea16f8d80a8c20b45508ce6a817fd5986628c95e7f64bafc8967d96bf0c0611b66da6899153e4e22cb7b0bb9840c07e76c27c
 DIST NVIDIA-FreeBSD-x86-304.43.tar.gz 33305109 SHA256 6a8c229ebab96afb94ea82c2f7d20fd095de75bedbcf7bb367ab7b2c9c3d3050 SHA512 394655c3eccaa5c47d4675dcd6fcfede1660e75f06677e031be38a0e2bd4abdda072b3801e2551e4f0d8dfa0d83cd60729be6037d648ec67fd3956ae0123fdcd WHIRLPOOL 930f2c5c8627b2c3ee94082b4e86820b9de40c0e5e3a9bc1594246af21b510016ed2efd5b73efe61714c930605028b70b9086b3fd0ab672f5221dae9fddb0c87
 DIST NVIDIA-FreeBSD-x86-304.48.tar.gz 33305880 SHA256 c048cea02aa2a0a50b4f9dfce0aa339d5a28de7b7be264cf33fed5e3a22c27df SHA512 02d7c27495b4f21a2de8222104c22aa05e6eaa6badf564610fc90e5602ef11a61f1e78433ab1e0ce90eefda7eb6a930cae02361fb2cb72de81b683197ee1b4d5 WHIRLPOOL da35d57ab06306363e3ea5b81e0fc4a7095d6a44fa08390bcbdf77118bbff8e4a9d5e37b808ecf288d3a4031aba7e4838127823c982e2ef1b35ad4c17df21c54
+DIST NVIDIA-FreeBSD-x86-304.51.tar.gz 33304401 SHA256 a65d1978b28acd4d730156f27b2e6998cae57a1c09d6f7a3ab2a863d0b4cfba7 SHA512 332f21ff3af44c524cdbf289bc07b2ae1de00f03bca4aebef3fbd6bb7c9bd15bc3922e74844e653a7c6092d42e4a90455773893029868053e992e04dbbc1befc WHIRLPOOL 46cedf2001d5009a78aa7c9885394541011d07714548b50bc0dc44616bdcb34e293b0aa9331fa967ad5a97fcb450e90b2712a22212c4f39d5b57269d9840d37f
 DIST NVIDIA-FreeBSD-x86-96.43.20.tar.gz 14060884 SHA256 e75fce272e72644d53e6ad3c0957fe173735a4b621726ce227ba8ecf9bd9c5cf SHA512 3a2c6bdfb6e4d8d085abe53a9f64f45a9872d968698da01599f27ae35d197d2e32e7cdff4873f6fa646118af48bbee0ecf95e6af3a9af279fe8f39e72c483a97 WHIRLPOOL d7fc9fd10b09b028e27203b388594a9d61d62f50bca7f2b667c53e1fcfea299029024e16f12f3114d0bbd4fd942bf51daf1f3467588d7e96767229524c980e5c
 DIST NVIDIA-FreeBSD-x86_64-295.71.tar.gz 33058244 SHA256 d563a75b07068c7182809bab63fe964377961fdf99cbfcfb2ff25b471a3815dd SHA512 19d4c8200d9764b42cedf675bc1d03547177fc3cdde1cbfa24a7c65a0e47f393d253e3584a8976cbefdd8813918008faae53f8809fd2540b2df867add8f1034a WHIRLPOOL 9ed8987472a00a2005f1013c14a323bdd385d56ee9ffded8266ecdd14d64ebab14e493105b8099f8e936220a5fc2d14a442d00b7820482c1038817aee886386d
 DIST NVIDIA-FreeBSD-x86_64-302.17.tar.gz 32993726 SHA256 609f2abe8459714993f62eb6ee90114a26beecfc375d72ab1776b503ef549166 SHA512 6ee33ae0518f596a978e4cff9342925ee5ac7927dc3dc84ed0b245608b438729c2c96a755e786e0e27641fff1ac78d814afa90db1c118bcd7a877647e5e05344 WHIRLPOOL 2c741e87928f2cea8c65e8b9dcd0d43582fd2c68620a208cc4e751135d4a3513925c4c0b94eecb6935206becc7eeec392cf8524e8bb84a0d3ed8254101db4aab
 DIST NVIDIA-FreeBSD-x86_64-304.37.tar.gz 34210803 SHA256 0d00046c8463954b6c8e13e245b2619758e947389161a113aa005ef7566e5dd3 SHA512 8414efc3c4b2d654b960892178fc5bc3c6c1ea6fb24558887dd18f0a72fa02dd16adf228a97d53b34c679f61c0c7fdaf72f460bbe818eaeef85ae7d69a204b21 WHIRLPOOL 5db2fb3cb23608703e9e915ccb3324465a23832516990f7765fb5317203f37fe8f91c76f88578583eba749a3440b7b13a7cb95e3dfe855c4c54f1f884c861b44
 DIST NVIDIA-FreeBSD-x86_64-304.43.tar.gz 34225997 SHA256 5e76b1660639b2af2fcfbe37457043138f26698866653726dd37cbf4c2ee2ac5 SHA512 2827f484e9936436a279ac78bb7eaae892a01d1df045308b1af95889b0002e39e81672b404c4a63c9940315ce2ec0160d7a2398033186017fc65eb607b85289a WHIRLPOOL 074276d8a9684bde8e317674449dbad78d3a7d595ab811566f17f0c88e09f520ae26914ec7f99a0a38c91c21d920d0d013737d9e1906ddc39af0dfe7d4a8bf7e
 DIST NVIDIA-FreeBSD-x86_64-304.48.tar.gz 34232252 SHA256 89814a464e906632e28e3e78e80cf7ef891e1bf23989c96f37dfb3c636265eec SHA512 55cd4fce3226fe99dd8eb1543c60ecefa709234547c616c5d932b75990b59f9af8f2b4946f193170ede0a727100eabc6bcd5a497e758df3fa4fd0baac188ee05 WHIRLPOOL b5b2ea29e53d6a57784ff892cf15136c85dc77060530f400e74030d069f7f95ed285e6afe612674e0e253d6cbd3740d8b42264c5c14c7ba92addf6af7ca744e1
+DIST NVIDIA-FreeBSD-x86_64-304.51.tar.gz 34233798 SHA256 0db3ca0267b20e4ef60f480375860fdf46848e58492ce452452264544263bd56 SHA512 d84f592a4cf97638346fbf14062d678dc94311845c17b43f8ea451cbf937d71b5d6eb380f462fe3e50c57558fdc11cf56b4e10cec43235a34113089986c5f1b6 WHIRLPOOL 76c000899ae171a67abcaf2f4b154fc7c1b785e1714071ae7ffb3570b12a1853f41ac9af6d5f87ba8448531445cc089bf4ce83fd351f484ee6ba4e4d05b0eb77
 DIST NVIDIA-Linux-x86-173.14.35-pkg0.run 14028887 SHA256 2d26100f7691047e424e1614deca0f1d862da5fa69e04e967f0c1dbb84ec729a SHA512 6f752a33ec69ec05979e2cc8754c59377d248675ab3ec2a55212a97ee6591e80942a44b96df612ed1b41eecd2c7a0e49f464dbe251a74345ca6e9b8650dc095c WHIRLPOOL b58e84c02e0e151555ba48dbe512d4f85de4852af6ed98e4e10d6cff1ce52f5a5f509752bdc28a31704a9a7d3325790ed236c37aa31622d096d39507653121c1
 DIST NVIDIA-Linux-x86-295.71.run 34738880 SHA256 e02dc300324eb953278664acfe5f4c3e6e4b7e45cc7b1c700c79ff368f2c9e4d SHA512 430b884d8e510dd2a722d4893f85a4f8e4227e3cfcbdd802ef1edfd776d4f6ca487854e1fc509537285fdc38c2d87474e3e7c9ed728871527a06227fd4306e3c WHIRLPOOL c65573d09be775e29c889c86bf8fcce2442d5e9e3d6aaedd6e2147d7fd12cf3e9fedc736f5cd90116ea1dabc169f7a42aa70e34d0c93ab6d1862cba13acfd6c0
 DIST NVIDIA-Linux-x86-302.17.run 34598956 SHA256 3525d3814361bd202998cea2962bb3d1bb3419206d02fd8ac30d61358c1a284f SHA512 e2ec7f9dcf566c9ed0085eaf45e40940830677f3d964077fb34681b6518a3a666fae6c7594e7eaea125c265db8ecf2087a3c309c0dc63ab9941d051ee73b252b WHIRLPOOL c81e3e8da372d3a217d0cf08f05d9aba468d75949d7a3c025595327aef7c61b882eb2bbef19373ebf2a79b5210f873cb7b13597fc6e9d3612791bec3ee1ca58a
 DIST NVIDIA-Linux-x86-304.37.run 39349097 SHA256 ab3174a0c9ab37a8fc3f4a8fc1121d72fbdd5e00ddecf44f7dbd84bb8d51b337 SHA512 82b38b6aabcce910bc5b9c4e80c7e1eeff0c969388e34bab30a6ae79fe58101b576bbdf3483bd9d846a39f124491ee3e4bb5c5592c3ee794b55f67f45d014719 WHIRLPOOL 79517d7258d5dd765c3d92fa2dab9f0d648e06c1d4db6799e87d888e7ce633f75004ec649712cadbab01f97f310d1c796f32b3ba697d60e1031890eedc40f2e6
 DIST NVIDIA-Linux-x86-304.43.run 39363770 SHA256 7c7f483302a0a5a828b8ef1f5a4a53f8e16d3b73d0c17bd61ed0d843cad32c4c SHA512 4915735ff744eb9b47bbd5cf3419452cdff9d94101fae0202f4f9fc8ecd0c3550a785bda9b374022c441f26f34f0bf10a080a4b3dbe2187b36eb1814e3c66222 WHIRLPOOL 0e4f5de98587652f65199f4085eba41b0bf2f14b74a0d4baa59d8cc09e7b0b126e7e49ffa4f948b5f08585b107a3de646a235159f25c1c8fe7809a6c2f4b534c
 DIST NVIDIA-Linux-x86-304.48.run 39364748 SHA256 af25dab21e7f06e34cc63fb06f427c0e8de110f66b25fd571cd814a9525513b8 SHA512 79929b9788deb750e72f2f3a78d3ec2ca6004a77a1d8b55c32dc1ed808c1bcca6b0c3e9deffa823c90402e071ee88f4dcd683229f4a8bf1cacfec4fc64225706 WHIRLPOOL 20f288819ccbb63ded28e10647017ca489fad3d6b2a42d372b7ead03054f5dcd59627e13703a3c288473a71e9ad3ebc016fef4dbba69c7c0aac93a06522a0a8b
+DIST NVIDIA-Linux-x86-304.51.run 39375416 SHA256 78fdf66377d996863fa56c9165745e439729b11df2b2629d55eb07160b270c22 SHA512 3258787b4f3d29cd67d6d23a5d0fb13ce0e2260a61d406319d9e8028e0c4f51b364a1eeb1ae98461aabe2cd8716b5d3b3406fb374756160604f9d78942bbb1d4 WHIRLPOOL c5bd639dcd63243e3e301ce4382bd7e4f1a9c5fa649cab7866040a88068bb0675c6ecdcc3d75dcda1a806f9d41dbac24f14cf1540f887a07f43642f27983436e
 DIST NVIDIA-Linux-x86-96.43.20-pkg0.run 10323541 SHA256 bc778062cf745ee4916de77a702f702312d33eeb3b6f379b63e4366fa5197517 SHA512 6fd8218dde3f3a3b49e83cd2e9df6aff502d17483ac5687c4f7009671a456bda008c12cde7d73a9d9999e6da777fe58f6093791cd7e7b10113c4a91deb1340fb WHIRLPOOL fd8e54f171bbf004eea9e7ea9bf0ad49386173e357221679f7144f6c9ec11d37d717f9b764a24a37bc10864b37e937a5dd7fd68319aa3e10edcdb835c4a2b1b0
 DIST NVIDIA-Linux-x86_64-173.14.35-pkg2.run 19767039 SHA256 5af64646b098021b550242fe8eb03817f862af0442023545d1295027f589595f SHA512 c6f4b56f9154af06bfef888be94dd7bbfe48e67593e901da13bc60bb0bfbfc7d00995ca61820419259e80fbc898373d26ef04c309ed6af3b73d13dc1245cc5e7 WHIRLPOOL 3c321157821751dcc82781db6fd0b9df6697d688280763ebfb11d8c004df1d5d7f975b70db9271797bfbe30d525dbe9b9a9987aeb272d854cba5a974c04d7584
 DIST NVIDIA-Linux-x86_64-295.71.run 58537709 SHA256 956c7660bff61c07a99cea2130e73baf1574907008d41d9462147aad6b83dcc6 SHA512 7eb21240ca44a648c081e38aab3ae6203ca70f2dd4ab187c67ef1f3cff9ab848f4040a640dfbd1f146135b37b98c6976943ff6caef8806a25784ff2263d23e8d WHIRLPOOL ea85d8fe42b15f7a7933b8dd3e31a48549a7dd411f21f60b69986fda8b2b4b53c6148194227097be6bc5323b448a5a8c452c784591e32281be576403e3caa435
@@ -39,13 +42,15 @@ DIST NVIDIA-Linux-x86_64-302.17.run 58653717 SHA256 5cf9059ebb70ade99e5621c0a605
 DIST NVIDIA-Linux-x86_64-304.37.run 64075318 SHA256 cae75158047d0b97ea48f269fd2903a6731f53b978a1065720343436c97ca9c2 SHA512 03ce52ad2f3ba232a9c9665ece40611a249ebd0bd74505adefe758064027f0d4afb4ea4e2411372183f46e372298d974c16708735f3d2b5bafe0038716d77bbc WHIRLPOOL 9a8f299db7e47a603805ce383bb30be520aa63acf91949f6ece7a8cac638eaf01d5e40b5f6279d2e243020b8d9c9af1ca94c6ca20c1ae5fa1ab3133bb56b4ed9
 DIST NVIDIA-Linux-x86_64-304.43.run 64094885 SHA256 76946e2fe4160cfd59e7a75fefd174a9c7e71c51cca6b88c40a16cf35947b777 SHA512 ff34f8d1aceb9190835de7bf9ae25cf973083ae747b79c9a18b0f5f01abc80ebe6a7355d0c17e40de0c8497f43a8041d524a666fc18aca324ad521bef5163f97 WHIRLPOOL c4ac780efacadc389e477f9c289fc5158826bf231d285b0c2848c4a797871575575453b08207ca24cb27afa18cc0c9eddce8b92aee8d35fdd2ab31a930b9d7ed
 DIST NVIDIA-Linux-x86_64-304.48.run 64107383 SHA256 c018541d30e4f276e1afc60077e5c75b54954daa8888c870fc80a19b28d4eae8 SHA512 4eb4b9f753157db7ab591433fad7043e6b8db8ad642b80711d71b541ea6a6b89ccf9f1cdbb95ea3fdec2077b4b9c146ef62afef9dd67b9b44276b8e56f3a27e8 WHIRLPOOL 5eeee0e1ffec91e96df9290d3c24785f5a5ae2cded87282f7cc67f11ea9a661f6e927516387ab6f6f4a9abbe523218fc13e88c3255947676ed44fe38b3d02c58
+DIST NVIDIA-Linux-x86_64-304.51.run 64118811 SHA256 28654ff26923660de7296488054154bbbac0ef6e669377eeed84178fd0c17e64 SHA512 f3fe897ee96df159c040b5106a3a84cb232dd244e2b0597875d03f99ff5fb9798f95175ac777d7a8b681c1cc331f658fe2098296a23fc6d6f1bab7eb3e49463f WHIRLPOOL e0ef2998ebfe64bac734bdcd9c7266d28394273a8b1ffcca6c3b4446a5a58310b010c96f2071106c94133052969f8c0fcb231ca2a9a17f9c5b79d01258790bee
 DIST NVIDIA-Linux-x86_64-96.43.20-pkg2.run 14572507 SHA256 562107a262e250b836966e29851628f6162ee2857d53252221c780d9b201de18 SHA512 ca89961463bc705b1aa0e5fcbb284317e60e455d444035ba8f6a44cb3884f3a4b4c98ed5a37465d6f70a0eb6578a7d865b25f15a6b6f48bdbcb5aaca6e541623 WHIRLPOOL 873e32237ee1441625c1335e1d325649f139306a49bc87fc25afe81ec37671984a2f0bb904b2d7b435d5ceb52572740bb910fac32853627ce5583655178674dc
-EBUILD nvidia-drivers-173.14.35.ebuild 16653 SHA256 6286530ae409bd511486ccddf8f8e8d921d63ca51ed4d61c286d7e5da2cfc3a8 SHA512 c492de4f6655adb83ab237cfa43033e4a1881310d4181d69375cda88059023b5534e331095a77580eab9e83969ee7f0e84cf0e149dd4f3a071e70abbb0bb875e WHIRLPOOL f77a79d608dd341328bf61b0b991d2f0a73cf233fe8cceee54d9d9eca0746f97a5d45021327e7fc588c90742d731e56617e6f1e5a5923bfaf039c7aa3a4e4c4b
-EBUILD nvidia-drivers-295.71.ebuild 18541 SHA256 2446ce5943be02cf2e3ef3dacb19bb9245bac98c0cc1e2840c7f699c87f97187 SHA512 c7c456fef768df094af9a8633d876523b609f62b8b510f63999206b80cece9d199dae4590cdad8e10a2a70fb3b1d6d5b357a2c6a9491002e42ee9266365ffe07 WHIRLPOOL fa163412554c690f3c7e2a421fc6189d26e839e928fa85ffbfe02d42e5fc5216d121d2f637e66e1ac3986c738c36dcdd9e92ca9e1cba7c9d78429c49fb52f821
-EBUILD nvidia-drivers-302.17-r1.ebuild 18683 SHA256 2789f605e6bfdec2a15be4d6a8265217fd82813794123834e158c9324fe8b24b SHA512 73ab9f6567fdb09dcc134ee744e6bc796270c248e4022c1120968fd26344f015c65790c5cb3d07f363612d1f2c3603c3bb5d83cbef725d525deb515be61964ec WHIRLPOOL 5db6d5f83cbfd0fbcab6f4a8534259b793494ae7549fcc56909b87691616d106aac1a16947ff30192bd90d40b0f6a44a6ce431a5309c47218d47b96253868f3f
+EBUILD nvidia-drivers-173.14.35.ebuild 16668 SHA256 50d53cbce419e474e7e6611d8d8a96988d4863f0934cca843e50d3ba857b0840 SHA512 ac31942bf15278e4ae90376a55e06925c639592325b34cac7d3df386ef863bbaa8d9b554cfc6431ab72777440c08387af5ffd8bf03a711dd34596e9553c5f073 WHIRLPOOL 145bbd21f812553547065bcaf5f2e264de5b05b72bbd068fc0498f0ecc9188993d293c086680b9a4e19479b62d88cab727e12f02666d13319bcbe85b5f7a5b68
+EBUILD nvidia-drivers-295.71.ebuild 18550 SHA256 aa13c7ab50809ac8a8ffc779b5f799da65dad5977f4b6b53fd554853ab6fa5da SHA512 1b73297e6ec45bac4c3bab632812ef2df083d9d6572166bb8bbcd2ec5c29afd3cc09e621c29a0bf667449a3b124123cdc4b1ed4f302201133b2c2d071d3fb300 WHIRLPOOL 64397c2c67e7f95f429f207494a9c2f93a6195d5ecf4510e63e4ef0dedb85d77b9938f333fb7d9fb94bc2b19ca9ecdab6975ee288af0fe8fee8002478bb6cf8b
+EBUILD nvidia-drivers-302.17-r1.ebuild 18698 SHA256 35904addec73863f63bb8fc43c5af5e2fb64d045af5dfd398c5eadbd9895a023 SHA512 841cab5ffa46133e92747bc6ed1c6da47f4c7bbc17acfc2eb69f6cf5fc8ac117c65156952e88d1c54448d81f139232736a74dfcdb4bab1c33aecb87f088867f1 WHIRLPOOL 6344ce83089745633704607ddb52f0f9a3ed8006b5c3c28a2ffa98d5856a093c6a9657832e49205da2ab5d39511ae863ed2fe1ff3cc3303debe0e38d2c27aca9
 EBUILD nvidia-drivers-304.37-r1.ebuild 12467 SHA256 e35ba319043fa69f7bcbd5bf999b14ecf0e7922ec43e7228bfe08c617bb69947 SHA512 9f64eb011abbe62915a05e09aa2631154468951b66cc703754ec68c1b074fb1f918bca73c608c3394f43bd9e7543856f4d5b643ae301d3a22b69b6565d2239e9 WHIRLPOOL 710c8e55578dd2cb61047752acc3192529954a1e0ece98ea01b0bd2f3a776ea0497f2b814a9c3dfb60874e20df090b64b2135ae4342d28fcafc4ccf813d6f175
 EBUILD nvidia-drivers-304.43.ebuild 12759 SHA256 e6d36303347c44a1ffe2ab7503e0f583c4831d4198b01a021b6a156360b21b88 SHA512 a66c30fa34336eae132864cff076e010cc7bcc9381b942ea069ef5eeb7c7d4c0e65653097fb85044e9e25c29b4572e8c36021a00df3b681db44c85b2d50832f2 WHIRLPOOL e0ae300756146b3e6d6766fe4f890f42e2ef19b614e5c29e67543c362f9cffe099bd5eaef76f7c4d1e4755933b32c17b791771cc0cf0f1eabb3222e4dfe446c7
 EBUILD nvidia-drivers-304.48.ebuild 12814 SHA256 3aa6478d61d2f68176720945c7dec2921090d5601090f584718f135f065c43c8 SHA512 10cb91743d1b5ee2abd0d96f4ca05aa0a1ef67bb989db39bd09d311531c44dfe7e00a91c193ea1414ddb431ecce1e5a0017bfdda5325a5223c8a460efc683025 WHIRLPOOL 65bd95063713be6155bc08a5d7abcffd54cd4e816fc6e78f3aeaa135a15e86b00747d571573ea2b4dc19270e57e11004319001f0a4858a3b356631b059dc8223
-EBUILD nvidia-drivers-96.43.20.ebuild 15268 SHA256 da92374cb260e0958897f444cb338870159714111c0230e20ea8fcfeac100c63 SHA512 5241fdc583f88aec384b3e2698255950bb84fdd781b051cc175dafc5a282e790d3d5dfa23734eab02b63a838f4c87227b89598fba6cb0e6bf9cd3fcf90042fde WHIRLPOOL e388f6fa286488f63994a70abcbc3077f552c6f58bc51289379bfc09b83dd9ec5a986d7f5d399c6d3d12a3b566e7d5f1710d3802d5472f5ed5ef38033fecaaf4
-MISC ChangeLog 84050 SHA256 a780ef129ed243a87ffa826ec14b5c6d9d03405730402bb17ff96641a36ab48e SHA512 c0e50408f70df6028ec9b9191421245594af425bfc9150cae6ca7c7d7864c3c2c8febbd1677c8084de61d0394ddeb39ba5c297093fc44e0b85e3836aa818dbdc WHIRLPOOL 236e25a0c1d73c84438e10190136926805dc4695e419eb9e6488139731549c85b7573ad2f0184408b4492dc298a4c0c40c4b9e0603b5dcf585d14183b0044a90
+EBUILD nvidia-drivers-304.51.ebuild 12808 SHA256 26cd467b0002c42f0ed5be5ae52ecee2a3324e082fbaab997509debb1a818f76 SHA512 e7a6a31a61430bd39d236b8898e93e03569db891be61a4755af659ed2e9dbc58f4bfe6fd62e96a472df1672ee15187d1ff13ed50940d9334912af0349f67043d WHIRLPOOL a2666bee4110771cf78fb037e996cf3d12974571c89e6a02150c6b8d722af0653114636e5d5df4614870818592c34af61286e8227f4a625863fb77fdd371d6ae
+EBUILD nvidia-drivers-96.43.20.ebuild 15283 SHA256 dc5391522b493ae6fd04526f41ef1d78cc43d4bc063f06a2f9f04fa6f996bf16 SHA512 f5c198dcadc904d8e96f0071dbf1449a418b147b132b697b110fa9b313cb6678e8c3a3b496c8654655b9f3eb03360742a11b5b689062c4b653baa750d670e21f WHIRLPOOL 0224ba1195f9a231036b8f74bc291776d4eda966f82b7eb7a5f81744d989494d26b8e86ac83e866104bf847f3fded537dd386c9b11f897af3d92ee37881eaa0b
+MISC ChangeLog 84533 SHA256 cb1ec733b7202ac4e1251868b5d06b5f5b74a8c583b9e59461b0b2754add2e98 SHA512 b82f3a883f7bfc607edf82d4375a0fc542944973acfbc509bb62eff7ec9f2a89de923713941137919ab469bca140303753eaca6f7e66744b5155c4d705bbab07 WHIRLPOOL 2f84b2517d82c9aec70a279f8e81e64bebbb2c9909d1200533f9c4a8c452bfac82356d19500c4c58f020488901d943856f0ed8643e6ad23fe1b27647a7b5c56e
 MISC metadata.xml 937 SHA256 807dcc6ae2775af89d15e2253a264ea0d24803bd876f93519d9dfa46abcd8c80 SHA512 85a7324e9a065c9bd003e1f9067adf5ad5408cabd5e37480422066fef392da841622aa6049aba0fabe249cc7e5014d4cb8435e4ad8507645802fad48f2021af9 WHIRLPOOL e87f8890be0329cffefc58b491cde96920344b0cfec5b04589dfd49f3805250c6ff7ecff2e8709fc930b7b77a32ff65ca530596ea521aaf9e97b6f82ccbc6e01

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.35.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.35.ebuild
index 83f8fa1..0a19f38 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.35.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.35.ebuild,v 1.8 2012/08/10 14:40:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.35.ebuild,v 1.9 2012/09/24 00:48:53 vapier Exp $
 
 EAPI="2"
 
@@ -99,7 +99,7 @@ QA_WX_LOAD_amd64="usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
 
 QA_SONAME_amd64="usr/lib64/libnvcompiler.so.${PV}"
 
-QA_DT_HASH_amd64="usr/lib32/libcuda.so.${PV}
+QA_FLAGS_IGNORED_amd64="usr/lib32/libcuda.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
@@ -117,7 +117,7 @@ QA_DT_HASH_amd64="usr/lib32/libcuda.so.${PV}
 	opt/bin/nvidia-smi
 	opt/bin/nvidia-xconfig"
 
-QA_DT_HASH_x86="usr/lib/libcuda.so.${PV}
+QA_FLAGS_IGNORED_x86="usr/lib/libcuda.so.${PV}
 	usr/lib/libnvidia-cfg.so.${PV}
 	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
 	usr/lib/opengl/nvidia/lib/libGL.so.${PV}

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-295.71.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-295.71.ebuild
index faf5df5..ac90701 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-295.71.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-295.71.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.71.ebuild,v 1.5 2012/08/17 11:20:04 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.71.ebuild,v 1.6 2012/09/24 00:48:53 vapier Exp $
 
 EAPI="5"
 
@@ -134,7 +134,7 @@ QA_SONAME_x86="usr/lib/libnvidia-compiler.so.${PV}"
 QA_SONAME_amd64="usr/lib64/libnvidia-compiler.so.${PV}
 	usr/lib32/libnvidia-compiler.so.${PV}"
 
-QA_DT_HASH_amd64="usr/lib32/libcuda.so.${PV}
+QA_FLAGS_IGNORED_amd64="usr/lib32/libcuda.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib32/libnvidia-glcore.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
@@ -159,7 +159,7 @@ QA_DT_HASH_amd64="usr/lib32/libcuda.so.${PV}
 	opt/bin/nvidia-debugdump
 	opt/bin/nvidia-settings"
 
-QA_DT_HASH_x86="usr/lib/libcuda.so.${PV}
+QA_FLAGS_IGNORED_x86="usr/lib/libcuda.so.${PV}
 	usr/lib/libnvidia-cfg.so.${PV}
 	usr/lib/libnvidia-glcore.so.${PV}
 	usr/lib/libnvidia-ml.so.${PV}

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-302.17-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-302.17-r1.ebuild
index c9c34bb..c476114 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-302.17-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-302.17-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-302.17-r1.ebuild,v 1.5 2012/08/10 14:40:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-302.17-r1.ebuild,v 1.6 2012/09/24 00:48:53 vapier Exp $
 
 EAPI="2"
 
@@ -134,7 +134,7 @@ QA_SONAME_x86="usr/lib/libnvidia-compiler.so.${PV}"
 QA_SONAME_amd64="usr/lib64/libnvidia-compiler.so.${PV}
 	usr/lib32/libnvidia-compiler.so.${PV}"
 
-QA_DT_HASH_amd64="usr/lib32/libcuda.so.${PV}
+QA_FLAGS_IGNORED_amd64="usr/lib32/libcuda.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib32/libnvidia-glcore.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
@@ -159,7 +159,7 @@ QA_DT_HASH_amd64="usr/lib32/libcuda.so.${PV}
 	opt/bin/nvidia-debugdump
 	opt/bin/nvidia-settings"
 
-QA_DT_HASH_x86="usr/lib/libcuda.so.${PV}
+QA_FLAGS_IGNORED_x86="usr/lib/libcuda.so.${PV}
 	usr/lib/libnvidia-cfg.so.${PV}
 	usr/lib/libnvidia-glcore.so.${PV}
 	usr/lib/libnvidia-ml.so.${PV}

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.51.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.51.ebuild
new file mode 100644
index 0000000..c7943b0
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.51.ebuild
@@ -0,0 +1,447 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.51.ebuild,v 1.1 2012/09/25 16:47:34 cardoe Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
+	portability toolchain-funcs unpacker user versionator
+
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+
+DESCRIPTION="NVIDIA X11 driver and GLX libraries"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
+	 amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	 amd64-fbsd? ( ftp://download.nvidia.com/XFree86/FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	 x86-fbsd? ( ftp://download.nvidia.com/XFree86/FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X"
+RESTRICT="strip"
+EMULTILIB_PKG="true"
+
+COMMON="app-admin/eselect-opencl
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	multilib? ( app-emulation/emul-linux-x86-xlibs )
+	X? (
+		<x11-base/xorg-server-1.13.99
+		>=app-admin/eselect-opengl-1.0.9
+	)"
+DEPEND="${COMMON}
+	kernel_linux? (
+		virtual/linux-sources
+		virtual/pkgconfig
+	)"
+RDEPEND="${COMMON}
+	acpi? ( sys-power/acpid )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango[X]
+	)
+	X? ( x11-libs/libXvMC )"
+PDEPEND="X? ( >=x11-libs/libvdpau-0.3-r1 )"
+
+REQUIRED_USE="tools? ( X )"
+
+QA_PREBUILT="opt/* usr/lib*"
+
+S=${WORKDIR}/
+
+pkg_pretend() {
+
+	if use amd64 && has_multilib_profile && \
+		[ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default ABI"
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	# Kernel features/options to check for
+	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
+	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+
+	# Now do the above checks
+	use kernel_linux && check_extra_config
+}
+
+pkg_setup() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use kernel_linux; then
+		linux-mod_pkg_setup
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+
+	# Since Nvidia ships 3 different series of drivers, we need to give the user
+	# some kind of guidance as to what version they should install. This tries
+	# to point the user in the right direction but can't be perfect. check
+	# nvidia-driver.eclass
+	nvidia-driver-check-warning
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_unpack() {
+	if ! use kernel_FreeBSD; then
+		cd "${S}"
+		unpack_makeself
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	# Please add a brief description for every added patch
+
+	if use kernel_linux; then
+		if kernel_is lt 2 6 9 ; then
+			eerror "You must build this against 2.6.9 or higher kernels."
+		fi
+
+		# If greater than 2.6.5 use M= instead of SUBDIR=
+		convert_to_m "${NV_SRC}"/Makefile.kbuild
+	fi
+
+	if use pax_kernel; then
+		ewarn "Using PAX patches is not supported. You will be asked to"
+		ewarn "use a standard kernel should you have issues. Should you"
+		ewarn "need support with these patches, contact the PaX team."
+	    epatch "${FILESDIR}"/nvidia-drivers-pax-const.patch
+	    epatch "${FILESDIR}"/nvidia-drivers-pax-usercopy.patch
+	fi
+
+	cat <<- EOF > "${S}"/nvidia.icd
+		/usr/$(get_libdir)/libnvidia-opencl.so
+	EOF
+
+	# Allow user patches so they can support RC kernels and whatever else
+	epatch_user
+}
+
+src_compile() {
+	# This is already the default on Linux, as there's no toplevel Makefile, but
+	# on FreeBSD there's one and triggers the kernel module build, as we install
+	# it by itself, pass this.
+
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use kernel_linux; then
+		linux-mod_src_compile
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if its not /usr/lib
+donvidia() {
+	# Full path to library minus SOVER
+	MY_LIB="$1"
+
+	# SOVER to use
+	MY_SOVER="$2"
+
+	# Where to install
+	MY_DEST="$3"
+
+	if [[ -z "${MY_DEST}" ]]; then
+		MY_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	else
+		exeinto ${MY_DEST}
+		action="doexe"
+	fi
+
+	# Get just the library name
+	libname=$(basename $1)
+
+	# Install the library with the correct SOVER
+	${action} ${MY_LIB}.${MY_SOVER} || \
+		die "failed to install ${libname}"
+
+	# If SOVER wasn't 1, then we need to create a .1 symlink
+	if [[ "${MY_SOVER}" != "1" ]]; then
+		dosym ${libname}.${MY_SOVER} \
+			${MY_DEST}/${libname}.1 || \
+			die "failed to create ${libname} symlink"
+	fi
+
+	# Always create the symlink from the raw lib to the .1
+	dosym ${libname}.1 \
+		${MY_DEST}/${libname} || \
+		die "failed to create ${libname} symlink"
+}
+
+src_install() {
+	if use kernel_linux; then
+		linux-mod_src_install
+
+		VIDEOGROUP="$(egetent group video | cut -d ':' -f 3)"
+		if [ -z "$VIDEOGROUP" ]; then
+			eerror "Failed to determine the video group gid."
+			die "Failed to determine the video group gid."
+		fi
+
+		# Add the aliases
+		[ -f "${FILESDIR}/nvidia-169.07" ] || die "nvidia missing in FILESDIR"
+		sed -e 's:PACKAGE:'${PF}':g' \
+			-e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-169.07 > \
+			"${WORKDIR}"/nvidia
+		insinto /etc/modprobe.d
+		newins "${WORKDIR}"/nvidia nvidia.conf || die
+
+		local udevdir=/lib/udev
+		has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "${udevdir}"
+		doexe "${FILESDIR}"/nvidia-udev.sh
+
+		insinto "${udevdir}"/rules.d
+		newins "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld" || die
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko" || die
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
+
+	if use kernel_linux; then
+		# NVIDIA video decode <-> CUDA
+		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so || die "failed to install nvidia_drv.so"
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
+			/usr/$(get_libdir)/opengl/nvidia/extensions
+
+		# XvMC driver
+		dolib.a ${NV_X11}/libXvMCNVIDIA.a || \
+			die "failed to install libXvMCNVIDIA.so"
+		donvidia ${NV_X11}/libXvMCNVIDIA.so ${NV_SOVER}
+		dosym libXvMCNVIDIA.so.${NV_SOVER} \
+			/usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 || \
+			die "failed to create libXvMCNVIDIA_dynamic.so symlink"
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins nvidia.icd
+		donvidia ${NV_OBJ}/libnvidia-opencl.so ${NV_SOVER}
+	fi
+
+	# Documentation
+	dohtml ${NV_DOC}/html/*
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1"
+		use tools && doman "${NV_MAN}/nvidia-settings.1"
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}/nvidia-smi.1.gz"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
+		use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
+		doman "${NV_MAN}/nvidia-cuda-proxy-control.1.gz"
+	fi
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig || die
+	fi
+
+	if use kernel_linux ; then
+		doexe ${NV_OBJ}/nvidia-debugdump || die
+		doexe ${NV_OBJ}/nvidia-cuda-proxy-control || die
+		doexe ${NV_OBJ}/nvidia-cuda-proxy-server || die
+		doexe ${NV_OBJ}/nvidia-smi || die
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+	fi
+
+	if use tools; then
+		doexe ${NV_OBJ}/nvidia-settings || die
+	fi
+
+	exeinto /usr/bin/
+	doexe ${NV_OBJ}/nvidia-bug-report.sh || die
+
+	# Desktop entries for nvidia-settings
+	if use tools ; then
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png nvidia-drivers-settings.png
+		domenu "${FILESDIR}"/nvidia-drivers-settings.desktop
+		exeinto /etc/X11/xinit/xinitrc.d
+		doexe "${FILESDIR}"/95-nvidia-settings
+	fi
+
+	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
+
+	if has_multilib_profile && use multilib ; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis) ; do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local libdir=${NV_OBJ}
+
+	if use kernel_linux && has_multilib_profile && \
+			[[ ${ABI} == "x86" ]] ; then
+		libdir=${NV_OBJ}/32
+	fi
+
+	if use X; then
+		# The GLX libraries
+		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
+		if use kernel_FreeBSD; then
+			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER} ${GL_ROOT}
+		else
+			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER} ${GL_ROOT}
+		fi
+
+		# VDPAU
+		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
+	fi
+
+	# NVIDIA monitoring library
+	if use kernel_linux ; then
+		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
+	fi
+
+	# CUDA & OpenCL
+	if use kernel_linux; then
+		donvidia ${libdir}/libcuda.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
+		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
+	fi
+}
+
+pkg_preinst() {
+	use kernel_linux && linux-mod_pkg_preinst
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
+
+	elog "You must be in the video group to use the NVIDIA device"
+	elog "For more info, read the docs at"
+	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
+	elog
+	elog "This ebuild installs a kernel module and X driver. Both must"
+	elog "match explicitly in their version. This means, if you restart"
+	elog "X, you must modprobe -r nvidia before starting it back up"
+	elog
+	elog "To use the NVIDIA GLX, run \"eselect opengl set nvidia\""
+	elog
+	elog "To use the NVIDIA CUDA/OpenCL, run \"eselect opencl set nvidia\""
+	elog
+	elog "NVIDIA has requested that any bug reports submitted have the"
+	elog "output of /opt/bin/nvidia-bug-report.sh included."
+	elog
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries, XvMC, and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+}
+
+pkg_prerm() {
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use kernel_linux && linux-mod_pkg_postrm
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.20.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.20.ebuild
index 7df8be6..4a0841e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.20.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.20.ebuild,v 1.10 2012/08/10 14:40:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.20.ebuild,v 1.11 2012/09/24 00:48:53 vapier Exp $
 
 EAPI="2"
 
@@ -100,7 +100,7 @@ QA_WX_LOAD_amd64="usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
 
 QA_SONAME_amd64="usr/lib64/libnvcompiler.so.${PV}"
 
-QA_DT_HASH_amd64="usr/lib32/libcuda.so.${PV}
+QA_FLAGS_IGNORED_amd64="usr/lib32/libcuda.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
@@ -118,7 +118,7 @@ QA_DT_HASH_amd64="usr/lib32/libcuda.so.${PV}
 	usr/bin/nvidia-smi
 	usr/bin/nvidia-xconfig"
 
-QA_DT_HASH_x86="usr/lib/libcuda.so.${PV}
+QA_FLAGS_IGNORED_x86="usr/lib/libcuda.so.${PV}
 	usr/lib/libnvidia-cfg.so.${PV}
 	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
 	usr/lib/opengl/nvidia/lib/libGL.so.${PV}

diff --git a/x11-drivers/xf86-input-wacom/Manifest b/x11-drivers/xf86-input-wacom/Manifest
index 5611ebe..4cc9161 100644
--- a/x11-drivers/xf86-input-wacom/Manifest
+++ b/x11-drivers/xf86-input-wacom/Manifest
@@ -3,6 +3,6 @@ DIST xf86-input-wacom-0.15.0.tar.bz2 528528 SHA256 2e9b64c30fb223c46407bd0e105a5
 DIST xf86-input-wacom-0.16.1.tar.bz2 532880 SHA256 db8578f04e0e0960ebe1cb93740b394072e21554d0fed86ccd29a94a249757c6 SHA512 f74481a5728e4c1c07918a4e047e9554f09b83f74f10b728fdfa5aab65222bb460f0f2bd10293869cc4ee6ceb123a1bfb3c2c16c61e46a48ac07abdabd6873bd WHIRLPOOL bf25f9e5bcbcdebdfd2794963df72ddbe91c86e722e5c6004900c744874ca5675f13194bc067b5fa18e7af7203a1eb814fe766cc1b0c93a2b56f1ce51f7ec44d
 EBUILD xf86-input-wacom-0.14.0.ebuild 1430 SHA256 fd56c02d64e9a36a97029a540db4dcecbf187dd69694e38ae0a68e59cc1c96f6 SHA512 c4aa392221bcf93aecae57e343103eedf67bf7ca953a896aafe501472d60b533e23603545d72a8ec37f4c53b210f35a81b480e85c132d35330fe853806382385 WHIRLPOOL d58370c89a19b39184b7d6a07cd811f62f07ba6e7e2eb20d42fe17c4f88047865692b7189fbae02ceff68d3aaeb0fe8c467ad9be7238af846a17da4f6ddb7561
 EBUILD xf86-input-wacom-0.15.0.ebuild 1434 SHA256 31a57d7b3b83aac4de00ea86860d78eb6d4f67f652e1614e6341841fb15a2c8b SHA512 4b419415ce22ac13a640a9fbc9e1fe588cea47cad1842ac86ce6926ed050478396cbcadfb7afce4b17b81e30d98f0b485acca8bc8c203475f4ef5d7781a3a05d WHIRLPOOL 54a26732cfcddf79cae7d0b8458a345095e7f797f97ea1d0c0bd572c5639fd4e959019db1a615a060de9bef0a6fecc7f5cbad29a13ec9cca787a1a298bce2ce8
-EBUILD xf86-input-wacom-0.16.1.ebuild 1437 SHA256 627a3ed2b10957c738bd05e6f67914505658c273d0fd55685612437a04e71126 SHA512 a3bfad6ee40d3bdf4095b7a15b0bf1bf3b9e260aaf0e3df6c6ffcf412bd7ff49973cebd98faf1ec8e1ff9de09b9697f91069b3ba59fdf96402b3a2a770d71c41 WHIRLPOOL e4eba2b882ed0b3e641a321e9c7cad0b7d05382afde2a9d590c5cece562fea91c0e72b7499f50a722e36834b97e9142519949504ae7e8e97fc1598b26dee64e3
-MISC ChangeLog 9287 SHA256 d8ff59335526a4b003f314aac0063ebc682f4a65ed45f16d17f606d2947378f3 SHA512 d085c35958d4595b8b3b6e75a2ef37b509baffd3a0cfa4dd0aa42ff3815cfad7588166797a88a882e7b65ca0c442774a47a021808ee80d740ef739602b5d781f WHIRLPOOL 49bc73f368e05156ccf78b46b5533ee6cdfb3173e4a7d5b0e3593e79593097707e444a71d1243e2f27108d4f0b70098f02b9981d6692b026bc3e932b9627cbce
+EBUILD xf86-input-wacom-0.16.1.ebuild 1441 SHA256 70cdff5601bc8ab3e7364b51335a2493e3e3ca2078fa1c45174b488ef537e78c SHA512 f03d5347cae44a7c4ee03bfe49d52df6bd464e5585c35a7d0ae459653be9b581b0f6dad6a8d5597625e5cd3eb05d40e3d1c68fa74e47b88f2c6a21f4f0ab7356 WHIRLPOOL 46466dc301b22ff068bbb80f2739e03fafa0f5b1528d4fdae22c0e221940ae0bcbcba61adf3ee027d196430335ab62561bd917bbd1d494d2a84741fc9967412f
+MISC ChangeLog 9417 SHA256 b02a409b12f6924c4398af19ab740059fbedc1d3c7683ba85cdd2cb424344a2a SHA512 7fc0609c44e8a316fbda3d49c63a4801d6f3a5c22665e0b07d47cc54380518550fe74dd72a742c8f4f4cf501c3a2e5bd1abc2c40b14a41c035834370db1fd739 WHIRLPOOL 00440951e53cf04ef5cc4e856c6266a0325bd725bc5edd72b4527fa27f2aed2604999df5b63185cd538ad89b4f34ce4ecb3251754f855fae7d6ba7743389c241
 MISC metadata.xml 365 SHA256 c2c9afd84e3b5dea0662cd9cb186a1efcc9ae1d96fc569bb7504701dd2925714 SHA512 63d110692b4e5a59d388798cdfa11c66f85a99871910270bd959fc1161d4f328b152ee78aedc89c0a21debb70924105d1dfe56048b2cc8363b1214445dee3644 WHIRLPOOL c184861db31e8f5a2637ad3daaf8419c999739bf475ac0ab0b47e5712d894017750aa4a64cc808a815b384aa17f36ffcb6ee34493d673c5a46dd80c5ebe1fe04

diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.16.1.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.16.1.ebuild
index d91ecb4..e5c8fa8 100644
--- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.16.1.ebuild
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.16.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.16.1.ebuild,v 1.1 2012/09/01 17:45:27 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.16.1.ebuild,v 1.2 2012/09/23 12:09:14 blueness Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ EGIT_REPO_URI="git://linuxwacom.git.sourceforge.net/gitroot/linuxwacom/${PN}"
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
 RDEPEND=">=x11-base/xorg-server-1.7

diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 5e4bfa5..b598e2d 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -8,6 +8,6 @@ EBUILD gdk-pixbuf-2.24.0-r1.ebuild 2942 SHA256 e46630f68222d87e70d9592617ec67625
 EBUILD gdk-pixbuf-2.24.1-r1.ebuild 2929 SHA256 e89bf06e25d002d3362b8a3595a2db281fe3a37358aa1025ed0e284ba441f583 SHA512 ecf1cc1f39972ecd1c3ed640e4d35d39f67fdbc74547071b3f1e96df1e79a89421fef253743bc9bfa5c4d1b65e47e68dc45bf1bc12e87a04cafdfcbe0eed1c81 WHIRLPOOL 89dedcd947b4e243400b2518e47888ef1d2092d72a5085b1799994acd082d116dff1b693723cb8a28bd031f3f1e641e7afe22d6bbdc334c45fc5c6d210b063d1
 EBUILD gdk-pixbuf-2.24.1.ebuild 2823 SHA256 6c050db3157600f9777cb8f3638831137fc60745764cc3a803f319c4f38e4e8f SHA512 3b60c6563ff6e3edb78585d573715eeef71be121633b00d4fac0b231d17e32f6f2c60ffc5d9648a9782c284fa777128a6253665680bb159e89db4b170fd1965b WHIRLPOOL 5faae2cef4e566ebf3f07ecfcb7d55dc7f3efcd9a6c834753503418f03400fd1804e24c4a2588165efc3239bc7dfb18f1ba32386bbc0fb687aa6da821ec84d7e
 EBUILD gdk-pixbuf-2.26.3.ebuild 2843 SHA256 166779c7f19ad4a7c9f336a779e5da9d01378a5d16a6560975a78b3e353f61bf SHA512 689750cc0f949fd4d7a3e8a3dd1ab49afa8003b4a7c554f6e2ca174cc7bce1381a9585168520551c312b1c08ed1e54e43b27392413c777e604a8d60995ebb60e WHIRLPOOL 8252c67484abfdb2524409630df47dd6c5b98ff8512ad8d5f191041cf862f6081740d8ea0786c4bec72f83ae9df4555163e69b5b8daa973348575e490e69bd35
-EBUILD gdk-pixbuf-2.26.4.ebuild 2843 SHA256 97b066ea18c526f2cafa07d066c9f85a2a2ee9e0dd631174fc4752a0c3029853 SHA512 37409e70c052cc422bdf42c679d6c4736bcb1b9fe3db9f04c624f0f6fe1ac376469d5253009557c013664d4aee71be8f39d51c985a087d0388b70d88502486b1 WHIRLPOOL 6be712822e0f6b03054f53ad3fa265f30fcbd72a92f2da27a6a7573f20ced01bd615d1c29a9147ba3465e7b18726f7d1bdadda0b0a0f0a895e82736e29308ac9
-MISC ChangeLog 10388 SHA256 b99d5bf8d061a7fec972a3fe94f526892ee364ed110cecc7cfa05e41e1475c02 SHA512 38f18c232462dabd0049567a482a71d279da680bc05559a323be1af55a60e2f14892f4ea8fdb4bbb80061c71d2966f36730c7b219dd62e0b7a0c6058b4c0540c WHIRLPOOL f2d3b57400e49fcbe7f3d79162e903fc20ea47465cc984887fc5c8a1a36500227c55c8bf062771c6c6d3b08bc9339ff0478b00fa0547847007cfb821fd6cfef0
+EBUILD gdk-pixbuf-2.26.4.ebuild 2841 SHA256 9e4951d6a0f0b3f5b6d6209c96cf97f7dfda69efcf2cd2bc5a78014408342462 SHA512 5768c1974144824802e28f89857c5b133f3e5b0b3a6f9ae1aa13e8d9a69d66386c33ebe3365ad157b216cdb9bf786c184f49444e1dfd9eac29ad4f71759c6da7 WHIRLPOOL 4078e301017f0bca2a16eef8592ba89fc106ff5fffef670b6c07b8858427b93f6fe0924d30442f2c7cdf453eaa0ec459741e80953ac65657f332451865c317f6
+MISC ChangeLog 10494 SHA256 fc55582bc5db7f9b1fd3ac638d43c8ffeeaf2553fcdd368d9ff2f84bdf71ff67 SHA512 1a7a089dc70a56a140fd7505bcb177ed4edff9cdc6128b08084451786832226e55d1cd79f46d0b3d794c922df5a0a5c31b84d780f148bfde6a27e917ec31ba3d WHIRLPOOL e457baf400fe9fa9dcf46acc33b14515ccc351b7261a1f434bd10d3d52554111d62559566e132eb7f601c444c2ae87f03bb0e7fce1a7b3b7675c72f091786770
 MISC metadata.xml 285 SHA256 8400998fc578bc9661b57a27ed3226941e4f75ef5bf7d9f929ed9de2d97ba8b0 SHA512 530f007c5e32d2a70d601342642e306f5a4ac40b07aa540b43aafb5708184b4cfd3d7e52fabac76aae590e562e2a1a5ba601f316f3f63f40d29d7dfee036c776 WHIRLPOOL 5783ba665a7ee8dc468d562c30716f10ed5468345c8e0ed088966b999ba39eea01ed84758da2fa1322a3f771e2d4283a010bf03e0e197e8cb4b6cbd49f6d3c22

diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.4.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.4.ebuild
index 6f781c9..f3044f0 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.4.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.4.ebuild,v 1.1 2012/09/18 09:44:29 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.4.ebuild,v 1.2 2012/09/27 04:53:33 mattst88 Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gtk.org/"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+X debug doc +introspection jpeg jpeg2k tiff test"
 
 COMMON_DEPEND="

diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 115ff10..2d96881 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -10,8 +10,8 @@ DIST wxPython-src-2.8.12.1.tar.bz2 31311482 SHA256 1f3f153d9f1504c6ce2d2c4b23e94
 DIST wxPython-src-2.9.3.1.tar.bz2 49131100 SHA256 7bae5bf45e98eba836472bdb358330f867c69de3a347860edd48fcb53690040d SHA512 16e5be3a2a98d64637866ecae7afb3a2835d21684077bb8a1b87d3c0cf37b75eb1169f3b8e16e38c5b85c04cce974dbfd5ba25d3d0a3016a47c005a05e5dbfc5 WHIRLPOOL ccae768ff87a95ee88d6259821be5e2073928278155743c0c16c75dd9b2262ac49ccb322dd4aa77ccfdac12d7de0e874a92b41171adacfa26ffb216f170751a7
 DIST wxPython-src-2.9.4.0.tar.bz2 50827671 SHA256 78c35c19e85a17cb9c730b86b49d6a479198d76d19e0b13e86db0b55707004be SHA512 100dd4474bc2508e9a80aed6f08d295e2697926e29c5789e1f6aa7c303921e1c5de2574c3eddde568804da8fc670d0214ef225d46f34a3006d0a947423d01fbf WHIRLPOOL feff68600a40a8f02492e91049ecdd1a1865ee6db8024112aa3a85a7eff616f26653c418a8ffde77121e2bf7d2c7090c5b91896f9a2de8eb980573af2ca65507
 DIST wxPython-src-2.9.4.1.patch 3768 SHA256 075e3a7b1cf69dd2bb20010717505d2508c74bc81658540f3e6d8c4fbf0a6b85 SHA512 4a5254a5bb9c246b75095e3cc0b849073e3cc71ff15ab7fb1db6ecfe71359800b9e1a5493bc39ce5b1f338cdc1d142ce84641611d458a8da4315f3c8a6aef3ba WHIRLPOOL 9bec06da4824fe56c172f4f417966681d1ffbf173dcb54f1579e9a484377bc76c45b4f2389911bbb17eff2476cfca786d68d9524856b21accc64b4dffafb1811
-EBUILD wxGTK-2.8.12.1.ebuild 4006 SHA256 60bca2179d26273b05a99265db53c684e6eb8526edd83ef15d33f4200ab4ccc3 SHA512 b064372674f8d26cc3dcc119ca47a97f5ff472c95f0c0aeba42f222512eb65cb7ef60203d9fcf019dc45d534ce0e174be286b2f13220cfbc71ec6d5ad337c19b WHIRLPOOL 401becf13e857ef6642b4c60191b23eba3c13767f66414061b5b981c4b5ab6632c8c36aa654cb40cacabc82a341b08c5d8dc9e85649edacdf0859a15e487b937
+EBUILD wxGTK-2.8.12.1.ebuild 4009 SHA256 3901c28d2ae31b41c24aeedba779d55bfc24dcade1ddddc5c508af35226c44be SHA512 43040eb6e272063b1e59eac333d073469db21d417002efefd577a130987ab87a14420221eb2a05643d69027c44adab5dd62572385eca7ed2371ad3f87a3c151b WHIRLPOOL 8fe28b6d902d5a3fead868af7be60a872098b1d350af1c804ca45379f5bdddc1219baf0af8d289598ef2f7829b17132771f0cdd0d112c240dafe97b7eb2dc84d
 EBUILD wxGTK-2.9.3.1.ebuild 4121 SHA256 2b1ad8548d1d1ce4b802ffd7f56329cdfb30413261eafcbee9670f8ab704b8c7 SHA512 02131be2fd24b0d518c0820c78f78835238f9f9347a42c78d4d61ded87e6d4866fe1bacf70142f75d6bbc95e18fa162c476201cb7f8397c72e8ace4d44dea01e WHIRLPOOL 702cc97c300ff31dfcc1bbd94ce32fe7a964894b71146348192bede9a5690f05d2d1c5e7537d2a249e3593830de3d1d1da01359990dcfc39b9a94fe9f05518fb
 EBUILD wxGTK-2.9.4.1.ebuild 4175 SHA256 6ecfe6df0c16bce6dff23167b323a30d488db0ca9ae0892af087e679af769b03 SHA512 7e90a6561dbadcdf0884889ab2e251cb1b13d42273c24080f1518bebca0c46e3457d2bd05f0a485d1cf5571786711c62205063f33210834ddaf9dce008401d77 WHIRLPOOL ffa7f3906dbcc26e8536a212aa2a63896cc122a245daf9d07caf063e5b0bce93ffc5061cae0d3328dc53d1025bef67d921eb668f5f2705f6b5900dc3573db189
-MISC ChangeLog 46280 SHA256 e5d43efa20a649845df036814699efcd4f8c81280fb4b87c9911e9e38ebde1e0 SHA512 b0db8497f4f6dda47b001a20c89478fd7e67e41dcdcea143e35b7e118443200dece45ae55f39bdd787ca0dae3ded36aed37ceed6235c0f6636cc78a37df03299 WHIRLPOOL ea2bf5830659adad2bd2a3f278053562f94c2eadfd2627e48abcc6dd63363de3a2fd8e84825496f2fda0218c345c4dacbb9272fa24904762181d4c5d430e519c
+MISC ChangeLog 46410 SHA256 9f266cb5985105088272c0035f44e14e5f6d9a8ed711f21b881f4f29a5f56e88 SHA512 1939597b2f7447e02b3756c390a966f31d18b6366eb77d002127f07c9219a9990d73a8452702ba6aff803c943d6a8252960e9e2282246bf4f1c89aebf50adbce WHIRLPOOL 5ab3ce72bca70bc329b58eb4f54e07bd25f8a0eb84cc9deb3424e910cde3395553c4257398ba91da18d6ebc4861aa1a865b3c023637eb29e2ce16058f54bb80b
 MISC metadata.xml 670 SHA256 59d453a10e6134a232d4478f326b35a9d693341cc29c013971ddf6b308347e75 SHA512 37ec56d00b488857a285a61c894f8c28dde61efce48d79b7767a207f5c533ad01f2ef09ebecc98dd5b803b4545e1d7f513ffb48e5ead4818ecb607129339c907 WHIRLPOOL cbcc9d2aea988f0b8e1a0615918903cf332976b192156296051c9f5ac5563e9ab512376453a52ad02db0fe3465b9b30d88d6808e38bea52bb58abe6fed316586

diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild
index 4c40ba1..5a09061 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild,v 1.12 2012/09/16 02:54:04 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild,v 1.13 2012/09/25 03:49:06 vapier Exp $
 
 EAPI="5"
 
-inherit eutils versionator flag-o-matic
+inherit eutils versionator flag-o-matic multilib
 
 DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
 HOMEPAGE="http://wxwidgets.org/"
@@ -71,7 +71,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch              # Bug #174874
 	epatch "${FILESDIR}"/${PN}-2.8.10.1-odbc-defines.patch     # Bug #310923
 	sed \
-		-e "/wx_cv_std_libpath/s: /usr: ${EPREFIX}/usr:g" \
+		-e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" \
 		-i configure || die
 }
 

diff --git a/x11-misc/wbar/Manifest b/x11-misc/wbar/Manifest
index 9d66ced..a48c210 100644
--- a/x11-misc/wbar/Manifest
+++ b/x11-misc/wbar/Manifest
@@ -12,11 +12,13 @@ DIST wbar-1.3.3.tbz2 429098 SHA256 431c5f7a8b6b065e2fe32a6482476a5ecefdf838aee55
 DIST wbar-2.2.2.tar.gz 369592 SHA256 0d7ae78d02d52cdb046a47286341ad6ff42dd9aff667f7d389b4f352046d4db0
 DIST wbar-2.3.1.orig.tgz 70646 SHA256 da227e4bc0c37ba34be73080dbd49f4687eb088927518c27178e9c188b676b8d SHA512 ba808e593f4812447289b1dbba3ddeb9fc663be83294897c4363a982a241d6a0b5b2b08f40218fa91edb2c154147728fe2e3c295822280907b75b6748042d539 WHIRLPOOL 7a18b45c482e3c33f4f91382190d99d2bd55f6f06b44ddb8673393df13ffc4c753ee26a94132987d6b7ff7b7f3bf531353d28518884b5d6200123c1e57fa65bc
 DIST wbar-2.3.3.tgz 186397 SHA256 714d0f81b72fe9f8d3a63a604a2ae21d04d9f83c50dfebb5fda6f7b3d3506b48 SHA512 1971cc0e1c60c5c2273e590eff550caca6373121a9d855ecec6aec5ac9a12b780a1d02052f95fed6ffeff41395006d31e46e4570854cedd471b3427f0c9c5aa1 WHIRLPOOL 767c6e0f6981399b2a2b4dcaa01d08664cfa0165a85bf7717428867c781b314708605546c378417a9aaf9a4ab75fc88879923d11f13e20c7f473caadda158928
+DIST wbar-2.3.4.tgz 189999 SHA256 46a69849e4436529aefb5cfb2c94b520d05a53c237e7773b90207f67f97a93e3 SHA512 07f3484bd071761d57ef1172c56b30980eef9ce2ee65d1fc21ea20c631a1da1d88c1b8a9e1a1fca0e5f18e7bf1c5697c349a543d72966ce71ff53d7e921147b3 WHIRLPOOL 3d5ff6e1ea5f9079c5e7ab2e9e59729795514415241f180c9438480d94c192180f725f6d541b117ed33728694f632fc11beb69bcfdb3dcbc03d4c211e2b28d31
 DIST wbar_2.3.0.orig.tar.gz 375206 SHA256 1a192f150eae92d1c92b86050e4f8046de960a2452c48190187dd6b7a89df63b SHA512 f775b0800a9e3d3fe3104798c973b9584b71eca7e12469af7081378d3f49bb10dbc379117513060e71e2f2d2731e02a73a9edd64e06f5c3416abea4a276e26ca WHIRLPOOL 780d5bb3b92bb9fbe78176dc9a63c9b6b806617be6cf51686d372d0392ba32aa90094e76f2f4ea71133eee4a030ce95513742ccb55fd5d2814fe84e30181583e
 EBUILD wbar-1.3.3.ebuild 914 SHA256 850aaacde34f32017067b52a5a6fd2bce1ffa53dfeec0ba95c6cf77df8cfe4e4 SHA512 48954ed47a4dbae3c70f61e03f112b3ed7a30addecb405ad116d22a052efbab54b6ebd8955dab84004f58e08507355a1b95b5c6178be8d3ce721014766c3ca0a WHIRLPOOL 36f77f101e221f6a93bbbfc0494bd462d3cc00f65471ffb730b43d75162a89a60bd46a21b6c53921d6c15fef0056fdf45c981a4bab189026880e5f4eec88e2db
 EBUILD wbar-2.2.2.ebuild 1033 SHA256 0e232500791ea9aa543eeda8a6e569a28c2f76993c504461b1c144720b5f2ab7 SHA512 dbc22094d2f54911ad79a29deeea18b45fb3da39e30f9285bc83e409385c91c128d91a065ea628c9c950d10ec5d3a796d3d2a12b145b76f692776b34323815db WHIRLPOOL 3a79692aa0fe4f9f83f0294b8e609d892e1c23fabcdecf23e4bc61897589d75c7981935f054814b8754c2f81ba6d69b62d2fb459fcfb8f04464403ed4ebea9c8
 EBUILD wbar-2.3.0.ebuild 862 SHA256 0a65a21aa8dad5269cacf34e0de71f975350f5d5723c3cbcf1883da97dc2023a SHA512 c1d6fb8b1bf8e819256de6c2018198ddf78cd518a6a3319f6271c690d67c3a4df381bc0e7b79c42b52fc288c9f4417854032541e5d2c4d236ec712495f7e1c56 WHIRLPOOL 3bde3450758ff09f9430a56cba2d20424b0e79aa4bba8811645401e8ebe1f96c0e49c523a845abb3bfaaf269cbefe6d6d8d50aa4a02414ae36dcfb46fec00232
 EBUILD wbar-2.3.1.ebuild 910 SHA256 d6ff132f33434c91a8737a5d96108ba8f2a31ebb992764fcda4a9860da4dc646 SHA512 bf343dafea1a510b056769ebcb7a39a9a7f392f1119bba542465b975752fa3a0fe3effb17bcc410ef4b0920545ea883886f11fcf4a9a2a4ca1f4db739f09b295 WHIRLPOOL 2243003bead437f4e3d1b4159630da2972aac7fdf7777a2688847fa5d905c3d6682e24d2ec6ec885c84b7ed11ba0a897a9e0c90e40750d001b423e35f846a602
 EBUILD wbar-2.3.3.ebuild 895 SHA256 1b0d4fa6bc6d32647dec933e48b0db82e4875c2d068ef1eda28e6352503717d3 SHA512 56a5abe1a15906c87bbe50788688954ce5d505c4968205568f0fd919509a3affeb429c3d3c194f98e629aa40fe62be80c309e81264bb91a99c8e849c0bb93980 WHIRLPOOL 85ab22d7325fb774d29437ad5488fea0699f0e1dead64eab750d13228e916db79beb471e4af44eb547823cb278f2c3d9cc9b23c4b9f18343ee5730149fd8e91f
-MISC ChangeLog 4225 SHA256 2fc460ca3cafd85a076be9db6861285c3b782ca3b7932da3f4e6b6a3b14331a7 SHA512 4ddb8cf5250706db20766af72bf0e13421c4f5884478fa34d16613428845fb540519dd6481176196bcdd2bf6d8902b8fe00356e3342d14e03dd0aca1afd94e33 WHIRLPOOL 8faca8130c065d5c1cf33753637a775ac8f840ec2daacf25c3168adf9c9e7db1740a1b8f4516a8e2e1a0686a0b439248d8a26313df581403cfabcaa5185e99a8
+EBUILD wbar-2.3.4.ebuild 909 SHA256 9c1c750010580017d066798ab57181265c664edf26eb16c8804678d0e8ed34b2 SHA512 fff9df63f53058d5b83373859258cda4cb5d797dbbea0d37451b45af0c6cfae6cc5551480dc9dfd9d9d66aa5ef1c0539d33b1751b13132270a5ef2cef87cfc83 WHIRLPOOL ac62a9e8bfbe496b8b2e56feaeef1b88cb41efd1d2c305b9c92595562ba86a2a3024864b83d11851a61e7834edb5eae6ac5ebca676025167f1a342480a8f6d21
+MISC ChangeLog 4339 SHA256 cdbf3c9d94b3803121a66ba99e51cbfcc411726fa67218c9413d96d93bf6bcd5 SHA512 b6fa6924dd9070fcf4b48d6dbd8c922755293ccb96179f2e2e99093889d112abc3d0bb2694ebbda66952cb5605f24d7bbe2756fb6b4355e281bf50bb126e9d86 WHIRLPOOL 0ec57fe4dec0f336271f3018f43118fa666681ef4744b4893ac70685a2a5e1cc8821831ee7e711ee5969e3487c9a6bd3179a2416381cc453fa4db63bac5bd952
 MISC metadata.xml 414 SHA256 76488e3434ec332ff752665dba1bc307f7f6173de12b3018be80dfa2045c7334 SHA512 8226e176da44146e35315530fa95bd5c5c7e989cd836ecf21c08729a036290b5c1ff9bd40288e3b13744c8e28e94163c118cd4b3245b9ecc8a802e9ae114b91f WHIRLPOOL ad96e6bcb89e9c429515698281f2f52801002ce2fee3c0bf5cd8a98539c91b85d518f82d1bcac5ba0bb36f5a41b570349c82167eb14edbfb52281aadc032e136

diff --git a/x11-misc/wbar/wbar-2.3.4.ebuild b/x11-misc/wbar/wbar-2.3.4.ebuild
new file mode 100644
index 0000000..f9b02aa
--- /dev/null
+++ b/x11-misc/wbar/wbar-2.3.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/wbar-2.3.4.ebuild,v 1.1 2012/09/24 20:33:42 hasufell Exp $
+
+EAPI=4
+
+inherit autotools eutils
+
+DESCRIPTION="A fast, lightweight quick launch bar"
+HOMEPAGE="http://code.google.com/p/wbar/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND="media-libs/imlib2[X]
+	virtual/init
+	x11-libs/libX11
+	gtk? ( gnome-base/libglade
+		media-libs/freetype:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	use gtk || epatch "${FILESDIR}"/${PN}-2.3.3-cfg.patch
+	epatch "${FILESDIR}"/${PN}-2.3.3-{desktopfile,nowerror,test}.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable gtk wbar-config)
+}

diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index cc36543..85252d2 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,14 +1,10 @@
-AUX compiz-0.8.6-gdk-display-deprecated.patch 3392 SHA256 a8038d6a80abe7f44f433f6ab0dd0cf39945850564b5da33244b88a099b4efb8 SHA512 49e1d8cda54cd698acfdebd38ac4d5edf10bf41202463ea836eb19b996205207c3000c64789baf8b6de6cd52f9cc9c5a74ac3603401af21b69c4228a141d07b1 WHIRLPOOL 3849521d85186190c88aa028b65c22e206a9eaf764482d1a35b3449b843d09d51368fca9a02b8d68f49bec7f664a8d3a38ab47dc1db10cb578f0331829234e7b
-AUX compiz-0.8.6-r2-fontcorruption.patch 676 SHA256 2c4c42a251c1583a8e7fe468c1868aa42b1318db5ee95189e23ae9be8061cd43 SHA512 b7ac11650ced25e9bb3b5c6a2e5d0d478a4235f5b8b009c7dc08ac314c714c01cbb7485e49f6bcfbdbd995223b25dc3f5d4f3f8b41af2a7772459f7e285e60d2 WHIRLPOOL 46e73c97bb6b6f01e907cf0016bee79da7b2899201e08d4d88d29e6f6a4e4bf983a107b32839a2e2049c893018e12db21380c9b59af449f04ad434763555324e
 AUX compiz-gcc-4.7.patch 999 SHA256 0824c0d32d32dfc8c57fa1afbfc81060e64bdcc4ec016f3ccb751a1956f6325a SHA512 e08563d928578ad74faa29168b3c3442cc0ab4e908ff4f430a7e23bcb2057e3da10f9742e8abbdaad9df6f56a039134e8a32f73ae214e240065d6d4ddd3a92bf WHIRLPOOL b79f08787a9f7d3dc46dc1f2c6645f40965c750122027e39679d783afb0c23bd300ee731bfb45858d6392c69a21b61eb326eb29315e0e4ac0d2655edb7d69f18
 AUX compiz-kde-4.8.patch 755 SHA256 4feb22c82d21c9d870d669498badf95c01f735a85f8a5f4d63b4877b6f74df65 SHA512 fccbe0afc6e7c651912dc0e271f3745e96f5562da210934d79f00820e3b94d8340ee62707a840e042d287eba920ff556c36a39032815549d86676cd53e1cbbcc WHIRLPOOL 0d0f015463dfccfec237ce97a781868c6a76a3ab96caa8c5ed656ea0504e425a7490c8289bf56a63c2c2f9cde6bf580c1b56a6a663b3086e9a25a85ff955b48b
 AUX compiz-kde-4.9.patch 4975 SHA256 0d984c6af504a9d3b532cc9e50534a329f914a5c949e10a54f39c56da856c09b SHA512 ef448bf43cba07ddd925405f8502af3d24692a911431696c9b454b97bc67523f39c1321a95dbf216bd5369a439dfc91e7b953be4a9340393254750515cf9097e WHIRLPOOL 15d6dd43de19a28f6428fcc1be080f922a087d5d0c50b57236bc555af199401e042a029526bf3f3b2c3b8d488cd16fd8704920875ef4fe5cd415266cf9bb2e44
 AUX compiz-manager 9835 SHA256 e387ff9f01b84c572f31643316ed2ce2eacd11a92488e745ebcfd659945c6f1d SHA512 5cf4c1023754128c456d48db257a308461de0cbd9ebd427a4c281ada0b77659013723362959ae39fa31f24de36929fdfe6ea96d9788cba568f35d2dc86bc263a WHIRLPOOL 0afb3b62a0e29b9608d2eaf640f7704ffa91a3ea7ea7fc0d7cba5761a04c4a1928007e285344e401030230de506b92cbbbdbe4436eda4ebd44848ebfcad95c97
 AUX compiz-no-gconf.patch 630 SHA256 87467fbe5d4e0d0bb8952f2d5b74d21046d92d49772543aeda137266e055aa67 SHA512 3c3789852db56be06d553dcdddb68c94e68b9290c74e5a9e642f266d1688c18eb4ce01b6835f267c84d3a213ec61266159d5891b10d80cb79e17bc9683163bf9 WHIRLPOOL 7341780992eed62a36bfa8be0e8f22c4f54ecda555f8af87ea76f585f4fcbcb76f31bb79269a01ff5c5eabe7d6796a233d7efa8baf35720a09085f53af3b1da6
 AUX compiz.desktop 273 SHA256 28a5459148c7733cdd82e3ecc1f584231d2619c7305b8bf71060db331bf081fb SHA512 60189c33d9190934195dace88a88571e79af2be06be0df9db96f7f332798cb8b3d7c0e4bacacb3413ea381c9418415932ae895e75547568eb38d12e3800cf427 WHIRLPOOL c8f068a5e254e74285ced96236a98cd4b5724c630342a19df1defb19f14755e83ce5e6d86688066dbbeee43e8c1d89640756d9427af996fa261f31630c6893af
-DIST compiz-0.8.6.tar.bz2 1162334 SHA256 c4df69b59b5660a37462de9ff0212af024ccf9c8038651bfda3557c955ab4f8c
 DIST compiz-0.8.8.tar.bz2 1123892 SHA256 3ba555b0d6d536850a227d37d6ebc5cd5b15ee5bad83d7956529a27b870977e3 SHA512 6e3bad018835fdbc1b0e5ecb51a46a77a6531d46d77ee3ae4169273632ea9a6839c78300b18e2198c41698517efa65ded75387785b0c5bbbb6da41498451b644 WHIRLPOOL fa1d9b5e443d45a4615201a85a74dd025066620339ebac58b4fd5c71c19db731009c013ceee93f0345b46c413211424bc4c813d48e07d6cea874024a2b562ba2
-EBUILD compiz-0.8.6-r3.ebuild 4030 SHA256 17331b2883d72fcce403c1485dbf408b5dbc8781202c4e285f11e0b8dfcb6d70 SHA512 2072736bce9dd3be5def0f5ab8bea12e027f86dc698aef2cafa9fbb7ce984a288ba9a0711bd8892c37e50b404a759ca90f9223aa5ea137490251302f6fa8c8ee WHIRLPOOL 9c7fb53527a44b0635a888899808071091bb3c1e409fef84440d23384cf6d7ee5d8946e7d3e09c382063bd89c20d23ea806968193a470234360ff777efd4c10c
 EBUILD compiz-0.8.8-r1.ebuild 4083 SHA256 c5bbae7ce2cab6e9b3363227a9e47bb63315214eaeb4ad78ffb79997c5a8b530 SHA512 a191c3107fdef84d9a4d1ea5ff08860fc572c45aefd5d98c7161a1f2aa99fe811c8d660ebe1af2208641a42f2cebdc0b5ec43b063fe3c52e44d4ed7145d30dc2 WHIRLPOOL 0abda4b254432f5b2ffa5234c472635337d5985dd5b62d603c0b0affeb530b86a4a4be70e39916aaa313c4e30f7c2140cc5d316d9624efade81cf5d7fe587387
-MISC ChangeLog 14558 SHA256 3750d757411d3c84404729dd40224609e21993b3d26e6d6b749c447b8377a2e2 SHA512 fa94e89f667a43624ae82f7c9170846c4c2505e71c891dbea52f3603ad505d26f64ec765e5af5cdab6455fe085e14ad9756e10f9fea58ebe254cf860add5dbb8 WHIRLPOOL b214209e9cfd4a0f1b0c1829e9e0b625f528b8c4bae38fa8aa2cd15e229d5865a28975f8914ed7b0ddba872e82add4b150be956f7039693c4ceeea728ef21ffb
+MISC ChangeLog 14759 SHA256 ec8fdc6baec99f3d233a33be467df22c35c1ee46e5d6b02e2de51691097ba2ee SHA512 2c72c0f674741956966d470e7b6dd55ca15f3d5d0480418421f122623fba7d0cde5251f64ed899406428601b84c35ce93e833abe716798120ea618519843fc4f WHIRLPOOL eb6279421292103c32ff681594bc23a6c03cebf3f8b36e4aa843c1120cc9dd88a865067939588d771015c6479026fb3ba8dd8ac38505de97e59e69cb5750af40
 MISC metadata.xml 632 SHA256 a0dce016c36d51c1fe13822ed59ba3aef9b8a22fecdb2d3f5360b824ee890bb1 SHA512 46e6acb05014ec6cb5b77b6ff5ae31adff93ded582ad7ca22e90ce16c00f6ce7009fe72e603af83d0e6d5604f177e8eb175cdac2703d715c065e5df2834740a7 WHIRLPOOL 9499ba8dba186cc869cbc34cb7c964655c870318eaa28ca0d7ddef8b473e199edeea48f90f3394ff39334af6b8924f46dae4fa1a43ff9a75d54b0358cea88a2e

diff --git a/x11-wm/compiz/compiz-0.8.6-r3.ebuild b/x11-wm/compiz/compiz-0.8.6-r3.ebuild
deleted file mode 100644
index 9e5ed96..0000000
--- a/x11-wm/compiz/compiz-0.8.6-r3.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.6-r3.ebuild,v 1.6 2012/07/31 22:36:58 naota Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2-utils
-
-DESCRIPTION="OpenGL window and compositing manager"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-# dbus has been disabled because of bug 365121
-IUSE="+cairo fuse gnome gconf gtk kde +svg" # dbus
-
-COMMONDEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	media-libs/libpng
-	>=media-libs/mesa-6.5.1-r1
-	>=x11-base/xorg-server-1.1.1-r1
-	>=x11-libs/libX11-1.4
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libICE
-	x11-libs/libSM
-	>=x11-libs/libXrender-0.8.4
-	>=x11-libs/startup-notification-0.7
-	cairo? (
-		x11-libs/cairo[X]
-	)
-	fuse? ( sys-fs/fuse )
-	gnome? (
-		>=gnome-base/gnome-control-center-2.16.1:2
-		gnome-base/gnome-desktop:2
-		gconf? ( gnome-base/gconf:2 )
-	)
-	gtk? (
-		>=x11-libs/gtk+-2.8.0:2
-		>=x11-libs/libwnck-2.18.3:1
-		x11-libs/pango
-	)
-	kde? (
-		|| (
-			>=kde-base/kwin-4.2.0
-			kde-base/kwin:live
-		)
-	)
-	svg? (
-		>=gnome-base/librsvg-2.14.0:2
-		>=x11-libs/cairo-1.0
-	)
-"
-# dbus? ( >=sys-apps/dbus-1.0 )
-
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	x11-proto/damageproto
-	x11-proto/xineramaproto
-"
-
-RDEPEND="${COMMONDEPEND}
-	x11-apps/mesa-progs
-	x11-apps/xvinfo
-"
-
-src_prepare() {
-
-	echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip"
-	echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip"
-
-	# fix cont corruption, bug #343861
-	epatch "${FILESDIR}"/${P}-r2-fontcorruption.patch
-	epatch "${FILESDIR}"/${P}-gdk-display-deprecated.patch
-
-	if ! use gnome || ! use gconf; then
-		epatch "${FILESDIR}"/${PN}-no-gconf.patch
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=
-
-	# We make gconf optional by itself, but only if gnome is also
-	# enabled, otherwise we simply disable it.
-	if use gnome; then
-		myconf="${myconf} $(use_enable gconf)"
-	else
-		myconf="${myconf} --disable-gconf"
-	fi
-
-	econf \
-		--disable-dependency-tracking \
-		--enable-fast-install \
-		--disable-static \
-		--disable-gnome-keybindings \
-		--with-default-plugins \
-		$(use_enable svg librsvg) \
-		$(use_enable cairo annotate) \
-		--disable-dbus \
-		--disable-dbus-glib \
-		$(use_enable fuse) \
-		$(use_enable gnome) \
-		$(use_enable gnome metacity) \
-		$(use_enable gtk) \
-		$(use_enable kde kde4) \
-		--disable-kde \
-		${myconf}
-
-		# $(use_enable dbus)
-		# $(use_enable dbus dbus-glib)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	find "${D}" -name '*.la' -delete || die
-
-	# Install compiz-manager
-	dobin "${FILESDIR}/compiz-manager" || die "dobin failed"
-
-	# Add the full-path to lspci
-	sed -i "s#lspci#/usr/sbin/lspci#" "${D}/usr/bin/compiz-manager" || die "sed 1 failed"
-
-	# Fix the hardcoded lib paths
-	sed -i "s#/lib/#/$(get_libdir)/#g" "${D}/usr/bin/compiz-manager" || die "sed 2 failed"
-
-	# Create gentoo's config file
-	dodir /etc/xdg/compiz || die "dodir failed"
-
-	cat <<- EOF > "${D}/etc/xdg/compiz/compiz-manager"
-	COMPIZ_BIN_PATH="/usr/bin/"
-	PLUGIN_PATH="/usr/$(get_libdir)/compiz/"
-	LIBGL_NVIDIA="/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.so.1.2"
-	LIBGL_FGLRX="/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.so.1.2"
-	KWIN="$(type -p kwin)"
-	METACITY="$(type -p metacity)"
-	SKIP_CHECKS="yes"
-	EOF
-
-	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
-
-	insinto "/usr/share/applications"
-	doins "${FILESDIR}/compiz.desktop" || die "Failed to install compiz.desktop"
-}
-
-pkg_preinst() {
-	use gnome && use gconf && gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	use gnome && use gconf && gnome2_gconf_install
-
-	ewarn "If you update to x11-wm/metacity-2.24 after you install ${P},"
-	ewarn "gtk-window-decorator will crash until you reinstall ${PN} again."
-}
-
-pkg_prerm() {
-	use gnome && gnome2_gconf_uninstall
-}

diff --git a/x11-wm/compiz/files/compiz-0.8.6-gdk-display-deprecated.patch b/x11-wm/compiz/files/compiz-0.8.6-gdk-display-deprecated.patch
deleted file mode 100644
index 440b37a..0000000
--- a/x11-wm/compiz/files/compiz-0.8.6-gdk-display-deprecated.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff --git a/gtk/window-decorator/gtk-window-decorator.c b/gtk/window-decorator/gtk-window-decorator.c
-index 18b907e..566da0f 100644
---- a/gtk/window-decorator/gtk-window-decorator.c
-+++ b/gtk/window-decorator/gtk-window-decorator.c
-@@ -31,6 +31,11 @@
- #include <X11/extensions/Xrender.h>
- #include <X11/Xregion.h>
- 
-+/* This must be included before the GDK_DISABLE_DEPRECATED definition 
-+ * in order to avoid QA issues on amd64 arch (see Gentoo bug 344293).
-+ */
-+#include <gdk/gdkgc.h>
-+
- #ifndef GDK_DISABLE_DEPRECATED
- #define GDK_DISABLE_DEPRECATED
- #endif
-@@ -2659,6 +2664,7 @@ get_window_prop (Window xwindow,
- 		 Atom   atom,
- 		 Window *val)
- {
-+    Display *dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-     Atom   type;
-     int	   format;
-     gulong nitems;
-@@ -2671,7 +2677,7 @@ get_window_prop (Window xwindow,
-     gdk_error_trap_push ();
- 
-     type = None;
--    result = XGetWindowProperty (gdk_display,
-+    result = XGetWindowProperty (dpy,
- 				 xwindow,
- 				 atom,
- 				 0, G_MAXLONG,
-@@ -4966,7 +4972,7 @@ force_quit_dialog_realize (GtkWidget *dialog,
-     WnckWindow *win = data;
- 
-     gdk_error_trap_push ();
--    XSetTransientForHint (gdk_display,
-+    XSetTransientForHint (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
- 			  GDK_WINDOW_XID (dialog->window),
- 			  wnck_window_get_xid (win));
-     gdk_display_sync (gdk_display_get_default ());
-@@ -4976,17 +4982,18 @@ force_quit_dialog_realize (GtkWidget *dialog,
- static char *
- get_client_machine (Window xwindow)
- {
--    Atom   atom, type;
--    gulong nitems, bytes_after;
--    guchar *str = NULL;
--    int    format, result;
--    char   *retval;
-+    Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-+    Atom    atom, type;
-+    gulong  nitems, bytes_after;
-+    guchar  *str = NULL;
-+    int     format, result;
-+    char    *retval;
- 
--    atom = XInternAtom (gdk_display, "WM_CLIENT_MACHINE", FALSE);
-+    atom = XInternAtom (xdisplay, "WM_CLIENT_MACHINE", FALSE);
- 
-     gdk_error_trap_push ();
- 
--    result = XGetWindowProperty (gdk_display,
-+    result = XGetWindowProperty (xdisplay,
- 				 xwindow, atom,
- 				 0, G_MAXLONG,
- 				 FALSE, XA_STRING, &type, &format, &nitems,
-@@ -5013,6 +5020,8 @@ get_client_machine (Window xwindow)
- static void
- kill_window (WnckWindow *win)
- {
-+    GdkDisplay      *gdk_display = gdk_display_get_default ();
-+    Display         *xdisplay    = GDK_DISPLAY_XDISPLAY (gdk_display);
-     WnckApplication *app;
- 
-     app = wnck_window_get_application (win);
-@@ -5038,8 +5047,8 @@ kill_window (WnckWindow *win)
-     }
- 
-     gdk_error_trap_push ();
--    XKillClient (gdk_display, wnck_window_get_xid (win));
--    gdk_display_sync (gdk_display_get_default ());
-+    XKillClient (xdisplay, wnck_window_get_xid (win));
-+    gdk_display_sync (gdk_display);
-     gdk_error_trap_pop ();
- }
- 
-@@ -5623,9 +5632,9 @@ static int
- update_shadow (void)
- {
-     decor_shadow_options_t opt;
--    Display		   *xdisplay = gdk_display;
--    GdkDisplay		   *display = gdk_display_get_default ();
--    GdkScreen		   *screen = gdk_display_get_default_screen (display);
-+    GdkDisplay		   *display  = gdk_display_get_default ();
-+    Display		   *xdisplay = GDK_DISPLAY_XDISPLAY (display);
-+    GdkScreen		   *screen   = gdk_display_get_default_screen (display);
- 
-     opt.shadow_radius  = shadow_radius;
-     opt.shadow_opacity = shadow_opacity;

diff --git a/x11-wm/compiz/files/compiz-0.8.6-r2-fontcorruption.patch b/x11-wm/compiz/files/compiz-0.8.6-r2-fontcorruption.patch
deleted file mode 100644
index 1ef84a1..0000000
--- a/x11-wm/compiz/files/compiz-0.8.6-r2-fontcorruption.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0f95c41a0aa175ddf7947ba18b01f746c95594a9 Mon Sep 17 00:00:00 2001
-From: Paul Donohue <compiz@××××××.com>
-Date: Sun, 17 Oct 2010 16:24:14 +0000
-Subject: Fix pixmap size calculation, server drawn borders are also included in 
-the pixmap.
----
-diff --git a/src/window.c b/src/window.c
-index a925288..6674643 100644
---- a/src/window.c
-+++ b/src/window.c
-@@ -1446,8 +1446,8 @@ bindWindow (CompWindow *w)
- 	}
- 
- 	w->pixmap = XCompositeNameWindowPixmap (dpy, w->id);
--	w->width  = attr.width;
--	w->height = attr.height;
-+	w->width  = attr.width + attr.border_width * 2;
-+	w->height = attr.height + attr.border_width * 2;
- 
- 	XUngrabServer (dpy);
-     }
---
-cgit v0.8.3.1-30-gff3a