[gentoo-commits] proj/android:master commit in: sys-libs/glibc/files/2.6/, sys-libs/glibc/, sys-libs/glibc/files/2.12/, ...

[Benda XU]

commit:     d6d4d907547bae4aeac27d4cc49c7143736dde79
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 30 09:22:12 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Wed Aug 30 09:22:12 2017 +0000
URL:        https://gitweb.gentoo.org/proj/android.git/commit/?id=d6d4d907

python, portage, glibc: merged into gentoo main repo.

 dev-lang/python/ChangeLog                          | 1041 -------
 dev-lang/python/ChangeLog-2011                     | 2583 -----------------
 dev-lang/python/Manifest                           |   50 -
 dev-lang/python/files/CVE-2013-4238_py27.patch     |  247 --
 dev-lang/python/files/CVE-2013-4238_py33.patch     |  241 --
 dev-lang/python/files/pydoc.conf                   |    7 -
 dev-lang/python/files/pydoc.init                   |   25 -
 dev-lang/python/files/python-2.5-tcl86.patch       |   11 -
 dev-lang/python/files/python-2.7-issue16248.patch  |   19 -
 dev-lang/python/files/python-2.7-issue18851.patch  |  287 --
 .../python/files/python-2.7.5-library-path.patch   |   25 -
 .../files/python-2.7.5-nonfatal-compileall.patch   |   18 -
 .../files/python-2.7.5-re_unsigned_ptrdiff.patch   |   23 -
 ...ython-2.7.6-recvfrom_into_buffer_overflow.patch |   17 -
 .../files/python-2.7.9-ncurses-pkg-config.patch    |   13 -
 .../python/files/python-3.2-CVE-2013-2099.patch    |   51 -
 .../python/files/python-3.2-CVE-2014-1912.patch    |   51 -
 .../python/files/python-3.2-CVE-2014-4616.patch    |   39 -
 dev-lang/python/files/python-3.2-issue16248.patch  |   19 -
 .../python/files/python-3.3-CVE-2013-2099.patch    |   51 -
 .../python/files/python-3.3-CVE-2014-4616.patch    |   52 -
 .../files/python-3.3.5-ncurses-pkg-config.patch    |   40 -
 .../files/python-3.4.3-ncurses-pkg-config.patch    |   13 -
 dev-lang/python/files/python-config-2.4-r1         |   58 -
 dev-lang/python/metadata.xml                       |   10 -
 dev-lang/python/python-2.6.9.ebuild                |  371 ---
 dev-lang/python/python-2.7.9-r1.ebuild             |  358 ---
 dev-lang/python/python-2.7.9-r2.ebuild             |  362 ---
 dev-lang/python/python-3.2.5-r6.ebuild             |  384 ---
 dev-lang/python/python-3.3.5-r1.ebuild             |  325 ---
 dev-lang/python/python-3.4.0.ebuild                |  320 ---
 dev-lang/python/python-3.4.1.ebuild                |  319 ---
 dev-lang/python/python-3.4.2.ebuild                |  319 ---
 dev-lang/python/python-3.4.3.ebuild                |  318 ---
 sys-apps/portage/Manifest                          |   16 -
 ...ert-URI-changes-related-to-docbook-schema.patch |   39 -
 sys-apps/portage/files/README.RESCUE               |    2 -
 .../files/portage-2.3.0-ldconfig-path.patch        |   34 -
 .../files/portage-2.3.0-prefix-path-only.patch     |   44 -
 sys-apps/portage/files/portage-2.3.0_rc1.patch     |   52 -
 sys-apps/portage/metadata.xml                      |   20 -
 sys-apps/portage/portage-2.3.0.ebuild              |  364 ---
 sys-apps/portage/portage-2.3.0_rc1-r1.ebuild       |  368 ---
 sys-apps/portage/portage-2.3.1.ebuild              |  367 ---
 sys-apps/portage/portage-2.3.2.ebuild              |  366 ---
 sys-apps/portage/portage-2.3.3.ebuild              |  369 ---
 sys-libs/glibc/Manifest                            |   62 -
 .../glibc/files/2.10/glibc-2.10-gentoo-chk_fail.c  |  315 --
 .../glibc-2.10-hardened-configure-picdefault.patch |   30 -
 .../glibc-2.10-hardened-inittls-nosysenter.patch   |  274 --
 .../2.10/glibc-2.10-hardened-ssp-compat.patch      |  168 --
 .../glibc/files/2.11/glibc-2.11-hardened-pie.patch |   40 -
 .../glibc/files/2.12/glibc-2.12-hardened-pie.patch |   39 -
 .../2.15/glibc-2.15-localstatedir-backport.patch   |   13 -
 .../glibc/files/2.16/glibc-2.16-hardened-pie.patch |   39 -
 .../glibc/files/2.17/glibc-2.17-hardened-pie.patch |   42 -
 .../files/2.17/glibc-2.17-runtime-prefix.patch     |  162 --
 .../files/2.17/glibc-2.17-shadow-prefix.patch      |   33 -
 sys-libs/glibc/files/2.17/locale-gen_prefix.patch  |   77 -
 sys-libs/glibc/files/2.17/vdso-disable.patch       |   34 -
 sys-libs/glibc/files/2.17/vdso.patch               |   17 -
 .../files/2.19/glibc-2.19-configurable-paths.patch | 2115 --------------
 .../glibc-2.19-hardened-configure-picdefault.patch |   30 -
 .../2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch  |   32 -
 .../glibc/files/2.19/glibc-2.19-vdso-disable.patch |   37 -
 .../files/2.20/glibc-2.20-configurable-paths.patch | 3012 --------------------
 .../glibc/files/2.20/glibc-2.20-gentoo-chk_fail.c  |  299 --
 .../files/2.20/glibc-2.20-gentoo-stack_chk_fail.c  |    2 -
 .../glibc-2.20-hardened-inittls-nosysenter.patch   |  306 --
 .../glibc/files/2.20/glibc-2.20-vdso-disable.patch |   20 -
 .../glibc-2.3.3-localedef-fix-trampoline.patch     |   68 -
 .../files/2.5/glibc-2.5-gentoo-stack_chk_fail.c    |  311 --
 .../glibc-2.5-hardened-configure-picdefault.patch  |   29 -
 .../glibc-2.5-hardened-inittls-nosysenter.patch    |  283 --
 .../glibc/files/2.5/glibc-2.5-hardened-pie.patch   |   39 -
 .../files/2.6/glibc-2.6-gentoo-stack_chk_fail.c    |  321 ---
 .../glibc-2.6-hardened-inittls-nosysenter.patch    |  273 --
 .../glibc-2.7-hardened-inittls-nosysenter.patch    |  273 --
 sys-libs/glibc/files/eblits/common.eblit           |  380 ---
 sys-libs/glibc/files/eblits/pkg_postinst.eblit     |   27 -
 sys-libs/glibc/files/eblits/pkg_preinst.eblit      |   63 -
 sys-libs/glibc/files/eblits/pkg_pretend.eblit      |  157 -
 sys-libs/glibc/files/eblits/pkg_setup.eblit        |    9 -
 sys-libs/glibc/files/eblits/src_compile.eblit      |   24 -
 sys-libs/glibc/files/eblits/src_configure.eblit    |  263 --
 sys-libs/glibc/files/eblits/src_install.eblit      |  244 --
 sys-libs/glibc/files/eblits/src_prepare.eblit      |   63 -
 sys-libs/glibc/files/eblits/src_test.eblit         |   30 -
 sys-libs/glibc/files/eblits/src_unpack.eblit       |  121 -
 sys-libs/glibc/files/nscd                          |   64 -
 sys-libs/glibc/files/nscd.service                  |   15 -
 sys-libs/glibc/files/nscd.tmpfilesd                |    4 -
 sys-libs/glibc/files/nsswitch.conf                 |   24 -
 sys-libs/glibc/glibc-2.15-r1.ebuild                |  233 --
 sys-libs/glibc/glibc-2.15-r2.ebuild                |  225 --
 sys-libs/glibc/glibc-2.15-r3.ebuild                |  227 --
 sys-libs/glibc/glibc-2.17.ebuild                   |  228 --
 sys-libs/glibc/glibc-2.19-r1.ebuild                |  227 --
 sys-libs/glibc/metadata.xml                        |   11 -
 99 files changed, 21542 deletions(-)

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
deleted file mode 100644
index 022a456..0000000
--- a/dev-lang/python/ChangeLog
+++ /dev/null
@@ -1,1041 +0,0 @@
-# ChangeLog for dev-lang/python
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.818 2015/04/23 19:25:27 floppym Exp $
-
-  23 Apr 2015; Mike Gilbert <floppym@g.o> python-2.6.9.ebuild:
-  Fix dep on eselect-python.
-
-*python-2.6.9 (23 Apr 2015)
-
-  23 Apr 2015; Mike Gilbert <floppym@g.o> +files/python-2.5-tcl86.patch,
-  +python-2.6.9.ebuild:
-  Restore python-2.6.9, without keywords.
-
-  31 Mar 2015; Ulrich Müller <ulm@g.o> python-2.7.9-r1.ebuild,
-  python-2.7.9-r2.ebuild, python-3.2.5-r6.ebuild, python-3.3.5-r1.ebuild,
-  python-3.4.0.ebuild, python-3.4.1.ebuild, python-3.4.2.ebuild,
-  python-3.4.3.ebuild:
-  Update dependency after package move of eselect modules to app-eselect.
-
-  03 Mar 2015; Mike Frysinger <vapier@g.o>
-  +files/python-2.7.9-ncurses-pkg-config.patch,
-  +files/python-3.3.5-ncurses-pkg-config.patch,
-  +files/python-3.4.3-ncurses-pkg-config.patch, python-2.7.9-r2.ebuild,
-  python-3.3.5-r1.ebuild, python-3.4.3.ebuild:
-  Use pkg-config to locate ncurses headers to fix cross-compiling.
-
-*python-3.4.3 (03 Mar 2015)
-
-  03 Mar 2015; Mike Gilbert <floppym@g.o> +python-3.4.3.ebuild:
-  Version bump.
-
-  09 Feb 2015; Mike Frysinger <vapier@g.o> python-2.7.9-r1.ebuild,
-  python-3.4.1.ebuild:
-  Mark arm64/m68k/s390/sh stable.
-
-*python-2.7.9-r2 (07 Feb 2015)
-
-  07 Feb 2015; Mike Gilbert <floppym@g.o> +python-2.7.9-r2.ebuild:
-  Drop 61_all_process_data.patch, fixes musl build, bug 539210.
-
-  07 Feb 2015; Mike Gilbert <floppym@g.o> -python-2.7.7.ebuild,
-  -python-2.7.8.ebuild:
-  Remove old.
-
-  09 Jan 2015; Tobias Klausmann <klausman@g.o> python-2.7.9-r1.ebuild:
-  Stable on alpha, bug 532232
-
-  30 Dec 2014; Markus Meier <maekke@g.o> python-2.7.9-r1.ebuild:
-  arm stable, bug #532232
-
-  26 Dec 2014; Agostino Sarubbo <ago@g.o> python-2.7.9-r1.ebuild:
-  Stable for sparc, wrt bug #532232
-
-  25 Dec 2014; Agostino Sarubbo <ago@g.o> python-2.7.9-r1.ebuild:
-  Stable for ia64, wrt bug #532232
-
-*python-2.7.9-r1 (24 Dec 2014)
-
-  24 Dec 2014; Mike Gilbert <floppym@g.o> +python-2.7.9-r1.ebuild,
-  -python-2.7.9.ebuild:
-  Revbump for ensurepip change.
-
-  24 Dec 2014; Mike Gilbert <floppym@g.o> python-2.7.9.ebuild:
-  Pass --without-ensurepip to configure.
-
-  24 Dec 2014; Agostino Sarubbo <ago@g.o> python-2.7.9.ebuild:
-  Stable for ppc64, wrt bug #532232
-
-  24 Dec 2014; Agostino Sarubbo <ago@g.o> python-2.7.9.ebuild:
-  Stable for ppc, wrt bug #532232
-
-  23 Dec 2014; Agostino Sarubbo <ago@g.o> python-2.7.9.ebuild:
-  Stable for x86, wrt bug #532232
-
-  23 Dec 2014; Agostino Sarubbo <ago@g.o> python-2.7.9.ebuild:
-  Stable for amd64, wrt bug #532232
-
-  22 Dec 2014; Jeroen Roovers <jer@g.o> python-2.7.9.ebuild:
-  Stable for HPPA (bug #532232).
-
-*python-2.7.9 (14 Dec 2014)
-
-  14 Dec 2014; Mike Gilbert <floppym@g.o> +python-2.7.9.ebuild:
-  Version bump.
-
-  11 Dec 2014; Michał Górny <mgorny@g.o> python-3.2.5-r6.ebuild:
-  Add a postinst explaining that Python 3.2 is not supported.
-
-  11 Nov 2014; Markus Meier <maekke@g.o> python-3.4.1.ebuild:
-  arm stable, bug #522322
-
-  02 Nov 2014; Agostino Sarubbo <ago@g.o> python-3.4.1.ebuild:
-  Stable for alpha, wrt bug #522322
-
-  29 Oct 2014; Agostino Sarubbo <ago@g.o> python-3.4.1.ebuild:
-  Stable for sparc, wrt bug #522322
-
-  28 Oct 2014; Agostino Sarubbo <ago@g.o> python-3.4.1.ebuild:
-  Stable for ia64, wrt bug #522322
-
-  27 Oct 2014; Agostino Sarubbo <ago@g.o> python-3.4.1.ebuild:
-  Stable for ppc64, wrt bug #522322
-
-  18 Oct 2014; Agostino Sarubbo <ago@g.o> python-3.4.1.ebuild:
-  Stable for ppc, wrt bug #522322
-
-*python-3.4.2 (12 Oct 2014)
-
-  12 Oct 2014; Mike Gilbert <floppym@g.o> +python-3.4.2.ebuild:
-  Version bump. Thanks to Arfrever for updating the patchset.
-
-  12 Oct 2014; Dirkjan Ochtman <djc@g.o> files/pydoc.init:
-  Remove net dependency from pydoc init scripts (fixes bug 439662)
-
-  12 Oct 2014; Agostino Sarubbo <ago@g.o> python-3.4.1.ebuild:
-  Stable for x86, wrt bug #522322
-
-  10 Oct 2014; Agostino Sarubbo <ago@g.o> python-3.4.1.ebuild:
-  Stable for amd64, wrt bug #522322
-
-  26 Sep 2014; Jeroen Roovers <jer@g.o> python-3.4.1.ebuild:
-  Stable for HPPA (bug #522322).
-
-  22 Sep 2014; Mike Gilbert <floppym@g.o> python-2.7.8.ebuild:
-  New patchset, should resolve bug 523072. Thanks for Arfrever for the updates.
-
-  09 Sep 2014; Mike Frysinger <vapier@g.o> python-2.7.7.ebuild,
-  python-3.3.5-r1.ebuild:
-  Mark m68k/s390/sh stable.
-
-  18 Aug 2014; Dirkjan Ochtman <djc@g.o> -python-3.3.4.ebuild:
-  Additional cleanup for bug 514686
-
-  18 Aug 2014; Dirkjan Ochtman <djc@g.o> -python-2.7.5-r3.ebuild,
-  -python-2.7.5-r4.ebuild, -python-2.7.6-r1.ebuild, -python-2.7.6.ebuild,
-  -python-3.2.5-r3.ebuild, -python-3.3.2-r2.ebuild, -python-3.3.3.ebuild,
-  -python-3.4.0_rc1.ebuild, -python-3.4.0_rc3.ebuild:
-  Cleanup for bug 500518
-
-  09 Aug 2014; Agostino Sarubbo <ago@g.o> python-2.7.7.ebuild,
-  python-3.2.5-r6.ebuild, python-3.3.5-r1.ebuild:
-  Stable for ppc64, wrt bug #500518
-
-  08 Aug 2014; Agostino Sarubbo <ago@g.o> python-2.7.7.ebuild,
-  python-3.2.5-r6.ebuild, python-3.3.5-r1.ebuild:
-  Stable for ppc, wrt bug #500518
-
-  04 Aug 2014; Raúl Porcel <armin76@g.o> python-2.7.7.ebuild,
-  python-3.2.5-r6.ebuild, python-3.3.5-r1.ebuild:
-  arm64/ia64/sparc stable wrt #500518
-
-  03 Aug 2014; Markus Meier <maekke@g.o> python-3.3.5-r1.ebuild:
-  arm stable, bug #500518
-
-  03 Aug 2014; Markus Meier <maekke@g.o> python-3.2.5-r6.ebuild:
-  arm stable, bug #500518
-
-  03 Aug 2014; Markus Meier <maekke@g.o> python-2.7.7.ebuild:
-  arm stable, bug #500518
-
-  02 Aug 2014; Agostino Sarubbo <ago@g.o> python-2.7.7.ebuild,
-  python-3.2.5-r6.ebuild, python-3.3.5-r1.ebuild:
-  Stable for x86, wrt bug #500518
-
-  02 Aug 2014; Agostino Sarubbo <ago@g.o> python-2.7.7.ebuild,
-  python-3.2.5-r6.ebuild, python-3.3.5-r1.ebuild:
-  Stable for amd64, wrt bug #500518
-
-  31 Jul 2014; Tobias Klausmann <klausman@g.o> python-3.2.5-r6.ebuild:
-  Stable on alpha, bug #500518
-
-  31 Jul 2014; Tobias Klausmann <klausman@g.o> python-2.7.7.ebuild:
-  Stable on alpha, bug #500518
-
-  31 Jul 2014; Tobias Klausmann <klausman@g.o> python-3.3.5-r1.ebuild:
-  Stable on alpha, bug #500518
-
-  31 Jul 2014; Jeroen Roovers <jer@g.o> python-3.2.5-r6.ebuild:
-  Stable for HPPA (bug #500518).
-
-  31 Jul 2014; Jeroen Roovers <jer@g.o> python-3.3.5-r1.ebuild:
-  Stable for HPPA (bug #500518).
-
-  30 Jul 2014; Jeroen Roovers <jer@g.o> python-2.7.7.ebuild:
-  Stable for HPPA (bug #500518).
-
-*python-2.7.8 (29 Jul 2014)
-
-  29 Jul 2014; Patrick McLean <chutzpah@g.o> +python-2.7.8.ebuild:
-  Version bump.
-
-*python-3.2.5-r6 (29 Jul 2014)
-
-  29 Jul 2014; Sergey Popov <pinkbyte@g.o> -python-3.2.5-r5.ebuild,
-  +python-3.2.5-r6.ebuild, +files/python-3.2-CVE-2014-1912.patch:
-  Revision bump: backport patch for CVE-2014-1912, bug #500518. Drop old
-  revision. Acked by Python team
-
-*python-3.3.5-r1 (29 Jul 2014)
-*python-3.2.5-r5 (29 Jul 2014)
-
-  29 Jul 2014; Sergey Popov <pinkbyte@g.o> -python-3.2.5-r4.ebuild,
-  +python-3.2.5-r5.ebuild, -python-3.3.5.ebuild, +python-3.3.5-r1.ebuild,
-  +files/python-3.2-CVE-2014-4616.patch, +files/python-3.3-CVE-2014-4616.patch:
-  Revision bump: add patch for CVE-2014-4616, bug #514686. Drop old revisions.
-  Acked by Python team
-
-  18 Jul 2014; Tobias Klausmann <klausman@g.o> python-2.7.6.ebuild:
-  Stable on alpha, bug #504742
-
-  06 Jul 2014; Michał Górny <mgorny@g.o> -files/CVE-2013-4238_py26.patch,
-  -files/python-2.5-tcl86.patch, -python-2.6.8-r3.ebuild, -python-2.6.9.ebuild:
-  Remove python:2.6 and relevant patches.
-
-*python-2.7.7 (28 Jun 2014)
-*python-3.4.1 (28 Jun 2014)
-
-  28 Jun 2014; Mike Gilbert <floppym@g.o> +python-2.7.7.ebuild,
-  +python-3.4.1.ebuild:
-  Version bumps.
-
-  15 Jun 2014; Akinori Hattori <hattya@g.o> python-2.7.6.ebuild:
-  ia64 stable wrt bug #504742
-
-  14 Jun 2014; Pawel Hajdan jr <phajdan.jr@g.o> python-2.7.6.ebuild:
-  x86 stable wrt bug #504742
-
-  24 May 2014; Markos Chandras <hwoarang@g.o> python-2.7.6.ebuild:
-  Stable on amd64 wrt bug #504742
-
-*python-3.2.5-r4 (10 May 2014)
-
-  10 May 2014; Mike Gilbert <floppym@g.o> +python-3.2.5-r4.ebuild,
-  python-2.7.6-r1.ebuild, python-3.3.5.ebuild, python-3.4.0.ebuild:
-  Add optional dependency on dev-tcltk/tix, bug 413393 by John Keeping.
-
-*python-2.7.6-r1 (25 Apr 2014)
-
-  25 Apr 2014; Patrick McLean <chutzpah@g.o> +python-2.7.6-r1.ebuild,
-  +files/python-2.7.6-recvfrom_into_buffer_overflow.patch:
-  Revision bump, add patch for CVE-2014-1912 (bug #500518)
-
-  06 Apr 2014; Mike Frysinger <vapier@g.o> python-2.7.6.ebuild:
-  Mark arm64/m68k/s390/sh stable.
-
-  01 Apr 2014; Markus Meier <maekke@g.o> python-2.7.6.ebuild:
-  arm stable, bug #504742
-
-  30 Mar 2014; Mike Gilbert <floppym@g.o> python-3.4.0.ebuild:
-  Update postinst message; python.eclass does not support 3.4.
-
-  28 Mar 2014; Mike Gilbert <floppym@g.o> python-3.2.5-r3.ebuild:
-  Backport readline-6.3 fixes to python-3.2.5, bug 505416.
-
-*python-3.4.0 (28 Mar 2014)
-
-  28 Mar 2014; Mike Gilbert <floppym@g.o> +python-3.4.0.ebuild:
-  Version bump. Permanently drop the 'doc' use flag.
-
-*python-3.3.5 (28 Mar 2014)
-
-  28 Mar 2014; Mike Gilbert <floppym@g.o> +python-3.3.5.ebuild:
-  Version bump.
-
-  20 Mar 2014; Jeroen Roovers <jer@g.o> python-2.7.6.ebuild:
-  Stable for HPPA (bug #504742).
-
-  18 Mar 2014; Agostino Sarubbo <ago@g.o> python-3.3.3.ebuild:
-  Stable for ia64, wrt bug #497758
-
-  16 Mar 2014; Mike Gilbert <floppym@g.o> python-2.6.9.ebuild:
-  Backport fix for bug 503180.
-
-*python-3.4.0_rc3 (15 Mar 2014)
-
-  15 Mar 2014; Mike Gilbert <floppym@g.o> +python-3.4.0_rc3.ebuild:
-  Bump.
-
-  15 Mar 2014; Mike Gilbert <floppym@g.o> python-2.7.6.ebuild:
-  Backport upstream fixes for bug 503180.
-
-  01 Mar 2014; Mike Gilbert <floppym@g.o> python-3.4.0_rc1.ebuild:
-  Disable ensurepip.
-
-*python-3.4.0_rc1 (17 Feb 2014)
-
-  17 Feb 2014; Mike Gilbert <floppym@g.o> +python-3.4.0_rc1.ebuild:
-  Version bump for testing. Thanks to Arfrever for the patches.
-
-*python-3.3.4 (17 Feb 2014)
-
-  17 Feb 2014; Mike Gilbert <floppym@g.o> +python-3.3.4.ebuild:
-  Version bump. Thanks to Arfrever for maintaining the patchset.
-
-  08 Feb 2014; Mike Gilbert <floppym@g.o> python-3.3.3.ebuild:
-  Add workaround for race condition when generating Python-ast.c and Python-
-  ast.h. Thanks to Arfrever.
-
-  05 Feb 2014; Mike Frysinger <vapier@g.o> python-3.3.3.ebuild:
-  Mark arm64/m68k/s390/sh stable.
-
-  26 Jan 2014; Agostino Sarubbo <ago@g.o> python-3.3.3.ebuild:
-  Stable for sparc, wrt bug #497758
-
-  26 Jan 2014; Agostino Sarubbo <ago@g.o> python-3.3.3.ebuild:
-  Stable for x86, wrt bug #497758
-
-  20 Jan 2014; Agostino Sarubbo <ago@g.o> python-3.3.3.ebuild:
-  Stable for ppc, wrt bug #497758
-
-  19 Jan 2014; Markus Meier <maekke@g.o> python-3.3.3.ebuild:
-  arm stable, bug #497758
-
-  19 Jan 2014; Agostino Sarubbo <ago@g.o> python-3.3.3.ebuild:
-  Stable for ppc64, wrt bug #497758
-
-  18 Jan 2014; Agostino Sarubbo <ago@g.o> python-3.3.3.ebuild:
-  Stable for alpha, wrt bug #497758
-
-  18 Jan 2014; Pacho Ramos <pacho@g.o> python-3.3.3.ebuild:
-  amd64 stable, bug #497758
-
-  18 Jan 2014; Mike Frysinger <vapier@g.o> python-2.7.6.ebuild:
-  Fix cross-compiling tests that try to read /dev/ paths.
-
-  18 Jan 2014; Mike Frysinger <vapier@g.o> python-2.7.5-r3.ebuild,
-  python-2.7.5-r4.ebuild, python-2.7.6.ebuild, python-3.3.2-r2.ebuild,
-  python-3.3.3.ebuild:
-  Add arm64 love.
-
-  16 Jan 2014; Mike Frysinger <vapier@g.o> python-3.3.2-r2.ebuild:
-  Mark m68k/s390/sh stable.
-
-  15 Jan 2014; Agostino Sarubbo <ago@g.o> python-3.3.2-r2.ebuild:
-  Stable for ia64, wrt bug #474128
-
-  11 Jan 2014; Jeroen Roovers <jer@g.o> python-3.3.3.ebuild:
-  Stable for HPPA (bug #497758).
-
-  05 Jan 2014; Agostino Sarubbo <ago@g.o> python-3.3.2-r2.ebuild:
-  Stable for ppc64, wrt bug #474128
-
-  05 Jan 2014; Agostino Sarubbo <ago@g.o> python-3.3.2-r2.ebuild:
-  Stable for ppc, wrt bug #474128
-
-  30 Dec 2013; Mike Gilbert <floppym@g.o> python-2.6.8-r3.ebuild,
-  python-2.6.9.ebuild, python-2.7.5-r3.ebuild, python-2.7.5-r4.ebuild,
-  python-2.7.6.ebuild, python-3.2.5-r3.ebuild, python-3.3.2-r2.ebuild,
-  python-3.3.3.ebuild:
-  Don't die on broken sem_open if threads flag is disabled.
-
-  30 Dec 2013; Mike Gilbert <floppym@g.o> python-2.6.8-r3.ebuild,
-  python-2.6.9.ebuild, python-2.7.5-r3.ebuild, python-2.7.5-r4.ebuild,
-  python-2.7.6.ebuild, python-3.2.5-r3.ebuild, python-3.3.2-r2.ebuild,
-  python-3.3.3.ebuild:
-  Die if sem_open is detected as broken, bug 496328.
-
-  26 Dec 2013; Markus Meier <maekke@g.o> python-3.3.2-r2.ebuild:
-  arm stable, bug #474128
-
-*python-2.6.9 (25 Dec 2013)
-
-  25 Dec 2013; Mike Gilbert <floppym@g.o> +python-2.6.9.ebuild:
-  Bump for security bug 495224.
-
-  15 Dec 2013; Agostino Sarubbo <ago@g.o> python-3.3.2-r2.ebuild:
-  Stable for sparc, wrt bug #474128
-
-  13 Dec 2013; Matt Turner <mattst88@g.o> python-3.3.2-r2.ebuild:
-  alpha stable, bug 474128.
-
-  08 Dec 2013; Pacho Ramos <pacho@g.o> python-3.3.2-r2.ebuild:
-  x86 stable, bug #474128
-
-  07 Dec 2013; Mike Frysinger <vapier@g.o> python-2.7.6.ebuild,
-  python-3.3.3.ebuild:
-  Drop redundant die statements with EAPI=4.
-
-*python-2.7.6 (01 Dec 2013)
-
-  01 Dec 2013; Mike Gilbert <floppym@g.o> +python-2.7.6.ebuild:
-  Version bump. Thanks to Arfrever for the patches.
-
-  30 Nov 2013; Jeroen Roovers <jer@g.o> python-3.3.2-r2.ebuild:
-  Stable for HPPA (bug #474128).
-
-  30 Nov 2013; Pacho Ramos <pacho@g.o> python-3.3.2-r2.ebuild:
-  amd64 stable, bug #474128
-
-  23 Nov 2013; Jeroen Roovers <jer@g.o> python-3.3.2-r2.ebuild,
-  python-3.3.3.ebuild:
-  Typo.
-
-  23 Nov 2013; Mike Gilbert <floppym@g.o> python-3.3.2-r2.ebuild,
-  python-3.3.3.ebuild:
-  Update the postinst upgrade message.
-
-*python-3.3.3 (21 Nov 2013)
-
-  21 Nov 2013; Mike Gilbert <floppym@g.o> +python-3.3.3.ebuild:
-  Version bump. Thanks to Arfrever for maintaining the patchset.
-
-*python-2.7.5-r4 (26 Oct 2013)
-
-  26 Oct 2013; Mike Gilbert <floppym@g.o>
-  +files/python-2.7-issue18851.patch, +python-2.7.5-r4.ebuild:
-  Apply patch to fix regression in subprocess module, bug 489378.
-
-*python-2.7.5-r3 (16 Oct 2013)
-*python-3.2.5-r3 (16 Oct 2013)
-
-  16 Oct 2013; Mike Gilbert <floppym@g.o>
-  +files/python-2.7-issue16248.patch, +files/python-3.2-issue16248.patch,
-  +python-2.7.5-r3.ebuild, +python-3.2.5-r3.ebuild, -python-2.7.5-r2.ebuild,
-  -python-3.2.5-r2.ebuild:
-  Apply upstream fix for regression in Tkinter, bug 488208 by jlec.
-
-  10 Oct 2013; Dirkjan Ochtman <djc@g.o> -files/python-3.2.3-x32.patch,
-  -python-2.6.8-r1.ebuild, -python-2.6.8-r2.ebuild, -python-2.7.3-r2.ebuild,
-  -python-2.7.3-r3.ebuild, -python-2.7.5-r1.ebuild, -python-2.7.5.ebuild,
-  -python-3.2.3-r1.ebuild, -python-3.2.3-r2.ebuild, -python-3.2.3.ebuild,
-  -python-3.2.4.ebuild, -python-3.2.5-r1.ebuild, -python-3.2.5.ebuild,
-  -python-3.3.1.ebuild, -python-3.3.2-r1.ebuild, -python-3.3.2.ebuild:
-  Remove old versions of python.
-
-  26 Sep 2013; Mike Gilbert <floppym@g.o>
-  +files/python-2.7.5-nonfatal-compileall.patch, python-2.7.5-r2.ebuild:
-  Apply cross-compile fixes to python-2.7.5.
-
-  26 Sep 2013; Mike Gilbert <floppym@g.o> python-3.3.2-r2.ebuild:
-  Fix/simplify cross-compiles.
-
-  26 Sep 2013; Mike Gilbert <floppym@g.o> python-3.3.2-r2.ebuild:
-  Depend on xz-utils (_lzma module).
-
-  05 Sep 2013; Mike Gilbert <floppym@g.o>
-  -files/CVE-2013-4238_py32.patch:
-  Drop another patch.
-
-  05 Sep 2013; Michał Górny <mgorny@g.o> -files/linux2.patch,
-  -files/python-2.4.4-test-cross.patch, -files/python-2.5-cross-printf.patch,
-  -files/python-2.6-chflags-cross.patch, -files/python-2.6-test-cross.patch,
-  -files/python-3-distutils-egg-utf8.patch, -files/python-3.2-soname_typo.patch,
-  -python-2.5.4-r5.ebuild, -python-2.5.4-r6.ebuild, -python-3.1.5-r1.ebuild,
-  -python-3.1.5.ebuild:
-  Remove Python 2.5 and 3.1. Purge old patches.
-
-  05 Sep 2013; Mike Gilbert <floppym@g.o> python-3.3.2-r2.ebuild:
-  Disable network tests, bug 483656.
-
-  28 Aug 2013; Mike Gilbert <floppym@g.o> python-2.7.3-r2.ebuild,
-  python-2.7.3-r3.ebuild, python-2.7.5-r1.ebuild, python-2.7.5-r2.ebuild,
-  python-2.7.5.ebuild, python-3.2.3-r1.ebuild, python-3.2.3-r2.ebuild,
-  python-3.2.3.ebuild, python-3.2.4.ebuild, python-3.2.5-r1.ebuild,
-  python-3.2.5-r2.ebuild, python-3.2.5.ebuild, python-3.3.1.ebuild,
-  python-3.3.2-r1.ebuild, python-3.3.2-r2.ebuild, python-3.3.2.ebuild:
-  Drop extensions usedep from sqlite dep; sqlite is dropping the use flag.
-
-  26 Aug 2013; Michał Górny <mgorny@g.o> python-2.5.4-r6.ebuild:
-  Replace internal eclass functions with a simple sed.
-
-  23 Aug 2013; Agostino Sarubbo <ago@g.o> python-2.6.8-r3.ebuild,
-  python-2.7.5-r2.ebuild, python-3.2.5-r2.ebuild:
-  Stable for sparc, wrt bug #480856
-
-  23 Aug 2013; Agostino Sarubbo <ago@g.o> python-2.6.8-r3.ebuild,
-  python-2.7.5-r2.ebuild, python-3.2.5-r2.ebuild:
-  Stable for sh, wrt bug #480856
-
-  23 Aug 2013; Agostino Sarubbo <ago@g.o> python-2.6.8-r3.ebuild,
-  python-2.7.5-r2.ebuild, python-3.2.5-r2.ebuild:
-  Stable for s390, wrt bug #480856
-
-  23 Aug 2013; Agostino Sarubbo <ago@g.o> python-2.6.8-r3.ebuild,
-  python-2.7.5-r2.ebuild, python-3.2.5-r2.ebuild:
-  Stable for ppc, wrt bug #480856
-
-  23 Aug 2013; Agostino Sarubbo <ago@g.o> python-2.6.8-r3.ebuild,
-  python-2.7.5-r2.ebuild, python-3.2.5-r2.ebuild:
-  Stable for ppc64, wrt bug #480856
-
-  23 Aug 2013; Agostino Sarubbo <ago@g.o> python-2.6.8-r3.ebuild,
-  python-2.7.5-r2.ebuild, python-3.2.5-r2.ebuild:
-  Stable for ia64, wrt bug #480856
-
-  23 Aug 2013; Agostino Sarubbo <ago@g.o> python-2.6.8-r3.ebuild,
-  python-2.7.5-r2.ebuild, python-3.2.5-r2.ebuild:
-  Stable for arm, wrt bug #480856
-
-  23 Aug 2013; Agostino Sarubbo <ago@g.o> python-2.6.8-r3.ebuild,
-  python-2.7.5-r2.ebuild, python-3.2.5-r2.ebuild:
-  Stable for alpha, wrt bug #480856
-
-  23 Aug 2013; Agostino Sarubbo <ago@g.o> python-2.6.8-r3.ebuild,
-  python-2.7.5-r2.ebuild, python-3.2.5-r2.ebuild:
-  Stable for x86, wrt bug #480856
-
-  23 Aug 2013; Agostino Sarubbo <ago@g.o> python-2.6.8-r3.ebuild,
-  python-2.7.5-r2.ebuild, python-3.2.5-r2.ebuild:
-  Stable for amd64, wrt bug #480856
-
-  20 Aug 2013; Jeroen Roovers <jer@g.o> python-2.6.8-r3.ebuild,
-  python-2.7.5-r2.ebuild, python-3.2.5-r2.ebuild:
-  Stable for HPPA (bug #480856).
-
-*python-2.7.5-r2 (18 Aug 2013)
-*python-3.2.5-r2 (18 Aug 2013)
-*python-2.6.8-r3 (18 Aug 2013)
-
-  18 Aug 2013; Mike Gilbert <floppym@g.o>
-  +files/CVE-2013-4238_py26.patch, +files/CVE-2013-4238_py27.patch,
-  +files/CVE-2013-4238_py32.patch, +files/CVE-2013-4238_py33.patch,
-  +python-2.6.8-r3.ebuild, +python-2.7.5-r2.ebuild, +python-3.2.5-r2.ebuild,
-  -files/CVE-2013-4073_py33.patch, python-3.3.2-r2.ebuild:
-  Apply fix for CVE-2013-4238, bug 480856.
-
-*python-3.3.2-r2 (18 Aug 2013)
-
-  18 Aug 2013; Mike Gilbert <floppym@g.o>
-  +files/CVE-2013-4073_py33.patch, +python-3.3.2-r2.ebuild:
-  Use Arfrever's patchset, bug 354877. Apply fix for CVS-2013-4238, bug 480856.
-
-  06 Aug 2013; Agostino Sarubbo <ago@g.o> python-2.7.5.ebuild:
-  Stable for s390, wrt bug #475424
-
-  06 Aug 2013; Agostino Sarubbo <ago@g.o> python-3.2.5-r1.ebuild:
-  Stable for s390, wrt bug #469988
-
-  03 Aug 2013; Agostino Sarubbo <ago@g.o> python-2.7.5.ebuild:
-  Stable for sparc, wrt bug #475424
-
-  22 Jul 2013; Agostino Sarubbo <ago@g.o> python-3.2.5-r1.ebuild:
-  Stable for sparc, wrt bug #469988
-
-  21 Jul 2013; Agostino Sarubbo <ago@g.o> python-3.2.5-r1.ebuild:
-  Stable for sh, wrt bug #469988
-
-*python-2.7.5-r1 (12 Jul 2013)
-
-  12 Jul 2013; Mike Gilbert <floppym@g.o>
-  +files/python-2.7.5-re_unsigned_ptrdiff.patch, +python-2.7.5-r1.ebuild:
-  Apply patch to fix regex crash, bug 476426 by Fabio Rossi.
-
-  07 Jul 2013; Agostino Sarubbo <ago@g.o> python-3.2.5-r1.ebuild:
-  Stable for ia64, wrt bug #469988
-
-  07 Jul 2013; Agostino Sarubbo <ago@g.o> python-2.7.5.ebuild:
-  Stable for ia64, wrt bug #475424
-
-  07 Jul 2013; Agostino Sarubbo <ago@g.o> python-3.2.5-r1.ebuild:
-  Stable for arm, wrt bug #469988
-
-  07 Jul 2013; Agostino Sarubbo <ago@g.o> python-2.7.5.ebuild:
-  Stable for arm, wrt bug #475424
-
-  06 Jul 2013; Mike Gilbert <floppym@g.o> -python-2.7.4.ebuild:
-  Remove old.
-
-  06 Jul 2013; Mike Gilbert <floppym@g.o> python-2.7.5.ebuild:
-  Move uclibc test removal after everything else, bug 475972.
-
-  06 Jul 2013; Agostino Sarubbo <ago@g.o> python-3.2.5-r1.ebuild:
-  Stable for alpha, wrt bug #469988
-
-  04 Jul 2013; Agostino Sarubbo <ago@g.o> python-3.2.5-r1.ebuild:
-  Stable for ppc64, wrt bug #469988
-
-  04 Jul 2013; Jeroen Roovers <jer@g.o> python-3.2.5-r1.ebuild:
-  Stable for HPPA (bug #469988).
-
-  04 Jul 2013; Agostino Sarubbo <ago@g.o> python-2.7.5.ebuild:
-  Stable for ppc64, wrt bug #475424
-
-  04 Jul 2013; Agostino Sarubbo <ago@g.o> python-3.2.5-r1.ebuild:
-  Stable for ppc, wrt bug #469988
-
-  04 Jul 2013; Agostino Sarubbo <ago@g.o> python-2.7.5.ebuild:
-  Stable for ppc, wrt bug #475424
-
-  03 Jul 2013; Agostino Sarubbo <ago@g.o> python-3.2.5-r1.ebuild:
-  Stable for x86, wrt bug #469988
-
-  03 Jul 2013; Agostino Sarubbo <ago@g.o> python-3.2.5-r1.ebuild:
-  Stable for amd64, wrt bug #469988
-
-*python-3.2.5-r1 (03 Jul 2013)
-*python-3.3.2-r1 (03 Jul 2013)
-
-  03 Jul 2013; Mike Gilbert <floppym@g.o>
-  +files/python-3.2-CVE-2013-2099.patch, +files/python-3.3-CVE-2013-2099.patch,
-  +python-3.2.5-r1.ebuild, +python-3.3.2-r1.ebuild:
-  Add patch to fix CVE-2013-2099, bug 469988.
-
-  02 Jul 2013; Jeroen Roovers <jer@g.o> python-2.7.5.ebuild:
-  Stable for HPPA (bug #475424).
-
-  02 Jul 2013; Tobias Klausmann <klausman@g.o> python-2.7.5.ebuild:
-  Stable on alpha, bug #475424
-
-  02 Jul 2013; Agostino Sarubbo <ago@g.o> python-2.7.5.ebuild:
-  Stable for x86, wrt bug #475424
-
-  02 Jul 2013; Agostino Sarubbo <ago@g.o> python-2.7.5.ebuild:
-  Stable for amd64, wrt bug #475424
-
-*python-2.6.8-r2 (30 Jun 2013)
-*python-2.5.4-r6 (30 Jun 2013)
-
-  30 Jun 2013; Mike Gilbert <floppym@g.o> +files/python-2.5-tcl86.patch,
-  +python-2.5.4-r6.ebuild, +python-2.6.8-r2.ebuild:
-  Apply patch to allow old python versions to use tk-8.6, bug 454342. Also fix
-  the python shebang in idle2.5 and pydoc2.5, bugs 275241 and 383009.
-
-  30 Jun 2013; Mike Gilbert <floppym@g.o> -python-2.5.4-r4.ebuild,
-  -python-2.6.8.ebuild, python-2.5.4-r5.ebuild, python-2.6.8-r1.ebuild:
-  Place upper bound on dev-lang/tk dep, bug 454342. Also stabilize on m68k since
-  nobody is responding on bug 458318.
-
-  28 Jun 2013; Mike Gilbert <floppym@g.o>
-  +files/python-2.7.5-library-path.patch, python-2.7.5.ebuild:
-  Fix library paths when not cross-compiling. Should resolve bug 474882. Thanks
-  to Arfrever for finding the upstream commit.
-
-*python-2.7.5 (25 May 2013)
-*python-3.2.5 (25 May 2013)
-
-  25 May 2013; Mike Gilbert <floppym@g.o> +python-2.7.5.ebuild,
-  +python-3.2.5.ebuild, python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild,
-  python-3.2.3-r2.ebuild:
-  Version bump. Also resolves bug 462288 and 471124.
-
-*python-3.3.2 (21 May 2013)
-
-  21 May 2013; Patrick McLean <chutz@g.o> -python-3.3.0.ebuild,
-  -python-3.3.0-r1.ebuild, +python-3.3.2.ebuild:
-  Version bump to 3.3.2, clean out old 3.3 versions preparing for unmasking.
-
-  18 May 2013; Magnus Granberg <zorry@g.o> python-2.7.4.ebuild,
-  python-3.2.4.ebuild, python-3.3.1.ebuild:
-  Add fix to support pax emutramp on libffi
-
-  09 May 2013; Mike Gilbert <floppym@g.o> python-2.7.4.ebuild:
-  Don't build the 'maninstall' target; this installs generic symlinks python.1
-  and python2.1, which we manage using eselect-python. Bug 469148 by Alphat-PC.
-
-  09 May 2013; Michał Górny <mgorny@g.o> python-2.5.4-r5.ebuild,
-  python-2.6.8-r1.ebuild, python-2.7.4.ebuild, python-3.1.5-r1.ebuild,
-  python-3.2.4.ebuild, python-3.3.1.ebuild:
-  Add epatch_user wrt bug #447714.
-
-  01 May 2013; Mike Gilbert <floppym@g.o> python-3.2.4.ebuild:
-  Enable byte-compilation during tests.
-
-  01 May 2013; Mike Gilbert <floppym@g.o> python-2.7.4.ebuild,
-  python-3.2.4.ebuild:
-  Use Arfrever's patches. Remove some unnecessary || die.
-
-  28 Apr 2013; Patrick McLean <chutzpah@g.o> python-3.3.1.ebuild:
-  Re-add patch from Arfrever to fix compilation on non-UTF-8 platforms, drop
-  patches that are no longer needed.
-
-*python-3.3.1 (28 Apr 2013)
-
-  28 Apr 2013; Patrick McLean <chutzpah@g.o> +python-3.3.1.ebuild:
-  Version bump. Add new patch to fix import tests from Arferver.
-
-*python-3.2.4 (27 Apr 2013)
-
-  27 Apr 2013; Mike Gilbert <floppym@g.o> +python-3.2.4.ebuild:
-  Version bump. Fails tests at the moment.
-
-  27 Apr 2013; Mike Gilbert <floppym@g.o> python-2.7.4.ebuild:
-  Downgrade to EAPI 4.
-
-  27 Apr 2013; Mike Gilbert <floppym@g.o> python-2.7.4.ebuild:
-  Increment patchset.
-
-  13 Apr 2013; Agostino Sarubbo <ago@g.o> python-2.5.4-r5.ebuild,
-  python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild,
-  python-3.2.3-r2.ebuild:
-  Stable for s390, wrt bug #458318
-
-  07 Apr 2013; Mike Gilbert <floppym@g.o> python-2.7.4.ebuild:
-  Adjust the sys-libs/db dep and add some || die.
-
-  07 Apr 2013; Michał Górny <mgorny@g.o> python-2.6.8-r1.ebuild,
-  python-2.7.3-r3.ebuild, python-2.7.4.ebuild:
-  Fix wininst removal typo. Fixes bug #462862.
-
-*python-2.7.4 (07 Apr 2013)
-
-  07 Apr 2013; Mike Gilbert <floppym@g.o> +python-2.7.4.ebuild:
-  Version bump.
-
-  31 Mar 2013; Agostino Sarubbo <ago@g.o> python-2.5.4-r5.ebuild,
-  python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild,
-  python-3.2.3-r2.ebuild:
-  Stable for sh, wrt bug #458318
-
-  31 Mar 2013; Agostino Sarubbo <ago@g.o> python-2.5.4-r5.ebuild,
-  python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild,
-  python-3.2.3-r2.ebuild:
-  Stable for sparc, wrt bug #458318
-
-  28 Mar 2013; Agostino Sarubbo <ago@g.o> python-2.5.4-r5.ebuild,
-  python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild,
-  python-3.2.3-r2.ebuild:
-  Stable for ia64, wrt bug #458318
-
-  26 Mar 2013; Mike Frysinger <vapier@g.o> python-2.6.8-r1.ebuild,
-  python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild, python-3.2.3-r2.ebuild,
-  python-3.3.0-r1.ebuild:
-  When cross-compiling, run the configures in parallel for a nice speed up
-  #462264 by SpanKY.
-
-  24 Mar 2013; Mike Gilbert <floppym@g.o> python-3.3.0-r1.ebuild,
-  python-3.3.0.ebuild:
-  Add hard blocker on <sys-apps/sandbox-2.6-r1 to ensure we don't hit bug
-  364877.
-
-  23 Mar 2013; Agostino Sarubbo <ago@g.o> python-2.5.4-r5.ebuild,
-  python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild,
-  python-3.2.3-r2.ebuild:
-  Stable for alpha, wrt bug #458318
-
-  23 Mar 2013; Agostino Sarubbo <ago@g.o> python-2.5.4-r5.ebuild,
-  python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild,
-  python-3.2.3-r2.ebuild:
-  Stable for arm, wrt bug #458318
-
-  21 Mar 2013; Jeroen Roovers <jer@g.o> python-2.5.4-r5.ebuild,
-  python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild,
-  python-3.2.3-r2.ebuild:
-  Stable for HPPA (bug #458318).
-
-  19 Mar 2013; Mike Frysinger <vapier@g.o> python-2.7.3-r3.ebuild,
-  python-3.2.3-r2.ebuild, python-3.3.0-r1.ebuild:
-  Install the python gdb module in the right place #443510 by Jan Pobrislo.
-
-  19 Mar 2013; Mike Frysinger <vapier@g.o> python-2.7.3-r2.ebuild,
-  python-2.7.3-r3.ebuild, python-3.2.3-r1.ebuild, python-3.2.3-r2.ebuild,
-  python-3.2.3.ebuild, python-3.3.0-r1.ebuild, python-3.3.0.ebuild:
-  Export ac_cv_have_long_long_format=yes when cross-compiling #362945 by
-  Patrick.
-
-  19 Mar 2013; Mike Frysinger <vapier@g.o> python-2.7.3-r2.ebuild,
-  python-2.7.3-r3.ebuild, python-3.2.3-r1.ebuild, python-3.2.3-r2.ebuild,
-  python-3.2.3.ebuild, python-3.3.0-r1.ebuild, python-3.3.0.ebuild:
-  Set ac_cv_buggy_getaddrinfo=no when cross-compiling.
-
-  19 Mar 2013; Mike Frysinger <vapier@g.o> python-2.5.4-r4.ebuild,
-  python-2.5.4-r5.ebuild, python-2.6.8-r1.ebuild, python-2.6.8.ebuild,
-  python-2.7.3-r2.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild,
-  python-3.1.5.ebuild, python-3.2.3-r1.ebuild, python-3.2.3-r2.ebuild,
-  python-3.2.3.ebuild, python-3.3.0-r1.ebuild, python-3.3.0.ebuild:
-  Add hardened to IUSE since we `use` it #447264 by Alphat-PC.
-
-  18 Mar 2013; Agostino Sarubbo <ago@g.o> python-2.5.4-r5.ebuild,
-  python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild,
-  python-3.2.3-r2.ebuild:
-  Stable for ppc64, wrt bug #458318
-
-  18 Mar 2013; Agostino Sarubbo <ago@g.o> python-2.5.4-r5.ebuild,
-  python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild,
-  python-3.2.3-r2.ebuild:
-  Stable for ppc, wrt bug #458318
-
-  18 Mar 2013; Agostino Sarubbo <ago@g.o> python-2.5.4-r5.ebuild,
-  python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild,
-  python-3.2.3-r2.ebuild:
-  Stable for x86, wrt bug #458318
-
-  18 Mar 2013; Agostino Sarubbo <ago@g.o> python-2.5.4-r5.ebuild,
-  python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild,
-  python-3.2.3-r2.ebuild:
-  Stable for amd64, wrt bug #458318
-
-  19 Dec 2012; Mike Gilbert <floppym@g.o> python-2.5.4-r5.ebuild,
-  python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild,
-  python-3.2.3-r2.ebuild, python-3.3.0-r1.ebuild:
-  Don't depend on dev-lang/python. Bug 447752.
-
-  03 Dec 2012; Mike Gilbert <floppym@g.o> python-2.5.4-r5.ebuild:
-  Copy eselect_python logic from more recent ebuilds.
-
-  02 Dec 2012; Michał Górny <mgorny@g.o> python-2.5.4-r5.ebuild,
-  python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild,
-  python-3.2.3-r2.ebuild, python-3.3.0-r1.ebuild:
-  Stop renaming python-config wrt bug #445592. Keep a symlink for compatibility.
-
-  01 Dec 2012; Michał Górny <mgorny@g.o> python-2.5.4-r5.ebuild,
-  python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild,
-  python-3.2.3-r2.ebuild, python-3.3.0-r1.ebuild:
-  Use python-any-r1 to clearly enforce build-time Python dependency.
-
-  30 Nov 2012; Michał Górny <mgorny@g.o> python-2.5.4-r5.ebuild,
-  python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild,
-  python-3.2.3-r2.ebuild, python-3.3.0-r1.ebuild:
-  Fix byte-compiling the installed epython module when installing a new Python
-  version.
-
-*python-2.7.3-r3 (30 Nov 2012)
-*python-3.3.0-r1 (30 Nov 2012)
-*python-2.6.8-r1 (30 Nov 2012)
-*python-2.5.4-r5 (30 Nov 2012)
-*python-3.2.3-r2 (30 Nov 2012)
-*python-3.1.5-r1 (30 Nov 2012)
-
-  30 Nov 2012; Michał Górny <mgorny@g.o> +python-2.5.4-r5.ebuild,
-  +python-2.6.8-r1.ebuild, +python-2.7.3-r3.ebuild, +python-3.1.5-r1.ebuild,
-  +python-3.2.3-r2.ebuild, +python-3.3.0-r1.ebuild:
-  Introduce a cleaned up, -r1-quality Python ebuilds. Stop using python.eclass,
-  install epython module for python-exec.
-
-  14 Oct 2012; Raúl Porcel <armin76@g.o> python-3.1.5.ebuild:
-  ia64/m68k/s390/sh/sparc stable
-
-  06 Oct 2012; Markus Meier <maekke@g.o> python-3.1.5.ebuild:
-  arm stable, bug #427544
-
-  02 Oct 2012; Jeroen Roovers <jer@g.o> python-3.1.5.ebuild:
-  Stable for HPPA (bug #427548).
-
-  02 Oct 2012; Jeroen Roovers <jer@g.o> python-3.2.3-r1.ebuild:
-  Stable for HPPA (bug #427548).
-
-  02 Oct 2012; Mike Gilbert <floppym@g.o> python-3.3.0.ebuild:
-  Bump patchset revision for bug 436904. Drop wide-unicode use flag.
-
-  30 Sep 2012; Raúl Porcel <armin76@g.o> python-3.2.3.ebuild:
-  alpha/ia64/m68k/s390/sh/sparc stable wrt #427548
-
-  30 Sep 2012; Dirkjan Ochtman <djc@g.o> python-3.3.0.ebuild:
-  Fix 3.3 slot.
-
-  30 Sep 2012; Dirkjan Ochtman <djc@g.o> -python-2.6.6-r2.ebuild,
-  -python-2.6.7-r2.ebuild, -python-2.7.2-r3.ebuild, -python-2.7.3.ebuild,
-  -python-2.7.3-r1.ebuild, -python-3.1.4-r3.ebuild, -python-3.1.4-r4.ebuild,
-  -python-3.2.2.ebuild, -python-3.2.2-r1.ebuild:
-  Remove old versions.
-
-*python-3.3.0 (30 Sep 2012)
-
-  30 Sep 2012; Dirkjan Ochtman <djc@g.o> +python-3.3.0.ebuild:
-  Add tentative python-3.3 ebuild. Some tests still fail.
-
-  27 Sep 2012; Matt Turner <mattst88@g.o> python-3.1.5.ebuild,
-  python-3.2.3-r1.ebuild:
-  Stable on alpha, bug 427548.
-
-  03 Aug 2012; Anthony G. Basile <blueness@g.o> python-3.2.3.ebuild:
-  Stable arm, bug #427548
-
-  30 Jul 2012; Mike Frysinger <vapier@g.o> python-2.5.4-r4.ebuild,
-  python-2.6.6-r2.ebuild, python-2.6.7-r2.ebuild, python-2.6.8.ebuild,
-  python-2.7.2-r3.ebuild, python-2.7.3-r1.ebuild, python-2.7.3-r2.ebuild,
-  python-2.7.3.ebuild, python-3.1.4-r3.ebuild, python-3.1.4-r4.ebuild,
-  python-3.1.5.ebuild, python-3.2.2-r1.ebuild, python-3.2.2.ebuild,
-  python-3.2.3-r1.ebuild, python-3.2.3.ebuild:
-  Make sure $PKG_CONFIG is respected.
-
-  29 Jul 2012; Raúl Porcel <armin76@g.o> python-2.7.3-r2.ebuild:
-  alpha/ia64/m68k/s390/sh/sparc stable wrt #419575
-
-  03 Jul 2012; Brent Baude <ranger@g.o> python-2.7.3-r2.ebuild:
-  Marking python-2.7.3-r2 ppc for bug 419575
-
-  22 Jun 2012; Brent Baude <ranger@g.o> python-2.7.3-r2.ebuild:
-  Marking python-2.7.3-r2 ppc64 for bug 419575
-
-  17 Jun 2012; Markus Meier <maekke@g.o> python-2.7.3-r2.ebuild:
-  arm stable, bug #419575
-
-  17 Jun 2012; Jeff Horelick <jdhore@g.o> python-2.7.3-r2.ebuild:
-  marked x86 per bug 419575
-
-  14 Jun 2012; Jeroen Roovers <jer@g.o> python-2.7.3-r2.ebuild:
-  Stable for HPPA (bug #419575).
-
-  11 Jun 2012; Agostino Sarubbo <ago@g.o> python-2.7.3-r2.ebuild:
-  Stable for amd64, wrt bug #419575
-
-  04 Jun 2012; Mike Frysinger <vapier@g.o> +files/python-3.2.3-x32.patch,
-  python-3.2.3.ebuild, python-3.2.3-r1.ebuild:
-  Fix posix subprocess module on x32.
-
-  26 May 2012; Raúl Porcel <armin76@g.o> python-2.6.8.ebuild,
-  python-2.7.3-r1.ebuild:
-  ia64/m68k/s390/sh/sparc stable wrt #396329
-
-  26 May 2012; Markus Meier <maekke@g.o> python-2.6.8.ebuild,
-  python-2.7.3-r1.ebuild:
-  arm stable, bug #396329
-
-  17 May 2012; Jeff Horelick <jdhore@g.o> python-2.6.8.ebuild,
-  python-2.7.3-r1.ebuild, python-3.1.5.ebuild, python-3.2.3.ebuild:
-  marked x86 per bug 396329
-
-  15 May 2012; Jeroen Roovers <jer@g.o> python-3.1.4-r3.ebuild,
-  python-3.1.5.ebuild, python-3.2.2.ebuild, python-3.2.3.ebuild:
-  Marked ~hppa until it is ready.
-
-  15 May 2012; Jeroen Roovers <jer@g.o> python-2.6.8.ebuild,
-  python-3.1.5.ebuild, python-3.2.3.ebuild:
-  Stable for HPPA (bug #396329).
-
-  14 May 2012; Jeroen Roovers <jer@g.o> python-2.7.3-r1.ebuild:
-  Stable for HPPA (bug #396329).
-
-  14 May 2012; Mark Loeser <halcy0n@g.o> python-2.6.8.ebuild,
-  python-2.7.3-r1.ebuild, python-3.1.5.ebuild, python-3.2.3.ebuild:
-  Stable for ppc/ppc64; bug #369329
-
-  14 May 2012; Agostino Sarubbo <ago@g.o> python-2.6.8.ebuild,
-  python-2.7.3-r1.ebuild, python-3.1.5.ebuild, python-3.2.3.ebuild:
-  Stable for amd64, wrt bug #396329
-
-  12 May 2012; Tobias Klausmann <klausman@g.o> python-2.6.8.ebuild:
-  Stable on alpha, bug #396329
-
-  12 May 2012; Tobias Klausmann <klausman@g.o> python-2.7.3-r1.ebuild:
-  Stable on alpha, bug #396329
-
-  03 May 2012; Jeff Horelick <jdhore@g.o> python-2.5.4-r4.ebuild,
-  python-2.6.6-r2.ebuild, python-2.6.7-r2.ebuild, python-2.6.8.ebuild,
-  python-2.7.2-r3.ebuild, python-2.7.3.ebuild, python-2.7.3-r1.ebuild,
-  python-2.7.3-r2.ebuild, python-3.1.4-r3.ebuild, python-3.1.4-r4.ebuild,
-  python-3.1.5.ebuild, python-3.2.2.ebuild, python-3.2.2-r1.ebuild,
-  python-3.2.3.ebuild, python-3.2.3-r1.ebuild:
-  dev-util/pkgconfig -> virtual/pkgconfig
-
-  03 May 2012; Mike Gilbert <floppym@g.o> python-3.2.3-r1.ebuild:
-  Revert to previous patchset due to bug 414333.
-
-  01 May 2012; Mike Gilbert <floppym@g.o> +python-2.7.3-r2.ebuild,
-  +python-3.2.3-r1.ebuild:
-  Restore ebuilds now that mirrors have the files.
-
-  01 May 2012; Mike Gilbert <floppym@g.o> -python-2.7.3-r2.ebuild,
-  -python-3.2.3-r1.ebuild:
-  Drop ebuilds until the patchsets get mirrored.
-
-*python-3.2.3-r1 (01 May 2012)
-*python-2.7.3-r2 (01 May 2012)
-
-  01 May 2012; Mike Gilbert <floppym@g.o> +python-2.7.3-r2.ebuild,
-  +python-3.2.3-r1.ebuild:
-  Drop several patches that upstream has not accepted.
-
-  28 Apr 2012; Mike Gilbert <floppym@g.o> python-2.6.8.ebuild,
-  python-2.7.3-r1.ebuild, python-3.1.5.ebuild, python-3.2.3.ebuild:
-  Document reason for pax marking. Bug 413751.
-
-  28 Apr 2012; Mike Gilbert <floppym@g.o> python-2.6.8.ebuild,
-  python-2.7.3-r1.ebuild, python-3.1.5.ebuild, python-3.2.3.ebuild:
-  Drop sys-apps/paxctl dep and restore fbsd keywords. Bug 413671 should be
-  resolved by not calling pax-mark on libpython.
-
-  28 Apr 2012; Alexis Ballier <aballier@g.o> python-2.6.8.ebuild,
-  python-2.7.3-r1.ebuild, python-3.1.5.ebuild, python-3.2.3.ebuild:
-  remove fbsd keywords on ebuilds depending on sys-apps/paxctl which doesnt
-  build and isnt keyworded
-
-  26 Apr 2012; Mike Gilbert <floppym@g.o> python-2.6.8.ebuild,
-  python-2.7.3-r1.ebuild, python-3.1.5.ebuild, python-3.2.3.ebuild:
-  Restore djc's fix for bug 368207.
-
-  26 Apr 2012; Mike Gilbert <floppym@g.o> python-2.6.8.ebuild,
-  python-2.7.3-r1.ebuild, python-3.1.5.ebuild, python-3.2.3.ebuild:
-  Don't pax-mark libpython.so. Bug 413671.
-
-  26 Apr 2012; Mike Gilbert <floppym@g.o> python-2.6.8.ebuild,
-  python-2.7.3-r1.ebuild, python-3.1.5.ebuild, python-3.2.3.ebuild:
-  Re-add dependency on sys-apps/paxctl due to bug 413671.
-
-*python-3.1.5 (26 Apr 2012)
-*python-2.7.3-r1 (26 Apr 2012)
-*python-3.2.3 (26 Apr 2012)
-*python-2.6.8 (26 Apr 2012)
-
-  26 Apr 2012; Mike Gilbert <floppym@g.o> +python-2.6.8.ebuild,
-  +python-2.7.3-r1.ebuild, +python-3.1.5.ebuild, +python-3.2.3.ebuild:
-  Version bumps for security bug 396329. Ebuilds and patchsets based on work by
-  Arfrever in Progress overlay.
-
-  26 Apr 2012; Alexis Ballier <aballier@g.o> python-3.2.2-r1.ebuild:
-  keyword ~amd64-fbsd
-
-  26 Apr 2012; Alexis Ballier <aballier@g.o> python-2.7.3.ebuild:
-  keyword ~amd64-fbsd
-
-*python-2.7.3 (12 Apr 2012)
-
-  12 Apr 2012; Dirkjan Ochtman <djc@g.o> +python-2.7.3.ebuild:
-  Version bump to 2.7.3, addressing bugs 368207, 301691.
-
-*python-3.1.4-r4 (21 Mar 2012)
-*python-3.2.2-r1 (21 Mar 2012)
-
-  21 Mar 2012; Mike Gilbert <floppym@g.o>
-  +files/python-3-distutils-egg-utf8.patch, +python-3.1.4-r4.ebuild,
-  +python-3.2.2-r1.ebuild:
-  Resolve distutils issue with unicode characters in egg-info files. Patch
-  backported by mgorny. Bug 343721.
-
-  07 Mar 2012; Brent Baude <ranger@g.o> python-3.2.2.ebuild:
-  Marking python-3.2.2 ppc for bug 403875
-
-  05 Mar 2012; Jeff Horelick <jdhore@g.o> python-3.2.2.ebuild:
-  marked x86 per bug 403875
-
-  05 Mar 2012; Samuli Suominen <ssuominen@g.o> python-2.5.4-r4.ebuild:
-  Remove obsolete sys-devel/gcc[libffi] built_with_use check wrt #406927 by
-  Michael Weber
-
-  03 Mar 2012; Brent Baude <ranger@g.o> python-3.2.2.ebuild:
-  Marking python-3.2.2 ppc64 for bug 403875
-
-  18 Feb 2012; Jeroen Roovers <jer@g.o> python-3.2.2.ebuild:
-  Stable for HPPA (bug #403875).
-
-  17 Feb 2012; Agostino Sarubbo <ago@g.o> python-3.2.2.ebuild:
-  Stable for amd64, wrt bug #403875
-
-  15 Feb 2012; Dirkjan Ochtman <djc@g.o> -python-2.7.1-r1.ebuild,
-  -python-3.1.3-r1.ebuild:
-  Remove some old versions.
-
-  13 Feb 2012; Kacper Kowalik <xarthisius@g.o> python-2.7.2-r3.ebuild,
-  python-3.1.4-r3.ebuild:
-  ppc64 stable wrt #387849
-
-  10 Feb 2012; Patrick Lauer <patrick@g.o> -python-2.4.6.ebuild:
-  Removing last python-2.4 ebuilds. Was nice having you around ...
-
-  01 Feb 2012; Brent Baude <ranger@g.o> python-2.7.2-r3.ebuild,
-  python-3.1.4-r3.ebuild:
-  Marking -2.7.2-r3 and -3.1.4-r3 for bug 387849
-
-  01 Jan 2012; Andreas K. Huettel <dilfridge@g.o> +ChangeLog-2011:
-  Split ChangeLog. For older entries, please see ChangeLog-2011.

diff --git a/dev-lang/python/ChangeLog-2011 b/dev-lang/python/ChangeLog-2011
deleted file mode 100644
index 7e2ecbc..0000000
--- a/dev-lang/python/ChangeLog-2011
+++ /dev/null
@@ -1,2583 +0,0 @@
-# ChangeLog for dev-lang/python
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog-2011,v 1.1 2012/01/01 20:25:25 dilfridge Exp $
-
-  14 Dec 2011; Mike Gilbert <floppym@g.o> python-2.5.4-r4.ebuild:
-  Apply linux3 platform workaround. Fixes bug 394143.
-
-  13 Dec 2011; Dirkjan Ochtman <djc@g.o> files/linux2.patch:
-  Prune back linux2.patch to prevent race conditions (bug 394547).
-
-  09 Dec 2011; Mike Frysinger <vapier@g.o> python-3.2.2.ebuild:
-  Replace hardcoded /lib64 searching with /<abi_libdir> paths.
-
-  01 Dec 2011; Dirkjan Ochtman <djc@g.o> python-2.7.2-r3.ebuild,
-  python-3.1.4-r3.ebuild, python-3.2.2.ebuild:
-  Fix autogen problems (bug 355733).
-
-  01 Dec 2011; Dirkjan Ochtman <djc@g.o> -python-2.7.2-r2.ebuild,
-  -python-3.1.4-r2.ebuild, -python-3.2-r2.ebuild:
-  Remove old versions from the tree.
-
-  26 Nov 2011; Mike Gilbert <floppym@g.o> python-2.6.7-r2.ebuild,
-  python-2.7.2-r2.ebuild, python-2.7.2-r3.ebuild, python-3.1.4-r2.ebuild,
-  python-3.1.4-r3.ebuild:
-  Remove reference to snapshots in python overlay.
-
-  31 Oct 2011; Mike Frysinger <vapier@g.o> python-2.6.7-r2.ebuild,
-  python-2.7.2-r2.ebuild, python-2.7.2-r3.ebuild, python-3.1.4-r2.ebuild,
-  python-3.1.4-r3.ebuild, python-3.2-r2.ebuild, python-3.2.2.ebuild:
-  Drop unnecessary USE=kernel_linux check in plat-linux3 setup.
-
-  30 Oct 2011; Raúl Porcel <armin76@g.o> python-2.7.2-r3.ebuild:
-  alpha/ia64/s390/sh/sparc stable wrt #387849
-
-  27 Oct 2011; Tony Vroon <chainsaw@g.o> python-2.7.2-r3.ebuild,
-  python-3.1.4-r3.ebuild:
-  Marked stable on AMD64; objections in arch testing by Ian "idella4" Delaney &
-  Agostino "ago" Sarubbo in bug #387849 were overridden by request of Dirkjan
-  Ochtman.
-
-  27 Oct 2011; Jesus Rivero <neurogeek@g.o> python-2.4.6.ebuild,
-  python-2.5.4-r4.ebuild, python-2.6.6-r2.ebuild, python-2.7.1-r1.ebuild,
-  python-3.1.3-r1.ebuild, python-3.2-r2.ebuild, python-3.2.2.ebuild,
-  files/pydoc.conf, files/pydoc.init:
-  Changes to pydoc conf.d and init.d files wrt bug #361867. Patch by
-  Arfrever
-
-  26 Oct 2011; Jeroen Roovers <jer@g.o> python-3.1.4-r3.ebuild:
-  Stable for HPPA (bug #387849).
-
-  26 Oct 2011; Jeroen Roovers <jer@g.o> python-2.7.2-r3.ebuild:
-  Stable for HPPA (bug #387849).
-
-  24 Oct 2011; Markus Meier <maekke@g.o> python-2.7.2-r3.ebuild:
-  arm stable, bug #387849
-
-  23 Oct 2011; Markus Meier <maekke@g.o> python-3.1.4-r3.ebuild:
-  x86 stable, bug #387849
-
-  23 Oct 2011; Markus Meier <maekke@g.o> python-2.7.2-r3.ebuild:
-  x86 stable, bug #387849
-
-*python-3.2.2 (16 Sep 2011)
-
-  16 Sep 2011; Dirkjan Ochtman <djc@g.o> +python-3.2.2.ebuild:
-  Version bump to 3.2.2 (fixes bug 375051).
-
-*python-3.1.4-r3 (16 Sep 2011)
-*python-2.7.2-r3 (16 Sep 2011)
-
-  16 Sep 2011; Dirkjan Ochtman <djc@g.o> +files/linux2.patch,
-  +python-2.7.2-r3.ebuild, +python-3.1.4-r3.ebuild:
-  Set sys.platform to linux2 even on linux3 (bug 375257).
-
-  16 Sep 2011; Dirkjan Ochtman <djc@g.o> -python-2.6.5-r3.ebuild,
-  -python-2.7.1-r2.ebuild:
-  Remove old versions.
-
-  27 Aug 2011; Jesus Rivero <neurogeek@g.o> python-2.7.2-r2.ebuild,
-  python-3.1.3-r1.ebuild, python-3.1.4-r2.ebuild:
-  Change to generic license
-
-  23 Aug 2011; Jesus Rivero <neurogeek@g.o> python-3.2-r2.ebuild,
-  +files/python-3.2-soname_typo.patch:
-  Applied patch from upstream, wrt bug #376303. Fixed License
-
-  07 Aug 2011; Naohiro Aota <naota@g.o> python-2.6.7-r2.ebuild,
-  python-2.7.2-r2.ebuild, python-3.1.4-r2.ebuild, python-3.2-r2.ebuild:
-  Move more linux3 compat hack into kernel_linux check. Bug #374579
-
-  05 Aug 2011; Naohiro Aota <naota@g.o> python-2.6.7-r2.ebuild,
-  python-2.7.2-r2.ebuild, python-3.1.4-r2.ebuild, python-3.2-r2.ebuild:
-  Move linux3 compat hack into kernel_linux check. Bug #374579
-
-*python-3.2-r2 (24 Jul 2011)
-*python-3.1.4-r2 (24 Jul 2011)
-*python-2.7.2-r2 (24 Jul 2011)
-*python-2.6.7-r2 (24 Jul 2011)
-
-  24 Jul 2011; Jesus Rivero <neurogeek@g.o> -python-2.6.7-r1.ebuild,
-  +python-2.6.7-r2.ebuild, -python-2.7.2-r1.ebuild, +python-2.7.2-r2.ebuild,
-  -python-3.1.4-r1.ebuild, +python-3.1.4-r2.ebuild, -python-3.2-r1.ebuild,
-  +python-3.2-r2.ebuild:
-  Revbump N. 2 for all testing versions of Python wrt bug #374579 and linux-3
-
-*python-3.2-r1 (22 Jul 2011)
-*python-3.1.4-r1 (22 Jul 2011)
-*python-2.7.2-r1 (22 Jul 2011)
-*python-2.6.7-r1 (22 Jul 2011)
-
-  22 Jul 2011; Jesus Rivero <neurogeek@g.o> -python-2.6.7.ebuild,
-  +python-2.6.7-r1.ebuild, -python-2.7.2.ebuild, +python-2.7.2-r1.ebuild,
-  -python-3.1.4.ebuild, +python-3.1.4-r1.ebuild, -python-3.2.ebuild,
-  +python-3.2-r1.ebuild:
-  Revbump for all testing versions of Python wrt bug #374579 and linux-3
-
-  27 Jun 2011; Dirkjan Ochtman <djc@g.o> python-2.7.2.ebuild,
-  python-3.2.ebuild:
-  Bump required autoconf version to 2.65 (bug 372461).
-
-*python-3.1.4 (27 Jun 2011)
-*python-2.7.2 (27 Jun 2011)
-*python-2.6.7 (27 Jun 2011)
-
-  27 Jun 2011; Dirkjan Ochtman <djc@g.o> +python-2.6.7.ebuild,
-  +python-2.7.2.ebuild, +python-3.1.4.ebuild:
-  Version bumps. Ebuilds and patchsets by Arfrever.
-
-*python-2.7.1-r2 (17 May 2011)
-
-  17 May 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  +python-2.7.1-r2.ebuild:
-  Use PyXML only after calling xml.use_pyxml().
-
-  17 May 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-2.4.6.ebuild, python-2.5.4-r4.ebuild, python-2.6.5-r3.ebuild,
-  python-2.6.6-r2.ebuild, python-2.7.1-r1.ebuild, python-3.1.3-r1.ebuild,
-  python-3.2.ebuild, files/pydoc.init:
-  Use target pydoc script in pydoc init.d script (bug #361867).
-
-  22 Apr 2011; Raúl Porcel <armin76@g.o> python-2.7.1-r1.ebuild:
-  alpha/ia64/m68k/s390/sh stable wrt #358717
-
-  18 Apr 2011; Thomas Kahle <tomka@g.o> python-2.7.1-r1.ebuild:
-  x86 stable per bug 358717
-
-  05 Apr 2011; Ulrich Mueller <ulm@g.o> python-2.4.6.ebuild,
-  python-2.5.4-r4.ebuild, python-2.6.5-r3.ebuild, python-2.6.6-r1.ebuild,
-  python-2.6.6-r2.ebuild, python-2.7.1-r1.ebuild, python-3.1.2-r4.ebuild,
-  python-3.1.3-r1.ebuild, python-3.2.ebuild:
-  Don't PROVIDE virtual/python, bug 358849.
-
-  04 Apr 2011; Jeroen Roovers <jer@g.o> python-2.7.1-r1.ebuild:
-  Stable for HPPA (bug #358717).
-
-  04 Apr 2011; Michael Weber <xmw@g.o> python-2.7.1-r1.ebuild:
-  arm/sparc stable (bug 358717)
-
-  25 Mar 2011; Kacper Kowalik <xarthisius@g.o> python-2.7.1-r1.ebuild:
-  ppc64 stable wrt #358717
-
-  24 Mar 2011; Christoph Mende <angelos@g.o> python-2.7.1-r1.ebuild:
-  Stable on amd64 wrt bug #358717
-
-  22 Mar 2011; Brent Baude <ranger@g.o> python-2.7.1-r1.ebuild:
-  Marking python-2.7.1-r1 ppc for bug 358717
-
-  18 Mar 2011; Mike Frysinger <vapier@g.o> python-2.4.6.ebuild,
-  python-2.5.4-r4.ebuild, python-2.6.5-r3.ebuild, python-2.6.6-r1.ebuild,
-  python-2.6.6-r2.ebuild, python-2.7.1-r1.ebuild, python-3.1.2-r4.ebuild,
-  python-3.1.3-r1.ebuild, python-3.2.ebuild:
-  Drop useless calls to prep_ml_includes #357727.
-
-  26 Feb 2011; Raúl Porcel <armin76@g.o> python-2.6.6-r2.ebuild:
-  alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #355927
-
-  26 Feb 2011; Markos Chandras <hwoarang@g.o> python-2.6.6-r2.ebuild,
-  python-3.1.3-r1.ebuild:
-  Stable on amd64 wrt bug #355927
-
-  24 Feb 2011; Pawel Hajdan jr <phajdan.jr@g.o>
-  python-2.6.6-r2.ebuild, python-3.1.3-r1.ebuild:
-  x86 stable wrt security bug #355927
-
-  23 Feb 2011; Kacper Kowalik <xarthisius@g.o>
-  python-2.6.6-r2.ebuild, python-3.1.3-r1.ebuild:
-  ppc/ppc64 stable wrt #355927
-
-  23 Feb 2011; Jeroen Roovers <jer@g.o> python-2.6.6-r2.ebuild,
-  python-3.1.3-r1.ebuild:
-  Stable for HPPA (bug #355927).
-
-*python-3.2 (21 Feb 2011)
-
-  21 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  +python-3.2.ebuild:
-  Version bump.
-
-*python-3.1.3-r1 (21 Feb 2011)
-
-  21 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  -python-3.1.3.ebuild, +python-3.1.3-r1.ebuild:
-  Fix regression in unicodedata.normalize() (Python issue #10254). Fix
-  NameError in logging.handlers.TimedRotatingFileHandler.__init__() (Gentoo bug
-  #350400, Python issue #10810). Don't skip test_ctypes tests on hardened/PAX
-  (Gentoo bug #348745).
-
-*python-2.7.1-r1 (21 Feb 2011)
-
-  21 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  -python-2.7.ebuild, -python-2.7.1.ebuild, +python-2.7.1-r1.ebuild:
-  Fix incompatible API change in xmlrpclib.Transport.parse_response() (Gentoo
-  bug #347465, Python issue #8194). Fix regression in unicodedata.normalize()
-  (Python issue #10254). Don't skip test_ctypes tests on hardened/PAX (Gentoo
-  bug #348745).
-
-*python-2.6.6-r2 (21 Feb 2011)
-
-  21 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  +python-2.6.6-r2.ebuild:
-  Fix DoS vulnerability in smtpd (Python issue #9129). Fix regression in
-  unicodedata.normalize() (Python issue #10254). Don't skip test_ctypes tests
-  on hardened/PAX (Gentoo bug #348745).
-
-  20 Feb 2011; Raúl Porcel <armin76@g.o> python-2.6.6-r1.ebuild:
-  ia64/m68k/s390/sh/sparc stable wrt #342927
-
-  06 Jan 2011; Brent Baude <ranger@g.o> python-2.6.6-r1.ebuild:
-  Marking python-2.6.6-r1 ppc for bug 342927
-
-  01 Jan 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o>
-  python-2.6.6-r1.ebuild:
-  Non-maintainer commit.
-  Reverting commit that broke stage generation for python-2.6.6-r1 as it wasn't
-  reverted before - bug 347867.
-  This commit was accepted by Arfrever.
-
-  29 Dec 2010; Markos Chandras <hwoarang@g.o> python-2.6.6-r1.ebuild:
-  Stable on amd64 wrt bug #342927
-
-  27 Dec 2010; Brent Baude <ranger@g.o> python-2.6.6-r1.ebuild:
-  Marking python-2.6.6-r1 ppc64 for bug 342927
-
-  27 Dec 2010; Brent Baude <ranger@g.o> python-3.1.2-r4.ebuild:
-  Marking python-3.1.2-r4 ppc64 for bug 325593
-
-  22 Dec 2010; Tobias Klausmann <klausman@g.o> python-2.6.6-r1.ebuild:
-  Stable on alpha, bug #342927
-
-  21 Dec 2010; Markus Meier <maekke@g.o> python-2.6.6-r1.ebuild:
-  arm stable, bug #342927
-
-  16 Dec 2010; Jesus Rivero <neurogeek@g.o> python-2.4.6.ebuild,
-  python-2.5.4-r4.ebuild, python-2.7.ebuild, python-2.7.1.ebuild,
-  python-3.1.3.ebuild:
-  Reverting commit that broke stage generation - bug 347867.
-
-  14 Dec 2010; Jeroen Roovers <jer@g.o> python-2.6.6-r1.ebuild:
-  Stable for HPPA (bug #342927).
-
-  07 Dec 2010; Pawel Hajdan jr <phajdan.jr@g.o>
-  python-2.6.6-r1.ebuild:
-  x86 stable wrt bug #342927
-
-  06 Dec 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o>
-  python-2.6.5-r3.ebuild, python-3.1.2-r4.ebuild:
-  Non-maintainer commit.
-  Reverting commit that broke stage generation - bug 347867.
-
-  01 Dec 2010; <sping@g.o> python-2.4.6.ebuild, python-2.5.4-r4.ebuild,
-  python-2.6.5-r3.ebuild, python-2.6.6-r1.ebuild, python-2.7.ebuild,
-  python-2.7.1.ebuild, python-3.1.2-r4.ebuild, python-3.1.3.ebuild:
-  Save/restore active Python version across calls to pkg_postrm() of the ebuild
-  about to be replaced. Ensure /usr/bin/python symlink.
-
-  29 Nov 2010; <sping@g.o> python-2.7.1.ebuild, python-3.1.3.ebuild:
-  Remove eselect_python_update() from 2.7.1 and 3.1.3
-
-*python-3.1.3 (28 Nov 2010)
-*python-2.7.1 (28 Nov 2010)
-
-  28 Nov 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  +python-2.7.1.ebuild, +python-3.1.3.ebuild:
-  Version bumps. 2.7: Enable loadable sqlite extensions (bug #335505).
-
-  27 Nov 2010; Sebastian Pipping <sping@g.o> python-2.4.6.ebuild,
-  python-2.5.4-r4.ebuild, python-2.6.5-r3.ebuild, python-2.6.6-r1.ebuild,
-  python-2.7.ebuild, python-3.1.2-r4.ebuild:
-  Disable auto-bumping of active Python version by removing
-  eselect_python_update() and its invocation as explained and announced on
-  gentoo-dev
-
-  27 Oct 2010; Dirkjan Ochtman <djc@g.o> -python-2.6.4-r1.ebuild,
-  -python-2.6.5-r2.ebuild, -python-3.1.2-r3.ebuild:
-  Remove old versions.
-
-  27 Oct 2010; Dirkjan Ochtman <djc@g.o> python-2.6.6-r1.ebuild:
-  Disable test___all__ to fix bug 321075.
-
-  13 Oct 2010; Dirkjan Ochtman <djc@g.o> python-2.6.6-r1.ebuild:
-  Use mirrors for the patch set.
-
-*python-2.6.6-r1 (12 Oct 2010)
-
-  12 Oct 2010; Dirkjan Ochtman <djc@g.o> -python-2.6.6.ebuild,
-  +python-2.6.6-r1.ebuild:
-  2.6.6-r1 actually has the rwx-mmap patch and the portage blocker.
-
-  11 Oct 2010; Dirkjan Ochtman <djc@g.o> python-2.6.6.ebuild:
-  Block 2.6.6 on portage-2.1.9 (earlier portage suffers from bug 330937).
-
-*python-2.6.6 (08 Oct 2010)
-
-  08 Oct 2010; Dirkjan Ochtman <djc@g.o> +python-2.6.6.ebuild:
-  Version bump to 2.6.6 (bug 334425).
-
-  15 Aug 2010; Jeroen Roovers <jer@g.o> python-3.1.2-r4.ebuild:
-  Stable for HPPA (bug #325593).
-
-  11 Aug 2010; Joseph Jezak <josejx@g.o> python-2.6.5-r3.ebuild,
-  python-3.1.2-r4.ebuild:
-  Marked ppc/ppc64 stable for bug #325593.
-
-  08 Aug 2010; Raúl Porcel <armin76@g.o> python-2.6.5-r3.ebuild:
-  alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #325593
-
-  06 Aug 2010; Markos Chandras <hwoarang@g.o> python-2.6.5-r3.ebuild,
-  python-3.1.2-r4.ebuild:
-  Stable on amd64 wrt bug #325593
-
-  06 Aug 2010; Jeroen Roovers <jer@g.o> python-2.6.5-r3.ebuild:
-  Stable for HPPA (bug #325593).
-
-  06 Aug 2010; Christian Faulhammer <fauli@g.o>
-  python-3.1.2-r4.ebuild:
-  stable x86, security bug 325593
-
-  06 Aug 2010; Christian Faulhammer <fauli@g.o>
-  python-2.6.5-r3.ebuild:
-  stable x86, security bug 325593
-
-  02 Aug 2010; Brian Harring <ferringb@g.o>
-  -python-2.6.5_p20100801.ebuild, -python-2.7_p20100801.ebuild,
-  -python-3.1.2_p20100801.ebuild:
-  Remove untested versions, one of which flat out breaks emerge (bug 330937).
-  These should not be re-added without going through devrel/qa.
-
-*python-3.1.2_p20100801 (02 Aug 2010)
-*python-2.7_p20100801 (02 Aug 2010)
-*python-2.6.5_p20100801 (02 Aug 2010)
-
-  02 Aug 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  +python-2.6.5_p20100801.ebuild, +python-2.7_p20100801.ebuild,
-  +python-3.1.2_p20100801.ebuild:
-  Improve usage of mmap in _ctypes module (bug #329499). Fix handling of
-  environmental variables (bug #329705). Backport some fixes from release
-  branches.
-
-  31 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-2.6.4-r1.ebuild, python-2.6.5-r2.ebuild, python-2.6.5-r3.ebuild,
-  python-2.7.ebuild, python-3.1.2-r3.ebuild, python-3.1.2-r4.ebuild:
-  Revert wrong change in _ctypes module (bug #329499).
-
-  30 Jul 2010; Jeroen Roovers <jer@g.o> python-3.1.2-r3.ebuild:
-  Stable for HPPA (bug #320043).
-
-  25 Jul 2010; <solar@g.o> python-2.6.4-r1.ebuild,
-  python-2.6.5-r2.ebuild, python-2.6.5-r3.ebuild, python-2.7.ebuild,
-  python-3.1.2-r3.ebuild, python-3.1.2-r4.ebuild:
-  - The Modules/_ctypes/malloc_closure.c misuses a mmap() call trying to set
-  a mem segment to rwx when it does not need it. Bug 329499
-
-  22 Jul 2010; Markus Meier <maekke@g.o> python-2.6.5-r2.ebuild:
-  arm stable, bug #319723
-
-  18 Jul 2010; <nixnut@g.o> python-3.1.2-r3.ebuild:
-  ppc stable #320043
-
-  17 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-3.1.2-r4.ebuild:
-  Fix parallel installation (bug #328009).
-
-  15 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-3.1.2-r4.ebuild:
-  Fix building with some locales (bug #328047).
-
-*python-3.1.2-r4 (12 Jul 2010)
-
-  12 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  +python-3.1.2-r4.ebuild:
-  Fix segmentation fault with non-module encodings directory on PYTHONPATH (bug #314883).
-  Fix building with Linux <2.6.9 headers (bug #317937). Fix httplib.HTTPResponse.read()
-  (bug #321545). Fix vulnerabilities in audioop module (bug #325593). Backport some
-  fixes from 3.1 branch.
-
-*python-2.6.5-r3 (12 Jul 2010)
-
-  12 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  +python-2.6.5-r3.ebuild:
-  Fix building with Linux <2.6.9 headers (bug #317937). Fix httplib.HTTPResponse.read()
-  (bug #321545). Fix vulnerabilities in audioop module (bug #325593). Backport some
-  fixes from 2.6 branch.
-
-*python-2.7 (04 Jul 2010)
-
-  04 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  +python-2.7.ebuild:
-  Version bump.
-
-  22 Jun 2010; Christian Faulhammer <fauli@g.o>
-  python-2.6.5-r2.ebuild:
-  stable x86, bug 319723
-
-  04 Jun 2010; Pawel Hajdan jr <phajdan.jr@g.o>
-  python-3.1.2-r3.ebuild:
-  x86 stable wrt bug #320043
-
-  04 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-3.1.2-r3.ebuild:
-  Disable tests with USE="-threads" (bug #322755).
-
-  26 May 2010; Markos Chandras <hwoarang@g.o> python-3.1.2-r3.ebuild:
-  Stable on amd64 wrt bug #320043
-
-  25 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-2.4.6.ebuild, python-2.5.4-r4.ebuild, python-2.6.4-r1.ebuild,
-  python-2.6.5-r2.ebuild, python-3.1.2-r3.ebuild:
-  Work around bug #321145.
-
-  24 May 2010; <nixnut@g.o> python-2.6.5-r2.ebuild:
-  ppc stable #319723
-
-  23 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-2.4.6.ebuild, python-2.5.4-r4.ebuild, python-2.6.5-r2.ebuild,
-  python-3.1.2-r3.ebuild:
-  Support FEATURES="test-fail-continue". Don't install byte-compiled Python
-  modules (bug #301915).
-
-  21 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-2.6.5-r2.ebuild:
-  amd64 stable (tested by rullzer) (bug #319723).
-
-  14 May 2010; Jeroen Roovers <jer@g.o> python-2.6.5-r2.ebuild:
-  Stable for HPPA (bug #319723).
-
-  02 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-3.1.2-r3.ebuild:
-  Don't use ebeep() (bug #318091).
-
-*python-3.1.2-r3 (01 May 2010)
-
-  01 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  +python-3.1.2-r3.ebuild:
-  Don't add GENTOO_PYTHON_WRAPPER_SCRIPT_PATH to os.environ (bug #315919).
-  Backport some fixes from 3.1 branch. Use EAPI="3".
-
-*python-2.6.5-r2 (01 May 2010)
-
-  01 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  +python-2.6.5-r2.ebuild:
-  Don't add GENTOO_PYTHON_WRAPPER_SCRIPT_PATH to os.environ (bug #315919).
-  Fix failure of test_zlib with zlib 1.2.4 (Python issue #8193). Backport
-  some fixes from 2.6 branch.
-
-*python-3.1.2-r2 (11 Apr 2010)
-
-  11 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  +python-3.1.2-r2.ebuild:
-  Use correct types of pointers. Fix failure of test_zlib with zlib 1.2.4
-  (Python issue #8193).
-
-*python-3.1.2-r1 (25 Mar 2010)
-
-  25 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  +python-3.1.2-r1.ebuild:
-  Allow str subclasses to override __str__ method (Python issue #1583863).
-  Fix argument validation in sys.setfilesystemencoding() (Python issue #8226).
-
-*python-2.6.5-r1 (25 Mar 2010)
-
-  25 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  +python-2.6.5-r1.ebuild:
-  Allow unicode subclasses to override __unicode__ method (Python issue #1583863).
-  Fix thread creation in low memory condition (Python issue #7544).
-  Fix unicodedata.normalize (Python issue #1054943). Set sys.executable to
-  empty string when program name is invalid (Python issue #7774).
-
-  25 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-2.6.5.ebuild, python-3.1.2.ebuild:
-  Unset variables after using them to avoid affecting child processes.
-
-*python-3.1.2 (22 Mar 2010)
-
-  22 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  +python-3.1.2.ebuild:
-  Version bump. Fixed bugs: #189283, #279234, #300961, #301848, #302519.
-  Respect GENTOO_PYTHON_PROCESS_NAME, GENTOO_PYTHON_WRAPPER_SCRIPT_PATH and
-  GENTOO_PYTHON_TARGET_SCRIPT_PATH environmental variables.
-
-*python-2.6.5 (21 Mar 2010)
-
-  21 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  +python-2.6.5.ebuild:
-  Version bump. Fixed bugs: #189283, #279234, #282859, #300961, #301848.
-  Respect GENTOO_PYTHON_PROCESS_NAME, GENTOO_PYTHON_WRAPPER_SCRIPT_PATH and
-  GENTOO_PYTHON_TARGET_SCRIPT_PATH environmental variables.
-
-  20 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-2.4.6.ebuild, python-2.5.4-r4.ebuild, python-2.6.4-r1.ebuild,
-  python-3.1.1-r1.ebuild:
-  Use -fwrapv (bug #297276). Install email module with USE="build".
-
-  10 Mar 2010; Joseph Jezak <josejx@g.o> python-2.6.4-r1.ebuild:
-  Marked ppc/ppc64 stable for bug #306793.
-
-  07 Mar 2010; Samuli Suominen <ssuominen@g.o>
-  python-2.6.4-r1.ebuild:
-  amd64 stable wrt #306793
-
-  07 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-2.4.6.ebuild, python-2.5.4-r4.ebuild, python-2.6.4.ebuild,
-  python-2.6.4-r1.ebuild:
-  Delete no longer needed recommendation (bug #307887).
-
-  04 Mar 2010; Raúl Porcel <armin76@g.o> python-2.6.4-r1.ebuild:
-  alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #306793
-
-  04 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-3.1.1-r1.ebuild:
-  Depend on >=app-admin/python-updater-0.8, which supports packages
-  installable for multiple versions of Python.
-
-  26 Feb 2010; Jeroen Roovers <jer@g.o> python-2.6.4-r1.ebuild:
-  Stable for HPPA (bug #306793).
-
-  25 Feb 2010; Christian Faulhammer <fauli@g.o>
-  python-2.6.4-r1.ebuild:
-  stable x86, bug 306793
-
-  21 Feb 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-2.4.6.ebuild, python-2.5.4-r4.ebuild, python-2.6.4-r1.ebuild,
-  python-3.1.1-r1.ebuild:
-  Don't install idle${SLOT} and idlelib module with USE="-tk" (bug #237788).
-  Enable "ssl" USE flag by default via IUSE (bug #304891).
-
-  13 Feb 2010; Raúl Porcel <armin76@g.o> python-2.5.4-r4.ebuild:
-  alpha/ia64/m68k/s390/sh/sparc stable wrt #303005
-
-  10 Feb 2010; Jeroen Roovers <jer@g.o> python-2.5.4-r4.ebuild:
-  Stable for HPPA (bug #303005).
-
-  10 Feb 2010; Joseph Jezak <josejx@g.o> python-2.5.4-r4.ebuild:
-  Marked ppc stable for bug #303005.
-
-  07 Feb 2010; Markus Meier <maekke@g.o> python-2.5.4-r4.ebuild:
-  arm/x86 stable, bug #303005
-
-  04 Feb 2010; Brent Baude <ranger@g.o> python-2.5.4-r4.ebuild:
-  Marking python-2.5.4-r4 ppc64 for bug 303005
-
-  01 Feb 2010; Markos Chandras <hwoarang@g.o> python-2.5.4-r4.ebuild:
-  Stable on amd64 wrt bug #303005
-
-*python-2.6.4-r1 (26 Jan 2010)
-
-  26 Jan 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  +python-2.6.4-r1.ebuild:
-  Respect PYTHONDONTWRITEBYTECODE / sys.dont_write_bytecode in distutils.
-  Check availability of nis headers before building of nis module (bug #288110).
-  Use pkg-config found by AC_PATH_TOOL() to avoid problem during crosscompilation
-  (bug #299044). Don't ignore __cmp__() of metaclasses.
-
-  12 Jan 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-2.4.6.ebuild, python-2.5.4-r3.ebuild, python-2.5.4-r4.ebuild,
-  python-2.6.4.ebuild, python-3.1.1-r1.ebuild:
-  Fix building with Portage <2.1.7 (bug #300671).
-
-  01 Jan 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-3.1.1-r1.ebuild:
-  Respect PYTHONDONTWRITEBYTECODE / sys.dont_write_bytecode in distutils.
-  Check availability of nis headers before building of nis module (bug #288110).
-  Use pkg-config found by AC_PATH_TOOL() to avoid problem during crosscompilation
-  (bug #299044). Depend on >=app-admin/eselect-python-20091230, which allows
-  wrapper scipts generated by python_generate_wrapper_scripts() and requiring
-  Python-2-specific target scripts to work correctly, when Python 3 is set as
-  main active version of Python.
-
-*python-2.5.4-r4 (01 Jan 2010)
-
-  01 Jan 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  +python-2.5.4-r4.ebuild:
-  Use external libffi (bug #209673). Respect PYTHONDONTWRITEBYTECODE in
-  distutils. Check availability of nis headers before building of nis
-  module (bug #288110).
-
-  01 Jan 2010; Brent Baude <ranger@g.o> python-2.6.4.ebuild:
-  Marking python-2.6.4 ppc64 for bug 295066
-
-  20 Dec 2009; Raúl Porcel <armin76@g.o> python-2.6.4.ebuild:
-  alpha/ia64/m68k/s390/sh/sparc stable wrt #295066
-
-  19 Dec 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-2.6.4.ebuild:
-  Restrict tests from test_httpservers (bug #293201).
-
-  19 Dec 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-3.1.1-r1.ebuild:
-  Use --with-computed-gotos (bug #296574).
-
-  13 Dec 2009; Raúl Porcel <armin76@g.o> python-2.6.4.ebuild,
-  python-3.1.1-r1.ebuild:
-  Add ~m68k, thanks to kolla for testing
-
-  09 Dec 2009; nixnut <nixnut@g.o> python-2.6.4.ebuild:
-  ppc stable #295066
-
-  06 Dec 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-2.4.6.ebuild, python-2.5.4-r3.ebuild, python-2.6.2-r1.ebuild,
-  python-2.6.2-r2.ebuild, python-2.6.3.ebuild, python-2.6.4.ebuild,
-  python-3.1.1-r1.ebuild, metadata.xml:
-  Remove "ucs2" USE flag and add "wide-unicode" USE flag (bug #293135).
-
-  04 Dec 2009; Jeroen Roovers <jer@g.o> python-2.6.4.ebuild:
-  Stable for HPPA (bug #295066).
-
-  03 Dec 2009; Markus Meier <maekke@g.o> python-2.6.4.ebuild:
-  amd64/arm/x86 stable, bug #295066
-
-  29 Nov 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-2.6.4.ebuild, python-3.1.1-r1.ebuild:
-  _ctypes module doesn't work with GCC's internal libffi.
-
-  07 Nov 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-3.1.1-r1.ebuild:
-  Make logging module ignore absence of multiprocessing module (bug
-  #291109).
-
-*python-2.6.4 (30 Oct 2009)
-
-  30 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  +python-2.6.4.ebuild:
-  Version bump.
-
-  24 Oct 2009; Alexey Shvetsov <alexxy@g.o> python-2.6.3.ebuild,
-  python-3.1.1-r1.ebuild:
-  Add ~mips keyword #287383
-
-  19 Oct 2009; Raúl Porcel <armin76@g.o> python-2.6.2-r1.ebuild:
-  s390/sh stable wrt #277645
-
-  17 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-2.5.4-r3.ebuild, python-2.6.3.ebuild, python-3.1.1-r1.ebuild:
-  Fix paths passed to python_mod_optimize() and python_mod_cleanup() (bug
-  #288354).
-
-  14 Oct 2009; Samuli Suominen <ssuominen@g.o>
-  python-3.1.1-r1.ebuild:
-  Keyword ~sparc-fbsd wrt #287383.
-
-  14 Oct 2009; Alexis Ballier <aballier@g.o> python-2.6.3.ebuild:
-  keyword ~sparc-fbsd
-
-  03 Oct 2009; Fabian Groffen <grobian@g.o> python-2.4.6.ebuild,
-  python-2.5.4-r3.ebuild, python-2.6.2-r2.ebuild, python-2.6.3.ebuild,
-  python-3.1.1-r1.ebuild:
-  Python's _locale module needs libintl, which on non-Linux is in gettext,
-  depend on virtual/libintl for that case
-
-*python-2.6.3 (02 Oct 2009)
-
-  02 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  +python-2.6.3.ebuild:
-  Version bump.
-
-  02 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-2.6.2-r2.ebuild, python-3.1.1-r1.ebuild:
-  Remove a workaround for missing keywords.
-
-  27 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-2.4.6.ebuild, python-2.5.4-r3.ebuild, python-2.6.2-r2.ebuild,
-  python-3.1.1-r1.ebuild:
-  Enable "ncurses" and "readline" USE flags by default. Don't activate
-  Python 2 when Python 3 is already active. Ensure that Python 2 is
-  installed.
-
-  27 Sep 2009; nixnut <nixnut@g.o> python-2.6.2-r1.ebuild:
-  ppc stable #277645
-
-  25 Sep 2009; Zac Medico <zmedico@g.o> python-3.1.1.ebuild,
-  python-3.1.1-r1.ebuild:
-  For python 3, don't remove the encodings directory with USE=build, in
-  order to avoid 'Fatal Python error: Py_Initialize: can't initialize sys
-  standard streams ImportError: No module named encodings.utf_8'.
-
-  23 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-2.4.6.ebuild, python-2.5.4-r3.ebuild, python-2.6.2-r2.ebuild:
-  Fix handling of USE="-berkdb".
-
-  23 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-2.4.6.ebuild, python-2.5.4-r3.ebuild, python-2.6.2-r2.ebuild,
-  python-3.1.1-r1.ebuild:
-  Add dependency on app-misc/mime-types which is used by mimetypes module.
-  Reported by Dirkjan Ochtman.
-
-*python-3.1.1-r1 (22 Sep 2009)
-*python-2.6.2-r2 (22 Sep 2009)
-
-  22 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  +python-2.6.2-r2.ebuild, +python-3.1.1-r1.ebuild:
-  Use external libffi on some architectures (bug #209673).
-
-  22 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-2.4.6.ebuild, python-2.5.4-r3.ebuild, python-2.6.2-r1.ebuild:
-  Restrict sys-libs/db dependencies and add warnings (bug #285553).
-
-  21 Sep 2009; Tom Gall <tgall@g.o> python-2.6.2-r1.ebuild:
-  stable for ppc64, bug #277645
-
-  17 Sep 2009; Jeroen Roovers <jer@g.o> python-2.6.2-r1.ebuild:
-  Stable for HPPA (bug #277645).
-
-  06 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  -files/python-config-2.4, -python-3.1.ebuild:
-  Delete old ebuild and old python-config.
-
-  05 Sep 2009; Raúl Porcel <armin76@g.o> python-2.6.2-r1.ebuild:
-  ia64/sparc stable wrt #277645
-
-  01 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-2.6.2-r1.ebuild:
-  Fix building on arm OABI (bug #266703).
-
-  30 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-2.4.6.ebuild, python-2.5.4-r3.ebuild, python-2.6.2-r1.ebuild,
-  python-3.1.1.ebuild:
-  Reenable test_math.py and test_pow.py on alpha (bug #282786).
-
-  28 Aug 2009; Raúl Porcel <armin76@g.o> python-2.6.2-r1.ebuild:
-  arm/m68k stable wrt #277645
-
-  26 Aug 2009; Tobias Klausmann <klausman@g.o>
-  python-2.6.2-r1.ebuild:
-  Stable on alpha, bug #277645
-
-  26 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-2.6.2-r1.ebuild, python-3.1.1.ebuild:
-  Skip test_math.py on alpha (bug #282786).
-
-  25 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-2.6.2-r1.ebuild, python-3.1.1.ebuild:
-  Fix building of Python 2.6.2-r1 with USE=-threads (bug #282518). Fix
-  building with USE=build or USE=-xml (bug #282259). Small updates.
-
-  21 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-2.5.4-r3.ebuild, python-2.6.2-r1.ebuild, python-3.1.1.ebuild:
-  Add missing dependency on >=dev-libs/expat-2 and non-zero exit status of
-  setup.py when building of extensions has failed (bug #281968).
-
-*python-3.1.1 (17 Aug 2009)
-
-  17 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  +python-3.1.1.ebuild:
-  Version bump. Don't install sqlite3 and _sqlite3 modules with USE="-sqlite"
-  (bug #236466).
-
-  16 Aug 2009; Christian Faulhammer <fauli@g.o>
-  python-2.6.2-r1.ebuild:
-  stable x86, bug 277645
-
-  04 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-3.1.ebuild:
-  Fix building with sys-libs/db headers containing non-UTF-8 characters (bug
-  #280001).
-
-  02 Aug 2009; Jeremy Olexa <darkside@g.o> metadata.xml:
-  Be more verbose about the 'threads' USE flag.
-
-*python-3.1 (01 Aug 2009)
-
-  01 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  +python-3.1.ebuild:
-  Version bump (bug #250186).
-
-  01 Aug 2009; Zac Medico <zmedico@g.o> python-2.6.2-r1.ebuild:
-  Bug #248081 - Fix tests not to assume that stdin is a tty.
-
-  31 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  python-2.5.4-r3.ebuild, python-2.6.2-r1.ebuild:
-  Skip test_ctypes on systems with PAX (bug #234498).
-
-  30 Jul 2009; Jeremy Olexa <darkside@g.o> python-2.6.2-r1.ebuild:
-  amd64 stable, bug 277645
-
-  19 Jul 2009; Raúl Porcel <armin76@g.o> python-2.5.4-r3.ebuild:
-  arm/ia64/m68k/s390/sh/sparc stable wrt #275311
-
-  17 Jul 2009; nixnut <nixnut@g.o> python-2.5.4-r3.ebuild:
-  ppc stable #275311
-
-  05 Jul 2009; Markus Meier <maekke@g.o> python-2.5.4-r3.ebuild:
-  amd64 stable, bug #275311
-
-  04 Jul 2009; Brent Baude <ranger@g.o> python-2.5.4-r3.ebuild:
-  stable ppc64, bug 275311
-
-  30 Jun 2009; Christian Faulhammer <fauli@g.o>
-  python-2.5.4-r3.ebuild:
-  stable x86, bug 275311
-
-  28 Jun 2009; Tobias Klausmann <klausman@g.o>
-  python-2.5.4-r3.ebuild:
-  Stable on alpha, bug #275311
-
-  26 Jun 2009; Jeroen Roovers <jer@g.o> python-2.5.4-r3.ebuild:
-  Stable for HPPA (bug #275311).
-
-*python-2.6.2-r1 (28 May 2009)
-
-  28 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  +python-2.6.2-r1.ebuild:
-  Install libpython2.6.a in /usr/lib instead of /usr/lib/python2.6/config
-  (bug #252372). Fix building with Subversion 1.7.
-
-  27 May 2009; Raúl Porcel <armin76@g.o> python-2.4.6.ebuild:
-  arm/ia64/m68k/s390/sh/sparc stable wrt #252317
-
-  25 May 2009; Markus Meier <maekke@g.o> python-2.4.6.ebuild:
-  amd64 stable, bug #252317
-
-  25 May 2009; Christian Faulhammer <fauli@g.o> python-2.4.6.ebuild:
-  stable x86, security bug  252317
-
-*python-2.5.4-r3 (25 May 2009)
-
-  25 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  +python-2.5.4-r3.ebuild:
-  Install libpython2.5.a in /usr/lib instead of /usr/lib/python2.5/config
-  (bug #252372). Fix building with Subversion 1.7. Use `eselect python`
-  instead of alternatives.eclass.
-
-  25 May 2009; Brent Baude <ranger@g.o> python-2.4.6.ebuild:
-  Marking python-2.4.6 ppc64 and ppc for bug 252317
-
-  24 May 2009; Jeroen Roovers <jer@g.o> python-2.4.6.ebuild:
-  Stable for HPPA (bug #252317).
-
-  24 May 2009; Tobias Klausmann <klausman@g.o> python-2.4.6.ebuild:
-  Stable on alpha, bug #252317
-
-  24 May 2009; Tobias Klausmann <klausman@g.o> python-2.4.6.ebuild:
-  Keyworded on alpha, bug #252317
-
-*python-2.4.6 (24 May 2009)
-
-  24 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  +python-2.4.6.ebuild:
-  Version bump (bug #252317).
-
-  24 Apr 2009; Raúl Porcel <armin76@g.o> python-2.5.4-r2.ebuild:
-  arm/ia64/m68k/s390/sh/sparc stable wrt #265790
-
-  22 Apr 2009; Jeroen Roovers <jer@g.o> python-2.5.4-r2:
-  Stable for HPPA (bug #265790).
-
-  19 Apr 2009; Markus Meier <maekke@g.o> python-2.5.4-r2:
-  amd64/x86 stable, bug #265790
-
-  19 Apr 2009; Brent Baude <ranger@g.o> python-2.5.4-r2.ebuild:
-  Marking python-2.5.4-r2 ppc64 and ppc for bug 265790
-
-*python-2.6.2 (18 Apr 2009)
-
-  18 Apr 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  +python-2.6.2.ebuild:
-  Version bump (bug #266596).
-
-  18 Apr 2009; Tobias Klausmann <klausman@g.o>
-  python-2.5.4-r2.ebuild:
-  Stable on alpha, bug #265790
-
-  17 Apr 2009; Joshua Kinard <kumba@g.o> python-2.6-r5.ebuild,
-  python-2.6.1-r1.ebuild:
-  Python 2.6 has a build failure on MIPS for now. Dropping our unstable
-  keywords until it's fixed by upstream or if Upstreams latest patch on
-  their bug is added. Refer to #266471 for Gentoo for the tracker, or
-  http://bugs.python.org/issue4305 for the Python issue.
-
-  12 Apr 2009; Mike Frysinger <vapier@g.o>
-  +files/python-2.6-chflags-cross.patch,
-  +files/python-2.6-cross-patch-tweak.patch, python-2.6.1-r1.ebuild:
-  Fix up cross-compiling with python-2.6.
-
-  26 Mar 2009; Zac Medico <zmedico@g.o> python-2.5.2-r7.ebuild,
-  python-2.5.2-r8.ebuild, python-2.5.4-r2.ebuild, python-2.6-r5.ebuild,
-  python-2.6.1-r1.ebuild:
-  In src_test, redirect stdin from /dev/tty as a workaround for bug #248081.
-
-*python-2.6.1-r1 (21 Mar 2009)
-
-  21 Mar 2009; Jesus Rivero <neurogeek@g.o> -python-2.6.1.ebuild,
-  +python-2.6.1-r1.ebuild:
-  Fixed typo in sqlite3 extension. Removed old version
-
-  26 Feb 2009; Mike Frysinger <vapier@g.o>
-  +files/python-2.5-cross-printf.patch, python-2.5.2-r7.ebuild,
-  python-2.5.2-r8.ebuild, python-2.5.4-r2.ebuild:
-  Fix cross-compilation with %zd printf tests #239110 by xeb and #184308 by
-  Joel Martin.
-
-  26 Feb 2009; Mike Frysinger <vapier@g.o> python-2.4.4-r5.ebuild,
-  python-2.4.4-r6.ebuild, python-2.4.4-r14.ebuild, python-2.4.4-r15.ebuild,
-  python-2.5.2-r7.ebuild, python-2.5.2-r8.ebuild, python-2.5.4-r2.ebuild,
-  python-2.6-r5.ebuild, python-2.6.1.ebuild:
-  Drop host python ver check when cross-compiling since we build up a local
-  hostpython, and pass CBUILD to the hostpython configure so it detects the
-  full name of the compiler.
-
-  10 Feb 2009; <neurogeek@g.o> python-2.6-r5.ebuild,
-  python-2.6.1.ebuild:
-  Python 2.6 series. Added +xml use flag to standarize.
-
-  10 Feb 2009; <neurogeek@g.o> python-2.5.2-r7.ebuild,
-  python-2.5.2-r8.ebuild, python-2.5.4-r2.ebuild:
-  Python 2.5 series. Added +xml use flag to standarize.
-
-  10 Feb 2009; <neurogeek@g.o> python-2.4.4-r5.ebuild,
-  python-2.4.4-r6.ebuild, python-2.4.4-r14.ebuild, python-2.4.4-r15.ebuild:
-  Python 2.4.4 series. Added +xml use flag to standarize.
-
-*python-2.5.4-r2 (24 Jan 2009)
-
-  24 Jan 2009; Jesus Rivero <neurogeek@g.o> -python-2.5.4-r1.ebuild,
-  +python-2.5.4-r2.ebuild:
-  Fixed line breaks errors in ebuild. Removed older version. Closes Bug
-  #255946. Thanks Walter and Steve for helping
-
-*python-2.5.4-r1 (22 Jan 2009)
-
-  22 Jan 2009; Jesus Rivero <neurogeek@g.o>
-  files/python-2.5.2_turkish.patch, files/python-2.6_turkish.patch,
-  -python-2.5.4.ebuild, +python-2.5.4-r1.ebuild:
-  Rev bump. Patch bundle updated to fix turkish locale patch. Updated older
-  patches too and removed previous version.
-
-*python-2.5.4 (21 Jan 2009)
-
-  21 Jan 2009; Jesus Rivero <neurogeek@g.o> +python-2.5.4.ebuild:
-  Version bump. Some of the patches used in previous versions are not
-  needed.
-
-  24 Dec 2008; Jesus Rivero <neurogeek@g.o> python-2.6-r5.ebuild,
-  python-2.6.1.ebuild:
-  Added dev-python/python-docs:2.6
-
-*python-2.6.1 (13 Dec 2008)
-
-  13 Dec 2008; Jesus Rivero <neurogeek@g.o>
-  +files/python-2.6_turkish.patch, +python-2.6.1.ebuild:
-  Version bump
-
-  09 Dec 2008; Mike Frysinger <vapier@g.o> python-2.5.2-r8.ebuild,
-  python-2.6-r5.ebuild:
-  Set expat to default to on.
-
-  08 Dec 2008; Mike Frysinger <vapier@g.o> python-2.5.2-r8.ebuild,
-  python-2.6-r5.ebuild:
-  Make dev-libs/expat optional via USE=expat.
-
-  06 Dec 2008; Jesus Rivero <neurogeek@g.o>
-  +files/python-2.5.2_turkish.patch, python-2.5.2-r8.ebuild:
-  Fixed support for tr_TR locale. Bug #250075. Thanks to Serkan
-
-*python-2.6-r5 (17 Nov 2008)
-
-  17 Nov 2008; <neurogeek@g.o> -python-2.6-r4.ebuild,
-  +python-2.6-r5.ebuild:
-  Revision bump. Fixes Bug #219238. Removed older version
-
-  26 Oct 2008; Ali Polatel <hawking@g.o> python-2.4.4-r5.ebuild,
-  python-2.4.4-r6.ebuild, python-2.4.4-r14.ebuild, python-2.4.4-r15.ebuild,
-  python-2.5.2-r7.ebuild, python-2.5.2-r8.ebuild:
-  Use python_{en,dis}able_pyc.
-
-*python-2.6-r4 (26 Oct 2008)
-
-  26 Oct 2008; Ali Polatel <hawking@g.o> +python-2.6-r4.ebuild:
-  Revbump. Updated patchset to use PYTHONDONTWRITEBYTECODE instead of
-  PYTHON_DONT_COMPILE.
-
-  25 Oct 2008; Ali Polatel <hawking@g.o> python-2.5.2-r7.ebuild,
-  python-2.5.2-r8.ebuild, python-2.6-r3.ebuild:
-  Nuke the useless bootstrap USE flag for >=python-2.5. Thanks to Arfrever.
-
-*python-2.6-r3 (25 Oct 2008)
-
-  25 Oct 2008; Ali Polatel <hawking@g.o> -python-2.6-r2.ebuild,
-  +python-2.6-r3.ebuild:
-  Revbump. Bump eselect-python DEPEND to fix bug 240149. Don't install empty
-  directories.
-
-*python-2.6-r2 (07 Oct 2008)
-
-  07 Oct 2008; Ali Polatel <hawking@g.o> -python-2.6-r1.ebuild,
-  +python-2.6-r2.ebuild:
-  Revbump. Bump to EAPI 2 and some minor fixes. Drop old.
-
-*python-2.6-r1 (06 Oct 2008)
-
-  06 Oct 2008; Ali Polatel <hawking@g.o> -python-2.6.ebuild,
-  +python-2.6-r1.ebuild:
-  Revbump. Use use_with for threads, remove die from econf, use emake
-  instead of make, remove redundant python_mod_{cleanup,optimize}. Drop old.
-
-*python-2.6 (05 Oct 2008)
-
-  05 Oct 2008; Ali Polatel <hawking@g.o>
-  +files/python-2.6-test-cross.patch, -python-2.5.2-r6.ebuild,
-  +python-2.6.ebuild:
-  Version bump. Drop old.
-
-*python-2.5.2-r8 (19 Sep 2008)
-*python-2.4.4-r15 (19 Sep 2008)
-
-  19 Sep 2008; Ali Polatel <hawking@g.o> +python-2.4.4-r15.ebuild,
-  +python-2.5.2-r8.ebuild:
-  Revbumps. Updated patchset to fix bug 238124. Install examples under
-  /usr/share/doc/$PF/examples.
-
-  17 Sep 2008; Brent Baude <ranger@g.o> python-2.5.2-r7.ebuild:
-  stable ppc64, bug 236723
-
-  14 Sep 2008; Sven Wegener <swegener@g.o> python-2.5.2-r6.ebuild,
-  python-2.5.2-r7.ebuild:
-  Use correct sqlite module name, when disabling it.
-
-  12 Sep 2008; Raúl Porcel <armin76@g.o> python-2.5.2-r7.ebuild:
-  alpha/ia64 stable wrt #236723
-
-  12 Sep 2008; Ferris McCormick <fmccor@g.o> python-2.5.2-r7.ebuild:
-  Sparc stable --- Bug #236723 --- tests all good.
-
-  11 Sep 2008; Markus Meier <maekke@g.o> python-2.5.2-r7.ebuild:
-  amd64/x86 stable, bug #236723
-
-  11 Sep 2008; Jeroen Roovers <jer@g.o> python-2.5.2-r7.ebuild:
-  Stable for HPPA (bug #236723).
-
-  10 Sep 2008; Brent Baude <ranger@g.o> python-2.5.2-r7.ebuild:
-  stable ppc, bug 236723
-
-  19 Aug 2008; Ali Polatel <hawking@g.o> -files/python-config-2.2,
-  -files/python-config-2.3, -files/python-2.3.6-disable-failing-tests.patch,
-  metadata.xml, -python-2.3.5-r2.ebuild, -python-2.3.5-r3.ebuild,
-  -python-2.3.6.ebuild, -python-2.3.6-r3.ebuild, -python-2.3.6-r6.ebuild,
-  -python-2.4.4-r13.ebuild, -python-2.5.2-r5.ebuild:
-  Drop python-2.3, drop old 2.4, 2.5 ebuilds. Add local use flag
-  descriptions to metadata.xml.
-
-  31 Jul 2008; Raúl Porcel <armin76@g.o> python-2.5.2-r6.ebuild:
-  sparc stable
-
-*python-2.5.2-r7 (31 Jul 2008)
-
-  31 Jul 2008; Tiziano Müller <dev-zero@g.o>
-  +python-2.5.2-r7.ebuild:
-  Added patches for bug #218378 (thanks to Duane Griffin) and bug #233312
-  (thanks to Arfrever Frehtes Taifersar Arahesis).
-
-*python-2.5.2-r6 (31 Jul 2008)
-*python-2.4.4-r14 (31 Jul 2008)
-
-  31 Jul 2008; Tiziano Müller <dev-zero@g.o>
-  +python-2.4.4-r14.ebuild, +python-2.5.2-r6.ebuild:
-  Revision bump to fix bug #230640 (CVE-2008-2315, CVE-2008-2316) and bug
-  #232137 (CVE-2008-{3142,3143,3144}).
-
-  18 Jul 2008; Olivier Crête <tester@g.o> python-2.5.2-r5.ebuild:
-  Stable on amd64, bug #178800
-
-  18 Jul 2008; Jeroen Roovers <jer@g.o> python-2.5.2-r5.ebuild:
-  Stable for HPPA (bug #178800).
-
-  17 Jul 2008; Tobias Klausmann <klausman@g.o>
-  python-2.5.2-r5.ebuild:
-  Stable on alpha, bug #178800
-
-  17 Jul 2008; Raúl Porcel <armin76@g.o> python-2.5.2-r5.ebuild:
-  ia64/sparc stable wrt #178800
-
-  17 Jul 2008; Christian Faulhammer <opfer@g.o>
-  python-2.5.2-r5.ebuild:
-  stable x86, bug 178800
-
-  16 Jul 2008; nixnut <nixnut@g.o> python-2.5.2-r5.ebuild:
-  Stable on ppc wrt bug 178800
-
-  09 Jul 2008; Markus Rothe <corsair@g.o> python-2.5.2-r5.ebuild:
-  Stable on ppc64; bug #178800
-
-  30 Jun 2008; Ali Polatel <hawking@g.o> files/pydoc.conf,
-  files/pydoc.init:
-  Fixed files/pydoc* headers
-
-*python-2.5.2-r5 (24 Jun 2008)
-
-  24 Jun 2008; Ali Polatel <hawking@g.o> -python-2.3.6-r4.ebuild,
-  -python-2.3.6-r5.ebuild, -python-2.4.4-r9.ebuild,
-  -python-2.4.4-r10.ebuild, -python-2.4.4-r11.ebuild,
-  -python-2.4.4-r12.ebuild, -python-2.5.2-r1.ebuild,
-  -python-2.5.2-r2.ebuild, -python-2.5.2-r3.ebuild, -python-2.5.2-r4.ebuild,
-  +python-2.5.2-r5.ebuild:
-  Revbump. Append -fwrapv to CFLAGS if we're using gcc-4, #228905. Updated
-  patchset to fix memory issues with unicode objects, #222481. Drop old.
-
-  20 Jun 2008; Ali Polatel <hawking@g.o> python-2.5.2-r4.ebuild:
-  Fix bsddb dependency, bug 223133. Cosmetics
-
-  29 May 2008; Ali Polatel <hawking@g.o> python-2.3.5-r2.ebuild,
-  python-2.3.5-r3.ebuild, python-2.3.6.ebuild, python-2.3.6-r3.ebuild,
-  python-2.3.6-r4.ebuild, python-2.3.6-r5.ebuild, python-2.3.6-r6.ebuild,
-  python-2.4.4-r5.ebuild, python-2.4.4-r6.ebuild, python-2.4.4-r9.ebuild,
-  python-2.4.4-r10.ebuild, python-2.4.4-r11.ebuild, python-2.4.4-r12.ebuild,
-  python-2.4.4-r13.ebuild, python-2.5.2-r1.ebuild, python-2.5.2-r2.ebuild,
-  python-2.5.2-r3.ebuild, python-2.5.2-r4.ebuild:
-  Fix -x option passed to python_mod_optimize, thanks to Remy Blank,
-  #224137.
-
-  29 May 2008; Ali Polatel <hawking@g.o> python-2.3.5-r2.ebuild,
-  python-2.3.5-r3.ebuild, python-2.3.6.ebuild, python-2.3.6-r3.ebuild,
-  python-2.3.6-r4.ebuild, python-2.3.6-r5.ebuild, python-2.3.6-r6.ebuild,
-  python-2.4.4-r5.ebuild, python-2.4.4-r6.ebuild, python-2.4.4-r9.ebuild,
-  python-2.4.4-r10.ebuild, python-2.4.4-r11.ebuild, python-2.4.4-r12.ebuild,
-  python-2.4.4-r13.ebuild, python-2.5.2-r1.ebuild, python-2.5.2-r2.ebuild,
-  python-2.5.2-r3.ebuild, python-2.5.2-r4.ebuild:
-  python_mod_optimize is ROOT aware.
-
-  28 May 2008; Markus Meier <maekke@g.o> python-2.3.6-r6.ebuild,
-  python-2.4.4-r13.ebuild:
-  amd64/x86 stable, security bug #216673
-
-  27 May 2008; Markus Rothe <corsair@g.o> python-2.3.6-r6.ebuild,
-  python-2.4.4-r13.ebuild:
-  Stable on ppc64; bug #216673
-
-  26 May 2008; Tobias Scherbaum <dertobi123@g.o>
-  python-2.3.6-r6.ebuild, python-2.4.4-r13.ebuild:
-  ppc stable, bug #216673
-
-  26 May 2008; Raúl Porcel <armin76@g.o> python-2.3.6-r6.ebuild,
-  python-2.4.4-r13.ebuild:
-  ia64/sparc stable wrt security #216673
-
-  25 May 2008; Tobias Klausmann <klausman@g.o>
-  python-2.3.6-r6.ebuild:
-  Stable on alpha, bug #216673
-
-  25 May 2008; Tobias Klausmann <klausman@g.o>
-  python-2.4.4-r13.ebuild:
-  Stable on alpha, bug #216673
-
-  25 May 2008; Ali Polatel <hawking@g.o>
-  +files/python-2.3.6-disable-failing-tests.patch, python-2.3.6-r6.ebuild,
-  python-2.4.4-r13.ebuild, python-2.5.2-r4.ebuild:
-  Added patch to disable failing test_bsddb test for 2.3. Disable test_pow
-  on alpha until upstream comes up with a fix.
-
-  24 May 2008; Jeroen Roovers <jer@g.o> python-2.3.6-r6.ebuild,
-  python-2.4.4-r13.ebuild:
-  Stable for HPPA (bug #216673).
-
-*python-2.5.2-r4 (21 May 2008)
-*python-2.4.4-r13 (21 May 2008)
-*python-2.3.6-r6 (21 May 2008)
-
-  21 May 2008; Ali Polatel <hawking@g.o> +python-2.3.6-r6.ebuild,
-  +python-2.4.4-r13.ebuild, +python-2.5.2-r4.ebuild:
-  Revision bumps. Don't build the imageop module on 32 bit as well, #216673.
-
-  13 May 2008; Ali Polatel <hawking@g.o> python-2.4.4-r12.ebuild,
-  python-2.5.2-r3.ebuild:
-  Drop dev-python/python-fchksum from PDEPEND. It's not needed anymore.
-
-*python-2.5.2-r3 (13 May 2008)
-*python-2.4.4-r12 (13 May 2008)
-
-  13 May 2008; Ali Polatel <hawking@g.o> +python-2.4.4-r12.ebuild,
-  +python-2.5.2-r3.ebuild:
-  Revbumps. Updated CXXFLAGS patch so packages overriding
-  distutils.CCompiler._compile won't fail to build, #219238. Added patch to
-  fix executable stack for ctypes, thanks to Sandro Bonazzola, #218753.
-  Added patch to build with system expat, thanks to Diego, #178921.
-
-*python-2.5.2-r2 (19 Apr 2008)
-*python-2.4.4-r11 (19 Apr 2008)
-
-  19 Apr 2008; Ali Polatel <hawking@g.o> +python-2.4.4-r11.ebuild,
-  +python-2.5.2-r2.ebuild:
-  Revbumps. Updated patchset to fix compilation of extensions when CXXFLAGS
-  is unset.
-
-*python-2.5.2-r1 (18 Apr 2008)
-
-  18 Apr 2008; Ali Polatel <hawking@g.o> python-2.3.5-r2.ebuild,
-  python-2.3.5-r3.ebuild, python-2.3.6.ebuild, -python-2.3.6-r2.ebuild,
-  python-2.3.6-r3.ebuild, -python-2.4.4-r4.ebuild, python-2.4.4-r5.ebuild,
-  -python-2.4.4-r7.ebuild, -python-2.4.4-r8.ebuild, -python-2.5.1-r2.ebuild,
-  -python-2.5.1-r3.ebuild, -python-2.5.1-r4.ebuild, -python-2.5.1-r5.ebuild,
-  -python-2.5.2.ebuild, +python-2.5.2-r1.ebuild:
-  Revbump. Updated patchset. Backported upstream patch to make file objects
-  as thread safe as the underlying libc FILE* implementation. Backported
-  upstream patch fixing a bunch of infinite C recursions. Dropped old.
-  Quoting.
-
-*python-2.5.2 (18 Apr 2008)
-*python-2.4.4-r10 (18 Apr 2008)
-*python-2.3.6-r5 (18 Apr 2008)
-
-  18 Apr 2008; Ali Polatel <hawking@g.o> +python-2.3.6-r5.ebuild,
-  +python-2.4.4-r10.ebuild, +python-2.5.2.ebuild:
-  Version bumps. Updated patchsets to fix buffer overflow in zlib extension
-  (CVE-2008-1721) bug 217221 and unsafe PyString_FromStringAndSize(). Added
-  patch by Mark Peloquin for distutils to respect CXXFLAGS, bug 145206. Add
-  wininst USE flag to conditionally install MS Windows executables, bug
-  198021. Use EAPI=1, rename nothreads and nocxx USE flags to threads and
-  cxx.
-
-  11 Mar 2008; Markus Rothe <corsair@g.o> python-2.4.4-r9.ebuild:
-  Stable on ppc64; bug #211281
-
-  11 Mar 2008; Tiziano Müller <dev-zero@g.o> python-2.4.4-r9.ebuild,
-  python-2.5.1-r5.ebuild:
-  Changed newinitd/newconfd for pydoc to install the init.d/conf.d scripts as
-  pydoc-2.x (aka don't break slotting)
-
-  06 Mar 2008; nixnut <nixnut@g.o> python-2.4.4-r9.ebuild:
-  Stable on ppc wrt bug 211281
-
-  03 Mar 2008; Christoph Mende <angelos@g.o> python-2.4.4-r9.ebuild:
-  Stable on amd64, bug #211281
-
-  03 Mar 2008; Raúl Porcel <armin76@g.o> python-2.4.4-r9.ebuild:
-  alpha/ia64/sparc/x86 stable wrt #211281
-
-  03 Mar 2008; Jeroen Roovers <jer@g.o> python-2.4.4-r9.ebuild:
-  Stable for HPPA (bug #211281).
-
-  01 Mar 2008; Tiziano Müller <dev-zero@g.o> +files/pydoc.conf,
-  +files/pydoc.init, python-2.4.4-r9.ebuild, python-2.5.1-r5.ebuild:
-  Added init.d/conf.d scripts for the integrated pydoc webserver (bug #59903,
-  thanks to compnerd).
-
-*python-2.4.4-r9 (16 Feb 2008)
-
-  16 Feb 2008; Christian Faulhammer <opfer@g.o>
-  +python-2.4.4-r9.ebuild:
-  fix bug 179377, with a dependency adjustment to proper slots of sys-libs/db,
-  provided by Petr Pisar <petr DOT pisar AT atlas DOT cz>
-
-  25 Jan 2008; Markus Rothe <corsair@g.o> python-2.3.6-r4.ebuild:
-  Stable on ppc64; bug #198373
-
-  23 Jan 2008; Peter Weller <welp@g.o> python-2.3.6-r4.ebuild:
-  Stable on amd64; bug 198373
-
-  23 Jan 2008; Raúl Porcel <armin76@g.o> python-2.3.6-r4.ebuild:
-  alpha/ia64/sparc stable wrt security #198373
-
-  23 Jan 2008; Christian Faulhammer <opfer@g.o>
-  python-2.3.6-r4.ebuild:
-  stable x86, security bug 198373
-
-  23 Jan 2008; Jeroen Roovers <jer@g.o> python-2.3.6-r4.ebuild:
-  Stable for HPPA (bug #198373).
-
-  23 Jan 2008; Brent Baude <ranger@g.o> python-2.3.6-r4.ebuild:
-  Marking python-2.3.6-r4 ppc for bug 198373
-
-*python-2.3.6-r4 (22 Jan 2008)
-
-  22 Jan 2008; Ali Polatel <hawking@g.o> +python-2.3.6-r4.ebuild:
-  Revision bump. New patchset for 2.3.6 including fixes for #198373 and #204343.
-  Changed berkdb DEPEND, quoting.
-
-*python-2.5.1-r5 (07 Jan 2008)
-*python-2.4.4-r8 (07 Jan 2008)
-
-  07 Jan 2008; Ali Polatel <hawking@g.o> +python-2.4.4-r8.ebuild,
-  +python-2.5.1-r5.ebuild:
-  Revision bump(s). New patchsets for 2.4.4 and 2.5.1 wrt #204700 and #204343
-
-*python-2.5.1-r4 (18 Nov 2007)
-*python-2.4.4-r7 (18 Nov 2007)
-
-  18 Nov 2007; Ali Polatel <hawking@g.o> +python-2.4.4-r7.ebuild,
-  +python-2.5.1-r4.ebuild:
-  revbump(s). don't install windows executables, bug 198021. updated patchset
-  to fix implicit dependency on openssl, bug 198398. fix quoting.
-
-  27 Oct 2007; Tobias Scherbaum <dertobi123@g.o>
-  python-2.3.6-r3.ebuild, python-2.4.4-r6.ebuild:
-  ppc stable, bug #192876
-
-  26 Oct 2007; Ali Polatel <hawking@g.o> python-2.4.4-r4.ebuild,
-  python-2.4.4-r5.ebuild, python-2.4.4-r6.ebuild:
-  Changed SRC_URI of python-gentoo-patches-2.4* to mirror://gentoo
-
-  25 Oct 2007; Jeroen Roovers <jer@g.o> python-2.4.4-r6.ebuild:
-  Stable for HPPA (bug #192876). Fixed quoting issues.
-
-  25 Oct 2007; Jeroen Roovers <jer@g.o> python-2.3.6-r3.ebuild:
-  Stable for HPPA (bug #192876).
-
-  25 Oct 2007; Raúl Porcel <armin76@g.o> python-2.3.6-r3.ebuild,
-  python-2.4.4-r6.ebuild:
-  alpha/ia64/sparc stable wrt security #192876
-
-  25 Oct 2007; Daniel Gryniewicz <dang@g.o> python-2.3.6-r3.ebuild,
-  python-2.4.4-r6.ebuild:
-  Marked stable on amd64 for bug #192876
-
-  25 Oct 2007; Markus Rothe <corsair@g.o> python-2.3.6-r3.ebuild,
-  python-2.4.4-r6.ebuild:
-  Stable on ppc64; bug #192876
-
-  25 Oct 2007; Christian Faulhammer <opfer@g.o>
-  python-2.3.6-r3.ebuild:
-  stable x86, security bug 192876
-
-  25 Oct 2007; Christian Faulhammer <opfer@g.o>
-  python-2.4.4-r6.ebuild:
-  stable x86, security bug 192876
-
-*python-2.5.1-r3 (24 Oct 2007)
-*python-2.4.4-r6 (24 Oct 2007)
-*python-2.3.6-r3 (24 Oct 2007)
-
-  24 Oct 2007; Ali Polatel <hawking@g.o> +python-2.3.6-r3.ebuild,
-  +python-2.4.4-r6.ebuild, +python-2.5.1-r3.ebuild:
-  revbump(s). fix imageop integer overflows (CVE-2007-4965), bug 192876
-
-  26 Sep 2007; Joshua Kinard <kumba@g.o> python-2.4.4-r5.ebuild:
-  Stable on mips, per #188029.
-
-  24 Sep 2007; Ali Polatel <hawking@g.o> python-2.5.1-r2.ebuild:
-  don't set LINKCC, removed nocxx use flag. don't pass --with-cxx=no to
-  configure. bug 193190
-
-  22 Sep 2007; Jeroen Roovers <jer@g.o> python-2.4.4-r5.ebuild:
-  Stable for HPPA (bug #188029).
-
-  22 Sep 2007; Ferris McCormick <fmccor@g.o> python-2.4.4-r5.ebuild:
-  Sparc stable --- Bug #188029 --- all tests pass and portage still works.
-
-  22 Sep 2007; Brent Baude <ranger@g.o> ChangeLog:
-  MArking python-2.4.4-r5 ppc64 for bug 188029
-
-  22 Sep 2007; nixnut <nixnut@g.o> python-2.4.4-r5.ebuild:
-  Stable on ppc wrt bug 188029
-
-  22 Sep 2007; Tom Gall <tgall@g.o> python-2.4.4-r5.ebuild:
-  stable on ppc64
-
-  21 Sep 2007; Raúl Porcel <armin76@g.o> python-2.4.4-r5.ebuild:
-  alpha/ia64 stable wrt #188029
-
-  21 Sep 2007; Chris Gianelloni <wolf31o2@g.o>
-  python-2.4.4-r5.ebuild:
-  Stable on x86 wrt bug #188029.
-
-  21 Sep 2007; Daniel Gryniewicz <dang@g.o> python-2.4.4-r5.ebuild:
-  Marked stable on amd64 for bug #188029
-
-  10 Sep 2007; Joel Martin <kanaka@g.o>
-  +files/python-2.4.4-test-cross.patch, python-2.4.4-r4.ebuild,
-  python-2.4.4-r5.ebuild, python-2.5.1-r2.ebuild:
-  Fix cross-compile check and add small cross-compile patch to remove unicode
-  in one of the tests when cross-compiling.
-
-  08 Sep 2007; Zac Medico <zmedico@g.o>
-  python-2.4.4-r4.ebuild, python-2.4.4-r5.ebuild:
-  Add build? ( !dev-python/pycrypto ) to RDEPEND in order to enforce
-  correct merge order for a stage building issue similar to bug #88777.
-
-  07 Sep 2007; Ali Polatel <hawking@g.o>
-  -files/python-2.4.3-db4.patch, -files/python-2.4.3-gentoo_obsd.patch,
-  -files/python-2.4.3-gentoo_obsd-r1.patch, -python-2.4.3-r1.ebuild,
-  -python-2.4.3-r4.ebuild, -python-2.4.4.ebuild, -python-2.5-r2.ebuild:
-  Clean out old versions
-
-  03 Sep 2007; Zac Medico <zmedico@g.o> python-2.4.4-r4.ebuild,
-  python-2.4.4-r5.ebuild, python-2.5-r2.ebuild, python-2.5.1-r2.ebuild:
-  Add build? ( !dev-python/python-fchksum ) to RDEPEND in order
-  to enforce correct merge order for bug #88777.
-
-*python-2.4.4-r5 (24 Aug 2007)
-
-  24 Aug 2007; Ali Polatel <hawking@g.o> +files/python-config-2.4-r1,
-  +python-2.4.4-r5.ebuild:
-  Revision bump. Use python-config provided by python-2.5 with small changes
-  instead of our custom python-config-2.4. bug 188029
-
-  20 Aug 2007; Roy Marples <uberlord@g.o> python-2.5.1-r2.ebuild:
-  export LDFLAGS="-L." -> append-ldflags "-L.", #189298
-  thanks to Arfrever Frehtes Taifersar Arahesis.
-
-  02 Jul 2007; Piotr Jaroszyński <peper@g.o> python-2.3.5-r2.ebuild,
-  python-2.3.5-r3.ebuild, python-2.3.6.ebuild, python-2.3.6-r2.ebuild,
-  python-2.4.3-r1.ebuild, python-2.4.3-r4.ebuild, python-2.4.4.ebuild,
-  python-2.4.4-r4.ebuild, python-2.5-r2.ebuild, python-2.5.1-r2.ebuild:
-  (QA) RESTRICT clean up.
-
-  30 Jun 2007; Lars Weiler <pylon@g.o> python-2.3.6-r2.ebuild,
-  python-2.5.1-r2.ebuild:
-  Keyworded ~ppc; bug #177426.
-
-  31 May 2007; Bryan Østergaard <kloeri@g.o> metadata.xml:
-  Remove myself as I'm retiring.
-
-  19 May 2007; Peter Weller <welp@g.o> python-2.5.1-r2.ebuild:
-  Keyworded ~amd64 wrt bug 177426
-
-  19 May 2007; Peter Weller <welp@g.o> python-2.3.6-r2.ebuild:
-  Added ~amd64 to python-2.3.6-r2
-
-  17 May 2007; Bryan Østergaard <kloeri@g.o> metadata.xml:
-  Mark myself as maintainer.
-
-  16 May 2007; Tobias Scherbaum <dertobi123@g.o>
-  python-2.4.4-r4.ebuild:
-  ppc stable, bug #177804
-
-  16 May 2007; Daniel Gryniewicz <dang@g.o> python-2.4.4-r4.ebuild:
-  Marked stable on amd64 for bug #177804
-
-  14 May 2007; Gustavo Zacarias <gustavoz@g.o>
-  python-2.3.6-r2.ebuild, python-2.5.1-r2.ebuild:
-  Keyworded ~sparc wrt #177426
-
-  14 May 2007; Bryan Østergaard <kloeri@g.o> python-2.4.4-r4.ebuild:
-  Stable on Alpha and Mips.
-
-  14 May 2007; Daniel Gryniewicz <dang@g.o> python-2.4.4-r4.ebuild:
-  Marked ~amd64 for bug #177804
-
-  14 May 2007; Bryan Østergaard <kloeri@g.o> python-2.4.4-r4.ebuild:
-  Fix 2.4.4-r4 tests always being disabled.
-
-  14 May 2007; Gustavo Zacarias <gustavoz@g.o>
-  python-2.4.4-r4.ebuild:
-  Stable on sparc wrt security #177804
-
-  14 May 2007; Bryan Østergaard <kloeri@g.o> python-2.3.6-r2.ebuild,
-  python-2.4.4-r4.ebuild, -python-2.5.1-r1.ebuild, python-2.5.1-r2.ebuild:
-  Fix small bug preventing tests from running, fix manpage symlinks (bug
-  177471) and filter as-needed in python-2.3.6-r2 (bug 177614).
-
-  14 May 2007; Jeroen Roovers <jer@g.o> python-2.4.4-r4.ebuild:
-  Stable for HPPA (bug #177804).
-
-  13 May 2007; Markus Rothe <corsair@g.o> python-2.4.4-r4.ebuild:
-  Stable on ppc64; bug #177804
-
-  12 May 2007; Roy Marples <uberlord@g.o> python-2.4.4-r4.ebuild:
-  Added ~sparc-fbsd keyword.
-
-  12 May 2007; Raúl Porcel <armin76@g.o> python-2.4.4-r4.ebuild:
-  ia64 + x86 stable wrt security bug #177804
-
-  12 May 2007; Markus Rothe <corsair@g.o> python-2.3.6-r2.ebuild,
-  python-2.4.4-r4.ebuild, python-2.5.1-r2.ebuild:
-  Added ~ppc64; bug #177426
-
-  11 May 2007; Bryan Østergaard <kloeri@g.o> python-2.4.4-r4.ebuild,
-  python-2.5.1-r2.ebuild:
-  Add ~alpha and ~mips keywords.
-
-  11 May 2007; Bryan Østergaard <kloeri@g.o>
-  -python-2.1.3-r1.ebuild, -python-2.2.3-r6.ebuild:
-  More cleanups, this time removing <python-2.3.
-
-  11 May 2007; Bryan Østergaard <kloeri@g.o>
-  -python-2.3.6-r1.ebuild, -python-2.4.4-r2.ebuild, -python-2.4.4-r3.ebuild,
-  -python-2.5-r1.ebuild, -python-2.5.1.ebuild:
-  Clean out some old versions.
-
-*python-2.5.1-r2 (11 May 2007)
-*python-2.4.4-r4 (11 May 2007)
-
-  11 May 2007; Bryan Østergaard <kloeri@g.o>
-  +python-2.4.4-r4.ebuild, +python-2.5.1-r2.ebuild:
-  Only apply crosscompile patch conditionally, drop tests if crosscompiling
-  and fix PyLocale.strxfrm leak from bug 177804. srtxfrm from Debian bug
-  416934
-
-*python-2.5.1-r1 (10 May 2007)
-*python-2.4.4-r3 (10 May 2007)
-*python-2.3.6-r2 (10 May 2007)
-
-  10 May 2007; Bryan Østergaard <kloeri@g.o>
-  +python-2.3.6-r2.ebuild, +python-2.4.4-r3.ebuild, +python-2.5.1-r1.ebuild:
-  Change threads USE flag to nothreads, fix non-linux linker issue and fix
-  man-page symlink.
-
-  08 May 2007; Roy Marples <uberlord@g.o> python-2.5.1.ebuild:
-  Added ~sparc-fbsd keyword, #177426.
-  Added ~x86-fbsd keyword, #177426.
-  export LDFLAGS="-L." so we link modules correctly on FreeBSD and possibly
-  other systems where python2.5 isn't installed yet.
-
-  08 May 2007; Raúl Porcel <armin76@g.o> python-2.3.6-r1.ebuild,
-  python-2.4.4-r2.ebuild, python-2.5.1.ebuild:
-  Add ~ia64 wrt 177426
-
-  08 May 2007; Roy Marples <uberlord@g.o> python-2.4.4-r2.ebuild:
-  Added ~x86-fbsd keyword, #177426.
-
-  08 May 2007; Bryan Østergaard <kloeri@g.o> python-2.3.6-r1.ebuild,
-  python-2.4.4-r2.ebuild, python-2.5.1.ebuild:
-  Change nptl USE flag to threads.
-
-  08 May 2007; Jeroen Roovers <jer@g.o> python-2.5.1.ebuild:
-  Marked ~hppa (bug #177426).
-
-  07 May 2007; Jeroen Roovers <jer@g.o> python-2.4.4-r2.ebuild:
-  Marked ~hppa (bug #177426).
-
-  07 May 2007; Jeroen Roovers <jer@g.o> python-2.3.6-r1.ebuild:
-  Marked ~hppa (bug #177426).
-
-*python-2.4.4-r2 (07 May 2007)
-
-  07 May 2007; Bryan Østergaard <kloeri@g.o>
-  -python-2.4.4-r1.ebuild, +python-2.4.4-r2.ebuild:
-  Fix broken 2.4.4 patch causing wrong linking.
-
-  07 May 2007; Gustavo Zacarias <gustavoz@g.o> python-2.4.4.ebuild:
-  Stable on sparc
-
-  07 May 2007; Bryan Østergaard <kloeri@g.o> python-2.3.6-r1.ebuild,
-  python-2.4.4.ebuild, python-2.4.4-r1.ebuild:
-  Fix 2.3.6-r1 patch (bug 177464) and disable sax test in 2.4.4.
-
-  07 May 2007; Bryan Østergaard <kloeri@g.o> python-2.3.5-r2.ebuild,
-  python-2.3.5-r3.ebuild, python-2.3.6.ebuild, python-2.3.6-r1.ebuild,
-  python-2.4.3-r1.ebuild, python-2.4.3-r4.ebuild, python-2.4.4.ebuild,
-  python-2.4.4-r1.ebuild, python-2.5-r1.ebuild, python-2.5-r2.ebuild:
-  Stable on Alpha, IA64 and x86 + fix digest issue reported in bug 177440.
-
-*python-2.5.1 (06 May 2007)
-*python-2.4.4-r1 (06 May 2007)
-*python-2.3.6-r1 (06 May 2007)
-
-  06 May 2007; Bryan Østergaard <kloeri@g.o>
-  +python-2.3.6-r1.ebuild, +python-2.4.4-r1.ebuild, +python-2.5.1.ebuild:
-  Build problems fixed:
-  bug 120099 dev-lang/python-2.4.2 builds against sys-libs/gdbm with USE="-gdbm"
-  bug 135239 crosscompiling python. python-2.4.1-bindir-libdir.patch
-  bug 138647 dev-lang/python-x.x.x distutils installer does not link libraries
-  bug 150595 dev-lang/python-2.5 fails to compile with LC_ALL=de_DE@euro
-  bug 150732 python-2.4.3-r4 does not honor ROOT
-  bug 159967 python doesn't add pthread to LIBS correctly on BSD
-
-  Other problems fixed:
-  bug 148362 File collision between python-2.4* and python-2.5*
-  bug 151695 dev-python/python-docs env.d entry incorrect
-  bug 158383 emerging python-2.4.3-r4 segfaults with -ipv6
-  bug 165268 dev-lang/python-2.4.4 fails to build the dbm module
-
-  Test failures fixed:
-  bug 82469: QA issue: python-2.3.5-maketest failes with propolice
-  bug 124188 dev-lang/python-2.4.2 fails test_cookielib
-  bug 154247 dev-lang/python-2.4.4 tests failed: test_sax failed -- 1 of 42 tests failed: test_xmlgen_attr_escape
-
-  Feature requests:
-  bug 131325 python 2.4.4/2.3.6 enable pthreads inconditionaly
-  bug 135617 dev-lang/python should install Tools/freeze
-  bug 176066 dev-lang/python-2.5.1 bump
-
-  Fixed in current upstream version:
-  bug 90660 python-2.3.5: No module named fcntl
-  bug 144798 dev-lang/python-2.4.3 with TZ=Australia/Melbourne fails test
-  bug 151246 signed integer overflow bug in dev-lang/python-2.4.3
-  bug 159553 dev-lang/python-2.4.3-r4 fails test_openpty
-  bug 162057 dev-lang/python fails tests in test_expanduser
-
-*python-2.5-r2 (31 Mar 2007)
-
-  31 Mar 2007; Marien Zwart <marienz@g.o> +python-2.5-r2.ebuild:
-  Revision bump python 2.5 with distutils and execstack fixes (rebuilding
-  installed extensions is recommended if upgrading from an older python 2.5
-  ebuild). Remove unnecessary pysqlite block. Fix python 2.3 digest problem.
-
-  06 Feb 2007; Marius Mauch <genone@g.o> python-2.3.5-r2.ebuild,
-  python-2.3.5-r3.ebuild, python-2.3.6.ebuild, python-2.4.3-r1.ebuild,
-  python-2.4.3-r4.ebuild, python-2.4.4.ebuild, python-2.5-r1.ebuild:
-  Replacing einfo with elog
-
-  11 Nov 2006; Bryan Østergaard <kloeri@g.o> python-2.3.6.ebuild:
-  Fix lib64 patch, bug 154711.
-
-*python-2.3.6 (09 Nov 2006)
-
-  09 Nov 2006; Bryan Østergaard <kloeri@g.o> +python-2.3.6.ebuild:
-  Bump version, bug 153944.
-
-*python-2.4.4 (04 Nov 2006)
-
-  04 Nov 2006; Bryan Østergaard <kloeri@g.o> +python-2.4.4.ebuild:
-  Version bump.
-
-  18 Oct 2006; Roy Marples <uberlord@g.o> python-2.4.3-r4.ebuild,
-  python-2.5-r1.ebuild:
-  Added ~sparc-fbsd keyword.
-
-  27 Sep 2006; Bryan Østergaard <kloeri@g.o> python-2.3.5-r3.ebuild,
-  python-2.4.3-r4.ebuild:
-  Stable on ia64.
-
-  27 Sep 2006; Bryan Østergaard <kloeri@g.o> python-2.3.5-r3.ebuild,
-  python-2.4.3-r4.ebuild:
-  Stable on Alpha.
-
-  27 Sep 2006; Joshua Jackson <tsunam@g.o> python-2.3.5-r3.ebuild,
-  python-2.4.3-r4.ebuild:
-  Stable x86; bug #149065
-
-  27 Sep 2006; Jason Wever <weeve@g.o> python-2.3.5-r3.ebuild,
-  python-2.4.3-r4.ebuild:
-  Stable on SPARC wrt security bug #149065.
-
-  26 Sep 2006; Gustavo Zacarias <gustavoz@g.o>
-  python-2.3.5-r3.ebuild, python-2.4.3-r4.ebuild:
-  Stable on hppa wrt security #149065
-
-  26 Sep 2006; Simon Stelling <blubb@g.o> python-2.3.5-r3.ebuild:
-  stable on amd64; bug 149065
-
-  26 Sep 2006; Tobias Scherbaum <dertobi123@g.o>
-  python-2.3.5-r3.ebuild, python-2.4.3-r4.ebuild:
-  ppc stable, bug #149065
-
-  26 Sep 2006; Simon Stelling <blubb@g.o> python-2.4.3-r4.ebuild:
-  stable on amd64; bug 149065
-
-  26 Sep 2006; Markus Rothe <corsair@g.o> python-2.3.5-r3.ebuild,
-  python-2.4.3-r4.ebuild:
-  Stable on ppc64; bug #149065
-
-*python-2.4.3-r4 (26 Sep 2006)
-*python-2.3.5-r3 (26 Sep 2006)
-
-  26 Sep 2006; Marien Zwart <marienz@g.o> +python-2.3.5-r3.ebuild,
-  +python-2.4.3-r4.ebuild:
-  Revision bumps for bug #149065.
-
-*python-2.5-r1 (19 Sep 2006)
-
-  19 Sep 2006; Alastair Tse <liquidx@g.o> python-2.5.ebuild
-  +python-2.5-r1.ebuild:
-  Fixed patches that still contain the zlib mistake from the 2.4
-  patchset. Disabled etree tests.
-
-*python-2.5 (19 Sep 2006)
-
-  19 Sep 2006; Alastair Tse <liquidx@g.o> -python-2.4.3-r2.ebuild,
-  +python-2.5.ebuild:
-  python 2.5 released.
-
-*python-2.4.3-r3 (28 Aug 2006)
-
-  28 Aug 2006; Alastair Tse <liquidx@g.o> +python-2.4.3-r3.ebuild:
-  fix mistake introduced in 2.4.3-r2 where system zlib was used that caused
-  problems on certain machines (#145242)
-
-*python-2.4.3-r2 (26 Aug 2006)
-
-  26 Aug 2006; Alastair Tse <liquidx@g.o> +python-2.4.3-r2.ebuild:
-  cleanup 2.4.3 ebuild, fix collisions with slotted versions of pydoc and
-  idle, fix multilib installs so that everything is installed in /usr/lib64
-  rather than just the .so (#118805)
-
-  22 Aug 2006; Alastair Tse <liquidx@g.o> python-2.2.3-r6.ebuild,
-  python-2.3.5-r2.ebuild, -python-2.4.2.ebuild, -python-2.4.2-r1.ebuild,
-  -python-2.4.2-r2.ebuild, -python-2.4.3.ebuild, python-2.4.3-r1.ebuild:
-  renamed patches to have short names and version numbers to indicate when
-  they were introduced. patches tarballs are now generated from gentoo-svn.
-  cleaned up older unstable versions of python leaving the latest version for
-  each major release. fixed some installed file collisions between the two
-  version.
-
-  20 Jul 2006; Simon Stelling <blubb@g.o> python-2.4.3-r1.ebuild:
-  stable on amd64
-
-  11 Jul 2006; Alastair Tse <liquidx@g.o> python-2.4.3-r1.ebuild:
-  python-2.2.3-r6.ebuild, python-2.3.5-r2.ebuild, python-2.4.2.ebuild,
-  python-2.4.2-r1.ebuild, python-2.4.2-r2.ebuild, python-2.4.3.ebuild,
-  python-2.4.3-r1.ebuild:
-  Typo fix in DESCRIPTION (#139463)
-
-  09 Jul 2006; Joshua Kinard <kumba@g.o> python-2.4.3-r1.ebuild:
-  Marked stable on mips.
-
-  08 Jul 2006; Doug Goldstein <cardoe@g.o> python-2.1.3-r1.ebuild,
-  python-2.2.3-r6.ebuild, python-2.3.5-r2.ebuild, python-2.4.2.ebuild,
-  python-2.4.2-r1.ebuild, python-2.4.2-r2.ebuild, python-2.4.3.ebuild,
-  python-2.4.3-r1.ebuild:
-  split USE='tcltk' to 'tcl' & 'tk' per bug #17808. Nuked X USE flag since it
-  was only to find tk from tcltk
-
-  30 Jun 2006; Joel Martin <kanaka@g.o> python-2.4.3-r1.ebuild:
-  Cross-compile update: bindir-libdir patch is no longer needed and will break
-  the patching if it's there. Also, unset CC to force the native python build
-  to use the native compiler.
-
-  28 Jun 2006; Tobias Scherbaum <dertobi123@g.o>
-  python-2.4.3-r1.ebuild:
-  ppc stable, #138268
-
-  28 Jun 2006; Gustavo Zacarias <gustavoz@g.o>
-  python-2.4.3-r1.ebuild:
-  Stable on sparc wrt #138268
-
-  28 Jun 2006; Guy Martin <gmsoft@g.o> python-2.4.3-r1.ebuild:
-  Stable on hppa.
-
-  28 Jun 2006; Markus Rothe <corsair@g.o> python-2.4.3-r1.ebuild:
-  Stable on ppc64; bug #138268
-
-  27 Jun 2006; Bryan Østergaard <kloeri@g.o> python-2.4.3-r1.ebuild:
-  Stable on alpha, ia64 and x86.
-
-*python-2.4.3-r1 (04 May 2006)
-*python-2.4.2-r2 (04 May 2006)
-
-  04 May 2006; Bryan Østergaard <kloeri@g.o>
-  +files/python-2.4.2-gentoo_obsd-r1.patch,
-  +files/python-2.4.3-gentoo_obsd-r1.patch, +python-2.4.2-r2.ebuild,
-  +python-2.4.3-r1.ebuild:
-  Fix obsd patch (thanks reb) fixing bugs 117261 and 130140.
-
-  27 Apr 2006; Marien Zwart <marienz@g.o>
-  files/digest-python-2.1.3-r1, files/digest-python-2.2.3-r6, Manifest:
-  Fixing SHA256 digest, pass four
-
-  14 Apr 2006; Bryan Østergaard <kloeri@g.o
-  +files/python-2.4.2-gentoo_obsd.patch,
-  +files/python-2.4.3-gentoo_obsd.patch, python-2.4.2-r1.ebuild,
-  python-2.4.3.ebuild:
-  Add gentoo/obsd patch, bug 117261.
-
-*python-2.4.3 (13 Apr 2006)
-
-  13 Apr 2006; Bryan Østergaard <kloeri@g.o
-  +files/python-2.4.3-db4.patch, +python-2.4.3.ebuild:
-  Version bump to 2.4.3.
-
-  30 Mar 2006; Diego Pettenò <flameeyes@g.o> python-2.4.2-r1.ebuild:
-  Add ~x86-fbsd keyword.
-
-  16 Feb 2006; Marien Zwart <marienz@g.o>
-  -files/python-2.2.3-db4.patch,
-  -files/python-2.2.3-disable_modules_and_ssl.patch,
-  -files/python-2.2.3-fPIC.patch,
-  -files/python-2.2.3-gentoo_py_dontcompile.patch,
-  -files/python-2.2.3-xmlrpc.patch,
-  -files/python-2.3.2-disable_modules_and_ssl.patch,
-  -files/python-2.3.4-lib64.patch, -files/python-2.3.5-st_flags.patch,
-  -files/python-2.3-add_portage_search_path.patch,
-  -files/python-2.3-add_portage_search_path_take_2.patch,
-  -files/python-2.3-db4.2.patch,
-  -files/python-2.3-gentoo_py_dontcompile.patch,
-  -files/python-2.3-mimetypes_apache.patch, -files/python-2.3-pcre.patch,
-  -files/python-2.3-readline.patch, -files/python-2.4.1-bindir-libdir.patch,
-  -files/python-2.4.1-crosscompile.patch, -files/python-2.4.1-db4.patch,
-  -files/python-2.4.1-libdir.patch, -files/python-2.4.1-st_flags.patch,
-  -files/python-2.4.2-mmap+fd.patch, -files/python-2.4.2-no-threads.patch,
-  -files/python-2.4.2-readline.patch,
-  -files/python-2.4-add_portage_search_path.patch,
-  -files/python-2.4-disable_modules_and_ssl.patch,
-  -files/python-2.4-gentoo_py_dontcompile.patch,
-  -files/python-2.4-mimetypes_apache.patch, python-2.2.3-r6.ebuild,
-  python-2.3.5-r2.ebuild, python-2.4.2.ebuild, python-2.4.2-r1.ebuild:
-  Move patches from files dir to separate tarballs.
-
-  16 Feb 2006; Marien Zwart <marienz@g.o> -files/python-config-2.2.1,
-  -files/python-2.2.1-r5-gentoo.diff, -files/python-config-2.2.2,
-  -files/python-2.2.2-tk-8.4.x.patch, -files/python-2.3-xmlrpc.patch,
-  -files/python-2.4-db4.2.patch, -files/python-2.4-lib64.patch,
-  -files/python-2.4.1-readline.patch, -files/python-2.4-libdir.patch,
-  -files/python-2.4-readline.patch, -files/python-2.4-xmlrpc.patch,
-  -python-2.3.4-r1.ebuild, -python-2.3.5.ebuild, -python-2.3.5-r1.ebuild,
-  -python-2.4-r3.ebuild, -python-2.4.1.ebuild, -python-2.4.1-r1.ebuild:
-  Remove old versions.
-
-  08 Feb 2006; Marien Zwart <marienz@g.o> python-2.3.5-r2.ebuild,
-  python-2.4.2.ebuild, python-2.4.2-r1.ebuild:
-  Disable confcache (breaks .so loading).
-
-  02 Feb 2006; Bryan Østergaard <kloeri@g.o
-  +files/python-2.4.2-mmap+fd.patch:
-  Add missing python-2.4.2-mmap+fd.patch.
-
-*python-2.4.2-r1 (02 Feb 2006)
-
-  02 Feb 2006; Bryan Østergaard <kloeri@g.o
-  +files/depreorder-topsort.py, +files/python-updater-r1,
-  +python-2.4.2-r1.ebuild:
-  No more libstdc++.so linking, fix python-updater ordering (bug #95538) +
-  mmap (bug #113439) and fd leak (bug #118575) fixes.
-
-  13 Jan 2006; Mike Frysinger <vapier@g.o>
-  +files/python-2.4.2-no-threads.patch, python-2.4.2.ebuild:
-  Fix from upstream for building without threads.
-
-  24 Nov 2005; Markus Rothe <corsair@g.o> python-2.4.2.ebuild:
-  Stable on ppc64
-
-  17 Nov 2005; Guy Martin <gmsoft@g.o> python-2.4-r3.ebuild,
-  python-2.4.1.ebuild, python-2.4.1-r1.ebuild, python-2.4.2.ebuild:
-  Readded critical fix for HPPA.
-
-  21 Oct 2005; Aaron Walker <ka0ttic@g.o> python-2.4.2.ebuild:
-  Stable on mips.
-
-  15 Oct 2005; MATSUU Takuto <matsuu@g.o> python-2.4.2.ebuild:
-  Stable on sh.
-
-  15 Oct 2005; Michael Hanselmann <hansmi@g.o> python-2.4.2.ebuild:
-  Stable on hppa, ppc.
-
-  14 Oct 2005; Gustavo Zacarias <gustavoz@g.o> python-2.4.2.ebuild:
-  Stable on sparc
-
-  14 Oct 2005; Bryan Østergaard <kloeri@g.o> python-2.4.2.ebuild:
-  Stable on alpha.
-
-  13 Oct 2005; Luis Medinas <metalgod@g.o> python-2.4.2.ebuild:
-  Marked Stable on amd64.
-
-  13 Oct 2005; Aron Griffis <agriffis@g.o> python-2.4.2.ebuild:
-  Mark 2.4.2 stable on ia64
-
-  13 Oct 2005; Rob Cakebread <pythonhead@g.o> python-2.4.2.ebuild:
-  Marked x86 stable per Mr_Bones_ - memory leak in posix.access()
-
-  10 Oct 2005; Gustavo Zacarias <gustavoz@g.o>
-  python-2.4.1-r1.ebuild:
-  Stable on sparc
-
-  10 Oct 2005; Luis Medinas <metalgod@g.o> python-2.4.1-r1.ebuild:
-  Marked Stable on amd64.
-
-  10 Oct 2005; Markus Rothe <corsair@g.o> python-2.4.1-r1.ebuild:
-  Stable on ppc64
-
-  09 Oct 2005; Michael Hanselmann <hansmi@g.o>
-  python-2.4.1-r1.ebuild:
-  Stable on hppa, ppc.
-
-  08 Oct 2005; Bryan Østergaard <kloeri@g.o> python-2.4.1-r1.ebuild:
-  Stable python-2.4 on alpha, ia64 and x86.
-
-  01 Oct 2005; Bryan Østergaard <kloeri@g.o> python-2.3.5-r2.ebuild,
-  python-2.4.1-r1.ebuild, python-2.4.2.ebuild:
-  Disable additional test, fixing bug 82469, 94859, 96366 and 96488.
-
-*python-2.4.2 (28 Sep 2005)
-
-  28 Sep 2005; Bryan Østergaard <kloeri@g.o>
-  +files/python-2.4.2-readline.patch, +python-2.4.2.ebuild:
-  Bump version to 2.4.2.
-
-  14 Sep 2005; Aaron Walker <ka0ttic@g.o> python-2.3.5-r2.ebuild:
-  2.3.5-r2 stable on mips for security bug #104009.
-
-  11 Sep 2005; Simon Stelling <blubb@g.o> python-2.3.5-r2.ebuild:
-  stable on amd64 wrt bug 104009
-
-  10 Sep 2005; Michael Hanselmann <hansmi@g.o>
-  python-2.3.5-r2.ebuild:
-  Stable on ppc and hppa.
-
-  10 Sep 2005; MATSUU Takuto <matsuu@g.o> python-2.3.5-r2.ebuild:
-  Stable on sh.
-
-  09 Sep 2005; Josh Grebe <squash@g.o> python-2.3.5-r2.ebuild:
-  Sparc stable bump for bug #104009
-
-  09 Sep 2005; Markus Rothe <corsair@g.o> python-2.3.5-r2.ebuild:
-  Stable on ppc64
-
-  08 Sep 2005; Bryan Østergaard <kloeri@g.o> python-2.3.5-r2.ebuild:
-  Stable on x86, alpha and ia64 - bug 104009.
-
-*python-2.3.5-r2 (08 Sep 2005)
-
-  08 Sep 2005; Bryan Østergaard <kloeri@g.o>
-  +files/python-2.3-pcre.patch, +python-2.3.5-r2.ebuild:
-  Version bump to fix pcre security vulnerability, bug 104009.
-
-  16 Aug 2005; Bryan Østergaard <kloeri@g.o> python-2.3.4-r1.ebuild,
-  python-2.3.5.ebuild:
-  Add fix for bug 88777 to arch versions.
-
-  15 Aug 2005; Bryan Østergaard <kloeri@g.o> python-2.3.5-r1.ebuild,
-  python-2.4.1-r1.ebuild:
-  Fix bug 88777 in ~arch versions.
-
-  11 Aug 2005; Mike Frysinger <vapier@g.o>
-  +files/python-2.4.1-bindir-libdir.patch,
-  +files/python-2.4.1-crosscompile.patch, python-2.4.1-r1.ebuild:
-  Add support for cross-compiling.  Grabbed patches from uClibc/OpenEmbedded.
-
-  19 Jul 2005; Bryan Østergaard <kloeri@g.o>
-  +files/python-2.4.1-st_flags.patch, python-2.4.1-r1.ebuild:
-  Update st_flags patch, bug 94637.
-
-  03 Jul 2005; Bryan Østergaard <kloeri@g.o> python-2.3.5.ebuild:
-  Stable on alpha.
-
-  27 Jun 2005; Markus Rothe <corsair@g.o> python-2.3.5.ebuild:
-  Stable on ppc64
-
-  18 Jun 2005; Markus Rothe <corsair@g.o> python-2.4.1-r1.ebuild:
-  added ~ppc64
-
-*python-2.4.1-r1 (16 Jun 2005)
-*python-2.3.5-r1 (16 Jun 2005)
-
-  16 Jun 2005; Bryan Østergaard <kloeri@g.o>
-  +files/python-2.3.5-st_flags.patch, +python-2.3.5-r1.ebuild,
-  +python-2.4.1-r1.ebuild:
-  Add st_flags patch, requested in bug 94637.
-
-  09 Jun 2005; Herbie Hopkins <herbs@g.o>
-  files/python-2.4.1-libdir.patch, python-2.4.1.ebuild:
-  Fix libdir patch to work with amd64s no-symlink profile, removed
-  append-flags -fPIC as this seems to no longer be necessary.
-
-  29 May 2005; <solar@g.o> python-2.3.4-r1.ebuild, python-2.3.5.ebuild,
-  python-2.4-r3.ebuild, python-2.4.1.ebuild:
-  echangelog - update package to use libc expanded variable elibc_uclibc vs
-  uclibc so USE=-* works
-
-  29 May 2005; Alastair Tse <liquidx@g.o>
-  files/python-2.4.1-libdir.patch:
-  remove zlib from libpython dependency (#90545)
-
-  28 May 2005; Bryan Østergaard <kloeri@g.o> python-2.1.3-r1.ebuild,
-  python-2.2.3-r6.ebuild, python-2.3.4-r1.ebuild, python-2.3.5.ebuild,
-  python-2.4-r3.ebuild, python-2.4.1.ebuild:
-  Add missing inherit versionator.
-
-  21 May 2005; Bryan Østergaard <kloeri@g.o> python-2.1.3-r1.ebuild:
-  Fix PROVIDE according to bug 93028.
-
-  18 May 2005; Markus Rothe <corsair@g.o> python-2.3.5.ebuild:
-  Added ~ppc64 to KEYWORDS
-
-  11 May 2005; Marcus D. Hanwell <cryos@g.o> python-2.3.5.ebuild:
-  Stable on amd64.
-
-  07 May 2005; Bryan Østergaard <kloeri@g.o> python-2.3.5.ebuild,
-  python-2.4.1.ebuild:
-  Fix FEATURES=test using slightly modified patch by Rob Cakebread, bug 67970.
-
-  01 May 2005; Stephen Bennett <spb@g.o> python-2.3.4-r1.ebuild,
-  python-2.3.5.ebuild, python-2.4.1.ebuild:
-  Added compile fix for when $LIBC is set.
-
-  30 Apr 2005; Michael Hanselmann <hansmi@g.o> python-2.3.5.ebuild:
-  Stable on ppc.
-
-  28 Apr 2005; Gustavo Zacarias <gustavoz@g.o> python-2.3.5.ebuild:
-  Stable on sparc
-
-*python-2.4.1 (27 Apr 2005)
-
-  27 Apr 2005; Alastair Tse <liquidx@g.o>
-  +files/python-2.4.1-db4.patch, +files/python-2.4.1-libdir.patch,
-  +files/python-2.4.1-readline.patch, files/python-2.4-readline.patch,
-  -python-2.3.3-r2.ebuild, python-2.3.5.ebuild, -python-2.4-r1.ebuild,
-  -python-2.4-r2.ebuild, +python-2.4.1.ebuild:
-  version bump for 2.4.1, clean up readling, db4 and libdir patch for 2.4.1.
-
-  20 Apr 2005; Alastair Tse <liquidx@g.o> python-2.3.5.ebuild,
-  python-2.4-r3.ebuild:
-  reverting changes to deps and adding note about why they are arranged in
-  that way (to remind myself never to touch them again :)
-
-  20 Apr 2005; Alastair Tse <liquidx@g.o>
-  +files/python-2.3-readline.patch, +files/python-2.4-readline.patch,
-  python-2.3.5.ebuild, python-2.4-r3.ebuild:
-  fixing readline support to not require termcap (#79013). fixed DEPEND
-  and RDEPEND order (python-fchksum isn't a DEPEND only)
-
-  08 Apr 2005; Markus Rothe <corsair@g.o> python-2.3.4-r1.ebuild:
-  Stable on ppc64
-
-*python-2.4-r3 (19 Mar 2005)
-
-  19 Mar 2005; Rob Cakebread <pythonhead@g.o>
-  files/python-2.4-libdir.patch, +python-2.4-r3.ebuild:
-  Removed multiple dirs in sys path. bug# 83109
-
-  15 Mar 2005; Alastair Tse <liquidx@g.o> python-2.3.5.ebuild:
-  more multilib fixes (#76791)
-
-  01 Mar 2005; Bryan Østergaard <kloeri@g.o> python-2.3.5.ebuild,
-  python-2.4-r1.ebuild:
-  Fix conditional c++ support for remaining versions.
-
-  27 Feb 2005; Bryan Østergaard <kloeri@g.o> python-2.3.3-r2.ebuild,
-  python-2.3.4-r1.ebuild, python-2.4-r2.ebuild:
-  Disable c++ conditionally.
-
-*python-2.3.5 (17 Feb 2005)
-
-  17 Feb 2005; Rob Cakebread <pythonhead@g.o> +python-2.3.5.ebuild:
-  Version bump.
-
-  09 Feb 2005; Luca Barbato <lu_zero@g.o> python-2.3.4-r1.ebuild:
-  Marked ppc
-
-*python-2.4-r2 (07 Feb 2005)
-
-  07 Feb 2005; Jeremy Huddleston <eradicator@g.o>
-  +files/python-2.4-libdir.patch, files/python-updater, +python-2.4-r2.ebuild:
-  Multilib releated cleanup.
-
-*python-2.2.3-r6 (06 Feb 2005)
-
-  06 Feb 2005; Rob Cakebread <pythonhead@g.o>
-  +files/python-2.2.3-xmlrpc.patch, +files/python-2.3-xmlrpc.patch,
-  +files/python-2.4-xmlrpc.patch, -python-2.2.3-r5.ebuild,
-  +python-2.2.3-r6.ebuild, -python-2.3.3-r1.ebuild, +python-2.3.3-r2.ebuild,
-  -python-2.3.3.ebuild, +python-2.3.4-r1.ebuild, -python-2.3.4.ebuild,
-  +python-2.4-r1.ebuild, -python-2.4.ebuild:
-  Patches and version bumps for security bug# 80592 Python bug# PSF-2005-001 xmlrpc
-  vulnerability. Removed obsolete versions.
-
-  06 Jan 2005; Bryan Østergaard <kloeri@g.o> python-2.4.ebuild:
-  Fix broken Manifest.
-
-  05 Jan 2005; Rob Cakebread <pythonhead@g.o> python-2.4.ebuild:
-  Only apply lib64 patch on CONF_LIBDIR == lib64
-
-  04 Jan 2005; Rob Cakebread <pythonhead@g.o>
-  +files/python-2.4-lib64.patch, python-2.4.ebuild:
-  Added lib64 patch
-
-*python-2.4 (04 Jan 2005)
-
-  04 Jan 2005; Rob Cakebread <pythonhead@g.o>
-  +files/python-2.4-add_portage_search_path.patch,
-  +files/python-2.4-db4.2.patch,
-  +files/python-2.4-disable_modules_and_ssl.patch,
-  +files/python-2.4-gentoo_py_dontcompile.patch,
-  +files/python-2.4-mimetypes_apache.patch, files/python-updater,
-  +python-2.4.ebuild:
-  Version bump. bug# 68775
-
-  29 Dec 2004; Ciaran McCreesh <ciaranm@g.o> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-  06 Nov 2004; Joshua Kinard <kumba@g.o> python-2.3.4.ebuild:
-  Marked stable on mips.
-
-  29 Oct 2004; Alastair Tse <liquidx@g.o> files/python-updater:
-  improvements with tmp log creation with python-updater (#68843)
-
-  19 Oct 2004; Guy Martin <gmsoft@g.o> python-2.3.4.ebuild:
-  Stable on hppa.
-
-  19 Oct 2004; Dylan Carlson <absinthe@g.o> python-2.3.4.ebuild:
-  Stable on amd64.
-
-  19 Oct 2004; Alastair Tse <liquidx@g.o> python-2.3.4.ebuild:
-  fix problem with tk-inter and USE flags handing (grumble)
-
-  18 Oct 2004; Mike Frysinger <vapier@g.o> python-2.3.3-r1.ebuild,
-  python-2.3.4.ebuild:
-  Forward part from 2.3.3-r1 the removal of directories in /usr/lib/python
-  based upon USE flags.
-
-  17 Oct 2004; Jason Wever <weeve@g.o> python-2.3.4.ebuild:
-  Stable on sparc.
-
-  24 Sep 2004; Alastair Tse <liquidx@g.o> -python-2.2.2.ebuild,
-  python-2.3.3-r1.ebuild, python-2.3.3.ebuild, python-2.3.4.ebuild,
-  -python-2.3.4_rc1.ebuild:
-  adding workaround for -fstack-protector-all (#50309)
-
-  06 Sep 2004; Ciaran McCreesh <ciaranm@g.o> python-2.3.3-r1.ebuild,
-  python-2.3.3.ebuild, python-2.3.4.ebuild, python-2.3.4_rc1.ebuild:
-  Switch to use epause and ebeep, bug #62950
-
-  31 Aug 2004; Guy Martin <gmsoft@g.o> python-2.3.4.ebuild:
-  Removed useless -fPIC for hppa.
-
-  18 Aug 2004; Aron Griffis <agriffis@g.o> python-2.3.4.ebuild:
-  stable on alpha
-
-  14 Aug 2004; Travis Tilley <lv@g.o> +files/python-2.3.4-lib64.patch,
-  python-2.3.3-r1.ebuild, python-2.3.4.ebuild:
-  added logic for installing to /usr/lib64, triggered by the CONF_LIBDIR
-  variable. proper CONF_LIBDIR support will require portage 2.0.51_pre18, soon
-  to be released.
-
-  20 Jul 2004; Lars Weiler <pylon@g.o> python-2.1.3-r1.ebuild:
-  Made python-2.1 stable on ppc as there are still some ebuilds which require
-  this version.
-
-  03 Jul 2004; Bryan Østergaard <kloeri@g.o> python-2.3.3-r1.ebuild:
-  Stable on alpha.
-
-  03 Jul 2004; Grant Goodyear <g2boojum@g.o> python-2.3.4.ebuild:
-  x86-obsd minor fix
-
-  01 Jul 2004; Jeremy Huddleston <eradicator@g.o>
-  python-2.1.3-r1.ebuild, python-2.2.2.ebuild, python-2.2.3-r5.ebuild,
-  python-2.3.3-r1.ebuild, python-2.3.3.ebuild, python-2.3.4.ebuild,
-  python-2.3.4_rc1.ebuild:
-  virtual/glibc -> virtual/libc
-
-  25 Jun 2004; Aron Griffis <agriffis@g.o> python-2.2.2.ebuild,
-  python-2.2.3-r5.ebuild, python-2.3.3-r1.ebuild, python-2.3.3.ebuild,
-  python-2.3.4.ebuild, python-2.3.4_rc1.ebuild:
-  QA - fix use invocation and a bug in the 2.3.4 ebuilds:
-  [ -z "use X" -o -z "use tcltk" ] doesn't do what you meant it to do
-
-  20 Jun 2004; Gustavo Zacarias <gustavoz@g.o> python-2.3.3-r1.ebuild:
-  Sparc happy stable
-
-  15 Jun 2004; <solar@g.o> python-2.3.3-r1.ebuild:
-  USE= cleanups and added uclibc
-
-  12 Jun 2004; Tom Gall <tgall@g.o> python-2.3.3-r1.ebuild:
-  stable on ppc64, bug #53575
-
-  06 Jun 2004; Aron Griffis <agriffis@g.o> python-2.2.3-r5.ebuild,
-  python-2.3.3-r1.ebuild, python-2.3.4.ebuild, python-2.3.4_rc1.ebuild:
-  Fix use invocation
-
-*python-2.3.4 (04 Jun 2004)
-
-  04 Jun 2004; Bryan Østergaard <kloeri@g.o> +python-2.3.4.ebuild:
-  Bump version.
-
-  02 Jun 2004; Travis Tilley <lv@g.o> python-2.3.3-r1.ebuild:
-  stable on amd64
-
-  30 May 2004; Guy Martin <gmsoft@g.o> python-2.3.3-r1.ebuild:
-  Marked stable on hppa.
-
-  22 May 2004; Guy Martin <gmsoft@g.o> python-2.3.3-r1.ebuild,
-  python-2.3.3.ebuild, python-2.3.4_rc1.ebuild:
-  Fix os.utime() on hppa. utimes it not supported but unfortunately reported as
-  working.
-
-*python-2.3.4_rc1 (15 May 2004)
-
-  15 May 2004; Joshua Kinard <kumba@g.o> python-2.3.3-r1.ebuild,
-  python-2.3.4_rc1.ebuild:
-  Marking 2.3.3 stable on mips (someone yanked the ~mips keyword at some
-  point...), and 2.3.4 unstable.
-
-  27 Apr 2004; Michael McCabe <randy@g.o> python-2.3.3-r1.ebuild:
-  Marked stable on s390
-
-*python-2.3.3-r1 (12 Apr 2004)
-
-  12 Apr 2004; Alastair Tse <liquidx@g.o> python-2.3.3-r1.ebuild,
-  files/python-2.3-add_portage_search_path_take_2.patch:
-  add workaround for python-2.2 to python-2.3 upgrade possibly breaking older
-  portage versions. make /usr/lib/portage/pym appear before
-  /usr/lib/python*/site-packages in sys.path (not really critical, but better be
-  safe than sorry). also removed c++ support to reduce gcc/glibc upgrade pain
-
-  11 Mar 2004; Alastair Tse <liquidx@g.o> python-2.2.1-r5.ebuild:
-  removing 2.2.1 from tree for security reasons (#44230)
-
-  09 Mar 2004; <agriffis@g.o> python-2.3.3.ebuild:
-  stable on alpha and ia64
-
-  05 Mar 2004; Alastair Tse <liquidx@g.o> python-2.3.3.ebuild:
-  added X useflag for greater tcltk seperation. now needs both X and tcltk USE
-  flags to enable tkinter support
-
-  03 Mar 2004; David Holm <dholm@g.o> python-2.1.3-r1.ebuild:
-  Added to ~ppc.
-
-  27 Feb 2004; Alastair Tse <liquidx@g.o> python-2.3.3.ebuild:
-  completely removed pkg_setup(), added note at the top of the ebuild where you
-  can't miss it.
-
-  27 Feb 2004; Jason Stubbs <jstubbs@g.o> python-2.3.3.ebuild:
-  Removing portage version check again as it's preventing new installations.
-  Bug #43036
-
-  25 Feb 2004; Bryan Østergaard,,, <kloeri@g.o> python-2.3.3.ebuild:
-  Reinstating portage version check as people keep upgrading python without
-  upgrading portage.
-
-  17 Feb 2004; Aron Griffis <agriffis@g.o> python-2.1.3-r1.ebuild:
-  Fix duplicate KEYWORDS settings and mark stable on alpha and ia64 for the sake
-  of dev-python/PyXML-py21
-
-  17 Feb 2004; Aron Griffis <agriffis@g.o> python-2.1.3-r1.ebuild:
-  add ~alpha for the sake of dev-python/Imaging-py21
-
-  10 Feb 2004; Bartosch Pixa <darkspecter@g.o> python-2.3.3.ebuild:
-  set ppc in keywords
-
-  10 Feb 2004; Alastair Tse <liquidx@g.o> python-2.3.3.ebuild,
-  files/python-2.3-db4.2.patch:
-  add fix to make python-2.3.3 db-4.2 (gentoo flavour) aware
-
-  06 Feb 2004; <gustavoz@g.o> python-2.3.3.ebuild:
-  Stable on sparc
-
-  03 Feb 2004; Guy Martin <gmsoft@g.o> python-2.3.3.ebuild :
-  Marked stable on hppa.
-
-  02 Feb 2004; Alastair Tse <liquidx@g.o> files/depreorder.py:
-  update python-updater thanks to a well spotted mistake by Chris Bainbridge
-  <chrb@×××××××××.uk> (#40198)
-
-  27 Jan 2004; Alastair Tse <liquidx@g.o> python-2.3.3.ebuild:
-  disabling pkg_setup again after testing with stage2
-
-  26 Jan 2004; Alastair Tse <liquidx@g.o> python-2.3.3.ebuild:
-  re-instating pkg_setup() warning/abort message. added apache mime.types to
-  mime type search list. modified to use tar.bz2 (saves 1MB of downloads)
-
-  24 Jan 2004; Guy Martin <gmsoft@g.o> python-2.3.3.ebuild:
-  Added ~hppa to KEYWORDS.
-
-  24 Jan 2004; <gustavoz@g.o> python-2.3.3.ebuild:
-  keyworded ~sparc
-
-  24 Jan 2004; Alastair Tse <liquidx@g.o> python-2.3.3.ebuild:
-  add missing doc IUSE (#39232)
-
-  22 Jan 2004; Alastair Tse <liquidx@g.o> python-2.3.3.ebuild,
-  files/depreorder.py:
-  updated python-updater for portage-2.0.50, installed python-updater in
-  /usr/sbin for convienence
-
-  19 Jan 2004; Alastair Tse <liquidx@g.o> python-2.3.2-r2.ebuild,
-  python-2.3.3.ebuild:
-  disable portage check because stable portage already is compatible with
-  python-2.3
-
-  18 Jan 2004; Alastair Tse <liquidx@g.o> python-2.3.3.ebuild:
-  make ROOT var more robust during postinst()
-
-  12 Jan 2004; Luca Barbato <lu_zero@g.o> python-2.2.3-r5.ebuild:
-  Marked ppc
-
-  06 Jan 2004; Aron Griffis <agriffis@g.o> python-2.2.3-r5.ebuild:
-  Stable on ia64 to enable fix for bug 36954; portage-2.0.49-r20 depends on
-  this revision.
-
-  03 Jan 2004; Jason Wever <weeve@g.o> python-2.2.3-r5.ebuild:
-  Marked stable on sparc as portage-2.0.49-r20 really depends on this version of
-  python rather than what the portage ebuild says. Fixes bug #36954 on sparc.
-
-*python-2.3.3 (03 Jan 2004)
-
-  03 Jan 2004; Alastair Tse <liquidx@g.o> python-2.3.2-r2.ebuild,
-  python-2.3.3.ebuild, files/python-2.3.2-disable_modules_and_ssl.patch:
-  version bump to 2.3.3, re-add python disable_modules_and_ssl patch and changed
-  ebuild to build 'socket' module under USE=build
-
-  28 Dec 2003; Joshua Kinard <kumba@g.o> python-2.2.3-r5.ebuild:
-  Move to mips stable (~mips -> mips)
-
-  24 Dec 2003; Sven Blumenstein <bazik@g.o> python-2.3.2-r2.ebuild,
-  files/python-2.3.2-disable_modules_and_ssl.patch:
-  Removed python-2.3.2-disable_modules_and_ssl.patch as
-  it broke python and caused 'ImportError: No module named _socket'.
-  More info: http://article.gmane.org/gmane.linux.gentoo.devel/14621
-
-  14 Dec 2003; Guy Martin <gmsoft@g.o> python-2.2.3-r5.ebuild:
-  Marked stable on hppa.
-
-  13 Dec 2003; Alastair Tse <liquidx@g.o> python-2.3.2-r2.ebuild:
-  clarified warning to prevent more bug reports
-
-  13 Dec 2003; Luca Barbato <lu_zero@g.o> python-2.3.2-r2.ebuild:
-  Marked ~ppc
-
-  08 Dec 2003; Alastair Tse <liquidx@g.o> python-2.2.3-r5.ebuild,
-  python-2.3.2-r2.ebuild:
-  fix python .pyc .pyo cleaning code
-
-  03 Dec 2003; Aron Griffis <agriffis@g.o> python-2.2.3-r5.ebuild:
-  Stable on alpha
-
-  27 Nov 2003; Daniel Ahlberg <aliz@g.o> python-2.2.3-r5.ebuild:
-  Make -fPIC compilation available for all platforms and not just amd64.
-
-  25 Nov 2003; Brad House <brad_mssw@g.o> python-2.2.3-r5.ebuild:
-  mark stable on amd64
-
-  23 Nov 2003; Alastair Tse <liquidx@g.o> python-2.3.2-r2.ebuild:
-  add pkg_setup() to 2.3 as a temporary measure to stop people messing up their
-  own system. Also added a ucs2 local useflag just in case someone complains
-  loudly and knows what they're doing
-
-*python-2.3.2-r2 (22 Nov 2003)
-
-  22 Nov 2003; Alastair Tse <liquidx@g.o> python-2.3.2-r2.ebuild,
-  files/python-updater:
-  ucs4 is now default. if you previously had python-2.3 merged, you'll need to
-  update your packages again. (sorry, that is the price for running p.mask'ed
-  versions). to update your python packages if you had python-2.3 installed,
-  run :
-
-  /usr/portage/dev-lang/python/files/python-updater -o 2.3
-
-  if you are upgrading from python-2.2, then you will need to run:
-
-  /usr/portage/dev-lang/python/files/python-updater
-
-  python-updater script also modified to have more robust command-line
-  parsing. hopefully this will be the last revision till we can go ~x86.
-
-  13 Nov 2003; Alastair Tse <liquidx@g.o> python-2.3.2-r1.ebuild:
-  fix python-config install for python-2.3
-
-  12 Nov 2003; Alastair Tse <liquidx@g.o> python-2.2.2-r1.ebuild,
-  python-2.2.3-r2.ebuild, python-2.2.3-r3.ebuild, python-2.2.3-r4.ebuild,
-  python-2.3.2-r1.ebuild, python-2.3.2.ebuild, files/python-updater:
-  cleanup and add warning on python-updated or PORTDIR is not set
-
-  12 Nov 2003; Daniel Ahlberg <aliz@g.o> python-2.2.3-r5.ebuild :
-  Add a patch that adds CFLAGSFORSHARED variable to some extra modules defined in the Makefile.
-  This variable could hold -fPIC so that the compiled libraries will work on amd64 (and maybe others)
-  without using append-flags -fPIC.
-
-  03 Nov 2003; Alastair Tse <liquidx@g.o> python-2.2.3-r5.ebuild,
-  python-2.3.2-r1.ebuild:
-  added ncurses and ssl to IUSE
-
-  03 Nov 2003; Alastair Tse <liquidx@g.o> python-2.2.3-r5.ebuild:
-  export environment in src_install()
-
-  01 Nov 2003; Alastair Tse <liquidx@g.o> python-2.2.3-r5.ebuild,
-  python-2.3.2-r1.ebuild, files/python-2.2.3-disable_modules_and_ssl.patch,
-  files/python-2.3.2-disable_modules_and_ssl.patch:
-  reordered deps to allow minimal python build for USE='build'. makes python
-  respect useflags explicitly even if the dependency exists. added support to
-  disable SSL. tweaked python_mod_optimize.
-
-*python-2.2.3-r5 (27 Oct 2003)
-
-  27 Oct 2003; Alastair Tse <liquidx@g.o> python-2.2.3-r5.ebuild,
-  files/python-2.2.3-db4.patch:
-  rev bump. fixes to idle.py and bsddb with db-4.1 for 2.2.3
-
-  26 Oct 2003; Rob Cakebread <pythonhead@g.o> python-2.2.3-r4.ebuild:
-  Fixed symlink to idle.py
-
-*python-2.2.3-r4 (22 Oct 2003)
-
-  22 Oct 2003; Alastair Tse <liquidx@g.o> python-2.2.3-r4.ebuild,
-  files/python-2.2.3-gentoo_py_dontcompile.patch:
-  Fixed PYTHON_DONTCOMPILE patch for 2.2.3 thanks to TGL
-  <degrenier@×××××××××××.fr> (#31730)
-
-*python-2.2.3-r3 (17 Oct 2003)
-
-  17 Oct 2003; Alastair Tse <liquidx@g.o> python-2.2.3-r3.ebuild,
-  files/python-2.2.3-db4.patch,
-  files/python-2.2.3-gentoo_py_dontcompile.patch, files/python-updater:
-  Add support for db-4.1, fixes for ewarn hanging for python-updater
-
-  14 Oct 2003; Alastair Tse <liquidx@g.o> python-2.2.3-r3.ebuild:
-  new 2.2.3 version that adds PYTHON_DONTCOMPILE support
-
-  10 Oct 2003; Alastair Tse <liquidx@g.o> files/python-updater:
-  fix typo in python-updater
-
-  09 Oct 2003; Alastair Tse <liquidx@g.o> python-2.3.2-r1.ebuild,
-  files/depreorder.py, files/python-2.2.3-gentoo_py_dontcompile.patch,
-  files/python-updater:
-  improved byte-compiling, fixed out-of-order python-updater and added
-  sys-apps/portage to exclusions
-
-  09 Oct 2003; <tuxus@g.o> python-2.2.3-r1.ebuild:
-  stable on mips
-
-*python-2.3.2-r1 (08 Oct 2003)
-
-  08 Oct 2003; Alastair Tse <liquidx@g.o> python-2.3.2-r1.ebuild,
-  files/python-2.3-gentoo_py_dontcompile.patch:
-  add patch to stop automatic generation of .pyc and .pyo by setting
-  PYTHON_DONTCOMPILE in your environment. also moved to use the new python
-  eclass to automatically optimize and cleanup compiled modules.
-
-*python-2.3.2 (07 Oct 2003)
-
-  07 Oct 2003; Alastair Tse <liquidx@g.o> python-2.2.3-r2.ebuild,
-  python-2.3.2.ebuild, files/python-2.2.3-db4.patch,
-  files/python-2.3-add_portage_search_path.patch, files/python-config-2.3,
-  files/python-updater:
-  it has been a long time coming, but finally there's a 2.3.x release in portage
-  along with a python-2.2.3 update that should fix some niggling issues and also
-  uses the new alternative class. 2.3.2 is still masked and should stay that way
-  until we can confirm the rebuilding script works.
-
-  03 Oct 2003; Alexander Gabert <pappy@g.o> python-2.2.3-r1.ebuild:
-  filter-flags because of segfaulting with fstackprotector in CFLAGS
-
-  23 Sep 2003; Bartosch Pixa <darkspecter@g.o> python-2.2.3-r1.ebuild:
-  set ppc in keywords
-
-  17 Sep 2003; Jon Portnoy <avenj@g.o> python-2.2.3-r1.ebuild :
-  ia64 keywords.
-
-  16 Jul 2003; Alastair Tse <liquidx@g.o> python-2.2.3-r1.ebuild,
-  python-2.2.3.ebuild:
-  marked 2.2.3 stable for x86
-
-  13 Jul 2003; Alastair Tse <liquidx@g.o> python-2.2.3-r1.ebuild:
-  add doc useflag to install python documentation. (#24318)
-
-*python-2.2.3-r1 (03 Jul 2003)
-
-  23 Jul 2003; Guy Martin <gmsoft@g.o> python-2.2.3-r1.ebuild :
-  Marked stable on hppa.
-
-  03 Jul 2003; Alastair Tse <liquidx@g.o> metadata.xml,
-  python-2.2.3-r1.ebuild:
-  added db4 support and enabled threads (pthread) support
-
-*python-2.2.3 (02 Jun 2003)
-
-  06 Jul 2003; Joshua Kinard <kumba@g.o> python-2.2.3.ebuild:
-  Changed ~mips to mips in KEYWORDS
-
-  01 Jul 2003; Todd Sunderlin <todd@g.o> python-2.2.3.ebuild:
-  set stable on sparc
-
-  02 Jun 2003; Alastair Tse <liquidx@g.o> python-2.2.2-r1.ebuild,
-  python-2.2.3.ebuild, files/python-config-2.2:
-  version bump to new bugfix release. fixed python-config location for unstable
-  versions
-
-*python-2.2.2-r1 (08 May 2003)
-
-  08 May 2003; Alastair Tse <liquidx@g.o> python-2.2.2-r1.ebuild,
-  files/python-2.2.2-tk-8.4.x.patch:
-  backported patch to fix tk-8.4.x problems (#20318)
-
-  23 Feb 2003; Guy Martin <gmsoft@g.o> python-2.2.2.ebuild :
-  Added -fPIC to CFLAGS on hppa. It's needed by apps linking to some python libs.
-
-  21 Feb 2003; Zach Welch <zwelch@g.o> python-2.2.2.ebuild :
-  Added arm to keywords.
-
-  07 Feb 2003; Guy Martin <gmsoft@g.o> python-2.2.2.ebuild :
-  Added hppa to keywords.
-
-  06 Dec 2002; Rodney Rees <manson@g.o> : changed sparc ~sparc keywords
-
-  29 Nov 2002; Dan Armak <danarmak@g.o> ChangeLog  :
-
-  Added missing python-config for 2.2.2.
-
-*python-2.2.2 (20 Oct 2002)
-
-  07 Jan 2003; Jan Seidel <tuxus@g.o> python-2.2.2.ebuild :
-  Added mips to keywords
-
-  20 Oct 2002; Jon Nelson <jnelson@g.o> :
-  2.2.2 is released
-
-*python-2.2.1-r5 (03 Oct 2002)
-
-  15 Oct 2002; Martin Schlemmer <azarah@g.o> :
-  Fix the sed on /usr/lib/python<ver>/config/Makefile to change
-  OPT to 'OPT = -DNDEBUG', and not 'OPT = -NDEBUG' which caused
-  gcc warnings.
-
-  03 Oct 2002; Daniel Ahlberg <aliz@g.o> :
-  Security update.
-
-*python-2.2.1-r4 (7 Sep 2002)
-  7 Sep 2002; Nicholas Jones <carpaski@g.o> python-2.2.1-r4.ebuild
-  Fix for bug #7641 -- Fixes the OPT flags in Makefile so that gcc
-  isn't confused by conflicting build types of i386 and user set.
-
-*python-2.2.1-r3 (2 Sep 2002)
-  2 Sep 2002; Jon Nelson <jnelson@g.o> python-2.2.1-r3.ebuild
-  Filter -malign-double from flags
-
-*python-2.1.3-r1 (2 Jul 2002)
-
-  20 Jul 2002; Doug Goldstein <cardoe@g.o> python-2.1.3-r1.ebuild
-  Added missing KEYWORDS
-
-  2 Jul 2002; Jon Nelson <jnelson@g.o> python-2.1.3-r1.ebuild:
-  Fix Makefile.pre.in install (the one we want is located in Misc)
-
-*python-2.1.3 (1 Jul 2002)
-
-  20 Jul 2002; Doug Goldstein <cardoe@g.o> python-2.1.3.ebuild
-  Added missing KEYWORDS
-
-  1 Jul 2002; Jon Nelson <jnelson@g.o>: python-2.1.3.ebuild
-  This is a python 2.1.3 ebuild that does *not* conflict with
-  python 2.2.*
-  Note that 99.9% of the people out there won't use it anyway,
-  because 2.2 will always be selected as most recent. ;-)
-
-*python-2.2.1-r2 (1 Jul 2002)
-
-  20 Jul 2002; Doug Goldstein <cardoe@g.o>: python-2.2.1-r2.ebuild
-  Added missing KEYWORDS
-
-  30 Jun 2002; Jon Nelson <jnelson@g.o>: python-2.2.1-r2.ebuild
-  Add "-lm" to the python-config script. Closes bug #4217.
-  2.2.1-r2 has a 100% identical ebuild file to 2.2.1-r1, just the
-  python-config file has changed.
-
-*python-2.2.1-r1 (29 May 2002)
-
-  20 Jul 2002; Doug Goldstein <cardoe@g.o>: python-2.2.1-r1.ebuild
-  Added missing KEYWORDS
-
-  29 May 2002; Jon Nelson <jnelson@g.o>: python-2.2.1-r1.ebuild
-  Add expat to build depends (except during bootstrap), use econf
-  and emake, and don't mess with Modules/Setup.local because modules
-  are build as shared on Linux as default.
-
-*python-2.2.1 (2 May 2002)
-
-  20 Jul 2002; Doug Goldstein <cardoe@g.o>: python-2.2.1.ebuild
-  Added missing KEYWORDS
-
-  2 May 2002; Jon Nelson <jnelson@g.o>: python-2.2.1.ebuild
-  Update to 2.2.1, and completely re-vamp build procedure
-  This should solve several build issues.
-
-*python-2.2-r7 (29 Apr 2002)
-
-  29 Apr 2002; Daniel Robbins <drobbins@g.o>: New rev to fix bug #2199;
-  python-config should now work properly.
-
-*python-2.2-r6 (24 Apr 2002)
-
-  24 Apr 2002; Jon Nelson <jnelson@g.o> python-2.2-r6.ebuild : Make
-  python build with shared modules.  Depends on python-fchksum, as fchksum *no
-  longer built in*
-
-*python-2.2-r5 (8 Apr 2002)
-
-  8 Apr 2002; Jared H. Hudson <jhhudso@g.o> python-2.2-r5.ebuild :
-
-  Added include flag for compilation of tcltk with python to compile
-  correctly.
-
-  --------
-
-  06 Apr 2002; Daniel Robbins <drobbins@g.o> : the 2.2-r4 ebuild now
-  disables C++ support if we are creating a new build image (since we have no
-  C++ in that case).
-
-  30 Mar 2002; Daniel Robbins <drobbins@g.o> : changed PROVIDE from
-  virtual/python-2.2 to virtual/python.  No rev bump.
-
-*python-2.2-r4 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@g.o> ChangeLog :
-
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
deleted file mode 100644
index 8042abd..0000000
--- a/dev-lang/python/Manifest
+++ /dev/null
@@ -1,50 +0,0 @@
-AUX CVE-2013-4238_py27.patch 11591 SHA256 050cc2d4b9d588f2587010a30819591e02130fde90594782993a39c945c1559b SHA512 f9b1d0573bc7175b8fe6bdd8b6777a376cd717a594a14a6ddb334e0107596b0fbfbfe8a0c1743a0da54ce8ac8905cb7385aa2ae26698272f679763542c13e7e2 WHIRLPOOL bbf89edb2e3620aae3f54e80feba98d75fa566594b2e71e88b75c22036201a2692a77daf56080f4413612edf159f4282f5494a0a5dd11b350bcde248ef51f139
-AUX CVE-2013-4238_py33.patch 11437 SHA256 e4f78490fc247df9d1133dc9f2deec47b1c582c4af1c8e93bd503d889c9eb716 SHA512 d1f1b64c46056f178b89abfe61c7c653afc0ed67cf9a8ef8c981d1cf6a1c389cb20bd354cac3a30c1241e6fe24a49e165527571276c1f8afb55989f5f069ba00 WHIRLPOOL e5889b6be0a2db7ec45ff8cbe9fa8481c6c69b25091b62635d2ff595ef5d0b1136485f7adb04f4c0c97402edfd9d915d4fd05e2b6bf1942497d81de1b1cefdce
-AUX pydoc.conf 279 SHA256 6437e85d16d34efaf2665b3cabb0707392e6dee3df04989d3fcac63fd22997e8 SHA512 2d552b6262fa4c7cd75f45d93b8a2657eb9154decbc08f9b73d2e67e1d84367b498f8556fbba20f7b57414281cfd673fff607da3c688c1d6bb9842e92cf0c32a WHIRLPOOL 1ba44797765939d7c0bcbecb08cb6201eeff9b134d4d3caef9339729dcad9f258e20b16db5f369f49b378df3c91e530115dbce5ce3595d71cd325a48793ac814
-AUX pydoc.init 711 SHA256 bf42ce358c4505bb9c9923758cf7c237113b5465778fe8d0d9781625586003fd SHA512 328597e0f7594dcc1d929dcf15feb39e08a0f85067b226140219c03c2f0a0a5fa9518f26d52723aeb77e36eb5e46d54b5ee4ddbcfc52aa81540a738c49c03b73 WHIRLPOOL 846c7d90fc4b7b74d65c6019ea8e7c9f0d2efb0b6cad5b91d53b5b7bda509f3b625fb30eb27ea59cacf6233378d800c35375108762ba82fb4c2155f2dbf08f13
-AUX python-2.5-tcl86.patch 615 SHA256 cc649fbd471c7e348fc64f3844d9f4e1aab604cb3a028c9fb2cc58ba816b7bda SHA512 dca5eaff3ba981d699805c310dba0a7412ab2b856256ef25e41eb49e1441c382f868406ddce04a1e9768ccfacab1fb39e5e7a320f4ca6884a51583ca61a77dc8 WHIRLPOOL 515f1a5a163d4b34adff2b8e10e43c83f9575f185391440cf89155076b0399d3c5249e5a8741894d94092af4c5271c125b032bbc76c9e4e6f6d94f26133e5672
-AUX python-2.7-issue16248.patch 735 SHA256 ed137a0ab513e6d9c910e37f637aef2d58fb730070e447572f39d46d9cc99568 SHA512 da00f8571741d4cfb529b9db875b5d831d5d8e43fdc464bc43adee046f208165ab6b13d671bc90be988b1099afeac4fc0e7ba7fa473ff74a9ec7731da89e11a9 WHIRLPOOL ad770b848666efb5cc3b8c07a530f2a9aaca683f4b447c2d835e39be59a5dde35a28ab8cdb278ecf456e15e57b7401ff83fb04ac71bd8d80abc19d45beb84d62
-AUX python-2.7-issue18851.patch 11805 SHA256 4ecff8db20cdc4d9b0692a126859c318a9ba20bf1eff6e633c964871b2410d66 SHA512 b1eeec1451d011f37c65676819bf8391b9657d93a0b9f03d0db09956ef052fa3f2d922d1d5fc3c69567f549aa86f65a06670dcf3ead8300c0ac97651f9a503cd WHIRLPOOL b4b51d590175959df1f8373ff86343618b4474ea9afc2ef9360c680c986f30fa8f432eeb076de676cb87052cc6453a2b613dfaab51ab1ec5945a7c7c496a4f9f
-AUX python-2.7.5-library-path.patch 991 SHA256 ff7a4a1846ebcadc2dbf979ea619072caac22e47909fe188fc4b6becce6ea2eb SHA512 74916d541eb38c526dc1243fe5e5a9de3a7875f02c53e5f49e60182ba042de2f15514364e7fbd821146dcf92db2bba88d8a9f46d4c71237b73fd39cbabf93d85 WHIRLPOOL 62bb1c85941ccaac7ca6f6fb2d93dc27f206cf9f815b90ef1f89748dfdd1d38deda9f6bf7eb2ce9fd8635d1a77576819192e8049ec5de52fdeb9f981dfb32f9f
-AUX python-2.7.5-nonfatal-compileall.patch 750 SHA256 3f5a137602f1b3f0522f561c168a740f0080b29c2c888cb3a8dbbcc4407c2d9e SHA512 d2e93e2a6fcd55d516df0ddaca31af97faed677ea6b4be282eb99e7864f8a7399b5ca11139844a4b3c264832183483b0f4c8c9865c05de0e8520e6d2c8f1dbc6 WHIRLPOOL ab576e3a4e67f881d6d5c705503230ace125fe94d907d7f69bb573dd492070b8b34078a2b1205f315eb45244fbae8855c0f15ce35158f1d356f1bd4acf83b3c2
-AUX python-2.7.5-re_unsigned_ptrdiff.patch 941 SHA256 5b0c0465a23d27e1c8f0961a8d88b3af75fbc9933ab60c2a71091720a3681079 SHA512 d46fbbc8411fae78cdfca2564faca42f32bb95ee348b9aa3fd1ca90b346cc52cd468945cee07e6df4dff46c10cee6856a58004f8e453960f6dca2751c077802b WHIRLPOOL 10bb08242dd9a055f6bdaf3eb1546786b58f180667c6355ea7276114cbac0ffba6c34822add7965fe3b5d41cc92ce8ec45e2d1d56377d8a6aa2755ef4267d101
-AUX python-2.7.6-recvfrom_into_buffer_overflow.patch 563 SHA256 bdf280058fe31b6e9d08a32e4ce16e958e3dddeed515417a03b25e5ec62d41b4 SHA512 21b534e41ce1cd1bf954849f4246ef0ae907ba7335b42ccfc914cc33068db91140dc1fea0f1b8a83818609e7f5a5f5df6623f029c2c86004f2126eb3f2699c06 WHIRLPOOL 2ffe173be651aae7d43ad8ee75600133ea96952431140c7c00e0ca6ad431d3faa230207f93f1191bfd3bcdf7b0c9af61948871b06158e6953106d7f2d0c7e9f5
-AUX python-2.7.9-ncurses-pkg-config.patch 305 SHA256 0464ec04985c642b40d53cb8f816abf18702aeae97cb52ec73541694317180c7 SHA512 2c18b5041a7a2f306dd4d0d6695bd851ca14c9107b2e3e856ec094bc53c7cc407b49e1f4813ee9e753b3ad2d4f6edda943a66bb1e6c895ab956a5f84d30646c6 WHIRLPOOL 774e2707a0c6ace106df30c0d4915527fb0ac7584cd0f1e12bbdb29d584c3b38c770d8fe8999d0166e94deab561cbed0c8ad09c27fcd83ed27045dfdede89a5a
-AUX python-3.2-CVE-2013-2099.patch 2102 SHA256 76a89951e7efcf14d37e30e0104446429ca121c68cbb1753ec362a177c1b5a54 SHA512 03d2a09fe730bf8c94df1eb10f8bac37a31a28dfb45b7d49abe1c3ffe26ca948f8d00eb58319d34102f8a747a038d447d3507b11c051c778c42ae21ac1066c8e WHIRLPOOL 3cd701c606ef1f4f557d1d250af41a860a6a5c4b6d9ff9a9f469ab6974f13e1205d2c4c791e9bd353fd4ff726f6cbf979f9a3927b83b04af5128c1aea7070496
-AUX python-3.2-CVE-2014-1912.patch 1635 SHA256 044a5857f54f1c6adfc8e3018cbcc5230ca21bc8efaf6b68f95fc47560ed13aa SHA512 afca87c0491087715f54bac777c15be426dbf3cf079859bc8559b4f4bab520e0835976221d16073b14b2fa584c0260a565307bea039f345fa5c7e3e1f9396228 WHIRLPOOL 97c08598f7cbaa28fa83819c9b9423ec218363c18781afc8ab98a3e9847459e59ae35d567b1f775eca7bc1ec53b17c656203ea6e332559607c507ec958eb8291
-AUX python-3.2-CVE-2014-4616.patch 1515 SHA256 8d971bca441c3b17cf7c2a1ee2391059de472d8a10ec4060af23bae65ffddf8c SHA512 fff6cdbde476a5804184fad6615dab3577c2e81bf2dc8f2276ad02d213239e6f47a642e9c8270de352e7123fcd712a1b0073d85146c9bee59d9b6644f5a2cb3f WHIRLPOOL 4894fd9f33a01d4aae477cc558f790ad792f02965ca841b4fb1119711ff4254bd19bac3f67872ae3fc761c677ec078b6c156d71ba036cc91fdbfe32b43044cfc
-AUX python-3.2-issue16248.patch 738 SHA256 b5e94ead2622f355d733232dcfdac4dab53889aab12980fa1e4496c296191e77 SHA512 6fcf3d4cf05e41758a6d51ad9cc25ce9fcd1d33854f096b599811a07ef6b7f0cc4f178c4db6b15c5c9ee86eb53fcc736fede0dfb4eae81ca429d0fad62d84db9 WHIRLPOOL dd620bdce394a74910f4deed50b8bcd2b5d6b61af1e2e225a7c36fe4f293560fe1237a2111a4a4a334dfd1272fa4b7faf6289b2a018864c4f154c8a8a8b85c5c
-AUX python-3.3-CVE-2013-2099.patch 2102 SHA256 d5ccc8de43a176d9d16c3a7be58d32dcf3c952147d8866f84dffcd8fa66f6396 SHA512 a8e2c8fd3d3c3924acb856e89b6dc6965c887688e4c7d078c27abacfaf6b33b12484d86942b75643f28e4a14a465e2ec6a30fe53acf2ab036ae667fb7f76d737 WHIRLPOOL c02bd815d5143b6a916a91f40bb7971f1be188e836ab6095a5befd6410545acba0d44b4b0a75a5f7e7d84105018c0ef27887eefdcd883c73e68f872bb4138e35
-AUX python-3.3-CVE-2014-4616.patch 1896 SHA256 50262c507dff44a2ec928281251882aa7c192954713f5a29def8eee7cc29d3d0 SHA512 98d7929d7b6dd88de511690776bf6cabfb5a2d21f89cd21573aba39cb03156666ce0404bd9e380c8193a28cf73d386a6b56c71f90ff3b66da48689953dea997b WHIRLPOOL 5debc17107a9d15a36bc73ef8c68f6f9c89ba060191f6d310709852a2cb01d9b4143c40cd0ce0a3df1b02ace8afe865122bd10dab38aafc1d1ec1e1c2c1b7331
-AUX python-3.3.5-ncurses-pkg-config.patch 1175 SHA256 2a64b3b5628f9114c091bfc5221c244f8966d83ce08e81971ec890a59f2d93c3 SHA512 25e37ac17a8fc5907bf9ce55e5c58337895a38cf4d4a6bd333a44f30a0f6ac65510a8594d3e953f477a8d724de9932450e6df56e79d7884bc451b23c9a7ad8e0 WHIRLPOOL b213fa0c9707b1e04036fd3cd85f040b7d459f1046b90c619f85a4c221e946b09ffb2d1a7c5b10f795674f89af886ac7f93ff8fd440c2f7014ee40e77b752e21
-AUX python-3.4.3-ncurses-pkg-config.patch 302 SHA256 43e704d8dc96606d96c5eee82ecb53798d6586f591b4ee54d08137e962705101 SHA512 9e2bc2af0077d6282d9512b172d80ee294c47a6d41855474eed641afa8139ce4667a64c4676f5b2e40a90278b780a46e998d1096422ed0fe1d83b973dc455dc2 WHIRLPOOL 321452dd6f443609fddd4da7f5fb0c8897e99f9f4eea77eafc81ca14a9a4995818ea5e1400e44d9531c2b5d9491326c64d838b262b9e1b4814ec47f564a069ef
-AUX python-config-2.4-r1 1624 SHA256 923a9e896f99cca5aa4ccbb02f981c6e26a2b1aa42326de2359d3c884bde2a9f SHA512 f8a0e12bed93385b3dddfa64a416ff4a560ec1b12c6c4a0dd715a2c804a43b6a292f0fe13e28d7828d4c4d620cde9dd7eab6a3423216786917ea6f51856ff53c WHIRLPOOL f2fe759b05ac0eb3b8dd196b0c68b8b8e0145ab79659eb4a45adee1bf7ae7260f457ae6192b9792990babd59cb98cceec05a8d93a50a3203517fe49ec30f5e0e
-DIST Python-2.6.9.tgz 13285074 SHA256 7277b1285d8a82f374ef6ebaac85b003266f7939b3f2a24a3af52f9523ac94db SHA512 7ff28f41f7dc12e1504a781060520440bbf74b96c5df269ca5218f5910eae63898b94fdd398f549217912689814bc5275bb3b5ec4cc892f20bb468fc1b041c0c WHIRLPOOL 909f612286314ea004eef328a58d7b0aecffc1a524f6b283333ef0f299413055c1f7ec4e2d21a44d1beeaa8e11aabd68510cf9c5840cb5394176cbc8f2e5c147
-DIST Python-2.7.9.tar.xz 12164712 SHA256 90d27e14ea7e03570026850e2e50ba71ad20b7eb31035aada1cf3def8f8d4916 SHA512 6939182463272a6bb9da0e327bfb9efc574a87820f2ae39eaf02d9fae053dbe0004330e916e6828becfef94cbe294acb0a88a600f8930b99b94fcfc4efc44ff4 WHIRLPOOL 993313811eddef1820e6f3ee0e02848c73bdfce65b85ab0e360603e726c31e1cc9dc6c128e3fe086cafc94164d2d628ff5d859e13b90648da6352c35ddeedcd4
-DIST Python-3.2.5.tar.xz 9221624 SHA256 8ccb9645b9779fc4550055b2ebb21a724ab7a63dee45643286eb4f79b2f84116 SHA512 6e71d01695c7b1e74d9781e4ac40a8d1560cae659d5351d392fc685b84316568d93740a99d2ed878dd87d4ce1708d0474cb01c6bad7b3dab610c639f3255b09d WHIRLPOOL d5e5fae5e1d4110861e1e1dac00c9812abbbc37205e8ce3cd268535ab9f66e24038ab4778af8bb834fd472eaa0281730f1f2fabdf6dffc4f6b54ef32c1d75953
-DIST Python-3.3.5.tar.xz 12116308 SHA256 abe99b484434503d8b23be0f243ec27139e743a4798cd71c1dce3cf40e63b6e5 SHA512 562ebd85291f29ff18d37f05682763fc45aa9d070688006f4ef5c89392a48022357c3ca9ee1d795e9e863bdef413e6bab77b8d65581d374a76dbe7cacec65550 WHIRLPOOL f4b6010d32b28b7bb038cbb7c5f98d325cc4253fd1be9a0a1089ed6fd7dd414c5169931d21ef819137d5c1084517a650828f260cf2a1d8ce871bc67aeef3fff8
-DIST Python-3.4.0.tar.xz 14084912 SHA256 f13686c0a2d45e7146759e9d5d1cbd8097a0606483c0cf7730e1e13f58b14cbe SHA512 4fd4d3352e3b64ef8017ba083a2d894b99e89882581bcf30cdb218578f0f384aa6efc89211ffe44f5bb3d783c79763e26823242d27382fd05900099dd966ca31 WHIRLPOOL 82a1bb14a7683e2bce32221792923f334b61fabc75b0b293b0ecc0d810c8a4bebf05b75a061d85dd6612a8ca699c9b4f358e2aef5d14706aad1c18f42c9b8d55
-DIST Python-3.4.1.tar.xz 14125788 SHA256 c595a163104399041fcbe1c5c04db4c1da94f917b82ce89e8944c8edff7aedc4 SHA512 09b6390c07334974f189fb1c90bc2310898aef76661b1cecaa2b4d50001fa3df0fa0c63d3471a5a0dc7f9e08dd559d38d3bc45a6c05a816d8b2ed6b2a20e5fa9 WHIRLPOOL c8f879bb5d42a759b0804aa58d90330d9be6f4c29652ec40f07ca7da31510eadbd6b4eceb2b213af9a1af031c8321fc25faccae77763a31814eb0569831b8bfd
-DIST Python-3.4.2.tar.xz 14223804 SHA256 1c6d9682d145c056537e477bbfa060ce727f9edd38df1827e0f970dcf04b2def SHA512 12de5309cfaf91f5292efd660b5abe31581b902fdcc302317b597ffa74c9f5ec14ec1dd55994bcccd50d40473ae344ae19bf917ccfb8ab4906c8777d6ea95b17 WHIRLPOOL 358a2ca605676a7b6decf7cc9edfcf5edd6e15eb7b08e48fbf5f78422d3470a1233830867e3986a6bd564e105726298d3664ad04b90a233f90a46d6b81d8d60f
-DIST Python-3.4.3.tar.xz 14421964 SHA256 b5b3963533768d5fc325a4d7a6bd6f666726002d696f1d399ec06b043ea996b8 SHA512 55b2d7c07da8ad3a3971b4687da2e45809c6f1474732e93b0432f121f287d0b63ad8a9bf381987ea70f47a03d9474c3e55b7d86d14800bf7ef29b3324d8d35b9 WHIRLPOOL f851dedc6a1ea35adec83d60784a5fbcd9dfcf6aa8858bb5ada114fa2ff55add1fbf323ab94ec039ecdedb26d59e8f2e6e171cd9fc1ed41ad9cfa434a555cff3
-DIST python-gentoo-patches-2.6.9-0.tar.xz 17532 SHA256 6ff9448c3a8412f9624363ec6f321b4e7f098aff350a82fde74f82adfbb0cae3 SHA512 e6d134200df8320fe137f0a282b7564aba02b10eab2d4585fa82de5b4740223ddeac7a5ea922a40cea8496a1a706b6787310eae45978a3e69342bb80a7670a39 WHIRLPOOL 09b38d10f9415f41205dec2c9e9df5f0687e23f791d31ce1127d96bd489c9fc7825912096b37329d62e66d8c99778ad1ffcbdbd4a2b77b5305f75ea7c28fe15d
-DIST python-gentoo-patches-2.7.9-0.tar.xz 14020 SHA256 d1ae164ab14e265ff63d6a724e0c2b5519bdb790fe8b7796c2124a30cecc8ef8 SHA512 83aa867ce562ff3acf970a4b3ecf7132f34aca1ecf286b90575a20e6e044600b98ff1d7f1a7ee613d4429a6a71cfe8beaff144b64b6beb456ea8691ca00937b0 WHIRLPOOL 5b4f7bd2dcec3a45e12fe5baf1c196faf2b754376a6bccb555dd12a1af28a202d51a0d956e4450ff2f334df13b296ee27b36aa967cb179925c386cd58389050b
-DIST python-gentoo-patches-2.7.9-1.tar.xz 12872 SHA256 9d912c55db56b5bfe054a6164614969fc9605f48f2ffec8770941f798a16470a SHA512 cbbae0faa246516361cd39e55d841660471931bb26cae8396a7d3929c9f4b4a3d8d5a76f7fa295deeb6335c26ed95aab18399e34c2603a582743b6e760f2b280 WHIRLPOOL 422ace8a204481458acd9cfd3b3b85e4b02fb2fe656c8ef8473a76444d5a1b54cd9d690e0009904f8c251697f60105769ce6a97c26224548476c0ece6595e484
-DIST python-gentoo-patches-3.2.5-1.tar.xz 14628 SHA256 0acc5531421781ab7f30e6fc8a502f202b79aa285b4f411eb16ea0a9e6d958c1 SHA512 1abbd53e92466d258802717309e1839ae931b8a4b0a5a27d4d0da748e71cf96ac47c6837bdbae5dd6921a46cee339c178f86ff3108afe95e6a0a42c4f4300791 WHIRLPOOL de003cccb8b311413889713d66b7987f28a1f906cc9642621d1fd2a379ceae4f0f901c137503d808dc3da7295ac611de09781bf8661cdbcd14c1d7c94ba489c2
-DIST python-gentoo-patches-3.3.5-0.tar.xz 12892 SHA256 a7240de9598033cb40f8f273d8104d4e2b1dcaea028d45ac28efaa3c680ff6f7 SHA512 27eef4c2b3f631b000db3f6a5c426d9b498d63a08fe82b1ab7c2c010fb72208109461a5f008d47703852526655b70a734ea95be8742897026db5750bb9cc9d16 WHIRLPOOL edab9222d7da94cab3b1de0e1a27c6c7dbd49194b813a0a1cf9e532063029c4e4f19151c9f4878eeabed3168ff1f97eae7f008280c7ed2897fc14c5516c68d7e
-DIST python-gentoo-patches-3.4.0-0.tar.xz 12900 SHA256 5e5ca54eaf446c7dde4155e5d792df5229c7790b32abb5aca38cbc4fc30f9c45 SHA512 be9851f9062f6aebbd2f23d91a4038dad1a8757049745ccbb1cc618ff6bc3dfab0326d520d27678541f4421e5db41d64f632fe6fb3e80f2cf4e73dadd3d5620b WHIRLPOOL df998b5588c928ca506f9f4434093a1f60637206f03f5e067444531dae02168f88b22c8de7d58e745bdb9d85e17abd667ed51f7f5651779c2c94da98f0925679
-DIST python-gentoo-patches-3.4.1-0.tar.xz 11164 SHA256 7d88e40ed02bef2d26802516fc0138a28cca58e298204e6b1a32054f9224fcb6 SHA512 5ecdf6a1ccb8d12b5b7436e1b7f641a41afcd7fde573e9249e3dc0d438bacb1eb6a5255e149388194dbfd2951fee4f8c800199362dfd072ff96776bbbcad0bbe WHIRLPOOL 707f943f9af7c3fc6deed7cfca5a4198f65a34434893840ba8e4f4c2a3d055e8f927069cb8855b5fe20dff643b7e2d41f35f65e1f3f300e350c0f291b4df6bc2
-DIST python-gentoo-patches-3.4.2-0.tar.xz 11568 SHA256 86028c50ecb16fdbaae68662d9749f8c5dbbad6359423ed02c7b379d4aaeb7e3 SHA512 786d74df8ca168655f38d052a3e79541fd1d9f58845f8fdc296246208f8ddc61e5a0d95d675432fcac77dda7c0ab419162790d0e39337bce2fb5c5d3f23c9ef4 WHIRLPOOL 5b26c7d5facd93ca334f23057e26e3a2af71d9d590ab270d4619bb57e0d14bc6465c08ea34c53e1ccf347f5938fd0199a0edf2ddada3c3a891a5568f1eb81227
-DIST python-gentoo-patches-3.4.3-0.tar.xz 11736 SHA256 917a9d98d40a91379c81ea57922a8632ba3c6f6db6f304ed6262bc88c5044946 SHA512 7ad1b30cf8bb7900fe518ed71e4ee55dd92ce7e23ae583a1f2f851b26cfa8c4f4271d28f418e780f3725a48d4ca8eeb8fd083f850810c66c29fb08c430828d72 WHIRLPOOL 074e8c0055b49a028eebda21d1acfb8a25ec968eb8b350c2bed37e042f9f354871e413db13e0ef2fe41d7e56d647178a7b3622019f36c4819c2c68f088366eb1
-EBUILD python-2.6.9.ebuild 11294 SHA256 afd73be1f2aeaa83d2ada51f126115cd99e83f1d28323fe7294e67fc46883346 SHA512 ef6952a0c69267534d9c4875ae5a6179f8e1fca2d431ea75085f100240297a2de4cf48aca72491628b20ac6d40773bca06176ff7191a6fd6f481653f8c975b2d WHIRLPOOL 29883ed256da0abe6ef2b4c8ee35ee9c95cb64564486d74a7dd0d32b2c157b17779ce31347f39bb003a7a06dc68557de5081c5af6a4d15ca3fd7c6793bf767c2
-EBUILD python-2.7.9-r1.ebuild 10532 SHA256 b257af119d2bb1fe14c9ffb9d7f5eb083446ecb2e455d54de878bd081ae52342 SHA512 46199fa81a8aa897f853ad50bc9d63127ab16f4062f57e10b536f49c09c37ba1fb357f449ad4570b3878414c58b80f14019ec1ecd12d1fe764c0c14a883478e7 WHIRLPOOL fe66cf76e68fa1ac211c0a60bc75b69f0d55ecf151611aa7b7f3ecaa6f5f42979b471ce9d7ce275083b9d1e2ba1b1d43b4a0c913730099036213a646d151a6e1
-EBUILD python-2.7.9-r2.ebuild 10701 SHA256 b1e73f3646351b27baa31079a18db4b51b47151e25655856fb037f8144ff3cf8 SHA512 2f4b782941c933a0e09b9a9459812a1bcdd46126f7d675ad3ca8753aa505efabc8e5b68009c7f7956027f040c944a6974b759bf696110c60a8371a2f5a8c867c WHIRLPOOL 0399f5ae86ff253bd8e4f379822bef7404f968689718abae366e49c32646350677d0f873e44d3163eed98036f4c0cfa23abf3df97017fcfc286941b1121db840
-EBUILD python-3.2.5-r6.ebuild 11463 SHA256 3dc64bc08b641e7befa7366f8a5bb34567beb970adeeccd8f3c71a36876fc27f SHA512 615d181fd1587ba106f1ad68a081752a1bea4163fa340abacebc13b9fac2c556e186db39763c59b4e100eda15e404bb100480d7f839cb8c4746cdc32d1662ae0 WHIRLPOOL 5c998bfe4d8b2d3874b2c2bbb121b84b6e7dd3d247d3e4fe657153226f12c5eb98b6802ddbc53c6ce2ea3a72dc1e830fe00e6963157768ca3012a8e118dd4d70
-EBUILD python-3.3.5-r1.ebuild 9581 SHA256 45e32db6d88b744d1f0100c4ca80a946e727379df4ce1d4a75046cf1fa49f3dc SHA512 58b1c4d0c3bc78f90dd2eebcd4864b163d4d7f4c919727c34b80f554025a57b0ac4c72dd78b3fdb4985f0fc8453ce46b530f5864ffa39b2f8449f9fc1db869b7 WHIRLPOOL 99e84e88f81f430d319fcf316c71af148a5cf155802a5132bc9dc34fa59fa1ea9fa27570181ab9866f501ab4f5a9908f7b9ada4c2a553750c1ea6276b81ec4a2
-EBUILD python-3.4.0.ebuild 9306 SHA256 ecb382171c85b5dae6f9da1b1ead58548ae0077669bc851c2416abdc5180a25c SHA512 6b51e94abefde02c569969f2f4e3d6ab19dd548ec8c3d925b519d9abd91c13e29b13d84695ec02a5cc526a38af4e0965c6eb2a90745ffcc75c88072696e8b0c4 WHIRLPOOL 41e110e37c8fa282183bec1fe628e4b36416396094f8548a32b8a7714a49e1a11bc1874aea89e808eb20fc34b011836c22b22755aa09886833e1cde9144cf2fa
-EBUILD python-3.4.1.ebuild 9228 SHA256 2e0c3853e037995afde3f233889eb05e9f5459a94a4cccbad28a4b1d97084441 SHA512 344a2903f47be14248edb1318cb138fe20113610211d368aca1e0a298fe4c3a169665884d39a882f2f488537c441a0d4fd87f52c2d3a595a0b40886c84fc6f50 WHIRLPOOL bcc30f3ef7f67327634f066c1b0de6c0549dfd7a32d03d22a8bcd5f8468d17c8f7e31da5fa8910add24fab64dfbb663c8dcf3127d86dff6f165274a538dcd14a
-EBUILD python-3.4.2.ebuild 9240 SHA256 24914c177f25fd847a792bbca0739b217dd02a44e101d38940eb28730984a29c SHA512 0f154558579481c3549a2969ee9a300d82aa266106faa02d4e5a547a0344de795ad7c6f255b833e2b89a3098a9c3f7166c221de0b8ba4f00b8a657b6ebae5851 WHIRLPOOL d7df13b58fdac0ac1ec351fa802bbb7b30605de2eda7934b395480de9bbdb4d97beeb5f581e99e6ce707ced024728edc389930ef8df5dfcc89352e71f4077d45
-EBUILD python-3.4.3.ebuild 9267 SHA256 19eeba5229976e9c59ee03f46b3a2d743c401ff0098ba434eb79b4cf211b2843 SHA512 82aa5c9011c9b0cf06dd8df1dc4af3048f5eebd8a3d7909883cf778294f34c11db0ff4e2d2cd90c64c1362d410de297dd134eb1c89e4e0b66e4dae8a974a49f8 WHIRLPOOL 802f5b8c7d3ea08a2dbbea243028f273e556dacedd20fb5d936555e88d9441cd3580715ffd946cd9bf890303fdaaa4378b002138cdf04980ec4eebdabfb7f895
-MISC ChangeLog 40613 SHA256 94b40f7cf900a8e63e8715d5c1005320498c5fee93e8aad6cf44a7063816d534 SHA512 6dfa11e154c8c8c6beb69876610c39a17ffcd22115f2c141c57e600e3ace0c37e44495716425afdc371fec295dbb04c5ba5b3c90133eef0b720ed9a128fe631c WHIRLPOOL 70bbdf38d65786423874e77872c544a77504f17667e9fdca58c09111c6935b26f5e7bb8afdab521e9e936224806b625258875c2a5ba27e7880fe5c61208a6bf0
-MISC ChangeLog-2011 100599 SHA256 23129cb47321b2a6b1cb9323f1815d0cd11d6f30c3893908ed51575c270a0cc8 SHA512 4181ba9d965139ba58218da5b960c87b7a611b27606a1ab1ce1b4c3c9255b4e0e2947307cbfffc531f0f8b6b545ee11e083fcb29dc7b2b7ba31c6bb40b8ab128 WHIRLPOOL 4ceebb6a6ed58b906d3a7331795748ac6e4fe2e1401bcccae9024a8e81e2c444aebc5fec610398cfe6002354ad3b10487484598da5091867874727f07e239c56
-MISC metadata.xml 661 SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908 SHA512 871989a29417ce20d95da950fa385f1a958139de7b1567beb9cda28a1217901243cd9d25235fe3c7b0e43a82176d72286e31e4e97310b26488d2a3252ef3a8a0 WHIRLPOOL b694b1b4270ba15640d04a3b0b26a08575ea4afc9be256717f7f3b1768d75da9f71ceca6afd2f69971906227d5ba42263d2df2fc9387441aa240222d39fd094e

diff --git a/dev-lang/python/files/CVE-2013-4238_py27.patch b/dev-lang/python/files/CVE-2013-4238_py27.patch
deleted file mode 100644
index e215589..0000000
--- a/dev-lang/python/files/CVE-2013-4238_py27.patch
+++ /dev/null
@@ -1,247 +0,0 @@
-diff -r 9ddc63c039ba Lib/test/nullbytecert.pem
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/Lib/test/nullbytecert.pem	Sun Aug 11 18:13:17 2013 +0200
-@@ -0,0 +1,90 @@
-+Certificate:
-+    Data:
-+        Version: 3 (0x2)
-+        Serial Number: 0 (0x0)
-+    Signature Algorithm: sha1WithRSAEncryption
-+        Issuer: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@××××××.org
-+        Validity
-+            Not Before: Aug  7 13:11:52 2013 GMT
-+            Not After : Aug  7 13:12:52 2013 GMT
-+        Subject: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@××××××.org
-+        Subject Public Key Info:
-+            Public Key Algorithm: rsaEncryption
-+                Public-Key: (2048 bit)
-+                Modulus:
-+                    00:b5:ea:ed:c9:fb:46:7d:6f:3b:76:80:dd:3a:f3:
-+                    03:94:0b:a7:a6:db:ec:1d:df:ff:23:74:08:9d:97:
-+                    16:3f:a3:a4:7b:3e:1b:0e:96:59:25:03:a7:26:e2:
-+                    88:a9:cf:79:cd:f7:04:56:b0:ab:79:32:6e:59:c1:
-+                    32:30:54:eb:58:a8:cb:91:f0:42:a5:64:27:cb:d4:
-+                    56:31:88:52:ad:cf:bd:7f:f0:06:64:1f:cc:27:b8:
-+                    a3:8b:8c:f3:d8:29:1f:25:0b:f5:46:06:1b:ca:02:
-+                    45:ad:7b:76:0a:9c:bf:bb:b9:ae:0d:16:ab:60:75:
-+                    ae:06:3e:9c:7c:31:dc:92:2f:29:1a:e0:4b:0c:91:
-+                    90:6c:e9:37:c5:90:d7:2a:d7:97:15:a3:80:8f:5d:
-+                    7b:49:8f:54:30:d4:97:2c:1c:5b:37:b5:ab:69:30:
-+                    68:43:d3:33:78:4b:02:60:f5:3c:44:80:a1:8f:e7:
-+                    f0:0f:d1:5e:87:9e:46:cf:62:fc:f9:bf:0c:65:12:
-+                    f1:93:c8:35:79:3f:c8:ec:ec:47:f5:ef:be:44:d5:
-+                    ae:82:1e:2d:9a:9f:98:5a:67:65:e1:74:70:7c:cb:
-+                    d3:c2:ce:0e:45:49:27:dc:e3:2d:d4:fb:48:0e:2f:
-+                    9e:77:b8:14:46:c0:c4:36:ca:02:ae:6a:91:8c:da:
-+                    2f:85
-+                Exponent: 65537 (0x10001)
-+        X509v3 extensions:
-+            X509v3 Basic Constraints: critical
-+                CA:FALSE
-+            X509v3 Subject Key Identifier:
-+                88:5A:55:C0:52:FF:61:CD:52:A3:35:0F:EA:5A:9C:24:38:22:F7:5C
-+            X509v3 Key Usage:
-+                Digital Signature, Non Repudiation, Key Encipherment
-+            X509v3 Subject Alternative Name:
-+                *************************************************************
-+                WARNING: The values for DNS, email and URI are WRONG. OpenSSL
-+                         doesn't print the text after a NULL byte.
-+                *************************************************************
-+                DNS:altnull.python.org, email:null@××××××.org, URI:http://null.python.org, IP Address:192.0.2.1, IP Address:2001:DB8:0:0:0:0:0:1
-+    Signature Algorithm: sha1WithRSAEncryption
-+         ac:4f:45:ef:7d:49:a8:21:70:8e:88:59:3e:d4:36:42:70:f5:
-+         a3:bd:8b:d7:a8:d0:58:f6:31:4a:b1:a4:a6:dd:6f:d9:e8:44:
-+         3c:b6:0a:71:d6:7f:b1:08:61:9d:60:ce:75:cf:77:0c:d2:37:
-+         86:02:8d:5e:5d:f9:0f:71:b4:16:a8:c1:3d:23:1c:f1:11:b3:
-+         56:6e:ca:d0:8d:34:94:e6:87:2a:99:f2:ae:ae:cc:c2:e8:86:
-+         de:08:a8:7f:c5:05:fa:6f:81:a7:82:e6:d0:53:9d:34:f4:ac:
-+         3e:40:fe:89:57:7a:29:a4:91:7e:0b:c6:51:31:e5:10:2f:a4:
-+         60:76:cd:95:51:1a:be:8b:a1:b0:fd:ad:52:bd:d7:1b:87:60:
-+         d2:31:c7:17:c4:18:4f:2d:08:25:a3:a7:4f:b7:92:ca:e2:f5:
-+         25:f1:54:75:81:9d:b3:3d:61:a2:f7:da:ed:e1:c6:6f:2c:60:
-+         1f:d8:6f:c5:92:05:ab:c9:09:62:49:a9:14:ad:55:11:cc:d6:
-+         4a:19:94:99:97:37:1d:81:5f:8b:cf:a3:a8:96:44:51:08:3d:
-+         0b:05:65:12:eb:b6:70:80:88:48:72:4f:c6:c2:da:cf:cd:8e:
-+         5b:ba:97:2f:60:b4:96:56:49:5e:3a:43:76:63:04:be:2a:f6:
-+         c1:ca:a9:94
-+-----BEGIN CERTIFICATE-----
-+MIIE2DCCA8CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxTELMAkGA1UEBhMCVVMx
-+DzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMSMwIQYDVQQKDBpQ
-+eXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEgMB4GA1UECwwXUHl0aG9uIENvcmUg
-+RGV2ZWxvcG1lbnQxJDAiBgNVBAMMG251bGwucHl0aG9uLm9yZwBleGFtcGxlLm9y
-+ZzEkMCIGCSqGSIb3DQEJARYVcHl0aG9uLWRldkBweXRob24ub3JnMB4XDTEzMDgw
-+NzEzMTE1MloXDTEzMDgwNzEzMTI1MlowgcUxCzAJBgNVBAYTAlVTMQ8wDQYDVQQI
-+DAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEjMCEGA1UECgwaUHl0aG9uIFNv
-+ZnR3YXJlIEZvdW5kYXRpb24xIDAeBgNVBAsMF1B5dGhvbiBDb3JlIERldmVsb3Bt
-+ZW50MSQwIgYDVQQDDBtudWxsLnB5dGhvbi5vcmcAZXhhbXBsZS5vcmcxJDAiBgkq
-+hkiG9w0BCQEWFXB5dGhvbi1kZXZAcHl0aG9uLm9yZzCCASIwDQYJKoZIhvcNAQEB
-+BQADggEPADCCAQoCggEBALXq7cn7Rn1vO3aA3TrzA5QLp6bb7B3f/yN0CJ2XFj+j
-+pHs+Gw6WWSUDpybiiKnPec33BFawq3kyblnBMjBU61ioy5HwQqVkJ8vUVjGIUq3P
-+vX/wBmQfzCe4o4uM89gpHyUL9UYGG8oCRa17dgqcv7u5rg0Wq2B1rgY+nHwx3JIv
-+KRrgSwyRkGzpN8WQ1yrXlxWjgI9de0mPVDDUlywcWze1q2kwaEPTM3hLAmD1PESA
-+oY/n8A/RXoeeRs9i/Pm/DGUS8ZPINXk/yOzsR/XvvkTVroIeLZqfmFpnZeF0cHzL
-+08LODkVJJ9zjLdT7SA4vnne4FEbAxDbKAq5qkYzaL4UCAwEAAaOB0DCBzTAMBgNV
-+HRMBAf8EAjAAMB0GA1UdDgQWBBSIWlXAUv9hzVKjNQ/qWpwkOCL3XDALBgNVHQ8E
-+BAMCBeAwgZAGA1UdEQSBiDCBhYIeYWx0bnVsbC5weXRob24ub3JnAGV4YW1wbGUu
-+Y29tgSBudWxsQHB5dGhvbi5vcmcAdXNlckBleGFtcGxlLm9yZ4YpaHR0cDovL251
-+bGwucHl0aG9uLm9yZwBodHRwOi8vZXhhbXBsZS5vcmeHBMAAAgGHECABDbgAAAAA
-+AAAAAAAAAAEwDQYJKoZIhvcNAQEFBQADggEBAKxPRe99SaghcI6IWT7UNkJw9aO9
-+i9eo0Fj2MUqxpKbdb9noRDy2CnHWf7EIYZ1gznXPdwzSN4YCjV5d+Q9xtBaowT0j
-+HPERs1ZuytCNNJTmhyqZ8q6uzMLoht4IqH/FBfpvgaeC5tBTnTT0rD5A/olXeimk
-+kX4LxlEx5RAvpGB2zZVRGr6LobD9rVK91xuHYNIxxxfEGE8tCCWjp0+3ksri9SXx
-+VHWBnbM9YaL32u3hxm8sYB/Yb8WSBavJCWJJqRStVRHM1koZlJmXNx2BX4vPo6iW
-+RFEIPQsFZRLrtnCAiEhyT8bC2s/Njlu6ly9gtJZWSV46Q3ZjBL4q9sHKqZQ=
-+-----END CERTIFICATE-----
-diff -r 9ddc63c039ba Lib/test/test_ssl.py
---- a/Lib/test/test_ssl.py	Sun Aug 11 13:04:50 2013 +0300
-+++ b/Lib/test/test_ssl.py	Sun Aug 11 18:13:17 2013 +0200
-@@ -25,6 +25,7 @@
- HOST = test_support.HOST
- CERTFILE = None
- SVN_PYTHON_ORG_ROOT_CERT = None
-+NULLBYTECERT = None
- 
- def handle_error(prefix):
-     exc_format = ' '.join(traceback.format_exception(*sys.exc_info()))
-@@ -123,6 +124,27 @@
-                           ('DNS', 'projects.forum.nokia.com'))
-                         )
- 
-+    def test_parse_cert_CVE_2013_4073(self):
-+        p = ssl._ssl._test_decode_cert(NULLBYTECERT)
-+        if test_support.verbose:
-+            sys.stdout.write("\n" + pprint.pformat(p) + "\n")
-+        subject = ((('countryName', 'US'),),
-+                   (('stateOrProvinceName', 'Oregon'),),
-+                   (('localityName', 'Beaverton'),),
-+                   (('organizationName', 'Python Software Foundation'),),
-+                   (('organizationalUnitName', 'Python Core Development'),),
-+                   (('commonName', 'null.python.org\x00example.org'),),
-+                   (('emailAddress', 'python-dev@××××××.org'),))
-+        self.assertEqual(p['subject'], subject)
-+        self.assertEqual(p['issuer'], subject)
-+        self.assertEqual(p['subjectAltName'],
-+                         (('DNS', 'altnull.python.org\x00example.com'),
-+                         ('email', 'null@××××××.org\x00user@×××××××.org'),
-+                         ('URI', 'http://null.python.org\x00http://example.org'),
-+                         ('IP Address', '192.0.2.1'),
-+                         ('IP Address', '2001:DB8:0:0:0:0:0:1\n'))
-+                        )
-+
-     def test_DER_to_PEM(self):
-         with open(SVN_PYTHON_ORG_ROOT_CERT, 'r') as f:
-             pem = f.read()
-@@ -1360,7 +1382,7 @@
- 
- 
- def test_main(verbose=False):
--    global CERTFILE, SVN_PYTHON_ORG_ROOT_CERT, NOKIACERT
-+    global CERTFILE, SVN_PYTHON_ORG_ROOT_CERT, NOKIACERT, NULLBYTECERT
-     CERTFILE = os.path.join(os.path.dirname(__file__) or os.curdir,
-                             "keycert.pem")
-     SVN_PYTHON_ORG_ROOT_CERT = os.path.join(
-@@ -1368,10 +1390,13 @@
-         "https_svn_python_org_root.pem")
-     NOKIACERT = os.path.join(os.path.dirname(__file__) or os.curdir,
-                              "nokia.pem")
-+    NULLBYTECERT = os.path.join(os.path.dirname(__file__) or os.curdir,
-+                                "nullbytecert.pem")
- 
-     if (not os.path.exists(CERTFILE) or
-         not os.path.exists(SVN_PYTHON_ORG_ROOT_CERT) or
--        not os.path.exists(NOKIACERT)):
-+        not os.path.exists(NOKIACERT) or
-+        not os.path.exists(NULLBYTECERT)):
-         raise test_support.TestFailed("Can't read certificate files!")
- 
-     tests = [BasicTests, BasicSocketTests]
-diff -r 9ddc63c039ba Modules/_ssl.c
---- a/Modules/_ssl.c	Sun Aug 11 13:04:50 2013 +0300
-+++ b/Modules/_ssl.c	Sun Aug 11 18:13:17 2013 +0200
-@@ -741,8 +741,13 @@
- 
-             /* get a rendering of each name in the set of names */
- 
-+            int gntype;
-+            ASN1_STRING *as = NULL;
-+
-             name = sk_GENERAL_NAME_value(names, j);
--            if (name->type == GEN_DIRNAME) {
-+            gntype = name-> type;
-+            switch (gntype) {
-+            case GEN_DIRNAME:
- 
-                 /* we special-case DirName as a tuple of tuples of attributes */
- 
-@@ -764,11 +769,61 @@
-                     goto fail;
-                 }
-                 PyTuple_SET_ITEM(t, 1, v);
-+                break;
- 
--            } else {
-+            case GEN_EMAIL:
-+            case GEN_DNS:
-+            case GEN_URI:
-+                /* GENERAL_NAME_print() doesn't handle NUL bytes in ASN1_string
-+                   correctly. */
-+                t = PyTuple_New(2);
-+                if (t == NULL)
-+                    goto fail;
-+                switch (gntype) {
-+                case GEN_EMAIL:
-+                    v = PyUnicode_FromString("email");
-+                    as = name->d.rfc822Name;
-+                    break;
-+                case GEN_DNS:
-+                    v = PyUnicode_FromString("DNS");
-+                    as = name->d.dNSName;
-+                    break;
-+                case GEN_URI:
-+                    v = PyUnicode_FromString("URI");
-+                    as = name->d.uniformResourceIdentifier;
-+                    break;
-+                }
-+                if (v == NULL) {
-+                    Py_DECREF(t);
-+                    goto fail;
-+                }
-+                PyTuple_SET_ITEM(t, 0, v);
-+                v = PyString_FromStringAndSize((char *)ASN1_STRING_data(as),
-+                                               ASN1_STRING_length(as));
-+                if (v == NULL) {
-+                    Py_DECREF(t);
-+                    goto fail;
-+                }
-+                PyTuple_SET_ITEM(t, 1, v);
-+                break;
- 
-+            default:
-                 /* for everything else, we use the OpenSSL print form */
--
-+                switch (gntype) {
-+                    /* check for new general name type */
-+                    case GEN_OTHERNAME:
-+                    case GEN_X400:
-+                    case GEN_EDIPARTY:
-+                    case GEN_IPADD:
-+                    case GEN_RID:
-+                        break;
-+                    default:
-+                        if (PyErr_Warn(PyExc_RuntimeWarning,
-+				       "Unknown general name type") == -1) {
-+                            goto fail;
-+                        }
-+                        break;
-+                }
-                 (void) BIO_reset(biobuf);
-                 GENERAL_NAME_print(biobuf, name);
-                 len = BIO_gets(biobuf, buf, sizeof(buf)-1);
-@@ -794,6 +849,7 @@
-                     goto fail;
-                 }
-                 PyTuple_SET_ITEM(t, 1, v);
-+		break;
-             }
- 
-             /* and add that rendering to the list */

diff --git a/dev-lang/python/files/CVE-2013-4238_py33.patch b/dev-lang/python/files/CVE-2013-4238_py33.patch
deleted file mode 100644
index 41db4d2..0000000
--- a/dev-lang/python/files/CVE-2013-4238_py33.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-diff -r e0f86c3b3685 Lib/test/nullbytecert.pem
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/Lib/test/nullbytecert.pem	Sun Aug 11 18:17:23 2013 +0200
-@@ -0,0 +1,90 @@
-+Certificate:
-+    Data:
-+        Version: 3 (0x2)
-+        Serial Number: 0 (0x0)
-+    Signature Algorithm: sha1WithRSAEncryption
-+        Issuer: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@××××××.org
-+        Validity
-+            Not Before: Aug  7 13:11:52 2013 GMT
-+            Not After : Aug  7 13:12:52 2013 GMT
-+        Subject: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@××××××.org
-+        Subject Public Key Info:
-+            Public Key Algorithm: rsaEncryption
-+                Public-Key: (2048 bit)
-+                Modulus:
-+                    00:b5:ea:ed:c9:fb:46:7d:6f:3b:76:80:dd:3a:f3:
-+                    03:94:0b:a7:a6:db:ec:1d:df:ff:23:74:08:9d:97:
-+                    16:3f:a3:a4:7b:3e:1b:0e:96:59:25:03:a7:26:e2:
-+                    88:a9:cf:79:cd:f7:04:56:b0:ab:79:32:6e:59:c1:
-+                    32:30:54:eb:58:a8:cb:91:f0:42:a5:64:27:cb:d4:
-+                    56:31:88:52:ad:cf:bd:7f:f0:06:64:1f:cc:27:b8:
-+                    a3:8b:8c:f3:d8:29:1f:25:0b:f5:46:06:1b:ca:02:
-+                    45:ad:7b:76:0a:9c:bf:bb:b9:ae:0d:16:ab:60:75:
-+                    ae:06:3e:9c:7c:31:dc:92:2f:29:1a:e0:4b:0c:91:
-+                    90:6c:e9:37:c5:90:d7:2a:d7:97:15:a3:80:8f:5d:
-+                    7b:49:8f:54:30:d4:97:2c:1c:5b:37:b5:ab:69:30:
-+                    68:43:d3:33:78:4b:02:60:f5:3c:44:80:a1:8f:e7:
-+                    f0:0f:d1:5e:87:9e:46:cf:62:fc:f9:bf:0c:65:12:
-+                    f1:93:c8:35:79:3f:c8:ec:ec:47:f5:ef:be:44:d5:
-+                    ae:82:1e:2d:9a:9f:98:5a:67:65:e1:74:70:7c:cb:
-+                    d3:c2:ce:0e:45:49:27:dc:e3:2d:d4:fb:48:0e:2f:
-+                    9e:77:b8:14:46:c0:c4:36:ca:02:ae:6a:91:8c:da:
-+                    2f:85
-+                Exponent: 65537 (0x10001)
-+        X509v3 extensions:
-+            X509v3 Basic Constraints: critical
-+                CA:FALSE
-+            X509v3 Subject Key Identifier:
-+                88:5A:55:C0:52:FF:61:CD:52:A3:35:0F:EA:5A:9C:24:38:22:F7:5C
-+            X509v3 Key Usage:
-+                Digital Signature, Non Repudiation, Key Encipherment
-+            X509v3 Subject Alternative Name:
-+                *************************************************************
-+                WARNING: The values for DNS, email and URI are WRONG. OpenSSL
-+                         doesn't print the text after a NULL byte.
-+                *************************************************************
-+                DNS:altnull.python.org, email:null@××××××.org, URI:http://null.python.org, IP Address:192.0.2.1, IP Address:2001:DB8:0:0:0:0:0:1
-+    Signature Algorithm: sha1WithRSAEncryption
-+         ac:4f:45:ef:7d:49:a8:21:70:8e:88:59:3e:d4:36:42:70:f5:
-+         a3:bd:8b:d7:a8:d0:58:f6:31:4a:b1:a4:a6:dd:6f:d9:e8:44:
-+         3c:b6:0a:71:d6:7f:b1:08:61:9d:60:ce:75:cf:77:0c:d2:37:
-+         86:02:8d:5e:5d:f9:0f:71:b4:16:a8:c1:3d:23:1c:f1:11:b3:
-+         56:6e:ca:d0:8d:34:94:e6:87:2a:99:f2:ae:ae:cc:c2:e8:86:
-+         de:08:a8:7f:c5:05:fa:6f:81:a7:82:e6:d0:53:9d:34:f4:ac:
-+         3e:40:fe:89:57:7a:29:a4:91:7e:0b:c6:51:31:e5:10:2f:a4:
-+         60:76:cd:95:51:1a:be:8b:a1:b0:fd:ad:52:bd:d7:1b:87:60:
-+         d2:31:c7:17:c4:18:4f:2d:08:25:a3:a7:4f:b7:92:ca:e2:f5:
-+         25:f1:54:75:81:9d:b3:3d:61:a2:f7:da:ed:e1:c6:6f:2c:60:
-+         1f:d8:6f:c5:92:05:ab:c9:09:62:49:a9:14:ad:55:11:cc:d6:
-+         4a:19:94:99:97:37:1d:81:5f:8b:cf:a3:a8:96:44:51:08:3d:
-+         0b:05:65:12:eb:b6:70:80:88:48:72:4f:c6:c2:da:cf:cd:8e:
-+         5b:ba:97:2f:60:b4:96:56:49:5e:3a:43:76:63:04:be:2a:f6:
-+         c1:ca:a9:94
-+-----BEGIN CERTIFICATE-----
-+MIIE2DCCA8CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxTELMAkGA1UEBhMCVVMx
-+DzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMSMwIQYDVQQKDBpQ
-+eXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEgMB4GA1UECwwXUHl0aG9uIENvcmUg
-+RGV2ZWxvcG1lbnQxJDAiBgNVBAMMG251bGwucHl0aG9uLm9yZwBleGFtcGxlLm9y
-+ZzEkMCIGCSqGSIb3DQEJARYVcHl0aG9uLWRldkBweXRob24ub3JnMB4XDTEzMDgw
-+NzEzMTE1MloXDTEzMDgwNzEzMTI1MlowgcUxCzAJBgNVBAYTAlVTMQ8wDQYDVQQI
-+DAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEjMCEGA1UECgwaUHl0aG9uIFNv
-+ZnR3YXJlIEZvdW5kYXRpb24xIDAeBgNVBAsMF1B5dGhvbiBDb3JlIERldmVsb3Bt
-+ZW50MSQwIgYDVQQDDBtudWxsLnB5dGhvbi5vcmcAZXhhbXBsZS5vcmcxJDAiBgkq
-+hkiG9w0BCQEWFXB5dGhvbi1kZXZAcHl0aG9uLm9yZzCCASIwDQYJKoZIhvcNAQEB
-+BQADggEPADCCAQoCggEBALXq7cn7Rn1vO3aA3TrzA5QLp6bb7B3f/yN0CJ2XFj+j
-+pHs+Gw6WWSUDpybiiKnPec33BFawq3kyblnBMjBU61ioy5HwQqVkJ8vUVjGIUq3P
-+vX/wBmQfzCe4o4uM89gpHyUL9UYGG8oCRa17dgqcv7u5rg0Wq2B1rgY+nHwx3JIv
-+KRrgSwyRkGzpN8WQ1yrXlxWjgI9de0mPVDDUlywcWze1q2kwaEPTM3hLAmD1PESA
-+oY/n8A/RXoeeRs9i/Pm/DGUS8ZPINXk/yOzsR/XvvkTVroIeLZqfmFpnZeF0cHzL
-+08LODkVJJ9zjLdT7SA4vnne4FEbAxDbKAq5qkYzaL4UCAwEAAaOB0DCBzTAMBgNV
-+HRMBAf8EAjAAMB0GA1UdDgQWBBSIWlXAUv9hzVKjNQ/qWpwkOCL3XDALBgNVHQ8E
-+BAMCBeAwgZAGA1UdEQSBiDCBhYIeYWx0bnVsbC5weXRob24ub3JnAGV4YW1wbGUu
-+Y29tgSBudWxsQHB5dGhvbi5vcmcAdXNlckBleGFtcGxlLm9yZ4YpaHR0cDovL251
-+bGwucHl0aG9uLm9yZwBodHRwOi8vZXhhbXBsZS5vcmeHBMAAAgGHECABDbgAAAAA
-+AAAAAAAAAAEwDQYJKoZIhvcNAQEFBQADggEBAKxPRe99SaghcI6IWT7UNkJw9aO9
-+i9eo0Fj2MUqxpKbdb9noRDy2CnHWf7EIYZ1gznXPdwzSN4YCjV5d+Q9xtBaowT0j
-+HPERs1ZuytCNNJTmhyqZ8q6uzMLoht4IqH/FBfpvgaeC5tBTnTT0rD5A/olXeimk
-+kX4LxlEx5RAvpGB2zZVRGr6LobD9rVK91xuHYNIxxxfEGE8tCCWjp0+3ksri9SXx
-+VHWBnbM9YaL32u3hxm8sYB/Yb8WSBavJCWJJqRStVRHM1koZlJmXNx2BX4vPo6iW
-+RFEIPQsFZRLrtnCAiEhyT8bC2s/Njlu6ly9gtJZWSV46Q3ZjBL4q9sHKqZQ=
-+-----END CERTIFICATE-----
-diff -r e0f86c3b3685 Lib/test/test_ssl.py
---- a/Lib/test/test_ssl.py	Sun Aug 11 13:04:50 2013 +0300
-+++ b/Lib/test/test_ssl.py	Sun Aug 11 18:17:23 2013 +0200
-@@ -55,6 +55,7 @@
- WRONGCERT = data_file("XXXnonexisting.pem")
- BADKEY = data_file("badkey.pem")
- NOKIACERT = data_file("nokia.pem")
-+NULLBYTECERT = data_file("nullbytecert.pem")
- 
- DHFILE = data_file("dh512.pem")
- BYTES_DHFILE = os.fsencode(DHFILE)
-@@ -162,6 +163,27 @@
-                           ('DNS', 'projects.forum.nokia.com'))
-                         )
- 
-+    def test_parse_cert_CVE_2013_4073(self):
-+        p = ssl._ssl._test_decode_cert(NULLBYTECERT)
-+        if support.verbose:
-+            sys.stdout.write("\n" + pprint.pformat(p) + "\n")
-+        subject = ((('countryName', 'US'),),
-+                   (('stateOrProvinceName', 'Oregon'),),
-+                   (('localityName', 'Beaverton'),),
-+                   (('organizationName', 'Python Software Foundation'),),
-+                   (('organizationalUnitName', 'Python Core Development'),),
-+                   (('commonName', 'null.python.org\x00example.org'),),
-+                   (('emailAddress', 'python-dev@××××××.org'),))
-+        self.assertEqual(p['subject'], subject)
-+        self.assertEqual(p['issuer'], subject)
-+        self.assertEqual(p['subjectAltName'],
-+                         (('DNS', 'altnull.python.org\x00example.com'),
-+                         ('email', 'null@××××××.org\x00user@×××××××.org'),
-+                         ('URI', 'http://null.python.org\x00http://example.org'),
-+                         ('IP Address', '192.0.2.1'),
-+                         ('IP Address', '2001:DB8:0:0:0:0:0:1\n'))
-+                        )
-+
-     def test_DER_to_PEM(self):
-         with open(SVN_PYTHON_ORG_ROOT_CERT, 'r') as f:
-             pem = f.read()
-@@ -294,6 +316,13 @@
-         fail(cert, 'foo.a.com')
-         fail(cert, 'bar.foo.com')
- 
-+        # NULL bytes are bad, CVE-2013-4073
-+        cert = {'subject': ((('commonName',
-+                              'null.python.org\x00example.org'),),)}
-+        ok(cert, 'null.python.org\x00example.org') # or raise an error?
-+        fail(cert, 'example.org')
-+        fail(cert, 'null.python.org')
-+
-         # Slightly fake real-world example
-         cert = {'notAfter': 'Jun 26 21:41:46 2011 GMT',
-                 'subject': ((('commonName', 'linuxfrz.org'),),),
-diff -r e0f86c3b3685 Modules/_ssl.c
---- a/Modules/_ssl.c	Sun Aug 11 13:04:50 2013 +0300
-+++ b/Modules/_ssl.c	Sun Aug 11 18:17:23 2013 +0200
-@@ -771,12 +771,14 @@
-                            ext->value->length));
- 
-         for(j = 0; j < sk_GENERAL_NAME_num(names); j++) {
--
-             /* get a rendering of each name in the set of names */
-+            int gntype;
-+            ASN1_STRING *as = NULL;
- 
-             name = sk_GENERAL_NAME_value(names, j);
--            if (name->type == GEN_DIRNAME) {
--
-+            gntype = name-> type;
-+            switch (gntype) {
-+            case GEN_DIRNAME:
-                 /* we special-case DirName as a tuple of
-                    tuples of attributes */
- 
-@@ -798,11 +800,62 @@
-                     goto fail;
-                 }
-                 PyTuple_SET_ITEM(t, 1, v);
-+                break;
- 
--            } else {
-+            case GEN_EMAIL:
-+            case GEN_DNS:
-+            case GEN_URI:
-+                /* GENERAL_NAME_print() doesn't handle NUL bytes in ASN1_string
-+                   correctly. */
-+                t = PyTuple_New(2);
-+                if (t == NULL)
-+                    goto fail;
-+                switch (gntype) {
-+                case GEN_EMAIL:
-+                    v = PyUnicode_FromString("email");
-+                    as = name->d.rfc822Name;
-+                    break;
-+                case GEN_DNS:
-+                    v = PyUnicode_FromString("DNS");
-+                    as = name->d.dNSName;
-+                    break;
-+                case GEN_URI:
-+                    v = PyUnicode_FromString("URI");
-+                    as = name->d.uniformResourceIdentifier;
-+                    break;
-+                }
-+                if (v == NULL) {
-+                    Py_DECREF(t);
-+                    goto fail;
-+                }
-+                PyTuple_SET_ITEM(t, 0, v);
-+                v = PyUnicode_FromStringAndSize((char *)ASN1_STRING_data(as),
-+                                                ASN1_STRING_length(as));
-+                if (v == NULL) {
-+                    Py_DECREF(t);
-+                    goto fail;
-+                }
-+                PyTuple_SET_ITEM(t, 1, v);
-+                break;
- 
-+            default:
-                 /* for everything else, we use the OpenSSL print form */
--
-+                switch (gntype) {
-+                    /* check for new general name type */
-+                    case GEN_OTHERNAME:
-+                    case GEN_X400:
-+                    case GEN_EDIPARTY:
-+                    case GEN_IPADD:
-+                    case GEN_RID:
-+                        break;
-+                    default:
-+                        if (PyErr_WarnFormat(PyExc_RuntimeWarning, 1,
-+                                             "Unknown general name type %d",
-+                                             gntype) == -1) {
-+                            goto fail;
-+                        }
-+                        break;
-+                }
-                 (void) BIO_reset(biobuf);
-                 GENERAL_NAME_print(biobuf, name);
-                 len = BIO_gets(biobuf, buf, sizeof(buf)-1);
-@@ -829,6 +882,7 @@
-                     goto fail;
-                 }
-                 PyTuple_SET_ITEM(t, 1, v);
-+                break;
-             }
- 
-             /* and add that rendering to the list */

diff --git a/dev-lang/python/files/pydoc.conf b/dev-lang/python/files/pydoc.conf
deleted file mode 100644
index 20e3628..0000000
--- a/dev-lang/python/files/pydoc.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# /etc/init.d/pydoc.conf
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/files/pydoc.conf,v 1.3 2011/10/27 13:56:55 neurogeek Exp $
-
-# This file contains the configuration for pydoc's internal webserver.
-
-# Default port for Python's pydoc server.
-@PYDOC_PORT_VARIABLE@="7464"

diff --git a/dev-lang/python/files/pydoc.init b/dev-lang/python/files/pydoc.init
deleted file mode 100755
index 3f02ae9..0000000
--- a/dev-lang/python/files/pydoc.init
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public Licence v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/files/pydoc.init,v 1.5 2014/10/12 12:37:07 djc Exp $
-
-start() {
-	local pydoc_port="${@PYDOC_PORT_VARIABLE@-${PYDOC_PORT}}"
-
-	if [ -z "${pydoc_port}" ]; then
-		eerror "Port not set"
-		return 1
-	fi
-
-	ebegin "Starting pydoc server on port ${pydoc_port}" 
-	start-stop-daemon --start --background --make-pidfile \
-			  --pidfile /var/run/@PYDOC@.pid \
-			  --exec /usr/bin/@PYDOC@ -- -p "${pydoc_port}"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping pydoc server"
-	start-stop-daemon --stop --quiet --pidfile /var/run/@PYDOC@.pid
-	eend $?
-}

diff --git a/dev-lang/python/files/python-2.5-tcl86.patch b/dev-lang/python/files/python-2.5-tcl86.patch
deleted file mode 100644
index 2362e98..0000000
--- a/dev-lang/python/files/python-2.5-tcl86.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -1518,7 +1518,7 @@
-         # The versions with dots are used on Unix, and the versions without
-         # dots on Windows, for detection by cygwin.
-         tcllib = tklib = tcl_includes = tk_includes = None
--        for version in ['8.5', '85', '8.4', '84', '8.3', '83', '8.2',
-+        for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83', '8.2',
-                         '82', '8.1', '81', '8.0', '80']:
-             tklib = self.compiler.find_library_file(lib_dirs, 'tk' + version)
-             tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' + version)

diff --git a/dev-lang/python/files/python-2.7-issue16248.patch b/dev-lang/python/files/python-2.7-issue16248.patch
deleted file mode 100644
index ce9c654..0000000
--- a/dev-lang/python/files/python-2.7-issue16248.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# HG changeset patch
-# User Antoine Pitrou <solipsis@××××××.net>
-# Date 1375388712 -7200
-# Node ID 0f17aed78168e63ec058c219d03cea7240f83dd6
-# Parent  bb546f6d8ab4f513804d7a420657963881e5b447
-Fix tkinter regression introduced by the security fix in #16248.
-
-diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py
---- a/Lib/lib-tk/Tkinter.py
-+++ b/Lib/lib-tk/Tkinter.py
-@@ -1736,7 +1736,7 @@ class Tk(Misc, Wm):
-         # ensure that self.tk is always _something_.
-         self.tk = None
-         if baseName is None:
--            import sys, os
-+            import os
-             baseName = os.path.basename(sys.argv[0])
-             baseName, ext = os.path.splitext(baseName)
-             if ext not in ('.py', '.pyc', '.pyo'):

diff --git a/dev-lang/python/files/python-2.7-issue18851.patch b/dev-lang/python/files/python-2.7-issue18851.patch
deleted file mode 100644
index 35c69ae..0000000
--- a/dev-lang/python/files/python-2.7-issue18851.patch
+++ /dev/null
@@ -1,287 +0,0 @@
-# HG changeset patch
-# User Antoine Pitrou <solipsis@××××××.net>
-# Date 1377898693 -7200
-# Node ID 43749cb6bdbd0fdab70f76cd171c3c02a3f600dd
-# Parent  ba54011aa295004ad87438211fe3bb1568dd69ab
-Issue #18851: Avoid a double close of subprocess pipes when the child process fails starting.
-
-diff --git a/Lib/subprocess.py b/Lib/subprocess.py
---- a/Lib/subprocess.py
-+++ b/Lib/subprocess.py
-@@ -698,12 +698,12 @@ class Popen(object):
- 
-         (p2cread, p2cwrite,
-          c2pread, c2pwrite,
--         errread, errwrite) = self._get_handles(stdin, stdout, stderr)
-+         errread, errwrite), to_close = self._get_handles(stdin, stdout, stderr)
- 
-         try:
-             self._execute_child(args, executable, preexec_fn, close_fds,
-                                 cwd, env, universal_newlines,
--                                startupinfo, creationflags, shell,
-+                                startupinfo, creationflags, shell, to_close,
-                                 p2cread, p2cwrite,
-                                 c2pread, c2pwrite,
-                                 errread, errwrite)
-@@ -711,18 +711,12 @@ class Popen(object):
-             # Preserve original exception in case os.close raises.
-             exc_type, exc_value, exc_trace = sys.exc_info()
- 
--            to_close = []
--            # Only close the pipes we created.
--            if stdin == PIPE:
--                to_close.extend((p2cread, p2cwrite))
--            if stdout == PIPE:
--                to_close.extend((c2pread, c2pwrite))
--            if stderr == PIPE:
--                to_close.extend((errread, errwrite))
--
-             for fd in to_close:
-                 try:
--                    os.close(fd)
-+                    if mswindows:
-+                        fd.Close()
-+                    else:
-+                        os.close(fd)
-                 except EnvironmentError:
-                     pass
- 
-@@ -816,8 +810,9 @@ class Popen(object):
-             """Construct and return tuple with IO objects:
-             p2cread, p2cwrite, c2pread, c2pwrite, errread, errwrite
-             """
-+            to_close = set()
-             if stdin is None and stdout is None and stderr is None:
--                return (None, None, None, None, None, None)
-+                return (None, None, None, None, None, None), to_close
- 
-             p2cread, p2cwrite = None, None
-             c2pread, c2pwrite = None, None
-@@ -835,6 +830,10 @@ class Popen(object):
-                 # Assuming file-like object
-                 p2cread = msvcrt.get_osfhandle(stdin.fileno())
-             p2cread = self._make_inheritable(p2cread)
-+            # We just duplicated the handle, it has to be closed at the end
-+            to_close.add(p2cread)
-+            if stdin == PIPE:
-+                to_close.add(p2cwrite)
- 
-             if stdout is None:
-                 c2pwrite = _subprocess.GetStdHandle(_subprocess.STD_OUTPUT_HANDLE)
-@@ -848,6 +847,10 @@ class Popen(object):
-                 # Assuming file-like object
-                 c2pwrite = msvcrt.get_osfhandle(stdout.fileno())
-             c2pwrite = self._make_inheritable(c2pwrite)
-+            # We just duplicated the handle, it has to be closed at the end
-+            to_close.add(c2pwrite)
-+            if stdout == PIPE:
-+                to_close.add(c2pread)
- 
-             if stderr is None:
-                 errwrite = _subprocess.GetStdHandle(_subprocess.STD_ERROR_HANDLE)
-@@ -863,10 +866,14 @@ class Popen(object):
-                 # Assuming file-like object
-                 errwrite = msvcrt.get_osfhandle(stderr.fileno())
-             errwrite = self._make_inheritable(errwrite)
-+            # We just duplicated the handle, it has to be closed at the end
-+            to_close.add(errwrite)
-+            if stderr == PIPE:
-+                to_close.add(errread)
- 
-             return (p2cread, p2cwrite,
-                     c2pread, c2pwrite,
--                    errread, errwrite)
-+                    errread, errwrite), to_close
- 
- 
-         def _make_inheritable(self, handle):
-@@ -895,7 +902,7 @@ class Popen(object):
- 
-         def _execute_child(self, args, executable, preexec_fn, close_fds,
-                            cwd, env, universal_newlines,
--                           startupinfo, creationflags, shell,
-+                           startupinfo, creationflags, shell, to_close,
-                            p2cread, p2cwrite,
-                            c2pread, c2pwrite,
-                            errread, errwrite):
-@@ -934,6 +941,10 @@ class Popen(object):
-                     # kill children.
-                     creationflags |= _subprocess.CREATE_NEW_CONSOLE
- 
-+            def _close_in_parent(fd):
-+                fd.Close()
-+                to_close.remove(fd)
-+
-             # Start the process
-             try:
-                 hp, ht, pid, tid = _subprocess.CreateProcess(executable, args,
-@@ -958,11 +969,11 @@ class Popen(object):
-                 # pipe will not close when the child process exits and the
-                 # ReadFile will hang.
-                 if p2cread is not None:
--                    p2cread.Close()
-+                    _close_in_parent(p2cread)
-                 if c2pwrite is not None:
--                    c2pwrite.Close()
-+                    _close_in_parent(c2pwrite)
-                 if errwrite is not None:
--                    errwrite.Close()
-+                    _close_in_parent(errwrite)
- 
-             # Retain the process handle, but close the thread handle
-             self._child_created = True
-@@ -1088,6 +1099,7 @@ class Popen(object):
-             """Construct and return tuple with IO objects:
-             p2cread, p2cwrite, c2pread, c2pwrite, errread, errwrite
-             """
-+            to_close = set()
-             p2cread, p2cwrite = None, None
-             c2pread, c2pwrite = None, None
-             errread, errwrite = None, None
-@@ -1096,6 +1108,7 @@ class Popen(object):
-                 pass
-             elif stdin == PIPE:
-                 p2cread, p2cwrite = self.pipe_cloexec()
-+                to_close.update((p2cread, p2cwrite))
-             elif isinstance(stdin, int):
-                 p2cread = stdin
-             else:
-@@ -1106,6 +1119,7 @@ class Popen(object):
-                 pass
-             elif stdout == PIPE:
-                 c2pread, c2pwrite = self.pipe_cloexec()
-+                to_close.update((c2pread, c2pwrite))
-             elif isinstance(stdout, int):
-                 c2pwrite = stdout
-             else:
-@@ -1116,6 +1130,7 @@ class Popen(object):
-                 pass
-             elif stderr == PIPE:
-                 errread, errwrite = self.pipe_cloexec()
-+                to_close.update((errread, errwrite))
-             elif stderr == STDOUT:
-                 errwrite = c2pwrite
-             elif isinstance(stderr, int):
-@@ -1126,7 +1141,7 @@ class Popen(object):
- 
-             return (p2cread, p2cwrite,
-                     c2pread, c2pwrite,
--                    errread, errwrite)
-+                    errread, errwrite), to_close
- 
- 
-         def _set_cloexec_flag(self, fd, cloexec=True):
-@@ -1170,7 +1185,7 @@ class Popen(object):
- 
-         def _execute_child(self, args, executable, preexec_fn, close_fds,
-                            cwd, env, universal_newlines,
--                           startupinfo, creationflags, shell,
-+                           startupinfo, creationflags, shell, to_close,
-                            p2cread, p2cwrite,
-                            c2pread, c2pwrite,
-                            errread, errwrite):
-@@ -1189,6 +1204,10 @@ class Popen(object):
-             if executable is None:
-                 executable = args[0]
- 
-+            def _close_in_parent(fd):
-+                os.close(fd)
-+                to_close.remove(fd)
-+
-             # For transferring possible exec failure from child to parent
-             # The first char specifies the exception type: 0 means
-             # OSError, 1 means some other error.
-@@ -1283,17 +1302,17 @@ class Popen(object):
-                     # be sure the FD is closed no matter what
-                     os.close(errpipe_write)
- 
--                if p2cread is not None and p2cwrite is not None:
--                    os.close(p2cread)
--                if c2pwrite is not None and c2pread is not None:
--                    os.close(c2pwrite)
--                if errwrite is not None and errread is not None:
--                    os.close(errwrite)
--
-                 # Wait for exec to fail or succeed; possibly raising exception
-                 # Exception limited to 1M
-                 data = _eintr_retry_call(os.read, errpipe_read, 1048576)
-             finally:
-+                if p2cread is not None and p2cwrite is not None:
-+                    _close_in_parent(p2cread)
-+                if c2pwrite is not None and c2pread is not None:
-+                    _close_in_parent(c2pwrite)
-+                if errwrite is not None and errread is not None:
-+                    _close_in_parent(errwrite)
-+
-                 # be sure the FD is closed no matter what
-                 os.close(errpipe_read)
- 
-diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
---- a/Lib/test/test_subprocess.py
-+++ b/Lib/test/test_subprocess.py
-@@ -14,6 +14,10 @@ try:
-     import resource
- except ImportError:
-     resource = None
-+try:
-+    import threading
-+except ImportError:
-+    threading = None
- 
- mswindows = (sys.platform == "win32")
- 
-@@ -629,6 +633,36 @@ class ProcessTestCase(BaseTestCase):
-             if c.exception.errno not in (errno.ENOENT, errno.EACCES):
-                 raise c.exception
- 
-+    @unittest.skipIf(threading is None, "threading required")
-+    def test_double_close_on_error(self):
-+        # Issue #18851
-+        fds = []
-+        def open_fds():
-+            for i in range(20):
-+                fds.extend(os.pipe())
-+                time.sleep(0.001)
-+        t = threading.Thread(target=open_fds)
-+        t.start()
-+        try:
-+            with self.assertRaises(EnvironmentError):
-+                subprocess.Popen(['nonexisting_i_hope'],
-+                                 stdin=subprocess.PIPE,
-+                                 stdout=subprocess.PIPE,
-+                                 stderr=subprocess.PIPE)
-+        finally:
-+            t.join()
-+            exc = None
-+            for fd in fds:
-+                # If a double close occurred, some of those fds will
-+                # already have been closed by mistake, and os.close()
-+                # here will raise.
-+                try:
-+                    os.close(fd)
-+                except OSError as e:
-+                    exc = e
-+            if exc is not None:
-+                raise exc
-+
-     def test_handles_closed_on_exception(self):
-         # If CreateProcess exits with an error, ensure the
-         # duplicate output handles are released
-@@ -783,7 +817,7 @@ class POSIXProcessTestCase(BaseTestCase)
- 
-         def _execute_child(
-                 self, args, executable, preexec_fn, close_fds, cwd, env,
--                universal_newlines, startupinfo, creationflags, shell,
-+                universal_newlines, startupinfo, creationflags, shell, to_close,
-                 p2cread, p2cwrite,
-                 c2pread, c2pwrite,
-                 errread, errwrite):
-@@ -791,7 +825,7 @@ class POSIXProcessTestCase(BaseTestCase)
-                 subprocess.Popen._execute_child(
-                         self, args, executable, preexec_fn, close_fds,
-                         cwd, env, universal_newlines,
--                        startupinfo, creationflags, shell,
-+                        startupinfo, creationflags, shell, to_close,
-                         p2cread, p2cwrite,
-                         c2pread, c2pwrite,
-                         errread, errwrite)

diff --git a/dev-lang/python/files/python-2.7.5-library-path.patch b/dev-lang/python/files/python-2.7.5-library-path.patch
deleted file mode 100644
index 6f43575..0000000
--- a/dev-lang/python/files/python-2.7.5-library-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# HG changeset patch
-# User Ned Deily <nad@×××.org>
-# Date 1368666045 25200
-# Node ID cd577c3288860b0deb459443ca5c489dc0f99ef6
-# Parent  149340b3004acfcb68e5ed36b1e96b7463c756c7
-Issue #17990: Only modify include and library search paths when cross-compiling.
-
-diff --git a/setup.py b/setup.py
---- a/setup.py
-+++ b/setup.py
-@@ -437,9 +437,11 @@ class PyBuildExt(build_ext):
- 
-     def detect_modules(self):
-         # Ensure that /usr/local is always used
--        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
--        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
--        self.add_gcc_paths()
-+        if not cross_compiling:
-+            add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-+            add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-+        if cross_compiling:
-+            self.add_gcc_paths()
-         self.add_multiarch_paths()
- 
-         # Add paths specified in the environment variables LDFLAGS and

diff --git a/dev-lang/python/files/python-2.7.5-nonfatal-compileall.patch b/dev-lang/python/files/python-2.7.5-nonfatal-compileall.patch
deleted file mode 100644
index a762dfb..0000000
--- a/dev-lang/python/files/python-2.7.5-nonfatal-compileall.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/Makefile.pre.in b/Makefile.pre.in
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1000,12 +1000,12 @@
- 		$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
- 			$(DESTDIR)$(LIBDEST)/distutils/tests ; \
- 	fi
--	PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
-+	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
- 		$(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
- 		-d $(LIBDEST) -f \
- 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
- 		$(DESTDIR)$(LIBDEST)
--	PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-+	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- 		$(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
- 		-d $(LIBDEST) -f \
- 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \

diff --git a/dev-lang/python/files/python-2.7.5-re_unsigned_ptrdiff.patch b/dev-lang/python/files/python-2.7.5-re_unsigned_ptrdiff.patch
deleted file mode 100644
index a905839..0000000
--- a/dev-lang/python/files/python-2.7.5-re_unsigned_ptrdiff.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=476426
-http://bugs.python.org/issue17998
-diff -r d91da96a55bf Modules/_sre.c
---- a/Modules/_sre.c	Thu May 16 22:47:47 2013 +0100
-+++ b/Modules/_sre.c	Fri May 17 21:02:48 2013 +0300
-@@ -1028,7 +1028,7 @@
-             TRACE(("|%p|%p|REPEAT_ONE %d %d\n", ctx->pattern, ctx->ptr,
-                    ctx->pattern[1], ctx->pattern[2]));
- 
--            if (ctx->pattern[1] > end - ctx->ptr)
-+            if ((Py_ssize_t) ctx->pattern[1] > end - ctx->ptr)
-                 RETURN_FAILURE; /* cannot match */
- 
-             state->ptr = ctx->ptr;
-@@ -1111,7 +1111,7 @@
-             TRACE(("|%p|%p|MIN_REPEAT_ONE %d %d\n", ctx->pattern, ctx->ptr,
-                    ctx->pattern[1], ctx->pattern[2]));
- 
--            if (ctx->pattern[1] > end - ctx->ptr)
-+            if ((Py_ssize_t) ctx->pattern[1] > end - ctx->ptr)
-                 RETURN_FAILURE; /* cannot match */
- 
-             state->ptr = ctx->ptr;

diff --git a/dev-lang/python/files/python-2.7.6-recvfrom_into_buffer_overflow.patch b/dev-lang/python/files/python-2.7.6-recvfrom_into_buffer_overflow.patch
deleted file mode 100644
index 37e786b..0000000
--- a/dev-lang/python/files/python-2.7.6-recvfrom_into_buffer_overflow.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -r 40fb60df4755 Modules/socketmodule.c
---- a/Modules/socketmodule.c	Sun Jan 12 12:11:47 2014 +0200
-+++ b/Modules/socketmodule.c	Mon Jan 13 16:36:35 2014 -0800
-@@ -2744,6 +2744,13 @@
-         recvlen = buflen;
-     }
- 
-+    /* Check if the buffer is large enough */
-+    if (buflen < recvlen) {
-+        PyErr_SetString(PyExc_ValueError,
-+                        "buffer too small for requested bytes");
-+        goto error;
-+    }
-+
-     readlen = sock_recvfrom_guts(s, buf.buf, recvlen, flags, &addr);
-     if (readlen < 0) {
-         /* Return an error */

diff --git a/dev-lang/python/files/python-2.7.9-ncurses-pkg-config.patch b/dev-lang/python/files/python-2.7.9-ncurses-pkg-config.patch
deleted file mode 100644
index 38ce6f7..0000000
--- a/dev-lang/python/files/python-2.7.9-ncurses-pkg-config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-do not hardcode /usr/include paths
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -4316,7 +4316,7 @@ fi
- 
- # first curses configure check
- ac_save_cppflags="$CPPFLAGS"
--CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
-+CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags ncursesw`"
- 
- AC_CHECK_HEADERS(curses.h ncurses.h)
- 

diff --git a/dev-lang/python/files/python-3.2-CVE-2013-2099.patch b/dev-lang/python/files/python-3.2-CVE-2013-2099.patch
deleted file mode 100644
index 9055a03..0000000
--- a/dev-lang/python/files/python-3.2-CVE-2013-2099.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-# HG changeset patch
-# User Antoine Pitrou <solipsis@××××××.net>
-# Date 1368892602 -7200
-#      Sat May 18 17:56:42 2013 +0200
-# Branch 3.2
-# Node ID b9b521efeba385af0142988899a55de1c1c805c7
-# Parent  6255b40c6a6127933d8ea7a2b9de200f5a0e6154
-Issue #17980: Fix possible abuse of ssl.match_hostname() for denial of service using certificates with many wildcards (CVE-2013-2099).
-
-diff --git a/Lib/ssl.py b/Lib/ssl.py
---- a/Lib/ssl.py
-+++ b/Lib/ssl.py
-@@ -108,9 +108,16 @@
-     pass
- 
- 
--def _dnsname_to_pat(dn):
-+def _dnsname_to_pat(dn, max_wildcards=1):
-     pats = []
-     for frag in dn.split(r'.'):
-+        if frag.count('*') > max_wildcards:
-+            # Issue #17980: avoid denials of service by refusing more
-+            # than one wildcard per fragment.  A survery of established
-+            # policy among SSL implementations showed it to be a
-+            # reasonable choice.
-+            raise CertificateError(
-+                "too many wildcards in certificate DNS name: " + repr(dn))
-         if frag == '*':
-             # When '*' is a fragment by itself, it matches a non-empty dotless
-             # fragment.
-diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
---- a/Lib/test/test_ssl.py
-+++ b/Lib/test/test_ssl.py
-@@ -326,6 +326,17 @@
-         self.assertRaises(ValueError, ssl.match_hostname, None, 'example.com')
-         self.assertRaises(ValueError, ssl.match_hostname, {}, 'example.com')
- 
-+        # Issue #17980: avoid denials of service by refusing more than one
-+        # wildcard per fragment.
-+        cert = {'subject': ((('commonName', 'a*b.com'),),)}
-+        ok(cert, 'axxb.com')
-+        cert = {'subject': ((('commonName', 'a*b.co*'),),)}
-+        ok(cert, 'axxb.com')
-+        cert = {'subject': ((('commonName', 'a*b*.com'),),)}
-+        with self.assertRaises(ssl.CertificateError) as cm:
-+            ssl.match_hostname(cert, 'axxbxxc.com')
-+        self.assertIn("too many wildcards", str(cm.exception))
-+
-     def test_server_side(self):
-         # server_hostname doesn't work for server sockets
-         ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)

diff --git a/dev-lang/python/files/python-3.2-CVE-2014-1912.patch b/dev-lang/python/files/python-3.2-CVE-2014-1912.patch
deleted file mode 100644
index 0e09507..0000000
--- a/dev-lang/python/files/python-3.2-CVE-2014-1912.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-# HG changeset patch
-# User Benjamin Peterson <benjamin@××××××.org>
-# Date 1389671978 18000
-# Node ID 9c56217e5c793685eeaf0ee224848c402bdf1e4c
-# Parent  2b5cd6d4d149dea6c6941b7e07ada248b29fc9f6
-complain when nbytes > buflen to fix possible buffer overflow (closes #20246)
-
-diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
---- a/Lib/test/test_socket.py
-+++ b/Lib/test/test_socket.py
-@@ -1968,6 +1968,14 @@ class BufferIOTest(SocketConnectedTest):
- 
-     _testRecvFromIntoMemoryview = _testRecvFromIntoArray
- 
-+    def testRecvFromIntoSmallBuffer(self):
-+        # See issue #20246.
-+        buf = bytearray(8)
-+        self.assertRaises(ValueError, self.cli_conn.recvfrom_into, buf, 1024)
-+
-+    def _testRecvFromIntoSmallBuffer(self):
-+        self.serv_conn.send(MSG*2048)
-+
- 
- TIPC_STYPE = 2000
- TIPC_LOWER = 200
-diff --git a/Misc/ACKS b/Misc/ACKS
---- a/Misc/ACKS
-+++ b/Misc/ACKS
-@@ -1020,6 +1020,7 @@ Eric V. Smith
- Christopher Smith
- Gregory P. Smith
- Roy Smith
-+Ryan Smith-Roberts
- Rafal Smotrzyk
- Dirk Soede
- Paul Sokolovsky
-diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
---- a/Modules/socketmodule.c
-+++ b/Modules/socketmodule.c
-@@ -2598,6 +2598,11 @@ sock_recvfrom_into(PySocketSockObject *s
-     if (recvlen == 0) {
-         /* If nbytes was not specified, use the buffer's length */
-         recvlen = buflen;
-+    } else if (recvlen > buflen) {
-+        PyBuffer_Release(&pbuf);
-+        PyErr_SetString(PyExc_ValueError,
-+                        "nbytes is greater than the length of the buffer");
-+        return NULL;
-     }
- 
-     readlen = sock_recvfrom_guts(s, buf, recvlen, flags, &addr);

diff --git a/dev-lang/python/files/python-3.2-CVE-2014-4616.patch b/dev-lang/python/files/python-3.2-CVE-2014-4616.patch
deleted file mode 100644
index 5b0a397..0000000
--- a/dev-lang/python/files/python-3.2-CVE-2014-4616.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-# HG changeset patch
-# User Benjamin Peterson <benjamin@××××××.org>
-# Date 1397441438 14400
-# Node ID 50c07ed1743da9cd4540d83de0c30bd17aeb41b0
-# Parent  218e28a935ab4494d05215c243e2129625a71893
-in scan_once, prevent the reading of arbitrary memory when passed a negative index
-
-Bug reported by Guido Vranken.
-
-Index: Python-3.2.5/Lib/json/tests/test_decode.py
-===================================================================
---- Python-3.2.5.orig/Lib/test/json_tests/test_decode.py	2014-06-26 18:40:10.825269130 +0200
-+++ Python-3.2.5/Lib/test/json_tests/test_decode.py	2014-06-26 18:40:21.962323035 +0200
-@@ -60,5 +60,9 @@
-         msg = 'escape'
-         self.assertRaisesRegexp(ValueError, msg, self.loads, s)
- 
-+    def test_negative_index(self):
-+        d = self.json.JSONDecoder()
-+        self.assertRaises(ValueError, d.raw_decode, 'a'*42, -50000)
-+
- class TestPyDecode(TestDecode, PyTest): pass
- class TestCDecode(TestDecode, CTest): pass
-Index: Python-3.2.5/Modules/_json.c
-===================================================================
---- a/Modules/_json.c
-+++ b/Modules/_json.c
-@@ -930,7 +930,10 @@ scan_once_unicode(PyScannerObject *s, Py
-     PyObject *res;
-     Py_UNICODE *str = PyUnicode_AS_UNICODE(pystr);
-     Py_ssize_t length = PyUnicode_GET_SIZE(pystr);
--    if (idx >= length) {
-+    if (idx < 0)
-+        /* Compatibility with Python version. */
-+        idx += length;
-+    if (idx < 0 || idx >= length) {
-         PyErr_SetNone(PyExc_StopIteration);
-         return NULL;
-     }

diff --git a/dev-lang/python/files/python-3.2-issue16248.patch b/dev-lang/python/files/python-3.2-issue16248.patch
deleted file mode 100644
index d0e80ca..0000000
--- a/dev-lang/python/files/python-3.2-issue16248.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# HG changeset patch
-# User Georg Brandl <georg@××××××.org>
-# Date 1379142489 -7200
-# Node ID c18c18774e240377d47638fb23e8276c1ac2e606
-# Parent  b9b521efeba385af0142988899a55de1c1c805c7
-Fix tkinter regression introduced by the security fix in #16248.
-
-diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py
---- a/Lib/tkinter/__init__.py
-+++ b/Lib/tkinter/__init__.py
-@@ -1722,7 +1722,7 @@ class Tk(Misc, Wm):
-         # ensure that self.tk is always _something_.
-         self.tk = None
-         if baseName is None:
--            import sys, os
-+            import os
-             baseName = os.path.basename(sys.argv[0])
-             baseName, ext = os.path.splitext(baseName)
-             if ext not in ('.py', '.pyc', '.pyo'):

diff --git a/dev-lang/python/files/python-3.3-CVE-2013-2099.patch b/dev-lang/python/files/python-3.3-CVE-2013-2099.patch
deleted file mode 100644
index 44b9ace..0000000
--- a/dev-lang/python/files/python-3.3-CVE-2013-2099.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-# HG changeset patch
-# User Antoine Pitrou <solipsis@××××××.net>
-# Date 1368892602 -7200
-#      Sat May 18 17:56:42 2013 +0200
-# Branch 3.3
-# Node ID c627638753e2d25a98950585b259104a025937a9
-# Parent  9682241dc8fcb4b1aef083bd30860efa070c3d6d
-Issue #17980: Fix possible abuse of ssl.match_hostname() for denial of service using certificates with many wildcards (CVE-2013-2099).
-
-diff --git a/Lib/ssl.py b/Lib/ssl.py
---- a/Lib/ssl.py
-+++ b/Lib/ssl.py
-@@ -129,9 +129,16 @@
-     pass
- 
- 
--def _dnsname_to_pat(dn):
-+def _dnsname_to_pat(dn, max_wildcards=1):
-     pats = []
-     for frag in dn.split(r'.'):
-+        if frag.count('*') > max_wildcards:
-+            # Issue #17980: avoid denials of service by refusing more
-+            # than one wildcard per fragment.  A survery of established
-+            # policy among SSL implementations showed it to be a
-+            # reasonable choice.
-+            raise CertificateError(
-+                "too many wildcards in certificate DNS name: " + repr(dn))
-         if frag == '*':
-             # When '*' is a fragment by itself, it matches a non-empty dotless
-             # fragment.
-diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
---- a/Lib/test/test_ssl.py
-+++ b/Lib/test/test_ssl.py
-@@ -349,6 +349,17 @@
-         self.assertRaises(ValueError, ssl.match_hostname, None, 'example.com')
-         self.assertRaises(ValueError, ssl.match_hostname, {}, 'example.com')
- 
-+        # Issue #17980: avoid denials of service by refusing more than one
-+        # wildcard per fragment.
-+        cert = {'subject': ((('commonName', 'a*b.com'),),)}
-+        ok(cert, 'axxb.com')
-+        cert = {'subject': ((('commonName', 'a*b.co*'),),)}
-+        ok(cert, 'axxb.com')
-+        cert = {'subject': ((('commonName', 'a*b*.com'),),)}
-+        with self.assertRaises(ssl.CertificateError) as cm:
-+            ssl.match_hostname(cert, 'axxbxxc.com')
-+        self.assertIn("too many wildcards", str(cm.exception))
-+
-     def test_server_side(self):
-         # server_hostname doesn't work for server sockets
-         ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)

diff --git a/dev-lang/python/files/python-3.3-CVE-2014-4616.patch b/dev-lang/python/files/python-3.3-CVE-2014-4616.patch
deleted file mode 100644
index c67b2e5..0000000
--- a/dev-lang/python/files/python-3.3-CVE-2014-4616.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-# HG changeset patch
-# User Benjamin Peterson <benjamin@××××××.org>
-# Date 1397441438 14400
-# Node ID 50c07ed1743da9cd4540d83de0c30bd17aeb41b0
-# Parent  218e28a935ab4494d05215c243e2129625a71893
-in scan_once, prevent the reading of arbitrary memory when passed a negative index
-
-Bug reported by Guido Vranken.
-
-Index: Python-3.3.5/Lib/json/tests/test_decode.py
-===================================================================
---- Python-3.3.5.orig/Lib/test/test_json/test_decode.py	2014-06-26 18:40:10.825269130 +0200
-+++ Python-3.3.5/Lib/test/test_json/test_decode.py	2014-06-26 18:40:21.962323035 +0200
-@@ -60,5 +60,10 @@
-         msg = 'escape'
-         self.assertRaisesRegexp(ValueError, msg, self.loads, s)
- 
-+    def test_negative_index(self):
-+        d = self.json.JSONDecoder()
-+        self.assertRaises(ValueError, d.raw_decode, 'a'*42, -50000)
-+        self.assertRaises(ValueError, d.raw_decode, u'a'*42, -50000)
-+
- class TestPyDecode(TestDecode, PyTest): pass
- class TestCDecode(TestDecode, CTest): pass
-Index: Python-3.3.5/Misc/ACKS
-===================================================================
---- Python-3.3.5.orig/Misc/ACKS	2014-06-26 18:40:10.826269135 +0200
-+++ Python-3.3.5/Misc/ACKS	2014-06-26 18:40:21.962323035 +0200
-@@ -1085,6 +1085,7 @@
- Frank Visser
- Johannes Vogel
- Alex Volkov
-+Guido Vranken
- Martijn Vries
- Niki W. Waibel
- Wojtek Walczak
-Index: Python-3.3.5/Modules/_json.c
-===================================================================
---- a/Modules/_json.c
-+++ b/Modules/_json.c
-@@ -975,7 +975,10 @@ scan_once_unicode(PyScannerObject *s, Py
-     kind = PyUnicode_KIND(pystr);
-     length = PyUnicode_GET_LENGTH(pystr);
- 
--    if (idx >= length) {
-+    if (idx < 0)
-+        /* Compatibility with Python version. */
-+        idx += length;
-+    if (idx < 0 || idx >= length) {
-         PyErr_SetNone(PyExc_StopIteration);
-         return NULL;
-     }

diff --git a/dev-lang/python/files/python-3.3.5-ncurses-pkg-config.patch b/dev-lang/python/files/python-3.3.5-ncurses-pkg-config.patch
deleted file mode 100644
index d963b9e..0000000
--- a/dev-lang/python/files/python-3.3.5-ncurses-pkg-config.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-do not hardcode /usr/include paths
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -668,6 +668,8 @@ AC_ARG_WITH(cxx_main,
- ])
- AC_MSG_RESULT($with_cxx_main)
- 
-+AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-+
- preset_cxx="$CXX"
- if test -z "$CXX"
- then
-@@ -1513,7 +1515,7 @@ dnl AC_MSG_RESULT($cpp_type)
- # checks for header files
- AC_HEADER_STDC
- ac_save_cppflags="$CPPFLAGS"
--CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
-+CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags ncursesw`"
- AC_CHECK_HEADERS(asm/types.h conio.h curses.h direct.h dlfcn.h errno.h \
- fcntl.h grp.h \
- ieeefp.h io.h langinfo.h libintl.h ncurses.h process.h pthread.h \
-@@ -2225,8 +2227,6 @@ LIBS="$withval $LIBS"
- ],
- [AC_MSG_RESULT(no)])
- 
--AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
--
- # Check for use of the system expat library
- AC_MSG_CHECKING(for --with-system-expat)
- AC_ARG_WITH(system_expat,
-@@ -4273,7 +4273,7 @@ then
- fi
- 
- ac_save_cppflags="$CPPFLAGS"
--CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
-+CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags ncursesw`"
- # On HP/UX 11.0, mvwdelch is a block with a return statement
- AC_MSG_CHECKING(whether mvwdelch is an expression)
- AC_CACHE_VAL(ac_cv_mvwdelch_is_expression,

diff --git a/dev-lang/python/files/python-3.4.3-ncurses-pkg-config.patch b/dev-lang/python/files/python-3.4.3-ncurses-pkg-config.patch
deleted file mode 100644
index 8bfad11..0000000
--- a/dev-lang/python/files/python-3.4.3-ncurses-pkg-config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-do not hardcode /usr/include paths
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -4402,7 +4402,7 @@ fi
- 
- # first curses header check
- ac_save_cppflags="$CPPFLAGS"
--CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
-+CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags ncursesw`"
- 
- AC_CHECK_HEADERS(curses.h ncurses.h)
- 

diff --git a/dev-lang/python/files/python-config-2.4-r1 b/dev-lang/python/files/python-config-2.4-r1
deleted file mode 100644
index af45113..0000000
--- a/dev-lang/python/files/python-config-2.4-r1
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /usr/bin/python2.4
-
-import sys
-import os
-import getopt
-from distutils import sysconfig
-
-valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags', 
-              'ldflags', 'help']
-
-def exit_with_usage(code=1):
-    print >>sys.stderr, "Usage: %s [%s]" % (sys.argv[0], 
-                                            '|'.join('--'+opt for opt in valid_opts))
-    sys.exit(code)
-
-try:
-    opts, args = getopt.getopt(sys.argv[1:], '', valid_opts)
-except getopt.error:
-    exit_with_usage()
-
-if not opts:
-    #exit_with_usage()
-    #be compatible with our old python-config-2.4
-    import string
-    print "-lpython2.4 -lm -L/usr/lib/python2.4/config",string.join(string.split(sysconfig.get_config_var("MODLIBS")))
-    sys.exit(0)
-
-opt = opts[0][0]
-
-pyver = sysconfig.get_config_var('VERSION')
-getvar = sysconfig.get_config_var
-
-if opt == '--help':
-    exit_with_usage(0)
-
-elif opt == '--prefix':
-    print sysconfig.PREFIX
-
-elif opt == '--exec-prefix':
-    print sysconfig.EXEC_PREFIX
-
-elif opt in ('--includes', '--cflags'):
-    flags = ['-I' + sysconfig.get_python_inc(),
-             '-I' + sysconfig.get_python_inc(plat_specific=True)]
-    if opt == '--cflags':
-        flags.extend(getvar('CFLAGS').split())
-    print ' '.join(flags)
-
-elif opt in ('--libs', '--ldflags'):
-    libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
-    libs.append('-lpython'+pyver)
-    # add the prefix/lib/pythonX.Y/config dir, but only if there is no
-    # shared library in prefix/lib/.
-    if opt == '--ldflags' and not getvar('Py_ENABLE_SHARED'):
-        libs.insert(0, '-L' + getvar('LIBPL'))
-    print ' '.join(libs)
-
-

diff --git a/dev-lang/python/metadata.xml b/dev-lang/python/metadata.xml
deleted file mode 100644
index 51a9e80..0000000
--- a/dev-lang/python/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>python</herd>
-<use>
-	<flag name="threads">Enable threading support. (DON'T DISABLE THIS UNLESS YOU KNOW WHAT YOU'RE DOING)</flag>
-	<flag name="wide-unicode">Enable wide Unicode implementation which uses 4-byte Unicode characters. Switching of this USE flag changes ABI of Python and requires reinstallation of many Python modules. (DON'T DISABLE THIS UNLESS YOU KNOW WHAT YOU'RE DOING)</flag>
-	<flag name="wininst">Install Windows executables required to create an executable installer for MS Windows.</flag>
-</use>
-</pkgmetadata>

diff --git a/dev-lang/python/python-2.6.9.ebuild b/dev-lang/python/python-2.6.9.ebuild
deleted file mode 100644
index 9ca66c6..0000000
--- a/dev-lang/python/python-2.6.9.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.9.ebuild,v 1.7 2015/04/23 19:25:27 floppym Exp $
-
-EAPI="2"
-WANT_AUTOMAKE="none"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib multiprocessing pax-utils python-utils-r1 toolchain-funcs unpacker
-
-MY_P="Python-${PV}"
-PATCHSET_VERSION="${PV}-0"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tgz
-	http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="2.6"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2
-	>=sys-libs/zlib-1.1.3
-	virtual/libffi
-	virtual/libintl
-	!build? (
-		berkdb? ( || (
-			sys-libs/db:4.7
-			sys-libs/db:4.6
-			sys-libs/db:4.5
-			sys-libs/db:4.4
-			sys-libs/db:4.3
-			sys-libs/db:4.2
-		) )
-		gdbm? ( sys-libs/gdbm[berkdb] )
-		ncurses? (
-			>=sys-libs/ncurses-5.2
-			readline? ( >=sys-libs/readline-4.1 )
-		)
-		sqlite? ( >=dev-db/sqlite-3.3.3:3 )
-		ssl? ( dev-libs/openssl )
-		tk? (
-			>=dev-lang/tk-8.0
-			dev-tcltk/blt
-		)
-		xml? ( >=dev-libs/expat-2.1 )
-	)
-	!!<sys-apps/portage-2.1.9"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.61
-	!sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )
-	doc? ( dev-python/python-docs:${SLOT} )"
-PDEPEND="app-eselect/eselect-python
-	app-admin/python-updater"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use berkdb; then
-		ewarn "'bsddb' module is out-of-date and no longer maintained inside"
-		ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
-		ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
-		ewarn "is provided by dev-python/bsddb3."
-	else
-		if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
-			ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"
-			ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
-			ewarn "You might need to migrate your databases."
-		fi
-	fi
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat
-	rm -fr Modules/_ctypes/libffi*
-	rm -fr Modules/zlib
-
-	local excluded_patches
-	if ! tc-is-cross-compiler; then
-		excluded_patches="*_all_crosscompile.patch"
-	fi
-
-	EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches"
-
-	epatch "${FILESDIR}/python-2.5-tcl86.patch"
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	epatch_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use build; then
-		# Disable extraneous modules with extra dependencies.
-		export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
-		export PYTHON_DISABLE_SSL="1"
-	else
-		# dbm module can be linked against berkdb or gdbm.
-		# Defaults to gdbm when both are enabled, #204343.
-		local disable
-		use berkdb   || use gdbm || disable+=" dbm"
-		use berkdb   || disable+=" _bsddb"
-		use gdbm     || disable+=" gdbm"
-		use ncurses  || disable+=" _curses _curses_panel"
-		use readline || disable+=" readline"
-		use sqlite   || disable+=" _sqlite3"
-		use ssl      || export PYTHON_DISABLE_SSL="1"
-		use tk       || disable+=" _tkinter"
-		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-		export PYTHON_DISABLE_MODULES="${disable}"
-
-		if ! use xml; then
-			ewarn "You have configured Python without XML support."
-			ewarn "This is NOT a recommended configuration as you"
-			ewarn "may face problems parsing any XML documents."
-		fi
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# Run the configure scripts in parallel.
-	multijob_init
-
-	mkdir -p "${WORKDIR}"/{${CBUILD},${CHOST}}
-
-	if tc-is-cross-compiler; then
-		(
-		multijob_child_init
-		cd "${WORKDIR}"/${CBUILD} >/dev/null
-		OPT="-O1" CFLAGS="" CPPFLAGS="" LDFLAGS="" CC="" \
-		"${S}"/configure \
-			--{build,host}=${CBUILD} \
-			|| die "cross-configure failed"
-		) &
-		multijob_post_fork
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
-	tc-export CXX
-	# The configure script fails to use pkg-config correctly.
-	# http://bugs.python.org/issue15506
-	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	# Set LDFLAGS so we link modules with -lpython2.6 correctly.
-	# Needed on FreeBSD unless Python 2.6 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	cd "${WORKDIR}"/${CHOST}
-	ECONF_SOURCE=${S} OPT="" \
-	econf \
-		--with-fpectl \
-		--enable-shared \
-		$(use_enable ipv6) \
-		$(use_with threads) \
-		$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
-		--infodir='${prefix}/share/info' \
-		--mandir='${prefix}/share/man' \
-		--with-libc="" \
-		--with-system-ffi
-
-	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	if tc-is-cross-compiler; then
-		# Modify the Makefile.pre so we don't regen for the host/ one.
-		# We need to link the host python programs into $PWD and run
-		# them from here because the distutils sysconfig module will
-		# parse Makefile/etc... from argv[0], and we need it to pick
-		# up the target settings, not the host ones.
-		sed -i \
-			-e '1iHOSTPYTHONPATH = ./hostpythonpath:' \
-			-e '/^HOSTPYTHON/s:=.*:= ./hostpython:' \
-			-e '/^HOSTPGEN/s:=.*:= ./Parser/hostpgen:' \
-			Makefile{.pre,} || die "sed failed"
-	fi
-
-	multijob_finish
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		cd "${WORKDIR}"/${CBUILD}
-		# Disable as many modules as possible -- but we need a few to install.
-		PYTHON_DISABLE_MODULES=$(
-			sed -n "/Extension('/{s:^.*Extension('::;s:'.*::;p}" "${S}"/setup.py | \
-				egrep -v '(unicodedata|time|cStringIO|_struct|binascii)'
-		) \
-		PTHON_DISABLE_SSL="1" \
-		SYSROOT= \
-		emake || die "cross-make failed"
-		# See comment in src_configure about these.
-		ln python ../${CHOST}/hostpython || die
-		ln Parser/pgen ../${CHOST}/Parser/hostpgen || die
-		ln -s ../${CBUILD}/build/lib.*/ ../${CHOST}/hostpythonpath || die
-	fi
-
-	cd "${WORKDIR}"/${CHOST}
-	default
-
-	# Work around bug 329499. See also bug 413751.
-	pax-mark m python
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	cd "${WORKDIR}"/${CHOST}
-
-	# Skip failing tests.
-	local skipped_tests="distutils tcl"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# Rerun failed tests in verbose mode (regrtest -w).
-	PYTHONDONTWRITEBYTECODE="" emake test EXTRATESTOPTS="-w" < /dev/tty
-	local result="$?"
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
-	elog "and run the tests separately."
-
-	if [[ "${result}" -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	[[ -z "${ED}" ]] && ED="${D%/}${EPREFIX}/"
-
-	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
-
-	cd "${WORKDIR}"/${CHOST}
-	emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed"
-
-	# Backwards compat with Gentoo divergence.
-	dosym python${SLOT}-config /usr/bin/python-config-${SLOT} || die
-
-	# Fix collisions between different slots of Python.
-	mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
-	mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
-	mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
-	mv "${ED}usr/share/man/man1/python.1" "${ED}usr/share/man/man1/python${SLOT}.1"
-	rm -f "${ED}usr/bin/smtpd.py"
-
-	if use build; then
-		rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{bsddb,dbhash.py,idlelib,lib-tk,sqlite3,test}
-	else
-		use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
-		use berkdb || rm -fr "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*}
-		use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
-		use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk}
-	fi
-
-	use threads || rm -fr "${libdir}/multiprocessing"
-	use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
-
-	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r "${S}"/Tools || die "doins failed"
-	fi
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed"
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${SLOT}:" \
-		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-
-	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
-
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local PYTHON=./python \
-			LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
-		export LD_LIBRARY_PATH
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py
-	python_domodule epython.py
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.6" && ! has_version "${CATEGORY}/${PN}:2.7"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	[[ -z "${EROOT}" || (! -d "${EROOT}" && -d "${ROOT}") ]] && EROOT="${ROOT%/}${EPREFIX}/"
-
-	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn "You should switch active version of Python ${PV%%.*} and run"
-		ewarn "'python-updater [options]' to rebuild Python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}

diff --git a/dev-lang/python/python-2.7.9-r1.ebuild b/dev-lang/python/python-2.7.9-r1.ebuild
deleted file mode 100644
index 774893e..0000000
--- a/dev-lang/python/python-2.7.9-r1.ebuild
+++ /dev/null
@@ -1,358 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.9-r1.ebuild,v 1.7 2015/03/31 18:46:33 ulm Exp $
-
-EAPI="4"
-WANT_AUTOMAKE="none"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
-
-MY_P="Python-${PV}"
-PATCHSET_VERSION="2.7.9-0"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
-	http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="2.7"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2
-	>=sys-libs/zlib-1.1.3
-	virtual/libffi
-	virtual/libintl
-	!build? (
-		berkdb? ( || (
-			sys-libs/db:5.3
-			sys-libs/db:5.2
-			sys-libs/db:5.1
-			sys-libs/db:5.0
-			sys-libs/db:4.8
-			sys-libs/db:4.7
-			sys-libs/db:4.6
-			sys-libs/db:4.5
-			sys-libs/db:4.4
-			sys-libs/db:4.3
-			sys-libs/db:4.2
-		) )
-		gdbm? ( sys-libs/gdbm[berkdb] )
-		ncurses? (
-			>=sys-libs/ncurses-5.2
-			readline? ( >=sys-libs/readline-4.1 )
-		)
-		sqlite? ( >=dev-db/sqlite-3.3.8:3 )
-		ssl? ( dev-libs/openssl )
-		tk? (
-			>=dev-lang/tk-8.0
-			dev-tcltk/blt
-			dev-tcltk/tix
-		)
-		xml? ( >=dev-libs/expat-2.1 )
-	)
-	!!<sys-apps/portage-2.1.9"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )
-	doc? ( dev-python/python-docs:${SLOT} )"
-PDEPEND="app-eselect/eselect-python
-	app-admin/python-updater"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use berkdb; then
-		ewarn "'bsddb' module is out-of-date and no longer maintained inside"
-		ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
-		ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
-		ewarn "is provided by dev-python/bsddb3."
-	else
-		if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
-			ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"
-			ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
-			ewarn "You might need to migrate your databases."
-		fi
-	fi
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -r Modules/expat || die
-	rm -r Modules/_ctypes/libffi* || die
-	rm -r Modules/zlib || die
-
-	if tc-is-cross-compiler; then
-		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
-	fi
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	# Fix for cross-compiling.
-	epatch "${FILESDIR}/python-2.7.5-nonfatal-compileall.patch"
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	epatch_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use build; then
-		# Disable extraneous modules with extra dependencies.
-		export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
-		export PYTHON_DISABLE_SSL="1"
-	else
-		# dbm module can be linked against berkdb or gdbm.
-		# Defaults to gdbm when both are enabled, #204343.
-		local disable
-		use berkdb   || use gdbm || disable+=" dbm"
-		use berkdb   || disable+=" _bsddb"
-		use gdbm     || disable+=" gdbm"
-		use ncurses  || disable+=" _curses _curses_panel"
-		use readline || disable+=" readline"
-		use sqlite   || disable+=" _sqlite3"
-		use ssl      || export PYTHON_DISABLE_SSL="1"
-		use tk       || disable+=" _tkinter"
-		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-		export PYTHON_DISABLE_MODULES="${disable}"
-
-		if ! use xml; then
-			ewarn "You have configured Python without XML support."
-			ewarn "This is NOT a recommended configuration as you"
-			ewarn "may face problems parsing any XML documents."
-		fi
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	if tc-is-cross-compiler; then
-		# Force some tests that try to poke fs paths.
-		export ac_cv_file__dev_ptc=no
-		export ac_cv_file__dev_ptmx=yes
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
-	tc-export CXX
-	# The configure script fails to use pkg-config correctly.
-	# http://bugs.python.org/issue15506
-	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	# Set LDFLAGS so we link modules with -lpython2.7 correctly.
-	# Needed on FreeBSD unless Python 2.7 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-	if use berkdb; then
-		dbmliborder+="${dbmliborder:+:}bdb"
-	fi
-
-	BUILD_DIR="${WORKDIR}/${CHOST}"
-	mkdir -p "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-
-	ECONF_SOURCE="${S}" OPT="" \
-	econf \
-		--with-fpectl \
-		--enable-shared \
-		$(use_enable ipv6) \
-		$(use_with threads) \
-		$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
-		--infodir='${prefix}/share/info' \
-		--mandir='${prefix}/share/man' \
-		--with-dbmliborder="${dbmliborder}" \
-		--with-libc="" \
-		--enable-loadable-sqlite-extensions \
-		--with-system-expat \
-		--with-system-ffi \
-		--without-ensurepip
-
-	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Avoid invoking pgen for cross-compiles.
-	touch Include/graminit.h Python/graminit.c
-
-	cd "${BUILD_DIR}" || die
-	emake
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	cd "${BUILD_DIR}" || die
-
-	# Skip failing tests.
-	local skipped_tests="distutils gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# Rerun failed tests in verbose mode (regrtest -w).
-	emake test EXTRATESTOPTS="-w" < /dev/tty
-	local result="$?"
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
-	elog "and run the tests separately."
-
-	if [[ "${result}" -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
-
-	cd "${BUILD_DIR}" || die
-	emake DESTDIR="${D}" altinstall
-
-	sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed"
-
-	# Backwards compat with Gentoo divergence.
-	dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
-	# Fix collisions between different slots of Python.
-	mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
-	mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
-	mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
-	rm -f "${ED}usr/bin/smtpd.py"
-
-	if use build; then
-		rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{bsddb,dbhash.py,idlelib,lib-tk,sqlite3,test}
-	else
-		use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*} || die
-		use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-		use tk || rm -r "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk} || die
-		use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
-	fi
-
-	use threads || rm -r "${libdir}/multiprocessing" || die
-	use wininst || rm -r "${libdir}/distutils/command/"wininst-*.exe || die
-
-	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r "${S}"/Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${SLOT}:" \
-		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-
-	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
-
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py
-	python_domodule epython.py
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn "You should switch active version of Python ${PV%%.*} and run"
-		ewarn "'python-updater [options]' to rebuild Python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}

diff --git a/dev-lang/python/python-2.7.9-r2.ebuild b/dev-lang/python/python-2.7.9-r2.ebuild
deleted file mode 100644
index a91fa4a..0000000
--- a/dev-lang/python/python-2.7.9-r2.ebuild
+++ /dev/null
@@ -1,362 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.9-r2.ebuild,v 1.3 2015/03/31 18:46:33 ulm Exp $
-
-EAPI="4"
-WANT_AUTOMAKE="none"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
-
-MY_P="Python-${PV}"
-PATCHSET_VERSION="2.7.9-1"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
-	http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="2.7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2
-	>=sys-libs/zlib-1.1.3
-	virtual/libffi
-	virtual/libintl
-	!build? (
-		berkdb? ( || (
-			sys-libs/db:5.3
-			sys-libs/db:5.2
-			sys-libs/db:5.1
-			sys-libs/db:5.0
-			sys-libs/db:4.8
-			sys-libs/db:4.7
-			sys-libs/db:4.6
-			sys-libs/db:4.5
-			sys-libs/db:4.4
-			sys-libs/db:4.3
-			sys-libs/db:4.2
-		) )
-		gdbm? ( sys-libs/gdbm[berkdb] )
-		ncurses? (
-			>=sys-libs/ncurses-5.2
-			readline? ( >=sys-libs/readline-4.1 )
-		)
-		sqlite? ( >=dev-db/sqlite-3.3.8:3 )
-		ssl? ( dev-libs/openssl )
-		tk? (
-			>=dev-lang/tk-8.0
-			dev-tcltk/blt
-			dev-tcltk/tix
-		)
-		xml? ( >=dev-libs/expat-2.1 )
-	)
-	!!<sys-apps/portage-2.1.9"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )
-	doc? ( dev-python/python-docs:${SLOT} )"
-PDEPEND="app-eselect/eselect-python
-	app-admin/python-updater"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use berkdb; then
-		ewarn "'bsddb' module is out-of-date and no longer maintained inside"
-		ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
-		ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
-		ewarn "is provided by dev-python/bsddb3."
-	else
-		if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
-			ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"
-			ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
-			ewarn "You might need to migrate your databases."
-		fi
-	fi
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -r Modules/expat || die
-	rm -r Modules/_ctypes/libffi* || die
-	rm -r Modules/zlib || die
-
-	if tc-is-cross-compiler; then
-		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
-	fi
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	# Fix for cross-compiling.
-	epatch "${FILESDIR}/python-2.7.5-nonfatal-compileall.patch"
-	epatch "${FILESDIR}/python-2.7.9-ncurses-pkg-config.patch"
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	epatch_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use build; then
-		# Disable extraneous modules with extra dependencies.
-		export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
-		export PYTHON_DISABLE_SSL="1"
-	else
-		# dbm module can be linked against berkdb or gdbm.
-		# Defaults to gdbm when both are enabled, #204343.
-		local disable
-		use berkdb   || use gdbm || disable+=" dbm"
-		use berkdb   || disable+=" _bsddb"
-		use gdbm     || disable+=" gdbm"
-		use ncurses  || disable+=" _curses _curses_panel"
-		use readline || disable+=" readline"
-		use sqlite   || disable+=" _sqlite3"
-		use ssl      || export PYTHON_DISABLE_SSL="1"
-		use tk       || disable+=" _tkinter"
-		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-		export PYTHON_DISABLE_MODULES="${disable}"
-
-		if ! use xml; then
-			ewarn "You have configured Python without XML support."
-			ewarn "This is NOT a recommended configuration as you"
-			ewarn "may face problems parsing any XML documents."
-		fi
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	if tc-is-cross-compiler; then
-		# Force some tests that try to poke fs paths.
-		export ac_cv_file__dev_ptc=no
-		export ac_cv_file__dev_ptmx=yes
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
-	tc-export CXX
-	# The configure script fails to use pkg-config correctly.
-	# http://bugs.python.org/issue15506
-	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	# Set LDFLAGS so we link modules with -lpython2.7 correctly.
-	# Needed on FreeBSD unless Python 2.7 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-	if use berkdb; then
-		dbmliborder+="${dbmliborder:+:}bdb"
-	fi
-
-	BUILD_DIR="${WORKDIR}/${CHOST}"
-	mkdir -p "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-
-	ECONF_SOURCE="${S}" OPT="" \
-	econf \
-		--with-fpectl \
-		--enable-shared \
-		$(use_enable ipv6) \
-		$(use_with threads) \
-		$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
-		--infodir='${prefix}/share/info' \
-		--mandir='${prefix}/share/man' \
-		--with-dbmliborder="${dbmliborder}" \
-		--with-libc="" \
-		--enable-loadable-sqlite-extensions \
-		--with-system-expat \
-		--with-system-ffi \
-		--without-ensurepip
-
-	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Avoid invoking pgen for cross-compiles.
-	touch Include/graminit.h Python/graminit.c
-
-	# Guide h2py to look into glibc of Prefix
-	use rap && export INCLUDE="${EPREFIX}"/usr/include
-
-	cd "${BUILD_DIR}" || die
-	emake
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	cd "${BUILD_DIR}" || die
-
-	# Skip failing tests.
-	local skipped_tests="distutils gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# Rerun failed tests in verbose mode (regrtest -w).
-	emake test EXTRATESTOPTS="-w" < /dev/tty
-	local result="$?"
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
-	elog "and run the tests separately."
-
-	if [[ "${result}" -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
-
-	cd "${BUILD_DIR}" || die
-	emake DESTDIR="${D}" altinstall
-
-	sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed"
-
-	# Backwards compat with Gentoo divergence.
-	dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
-	# Fix collisions between different slots of Python.
-	mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
-	mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
-	mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
-	rm -f "${ED}usr/bin/smtpd.py"
-
-	if use build; then
-		rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{bsddb,dbhash.py,idlelib,lib-tk,sqlite3,test}
-	else
-		use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*} || die
-		use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-		use tk || rm -r "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk} || die
-		use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
-	fi
-
-	use threads || rm -r "${libdir}/multiprocessing" || die
-	use wininst || rm -r "${libdir}/distutils/command/"wininst-*.exe || die
-
-	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r "${S}"/Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${SLOT}:" \
-		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-
-	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
-
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py
-	python_domodule epython.py
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn "You should switch active version of Python ${PV%%.*} and run"
-		ewarn "'python-updater [options]' to rebuild Python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}

diff --git a/dev-lang/python/python-3.2.5-r6.ebuild b/dev-lang/python/python-3.2.5-r6.ebuild
deleted file mode 100644
index e11eff0..0000000
--- a/dev-lang/python/python-3.2.5-r6.ebuild
+++ /dev/null
@@ -1,384 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.5-r6.ebuild,v 1.11 2015/03/31 18:46:33 ulm Exp $
-
-EAPI="4"
-WANT_AUTOMAKE="none"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
-
-MY_P="Python-${PV}"
-PATCHSET_REVISION="1"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
-	http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PV}-${PATCHSET_REVISION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="3.2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2
-	>=sys-libs/zlib-1.1.3
-	virtual/libffi
-	virtual/libintl
-	!build? (
-		gdbm? ( sys-libs/gdbm[berkdb] )
-		ncurses? (
-			>=sys-libs/ncurses-5.2
-			readline? ( >=sys-libs/readline-4.1 )
-		)
-		sqlite? ( >=dev-db/sqlite-3.3.8:3 )
-		ssl? ( dev-libs/openssl )
-		tk? (
-			>=dev-lang/tk-8.0
-			dev-tcltk/blt
-			dev-tcltk/tix
-		)
-		xml? ( >=dev-libs/expat-2.1 )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )
-	doc? ( dev-python/python-docs:${SLOT} )"
-PDEPEND="app-eselect/eselect-python
-	app-admin/python-updater"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if [[ "${PV}" =~ ^3\.2(\.[1234])?(_pre)? ]]; then
-		rm -f "${EROOT}usr/$(get_libdir)/llibpython3.so"
-	else
-		die "Deprecated code not deleted"
-	fi
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -r Modules/expat
-	rm -r Modules/_ctypes/libffi*
-	rm -r Modules/zlib
-
-	local excluded_patches
-	if ! tc-is-cross-compiler; then
-		excluded_patches="*_all_crosscompile.patch"
-	fi
-
-	EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches"
-
-	epatch "${FILESDIR}/python-3.2-CVE-2013-2099.patch"
-	epatch "${FILESDIR}/CVE-2013-4238_py33.patch"
-	epatch "${FILESDIR}/python-3.2-issue16248.patch"
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# Disable ABI flags.
-	sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.ac || die "sed failed"
-
-	# bug #514686
-	epatch "${FILESDIR}/${PN}-3.2-CVE-2014-4616.patch"
-	# bug #500518
-	epatch "${FILESDIR}/${PN}-3.2-CVE-2014-1912.patch"
-
-	epatch_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use build; then
-		# Disable extraneous modules with extra dependencies.
-		export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
-		export PYTHON_DISABLE_SSL="1"
-	else
-		local disable
-		use gdbm     || disable+=" gdbm"
-		use ncurses  || disable+=" _curses _curses_panel"
-		use readline || disable+=" readline"
-		use sqlite   || disable+=" _sqlite3"
-		use ssl      || export PYTHON_DISABLE_SSL="1"
-		use tk       || disable+=" _tkinter"
-		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-		export PYTHON_DISABLE_MODULES="${disable}"
-
-		if ! use xml; then
-			ewarn "You have configured Python without XML support."
-			ewarn "This is NOT a recommended configuration as you"
-			ewarn "may face problems parsing any XML documents."
-		fi
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# Run the configure scripts in parallel.
-	multijob_init
-
-	mkdir -p "${WORKDIR}"/{${CBUILD},${CHOST}}
-
-	if tc-is-cross-compiler; then
-		(
-		multijob_child_init
-		cd "${WORKDIR}"/${CBUILD} >/dev/null
-		OPT="-O1" CFLAGS="" CPPFLAGS="" LDFLAGS="" CC="" \
-		"${S}"/configure \
-			--{build,host}=${CBUILD} \
-			|| die "cross-configure failed"
-		) &
-		multijob_post_fork
-
-		# The configure script assumes it's buggy when cross-compiling.
-		export ac_cv_buggy_getaddrinfo=no
-		export ac_cv_have_long_long_format=yes
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-	# The configure script fails to use pkg-config correctly.
-	# http://bugs.python.org/issue15506
-	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
-	# Needed on FreeBSD unless Python 3.2 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	cd "${WORKDIR}"/${CHOST}
-	ECONF_SOURCE=${S} OPT="" \
-	econf \
-		--with-fpectl \
-		--enable-shared \
-		$(use_enable ipv6) \
-		$(use_with threads) \
-		$(use_with wide-unicode) \
-		--infodir='${prefix}/share/info' \
-		--mandir='${prefix}/share/man' \
-		--with-computed-gotos \
-		--with-dbmliborder="${dbmliborder}" \
-		--with-libc="" \
-		--enable-loadable-sqlite-extensions \
-		--with-system-expat \
-		--with-system-ffi
-
-	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	if tc-is-cross-compiler; then
-		# Modify the Makefile.pre so we don't regen for the host/ one.
-		# We need to link the host python programs into $PWD and run
-		# them from here because the distutils sysconfig module will
-		# parse Makefile/etc... from argv[0], and we need it to pick
-		# up the target settings, not the host ones.
-		sed -i \
-			-e '1iHOSTPYTHONPATH = ./hostpythonpath:' \
-			-e '/^HOSTPYTHON/s:=.*:= ./hostpython:' \
-			-e '/^HOSTPGEN/s:=.*:= ./Parser/hostpgen:' \
-			Makefile{.pre,} || die "sed failed"
-	fi
-
-	multijob_finish
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		cd "${WORKDIR}"/${CBUILD}
-		# Disable as many modules as possible -- but we need a few to install.
-		PYTHON_DISABLE_MODULES=$(
-			sed -n "/Extension('/{s:^.*Extension('::;s:'.*::;p}" "${S}"/setup.py | \
-				egrep -v '(unicodedata|time|cStringIO|_struct|binascii)'
-		) \
-		PTHON_DISABLE_SSL="1" \
-		SYSROOT= \
-		emake
-		# See comment in src_configure about these.
-		ln python ../${CHOST}/hostpython || die
-		ln Parser/pgen ../${CHOST}/Parser/hostpgen || die
-		ln -s ../${CBUILD}/build/lib.*/ ../${CHOST}/hostpythonpath || die
-	fi
-
-	cd "${WORKDIR}"/${CHOST}
-	emake CPPFLAGS="" CFLAGS="" LDFLAGS=""
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	cd "${WORKDIR}"/${CHOST}
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# Rerun failed tests in verbose mode (regrtest -w).
-	PYTHONDONTWRITEBYTECODE="" emake test EXTRATESTOPTS="-w" CPPFLAGS="" CFLAGS="" LDFLAGS="" < /dev/tty
-	local result="$?"
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
-	elog "and run the tests separately."
-
-	if [[ "${result}" -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
-
-	cd "${WORKDIR}"/${CHOST}
-	emake DESTDIR="${D}" altinstall
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${SLOT}/Makefile" || die "sed failed"
-
-	# Backwards compat with Gentoo divergence.
-	dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}usr/$(get_libdir)/libpython3.so" || die
-
-	if use build; then
-		rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,sqlite3,test,tkinter}
-	else
-		use elibc_uclibc && rm -fr "${libdir}/test"
-		use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
-		use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,tkinter,test/test_tk*}
-	fi
-
-	use threads || rm -fr "${libdir}/multiprocessing"
-	use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
-
-	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
-		doins -r "${S}"/Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${SLOT}:" \
-		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-
-	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
-
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local PYTHON=./python \
-			LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
-		export LD_LIBRARY_PATH
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py
-	python_domodule epython.py
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Please note that Python ${PV%.*} is no longer supported in Gentoo."
-	ewarn "The interpreter is not well maintained, and may contain security"
-	ewarn "vulnerabilities. Gentoo ebuilds will no longer be built with support"
-	ewarn "for Python ${PV%.*}."
-	ewarn
-	ewarn "If you wish to use Python ${PV%.*} for your own purposes (development,"
-	ewarn "testing), we suggest establishing a virtualenv for this interpreter,"
-	ewarn "and installing the necessary dependencies inside it. However, we also"
-	ewarn "strongly discourage using Python ${PV%.*} on production systems."
-}
-
-pkg_postrm() {
-	eselect_python_update
-}

diff --git a/dev-lang/python/python-3.3.5-r1.ebuild b/dev-lang/python/python-3.3.5-r1.ebuild
deleted file mode 100644
index 7beb6c9..0000000
--- a/dev-lang/python/python-3.3.5-r1.ebuild
+++ /dev/null
@@ -1,325 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.3.5-r1.ebuild,v 1.12 2015/03/31 18:46:33 ulm Exp $
-
-EAPI="4"
-WANT_AUTOMAKE="none"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
-
-MY_P="Python-${PV}"
-PATCHSET_VERSION="${PV}-0"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
-	http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz
-	mirror://gentoo/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="3.3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2
-	app-arch/xz-utils
-	>=sys-libs/zlib-1.1.3
-	virtual/libffi
-	virtual/libintl
-	!build? (
-		gdbm? ( sys-libs/gdbm[berkdb] )
-		ncurses? (
-			>=sys-libs/ncurses-5.2
-			readline? ( >=sys-libs/readline-4.1 )
-		)
-		sqlite? ( >=dev-db/sqlite-3.3.8:3 )
-		ssl? ( dev-libs/openssl )
-		tk? (
-			>=dev-lang/tk-8.0
-			dev-tcltk/blt
-			dev-tcltk/tix
-		)
-		xml? ( >=dev-libs/expat-2.1 )
-	)
-	!!<sys-apps/sandbox-2.6-r1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )
-	doc? ( dev-python/python-docs:${SLOT} )"
-PDEPEND="app-eselect/eselect-python
-	app-admin/python-updater"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat
-	rm -fr Modules/_ctypes/libffi*
-	rm -fr Modules/zlib
-
-	if tc-is-cross-compiler; then
-		# Invokes BUILDPYTHON, which is built for the host arch
-		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
-	fi
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	epatch "${FILESDIR}/${PN}-3.3.5-ncurses-pkg-config.patch"
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# Disable ABI flags.
-	sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.ac || die "sed failed"
-
-	# bug #514686
-	epatch "${FILESDIR}/${PN}-3.3-CVE-2014-4616.patch"
-
-	epatch_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use build; then
-		# Disable extraneous modules with extra dependencies.
-		export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
-		export PYTHON_DISABLE_SSL="1"
-	else
-		local disable
-		use gdbm     || disable+=" gdbm"
-		use ncurses  || disable+=" _curses _curses_panel"
-		use readline || disable+=" readline"
-		use sqlite   || disable+=" _sqlite3"
-		use ssl      || export PYTHON_DISABLE_SSL="1"
-		use tk       || disable+=" _tkinter"
-		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-		export PYTHON_DISABLE_MODULES="${disable}"
-
-		if ! use xml; then
-			ewarn "You have configured Python without XML support."
-			ewarn "This is NOT a recommended configuration as you"
-			ewarn "may face problems parsing any XML documents."
-		fi
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-	# The configure script fails to use pkg-config correctly.
-	# http://bugs.python.org/issue15506
-	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
-	# Needed on FreeBSD unless Python 3.2 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	BUILD_DIR="${WORKDIR}/${CHOST}"
-	mkdir -p "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-
-	ECONF_SOURCE="${S}" OPT="" \
-	econf \
-		--with-fpectl \
-		--enable-shared \
-		$(use_enable ipv6) \
-		$(use_with threads) \
-		--infodir='${prefix}/share/info' \
-		--mandir='${prefix}/share/man' \
-		--with-computed-gotos \
-		--with-dbmliborder="${dbmliborder}" \
-		--with-libc="" \
-		--enable-loadable-sqlite-extensions \
-		--with-system-expat \
-		--with-system-ffi
-
-	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Avoid invoking pgen for cross-compiles.
-	touch Include/graminit.h Python/graminit.c || die
-
-	cd "${BUILD_DIR}" || die
-	emake CPPFLAGS="" CFLAGS="" LDFLAGS=""
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	cd "${BUILD_DIR}" || die
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	PYTHONDONTWRITEBYTECODE="" emake test EXTRATESTOPTS="-u -network" FLAGS="" CFLAGS="" LDFLAGS="" < /dev/tty
-	local result="$?"
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
-	elog "and run the tests separately."
-
-	if [[ "${result}" -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
-
-	cd "${BUILD_DIR}" || die
-
-	emake DESTDIR="${D}" altinstall
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${SLOT}/Makefile" || die "sed failed"
-
-	# Backwards compat with Gentoo divergence.
-	dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
-	# Fix collisions between different slots of Python.
-	rm -f "${ED}usr/$(get_libdir)/libpython3.so"
-
-	if use build; then
-		rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,sqlite3,test,tkinter}
-	else
-		use elibc_uclibc && rm -fr "${libdir}/test"
-		use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
-		use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,tkinter,test/test_tk*}
-	fi
-
-	use threads || rm -fr "${libdir}/multiprocessing"
-	use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
-
-	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
-		doins -r "${S}"/Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${SLOT}:" \
-		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-
-	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
-
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py
-	python_domodule epython.py
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn
-		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
-		ewarn
-		ewarn "For legacy packages, you should switch active version of Python and run 'python-updater [options]' to rebuild Python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}

diff --git a/dev-lang/python/python-3.4.0.ebuild b/dev-lang/python/python-3.4.0.ebuild
deleted file mode 100644
index b89c063..0000000
--- a/dev-lang/python/python-3.4.0.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.4.0.ebuild,v 1.4 2015/03/31 18:46:33 ulm Exp $
-
-EAPI="4"
-WANT_AUTOMAKE="none"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
-
-MY_P="Python-${PV/_/}"
-PATCHSET_VERSION="3.4.0-0"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
-	http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz
-	mirror://gentoo/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2
-	app-arch/xz-utils
-	>=sys-libs/zlib-1.1.3
-	virtual/libffi
-	virtual/libintl
-	!build? (
-		gdbm? ( sys-libs/gdbm[berkdb] )
-		ncurses? (
-			>=sys-libs/ncurses-5.2
-			readline? ( >=sys-libs/readline-4.1 )
-		)
-		sqlite? ( >=dev-db/sqlite-3.3.8:3 )
-		ssl? ( dev-libs/openssl )
-		tk? (
-			>=dev-lang/tk-8.0
-			dev-tcltk/blt
-			dev-tcltk/tix
-		)
-		xml? ( >=dev-libs/expat-2.1 )
-	)
-	!!<sys-apps/sandbox-2.6-r1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND="app-eselect/eselect-python
-	app-admin/python-updater"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat
-	rm -fr Modules/_ctypes/libffi*
-	rm -fr Modules/zlib
-
-	if tc-is-cross-compiler; then
-		# Invokes BUILDPYTHON, which is built for the host arch
-		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
-	fi
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# Disable ABI flags.
-	sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.ac || die "sed failed"
-
-	epatch_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use build; then
-		# Disable extraneous modules with extra dependencies.
-		export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
-		export PYTHON_DISABLE_SSL="1"
-	else
-		local disable
-		use gdbm     || disable+=" gdbm"
-		use ncurses  || disable+=" _curses _curses_panel"
-		use readline || disable+=" readline"
-		use sqlite   || disable+=" _sqlite3"
-		use ssl      || export PYTHON_DISABLE_SSL="1"
-		use tk       || disable+=" _tkinter"
-		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-		export PYTHON_DISABLE_MODULES="${disable}"
-
-		if ! use xml; then
-			ewarn "You have configured Python without XML support."
-			ewarn "This is NOT a recommended configuration as you"
-			ewarn "may face problems parsing any XML documents."
-		fi
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-	# The configure script fails to use pkg-config correctly.
-	# http://bugs.python.org/issue15506
-	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
-	# Needed on FreeBSD unless Python 3.2 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	BUILD_DIR="${WORKDIR}/${CHOST}"
-	mkdir -p "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-
-	ECONF_SOURCE="${S}" OPT="" \
-	econf \
-		--with-fpectl \
-		--enable-shared \
-		$(use_enable ipv6) \
-		$(use_with threads) \
-		--infodir='${prefix}/share/info' \
-		--mandir='${prefix}/share/man' \
-		--with-computed-gotos \
-		--with-dbmliborder="${dbmliborder}" \
-		--with-libc="" \
-		--enable-loadable-sqlite-extensions \
-		--with-system-expat \
-		--with-system-ffi \
-		--without-ensurepip
-
-	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Avoid invoking pgen for cross-compiles.
-	touch Include/graminit.h Python/graminit.c || die
-
-	cd "${BUILD_DIR}" || die
-	emake CPPFLAGS="" CFLAGS="" LDFLAGS=""
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	cd "${BUILD_DIR}" || die
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	local -x PYTHONDONTWRITEBYTECODE=
-	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
-
-	cd "${BUILD_DIR}" || die
-
-	emake DESTDIR="${D}" altinstall
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${SLOT}/Makefile" || die "sed failed"
-
-	# Backwards compat with Gentoo divergence.
-	dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
-	# Fix collisions between different slots of Python.
-	rm -f "${ED}usr/$(get_libdir)/libpython3.so"
-
-	if use build; then
-		rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,sqlite3,test,tkinter}
-	else
-		use elibc_uclibc && rm -fr "${libdir}/test"
-		use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
-		use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,tkinter,test/test_tk*}
-	fi
-
-	use threads || rm -fr "${libdir}/multiprocessing"
-	use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
-
-	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
-		doins -r "${S}"/Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${SLOT}:" \
-		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-
-	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
-
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py
-	python_domodule epython.py
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn
-		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}

diff --git a/dev-lang/python/python-3.4.1.ebuild b/dev-lang/python/python-3.4.1.ebuild
deleted file mode 100644
index 0ef929b..0000000
--- a/dev-lang/python/python-3.4.1.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.4.1.ebuild,v 1.12 2015/03/31 18:46:33 ulm Exp $
-
-EAPI="4"
-WANT_AUTOMAKE="none"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
-
-MY_P="Python-${PV/_/}"
-PATCHSET_VERSION="3.4.1-0"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
-	http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="3.4"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2
-	app-arch/xz-utils
-	>=sys-libs/zlib-1.1.3
-	virtual/libffi
-	virtual/libintl
-	!build? (
-		gdbm? ( sys-libs/gdbm[berkdb] )
-		ncurses? (
-			>=sys-libs/ncurses-5.2
-			readline? ( >=sys-libs/readline-4.1 )
-		)
-		sqlite? ( >=dev-db/sqlite-3.3.8:3 )
-		ssl? ( dev-libs/openssl )
-		tk? (
-			>=dev-lang/tk-8.0
-			dev-tcltk/blt
-			dev-tcltk/tix
-		)
-		xml? ( >=dev-libs/expat-2.1 )
-	)
-	!!<sys-apps/sandbox-2.6-r1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND="app-eselect/eselect-python
-	app-admin/python-updater"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat
-	rm -fr Modules/_ctypes/libffi*
-	rm -fr Modules/zlib
-
-	if tc-is-cross-compiler; then
-		# Invokes BUILDPYTHON, which is built for the host arch
-		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
-	fi
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# Disable ABI flags.
-	sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.ac || die "sed failed"
-
-	epatch_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use build; then
-		# Disable extraneous modules with extra dependencies.
-		export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
-		export PYTHON_DISABLE_SSL="1"
-	else
-		local disable
-		use gdbm     || disable+=" gdbm"
-		use ncurses  || disable+=" _curses _curses_panel"
-		use readline || disable+=" readline"
-		use sqlite   || disable+=" _sqlite3"
-		use ssl      || export PYTHON_DISABLE_SSL="1"
-		use tk       || disable+=" _tkinter"
-		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-		export PYTHON_DISABLE_MODULES="${disable}"
-
-		if ! use xml; then
-			ewarn "You have configured Python without XML support."
-			ewarn "This is NOT a recommended configuration as you"
-			ewarn "may face problems parsing any XML documents."
-		fi
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-	# The configure script fails to use pkg-config correctly.
-	# http://bugs.python.org/issue15506
-	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
-	# Needed on FreeBSD unless Python 3.2 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	BUILD_DIR="${WORKDIR}/${CHOST}"
-	mkdir -p "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-
-	ECONF_SOURCE="${S}" OPT="" \
-	econf \
-		--with-fpectl \
-		--enable-shared \
-		$(use_enable ipv6) \
-		$(use_with threads) \
-		--infodir='${prefix}/share/info' \
-		--mandir='${prefix}/share/man' \
-		--with-computed-gotos \
-		--with-dbmliborder="${dbmliborder}" \
-		--with-libc="" \
-		--enable-loadable-sqlite-extensions \
-		--with-system-expat \
-		--with-system-ffi \
-		--without-ensurepip
-
-	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Avoid invoking pgen for cross-compiles.
-	touch Include/graminit.h Python/graminit.c || die
-
-	cd "${BUILD_DIR}" || die
-	emake CPPFLAGS="" CFLAGS="" LDFLAGS=""
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	cd "${BUILD_DIR}" || die
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	local -x PYTHONDONTWRITEBYTECODE=
-	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
-
-	cd "${BUILD_DIR}" || die
-
-	emake DESTDIR="${D}" altinstall
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${SLOT}/Makefile" || die "sed failed"
-
-	# Backwards compat with Gentoo divergence.
-	dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
-	# Fix collisions between different slots of Python.
-	rm -f "${ED}usr/$(get_libdir)/libpython3.so"
-
-	if use build; then
-		rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,sqlite3,test,tkinter}
-	else
-		use elibc_uclibc && rm -fr "${libdir}/test"
-		use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
-		use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,tkinter,test/test_tk*}
-	fi
-
-	use threads || rm -fr "${libdir}/multiprocessing"
-	use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
-
-	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
-		doins -r "${S}"/Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${SLOT}:" \
-		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-
-	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
-
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py
-	python_domodule epython.py
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn
-		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}

diff --git a/dev-lang/python/python-3.4.2.ebuild b/dev-lang/python/python-3.4.2.ebuild
deleted file mode 100644
index fa9b136..0000000
--- a/dev-lang/python/python-3.4.2.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.4.2.ebuild,v 1.2 2015/03/31 18:46:33 ulm Exp $
-
-EAPI="4"
-WANT_AUTOMAKE="none"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
-
-MY_P="Python-${PV/_/}"
-PATCHSET_VERSION="3.4.2-0"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
-	http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2
-	app-arch/xz-utils
-	>=sys-libs/zlib-1.1.3
-	virtual/libffi
-	virtual/libintl
-	!build? (
-		gdbm? ( sys-libs/gdbm[berkdb] )
-		ncurses? (
-			>=sys-libs/ncurses-5.2
-			readline? ( >=sys-libs/readline-4.1 )
-		)
-		sqlite? ( >=dev-db/sqlite-3.3.8:3 )
-		ssl? ( dev-libs/openssl )
-		tk? (
-			>=dev-lang/tk-8.0
-			dev-tcltk/blt
-			dev-tcltk/tix
-		)
-		xml? ( >=dev-libs/expat-2.1 )
-	)
-	!!<sys-apps/sandbox-2.6-r1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND="app-eselect/eselect-python
-	app-admin/python-updater"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat
-	rm -fr Modules/_ctypes/libffi*
-	rm -fr Modules/zlib
-
-	if tc-is-cross-compiler; then
-		# Invokes BUILDPYTHON, which is built for the host arch
-		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
-	fi
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# Disable ABI flags.
-	sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.ac || die "sed failed"
-
-	epatch_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use build; then
-		# Disable extraneous modules with extra dependencies.
-		export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
-		export PYTHON_DISABLE_SSL="1"
-	else
-		local disable
-		use gdbm     || disable+=" gdbm"
-		use ncurses  || disable+=" _curses _curses_panel"
-		use readline || disable+=" readline"
-		use sqlite   || disable+=" _sqlite3"
-		use ssl      || export PYTHON_DISABLE_SSL="1"
-		use tk       || disable+=" _tkinter"
-		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-		export PYTHON_DISABLE_MODULES="${disable}"
-
-		if ! use xml; then
-			ewarn "You have configured Python without XML support."
-			ewarn "This is NOT a recommended configuration as you"
-			ewarn "may face problems parsing any XML documents."
-		fi
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-	# The configure script fails to use pkg-config correctly.
-	# http://bugs.python.org/issue15506
-	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
-	# Needed on FreeBSD unless Python 3.2 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	BUILD_DIR="${WORKDIR}/${CHOST}"
-	mkdir -p "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-
-	ECONF_SOURCE="${S}" OPT="" \
-	econf \
-		--with-fpectl \
-		--enable-shared \
-		$(use_enable ipv6) \
-		$(use_with threads) \
-		--infodir='${prefix}/share/info' \
-		--mandir='${prefix}/share/man' \
-		--with-computed-gotos \
-		--with-dbmliborder="${dbmliborder}" \
-		--with-libc="" \
-		--enable-loadable-sqlite-extensions \
-		--with-system-expat \
-		--with-system-ffi \
-		--without-ensurepip
-
-	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Avoid invoking pgen for cross-compiles.
-	touch Include/graminit.h Python/graminit.c || die
-
-	cd "${BUILD_DIR}" || die
-	emake CPPFLAGS="" CFLAGS="" LDFLAGS=""
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	cd "${BUILD_DIR}" || die
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	local -x PYTHONDONTWRITEBYTECODE=
-	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
-
-	cd "${BUILD_DIR}" || die
-
-	emake DESTDIR="${D}" altinstall
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${SLOT}/Makefile" || die "sed failed"
-
-	# Backwards compat with Gentoo divergence.
-	dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
-	# Fix collisions between different slots of Python.
-	rm -f "${ED}usr/$(get_libdir)/libpython3.so"
-
-	if use build; then
-		rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,sqlite3,test,tkinter}
-	else
-		use elibc_uclibc && rm -fr "${libdir}/test"
-		use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
-		use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,tkinter,test/test_tk*}
-	fi
-
-	use threads || rm -fr "${libdir}/multiprocessing"
-	use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
-
-	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
-		doins -r "${S}"/Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${SLOT}:" \
-		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-
-	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
-
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py
-	python_domodule epython.py
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn
-		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}

diff --git a/dev-lang/python/python-3.4.3.ebuild b/dev-lang/python/python-3.4.3.ebuild
deleted file mode 100644
index c70b8d5..0000000
--- a/dev-lang/python/python-3.4.3.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.4.3.ebuild,v 1.3 2015/03/31 18:46:33 ulm Exp $
-
-EAPI="4"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
-
-MY_P="Python-${PV/_/}"
-PATCHSET_VERSION="3.4.3-0"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
-	http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2
-	app-arch/xz-utils
-	>=sys-libs/zlib-1.1.3
-	virtual/libffi
-	virtual/libintl
-	!build? (
-		gdbm? ( sys-libs/gdbm[berkdb] )
-		ncurses? (
-			>=sys-libs/ncurses-5.2
-			readline? ( >=sys-libs/readline-4.1 )
-		)
-		sqlite? ( >=dev-db/sqlite-3.3.8:3 )
-		ssl? ( dev-libs/openssl )
-		tk? (
-			>=dev-lang/tk-8.0
-			dev-tcltk/blt
-			dev-tcltk/tix
-		)
-		xml? ( >=dev-libs/expat-2.1 )
-	)
-	!!<sys-apps/sandbox-2.6-r1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND="app-eselect/eselect-python
-	app-admin/python-updater"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat
-	rm -fr Modules/_ctypes/libffi*
-	rm -fr Modules/zlib
-
-	if tc-is-cross-compiler; then
-		# Invokes BUILDPYTHON, which is built for the host arch
-		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
-	fi
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	epatch "${FILESDIR}/${PN}-3.4.3-ncurses-pkg-config.patch"
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# Disable ABI flags.
-	sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.ac || die "sed failed"
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	if use build; then
-		# Disable extraneous modules with extra dependencies.
-		export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
-		export PYTHON_DISABLE_SSL="1"
-	else
-		local disable
-		use gdbm     || disable+=" gdbm"
-		use ncurses  || disable+=" _curses _curses_panel"
-		use readline || disable+=" readline"
-		use sqlite   || disable+=" _sqlite3"
-		use ssl      || export PYTHON_DISABLE_SSL="1"
-		use tk       || disable+=" _tkinter"
-		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-		export PYTHON_DISABLE_MODULES="${disable}"
-
-		if ! use xml; then
-			ewarn "You have configured Python without XML support."
-			ewarn "This is NOT a recommended configuration as you"
-			ewarn "may face problems parsing any XML documents."
-		fi
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-	# The configure script fails to use pkg-config correctly.
-	# http://bugs.python.org/issue15506
-	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
-	# Needed on FreeBSD unless Python 3.2 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	BUILD_DIR="${WORKDIR}/${CHOST}"
-	mkdir -p "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-
-	ECONF_SOURCE="${S}" OPT="" \
-	econf \
-		--with-fpectl \
-		--enable-shared \
-		$(use_enable ipv6) \
-		$(use_with threads) \
-		--infodir='${prefix}/share/info' \
-		--mandir='${prefix}/share/man' \
-		--with-computed-gotos \
-		--with-dbmliborder="${dbmliborder}" \
-		--with-libc="" \
-		--enable-loadable-sqlite-extensions \
-		--with-system-expat \
-		--with-system-ffi \
-		--without-ensurepip
-
-	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Avoid invoking pgen for cross-compiles.
-	touch Include/graminit.h Python/graminit.c || die
-
-	cd "${BUILD_DIR}" || die
-	emake CPPFLAGS="" CFLAGS="" LDFLAGS=""
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	cd "${BUILD_DIR}" || die
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	local -x PYTHONDONTWRITEBYTECODE=
-	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
-
-	cd "${BUILD_DIR}" || die
-
-	emake DESTDIR="${D}" altinstall
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${SLOT}/Makefile" || die "sed failed"
-
-	# Backwards compat with Gentoo divergence.
-	dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
-	# Fix collisions between different slots of Python.
-	rm -f "${ED}usr/$(get_libdir)/libpython3.so"
-
-	if use build; then
-		rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,sqlite3,test,tkinter}
-	else
-		use elibc_uclibc && rm -fr "${libdir}/test"
-		use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
-		use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,tkinter,test/test_tk*}
-	fi
-
-	use threads || rm -fr "${libdir}/multiprocessing"
-	use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
-
-	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
-		doins -r "${S}"/Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${SLOT}:" \
-		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-
-	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
-
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py
-	python_domodule epython.py
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn
-		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
deleted file mode 100644
index c87cf88..0000000
--- a/sys-apps/portage/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-AUX 2.3.1-doc-Revert-URI-changes-related-to-docbook-schema.patch 1394 SHA256 a076b70b775aef23e89127d2fc64065f2d7a895b3b56a723122f641375b7c3d3 SHA512 fb3488ec9c5a849bdc9ae2cfaed3732c939072cd847534fdeaaff28560b62ad5b184f15bfb6943b921f417ec7de8e1fd3845322a0ba4d3e55f625a12cf903dcd WHIRLPOOL ddf6cd307f063404f53e9e819b01965b053df7554790d1332a5d131c11e5e6eec466412c17c4d8b3dd124ab81797641001ec3bbcfadd7ff06f5e59b2f40dc7d2
-AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
-AUX portage-2.3.0-ldconfig-path.patch 1311 SHA256 7cd9acd6c1cd2a304348819a7232abe4a71473769a94ef1af9d8a956c81749ac SHA512 22ada6f4d39bdd35ffbc5e248f6ca490af8f84eb471d44bc39c8a517e61a1d04071fd1bbf3f78aed92f2c8b61ddc1465f4ccfb298dcce24ee1808d48b83c3d16 WHIRLPOOL 0023fafb781932e484278017cbf72637eed91f83673c34d5094d4c65cf981ba16d5c7c3b10879e4013fc83a8f941a99acd5d71b40673b4372f689de5a3d2e2ac
-AUX portage-2.3.0-prefix-path-only.patch 1725 SHA256 1d087d0855c3f68fce817d31192209f4fe271f5bbf98030ab72621671cd4529e SHA512 408fcc71ca0dc0b8cdc99aff29c8c94e22ab1205257cc6a48e439abb0b34ddc4366f093d46719899c6c9a52075e2a72db31a28f13ca9aace45b9350266c609db WHIRLPOOL e3c2e1e27496c41d9b84188f2692f6f91b18b9317097ffe517515687a853e0c01f93fe5ec4059177892ead2bf851f9eb68c2a23905f081f13193032d5c8bf535
-AUX portage-2.3.0_rc1.patch 2278 SHA256 5c10f7bf71250a87576bf81635a765e6fdfdaa7882fe7e1949c736ae1472c2d6 SHA512 0e26adc69b3b716c7435d54a2ed4252045cb24e7891eed5d88514e6066ee4b1fc32ba89d63dc63e2341456110bc7def0bf1a49c1cb3cb53c0d9092bb251f9151 WHIRLPOOL 3964864f80131293283aa79ef1e87e5975e2543e456515c00cf6bd38905c2502539b9698634a44123db9e8ab3c566645b5424c29390a0f47ae7df62431355928
-DIST portage-2.3.0.tar.bz2 907500 SHA256 1fbed03f78587c80f5afd36b57d7ac085ed5e5b2cc19fea63fc8a43a477e4067 SHA512 85d15a234e446677dc3458de8dacaa0d91164b190c59f8002ff98dc27a9ad699cba6c4f871ac785ba6116ed53f1f3530ec3ed662ce7f4b3e8c49380b4b206074 WHIRLPOOL 979a7fc61a65dca790a077d4839fbbb22fc8ef31ccbe534b12b87c699a25a1930586dd6ddfb9013d57a71c03ed8d976612ea15e9dc3541aff0b67e3d604a5be2
-DIST portage-2.3.0_rc1.tar.bz2 910204 SHA256 52cf0837975c4b2a8e1d3d18e3334a735b14e4ebdbdca8992548b86c1d5bebd1 SHA512 d7a5ce8800668606a2e3549621686bb8bb30bd2f5d7a57b106efc1c58d34b95cef4605f5067824db0beb6f870c9e81cb3fdb5c074e9e64bef40a9df6f524ad13 WHIRLPOOL c4c86fe20606e93ecf4d125f436077ec4d15cb453c98e83894a8383f1654a9b294107c9c04bb3019f66a643ff42c333060319d59dda47c323e9711723c3b9cfe
-DIST portage-2.3.1.tar.bz2 918411 SHA256 a3c5ee98791c579687ad5ec6a7882a6b6a486a54c14d1bc73ccc9a79b4a507e9 SHA512 75a713cfa077ac271ad7fad0a48bbc923beedd2ec47000602576297fabae2de47ee69e7e6d52e02c87f9ba5d9e5b27c10fa9be7b308f72c6dcc8e7f6c321f2c6 WHIRLPOOL 4ee7942d73e8e5b977d0260b568d31d0b49387787f7ffa2e77d4ec49e00b3e67c54506840be463cb5a6da070683013192f46bb47df1df1a328457de1796d05c0
-DIST portage-2.3.2.tar.bz2 919270 SHA256 724a9924209c5da5e7ba7f19812db0675bb3b4309f911e37da8c35bbc3fede67 SHA512 bee95d0308a613083a28b05e5276bc3c4eb5841e17985e3c943a92bc5b9a659eb18ae822219d26da80144febf47b5ad30766536f820162812549f0bc83975bec WHIRLPOOL 0836aac5d9e331d896053160d8e829f997697f83bd3dbe4f14b924b9aa7c41a7c53e48e4ea5873fba05d4d23d715b310e92a10fed348b7ad55afbde149864f20
-DIST portage-2.3.3.tar.bz2 920984 SHA256 beec3923e14fb98d9992ede0b7718df594c50f366c3e58c2f0ba10102e77271f SHA512 7dec90a980ce6bb1266bb9c9c9979bc6cb8bdb4f37d8908c78cddf053979aef44424be86ea1fe16a072f6ed21b26233df84f6dd22d6f0c9435816090c675b53c WHIRLPOOL cc4a7e63b797766cc99ab712902b96e38fe22a482d7eeb3e29843a6070f6601b8bbe9c435b0a9c3cc1947e49c23291f1064f3d01c010d822dcb2686a103b4c3d
-EBUILD portage-2.3.0.ebuild 11517 SHA256 16b10e751c98dc45735697b50a4df638ccce75745f2a04004dbc5c0897d4b0ed SHA512 bc44fd3cdab534b513fc00a6c27a06f42a9448c53008a470c976f2b520b0f606ec14f532eeff1c3740abd520a09bf886b005ec427a730bfbd1086093b4b7a6c3 WHIRLPOOL 068f283095fbe0bc417fd2856cc30be867001708e8d9b8daaa3a1027995bc0a2ef2ab7a9fa6bcc3fb892628e597fb55e1bc5a3795d609650c5c98b1c30d56e91
-EBUILD portage-2.3.0_rc1-r1.ebuild 11651 SHA256 2ad29bbb196cf1aee3101e40d18b81537371358327614c1752e427ee713801fe SHA512 b289f6fb24e159ad99248438739607d5e670b1c3d5353d64708e4751961e249d81a9fabf7fe3fc274533982aeca96c091f5cb2787af7a6030d18b313d3172728 WHIRLPOOL 77b92fbecfc492aef0edeffc1742dc839bbe21fae0b6308c9f91bb96909b17d97933c15b2cacf7ec746847c63a376c280ecb28b293e7e1876df657ed3b4841b0
-EBUILD portage-2.3.1.ebuild 11594 SHA256 8551819a28d41a6fb7e291e37bf9289efa329dc0addb21b7a729cbabdd96aa65 SHA512 c864bf3a6a916a9865738de504dfeef82ffe48177c1635b7a6dd4e3dcec3e78daa33be5ff6fb6edc15e5e91b8551046ff0a318579ee60f40fc1d96ad1614619a WHIRLPOOL 46a0652cf699e0c3435a7a8ba3c09705ea53b030f501bfec267a0f4020c908817e35c05b5d278791657739892f7b6e078c48107a5f1a6d05dde78b5e4f4d6eb3
-EBUILD portage-2.3.2.ebuild 11529 SHA256 cce0948c655eed88b0e3e0e9dc283cb05a47c778440cd4b576796a680cb84a52 SHA512 791ce4506b24ced68dd0d09cf5cf9a1fac08b11b6b3b1dfd13831c2b2276db7d701c08b03771732e59b710c7bbd2b5cb0d92942c81123d3dfc070716ab4fefdf WHIRLPOOL b528eee31f6721e680739db5486afbf6982d01329611cc402f048ceffbae6ac550def47ce378608fdbcf7ff8c781ad00cb249bfae7c97f1d60313dc91eb5bd6a
-EBUILD portage-2.3.3.ebuild 11722 SHA256 fd2c2aaccee660e0848ceedb6d29b9a72fa32e29bb0b86a74374232e02d47f19 SHA512 60d1d6ac07fb20be233c1709e03b49d557388563a3ee7f58a9fe313ddf7c7de6bcc8ebdf98a40d0088ad087a9d9359ad03563b826f4628a4e2cc6779668bfdf0 WHIRLPOOL 64a9af3696a3c601ef7a72e5c6055bbc821e07e7be892047b94da5c8008e40acb13510ab34711d651aebf77e6741005ee32c2e67be5b1d27759700662d8cfa0e
-MISC metadata.xml 1017 SHA256 78bf0d7e87b917ab6eb9c43835c9c688dc3c5ab0a1043608448e12e6bad715bc SHA512 40315f8375409a6e8b86b2d11dc33b28a019911348d66f05fdd1194a4f0859f3f2ebf9c6922b795194669d992901c1fdda4cd147100979a7f661915c4094fd35 WHIRLPOOL c2817f5c0005da6f1bf0ecb8d1bde9a6b9379e3022b9e456ee5e932974493a0454166e0113092aae7de2725b0718b3cd10e05ba25012b321644403ab0677c166

diff --git a/sys-apps/portage/files/2.3.1-doc-Revert-URI-changes-related-to-docbook-schema.patch b/sys-apps/portage/files/2.3.1-doc-Revert-URI-changes-related-to-docbook-schema.patch
deleted file mode 100644
index ee191ff..0000000
--- a/sys-apps/portage/files/2.3.1-doc-Revert-URI-changes-related-to-docbook-schema.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 35863a80b915939aac3ce6bf017d942cac879df8 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@g.o>
-Date: Wed, 20 Jul 2016 12:30:05 -0400
-Subject: [PATCH] doc: Revert URI changes related to docbook schema
-
-This partially reverts b5365341dad167e314023df95d2c5e0f955962f0.
-
-X-Gentoo-Bug: 589210
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/589210
----
- doc/custom.xsl      | 2 +-
- doc/portage.docbook | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/doc/custom.xsl b/doc/custom.xsl
-index 11a2b9e..a7763ec 100644
---- a/doc/custom.xsl
-+++ b/doc/custom.xsl
-@@ -1,4 +1,4 @@
--<xsl:stylesheet xmlns:xsl="https://www.w3.org/1999/XSL/Transform" version="1.0">
-+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
- <xsl:param name="toc.section.depth" select="20"/>
- <xsl:param name="chunk.section.depth" select="2"/>
- <xsl:param name="generate.section.toc.level" select="2"/>
-diff --git a/doc/portage.docbook b/doc/portage.docbook
-index f7d539a..811544f 100644
---- a/doc/portage.docbook
-+++ b/doc/portage.docbook
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
--	"https://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-+	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
- 
- 	<!ENTITY date SYSTEM "fragment/date">
- 	<!ENTITY version SYSTEM "fragment/version">
--- 
-2.10.0
-

diff --git a/sys-apps/portage/files/README.RESCUE b/sys-apps/portage/files/README.RESCUE
deleted file mode 100644
index 70c494e..0000000
--- a/sys-apps/portage/files/README.RESCUE
+++ /dev/null
@@ -1,2 +0,0 @@
-Please see http://www.gentoo.org/proj/en/portage/doc/manually-fixing-portage.xml
-for a recovery guide for a broken portage installation.

diff --git a/sys-apps/portage/files/portage-2.3.0-ldconfig-path.patch b/sys-apps/portage/files/portage-2.3.0-ldconfig-path.patch
deleted file mode 100644
index 335d0cd..0000000
--- a/sys-apps/portage/files/portage-2.3.0-ldconfig-path.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-commit c70609e72f7eef422af122543d66c595ee139719
-Author: Benda Xu <heroxbd@g.o>
-Date:   Mon Jun 20 09:12:35 2016 +0900
-
-    let env-update call ldconfig if it exists
-    
-        In Prefix, let env-update call ldconfig if it exists.
-    
-        It does not affect prefix-rpath, and handles prefix-libc(RAP) correctly.
-
-diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update.py
-index c0a93a8..fde2f66 100644
---- a/pym/portage/util/env_update.py
-+++ b/pym/portage/util/env_update.py
-@@ -306,13 +306,17 @@ def _env_update(makelinks, target_root, prev_mtimes, contents, env,
- 		if not libdir_contents_changed:
- 			makelinks = False
- 
--	ldconfig = "/sbin/ldconfig"
- 	if "CHOST" in settings and "CBUILD" in settings and \
- 		settings["CHOST"] != settings["CBUILD"]:
- 		ldconfig = find_binary("%s-ldconfig" % settings["CHOST"])
-+	else:
-+		ldconfig = os.path.join(eroot, "sbin", "ldconfig")
-+
-+	if not (os.access(ldconfig, os.X_OK) and os.path.isfile(ldconfig)):
-+		ldconfig = None
- 
- 	# Only run ldconfig as needed
--	if makelinks and ldconfig and not eprefix:
-+	if makelinks and ldconfig:
- 		# ldconfig has very different behaviour between FreeBSD and Linux
- 		if ostype == "Linux" or ostype.lower().endswith("gnu"):
- 			# We can't update links if we haven't cleaned other versions first, as

diff --git a/sys-apps/portage/files/portage-2.3.0-prefix-path-only.patch b/sys-apps/portage/files/portage-2.3.0-prefix-path-only.patch
deleted file mode 100644
index 378b9d8..0000000
--- a/sys-apps/portage/files/portage-2.3.0-prefix-path-only.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-commit b3e47525357322433126389533501c42cd092979
-Author: Benda Xu <heroxbd@g.o>
-Date:   Sat Jun 18 14:32:07 2016 +0900
-
-    do not use host PATH by default and prepend EPREFIX PATH.
-    
-      EPREFIX could be overridden in cross-eprefix, in that case tools
-      inside EPREFIX should be prioritized.
-
-diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
-index 52dbf8b..304b164 100644
---- a/pym/portage/package/ebuild/doebuild.py
-+++ b/pym/portage/package/ebuild/doebuild.py
-@@ -199,16 +199,18 @@ def _doebuild_path(settings, eapi=None):
- 	if portage_bin_path[0] != portage.const.PORTAGE_BIN_PATH:
- 		# Add a fallback path for restarting failed builds (bug 547086)
- 		portage_bin_path.append(portage.const.PORTAGE_BIN_PATH)
--	eprefix = portage.const.EPREFIX
- 	prerootpath = [x for x in settings.get("PREROOTPATH", "").split(":") if x]
- 	rootpath = [x for x in settings.get("ROOTPATH", "").split(":") if x]
- 	overrides = [x for x in settings.get(
- 		"__PORTAGE_TEST_PATH_OVERRIDE", "").split(":") if x]
- 
- 	prefixes = []
--	if eprefix:
--		prefixes.append(eprefix)
--	prefixes.append("/")
-+	# tools in EPREFIX can only be executed when ROOT is /.
-+	if settings["ROOT"] == "/":
-+		prefixes.append(settings["EPREFIX"])
-+	# settings["EPREFIX"] could be overridden during cross-eprefix
-+	if portage.const.EPREFIX != settings["EPREFIX"]:
-+		prefixes.append(portage.const.EPREFIX)
- 
- 	path = overrides
- 
-@@ -232,6 +234,7 @@ def _doebuild_path(settings, eapi=None):
- 	path.extend(prerootpath)
- 
- 	for prefix in prefixes:
-+		prefix = prefix if prefix else "/"
- 		for x in ("usr/local/sbin", "usr/local/bin", "usr/sbin", "usr/bin", "sbin", "bin"):
- 			path.append(os.path.join(prefix, x))
- 

diff --git a/sys-apps/portage/files/portage-2.3.0_rc1.patch b/sys-apps/portage/files/portage-2.3.0_rc1.patch
deleted file mode 100644
index 8464462..0000000
--- a/sys-apps/portage/files/portage-2.3.0_rc1.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 9ba1bea5e24fe839ef5bd833c3974a55d5333bf1 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@g.o>
-Date: Mon, 16 May 2016 02:45:45 -0700
-Subject: [PATCH] portage.const.py: Remove repoman from PORTAGE_PYM_PACKAGES
-
-Decca (in IRC) got a traceback due to the missing repoman install
-
-sysresccd / # emerge -e @system
-Calculating dependencies... done!
-Traceback (most recent call last):
-  File "/usr/lib/python-exec/python3.5/emerge", line 50, in <module>
-    retval = emerge_main()
-  File "/usr/lib64/python3.5/site-packages/_emerge/main.py", line 1185, in emerge_main
-    return run_action(emerge_config)
-  File "/usr/lib64/python3.5/site-packages/_emerge/actions.py", line 3236, in run_action
-    emerge_config.args, spinner)
-  File "/usr/lib64/python3.5/site-packages/_emerge/actions.py", line 505, in action_build
-    retval = mergetask.merge()
-  File "/usr/lib64/python3.5/site-packages/_emerge/Scheduler.py", line 958, in merge
-    rval = self._handle_self_update()
-  File "/usr/lib64/python3.5/site-packages/_emerge/Scheduler.py", line 323, in _handle_self_update
-    _prepare_self_update(self.settings)
-  File "/usr/lib64/python3.5/site-packages/portage/package/ebuild/doebuild.py", line 2489, in _prepare_self_update
-    symlinks=True)
-  File "/usr/lib64/python3.5/site-packages/portage/__init__.py", line 259, in __call__
-    rval = self._func(*wrapped_args, **wrapped_kwargs)
-  File "/usr/lib64/python3.5/shutil.py", line 303, in copytree
-    names = os.listdir(src)
-FileNotFoundError: [Errno 2] No such file or directory: b'/usr/lib64/python3.5/site-packages/repoman'
-
-Dirkjan <djc> found  repoman was still included in the PORTAGE_PYM_PACKAGES which
-caused the traceback.
----
- pym/portage/const.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pym/portage/const.py b/pym/portage/const.py
-index 814d7f4..179efce 100644
---- a/pym/portage/const.py
-+++ b/pym/portage/const.py
-@@ -278,7 +278,7 @@ SUPPORTED_XPAK_EXTENSIONS = (".tbz2", ".xpak")
- TIMESTAMP_FORMAT = "%a, %d %b %Y %H:%M:%S +0000"	# to be used with time.gmtime()
- 
- # Top-level names of Python packages installed by Portage.
--PORTAGE_PYM_PACKAGES = ("_emerge", "portage", "repoman")
-+PORTAGE_PYM_PACKAGES = ("_emerge", "portage")
- 
- RETURNCODE_POSTINST_FAILURE = 5
- 
--- 
-2.8.2
-

diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
deleted file mode 100644
index 4d95e14..0000000
--- a/sys-apps/portage/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <upstream>
-    <bugs-to>mailto:dev-portage@g.o</bugs-to>
-    <changelog>https://gitweb.gentoo.org/proj/portage.git/plain/RELEASE-NOTES</changelog>
-    <doc>https://wiki.gentoo.org/wiki/Handbook:AMD64/Working/Portage</doc>
-  </upstream>
-  <maintainer type="project">
-    <email>dev-portage@g.o</email>
-  </maintainer>
-  <use>
-    <flag name="epydoc">Build html API documentation with epydoc.</flag>
-    <flag name="ipc">Use inter-process communication between portage and running ebuilds.</flag>
-    <flag name="pypy2_0">Use pypy-c2.0 as Python interpreter.</flag>
-    <flag name="python2">Use python2 as Python interpreter.</flag>
-    <flag name="python3">Use python3 as Python interpreter.</flag>
-    <flag name="xattr">Preserve extended attributes (filesystem-stored metadata) when installing files. Usually only required for hardened systems.</flag>
-  </use>
-</pkgmetadata>

diff --git a/sys-apps/portage/portage-2.3.0.ebuild b/sys-apps/portage/portage-2.3.0.ebuild
deleted file mode 100644
index e4f475c..0000000
--- a/sys-apps/portage/portage-2.3.0.ebuild
+++ /dev/null
@@ -1,364 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=(
-	pypy
-	python3_3 python3_4 python3_5
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1 multilib
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-RDEPEND="
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!<app-admin/logrotate-3.8.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.3.0-ldconfig-path.patch
-	"${FILESDIR}"/${PN}-2.3.0-prefix-path-only.patch )
-
-pkg_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use epydoc && targets+=( epydoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=( install_docbook )
-	use epydoc && targets+=( install_epydoc )
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	# comment out sanity test until it is fixed to work
-	# with the new PORTAGE_PYM_PATH
-	#if [[ $ROOT == / ]] ; then
-		## Run some minimal tests as a sanity check.
-		#local test_runner=$(find "${ED}" -name runTests)
-		#if [[ -n $test_runner && -x $test_runner ]] ; then
-			#einfo "Running preinst sanity tests..."
-			#"$test_runner" || die "preinst sanity tests failed"
-		#fi
-	#fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.1.13" || \
-		{
-			has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
-			has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
-		} ; then
-		USERPRIV_UPGRADE=true
-		USERSYNC_UPGRADE=true
-		REPOS_CONF_UPGRADE=true
-		REPOS_CONF_SYNC=
-		type -P portageq >/dev/null 2>&1 && \
-			REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
-	else
-		USERPRIV_UPGRADE=false
-		USERSYNC_UPGRADE=false
-		REPOS_CONF_UPGRADE=false
-	fi
-}
-
-get_ownership() {
-	case ${USERLAND} in
-		BSD)
-			stat -f '%Su:%Sg' "${1}"
-			;;
-		*)
-			stat -c '%U:%G' "${1}"
-			;;
-	esac
-}
-
-new_config_protect() {
-	# Generate a ._cfg file even if the target file
-	# does not exist, ensuring that the user will
-	# notice the config change.
-	local basename=${1##*/}
-	local dirname=${1%/*}
-	local i=0
-	while true ; do
-		local filename=$(
-			echo -n "${dirname}/._cfg"
-			printf "%04d" ${i}
-			echo -n "_${basename}"
-		)
-		[[ -e ${filename} ]] || break
-		(( i++ ))
-	done
-	echo "${filename}"
-}
-
-pkg_postinst() {
-
-	if ${REPOS_CONF_UPGRADE} ; then
-		einfo "Generating repos.conf"
-		local repo_name=
-		[[ -f ${PORTDIR}/profiles/repo_name ]] && \
-			repo_name=$(< "${PORTDIR}/profiles/repo_name")
-		if [[ -z ${REPOS_CONF_SYNC} ]] ; then
-			REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
-			REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
-		fi
-		local sync_type=
-		[[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
-
-		if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
-			sync_type=cvs
-			REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
-		fi
-
-		cat <<-EOF > "${T}/repos.conf"
-		[DEFAULT]
-		main-repo = ${repo_name:-gentoo}
-
-		[${repo_name:-gentoo}]
-		location = ${PORTDIR:-${EPREFIX}/usr/portage}
-		sync-type = ${sync_type:-rsync}
-		sync-uri = ${REPOS_CONF_SYNC}
-		EOF
-
-		[[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
-
-		local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
-		if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
-			dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
-		fi
-		# Don't install the config update if the desired repos.conf directory
-		# and config file exist, since users may accept it blindly and break
-		# their config (bug #478726).
-		[[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
-			mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
-
-		if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
-			einfo "Generating make.conf PORTDIR setting for backward compatibility"
-			for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
-				[[ -e ${dest} ]] && break
-			done
-			[[ -d ${dest} ]] && dest=${dest}/portdir.conf
-			rm -rf "${T}/make.conf"
-			[[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
-			cat <<-EOF >> "${T}/make.conf"
-
-			# Set PORTDIR for backward compatibility with various tools:
-			#   gentoo-bashcomp - bug #478444
-			#   euse - bug #474574
-			#   euses and ufed - bug #478318
-			PORTDIR="${EPREFIX}/usr/portage"
-			EOF
-			mkdir -p "${dest%/*}"
-			mv "${T}/make.conf" "$(new_config_protect "${dest}")"
-		fi
-	fi
-
-	local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
-
-	if ${USERSYNC_UPGRADE} && \
-		[[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
-		local ownership=$(get_ownership "${PORTDIR}")
-		if [[ -n ${ownership} ]] ; then
-			einfo "Adjusting PORTDIR permissions for usersync"
-			find "${PORTDIR}" -path "${distdir%/}" -prune -o \
-				! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
-				-exec chown "${ownership}" {} +
-		fi
-	fi
-
-	# Do this last, since it could take a long time if there
-	# are lots of live sources, and the user may be tempted
-	# to kill emerge while it is running.
-	if ${USERPRIV_UPGRADE} && \
-		[[ -d ${distdir} && -w ${distdir} ]] ; then
-		local ownership=$(get_ownership "${distdir}")
-		if [[ ${ownership#*:} == portage ]] ; then
-			einfo "Adjusting DISTDIR permissions for userpriv"
-			find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
-				-exec chown -R portage:portage {} +
-		fi
-	fi
-
-	einfo ""
-	einfo "This release of portage NO LONGER contains the repoman code base."
-	einfo "Repoman has its own ebuild and release package."
-	einfo "For repoman functionality please emerge app-portage/repoman"
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}

diff --git a/sys-apps/portage/portage-2.3.0_rc1-r1.ebuild b/sys-apps/portage/portage-2.3.0_rc1-r1.ebuild
deleted file mode 100644
index 51bca3f..0000000
--- a/sys-apps/portage/portage-2.3.0_rc1-r1.ebuild
+++ /dev/null
@@ -1,368 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=(
-	pypy
-	python3_3 python3_4 python3_5
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1 multilib
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-RDEPEND="
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!<app-admin/logrotate-3.8.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-PATCHES=("${FILESDIR}/portage-2.3.0_rc1.patch"
-	"${FILESDIR}"/${PN}-2.2.28-distcc-eprefix.patch
-	"${FILESDIR}"/${PN}-2.3.0-scanelf-path.patch
-	"${FILESDIR}"/${PN}-2.3.0-prefix-path-only.patch
-	"${FILESDIR}"/${PN}-2.3.0-ldconfig-path.patch
-)
-
-pkg_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use epydoc && targets+=( epydoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=( install_docbook )
-	use epydoc && targets+=( install_epydoc )
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	# comment out sanity test until it is fixed to work
-	# with the new PORTAGE_PYM_PATH
-	#if [[ $ROOT == / ]] ; then
-		## Run some minimal tests as a sanity check.
-		#local test_runner=$(find "${ED}" -name runTests)
-		#if [[ -n $test_runner && -x $test_runner ]] ; then
-			#einfo "Running preinst sanity tests..."
-			#"$test_runner" || die "preinst sanity tests failed"
-		#fi
-	#fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.1.13" || \
-		{
-			has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
-			has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
-		} ; then
-		USERPRIV_UPGRADE=true
-		USERSYNC_UPGRADE=true
-		REPOS_CONF_UPGRADE=true
-		REPOS_CONF_SYNC=
-		type -P portageq >/dev/null 2>&1 && \
-			REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
-	else
-		USERPRIV_UPGRADE=false
-		USERSYNC_UPGRADE=false
-		REPOS_CONF_UPGRADE=false
-	fi
-}
-
-get_ownership() {
-	case ${USERLAND} in
-		BSD)
-			stat -f '%Su:%Sg' "${1}"
-			;;
-		*)
-			stat -c '%U:%G' "${1}"
-			;;
-	esac
-}
-
-new_config_protect() {
-	# Generate a ._cfg file even if the target file
-	# does not exist, ensuring that the user will
-	# notice the config change.
-	local basename=${1##*/}
-	local dirname=${1%/*}
-	local i=0
-	while true ; do
-		local filename=$(
-			echo -n "${dirname}/._cfg"
-			printf "%04d" ${i}
-			echo -n "_${basename}"
-		)
-		[[ -e ${filename} ]] || break
-		(( i++ ))
-	done
-	echo "${filename}"
-}
-
-pkg_postinst() {
-
-	if ${REPOS_CONF_UPGRADE} ; then
-		einfo "Generating repos.conf"
-		local repo_name=
-		[[ -f ${PORTDIR}/profiles/repo_name ]] && \
-			repo_name=$(< "${PORTDIR}/profiles/repo_name")
-		if [[ -z ${REPOS_CONF_SYNC} ]] ; then
-			REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
-			REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
-		fi
-		local sync_type=
-		[[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
-
-		if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
-			sync_type=cvs
-			REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
-		fi
-
-		cat <<-EOF > "${T}/repos.conf"
-		[DEFAULT]
-		main-repo = ${repo_name:-gentoo}
-
-		[${repo_name:-gentoo}]
-		location = ${PORTDIR:-${EPREFIX}/usr/portage}
-		sync-type = ${sync_type:-rsync}
-		sync-uri = ${REPOS_CONF_SYNC}
-		EOF
-
-		[[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
-
-		local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
-		if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
-			dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
-		fi
-		# Don't install the config update if the desired repos.conf directory
-		# and config file exist, since users may accept it blindly and break
-		# their config (bug #478726).
-		[[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
-			mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
-
-		if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
-			einfo "Generating make.conf PORTDIR setting for backward compatibility"
-			for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
-				[[ -e ${dest} ]] && break
-			done
-			[[ -d ${dest} ]] && dest=${dest}/portdir.conf
-			rm -rf "${T}/make.conf"
-			[[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
-			cat <<-EOF >> "${T}/make.conf"
-
-			# Set PORTDIR for backward compatibility with various tools:
-			#   gentoo-bashcomp - bug #478444
-			#   euse - bug #474574
-			#   euses and ufed - bug #478318
-			PORTDIR="${EPREFIX}/usr/portage"
-			EOF
-			mkdir -p "${dest%/*}"
-			mv "${T}/make.conf" "$(new_config_protect "${dest}")"
-		fi
-	fi
-
-	local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
-
-	if ${USERSYNC_UPGRADE} && \
-		[[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
-		local ownership=$(get_ownership "${PORTDIR}")
-		if [[ -n ${ownership} ]] ; then
-			einfo "Adjusting PORTDIR permissions for usersync"
-			find "${PORTDIR}" -path "${distdir%/}" -prune -o \
-				! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
-				-exec chown "${ownership}" {} +
-		fi
-	fi
-
-	# Do this last, since it could take a long time if there
-	# are lots of live sources, and the user may be tempted
-	# to kill emerge while it is running.
-	if ${USERPRIV_UPGRADE} && \
-		[[ -d ${distdir} && -w ${distdir} ]] ; then
-		local ownership=$(get_ownership "${distdir}")
-		if [[ ${ownership#*:} == portage ]] ; then
-			einfo "Adjusting DISTDIR permissions for userpriv"
-			find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
-				-exec chown -R portage:portage {} +
-		fi
-	fi
-
-	einfo ""
-	einfo "This release of portage NO LONGER contains the repoman code base."
-	einfo "Repoman has it's own ebuild and release package."
-	einfo "For repoman functionality please emerge app-portage/repoman"
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}

diff --git a/sys-apps/portage/portage-2.3.1.ebuild b/sys-apps/portage/portage-2.3.1.ebuild
deleted file mode 100644
index 1e432c4..0000000
--- a/sys-apps/portage/portage-2.3.1.ebuild
+++ /dev/null
@@ -1,367 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=(
-	pypy
-	python3_3 python3_4 python3_5
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1 multilib
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-RDEPEND="
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!<app-admin/logrotate-3.8.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-PATCHES=(
-	"${FILESDIR}/2.3.1-doc-Revert-URI-changes-related-to-docbook-schema.patch"
-	"${FILESDIR}"/${PN}-2.3.0-ldconfig-path.patch
-	"${FILESDIR}"/${PN}-2.3.0-prefix-path-only.patch
-)
-
-pkg_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use epydoc && targets+=( epydoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=( install_docbook )
-	use epydoc && targets+=( install_epydoc )
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	# comment out sanity test until it is fixed to work
-	# with the new PORTAGE_PYM_PATH
-	#if [[ $ROOT == / ]] ; then
-		## Run some minimal tests as a sanity check.
-		#local test_runner=$(find "${ED}" -name runTests)
-		#if [[ -n $test_runner && -x $test_runner ]] ; then
-			#einfo "Running preinst sanity tests..."
-			#"$test_runner" || die "preinst sanity tests failed"
-		#fi
-	#fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.1.13" || \
-		{
-			has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
-			has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
-		} ; then
-		USERPRIV_UPGRADE=true
-		USERSYNC_UPGRADE=true
-		REPOS_CONF_UPGRADE=true
-		REPOS_CONF_SYNC=
-		type -P portageq >/dev/null 2>&1 && \
-			REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
-	else
-		USERPRIV_UPGRADE=false
-		USERSYNC_UPGRADE=false
-		REPOS_CONF_UPGRADE=false
-	fi
-}
-
-get_ownership() {
-	case ${USERLAND} in
-		BSD)
-			stat -f '%Su:%Sg' "${1}"
-			;;
-		*)
-			stat -c '%U:%G' "${1}"
-			;;
-	esac
-}
-
-new_config_protect() {
-	# Generate a ._cfg file even if the target file
-	# does not exist, ensuring that the user will
-	# notice the config change.
-	local basename=${1##*/}
-	local dirname=${1%/*}
-	local i=0
-	while true ; do
-		local filename=$(
-			echo -n "${dirname}/._cfg"
-			printf "%04d" ${i}
-			echo -n "_${basename}"
-		)
-		[[ -e ${filename} ]] || break
-		(( i++ ))
-	done
-	echo "${filename}"
-}
-
-pkg_postinst() {
-
-	if ${REPOS_CONF_UPGRADE} ; then
-		einfo "Generating repos.conf"
-		local repo_name=
-		[[ -f ${PORTDIR}/profiles/repo_name ]] && \
-			repo_name=$(< "${PORTDIR}/profiles/repo_name")
-		if [[ -z ${REPOS_CONF_SYNC} ]] ; then
-			REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
-			REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
-		fi
-		local sync_type=
-		[[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
-
-		if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
-			sync_type=cvs
-			REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
-		fi
-
-		cat <<-EOF > "${T}/repos.conf"
-		[DEFAULT]
-		main-repo = ${repo_name:-gentoo}
-
-		[${repo_name:-gentoo}]
-		location = ${PORTDIR:-${EPREFIX}/usr/portage}
-		sync-type = ${sync_type:-rsync}
-		sync-uri = ${REPOS_CONF_SYNC}
-		EOF
-
-		[[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
-
-		local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
-		if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
-			dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
-		fi
-		# Don't install the config update if the desired repos.conf directory
-		# and config file exist, since users may accept it blindly and break
-		# their config (bug #478726).
-		[[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
-			mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
-
-		if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
-			einfo "Generating make.conf PORTDIR setting for backward compatibility"
-			for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
-				[[ -e ${dest} ]] && break
-			done
-			[[ -d ${dest} ]] && dest=${dest}/portdir.conf
-			rm -rf "${T}/make.conf"
-			[[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
-			cat <<-EOF >> "${T}/make.conf"
-
-			# Set PORTDIR for backward compatibility with various tools:
-			#   gentoo-bashcomp - bug #478444
-			#   euse - bug #474574
-			#   euses and ufed - bug #478318
-			PORTDIR="${EPREFIX}/usr/portage"
-			EOF
-			mkdir -p "${dest%/*}"
-			mv "${T}/make.conf" "$(new_config_protect "${dest}")"
-		fi
-	fi
-
-	local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
-
-	if ${USERSYNC_UPGRADE} && \
-		[[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
-		local ownership=$(get_ownership "${PORTDIR}")
-		if [[ -n ${ownership} ]] ; then
-			einfo "Adjusting PORTDIR permissions for usersync"
-			find "${PORTDIR}" -path "${distdir%/}" -prune -o \
-				! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
-				-exec chown "${ownership}" {} +
-		fi
-	fi
-
-	# Do this last, since it could take a long time if there
-	# are lots of live sources, and the user may be tempted
-	# to kill emerge while it is running.
-	if ${USERPRIV_UPGRADE} && \
-		[[ -d ${distdir} && -w ${distdir} ]] ; then
-		local ownership=$(get_ownership "${distdir}")
-		if [[ ${ownership#*:} == portage ]] ; then
-			einfo "Adjusting DISTDIR permissions for userpriv"
-			find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
-				-exec chown -R portage:portage {} +
-		fi
-	fi
-
-	einfo ""
-	einfo "This release of portage NO LONGER contains the repoman code base."
-	einfo "Repoman has its own ebuild and release package."
-	einfo "For repoman functionality please emerge app-portage/repoman"
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}

diff --git a/sys-apps/portage/portage-2.3.2.ebuild b/sys-apps/portage/portage-2.3.2.ebuild
deleted file mode 100644
index 3c35c22..0000000
--- a/sys-apps/portage/portage-2.3.2.ebuild
+++ /dev/null
@@ -1,366 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=(
-	pypy
-	python3_3 python3_4 python3_5
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 multilib
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-RDEPEND="
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!<app-admin/logrotate-3.8.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.0-ldconfig-path.patch
-	"${FILESDIR}"/${PN}-2.3.0-prefix-path-only.patch
-)
-
-pkg_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use epydoc && targets+=( epydoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=( install_docbook )
-	use epydoc && targets+=( install_epydoc )
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	# comment out sanity test until it is fixed to work
-	# with the new PORTAGE_PYM_PATH
-	#if [[ $ROOT == / ]] ; then
-		## Run some minimal tests as a sanity check.
-		#local test_runner=$(find "${ED}" -name runTests)
-		#if [[ -n $test_runner && -x $test_runner ]] ; then
-			#einfo "Running preinst sanity tests..."
-			#"$test_runner" || die "preinst sanity tests failed"
-		#fi
-	#fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.1.13" || \
-		{
-			has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
-			has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
-		} ; then
-		USERPRIV_UPGRADE=true
-		USERSYNC_UPGRADE=true
-		REPOS_CONF_UPGRADE=true
-		REPOS_CONF_SYNC=
-		type -P portageq >/dev/null 2>&1 && \
-			REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
-	else
-		USERPRIV_UPGRADE=false
-		USERSYNC_UPGRADE=false
-		REPOS_CONF_UPGRADE=false
-	fi
-}
-
-get_ownership() {
-	case ${USERLAND} in
-		BSD)
-			stat -f '%Su:%Sg' "${1}"
-			;;
-		*)
-			stat -c '%U:%G' "${1}"
-			;;
-	esac
-}
-
-new_config_protect() {
-	# Generate a ._cfg file even if the target file
-	# does not exist, ensuring that the user will
-	# notice the config change.
-	local basename=${1##*/}
-	local dirname=${1%/*}
-	local i=0
-	while true ; do
-		local filename=$(
-			echo -n "${dirname}/._cfg"
-			printf "%04d" ${i}
-			echo -n "_${basename}"
-		)
-		[[ -e ${filename} ]] || break
-		(( i++ ))
-	done
-	echo "${filename}"
-}
-
-pkg_postinst() {
-
-	if ${REPOS_CONF_UPGRADE} ; then
-		einfo "Generating repos.conf"
-		local repo_name=
-		[[ -f ${PORTDIR}/profiles/repo_name ]] && \
-			repo_name=$(< "${PORTDIR}/profiles/repo_name")
-		if [[ -z ${REPOS_CONF_SYNC} ]] ; then
-			REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
-			REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
-		fi
-		local sync_type=
-		[[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
-
-		if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
-			sync_type=cvs
-			REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
-		fi
-
-		cat <<-EOF > "${T}/repos.conf"
-		[DEFAULT]
-		main-repo = ${repo_name:-gentoo}
-
-		[${repo_name:-gentoo}]
-		location = ${PORTDIR:-${EPREFIX}/usr/portage}
-		sync-type = ${sync_type:-rsync}
-		sync-uri = ${REPOS_CONF_SYNC}
-		EOF
-
-		[[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
-
-		local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
-		if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
-			dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
-		fi
-		# Don't install the config update if the desired repos.conf directory
-		# and config file exist, since users may accept it blindly and break
-		# their config (bug #478726).
-		[[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
-			mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
-
-		if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
-			einfo "Generating make.conf PORTDIR setting for backward compatibility"
-			for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
-				[[ -e ${dest} ]] && break
-			done
-			[[ -d ${dest} ]] && dest=${dest}/portdir.conf
-			rm -rf "${T}/make.conf"
-			[[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
-			cat <<-EOF >> "${T}/make.conf"
-
-			# Set PORTDIR for backward compatibility with various tools:
-			#   gentoo-bashcomp - bug #478444
-			#   euse - bug #474574
-			#   euses and ufed - bug #478318
-			PORTDIR="${EPREFIX}/usr/portage"
-			EOF
-			mkdir -p "${dest%/*}"
-			mv "${T}/make.conf" "$(new_config_protect "${dest}")"
-		fi
-	fi
-
-	local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
-
-	if ${USERSYNC_UPGRADE} && \
-		[[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
-		local ownership=$(get_ownership "${PORTDIR}")
-		if [[ -n ${ownership} ]] ; then
-			einfo "Adjusting PORTDIR permissions for usersync"
-			find "${PORTDIR}" -path "${distdir%/}" -prune -o \
-				! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
-				-exec chown "${ownership}" {} +
-		fi
-	fi
-
-	# Do this last, since it could take a long time if there
-	# are lots of live sources, and the user may be tempted
-	# to kill emerge while it is running.
-	if ${USERPRIV_UPGRADE} && \
-		[[ -d ${distdir} && -w ${distdir} ]] ; then
-		local ownership=$(get_ownership "${distdir}")
-		if [[ ${ownership#*:} == portage ]] ; then
-			einfo "Adjusting DISTDIR permissions for userpriv"
-			find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
-				-exec chown -R portage:portage {} +
-		fi
-	fi
-
-	einfo ""
-	einfo "This release of portage NO LONGER contains the repoman code base."
-	einfo "Repoman has its own ebuild and release package."
-	einfo "For repoman functionality please emerge app-portage/repoman"
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}

diff --git a/sys-apps/portage/portage-2.3.3.ebuild b/sys-apps/portage/portage-2.3.3.ebuild
deleted file mode 100644
index 4f14483..0000000
--- a/sys-apps/portage/portage-2.3.3.ebuild
+++ /dev/null
@@ -1,369 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=(
-	pypy
-	python3_3 python3_4 python3_5
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 multilib
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-RDEPEND="
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!<app-admin/logrotate-3.8.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.0-ldconfig-path.patch
-	"${FILESDIR}"/${PN}-2.3.0-prefix-path-only.patch
-)
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-pkg_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use epydoc && targets+=( epydoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=( install_docbook )
-	use epydoc && targets+=( install_epydoc )
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	# comment out sanity test until it is fixed to work
-	# with the new PORTAGE_PYM_PATH
-	#if [[ $ROOT == / ]] ; then
-		## Run some minimal tests as a sanity check.
-		#local test_runner=$(find "${ED}" -name runTests)
-		#if [[ -n $test_runner && -x $test_runner ]] ; then
-			#einfo "Running preinst sanity tests..."
-			#"$test_runner" || die "preinst sanity tests failed"
-		#fi
-	#fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.1.13" || \
-		{
-			has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
-			has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
-		} ; then
-		USERPRIV_UPGRADE=true
-		USERSYNC_UPGRADE=true
-		REPOS_CONF_UPGRADE=true
-		REPOS_CONF_SYNC=
-		type -P portageq >/dev/null 2>&1 && \
-			REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
-	else
-		USERPRIV_UPGRADE=false
-		USERSYNC_UPGRADE=false
-		REPOS_CONF_UPGRADE=false
-	fi
-}
-
-get_ownership() {
-	case ${USERLAND} in
-		BSD)
-			stat -f '%Su:%Sg' "${1}"
-			;;
-		*)
-			stat -c '%U:%G' "${1}"
-			;;
-	esac
-}
-
-new_config_protect() {
-	# Generate a ._cfg file even if the target file
-	# does not exist, ensuring that the user will
-	# notice the config change.
-	local basename=${1##*/}
-	local dirname=${1%/*}
-	local i=0
-	while true ; do
-		local filename=$(
-			echo -n "${dirname}/._cfg"
-			printf "%04d" ${i}
-			echo -n "_${basename}"
-		)
-		[[ -e ${filename} ]] || break
-		(( i++ ))
-	done
-	echo "${filename}"
-}
-
-pkg_postinst() {
-
-	if ${REPOS_CONF_UPGRADE} ; then
-		einfo "Generating repos.conf"
-		local repo_name=
-		[[ -f ${PORTDIR}/profiles/repo_name ]] && \
-			repo_name=$(< "${PORTDIR}/profiles/repo_name")
-		if [[ -z ${REPOS_CONF_SYNC} ]] ; then
-			REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
-			REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
-		fi
-		local sync_type=
-		[[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
-
-		if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
-			sync_type=cvs
-			REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
-		fi
-
-		cat <<-EOF > "${T}/repos.conf"
-		[DEFAULT]
-		main-repo = ${repo_name:-gentoo}
-
-		[${repo_name:-gentoo}]
-		location = ${PORTDIR:-${EPREFIX}/usr/portage}
-		sync-type = ${sync_type:-rsync}
-		sync-uri = ${REPOS_CONF_SYNC}
-		EOF
-
-		[[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
-
-		local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
-		if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
-			dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
-		fi
-		# Don't install the config update if the desired repos.conf directory
-		# and config file exist, since users may accept it blindly and break
-		# their config (bug #478726).
-		[[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
-			mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
-
-		if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
-			einfo "Generating make.conf PORTDIR setting for backward compatibility"
-			for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
-				[[ -e ${dest} ]] && break
-			done
-			[[ -d ${dest} ]] && dest=${dest}/portdir.conf
-			rm -rf "${T}/make.conf"
-			[[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
-			cat <<-EOF >> "${T}/make.conf"
-
-			# Set PORTDIR for backward compatibility with various tools:
-			#   gentoo-bashcomp - bug #478444
-			#   euse - bug #474574
-			#   euses and ufed - bug #478318
-			PORTDIR="${EPREFIX}/usr/portage"
-			EOF
-			mkdir -p "${dest%/*}"
-			mv "${T}/make.conf" "$(new_config_protect "${dest}")"
-		fi
-	fi
-
-	local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
-
-	if ${USERSYNC_UPGRADE} && \
-		[[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
-		local ownership=$(get_ownership "${PORTDIR}")
-		if [[ -n ${ownership} ]] ; then
-			einfo "Adjusting PORTDIR permissions for usersync"
-			find "${PORTDIR}" -path "${distdir%/}" -prune -o \
-				! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
-				-exec chown "${ownership}" {} +
-		fi
-	fi
-
-	# Do this last, since it could take a long time if there
-	# are lots of live sources, and the user may be tempted
-	# to kill emerge while it is running.
-	if ${USERPRIV_UPGRADE} && \
-		[[ -d ${distdir} && -w ${distdir} ]] ; then
-		local ownership=$(get_ownership "${distdir}")
-		if [[ ${ownership#*:} == portage ]] ; then
-			einfo "Adjusting DISTDIR permissions for userpriv"
-			find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
-				-exec chown -R portage:portage {} +
-		fi
-	fi
-
-	ewarn "Please note that this release no longer respects sync-depth for"
-	ewarn "git repositories.  There have been too many problems and"
-	ewarn "performance issues.  See bugs 552814, 559008"
-	einfo ""
-	einfo "This release of portage NO LONGER contains the repoman code base."
-	einfo "Repoman has its own ebuild and release package."
-	einfo "For repoman functionality please emerge app-portage/repoman"
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
deleted file mode 100644
index 51fa4f0..0000000
--- a/sys-libs/glibc/Manifest
+++ /dev/null
@@ -1,62 +0,0 @@
-AUX 2.10/glibc-2.10-gentoo-chk_fail.c 9407 SHA256 7745c0f5d37b37959b43b41e39762fc35b877161bc5740d9d3e9a83021acbc0e SHA512 d1c51c573353b3b8ae6ab1bcc8c10eda5cad8b98fc7ab4848e4fbd8a8736174f3c3fd1b72dd80c72b1e54be78f1cae4dc1ab8130df25aa6d1495e5cbbaf3b9f6 WHIRLPOOL 32028ddeb422d89c0523fec994413e67c6afd9fcfdaf147d3d6a28bd02f8feabda9571ced4509253b7061a95bb2c16cecf94a4274671b33909ff545b1787f101
-AUX 2.10/glibc-2.10-hardened-configure-picdefault.patch 865 SHA256 b50b29f85d88011555bbcbe6046e6600be9344f2d78412b14aebdea515420774 SHA512 e0a09f77b209a72ab577fe1e62126609fdddedf3fba0eec749c4b506cdf793779b48390f055a3594892120f694291f8340c0b6f51862e94c03fd516897138be7 WHIRLPOOL d1b8e1536696350e0ed9eaf9a923daa7c004ef40ae94c1c3ba3d6cb293f1c19364cefbe8491089061124cbe26a9fded9f3d38d89f1bda56d408162e53702e8d4
-AUX 2.10/glibc-2.10-hardened-inittls-nosysenter.patch 8823 SHA256 dcf78c6524c222dbee907200a8878aff727e29d43a4962b977a16d85752e5c10 SHA512 0605b7964af87d1d6bdccea5c4d1bfe6267d4401b8bbf0c8bb689663e6bb3ef92eebad8be6c23ffdf6632a4d5e6098d8a403c3e84ffb21b5e87b5b1d1ec3512d WHIRLPOOL 635261b547883bbfbe23c802fcf97916dee823b367f96732ccecd7506dff004b87f2d36d97ed398510711330f3a53f039a14e226d20a681cc201a8c7a3450833
-AUX 2.10/glibc-2.10-hardened-ssp-compat.patch 4802 SHA256 bd6f0aa8eace0a935731749e101d5fe30210f9edb65f2f5ccd425cef581ddce4 SHA512 16fc6cbf366c3a0f476f28da8d4e465b1d894f68d33ebdb02de60d6b22bdc6341915d8529952fa4213b11c377302f18a63c462898fe0e4b13f5ec9e3ceda96c7 WHIRLPOOL 059e84269286b285261cc57846b34462524661fef3582396a6b301ee2dd156d2511c88f17f52679e4d5fd96ae0ed6673c8b75a32048e40efa87fad34da6cc066
-AUX 2.11/glibc-2.11-hardened-pie.patch 1492 SHA256 74277f76ace9cb6b408ef7c1d43a3604ae0d6c1af539055aeaeb542d2bfa2a46 SHA512 31ad12fdafc20f783bde32fa3cb477e18d19c5436309b0023284c3134f99c849b0281ea7815ae7509b96f1a88e9c24d52805044cd1c65a88a1a62eebc519a0e5 WHIRLPOOL cf3fe8c5e164623bf553487cf589f85eff28d1073e55a87ef14da716ce313bfaec0dadbf322f2e705c1d4f975458d9cbd6f2eca268a9dc5dce16e54305907aa7
-AUX 2.12/glibc-2.12-hardened-pie.patch 1542 SHA256 9d11da52900a4cfdaa9052476029cb1b4c8004dfaef3cf446f3b728035f75fbe SHA512 97abb62a72d95b07f546658846718755ed78286b11cb72b2cf6ebc809afb1e775ca860e3903f9936ee54761b6d6bb309e822957387900454dd3c66be35ba8148 WHIRLPOOL 4b9b95d1c6c6e02ba21ec43f382a1d932ed8be5ff548a828c3e9a1d945c44cb8435fd502f6c8becf6a2c19bd23c77ad003598b3b3b68b7bad5a5af79e92d6077
-AUX 2.15/glibc-2.15-localstatedir-backport.patch 412 SHA256 465bedaaf735a48825cd6433007abfb1e40c2ef8ddf94d12d452b486c70ce36b SHA512 76506a540d47ad7e76073c3b25bc46278a9e56e34e17d49caf9fffc0622646e8e0d6905fe7d00599db02f444420ed0b9d64d3d70df78446564b137fd65021e45 WHIRLPOOL f21fb6d6eb3555421f7d90b179a7a2745e7056316eacbf209066f01e742037fd283689c5a5f5a313666a2fb79d5ad0631dbada94d9c7eb958ee01217b605533a
-AUX 2.16/glibc-2.16-hardened-pie.patch 1570 SHA256 9a8d8a8268605251782b1fba509cda090f39f56edc8a5497c7b4acfc428041f7 SHA512 1dff16b1ce4ba6246336d19fac21ea6e8d5710e138a23603fa6b79896d895834b6d28bb1948c83648120ca1d038805db7dd7138ba3e28e9071254d6320cdc092 WHIRLPOOL f96487ac4bd95a99e9e70204c686c3f19bb8238cfd4a9856b031be58ac23927886f228a8b4add14213e0489a204c51ebbeb8a376311305025116b8ae45fc90c2
-AUX 2.17/glibc-2.17-hardened-pie.patch 1784 SHA256 bba32e40c73aef20122b2825f31e5c3aa058b61feae4f32f336e1941f83f82d1 SHA512 9ecfe2b6c8c982a42786181d6507d5fa588a6868109065451f58a779848837bd5e69c32a24e43a186c2ff63a9784015c51487e342c87982ac074139e36c169fc WHIRLPOOL 1baffbef9e6d870ea2f2ae5be014b71020a213a1a11e9856fa207545867de444ed164cb926b2aac23471854eaaf72a87e38760702b32bfcfa639add8733d925e
-AUX 2.17/glibc-2.17-runtime-prefix.patch 6695 SHA256 466198a1e2f92957017d3e550b806196de40a6cbf780320b3b11ac72459c19d8 SHA512 9adf787c8516ec86609bb2c1975d2d05c679199200732c141f4c8ae2724bc1b92a3981995f814542d2fed44662d7ccf560b0e9d904e27d68eafcfe3f55787a43 WHIRLPOOL 3bc2aab75168ad3a8b4b273577c3f0e71396a631f151974433187ecb3c73b0adc2ad15e9fd17334b9cb1332035c98937d302a03bc1afb3f66ff1d36d347d21f4
-AUX 2.17/glibc-2.17-shadow-prefix.patch 950 SHA256 36fa45e0e2642c6ce8809341b69e93d45d97d3b6c451a089198f7b90a5d0eb21 SHA512 3101b9814bcbd0443d309f3949024e753cb6101e84e9cbbae1502fb4c3f85c2fad041608ba69c966cb1da2cf64f5f2c0931c08db222933a2053394f7b0fabf9d WHIRLPOOL 5243b70d2d2e2d3c3c9b07eb2251bb5e78767e776c0491f91fc8499c3d807b44bdab384f7c81867373a577574999079791695eb65ed8c2da1ce5a79c8e60a5ef
-AUX 2.17/locale-gen_prefix.patch 2704 SHA256 0807c8979b7a1a63b48d155417ff8ecc7e14773e928a0d1fe6c349a36fcdadef SHA512 d6b41b953713f7fe0ba14af6d045fc0e6b649f278da691ca5f021d95be5cdabfc87de399880cf988fec2b189fac22864d004ec8d159e59a2348b41945de1d5db WHIRLPOOL 3c7d6b4e789ae494cebea620ed64a6ba8dd401837914f4ead72c7b2d6af94538c9a28f65781db7e6ae0d21c7fac13c531b71147fdb5456ffd39ae1246b331069
-AUX 2.17/vdso-disable.patch 1136 SHA256 49006855c1ba3ae3d3aa5ed71787056dc64e993eec70a4bef05bcc9f4d824014 SHA512 6eeb6eae8b8c1777ebd18170a7651b9e95297125cfc3829786c4d02887cad4a5d768fc2950723d1d040d16d15d72491d7443a3c14ca9f20eb2adb1ba6d1649ca WHIRLPOOL 80367da491b958d0b7855d23d3225a5c17a3a7a1b1f9a54ebc093c53823a5ef1642b974b45e079aec0abff0476494368ed9afcaed83b87576ed8458b8348e41e
-AUX 2.17/vdso.patch 697 SHA256 26f2089344709de9c1bdd2f974d02ff5d4c465f6ebebd5d1ac2cd72b732de201 SHA512 a303a6828ed001b16f2f5c3532890cff66a50259c2e2aa2843e992f2bed5e6141abc9e120afed25f2e1f30d77bc218c3940d680c3d73c227d2056370d5e6b806 WHIRLPOOL edcaa815b8f86e17d77f0582453a717fbbd848400bfdbd302730fec20a952a584ea8f5ba4f7175b25d84752bc895519d7baa55664073cae5037962b0c1825aa3
-AUX 2.19/glibc-2.19-configurable-paths.patch 81250 SHA256 ae15864d46cb4d5e061465249c9a9c4585961a312d61d6e9edbf8dd8a5dc8a22 SHA512 e9b4c4d48560fc4af41505996b40f3dd0023ba86a71182d965a5c0978f1ed6236311da5b990199e2916b9fc091ce374b2d346b03c133f2d8fcf7e6f07616a3fd WHIRLPOOL 67cf918f3f26b74cf34108806195465dbfe0a51b3c97a7ed19e398c093980dbb0bf5b9102f351cdd95acad58cb3b7c947a50efd593c6a161212afe2f4a9f8ac0
-AUX 2.19/glibc-2.19-hardened-configure-picdefault.patch 865 SHA256 feeb2ddc276e90f55d2fd358837e8d4922d3b2875cb8080b1d8e27e5da83a2d9 SHA512 d8e6fea72e240f1fde8a487958463140a84e8bd6bb5b176f8ce84a34df3137943db9016300884f3efdd4da130e342448e57ed0c0dc6eb2956d647286ce1d00ce WHIRLPOOL 3a5d2882b5fc1bea78c45409c848c94a260659e3ea1e28a5dc8818de8825e55453aa1cc97b86eef99c91b17bde9f2a6db1fd8ae03839f7029d93a71feaa4d4d0
-AUX 2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch 1360 SHA256 f0d8bb004f598375b61e67e1c215b15953c293038243207f2d85cbe9f10d093e SHA512 79876b12871b3e7693340bfdf99276ac0dfd6ff30bc977a9526af9e681fcbab2f25d3ac9e2b33f027c968b38a4b670237de54ffd08edc418423ecd82dddd1d67 WHIRLPOOL 5ca64dddf58a790cc5f6090ae48fc4bd4799a9aac4c67f6ef7d1fea9498208ffc38ee8167b6ec80dc97c4f723fcdfade8f573893f1b380aff04f6d0476d0d253
-AUX 2.19/glibc-2.19-vdso-disable.patch 1120 SHA256 20048700be532bd1b692471420f930951cc0be2d2c9eb2a95e895e9771a0e13c SHA512 8f52408e5acd96708e5376b3aee77d4851dbe98a7f4b2d2503d3ce5c0088bc93640023659d9e49c8c802ab33ad9f987630667bd5094e4b4aab2c48bb1183a84e WHIRLPOOL 67b6bc23ef1a90886f8860396d52b9004764f3ebefd1d48736c734db419d47402c01c9b746a16147a84b77b8510d243c63d76048c8b2a46daed8aa0acac73fe4
-AUX 2.20/glibc-2.20-configurable-paths.patch 116486 SHA256 d7fe27619225d6e2941e52bc3dd049bfffbed2cf633329ad4ae9a76150ce5f1a SHA512 e2998c66d7c84e6da8f9f24e3b710c8c62f0042a65c7af6f0a2f9cf303724d732aec753e6002ed265c95947f72534de6da9fb0681328c5f8cebbb8c8a60ac61a WHIRLPOOL 50e5984c09e76dd5ebd9172c2e560dc2ff721af23a9be0d1c24fc289af20a5a4e0bf278ec4ef878151bf1cde4d51f42d536aeefdde1f5c206d7942630c8f93a2
-AUX 2.20/glibc-2.20-gentoo-chk_fail.c 8978 SHA256 f9cc426b0fb21de1dc11bb36e43bca8e1b3114fe78f8b343f672a951a82c742e SHA512 5cb529ac9d18a315f25fd48a3a80a529924bee0588074c97e6df7dbe8568a67f786363c41da6300ea55818369e3609ed4315b2e2104f8a8b4f1266ba43076eda WHIRLPOOL 2d38c19a20226fc4687037b8bb19025065f039ddaa62466879ca98765c8899e64b147dd148565304419ed1a98fbe1f8403710b22c930b08a19bddba7e79b0f1d
-AUX 2.20/glibc-2.20-gentoo-stack_chk_fail.c 55 SHA256 ec73e74297b5eade591bfb3a2999989e2a7aa80752140048ffa67349635f05e7 SHA512 4dfec1bd17007b826110dcb73d09331a58b7a892c87de55b94480b14c28686442c567725b610082813411cf9911e180835a400a54ea704fe80f81cfba966a989 WHIRLPOOL b2b338a50f7895c530a71a19e4582bd0116a0b9d13b2e1505f0566924557493849f93cefb2c0ad1719ef684321e145129e0f72cfc9aa85a44ea7ebf910e7304c
-AUX 2.20/glibc-2.20-hardened-inittls-nosysenter.patch 9951 SHA256 992fb70b9b62674d94ef8938297a3f2591b3121495987d927f5a44c1d8788658 SHA512 a8302ee2963bd791be859233223b17cd154afbf04c13c046956bb1140d748272d7bcb3a6167ce8b61573ebcffe906dff064308374d2910656b8fad18480fe422 WHIRLPOOL b8753d6f1301650b91b5cf4f342de22010d819deb2bf4da27aac33d7540e15a140b8a7a4c5e111faba320873ed5784b22f6add29181fbaef14c3e9504b1b838f
-AUX 2.20/glibc-2.20-vdso-disable.patch 725 SHA256 476d1198e990a0beb42a7350c52c34783de33d0364ab3e11d9b74a81e027977b SHA512 2c47efc06aa93eea18e6d407c2b1cfdaa80b374bdaf7ad257ca02857aab53d7a6ec46092872d3affff2ec800f6937012571115b8c83d116084c21f8130c4fdd6 WHIRLPOOL fb919be2a23f5a240817dc8540582915cb0e0497196237a7bcd891113738b81072e96f4af4668d0ebd05094c2983c411265267bbcfc2be96c5ff33f37fe7f936
-AUX 2.3.3/glibc-2.3.3-localedef-fix-trampoline.patch 2329 SHA256 b5cf51d1ff5479d09fbc82992f126ca4969006c90c3a2ae94ad586d4902d791b SHA512 939ec7da977837ef46aa8894f99ac06b3fccfc36dd672889b85ae8cbbfc9a963c5d0c031d776aa2feee29ddf8341b4cc7a50ea19b7c6f7e80df74eef5f1fd977 WHIRLPOOL 47d248ddba815a517aed9b7dbfa247bdedf293cb5adad8079be803ea4a682136f01b47fd3817a1696b3758c4631d1a25376bf58ef039998ace4a6b65807fe75e
-AUX 2.5/glibc-2.5-gentoo-stack_chk_fail.c 9058 SHA256 067fba2a36d2630d50198c44395ef208cdf080508f1b716bd3d079f7b964e2df SHA512 2d404bec1e009d111b775fde620102b3d0ea7614d07ba31350940f2693e937e825acc43d1ab94bad2eecac61d47c696098327096dff8f08b4b7312d0873d71a6 WHIRLPOOL bb27ef90afb256d3822787b93574d4f4f5632995663e08b7201db17a4f38f6e2a8fd6368aaf699a808cd8f7acc346625b5607dcbf1e88f8b28dcc6d3dba92399
-AUX 2.5/glibc-2.5-hardened-configure-picdefault.patch 794 SHA256 0c0359f567e4ad2d3184618bf6ac7e6102b703eab6227c7e9a4ff4dcdeed2c91 SHA512 99caace6c3528db400f8039c3f5aa65a2d5088d9758894c8a49df2b5045226a4056972de2d162411617162edd9023b6c6f80d85509638b5d68a8d0cda40adafe WHIRLPOOL 1271cea2155149e789f1242759e516443c5cf152ae9612d91d2a25a727952684eb043fbcfb38186a31fc6a1568201de5ef40af45436b137453e0582f2f6facde
-AUX 2.5/glibc-2.5-hardened-inittls-nosysenter.patch 9407 SHA256 2a912e82445815ae32744d990c59d8758ec74e482b856bd274c292848b9af1fd SHA512 6acdfad1c2395a8097500216df3aab7a96211e418b56eb07ad317c25049c30c4bd9538905f186eb6d5b9260d98423bf525ec005a283e385ba4a83e7425080b10 WHIRLPOOL a542db44162d1322b23c574e20f59c8df7a5c17ca26560a22f73da832ff1743c7f56915a7e43d5d13a6068b3b975521f6b33940309496ae62fa952cfc2cd23dd
-AUX 2.5/glibc-2.5-hardened-pie.patch 1569 SHA256 ff9cde8857c5da89faa4039e2a81748674fbeaaa49d85c378d80711d55f2b0c1 SHA512 bd026dba9df97d5a2a66c92feb8e004fcbaf69aaff489688990f9c0716e31d35654e2ad2b4f6ee8ea02259567f28a7d389cc5d43f0a77122c3f65a61fb4db112 WHIRLPOOL 888ca7bd8d4fe89961ee582bf96c141962b6702a92af663c7cb86d245f471f55b0817232744a7218dbf9d0f9eae9a8cc6a52843257c9353eef1332cf5c368e2e
-AUX 2.6/glibc-2.6-gentoo-stack_chk_fail.c 9545 SHA256 1410ded812be80d452eada5f9d6b9bd7bdb504c14f01cc27dce3e36b6f92b92a SHA512 360b77df2d19d14060e19e763878297bf042eccd5206ce4829a33c78c982b59b46144116d237a7cac73a22dd6cb4987c8dd50f1d16003baa22c2cb2942d2cbdf WHIRLPOOL 44e14dacdd258c46201a44c2c6aae4d975b960a914c24e49f2b39dae960636512049daa052d3cd8e8d93819d263327c28eac947efdb5d9e240d1bc6e9964016f
-AUX 2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674 SHA256 cf58ded8fbe9fcb3dc094521feec2588c1520ff2c632b20c69d6a210325c4fcf SHA512 094b24474e42a9714f5298b0768d44f2c0e01b7d8c3b0a754bb16caa6c024106e8c0b1acbce670bacec1ead6653f8365397173d62cb8168b946c8f521ca155d2 WHIRLPOOL 9fa16256f9d3bd2f38023549c0bd4c932d3173b6c3f4ef66e19cdb3eff5cb2def6ec02fa72a7e57ba74da6d5f29b82ddb9692d59f6c694d45b5989fa0bfa6057
-AUX 2.7/glibc-2.7-hardened-inittls-nosysenter.patch 8755 SHA256 b0b1bf0746f7160b89cf281502b95c38dec9cb948d6a50a907b84fd6230a2dc3 SHA512 50563c26e1fd2e71cb034c8a1b85e0e4075ac6467bae46d4cba0c105c940c5aa6531c39cf00c63ebf94be4e290ee485d7bd8239ff08dbc781db605b45c4aa38f WHIRLPOOL 2047148b53073bae4031ad864fc360112e2812115ec455142c82d4694a57387b49b36c98f400dd6f77f5dab3d419303faabe8183a16f0fd68387996c95888a43
-AUX eblits/common.eblit 10934 SHA256 5e12fe093156b639b308212562a92cd68a7778272efdec9c2dbcf3c6f94406fc SHA512 d8bf175a3f88dd93bf338af9ca2edda88ba0e3b0be43f5110865da58911092c7920ffa210d82b579e402bfe29545c3376a6257ede04dc5ef27dee2318a7d452f WHIRLPOOL e7e97534c857f56c5a7821372d1209f757b89981ba6e2386aedb42acb60afd72e0f27181a5246eaf94716808551f14933c11d57b54c3308a3bbdb20c7316e346
-AUX eblits/pkg_postinst.eblit 971 SHA256 abcb925bb0730d1eae22bbcee7a4ba6523280390f410f38bfdf9eb44e0280000 SHA512 65e577c77a9a488c5e93ccd4afa325ab7e3904df594c13fda17136c8aa2748fa4e6d0102f4799b4ac9b8c3bea9920faadc4db356ece9929ee708bbfa9151dfc2 WHIRLPOOL fb3cdfb702b0ce616064f94321b9225a53b300f76d95495098b6c97eb3ab1650ea2d323eae169bb8d1fd8795134aacb5c54ba6927fe743b01f124aec416b15a0
-AUX eblits/pkg_preinst.eblit 2105 SHA256 aba79a4369067615bc48429ec371ae91ccfc793ddc72cc05862b705cf63c303f SHA512 993ac0b94bae95819bf11f2ba88820bdabdc41c4c63ed25f00adb16e9e965d4206b68d316faf329ab3870a3e810183662e12e554a0150829ed026567bf9829da WHIRLPOOL 01c511f6995fc5b8cd9bf564298ab6bf6609e660fce26dff23c36081ccb72b28fdd3ba0787384c11fd126a7db0f1a0744e9396c6225b0881b9d02ee52d6eaa42
-AUX eblits/pkg_pretend.eblit 4990 SHA256 219947e495090b640ec6229b028299edc3f06ee81a130211cf91803923ccf477 SHA512 cb27a05b798ec892576239d6146403f2430c9568faad410f42933610c83c60317bcd79198be4ff9b6c08f9e13b3e0ea897a9ddb8613ccc75975fa227e3c9e26d WHIRLPOOL 613f1920a3d8f51fc6274f73d72cc2be1f3df8b5f2d5af173d050142cbea8b52da4eabe50ba28192af2f2a62c259d512d466b33b303a16648cc82e6422904ba7
-AUX eblits/pkg_setup.eblit 275 SHA256 c5de97dc69d3508555ac579e14ead694a75edf4707c1749219677ebee88ca9ab SHA512 627740976e372842b09034b79f61f5cb5d8283f47c94cfe66b2aa1517c901df0bf3b456f1ba26a9ddc0aa0215190d0415ed4f881cc950d163d8203a0e6bba2a9 WHIRLPOOL 16ef3155b35671311443f4c231c1867d12731035aa603dedb6e86eabdc1501c67183474a26bb06048e12c19ac3bda054fdb8a107792a3dddb743b6dc7d447339
-AUX eblits/src_compile.eblit 598 SHA256 3b90a6f44d307b92cee36fdd91d412bdb9fcbab555e6c6bf8174c8e3f29137ca SHA512 ee216aa3bb13f75313d141459acb47523442addf12a6bb8d829ca40eda4f63324911a13ff0ae90fe6eed1fbe0058c89308a2205c5357a0e1897a89573fea2f51 WHIRLPOOL 3bfc5406e794ee9ee4005e97aa2d40a82d77de090c72767d6b43be6993048536b4f2442bf6864157d036e7ea3fce6ba6537a97cd2afee04c61f9e98e1adc3c00
-AUX eblits/src_configure.eblit 7909 SHA256 5947f6fe819d936e0e32484a6d3f49ad7aac5e5c89333251c5659fe998c6a083 SHA512 63ef84d95c47d5881db383c4c90be03434e1c1a87db673f562ead7e6edbf694a428cdc0cf69d312159797f70fc5ac74584d7a7087b314d92dc21e452d1d66477 WHIRLPOOL e5aa3b11ac35b05ea52b077ffe16f8c5fa144a5c70dcf086569a7b6bf2daf171d552dc4a72fee65b892297af1796e80247512e17c313c4c56b6f4b7351fe8ef3
-AUX eblits/src_install.eblit 7814 SHA256 8d64a4a031263dd7c3e7ba710a5dbe51fa7004b9795fefdab55f7db273f5e89f SHA512 fb9fc62103e1803509f5910b71eb28398258433762b930c93cccb7578756599739714c41077a2d0fd81c78e8fd14fd30b384a2c141d8df801507414531062551 WHIRLPOOL 4634ef7da02f35d461027a4d5bd27bd4e888805de0713b577ac47eb1161048f929e1c52e38fc4ad8da333a2198877b82962416edfb30bbaafb9055fb658a6226
-AUX eblits/src_prepare.eblit 2231 SHA256 02e28094bb57137d0f12031dc3ed75d022df711847904f428ffea2e0bc42b778 SHA512 967e831a0390c2fb328cb69a75489f3ecddf2a3aecd3d8b95e8ef36fdced3b0b15a320245cd1274e5bf78bc49a17a862fe4af26f610c3f864418c707e7d6150a WHIRLPOOL 4855e3979903daa6b4586d5bed08a1f7806c03b9873f4b51a0b6b73254bb40eb08cb0e6329992f663f98907e8d82f485ee7f49ee4f82fd52dbfe880f8dd1fe70
-AUX eblits/src_test.eblit 698 SHA256 96b044ef9a27c2591b2a440b45bd89989022d0b41c546ce4dcea58a631315bf4 SHA512 0a46dddf53ccbfaab3f85ba7d2e8f202b4d5be98052601686592eca0ec115de29d8cb1f324ba12dcb77f3a8d4bbb39032532042b8adf809a772ebcc845b1a152 WHIRLPOOL 42af8b97859789b52a5a0c100ba109d8c3dd47532ef3f0b764c95b7a61be9d293d99de25e601dacd840c0a4cc921740b5acc2a3567b5aa3ae8ac6f88430ccf04
-AUX eblits/src_unpack.eblit 3096 SHA256 f0934fe81278797a0625fde2518f5bdf8531c75443ed3dc6ba7d18aa751cb235 SHA512 6fb32f854920ac4c0df5d60d334f4b9376b05d9b2df7d1bfac979acc3d7c282846fcce36c9816558ee75db030c3551b95f2ff26e53ea166adf97a2ae5db55abf WHIRLPOOL cee004cf4967f0b073f56ef5bbc67e56981f109400622f70cfba51ce120115f4c25ee7696a5b9baf7b22080d01d038ea936d5c342d65b7331b3801510a509123
-AUX nscd 1621 SHA256 6165db3a2fcb251d4f3655c0461e018ce9c92a37f7f22a8fd2b75178b5435bc8 SHA512 3e1255ab014b3806112120000c3d2189a7c1c69dcd6639d5ce55e96bec721683a22b141982f6a6c6d44b14481c33fbbaa470863bef04e9b9eab7ccad1ddd5d95 WHIRLPOOL b7152f8d888fca13a16ea403c44eadbf1da2249dae3add11f73999259061824460a5479aa7e58c012bd737b62ecc81814109832cee33638279d90d4c08bfdbdc
-AUX nscd.service 337 SHA256 de7bc9946309d34f0ab44aa22a4d3cf259fe91c57e8000d741cb09ecd3a6caa0 SHA512 2001100f3b054843c69b6fd2d38852c7c824282aa8998c25a3c0352db993705429d25c70d8ce6cb3579f836b7089644c520acac423ebd69cb1b36e94a77c5bea WHIRLPOOL f01d191971b0dc45f541c9ebaaa1a40f3497e2cc838cff6a20a7b1828d726c248abbd94322a5a5ff30c33ddb7d9086cd4d2ba3bdc1811fed59ff292ef3983a72
-AUX nscd.tmpfilesd 111 SHA256 f0f64c4612d2097173854d2ec2e94ecbf4b77c7a6e94d950874e37346aa90d72 SHA512 53b80b331e1a85d8ee16eb2ce547a7249e944926c3d1cdd4a47a5301a5c842ffc7ec1e3dc0a731542a8facf8261c1c57121802d01741aa89898a3476c09da340 WHIRLPOOL cf1fed1a7e2ac1623a84f1cfa2062645afe3f791da2f4ace3859d12aa05df0e282b4c2e367a460015956ac2a8d01fee4cda84917a3adf2c38561dff200335270
-AUX nsswitch.conf 503 SHA256 6c38b8642d5da884327ad678d0351d57be3621562253bd9711394bad87e45e2d SHA512 c13714110f3ccc9a2270f51d0da9293ab19b9df368092d19b1a84d5051d888297bd9439a322eca1ea60d6d5e58952797d803a368a295f2db6d5e97e173907373 WHIRLPOOL 0d37755ba5928ff894c355b3fdcf7079f19c1cb7a4f3676634084da89c74d7175823a4659b8c66d8dc1395d086991857162822ddf977dbe8dff9a59bccab821e
-DIST gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 8064097 SHA256 34aec5a59bb4d0ecf908c62fd418461d0f3793238296897687305fd7a1f27299 SHA512 40b93e194ad41a75d649d84d1c49070680f253a13f0617803243bc61c44fed1ca2d0a7572a97ebb79353f312b58b5f6360be916dd7435928cc53935082e15269 WHIRLPOOL bbce19e7fe5c30faa55ddd4e29070f0d1fdfca3a04e8d68e0772260fa9be89ccde63ec92badb490209008df5fee6e53dfdeec4ae51857b90ba298a79315a199f
-DIST glibc-2.15-patches-13.tar.bz2 154658 SHA256 59c11d8b70bc406f6bc7dd87509f1c5fa05998fb0dde8e1be530064e9dd24a53 SHA512 ceec0506e10cff25ec9acce3d4e3f174d56a7cbb00993cb8edbf532f303c48e3b2d5e965e4470f537dbed23d14a29bae4ac4c834b4c11fcd27d8e66d8500e4c6 WHIRLPOOL 9dadbcd8626df9938b6b215a0618cbc605405bf56bb143f25e029c0aa00d5d6ac75877c7b2fd2a2c22291f62587cf8011c30d32baafb5ed0dd2bb539895f1c54
-DIST glibc-2.15-patches-21.tar.bz2 110297 SHA256 5553c0a37c5c0a3abb303850fa9d2ad309e2f47c3f42806c2f1dd32a48affbfe SHA512 5255ef053a2c30f9cae583133094f41604385b9d6e653a0d6aab1d13d69e6c8cbf16fde712607ab0bac738944a0410ddc050dc231ad4ea7d3584271937b0b059 WHIRLPOOL d70249c6c3c3c0a4d02c3ebbf0309bd6b3da3962231c153c77be38d217e2f57e0eba88614e34f0f219f485ba8f8474586d0059cfc505e44f312396e6a753d441
-DIST glibc-2.15-patches-23.tar.bz2 118999 SHA256 11c38082635822eb7b12d538e3b9c38ee71f6a86be6cebb59f5f2c575be93830 SHA512 ff3792a0029ea24990fe2419579472bd02119ed6a2dab28e85089d232029be5f1c18c643bcb9d577dce78a7c682bb5eee1ed3644f086b5cf19230bcf37ce8a4b WHIRLPOOL 110ddb5989bf1b66a487c9ebae03a3e62ac22b7a28b4c70d142e1c56160bdd50b9f5fa6f4dc4a28cfb28d94281c582fcfc1f60df8ae2ef4e8a946b3b06d2b1b1
-DIST glibc-2.15.tar.xz 10280176 SHA256 321ec482abdc27b03244f7b345ee22dc431bc55daf9c000a4e7b040fbdbecb50 SHA512 fc8bc407cd9edfd79bd286d28c84e0b8224e1f57c1d318e73da098a9693257d78970178fd59f487f0321a079fcb772e8e78473fab52f091b2addb0a48fe8dcf7 WHIRLPOOL 061fc0c9915bd821dc31c2fea8e4f9a75b6c7ec0c935ea713d8c087408a8bf3c600179273438f3d9748fe40b946866b2f160e6da6fee4da51e549a30d0f0ebbc
-DIST glibc-2.17-patches-7.tar.bz2 79288 SHA256 8000409d072571d2d5119d4dd538e3a3ea39213407e202ea10033bf6aed516af SHA512 c6de4d7754cec6e7a9e36d56eadc6605ba6fcfac116eb50553503738873659977beb935112d361620c35e7b15e86f845a49fd13269ffbf98c72f54dffade19f7 WHIRLPOOL 259e938e8f4ca6b7296db4982748429f00135f80cd03965da589e4318134aeddb5acdfa0f8f61871e46330a0c96eb8e734a3c2f50d564882ba37f13f722b78c5
-DIST glibc-2.17.tar.xz 10981956 SHA256 6914e337401e0e0ade23694e1b2c52a5f09e4eda3270c67e7c3ba93a89b5b23e SHA512 384e54037daaa344a26ce58242acc3f9a249d0765088d18a540a305745afa33ae6dec4024adae958eacd7100be9c713d117260ace8340f6d8c8396dbde4868d2 WHIRLPOOL 9b98c1c298aeff607aaa554341c300c15491b7314f127524fc5c048c67c5059daaf706e6cf206bb69213d5307e37bed87137ab46f504d8072bb778310081fc23
-DIST glibc-2.19-patches-3.tar.bz2 80664 SHA256 6fb03292e224199e0dd9ba7ee83aca723e1560f26831e85cdc6302b187c6de3c SHA512 d281d6a2757920124cf8a3f02b97e75192598b08d96ae48840df34c7ffdcb212952d171f233e6f12a429b19437d0a296212fe1f2eae164d6a1c6793cb3cb69f0 WHIRLPOOL 6f28a2d0dff42e8ad0e77859938e3093753f77f78821375777eebb2db5568bf1c56e8b8208f02280f23acb2dd26dc8a313fedd5b2c10755f1659e6d324a1dbc3
-DIST glibc-2.19.tar.xz 12083312 SHA256 2d3997f588401ea095a0b27227b1d50cdfdd416236f6567b564549d3b46ea2a2 SHA512 9e021fcb3afbb9ace2a0e37fded231a62de861bd766e29d47163a03182e37add718b7acc3963d1c525f9556773e842297725715acde48dcfbaab6e756af1a23d WHIRLPOOL 9581a3a23ebdd56bc559b56b95b7bcd21ca039546ec19c6c0e4e0738597542164fdb21ab1d1f36d5e73a205fb51f0974c7d497972615bce69ae002298f6475b6
-DIST glibc-ports-2.15.tar.xz 421820 SHA256 fcc271fcc3a808bf0f3aa1d144bc39b8d0d5f730aed6e206b883961515f0d1b9 SHA512 fc3c80a9a7ede0f35054e5be043fff4b967e6ef6678f42e617dd1dd498920edb4e4c785cf8e3cd97fc2914a35a892e0fd7e1aab24f0c3c8d207765a131bf3744 WHIRLPOOL a8a617eacb326615265832f86a7ef39678364b5b65d5c16d58680ec0debfbca6780018b7da9c1a86bdfffcde58aa1258b96ea4bd50b114901b522e62d48ae4a5
-EBUILD glibc-2.15-r1.ebuild 8143 SHA256 94c831d06eb6cd7c153db3267dfc7811739d90b8761751b384e85360f77e70bd SHA512 53d5b41729a282362d3447a45dd373c098e04cafddc81d7da0304b7ef56a4bf53058c4ea88763db48d3796345131f6b25cc56949770af1a628549d3e2b24af59 WHIRLPOOL 3f76b15a4db14db99afece549cd4c4982f1fbcefac313bbdf10127f10630da9c43f272ec85ee99afafeb3ab9afcf5f2eafd612386e152e3cfa08d360ca639115
-EBUILD glibc-2.15-r2.ebuild 7692 SHA256 1ee891da4bbb450ce16318877a9043773c34a7418eb49f7f684155e48ecc1b6b SHA512 4e0e5c7e85a514a0fed90a9e339eef8748e3a0f06211a93463db355b9b921337ead3f645a3fe8b99dbe2f12d1c03e2ffcad7e2dbe2909b5d97fa5486fe53215f WHIRLPOOL 84ab863b0f70cf8d40291a155f21c987e9b48dce005890e34e105bb3fed950d463f0b053fe2d7988a9b218dc3ccc9afb0c952845009b2e7e2569b28298f8e479
-EBUILD glibc-2.15-r3.ebuild 7764 SHA256 17540bbede72db02e113f556cd3c4a6873c45be1191bade644b5a78d2557c673 SHA512 b9f856356a1dad8f51a62610defce3984477e7f8265427c7e6d21c7868bb6756de4f66b16d3184fd51180155112339e33547a2348d55a2cf1059ccbdf68f0c3f WHIRLPOOL 9c36e9f55427b2cf0180db983446d572d63be309e64b42bbe3571105446f4eddaa815081faf79fe6fc639e3ddf3e3720f11e7af2e85ea19125ef561176eaeff5
-EBUILD glibc-2.17.ebuild 7668 SHA256 b6b7142b8fded3c848424eec002b0e9b15912fe03841d854377b827ea3975eb9 SHA512 0d5dafad92578139720403aa29e1406c366892cd7bdebbfa3fee8a1a4eed06009941d9a55f6f9e9f3ec035947e03d17137e6b9ecdb4061812b0254aa48d0d1a8 WHIRLPOOL 2fdb5ab665c6ac7297e2586644f121101ab84ae3a17ade1fff87be8a31e4d89096063ccb25ceadba53328a398d65240833cf2508b3fa20c42f1e4354a3f1f81d
-EBUILD glibc-2.19-r1.ebuild 7397 SHA256 c96062bad2386baf72d3e31e9858eedc5a05980fbfe90b3bc618f7027d90c80b SHA512 df34e6de33e59afb49c4c6d98bf32ce47f21c54979b2db5e21bdad8357f9e2921ab5c80f9926aeeb4cc65f010ee8407bd078ae121adedb22e8d5e6431b8123ac WHIRLPOOL f74da4cd1fbd863928551144cef903093df3db95ca7db8da982a1eede571e5cbe123700ef8d81546754cfc29a9edccd58bd42ea1d51f8cfb76a35072fc96680a
-MISC metadata.xml 521 SHA256 e89c6157189c7a76823ea61ad88e85d6c5e497855abfa03d4e044b09bd0d0955 SHA512 46d36653c75257e1091d88eed54dda553a81a246407f7ae37864e3a9f1c359560bf3d08f5946a725624804e74b1684414a729a1a3b961220dc76cdedd9a4d0ce WHIRLPOOL eb3695d1ce708f3668dc85332b4ad9de6e021b3a98c1b48c4b874d7254168ee5aff2ac6b51866b1df29f1689085ab07e97a7b39708bcffbafedb21288e01f42e

diff --git a/sys-libs/glibc/files/2.10/glibc-2.10-gentoo-chk_fail.c b/sys-libs/glibc/files/2.10/glibc-2.10-gentoo-chk_fail.c
deleted file mode 100644
index 37711e8..0000000
--- a/sys-libs/glibc/files/2.10/glibc-2.10-gentoo-chk_fail.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/* Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* Copyright (C) 2006-2008 Gentoo Foundation Inc.
- * License terms as above.
- *
- * Hardened Gentoo SSP and FORTIFY handler
- *
- * An SSP failure handler that does not use functions from the rest of
- * glibc; it uses the INTERNAL_SYSCALL methods directly.  This ensures
- * no possibility of recursion into the handler.
- *
- * Direct all bug reports to http://bugs.gentoo.org/
- *
- * Re-written from the glibc-2.3 Hardened Gentoo SSP handler
- * by Kevin F. Quinn - <kevquinn[@]gentoo.org>
- *
- * The following people contributed to the glibc-2.3 Hardened
- * Gentoo SSP and FORTIFY handler, from which this implementation draws much:
- *
- * Ned Ludd - <solar[@]gentoo.org>
- * Alexander Gabert - <pappy[@]gentoo.org>
- * The PaX Team - <pageexec[@]freemail.hu>
- * Peter S. Mazinger - <ps.m[@]gmx.net>
- * Yoann Vandoorselaere - <yoann[@]prelude-ids.org>
- * Robert Connolly - <robert[@]linuxfromscratch.org>
- * Cory Visi <cory[@]visi.name>
- * Mike Frysinger <vapier[@]gentoo.org>
- * Magnus Granberg <zorry[@]ume.nu>
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <signal.h>
-
-#include <sys/types.h>
-
-#include <sysdep-cancel.h>
-#include <sys/syscall.h>
-#include <bp-checks.h>
-
-#include <kernel-features.h>
-
-#include <alloca.h>
-/* from sysdeps */
-#include <socketcall.h>
-/* for the stuff in bits/socket.h */
-#include <sys/socket.h>
-#include <sys/un.h>
-
-/* Sanity check on SYSCALL macro names - force compilation
- * failure if the names used here do not exist
- */
-#if !defined __NR_socketcall && !defined __NR_socket
-# error Cannot do syscall socket or socketcall
-#endif
-#if !defined __NR_socketcall && !defined __NR_connect
-# error Cannot do syscall connect or socketcall
-#endif
-#ifndef __NR_write
-# error Cannot do syscall write
-#endif
-#ifndef __NR_close
-# error Cannot do syscall close
-#endif
-#ifndef __NR_getpid
-# error Cannot do syscall getpid
-#endif
-#ifndef __NR_kill
-# error Cannot do syscall kill
-#endif
-#ifndef __NR_exit
-# error Cannot do syscall exit
-#endif
-#ifdef SSP_SMASH_DUMPS_CORE
-# define ENABLE_SSP_SMASH_DUMPS_CORE 1
-# if !defined _KERNEL_NSIG && !defined _NSIG
-#  error No _NSIG or _KERNEL_NSIG for rt_sigaction
-# endif
-# if !defined __NR_sigaction && !defined __NR_rt_sigaction
-#  error Cannot do syscall sigaction or rt_sigaction
-# endif
-/* Although rt_sigaction expects sizeof(sigset_t) - it expects the size
- * of the _kernel_ sigset_t which is not the same as the user sigset_t.
- * Most arches have this as _NSIG bits - mips has _KERNEL_NSIG bits for
- * some reason.
- */
-# ifdef _KERNEL_NSIG
-#  define _SSP_NSIG _KERNEL_NSIG
-# else
-#  define _SSP_NSIG _NSIG
-# endif
-#else
-# define _SSP_NSIG 0
-# define ENABLE_SSP_SMASH_DUMPS_CORE 0
-#endif
-
-/* Define DO_SIGACTION - default to newer rt signal interface but
- * fallback to old as needed.
- */
-#ifdef __NR_rt_sigaction
-# define DO_SIGACTION(signum, act, oldact) \
-	INLINE_SYSCALL(rt_sigaction, 4, signum, act, oldact, _SSP_NSIG/8)
-#else
-# define DO_SIGACTION(signum, act, oldact) \
-	INLINE_SYSCALL(sigaction, 3, signum, act, oldact)
-#endif
-
-/* Define DO_SOCKET/DO_CONNECT functions to deal with socketcall vs socket/connect */
-#if defined(__NR_socket) && defined(__NR_connect)
-# define USE_OLD_SOCKETCALL 0
-#else
-# define USE_OLD_SOCKETCALL 1
-#endif
-
-/* stub out the __NR_'s so we can let gcc optimize away dead code */
-#ifndef __NR_socketcall
-# define __NR_socketcall 0
-#endif
-#ifndef __NR_socket
-# define __NR_socket 0
-#endif
-#ifndef __NR_connect
-# define __NR_connect 0
-#endif
-#define DO_SOCKET(result, domain, type, protocol) \
-	do { \
-		if (USE_OLD_SOCKETCALL) { \
-			socketargs[0] = domain; \
-			socketargs[1] = type; \
-			socketargs[2] = protocol; \
-			socketargs[3] = 0; \
-			result = INLINE_SYSCALL(socketcall, 2, SOCKOP_socket, socketargs); \
-		} else \
-			result = INLINE_SYSCALL(socket, 3, domain, type, protocol); \
-	} while (0)
-#define DO_CONNECT(result, sockfd, serv_addr, addrlen) \
-	do { \
-		if (USE_OLD_SOCKETCALL) { \
-			socketargs[0] = sockfd; \
-			socketargs[1] = (unsigned long int)serv_addr; \
-			socketargs[2] = addrlen; \
-			socketargs[3] = 0; \
-			result = INLINE_SYSCALL(socketcall, 2, SOCKOP_connect, socketargs); \
-		} else \
-			result = INLINE_SYSCALL(connect, 3, sockfd, serv_addr, addrlen); \
-	} while (0)
-
-#ifndef _PATH_LOG
-# define _PATH_LOG "/dev/log"
-#endif
-
-static const char path_log[] = _PATH_LOG;
-
-/* For building glibc with SSP switched on, define __progname to a
- * constant if building for the run-time loader, to avoid pulling
- * in more of libc.so into ld.so
- */
-#ifdef IS_IN_rtld
-static char *__progname = "<rtld>";
-#else
-extern char *__progname;
-#endif
-
-/* Common handler code, used by chk_fail
- * Inlined to ensure no self-references to the handler within itself.
- * Data static to avoid putting more than necessary on the stack,
- * to aid core debugging.
- */
-__attribute__ ((__noreturn__ , __always_inline__))
-static inline void
-__hardened_gentoo_chk_fail(char func[], int damaged)
-{
-#define MESSAGE_BUFSIZ 256
-	static pid_t pid;
-	static int plen, i;
-	static char message[MESSAGE_BUFSIZ];
-	static const char msg_ssa[] = ": buffer overflow attack";
-	static const char msg_inf[] = " in function ";
-	static const char msg_ssd[] = "*** buffer overflow detected ***: ";
-	static const char msg_terminated[] = " - terminated\n";
-	static const char msg_report[] = "Report to http://bugs.gentoo.org/\n";
-	static const char msg_unknown[] = "<unknown>";
-	static int log_socket, connect_result;
-	static struct sockaddr_un sock;
-	static unsigned long int socketargs[4];
-
-	/* Build socket address
-	 */
-	sock.sun_family = AF_UNIX;
-	i = 0;
-	while ((path_log[i] != '\0') && (i<(sizeof(sock.sun_path)-1))) {
-		sock.sun_path[i] = path_log[i];
-		i++;
-	}
-	sock.sun_path[i] = '\0';
-
-	/* Try SOCK_DGRAM connection to syslog */
-	connect_result = -1;
-	DO_SOCKET(log_socket, AF_UNIX, SOCK_DGRAM, 0);
-	if (log_socket != -1)
-		DO_CONNECT(connect_result, log_socket, &sock, sizeof(sock));
-	if (connect_result == -1) {
-		if (log_socket != -1)
-			INLINE_SYSCALL(close, 1, log_socket);
-		/* Try SOCK_STREAM connection to syslog */
-		DO_SOCKET(log_socket, AF_UNIX, SOCK_STREAM, 0);
-		if (log_socket != -1)
-			DO_CONNECT(connect_result, log_socket, &sock, sizeof(sock));
-	}
-
-	/* Build message.  Messages are generated both in the old style and new style,
-	 * so that log watchers that are configured for the old-style message continue
-	 * to work.
-	 */
-#define strconcat(str) \
-		{i=0; while ((str[i] != '\0') && ((i+plen)<(MESSAGE_BUFSIZ-1))) \
-		{\
-			message[plen+i]=str[i];\
-			i++;\
-		}\
-		plen+=i;}
-
-	/* R.Henderson post-gcc-4 style message */
-	plen = 0;
-	strconcat(msg_ssd);
-	if (__progname != (char *)0)
-		strconcat(__progname)
-	else
-		strconcat(msg_unknown);
-	strconcat(msg_terminated);
-
-	/* Write out error message to STDERR, to syslog if open */
-	INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen);
-	if (connect_result != -1)
-		INLINE_SYSCALL(write, 3, log_socket, message, plen);
-
-	/* Dr. Etoh pre-gcc-4 style message */
-	plen = 0;
-	if (__progname != (char *)0)
-		strconcat(__progname)
-	else
-		strconcat(msg_unknown);
-	strconcat(msg_ssa);
-	strconcat(msg_inf);
-	if (func != NULL)
-		strconcat(func)
-	else
-		strconcat(msg_unknown);
-	strconcat(msg_terminated);
-	/* Write out error message to STDERR, to syslog if open */
-	INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen);
-	if (connect_result != -1)
-		INLINE_SYSCALL(write, 3, log_socket, message, plen);
-
-	/* Direct reports to bugs.gentoo.org */
-	plen=0;
-	strconcat(msg_report);
-	message[plen++]='\0';
-
-	/* Write out error message to STDERR, to syslog if open */
-	INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen);
-	if (connect_result != -1)
-		INLINE_SYSCALL(write, 3, log_socket, message, plen);
-
-	if (log_socket != -1)
-		INLINE_SYSCALL(close, 1, log_socket);
-
-	/* Suicide */
-	pid = INLINE_SYSCALL(getpid, 0);
-
-	if (ENABLE_SSP_SMASH_DUMPS_CORE) {
-		static struct sigaction default_abort_act;
-		/* Remove any user-supplied handler for SIGABRT, before using it */
-		default_abort_act.sa_handler = SIG_DFL;
-		default_abort_act.sa_sigaction = NULL;
-		__sigfillset(&default_abort_act.sa_mask);
-		default_abort_act.sa_flags = 0;
-		if (DO_SIGACTION(SIGABRT, &default_abort_act, NULL) == 0)
-			INLINE_SYSCALL(kill, 2, pid, SIGABRT);
-	}
-
-	/* Note; actions cannot be added to SIGKILL */
-	INLINE_SYSCALL(kill, 2, pid, SIGKILL);
-
-	/* In case the kill didn't work, exit anyway
-	 * The loop prevents gcc thinking this routine returns
-	 */
-	while (1)
-		INLINE_SYSCALL(exit, 0);
-}
-
-__attribute__ ((__noreturn__))
-void __chk_fail(void)
-{
-	__hardened_gentoo_chk_fail(NULL, 0);
-}
-

diff --git a/sys-libs/glibc/files/2.10/glibc-2.10-hardened-configure-picdefault.patch b/sys-libs/glibc/files/2.10/glibc-2.10-hardened-configure-picdefault.patch
deleted file mode 100644
index e75ccc7..0000000
--- a/sys-libs/glibc/files/2.10/glibc-2.10-hardened-configure-picdefault.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Prevent default-fPIE from confusing configure into thinking
-PIC code is default.  This causes glibc to build both PIC and
-non-PIC code as normal, which on the hardened compiler generates
-PIC and PIE.
-
-Patch by Kevin F. Quinn <kevquinn@g.o>
-Fixed for glibc 2.10 by Magnus Granberg <zorry@×××.nu>
-
---- configure.in
-+++ configure.in
-@@ -2145,7 +2145,7 @@
- # error PIC is default.
- #endif
- EOF
--if eval "${CC-cc} -S conftest.c 2>&AS_MESSAGE_LOG_FD 1>&AS_MESSAGE_LOG_FD"; then
-+if eval "${CC-cc} -fno-PIE -S conftest.c 2>&AS_MESSAGE_LOG_FD 1>&AS_MESSAGE_LOG_FD"; then
-   libc_cv_pic_default=no
- fi
- rm -f conftest.*])
---- configure
-+++ configure
-@@ -7698,7 +7698,7 @@
- # error PIC is default.
- #endif
- EOF
--if eval "${CC-cc} -S conftest.c 2>&5 1>&5"; then
-+if eval "${CC-cc} -fno-PIE -S conftest.c 2>&5 1>&5"; then
-   libc_cv_pic_default=no
- fi
- rm -f conftest.*

diff --git a/sys-libs/glibc/files/2.10/glibc-2.10-hardened-inittls-nosysenter.patch b/sys-libs/glibc/files/2.10/glibc-2.10-hardened-inittls-nosysenter.patch
deleted file mode 100644
index cb6d8e3..0000000
--- a/sys-libs/glibc/files/2.10/glibc-2.10-hardened-inittls-nosysenter.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-When building glibc PIE (which is not something upstream support),
-several modifications are necessary to the glibc build process.
-
-First, any syscalls in PIEs must be of the PIC variant, otherwise
-textrels ensue.  Then, any syscalls made before the initialisation
-of the TLS will fail on i386, as the sysenter variant on i386 uses
-the TLS, giving rise to a chicken-and-egg situation.  This patch
-defines a PIC syscall variant that doesn't use sysenter, even when the sysenter
-version is normally used, and uses the non-sysenter version for the brk
-syscall that is performed by the TLS initialisation.  Further, the TLS
-initialisation is moved in this case prior to the initialisation of
-dl_osversion, as that requires further syscalls.
-
-csu/libc-start.c: Move initial TLS initialization to before the
-initialisation of dl_osversion, when INTERNAL_SYSCALL_NOSYSENTER is defined
-
-csu/libc-tls.c: Use the no-sysenter version of sbrk when
-INTERNAL_SYSCALL_NOSYSENTER is defined.
-
-misc/sbrk.c: Define a no-sysenter version of sbrk, using the no-sysenter
-version of brk - if INTERNAL_SYSCALL_NOSYSENTER is defined.
-
-misc/brk.c: Define a no-sysenter version of brk if
-INTERNAL_SYSCALL_NOSYSENTER is defined.
-
-sysdeps/unix/sysv/linux/i386/sysdep.h: Define INTERNAL_SYSCALL_NOSYSENTER
-Make INTERNAL_SYSCALL always use the PIC variant, even if not SHARED.
-
-Patch by Kevin F. Quinn <kevquinn@g.o>
-Fixed for 2.10 by Magnus Granberg <zorry@×××.nu>
-
---- csu/libc-start.c
-+++ csu/libc-start.c
-@@ -28,6 +28,7 @@
- extern int __libc_multiple_libcs;
- 
- #include <tls.h>
-+#include <sysdep.h>
- #ifndef SHARED
- # include <dl-osinfo.h>
- extern void __pthread_initialize_minimal (void);
-@@ -129,6 +130,11 @@
- #  endif
-   _dl_aux_init (auxvec);
- # endif
-+# ifdef INTERNAL_SYSCALL_NOSYSENTER
-+  /* Do the initial TLS initialization before _dl_osversion,
-+     since the latter uses the uname syscall.  */
-+  __pthread_initialize_minimal ();
-+# endif
- # ifdef DL_SYSDEP_OSCHECK
-   if (!__libc_multiple_libcs)
-     {
-@@ -138,10 +144,12 @@
-     }
- # endif
- 
-+# ifndef INTERNAL_SYSCALL_NOSYSENTER
-   /* Initialize the thread library at least a bit since the libgcc
-      functions are using thread functions if these are available and
-      we need to setup errno.  */
-   __pthread_initialize_minimal ();
-+# endif
- 
-   /* Set up the stack checker's canary.  */
-   uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard ();
---- csu/libc-tls.c
-+++ csu/libc-tls.c
-@@ -23,6 +23,7 @@
- #include <unistd.h>
- #include <stdio.h>
- #include <sys/param.h>
-+#include <sysdep.h>
- 
- 
- #ifdef SHARED
-@@ -29,6 +30,9 @@
-  #error makefile bug, this file is for static only
- #endif
- 
-+#ifdef INTERNAL_SYSCALL_NOSYSENTER
-+extern void *__sbrk_nosysenter (intptr_t __delta);
-+#endif
- extern ElfW(Phdr) *_dl_phdr;
- extern size_t _dl_phnum;
- 
-@@ -141,14 +145,26 @@
- 
-      The initialized value of _dl_tls_static_size is provided by dl-open.c
-      to request some surplus that permits dynamic loading of modules with
--     IE-model TLS.  */
-+     IE-model TLS.
-+     
-+     Where the normal sbrk would use a syscall that needs the TLS (i386)
-+     use the special non-sysenter version instead.  */
- #if TLS_TCB_AT_TP
-   tcb_offset = roundup (memsz + GL(dl_tls_static_size), tcbalign);
-+# ifdef INTERNAL_SYSCALL_NOSYSENTER
-+  tlsblock = __sbrk_nosysenter (tcb_offset + tcbsize + max_align);
-+# else
-   tlsblock = __sbrk (tcb_offset + tcbsize + max_align);
-+# endif
- #elif TLS_DTV_AT_TP
-   tcb_offset = roundup (tcbsize, align ?: 1);
-+# ifdef INTERNAL_SYSCALL_NOSYSENTER
-+  tlsblock = __sbrk_nosysenter (tcb_offset + memsz + max_align
-+		     + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size));
-+# else
-   tlsblock = __sbrk (tcb_offset + memsz + max_align
- 		     + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size));
-+# endif
-   tlsblock += TLS_PRE_TCB_SIZE;
- #else
-   /* In case a model with a different layout for the TCB and DTV
---- misc/sbrk.c
-+++ misc/sbrk.c
-@@ -18,6 +18,7 @@
- #include <errno.h>
- #include <stdint.h>
- #include <unistd.h>
-+#include <sysdep.h>
- 
- /* Defined in brk.c.  */
- extern void *__curbrk;
-@@ -29,6 +30,35 @@
- /* Extend the process's data space by INCREMENT.
-    If INCREMENT is negative, shrink data space by - INCREMENT.
-    Return start of new space allocated, or -1 for errors.  */
-+#ifdef INTERNAL_SYSCALL_NOSYSENTER
-+/* This version is used by csu/libc-tls.c whem initialising the TLS
-+   if the SYSENTER version requires the TLS (which it does on i386).
-+   Obviously using the TLS before it is initialised is broken. */
-+extern int __brk_nosysenter (void *addr);
-+void *
-+__sbrk_nosysenter (intptr_t increment)
-+{
-+  void *oldbrk;
-+
-+  /* If this is not part of the dynamic library or the library is used
-+     via dynamic loading in a statically linked program update
-+     __curbrk from the kernel's brk value.  That way two separate
-+     instances of __brk and __sbrk can share the heap, returning
-+     interleaved pieces of it.  */
-+  if (__curbrk == NULL || __libc_multiple_libcs)
-+    if (__brk_nosysenter (0) < 0)		/* Initialize the break.  */
-+      return (void *) -1;
-+
-+  if (increment == 0)
-+    return __curbrk;
-+
-+  oldbrk = __curbrk;
-+  if (__brk_nosysenter (oldbrk + increment) < 0)
-+    return (void *) -1;
-+
-+  return oldbrk;
-+}
-+#endif
- void *
- __sbrk (intptr_t increment)
- {
---- sysdeps/unix/sysv/linux/i386/brk.c
-+++ sysdeps/unix/sysv/linux/i386/brk.c
-@@ -31,6 +31,30 @@
-    linker.  */
- weak_alias (__curbrk, ___brk_addr)
- 
-+#ifdef INTERNAL_SYSCALL_NOSYSENTER
-+/* This version is used by csu/libc-tls.c whem initialising the TLS
-+ * if the SYSENTER version requires the TLS (which it does on i386).
-+ * Obviously using the TLS before it is initialised is broken. */
-+int
-+__brk_nosysenter (void *addr)
-+{
-+  void *__unbounded newbrk;
-+
-+  INTERNAL_SYSCALL_DECL (err);
-+  newbrk = (void *__unbounded) INTERNAL_SYSCALL_NOSYSENTER (brk, err, 1,
-+						 __ptrvalue (addr));
-+
-+  __curbrk = newbrk;
-+
-+  if (newbrk < addr)
-+    {
-+      __set_errno (ENOMEM);
-+      return -1;
-+    }
-+
-+  return 0;
-+}
-+#endif
- int
- __brk (void *addr)
- {
---- sysdeps/unix/sysv/linux/i386/sysdep.h
-+++ sysdeps/unix/sysv/linux/i386/sysdep.h
-@@ -187,7 +187,7 @@
- /* The original calling convention for system calls on Linux/i386 is
-    to use int $0x80.  */
- #ifdef I386_USE_SYSENTER
--# ifdef SHARED
-+# if defined SHARED || defined __PIC__
- #  define ENTER_KERNEL call *%gs:SYSINFO_OFFSET
- # else
- #  define ENTER_KERNEL call *_dl_sysinfo
-@@ -358,7 +358,7 @@
-    possible to use more than four parameters.  */
- #undef INTERNAL_SYSCALL
- #ifdef I386_USE_SYSENTER
--# ifdef SHARED
-+# if defined SHARED || defined __PIC__
- #  define INTERNAL_SYSCALL(name, err, nr, args...) \
-   ({									      \
-     register unsigned int resultvar;					      \
-@@ -384,6 +384,18 @@
-     : "0" (name), "i" (offsetof (tcbhead_t, sysinfo))			      \
-       ASMFMT_##nr(args) : "memory", "cc");				      \
-     (int) resultvar; })
-+#  define INTERNAL_SYSCALL_NOSYSENTER(name, err, nr, args...) \
-+  ({									      \
-+    register unsigned int resultvar;					      \
-+    EXTRAVAR_##nr							      \
-+    asm volatile (							      \
-+    LOADARGS_NOSYSENTER_##nr						      \
-+    "movl %1, %%eax\n\t"						      \
-+    "int $0x80\n\t"							      \
-+    RESTOREARGS_NOSYSENTER_##nr						      \
-+    : "=a" (resultvar)							      \
-+    : "i" (__NR_##name) ASMFMT_##nr(args) : "memory", "cc");		      \
-+    (int) resultvar; })
- # else
- #  define INTERNAL_SYSCALL(name, err, nr, args...) \
-   ({									      \
-@@ -447,12 +459,20 @@
- 
- #define LOADARGS_0
- #ifdef __PIC__
--# if defined I386_USE_SYSENTER && defined SHARED
-+# if defined I386_USE_SYSENTER && ( defined SHARED || defined __PIC__ )
- #  define LOADARGS_1 \
-     "bpushl .L__X'%k3, %k3\n\t"
- #  define LOADARGS_5 \
-     "movl %%ebx, %4\n\t"						      \
-     "movl %3, %%ebx\n\t"
-+#  define LOADARGS_NOSYSENTER_1 \
-+    "bpushl .L__X'%k2, %k2\n\t"
-+#  define LOADARGS_NOSYSENTER_2	LOADARGS_NOSYSENTER_1
-+#  define LOADARGS_NOSYSENTER_3	LOADARGS_3
-+#  define LOADARGS_NOSYSENTER_4	LOADARGS_3
-+#  define LOADARGS_NOSYSENTER_5 \
-+    "movl %%ebx, %3\n\t"						      \
-+    "movl %2, %%ebx\n\t"
- # else
- #  define LOADARGS_1 \
-     "bpushl .L__X'%k2, %k2\n\t"
-@@ -474,11 +495,18 @@
- 
- #define RESTOREARGS_0
- #ifdef __PIC__
--# if defined I386_USE_SYSENTER && defined SHARED
-+# if defined I386_USE_SYSENTER && ( defined SHARED || defined __PIC__ )
- #  define RESTOREARGS_1 \
-     "bpopl .L__X'%k3, %k3\n\t"
- #  define RESTOREARGS_5 \
-     "movl %4, %%ebx"
-+#  define RESTOREARGS_NOSYSENTER_1 \
-+    "bpopl .L__X'%k2, %k2\n\t"
-+#  define RESTOREARGS_NOSYSENTER_2	RESTOREARGS_NOSYSENTER_1
-+#  define RESTOREARGS_NOSYSENTER_3	RESTOREARGS_3
-+#  define RESTOREARGS_NOSYSENTER_4	RESTOREARGS_3
-+#  define RESTOREARGS_NOSYSENTER_5 \
-+    "movl %3, %%ebx"
- # else
- #  define RESTOREARGS_1 \
-     "bpopl .L__X'%k2, %k2\n\t"

diff --git a/sys-libs/glibc/files/2.10/glibc-2.10-hardened-ssp-compat.patch b/sys-libs/glibc/files/2.10/glibc-2.10-hardened-ssp-compat.patch
deleted file mode 100644
index a1c9eef..0000000
--- a/sys-libs/glibc/files/2.10/glibc-2.10-hardened-ssp-compat.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-Add backwards compat support for gcc-3.x ssp ... older ssp versions
-used __guard and __stack_smash_handler symbols while gcc-4.1 and newer
-uses __stack_chk_guard and __stack_chk_fail.
-
---- config.h.in
-+++ config.h.in
-@@ -42,6 +42,9 @@
-    assembler instructions per line.  Default is `;'  */
- #undef ASM_LINE_SEP
- 
-+/* Define if we want to enable support for old ssp symbols */
-+#undef	ENABLE_OLD_SSP_COMPAT
-+
- /* Define if not using ELF, but `.init' and `.fini' sections are available.  */
- #undef	HAVE_INITFINI
- 
---- configure
-+++ configure
-@@ -1378,6 +1378,9 @@ Optional Features:
-   --enable-kernel=VERSION compile for compatibility with kernel not older than
-                           VERSION
-   --enable-all-warnings   enable all useful warnings gcc can issue
-+  --disable-old-ssp-compat
-+                          enable support for older ssp symbols
-+                          [default=no]
-   --enable-multi-arch     enable single DSO with optimizations for multiple
-                           architectures
-   --enable-experimental-malloc
-@@ -6462,6 +6465,20 @@ fi
- $as_echo "$libc_cv_ssp" >&6; }
- 
- 
-+# Check whether --enable-old-ssp-compat or --disable-old-ssp-compat was given.
-+if test "${enable_old_ssp_compat+set}" = set; then
-+  enableval="$enable_old_ssp_compat"
-+  enable_old_ssp_compat=$enableval
-+else
-+  enable_old_ssp_compat=no
-+fi;
-+if test "x$enable_old_ssp_compat" = "xyes"; then
-+  cat >>confdefs.h <<\_ACEOF
-+#define ENABLE_OLD_SSP_COMPAT 1
-+_ACEOF
-+
-+fi
-+
- { $as_echo "$as_me:$LINENO: checking for -fgnu89-inline" >&5
- $as_echo_n "checking for -fgnu89-inline... " >&6; }
- if test "${libc_cv_gnu89_inline+set}" = set; then
---- configure.in
-+++ configure.in
-@@ -1641,6 +1641,15 @@ fi
- rm -f conftest*])
- AC_SUBST(libc_cv_ssp)
- 
-+AC_ARG_ENABLE([old-ssp-compat],
-+	      AC_HELP_STRING([--enable-old-ssp-compat],
-+	                     [enable support for older ssp symbols @<:@default=no@:>@]),
-+	      [enable_old_ssp_compat=$enableval],
-+	      [enable_old_ssp_compat=no])
-+if test "x$enable_old_ssp_compat" = "xyes"; then
-+  AC_DEFINE(ENABLE_OLD_SSP_COMPAT)
-+fi
-+
- AC_CACHE_CHECK(for -fgnu89-inline, libc_cv_gnu89_inline, [dnl
- cat > conftest.c <<EOF
- int foo;
---- csu/libc-start.c
-+++ csu/libc-start.c
-@@ -37,6 +37,9 @@ extern void __pthread_initialize_minimal
- uintptr_t __stack_chk_guard attribute_relro;
- # endif
- #endif
-+#ifdef ENABLE_OLD_SSP_COMPAT
-+uintptr_t __guard attribute_relro;
-+#endif
- 
- #ifdef HAVE_PTR_NTHREADS
- /* We need atomic operations.  */
-@@ -141,6 +145,9 @@ LIBC_START_MAIN (int (*main) (int, char 
- 
-   /* Set up the stack checker's canary.  */
-   uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard (_dl_random);
-+#ifdef ENABLE_OLD_SSP_COMPAT
-+  __guard = stack_chk_guard;
-+#endif
- # ifdef THREAD_SET_STACK_GUARD
-   THREAD_SET_STACK_GUARD (stack_chk_guard);
- # else
---- csu/Versions
-+++ csu/Versions
-@@ -17,6 +17,12 @@ libc {
-     # New special glibc functions.
-     gnu_get_libc_release; gnu_get_libc_version;
-   }
-+  GLIBC_2.3.2 {
-+%ifdef ENABLE_OLD_SSP_COMPAT
-+    # global objects and functions for the old propolice patch in gcc
-+    __guard;
-+%endif
-+  }
-   GLIBC_PRIVATE {
- %if HAVE___THREAD
-     # This version is for the TLS symbol, GLIBC_2.0 is the old object symbol.
---- debug/Versions
-+++ debug/Versions
-@@ -10,6 +10,12 @@ libc {
-     # These are to support some gcc features.
-     __cyg_profile_func_enter; __cyg_profile_func_exit;
-   }
-+%ifdef ENABLE_OLD_SSP_COMPAT
-+  GLIBC_2.3.2 {
-+    # backwards ssp compat support; alias to __stack_chk_fail
-+    __stack_smash_handler;
-+  }
-+%endif
-   GLIBC_2.3.4 {
-     __chk_fail;
-     __memcpy_chk; __memmove_chk; __mempcpy_chk; __memset_chk; __stpcpy_chk;
---- elf/rtld.c
-+++ elf/rtld.c
-@@ -89,6 +89,9 @@ INTDEF(_dl_argv)
-    in thread local area.  */
- uintptr_t __stack_chk_guard attribute_relro;
- #endif
-+#ifdef ENABLE_OLD_SSP_COMPAT
-+uintptr_t __guard attribute_relro;
-+#endif
- 
- /* Only exported for architectures that don't store the pointer guard
-    value in thread local area.  */
-@@ -1817,6 +1821,9 @@ ERROR: ld.so: object '%s' cannot be load
- 
-   /* Set up the stack checker's canary.  */
-   uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard (_dl_random);
-+#ifdef ENABLE_OLD_SSP_COMPAT
-+  __guard = stack_chk_guard;
-+#endif
- #ifdef THREAD_SET_STACK_GUARD
-   THREAD_SET_STACK_GUARD (stack_chk_guard);
- #else
---- elf/Versions
-+++ elf/Versions
-@@ -43,6 +43,12 @@ ld {
-     # runtime interface to TLS
-     __tls_get_addr;
-   }
-+%ifdef ENABLE_OLD_SSP_COMPAT
-+  GLIBC_2.3.2 {
-+    # backwards ssp compat support
-+    __guard;
-+  }
-+%endif
-   GLIBC_2.4 {
-     # stack canary
-     __stack_chk_guard;
---- Versions.def
-+++ Versions.def
-@@ -109,6 +109,9 @@ ld {
-   GLIBC_2.0
-   GLIBC_2.1
-   GLIBC_2.3
-+%ifdef ENABLE_OLD_SSP_COMPAT
-+  GLIBC_2.3.2
-+%endif
-   GLIBC_2.4
-   GLIBC_PRIVATE
- }

diff --git a/sys-libs/glibc/files/2.11/glibc-2.11-hardened-pie.patch b/sys-libs/glibc/files/2.11/glibc-2.11-hardened-pie.patch
deleted file mode 100644
index df7292f..0000000
--- a/sys-libs/glibc/files/2.11/glibc-2.11-hardened-pie.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-http://bugs.gentoo.org/292139
-
-2009-11-08  Magnus Granberg  <zorry@×××.nu>
-
-	* Makeconfig (+link): Set to +link-pie.
-	(+link-static): Change $(static-start-installed-name) to
-	S$(static-start-installed-name).
-	(+prector): Set to +prectorS.
-	(+postctor): Set to +postctorS.
-
---- libc/Makeconfig
-+++ libc/Makeconfig
-@@ -447,11 +447,12 @@
- 	     $(common-objpfx)libc% $(+postinit),$^) \
- 	     $(link-extra-libs) $(link-libc) $(+postctorS) $(+postinit)
- endif
-++link = $(+link-pie)
- # Command for statically linking programs with the C library.
- ifndef +link-static
- +link-static = $(CC) -nostdlib -nostartfiles -static -o $@ \
- 	      $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F))  \
--	      $(addprefix $(csu-objpfx),$(static-start-installed-name)) \
-+	      $(addprefix $(csu-objpfx),S$(static-start-installed-name)) \
- 	      $(+preinit) $(+prector) \
- 	      $(filter-out $(addprefix $(csu-objpfx),start.o \
- 						     $(start-installed-name))\
-@@ -549,11 +550,10 @@
- ifeq ($(elf),yes)
- +preinit = $(addprefix $(csu-objpfx),crti.o)
- +postinit = $(addprefix $(csu-objpfx),crtn.o)
--+prector = `$(CC) --print-file-name=crtbegin.o`
--+postctor = `$(CC) --print-file-name=crtend.o`
--# Variants of the two previous definitions for linking PIE programs.
- +prectorS = `$(CC) --print-file-name=crtbeginS.o`
- +postctorS = `$(CC) --print-file-name=crtendS.o`
-++prector = $(+prectorS)
-++postctor = $(+postctorS)
- +interp = $(addprefix $(elf-objpfx),interp.os)
- endif
- csu-objpfx = $(common-objpfx)csu/

diff --git a/sys-libs/glibc/files/2.12/glibc-2.12-hardened-pie.patch b/sys-libs/glibc/files/2.12/glibc-2.12-hardened-pie.patch
deleted file mode 100644
index 3315171..0000000
--- a/sys-libs/glibc/files/2.12/glibc-2.12-hardened-pie.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-2010-08-11  Magnus Granberg  <zorry@×××.nu>
-
-	#332331
-	* Makeconfig (+link): Set to +link-pie.
-	(+link-static): Change $(static-start-installed-name) to
-	S$(static-start-installed-name).
-	(+prector): Set to +prectorS.
-	(+postctor): Set to +postctorS.
-
---- libc/Makeconfig
-+++ libc/Makeconfig
-@@ -447,11 +447,12 @@
- 	     $(common-objpfx)libc% $(+postinit),$^) \
- 	     $(link-extra-libs) $(link-libc) $(+postctorS) $(+postinit)
- endif
-++link = $(+link-pie)
- # Command for statically linking programs with the C library.
- ifndef +link-static
- +link-static = $(CC) -nostdlib -nostartfiles -static -o $@ \
- 	      $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F))  \
--	      $(addprefix $(csu-objpfx),$(static-start-installed-name)) \
-+	      $(addprefix $(csu-objpfx),S$(static-start-installed-name)) \
- 	      $(+preinit) $(+prector) \
- 	      $(filter-out $(addprefix $(csu-objpfx),start.o \
- 						     $(start-installed-name))\
-@@ -549,11 +550,10 @@
- ifeq ($(elf),yes)
- +preinit = $(addprefix $(csu-objpfx),crti.o)
- +postinit = $(addprefix $(csu-objpfx),crtn.o)
--+prector = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbegin.o`
--+postctor = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtend.o`
--# Variants of the two previous definitions for linking PIE programs.
- +prectorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbeginS.o`
- +postctorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtendS.o`
-++prector = $(+prectorS)
-++postctor = $(+postctorS)
- +interp = $(addprefix $(elf-objpfx),interp.os)
- endif
- csu-objpfx = $(common-objpfx)csu/

diff --git a/sys-libs/glibc/files/2.15/glibc-2.15-localstatedir-backport.patch b/sys-libs/glibc/files/2.15/glibc-2.15-localstatedir-backport.patch
deleted file mode 100644
index 5f8f15a..0000000
--- a/sys-libs/glibc/files/2.15/glibc-2.15-localstatedir-backport.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: work/glibc-2.15/Makeconfig
-===================================================================
---- work.orig/glibc-2.15/Makeconfig
-+++ work/glibc-2.15/Makeconfig
-@@ -293,7 +293,7 @@ inst_sysconfdir = $(install_root)$(sysco
- 
- # Directory for the database files and Makefile for nss_db.
- ifndef vardbdir
--vardbdir = /var/db
-+vardbdir = $(prefix)/var/db
- endif
- inst_vardbdir = $(install_root)$(vardbdir)
- 

diff --git a/sys-libs/glibc/files/2.16/glibc-2.16-hardened-pie.patch b/sys-libs/glibc/files/2.16/glibc-2.16-hardened-pie.patch
deleted file mode 100644
index a850a61..0000000
--- a/sys-libs/glibc/files/2.16/glibc-2.16-hardened-pie.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-2012-11-11  Magnus Granberg  <zorry@g.o>
-
-	#442712
-	* Makeconfig (+link): Set to +link-pie.
-	(+link-static-before-libc): Change $(static-start-installed-name) to
-	S$(static-start-installed-name).
-	(+prector): Set to +prectorS.
-	(+postctor): Set to +postctorS.
-
---- libc/Makeconfig
-+++ libc/Makeconfig
-@@ -447,11 +447,12 @@
- 	     $(common-objpfx)libc% $(+postinit),$^) \
- 	     $(link-extra-libs) $(link-libc) $(+postctorS) $(+postinit)
- endif
-++link = $(+link-pie)
- # Command for statically linking programs with the C library.
- ifndef +link-static
- +link-static-before-libc = $(CC) -nostdlib -nostartfiles -static -o $@ \
- 	      $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F))  \
--	      $(addprefix $(csu-objpfx),$(static-start-installed-name)) \
-+	      $(addprefix $(csu-objpfx),S$(static-start-installed-name)) \
- 	      $(+preinit) $(+prector) \
- 	      $(filter-out $(addprefix $(csu-objpfx),start.o \
- 						     $(start-installed-name))\
-@@ -549,11 +550,10 @@
- ifeq ($(elf),yes)
- +preinit = $(addprefix $(csu-objpfx),crti.o)
- +postinit = $(addprefix $(csu-objpfx),crtn.o)
--+prector = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbegin.o`
--+postctor = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtend.o`
--# Variants of the two previous definitions for linking PIE programs.
- +prectorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbeginS.o`
- +postctorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtendS.o`
-++prector = $(+prectorS)
-++postctor = $(+postctorS)
- +interp = $(addprefix $(elf-objpfx),interp.os)
- endif
- csu-objpfx = $(common-objpfx)csu/

diff --git a/sys-libs/glibc/files/2.17/glibc-2.17-hardened-pie.patch b/sys-libs/glibc/files/2.17/glibc-2.17-hardened-pie.patch
deleted file mode 100644
index da4fb82..0000000
--- a/sys-libs/glibc/files/2.17/glibc-2.17-hardened-pie.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-2012-11-11  Magnus Granberg  <zorry@g.o>
-
-	#442712
-	* Makeconfig (+link): Set to +link-pie.
-	(+link-static-before-libc): Change $(static-start-installed-name) to
-	S$(static-start-installed-name).
-	(+prector): Set to +prectorS.
-	(+postctor): Set to +postctorS.
-
---- libc/Makeconfig
-+++ libc/Makeconfig
-@@ -447,11 +447,12 @@
- 	     $(common-objpfx)libc% $(+postinit),$^) \
- 	     $(link-extra-libs) $(link-libc) $(+postctorS) $(+postinit)
- endif
-++link = $(+link-pie)
- # Command for statically linking programs with the C library.
- ifndef +link-static
- +link-static-before-libc = $(CC) -nostdlib -nostartfiles -static -o $@ \
- 	      $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F))  \
--	      $(addprefix $(csu-objpfx),$(static-start-installed-name)) \
-+	      $(addprefix $(csu-objpfx),S$(static-start-installed-name)) \
- 	      $(+preinit) $(+prectorT) \
- 	      $(filter-out $(addprefix $(csu-objpfx),start.o \
- 						     $(start-installed-name))\
-@@ -549,11 +550,10 @@
- ifeq ($(elf),yes)
- +preinit = $(addprefix $(csu-objpfx),crti.o)
- +postinit = $(addprefix $(csu-objpfx),crtn.o)
--+prector = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbegin.o`
--+postctor = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtend.o`
--# Variants of the two previous definitions for linking PIE programs.
- +prectorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbeginS.o`
- +postctorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtendS.o`
-++prector = $(+prectorS)
-++postctor = $(+postctorS)
- # Variants of the two previous definitions for statically linking programs.
- +prectorT = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbeginT.o`
- +postctorT = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtend.o`
- +interp = $(addprefix $(elf-objpfx),interp.os)
- endif
- csu-objpfx = $(common-objpfx)csu/

diff --git a/sys-libs/glibc/files/2.17/glibc-2.17-runtime-prefix.patch b/sys-libs/glibc/files/2.17/glibc-2.17-runtime-prefix.patch
deleted file mode 100644
index 8fc683d..0000000
--- a/sys-libs/glibc/files/2.17/glibc-2.17-runtime-prefix.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-Index: glibc-2.19/sysdeps/generic/paths.h
-===================================================================
---- glibc-2.19.orig/sysdeps/generic/paths.h
-+++ glibc-2.19/sysdeps/generic/paths.h
-@@ -33,43 +33,43 @@
- #define	_PATHS_H_
- 
- /* Default search path. */
--#define	_PATH_DEFPATH	"/usr/bin:/bin"
-+#define	_PATH_DEFPATH	"@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/bin"
- /* All standard utilities path. */
- #define	_PATH_STDPATH \
--	"/usr/bin:/bin:/usr/sbin:/sbin"
-+	"@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/bin:@GENTOO_PORTAGE_EPREFIX@/usr/sbin:@GENTOO_PORTAGE_EPREFIX@/sbin"
- 
--#define	_PATH_BSHELL	"/bin/sh"
-+#define	_PATH_BSHELL	"@GENTOO_PORTAGE_EPREFIX@/bin/sh"
- #define	_PATH_CONSOLE	"/dev/console"
--#define	_PATH_CSHELL	"/bin/csh"
--#define	_PATH_DEVDB	"/var/run/dev.db"
-+#define	_PATH_CSHELL	"@GENTOO_PORTAGE_EPREFIX@/bin/csh"
-+#define	_PATH_DEVDB	"@GENTOO_PORTAGE_EPREFIX@/var/run/dev.db"
- #define	_PATH_DEVNULL	"/dev/null"
- #define	_PATH_DRUM	"/dev/drum"
--#define	_PATH_GSHADOW	"/etc/gshadow"
-+#define	_PATH_GSHADOW	"@GENTOO_PORTAGE_EPREFIX@/etc/gshadow"
- #define	_PATH_KMEM	"/dev/kmem"
--#define	_PATH_LASTLOG	"/var/log/lastlog"
-+#define	_PATH_LASTLOG	"@GENTOO_PORTAGE_EPREFIX@/var/log/lastlog"
- #define	_PATH_MAILDIR	"/var/mail"
--#define	_PATH_MAN	"/usr/share/man"
-+#define	_PATH_MAN	"@GENTOO_PORTAGE_EPREFIX@/usr/share/man"
- #define	_PATH_MEM	"/dev/mem"
--#define	_PATH_MNTTAB	"/etc/fstab"
--#define	_PATH_MOUNTED	"/var/run/mtab"
--#define	_PATH_NOLOGIN	"/etc/nologin"
--#define	_PATH_PRESERVE	"/var/lib"
--#define	_PATH_RWHODIR	"/var/spool/rwho"
--#define	_PATH_SENDMAIL	"/usr/sbin/sendmail"
--#define	_PATH_SHADOW	"/etc/shadow"
--#define	_PATH_SHELLS	"/etc/shells"
-+#define	_PATH_MNTTAB	"@GENTOO_PORTAGE_EPREFIX@/etc/fstab"
-+#define	_PATH_MOUNTED	"@GENTOO_PORTAGE_EPREFIX@/var/run/mtab"
-+#define	_PATH_NOLOGIN	"@GENTOO_PORTAGE_EPREFIX@/etc/nologin"
-+#define	_PATH_PRESERVE	"@GENTOO_PORTAGE_EPREFIX@/var/lib"
-+#define	_PATH_RWHODIR	"@GENTOO_PORTAGE_EPREFIX@/var/spool/rwho"
-+#define	_PATH_SENDMAIL	"@GENTOO_PORTAGE_EPREFIX@/usr/sbin/sendmail"
-+#define	_PATH_SHADOW	"@GENTOO_PORTAGE_EPREFIX@/etc/shadow"
-+#define	_PATH_SHELLS	"@GENTOO_PORTAGE_EPREFIX@/etc/shells"
- #define	_PATH_TTY	"/dev/tty"
- #define	_PATH_UNIX	"/vmunix"
--#define	_PATH_UTMP	"/var/run/utmp"
--#define	_PATH_UTMP_DB	"/var/run/utmp.db"
--#define	_PATH_VI	"/usr/bin/vi"
-+#define	_PATH_UTMP	"@GENTOO_PORTAGE_EPREFIX@/var/run/utmp"
-+#define	_PATH_UTMP_DB	"@GENTOO_PORTAGE_EPREFIX@/var/run/utmp.db"
-+#define	_PATH_VI	"@GENTOO_PORTAGE_EPREFIX@/usr/bin/vi"
- #define	_PATH_WTMP	"/var/log/wtmp"
- 
- /* Provide trailing slash, since mostly used for building pathnames. */
- #define	_PATH_DEV	"/dev/"
- #define	_PATH_TMP	"/tmp/"
--#define	_PATH_VARDB	"/var/db/"
--#define	_PATH_VARRUN	"/var/run/"
-+#define	_PATH_VARDB	"@GENTOO_PORTAGE_EPREFIX@/var/db/"
-+#define	_PATH_VARRUN	"@GENTOO_PORTAGE_EPREFIX@/var/run/"
- #define	_PATH_VARTMP	"/var/tmp/"
- 
- #endif /* !_PATHS_H_ */
-Index: glibc-2.19/sysdeps/unix/sysv/linux/paths.h
-===================================================================
---- glibc-2.19.orig/sysdeps/unix/sysv/linux/paths.h
-+++ glibc-2.19/sysdeps/unix/sysv/linux/paths.h
-@@ -33,43 +33,43 @@
- #define	_PATHS_H_
- 
- /* Default search path. */
--#define	_PATH_DEFPATH	"/usr/bin:/bin"
-+#define	_PATH_DEFPATH	"@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/bin"
- /* All standard utilities path. */
- #define	_PATH_STDPATH \
--	"/usr/bin:/bin:/usr/sbin:/sbin"
-+	"@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/bin:@GENTOO_PORTAGE_EPREFIX@/usr/sbin:@GENTOO_PORTAGE_EPREFIX@/sbin"
- 
--#define	_PATH_BSHELL	"/bin/sh"
-+#define	_PATH_BSHELL	"@GENTOO_PORTAGE_EPREFIX@/bin/sh"
- #define	_PATH_CONSOLE	"/dev/console"
--#define	_PATH_CSHELL	"/bin/csh"
--#define	_PATH_DEVDB	"/var/run/dev.db"
-+#define	_PATH_CSHELL	"@GENTOO_PORTAGE_EPREFIX@/bin/csh"
-+#define	_PATH_DEVDB	"@GENTOO_PORTAGE_EPREFIX@/var/run/dev.db"
- #define	_PATH_DEVNULL	"/dev/null"
- #define	_PATH_DRUM	"/dev/drum"
--#define	_PATH_GSHADOW	"/etc/gshadow"
-+#define	_PATH_GSHADOW	"@GENTOO_PORTAGE_EPREFIX@/etc/gshadow"
- #define	_PATH_KLOG	"/proc/kmsg"
- #define	_PATH_KMEM	"/dev/kmem"
- #define	_PATH_LASTLOG	"/var/log/lastlog"
- #define	_PATH_MAILDIR	"/var/mail"
--#define	_PATH_MAN	"/usr/share/man"
-+#define	_PATH_MAN	"@GENTOO_PORTAGE_EPREFIX@/usr/share/man"
- #define	_PATH_MEM	"/dev/mem"
--#define	_PATH_MNTTAB	"/etc/fstab"
--#define	_PATH_MOUNTED	"/etc/mtab"
--#define	_PATH_NOLOGIN	"/etc/nologin"
--#define	_PATH_PRESERVE	"/var/lib"
--#define	_PATH_RWHODIR	"/var/spool/rwho"
--#define	_PATH_SENDMAIL	"/usr/sbin/sendmail"
--#define	_PATH_SHADOW	"/etc/shadow"
--#define	_PATH_SHELLS	"/etc/shells"
-+#define	_PATH_MNTTAB	"@GENTOO_PORTAGE_EPREFIX@/etc/fstab"
-+#define	_PATH_MOUNTED	"@GENTOO_PORTAGE_EPREFIX@/etc/mtab"
-+#define	_PATH_NOLOGIN	"@GENTOO_PORTAGE_EPREFIX@/etc/nologin"
-+#define	_PATH_PRESERVE	"@GENTOO_PORTAGE_EPREFIX@/var/lib"
-+#define	_PATH_RWHODIR	"@GENTOO_PORTAGE_EPREFIX@/var/spool/rwho"
-+#define	_PATH_SENDMAIL	"@GENTOO_PORTAGE_EPREFIX@/usr/sbin/sendmail"
-+#define	_PATH_SHADOW	"@GENTOO_PORTAGE_EPREFIX@/etc/shadow"
-+#define	_PATH_SHELLS	"@GENTOO_PORTAGE_EPREFIX@/etc/shells"
- #define	_PATH_TTY	"/dev/tty"
- #define	_PATH_UNIX	"/boot/vmlinux"
--#define	_PATH_UTMP	"/var/run/utmp"
--#define	_PATH_VI	"/usr/bin/vi"
-+#define	_PATH_UTMP	"@GENTOO_PORTAGE_EPREFIX@/var/run/utmp"
-+#define	_PATH_VI	"@GENTOO_PORTAGE_EPREFIX@/usr/bin/vi"
- #define	_PATH_WTMP	"/var/log/wtmp"
- 
- /* Provide trailing slash, since mostly used for building pathnames. */
- #define	_PATH_DEV	"/dev/"
- #define	_PATH_TMP	"/tmp/"
--#define	_PATH_VARDB	"/var/db/"
--#define	_PATH_VARRUN	"/var/run/"
-+#define	_PATH_VARDB	"@GENTOO_PORTAGE_EPREFIX@/var/db/"
-+#define	_PATH_VARRUN	"@GENTOO_PORTAGE_EPREFIX@/var/run/"
- #define	_PATH_VARTMP	"/var/tmp/"
- 
- #endif /* !_PATHS_H_ */
-Index: glibc-2.19/sysdeps/posix/system.c
-===================================================================
---- glibc-2.19.orig/sysdeps/posix/system.c
-+++ glibc-2.19/sysdeps/posix/system.c
-@@ -26,7 +26,7 @@
- #include <sysdep-cancel.h>
- 
- 
--#define	SHELL_PATH	"/bin/sh"	/* Path of the shell.  */
-+#define	SHELL_PATH	"@GENTOO_PORTAGE_EPREFIX@/bin/sh"	/* Path of the shell.  */
- #define	SHELL_NAME	"sh"		/* Name to give it.  */
- 
- 
-Index: glibc-2.19/libio/iopopen.c
-===================================================================
---- glibc-2.19.orig/libio/iopopen.c
-+++ glibc-2.19/libio/iopopen.c
-@@ -222,7 +222,7 @@ _IO_new_proc_open (fp, command, mode)
- 	    _IO_close (fd);
- 	}
- 
--      _IO_execl ("/bin/sh", "sh", "-c", command, (char *) 0);
-+      _IO_execl ("@GENTOO_PORTAGE_EPREFIX@/bin/sh", "sh", "-c", command, (char *) 0);
-       _IO__exit (127);
-     }
-   _IO_close (child_end);

diff --git a/sys-libs/glibc/files/2.17/glibc-2.17-shadow-prefix.patch b/sys-libs/glibc/files/2.17/glibc-2.17-shadow-prefix.patch
deleted file mode 100644
index 0e3979c..0000000
--- a/sys-libs/glibc/files/2.17/glibc-2.17-shadow-prefix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: shadow/Makefile
-===================================================================
---- shadow/Makefile.orig
-+++ shadow/Makefile
-@@ -20,6 +20,8 @@
- #
- subdir	:= shadow
- 
-+include ../Makeconfig
-+
- headers		= shadow.h
- routines	= getspent getspnam sgetspent fgetspent putspent \
- 		  getspent_r getspnam_r sgetspent_r fgetspent_r \
-@@ -34,5 +36,6 @@ CFLAGS-fgetspent_r.c = -fexceptions $(li
- CFLAGS-putspent.c = -fexceptions $(libio-mtsafe)
- CFLAGS-getspnam.c = -fexceptions
- CFLAGS-getspnam_r.c = -fexceptions
-+CPPFLAGS-lckpwdf.c = -DSYSCONFDIR='"$(sysconfdir)"'
- 
- include ../Rules
-Index: shadow/lckpwdf.c
-===================================================================
---- shadow/lckpwdf.c.orig
-+++ shadow/lckpwdf.c
-@@ -29,7 +29,7 @@
- 
- 
- /* Name of the lock file.  */
--#define PWD_LOCKFILE "/etc/.pwd.lock"
-+#define PWD_LOCKFILE SYSCONFDIR "/.pwd.lock"
- 
- /* How long to wait for getting the lock before returning with an
-    error.  */

diff --git a/sys-libs/glibc/files/2.17/locale-gen_prefix.patch b/sys-libs/glibc/files/2.17/locale-gen_prefix.patch
deleted file mode 100644
index f378605..0000000
--- a/sys-libs/glibc/files/2.17/locale-gen_prefix.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-bug #473484
-Index: work/extra/locale/locale-gen
-===================================================================
---- work.orig/extra/locale/locale-gen
-+++ work/extra/locale/locale-gen
-@@ -8,7 +8,13 @@ unset POSIXLY_CORRECT IFS
- umask 0022
- 
- argv0=${0##*/}
--source /etc/init.d/functions.sh || {
-+
-+EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
-+if [[ ${EPREFIX} == "@"GENTOO_PORTAGE_EPREFIX"@" ]] ; then
-+	EPREFIX=""
-+fi
-+
-+source "${EPREFIX}"/etc/init.d/functions.sh || {
- 	echo "${argv0}: Could not source /etc/init.d/functions.sh!" 1>&2
- 	exit 1
- }
-@@ -97,13 +103,14 @@ if [[ -n ${DESTDIR} ]] && [[ ${ROOT} !=
- 	eerror "DESTDIR and ROOT are mutually exclusive options"
- 	exit 1
- fi
--if [[ ${ROOT} != "/" ]] ; then
--	einfo "Using locale.gen from ROOT ${ROOT}etc/"
-+: ${EROOT:="${ROOT%/}${EPREFIX}/"}
-+if [[ ${EROOT} != "/" ]] ; then
-+	einfo "Using locale.gen from ROOT ${EROOT}etc/"
- fi
- if [[ -n ${DESTDIR} ]] ; then
- 	einfo "Building locales in DESTDIR '${DESTDIR}'"
- else
--	DESTDIR=${ROOT}
-+	DESTDIR=${EROOT}
- fi
- 
- # XXX: should fix this ...
-@@ -112,7 +119,7 @@ if [[ ${ROOT} != "/" ]] ; then
- 	exit 0
- fi
- 
--: ${CONFIG:=${ROOT}etc/locale.gen}
-+: ${CONFIG:=${EROOT}etc/locale.gen}
- LOCALES=${DESTDIR}usr/share/i18n/locales
- CHARMAPS=${DESTDIR}usr/share/i18n/charmaps
- SUPPORTED=${DESTDIR}usr/share/i18n/SUPPORTED
-@@ -150,7 +157,10 @@ fi
- 
- # Extract the location of the locale dir on the fly as `localedef --help` has:
- #                        locale path    : /usr/lib64/locale:/usr/share/i18n
--LOCALEDIR=${DESTDIR}$(LC_ALL="C" "${DESTDIR}"usr/bin/localedef --help | sed -n -e '/locale path/{s|.* : ||;s|:.*||;p}')
-+# For long paths, the line may get wrapped into two, in which case space (' ') is replaced
-+# by newline (\n).
-+LOCALEDIR=$(LC_ALL="C" "${DESTDIR}"usr/bin/localedef --help | sed -n -r '/locale path/{N;s|.*:[ \n](.*):/.*|\1|;p}')
-+LOCALEDIR="${DESTDIR}${LOCALEDIR#${EPREFIX}}"
- if [[ $? -ne 0 ]] || [[ -z ${LOCALEDIR} ]] || [[ ${LOCALEDIR} != ${DESTDIR}/usr/lib*/locale ]] ; then
- 	eerror "Unable to parse the output of your localedef utility." 1>&2
- 	eerror "File a bug about this issue and include the output of 'localedef --help'." 1>&2
-@@ -160,7 +170,7 @@ fi
- 
- 
- if [[ ${QUIET} -eq 0 ]] && [[ -z ${JUST_LIST} ]] && \
--   [[ -e ${ROOT}etc/locales.build ]]
-+   [[ -e ${EROOT}etc/locales.build ]]
- then
- 	ewarn "You should upgrade your /etc/locales.build to /etc/locale.gen"
- 	ewarn "and then remove /etc/locales.build when you're done.\n"
-@@ -280,7 +290,7 @@ generate_locale() {
- 				-i "${input}" \
- 				-f "${charmap}" \
- 				-A "${ALIAS}" \
--				--prefix "${DESTDIR}" \
-+				--prefix "${DESTDIR%${EPREFIX}/}/" \
- 				"${locale}" 2>&1
- 			ret=$?
- 			[[ -n ${output} ]] && eend ${ret}

diff --git a/sys-libs/glibc/files/2.17/vdso-disable.patch b/sys-libs/glibc/files/2.17/vdso-disable.patch
deleted file mode 100644
index 0354ae9..0000000
--- a/sys-libs/glibc/files/2.17/vdso-disable.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: work/glibc-2.17/elf/dl-support.c
-===================================================================
---- work.orig/glibc-2.17/elf/dl-support.c
-+++ work/glibc-2.17/elf/dl-support.c
-@@ -212,16 +212,6 @@ _dl_aux_init (ElfW(auxv_t) *av)
-       case AT_HWCAP:
- 	GLRO(dl_hwcap) = (unsigned long int) av->a_un.a_val;
- 	break;
--#ifdef NEED_DL_SYSINFO
--      case AT_SYSINFO:
--	GL(dl_sysinfo) = av->a_un.a_val;
--	break;
--#endif
--#if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO
--      case AT_SYSINFO_EHDR:
--	GL(dl_sysinfo_dso) = (void *) av->a_un.a_val;
--	break;
--#endif
-       case AT_UID:
- 	uid ^= av->a_un.a_val;
- 	seen |= 1;
-Index: work/glibc-2.17/elf/setup-vdso.h
-===================================================================
---- work.orig/glibc-2.17/elf/setup-vdso.h
-+++ work/glibc-2.17/elf/setup-vdso.h
-@@ -20,7 +20,7 @@ static inline void __attribute__ ((alway
- setup_vdso (struct link_map *main_map __attribute__ ((unused)),
- 	    struct link_map ***first_preload __attribute__ ((unused)))
- {
--#if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO
-+#if 0
-   if (GLRO(dl_sysinfo_dso) == NULL)
-     return;
- 

diff --git a/sys-libs/glibc/files/2.17/vdso.patch b/sys-libs/glibc/files/2.17/vdso.patch
deleted file mode 100644
index eb9a492..0000000
--- a/sys-libs/glibc/files/2.17/vdso.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: glibc-2.17/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c
-===================================================================
---- glibc-2.17.orig/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c
-+++ glibc-2.17/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c
-@@ -28,11 +28,7 @@ void *gettimeofday_ifunc (void) __asm__
- void *
- gettimeofday_ifunc (void)
- {
--  PREPARE_VERSION (linux26, "LINUX_2.6", 61765110);
--
--  /* If the vDSO is not available we fall back on the old vsyscall.  */
--  return (_dl_vdso_vsym ("__vdso_gettimeofday", &linux26)
--	  ?: (void *) VSYSCALL_ADDR_vgettimeofday);
-+  return (void *) VSYSCALL_ADDR_vgettimeofday;
- }
- asm (".type __gettimeofday, %gnu_indirect_function");
- 

diff --git a/sys-libs/glibc/files/2.19/glibc-2.19-configurable-paths.patch b/sys-libs/glibc/files/2.19/glibc-2.19-configurable-paths.patch
deleted file mode 100644
index 1cf906a..0000000
--- a/sys-libs/glibc/files/2.19/glibc-2.19-configurable-paths.patch
+++ /dev/null
@@ -1,2115 +0,0 @@
-Index: glibc-2.19/nis/Makefile
-===================================================================
---- glibc-2.19.orig/nis/Makefile
-+++ glibc-2.19/nis/Makefile
-@@ -58,6 +58,11 @@ libnsl-routines = yp_xdr ypclnt ypupdate
- 		  nis_clone_res nss-default
- 
- libnss_compat-routines	:= $(addprefix compat-,grp pwd spwd initgroups)
-+SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"'
-+CPPFLAGS-compat-grp.c = $(SYSCONF-FLAGS)
-+CPPFLAGS-compat-pwd.c = $(SYSCONF-FLAGS)
-+CPPFLAGS-compat-spwd.c = $(SYSCONF-FLAGS)
-+CPPFLAGS-compat-initgroups.c = $(SYSCONF-FLAGS)
- libnss_compat-inhibit-o	= $(filter-out .os,$(object-suffixes))
- 
- libnss_nis-routines	:= $(addprefix nis-,$(databases)) nis-initgroups \
-Index: glibc-2.19/nis/nss_compat/compat-grp.c
-===================================================================
---- glibc-2.19.orig/nis/nss_compat/compat-grp.c
-+++ glibc-2.19/nis/nss_compat/compat-grp.c
-@@ -120,7 +120,7 @@ internal_setgrent (ent_t *ent, int stayo
- 
-   if (ent->stream == NULL)
-     {
--      ent->stream = fopen ("/etc/group", "rme");
-+      ent->stream = fopen (SYSCONFDIR "/group", "rme");
- 
-       if (ent->stream == NULL)
- 	status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL;
-Index: glibc-2.19/nis/nss_compat/compat-initgroups.c
-===================================================================
---- glibc-2.19.orig/nis/nss_compat/compat-initgroups.c
-+++ glibc-2.19/nis/nss_compat/compat-initgroups.c
-@@ -136,7 +136,7 @@ internal_setgrent (ent_t *ent)
-   else
-     ent->blacklist.current = 0;
- 
--  ent->stream = fopen ("/etc/group", "rme");
-+  ent->stream = fopen (SYSCONFDIR "/group", "rme");
- 
-   if (ent->stream == NULL)
-     status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL;
-Index: glibc-2.19/nis/nss_compat/compat-pwd.c
-===================================================================
---- glibc-2.19.orig/nis/nss_compat/compat-pwd.c
-+++ glibc-2.19/nis/nss_compat/compat-pwd.c
-@@ -235,7 +235,7 @@ internal_setpwent (ent_t *ent, int stayo
- 
-   if (ent->stream == NULL)
-     {
--      ent->stream = fopen ("/etc/passwd", "rme");
-+      ent->stream = fopen (SYSCONFDIR "/passwd", "rme");
- 
-       if (ent->stream == NULL)
- 	status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL;
-Index: glibc-2.19/nis/nss_compat/compat-spwd.c
-===================================================================
---- glibc-2.19.orig/nis/nss_compat/compat-spwd.c
-+++ glibc-2.19/nis/nss_compat/compat-spwd.c
-@@ -191,7 +191,7 @@ internal_setspent (ent_t *ent, int stayo
- 
-   if (ent->stream == NULL)
-     {
--      ent->stream = fopen ("/etc/shadow", "rme");
-+      ent->stream = fopen (SYSCONFDIR "/shadow", "rme");
- 
-       if (ent->stream == NULL)
- 	status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL;
-Index: glibc-2.19/nss/Makefile
-===================================================================
---- glibc-2.19.orig/nss/Makefile
-+++ glibc-2.19/nss/Makefile
-@@ -39,6 +39,8 @@ extra-objs		+= $(makedb-modules:=.o)
- 
- tests			= test-netdb tst-nss-test1 test-digits-dots
- xtests			= bug-erange
-+SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"'
-+CPPFLAGS-bug-erange.c = $(SYSCONF-FLAGS)
- 
- include ../Makeconfig
- 
-@@ -57,6 +59,8 @@ vpath %.c $(subdir-dirs) ../locale/progr
- 
- libnss_files-routines	:= $(addprefix files-,$(databases)) \
- 			   files-initgroups files-have_o_cloexec files-init
-+CPPFLAGS-files-init.c = $(SYSCONF-FLAGS)
-+CPPFLAGS-files-initgroups.c = $(SYSCONF-FLAGS)
- 
- libnss_db-dbs		:= $(addprefix db-,\
- 				       $(filter-out hosts network key alias,\
-@@ -102,7 +106,7 @@ $(libnss_db-dbs:%=$(objpfx)%.c): $(objpf
- 
- $(objpfx)makedb: $(makedb-modules:%=$(objpfx)%.o)
- 
--$(inst_vardbdir)/Makefile: db-Makefile $(+force)
-+$(inst_vardbdir)/Makefile: $(objpfx)db-Makefile $(+force)
- 	$(do-install)
- 
- CFLAGS-nss_test1.c = -DNOT_IN_libc=1
-Index: glibc-2.19/nss/bug-erange.c
-===================================================================
---- glibc-2.19.orig/nss/bug-erange.c
-+++ glibc-2.19/nss/bug-erange.c
-@@ -37,7 +37,7 @@ main (void)
-     {
-       printf ("gethostbyname_r failed: %s (errno: %m)\n", strerror (res));
- 
--      if (access ("/etc/resolv.conf", R_OK))
-+      if (access (SYSCONFDIR "/resolv.conf", R_OK))
- 	{
- 	  puts ("DNS probably not set up");
- 	  return 0;
-Index: glibc-2.19/nss/nss_files/files-init.c
-===================================================================
---- glibc-2.19.orig/nss/nss_files/files-init.c
-+++ glibc-2.19/nss/nss_files/files-init.c
-@@ -35,33 +35,33 @@ static union							\
-     }								\
-   }
- 
--TF (pwd, "/etc/passwd");
--TF (grp, "/etc/group");
--TF (hst, "/etc/hosts");
--TF (resolv, "/etc/resolv.conf", .call_res_init = 1);
--TF (serv, "/etc/services");
--TF (netgr, "/etc/netgroup");
-+TF (pwd, SYSCONFDIR "/passwd");
-+TF (grp, SYSCONFDIR "/group");
-+TF (hst, SYSCONFDIR "/hosts");
-+TF (resolv, SYSCONFDIR "/resolv.conf", .call_res_init = 1);
-+TF (serv, SYSCONFDIR "/services");
-+TF (netgr, SYSCONFDIR "/netgroup");
- 
- 
- void
- _nss_files_init (void (*cb) (size_t, struct traced_file *))
- {
--  strcpy (pwd_traced_file.file.fname, "/etc/passwd");
-+  strcpy (pwd_traced_file.file.fname, SYSCONFDIR "/passwd");
-   cb (pwddb, &pwd_traced_file.file);
- 
--  strcpy (grp_traced_file.file.fname, "/etc/group");
-+  strcpy (grp_traced_file.file.fname, SYSCONFDIR "/group");
-   cb (grpdb, &grp_traced_file.file);
- 
--  strcpy (hst_traced_file.file.fname, "/etc/hosts");
-+  strcpy (hst_traced_file.file.fname, SYSCONFDIR "/hosts");
-   cb (hstdb, &hst_traced_file.file);
- 
--  strcpy (resolv_traced_file.file.fname, "/etc/resolv.conf");
-+  strcpy (resolv_traced_file.file.fname, SYSCONFDIR "/resolv.conf");
-   cb (hstdb, &resolv_traced_file.file);
- 
--  strcpy (serv_traced_file.file.fname, "/etc/services");
-+  strcpy (serv_traced_file.file.fname, SYSCONFDIR "/services");
-   cb (servdb, &serv_traced_file.file);
- 
--  strcpy (netgr_traced_file.file.fname, "/etc/netgroup");
-+  strcpy (netgr_traced_file.file.fname, SYSCONFDIR "/netgroup");
-   cb (netgrdb, &netgr_traced_file.file);
- }
- 
-Index: glibc-2.19/nss/nss_files/files-initgroups.c
-===================================================================
---- glibc-2.19.orig/nss/nss_files/files-initgroups.c
-+++ glibc-2.19/nss/nss_files/files-initgroups.c
-@@ -31,7 +31,7 @@ _nss_files_initgroups_dyn (const char *u
- 			   long int *size, gid_t **groupsp, long int limit,
- 			   int *errnop)
- {
--  FILE *stream = fopen ("/etc/group", "rce");
-+  FILE *stream = fopen (SYSCONFDIR "/group", "rce");
-   if (stream == NULL)
-     {
-       *errnop = errno;
-Index: glibc-2.19/nss/db-Makefile
-===================================================================
---- glibc-2.19.orig/nss/db-Makefile
-+++ /dev/null
-@@ -1,166 +0,0 @@
--# Makefile to (re-)generate db versions of system database files.
--# Copyright (C) 1996-2014 Free Software Foundation, Inc.
--# This file is part of the GNU C Library.
--# Contributed by Ulrich Drepper <drepper@××××××.com>, 1996.
--#
--
--# The GNU C Library is free software; you can redistribute it and/or
--# modify it under the terms of the GNU Lesser General Public
--# License as published by the Free Software Foundation; either
--# version 2.1 of the License, or (at your option) any later version.
--
--# The GNU C Library is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--# Lesser General Public License for more details.
--
--# You should have received a copy of the GNU Lesser General Public
--# License along with the GNU C Library; if not, see
--# <http://www.gnu.org/licenses/>.
--
--DATABASES = $(wildcard /etc/passwd /etc/group /etc/ethers /etc/protocols \
--		       /etc/rpc /etc/services /etc/shadow /etc/gshadow \
--		       /etc/netgroup)
--
--VAR_DB = /var/db
--
--AWK = awk
--MAKEDB = makedb --quiet
--
--all: $(patsubst %,$(VAR_DB)/%.db,$(notdir $(DATABASES)))
--
--
--$(VAR_DB)/passwd.db: /etc/passwd
--	@echo -n "$(patsubst %.db,%,$(@F))... "
--	@$(AWK) 'BEGIN { FS=":"; OFS=":" } \
--		 /^[ \t]*$$/ { next } \
--		 /^[ \t]*#/ { next } \
--		 /^[^#]/ { printf ".%s ", $$1; print; \
--			   printf "=%s ", $$3; print }' $^ | \
--	$(MAKEDB) -o $@ -
--	@echo "done."
--
--$(VAR_DB)/group.db: /etc/group
--	@echo -n "$(patsubst %.db,%,$(@F))... "
--	@$(AWK) 'BEGIN { FS=":"; OFS=":" } \
--		 /^[ \t]*$$/ { next } \
--		 /^[ \t]*#/ { next } \
--		 /^[^#]/ { printf ".%s ", $$1; print; \
--			   printf "=%s ", $$3; print; \
--			   if ($$4 != "") { \
--			     split($$4, grmems, ","); \
--			     for (memidx in grmems) { \
--			       mem=grmems[memidx]; \
--			       if (members[mem] == "") \
--				 members[mem]=$$3; \
--			       else \
--				 members[mem]=members[mem] "," $$3; \
--			     } \
--			     delete grmems; } } \
--		 END { for (mem in members) \
--			 printf ":%s %s %s\n", mem, mem, members[mem]; }' $^ | \
--	$(MAKEDB) -o $@ -
--	@echo "done."
--
--$(VAR_DB)/ethers.db: /etc/ethers
--	@echo -n "$(patsubst %.db,%,$(@F))... "
--	@$(AWK) '/^[ \t]*$$/ { next } \
--		 /^[ \t]*#/ { next } \
--		 /^[^#]/ { printf ".%s ", $$1; print; \
--			   printf "=%s ", $$2; print }' $^ | \
--	$(MAKEDB) -o $@ -
--	@echo "done."
--
--$(VAR_DB)/protocols.db: /etc/protocols
--	@echo -n "$(patsubst %.db,%,$(@F))... "
--	@$(AWK) '/^[ \t]*$$/ { next } \
--		 /^[ \t]*#/ { next } \
--		 /^[^#]/ { printf ".%s ", $$1; print; \
--			   printf "=%s ", $$2; print; \
--			   for (i = 3; i <= NF && !($$i ~ /^#/); ++i) \
--			     { printf ".%s ", $$i; print } }' $^ | \
--	$(MAKEDB) -o $@ -
--	@echo "done."
--
--$(VAR_DB)/rpc.db: /etc/rpc
--	@echo -n "$(patsubst %.db,%,$(@F))... "
--	@$(AWK) '/^[ \t]*$$/ { next } \
--		 /^[ \t]*#/ { next } \
--		 /^[^#]/ { printf ".%s ", $$1; print; \
--			   printf "=%s ", $$2; print; \
--			   for (i = 3; i <= NF && !($$i ~ /^#/); ++i) \
--			     { printf ".%s ", $$i; print } }' $^ | \
--	$(MAKEDB) -o $@ -
--	@echo "done."
--
--$(VAR_DB)/services.db: /etc/services
--	@echo -n "$(patsubst %.db,%,$(@F))... "
--	@$(AWK) 'BEGIN { FS="[ \t/]+" } \
--		 /^[ \t]*$$/ { next } \
--		 /^[ \t]*#/ { next } \
--		 /^[^#]/ { sub(/[ \t]*#.*$$/, "");\
--			   printf ":%s/%s ", $$1, $$3; print; \
--			   printf ":%s/ ", $$1; print; \
--			   printf "=%s/%s ", $$2, $$3; print; \
--			   printf "=%s/ ", $$2; print; \
--			   for (i = 4; i <= NF && !($$i ~ /^#/); ++i) \
--			     { printf ":%s/%s ", $$i, $$3; print; \
--			       printf ":%s/ ", $$i; print } }' $^ | \
--	$(MAKEDB) -o $@ -
--	@echo "done."
--
--$(VAR_DB)/shadow.db: /etc/shadow
--	@echo -n "$(patsubst %.db,%,$(@F))... "
--	@$(AWK) 'BEGIN { FS=":"; OFS=":" } \
--		 /^[ \t]*$$/ { next } \
--		 /^[ \t]*#/ { next } \
--		 /^[^#]/ { printf ".%s ", $$1; print }' $^ | \
--	(umask 077 && $(MAKEDB) -o $@ -)
--	@echo "done."
--	@if chgrp shadow $@ 2>/dev/null; then \
--	  chmod g+r $@; \
--	else \
--	  chown 0 $@; chgrp 0 $@; chmod 600 $@; \
--	  echo; \
--	  echo "Warning: The shadow password database $@"; \
--	  echo "has been set to be readable only by root.  You may want"; \
--	  echo "to make it readable by the \`shadow' group depending"; \
--	  echo "on your configuration."; \
--	  echo; \
--	fi
--
--$(VAR_DB)/gshadow.db: /etc/gshadow
--	@echo -n "$(patsubst %.db,%,$(@F))... "
--	@$(AWK) 'BEGIN { FS=":"; OFS=":" } \
--		 /^[ \t]*$$/ { next } \
--		 /^[ \t]*#/ { next } \
--		 /^[^#]/ { printf ".%s ", $$1; print }' $^ | \
--	(umask 077 && $(MAKEDB) -o $@ -)
--	@echo "done."
--	@if chgrp shadow $@ 2>/dev/null; then \
--	  chmod g+r $@; \
--	else \
--	  chown 0 $@; chgrp 0 $@; chmod 600 $@; \
--	  echo; \
--	  echo "Warning: The shadow group database $@"; \
--	  echo "has been set to be readable only by root.  You may want"; \
--	  echo "to make it readable by the \`shadow' group depending"; \
--	  echo "on your configuration."; \
--	  echo; \
--	fi
--
--$(VAR_DB)/netgroup.db: /etc/netgroup
--	@echo -n "$(patsubst %.db,%,$(@F))... "
--	@$(AWK) 'BEGIN { ini=1 } \
--		 /^[ \t]*$$/ { next } \
--		 /^[ \t]*#/ { next } \
--		 /^[^#]/ { if (sub(/[ \t]*\\$$/, " ") == 0) end="\n"; \
--			   else end=""; \
--			   gsub(/[ \t]+/, " "); \
--			   sub(/^[ \t]*/, ""); \
--			   if (ini == 0) printf "%s%s", $$0, end; \
--			   else printf ".%s %s%s", $$1, $$0, end; \
--			   ini=end == "" ? 0 : 1; } \
--			   END { if (ini==0) printf "\n" }' $^ | \
--	$(MAKEDB) -o $@ -
--	@echo "done."
-Index: glibc-2.19/nss/db-Makefile.in
-===================================================================
---- /dev/null
-+++ glibc-2.19/nss/db-Makefile.in
-@@ -0,0 +1,173 @@
-+
-+# Makefile to (re-)generate db versions of system database files.
-+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
-+# This file is part of the GNU C Library.
-+# Contributed by Ulrich Drepper <drepper@××××××.com>, 1996.
-+#
-+
-+# The GNU C Library is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Lesser General Public
-+# License as published by the Free Software Foundation; either
-+# version 2.1 of the License, or (at your option) any later version.
-+
-+# The GNU C Library is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# Lesser General Public License for more details.
-+
-+# You should have received a copy of the GNU Lesser General Public
-+# License along with the GNU C Library; if not, see
-+# <http://www.gnu.org/licenses/>.
-+
-+DATABASES = $(wildcard @libc_cv_sysconfdir@/passwd	\
-+		       @libc_cv_sysconfdir@/group	\
-+		       @libc_cv_sysconfdir@/ethers	\
-+		       @libc_cv_sysconfdir@/protocols	\
-+		       @libc_cv_sysconfdir@/rpc		\
-+		       @libc_cv_sysconfdir@/services	\
-+		       @libc_cv_sysconfdir@/shadow	\
-+		       @libc_cv_sysconfdir@/gshadow	\
-+		       @libc_cv_sysconfdir@/netgroup)
-+
-+VAR_DB = /var/db
-+
-+AWK = awk
-+MAKEDB = makedb --quiet
-+
-+all: $(patsubst %,$(VAR_DB)/%.db,$(notdir $(DATABASES)))
-+
-+
-+$(VAR_DB)/passwd.db: @libc_cv_sysconfdir@/passwd
-+	@echo -n "$(patsubst %.db,%,$(@F))... "
-+	@$(AWK) 'BEGIN { FS=":"; OFS=":" } \
-+		 /^[ \t]*$$/ { next } \
-+		 /^[ \t]*#/ { next } \
-+		 /^[^#]/ { printf ".%s ", $$1; print; \
-+			   printf "=%s ", $$3; print }' $^ | \
-+	$(MAKEDB) -o $@ -
-+	@echo "done."
-+
-+$(VAR_DB)/group.db: @libc_cv_sysconfdir@/group
-+	@echo -n "$(patsubst %.db,%,$(@F))... "
-+	@$(AWK) 'BEGIN { FS=":"; OFS=":" } \
-+		 /^[ \t]*$$/ { next } \
-+		 /^[ \t]*#/ { next } \
-+		 /^[^#]/ { printf ".%s ", $$1; print; \
-+			   printf "=%s ", $$3; print; \
-+			   if ($$4 != "") { \
-+			     split($$4, grmems, ","); \
-+			     for (memidx in grmems) { \
-+			       mem=grmems[memidx]; \
-+			       if (members[mem] == "") \
-+				 members[mem]=$$3; \
-+			       else \
-+				 members[mem]=members[mem] "," $$3; \
-+			     } \
-+			     delete grmems; } } \
-+		 END { for (mem in members) \
-+			 printf ":%s %s %s\n", mem, mem, members[mem]; }' $^ | \
-+	$(MAKEDB) -o $@ -
-+	@echo "done."
-+
-+$(VAR_DB)/ethers.db: @libc_cv_sysconfdir@/ethers
-+	@echo -n "$(patsubst %.db,%,$(@F))... "
-+	@$(AWK) '/^[ \t]*$$/ { next } \
-+		 /^[ \t]*#/ { next } \
-+		 /^[^#]/ { printf ".%s ", $$1; print; \
-+			   printf "=%s ", $$2; print }' $^ | \
-+	$(MAKEDB) -o $@ -
-+	@echo "done."
-+
-+$(VAR_DB)/protocols.db: @libc_cv_sysconfdir@/protocols
-+	@echo -n "$(patsubst %.db,%,$(@F))... "
-+	@$(AWK) '/^[ \t]*$$/ { next } \
-+		 /^[ \t]*#/ { next } \
-+		 /^[^#]/ { printf ".%s ", $$1; print; \
-+			   printf "=%s ", $$2; print; \
-+			   for (i = 3; i <= NF && !($$i ~ /^#/); ++i) \
-+			     { printf ".%s ", $$i; print } }' $^ | \
-+	$(MAKEDB) -o $@ -
-+	@echo "done."
-+
-+$(VAR_DB)/rpc.db: @libc_cv_sysconfdir@/rpc
-+	@echo -n "$(patsubst %.db,%,$(@F))... "
-+	@$(AWK) '/^[ \t]*$$/ { next } \
-+		 /^[ \t]*#/ { next } \
-+		 /^[^#]/ { printf ".%s ", $$1; print; \
-+			   printf "=%s ", $$2; print; \
-+			   for (i = 3; i <= NF && !($$i ~ /^#/); ++i) \
-+			     { printf ".%s ", $$i; print } }' $^ | \
-+	$(MAKEDB) -o $@ -
-+	@echo "done."
-+
-+$(VAR_DB)/services.db: @libc_cv_sysconfdir@/services
-+	@echo -n "$(patsubst %.db,%,$(@F))... "
-+	@$(AWK) 'BEGIN { FS="[ \t/]+" } \
-+		 /^[ \t]*$$/ { next } \
-+		 /^[ \t]*#/ { next } \
-+		 /^[^#]/ { sub(/[ \t]*#.*$$/, "");\
-+			   printf ":%s/%s ", $$1, $$3; print; \
-+			   printf ":%s/ ", $$1; print; \
-+			   printf "=%s/%s ", $$2, $$3; print; \
-+			   printf "=%s/ ", $$2; print; \
-+			   for (i = 4; i <= NF && !($$i ~ /^#/); ++i) \
-+			     { printf ":%s/%s ", $$i, $$3; print; \
-+			       printf ":%s/ ", $$i; print } }' $^ | \
-+	$(MAKEDB) -o $@ -
-+	@echo "done."
-+
-+$(VAR_DB)/shadow.db: @libc_cv_sysconfdir@/shadow
-+	@echo -n "$(patsubst %.db,%,$(@F))... "
-+	@$(AWK) 'BEGIN { FS=":"; OFS=":" } \
-+		 /^[ \t]*$$/ { next } \
-+		 /^[ \t]*#/ { next } \
-+		 /^[^#]/ { printf ".%s ", $$1; print }' $^ | \
-+	(umask 077 && $(MAKEDB) -o $@ -)
-+	@echo "done."
-+	@if chgrp shadow $@ 2>/dev/null; then \
-+	  chmod g+r $@; \
-+	else \
-+	  chown 0 $@; chgrp 0 $@; chmod 600 $@; \
-+	  echo; \
-+	  echo "Warning: The shadow password database $@"; \
-+	  echo "has been set to be readable only by root.  You may want"; \
-+	  echo "to make it readable by the \`shadow' group depending"; \
-+	  echo "on your configuration."; \
-+	  echo; \
-+	fi
-+
-+$(VAR_DB)/gshadow.db: @libc_cv_sysconfdir@/gshadow
-+	@echo -n "$(patsubst %.db,%,$(@F))... "
-+	@$(AWK) 'BEGIN { FS=":"; OFS=":" } \
-+		 /^[ \t]*$$/ { next } \
-+		 /^[ \t]*#/ { next } \
-+		 /^[^#]/ { printf ".%s ", $$1; print }' $^ | \
-+	(umask 077 && $(MAKEDB) -o $@ -)
-+	@echo "done."
-+	@if chgrp shadow $@ 2>/dev/null; then \
-+	  chmod g+r $@; \
-+	else \
-+	  chown 0 $@; chgrp 0 $@; chmod 600 $@; \
-+	  echo; \
-+	  echo "Warning: The shadow group database $@"; \
-+	  echo "has been set to be readable only by root.  You may want"; \
-+	  echo "to make it readable by the \`shadow' group depending"; \
-+	  echo "on your configuration."; \
-+	  echo; \
-+	fi
-+
-+$(VAR_DB)/netgroup.db: @libc_cv_sysconfdir@/netgroup
-+	@echo -n "$(patsubst %.db,%,$(@F))... "
-+	@$(AWK) 'BEGIN { ini=1 } \
-+		 /^[ \t]*$$/ { next } \
-+		 /^[ \t]*#/ { next } \
-+		 /^[^#]/ { if (sub(/[ \t]*\\$$/, " ") == 0) end="\n"; \
-+			   else end=""; \
-+			   gsub(/[ \t]+/, " "); \
-+			   sub(/^[ \t]*/, ""); \
-+			   if (ini == 0) printf "%s%s", $$0, end; \
-+			   else printf ".%s %s%s", $$1, $$0, end; \
-+			   ini=end == "" ? 0 : 1; } \
-+			   END { if (ini==0) printf "\n" }' $^ | \
-+	$(MAKEDB) -o $@ -
-+	@echo "done."
-Index: glibc-2.19/resolv/netdb.h
-===================================================================
---- glibc-2.19.orig/resolv/netdb.h
-+++ glibc-2.19/resolv/netdb.h
-@@ -42,12 +42,12 @@
- #include <bits/netdb.h>
- 
- /* Absolute file name for network data base files.  */
--#define	_PATH_HEQUIV		"/etc/hosts.equiv"
--#define	_PATH_HOSTS		"/etc/hosts"
--#define	_PATH_NETWORKS		"/etc/networks"
--#define	_PATH_NSSWITCH_CONF	"/etc/nsswitch.conf"
--#define	_PATH_PROTOCOLS		"/etc/protocols"
--#define	_PATH_SERVICES		"/etc/services"
-+#define	_PATH_HEQUIV		SYSCONFDIR "/hosts.equiv"
-+#define	_PATH_HOSTS		SYSCONFDIR "/hosts"
-+#define	_PATH_NETWORKS		SYSCONFDIR "/networks"
-+#define	_PATH_NSSWITCH_CONF	SYSCONFDIR "/nsswitch.conf"
-+#define	_PATH_PROTOCOLS		SYSCONFDIR "/protocols"
-+#define	_PATH_SERVICES		SYSCONFDIR "/services"
- 
- 
- __BEGIN_DECLS
-Index: glibc-2.19/resolv/resolv.h
-===================================================================
---- glibc-2.19.orig/resolv/resolv.h
-+++ /dev/null
-@@ -1,389 +0,0 @@
--/*
-- * Copyright (c) 1983, 1987, 1989
-- *    The Regents of the University of California.  All rights reserved.
-- *
-- * Redistribution and use in source and binary forms, with or without
-- * modification, are permitted provided that the following conditions
-- * are met:
-- * 1. Redistributions of source code must retain the above copyright
-- *    notice, this list of conditions and the following disclaimer.
-- * 2. Redistributions in binary form must reproduce the above copyright
-- *    notice, this list of conditions and the following disclaimer in the
-- *    documentation and/or other materials provided with the distribution.
-- * 4. Neither the name of the University nor the names of its contributors
-- *    may be used to endorse or promote products derived from this software
-- *    without specific prior written permission.
-- *
-- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-- * SUCH DAMAGE.
-- */
--
--/*
-- * Portions Copyright (c) 1996-1999 by Internet Software Consortium.
-- *
-- * Permission to use, copy, modify, and distribute this software for any
-- * purpose with or without fee is hereby granted, provided that the above
-- * copyright notice and this permission notice appear in all copies.
-- *
-- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
-- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
-- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-- * SOFTWARE.
-- */
--
--/*
-- *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
-- *	$BINDId: resolv.h,v 8.31 2000/03/30 20:16:50 vixie Exp $
-- */
--
--#ifndef _RESOLV_H_
--
--/* These headers are needed for types used in the `struct res_state'
--   declaration.  */
--#include <sys/types.h>
--#include <netinet/in.h>
--
--#ifndef __need_res_state
--# define _RESOLV_H_
--
--# include <sys/param.h>
--# include <sys/cdefs.h>
--# include <stdio.h>
--# include <arpa/nameser.h>
--#endif
--
--#ifndef __res_state_defined
--# define __res_state_defined
--
--typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error }
--	res_sendhookact;
--
--typedef res_sendhookact (*res_send_qhook) (struct sockaddr_in * const *__ns,
--					   const u_char **__query,
--					   int *__querylen,
--					   u_char *__ans,
--					   int __anssiz,
--					   int *__resplen);
--
--typedef res_sendhookact (*res_send_rhook) (const struct sockaddr_in *__ns,
--					   const u_char *__query,
--					   int __querylen,
--					   u_char *__ans,
--					   int __anssiz,
--					   int *__resplen);
--
--/*
-- * Global defines and variables for resolver stub.
-- */
--# define MAXNS			3	/* max # name servers we'll track */
--# define MAXDFLSRCH		3	/* # default domain levels to try */
--# define MAXDNSRCH		6	/* max # domains in search path */
--# define LOCALDOMAINPARTS	2	/* min levels in name that is "local" */
--
--# define RES_TIMEOUT		5	/* min. seconds between retries */
--# define MAXRESOLVSORT		10	/* number of net to sort on */
--# define RES_MAXNDOTS		15	/* should reflect bit field size */
--# define RES_MAXRETRANS		30	/* only for resolv.conf/RES_OPTIONS */
--# define RES_MAXRETRY		5	/* only for resolv.conf/RES_OPTIONS */
--# define RES_DFLRETRY		2	/* Default #/tries. */
--# define RES_MAXTIME		65535	/* Infinity, in milliseconds. */
--
--struct __res_state {
--	int	retrans;		/* retransmition time interval */
--	int	retry;			/* number of times to retransmit */
--	u_long	options;		/* option flags - see below. */
--	int	nscount;		/* number of name servers */
--	struct sockaddr_in
--		nsaddr_list[MAXNS];	/* address of name server */
--# define nsaddr	nsaddr_list[0]		/* for backward compatibility */
--	u_short	id;			/* current message id */
--	/* 2 byte hole here.  */
--	char	*dnsrch[MAXDNSRCH+1];	/* components of domain to search */
--	char	defdname[256];		/* default domain (deprecated) */
--	u_long	pfcode;			/* RES_PRF_ flags - see below. */
--	unsigned ndots:4;		/* threshold for initial abs. query */
--	unsigned nsort:4;		/* number of elements in sort_list[] */
--	unsigned ipv6_unavail:1;	/* connecting to IPv6 server failed */
--	unsigned unused:23;
--	struct {
--		struct in_addr	addr;
--		u_int32_t	mask;
--	} sort_list[MAXRESOLVSORT];
--	/* 4 byte hole here on 64-bit architectures.  */
--	res_send_qhook qhook;		/* query hook */
--	res_send_rhook rhook;		/* response hook */
--	int	res_h_errno;		/* last one set for this context */
--	int	_vcsock;		/* PRIVATE: for res_send VC i/o */
--	u_int	_flags;			/* PRIVATE: see below */
--	/* 4 byte hole here on 64-bit architectures.  */
--	union {
--		char	pad[52];	/* On an i386 this means 512b total. */
--		struct {
--			u_int16_t		nscount;
--			u_int16_t		nsmap[MAXNS];
--			int			nssocks[MAXNS];
--			u_int16_t		nscount6;
--			u_int16_t		nsinit;
--			struct sockaddr_in6	*nsaddrs[MAXNS];
--#ifdef _LIBC
--			unsigned long long int	initstamp
--			  __attribute__((packed));
--#else
--			unsigned int		_initstamp[2];
--#endif
--		} _ext;
--	} _u;
--};
--
--typedef struct __res_state *res_state;
--# undef __need_res_state
--#endif
--
--#ifdef _RESOLV_H_
--/*
-- * Revision information.  This is the release date in YYYYMMDD format.
-- * It can change every day so the right thing to do with it is use it
-- * in preprocessor commands such as "#if (__RES > 19931104)".  Do not
-- * compare for equality; rather, use it to determine whether your resolver
-- * is new enough to contain a certain feature.
-- */
--
--#define	__RES	19991006
--
--/*
-- * Resolver configuration file.
-- * Normally not present, but may contain the address of the
-- * inital name server(s) to query and the domain search list.
-- */
--
--#ifndef _PATH_RESCONF
--#define _PATH_RESCONF        "/etc/resolv.conf"
--#endif
--
--struct res_sym {
--	int	number;		/* Identifying number, like T_MX */
--	char *	name;		/* Its symbolic name, like "MX" */
--	char *	humanname;	/* Its fun name, like "mail exchanger" */
--};
--
--/*
-- * Resolver flags (used to be discrete per-module statics ints).
-- */
--#define	RES_F_VC	0x00000001	/* socket is TCP */
--#define	RES_F_CONN	0x00000002	/* socket is connected */
--#define RES_F_EDNS0ERR	0x00000004	/* EDNS0 caused errors */
--
--/* res_findzonecut() options */
--#define	RES_EXHAUSTIVE	0x00000001	/* always do all queries */
--
--/*
-- * Resolver options (keep these in synch with res_debug.c, please)
-- */
--#define RES_INIT	0x00000001	/* address initialized */
--#define RES_DEBUG	0x00000002	/* print debug messages */
--#define RES_AAONLY	0x00000004	/* authoritative answers only (!IMPL)*/
--#define RES_USEVC	0x00000008	/* use virtual circuit */
--#define RES_PRIMARY	0x00000010	/* query primary server only (!IMPL) */
--#define RES_IGNTC	0x00000020	/* ignore trucation errors */
--#define RES_RECURSE	0x00000040	/* recursion desired */
--#define RES_DEFNAMES	0x00000080	/* use default domain name */
--#define RES_STAYOPEN	0x00000100	/* Keep TCP socket open */
--#define RES_DNSRCH	0x00000200	/* search up local domain tree */
--#define	RES_INSECURE1	0x00000400	/* type 1 security disabled */
--#define	RES_INSECURE2	0x00000800	/* type 2 security disabled */
--#define	RES_NOALIASES	0x00001000	/* shuts off HOSTALIASES feature */
--#define	RES_USE_INET6	0x00002000	/* use/map IPv6 in gethostbyname() */
--#define RES_ROTATE	0x00004000	/* rotate ns list after each query */
--#define	RES_NOCHECKNAME	0x00008000	/* do not check names for sanity (!IMPL) */
--#define	RES_KEEPTSIG	0x00010000	/* do not strip TSIG records */
--#define	RES_BLAST	0x00020000	/* blast all recursive servers */
--#define RES_USEBSTRING	0x00040000	/* IPv6 reverse lookup with byte
--					   strings */
--#define RES_NOIP6DOTINT	0x00080000	/* Do not use .ip6.int in IPv6
--					   reverse lookup */
--#define RES_USE_EDNS0	0x00100000	/* Use EDNS0.  */
--#define RES_SNGLKUP	0x00200000	/* one outstanding request at a time */
--#define RES_SNGLKUPREOP	0x00400000	/* -"-, but open new socket for each
--					   request */
--#define RES_USE_DNSSEC	0x00800000	/* use DNSSEC using OK bit in OPT */
--#define RES_NOTLDQUERY	0x01000000	/* Do not look up unqualified name
--					   as a TLD.  */
--
--#define RES_DEFAULT	(RES_RECURSE|RES_DEFNAMES|RES_DNSRCH|RES_NOIP6DOTINT)
--
--/*
-- * Resolver "pfcode" values.  Used by dig.
-- */
--#define RES_PRF_STATS	0x00000001
--#define RES_PRF_UPDATE	0x00000002
--#define RES_PRF_CLASS   0x00000004
--#define RES_PRF_CMD	0x00000008
--#define RES_PRF_QUES	0x00000010
--#define RES_PRF_ANS	0x00000020
--#define RES_PRF_AUTH	0x00000040
--#define RES_PRF_ADD	0x00000080
--#define RES_PRF_HEAD1	0x00000100
--#define RES_PRF_HEAD2	0x00000200
--#define RES_PRF_TTLID	0x00000400
--#define RES_PRF_HEADX	0x00000800
--#define RES_PRF_QUERY	0x00001000
--#define RES_PRF_REPLY	0x00002000
--#define RES_PRF_INIT	0x00004000
--/*			0x00008000	*/
--
--/* Things involving an internal (static) resolver context. */
--__BEGIN_DECLS
--extern struct __res_state *__res_state(void) __attribute__ ((__const__));
--__END_DECLS
--#define _res (*__res_state())
--
--#ifndef __BIND_NOSTATIC
--#define fp_nquery		__fp_nquery
--#define fp_query		__fp_query
--#define hostalias		__hostalias
--#define p_query			__p_query
--#define res_close		__res_close
--#define res_init		__res_init
--#define res_isourserver		__res_isourserver
--#define res_mkquery		__res_mkquery
--#define res_query		__res_query
--#define res_querydomain		__res_querydomain
--#define res_search		__res_search
--#define res_send		__res_send
--
--__BEGIN_DECLS
--void		fp_nquery (const u_char *, int, FILE *) __THROW;
--void		fp_query (const u_char *, FILE *) __THROW;
--const char *	hostalias (const char *) __THROW;
--void		p_query (const u_char *) __THROW;
--void		res_close (void) __THROW;
--int		res_init (void) __THROW;
--int		res_isourserver (const struct sockaddr_in *) __THROW;
--int		res_mkquery (int, const char *, int, int, const u_char *,
--			     int, const u_char *, u_char *, int) __THROW;
--int		res_query (const char *, int, int, u_char *, int) __THROW;
--int		res_querydomain (const char *, const char *, int, int,
--				 u_char *, int) __THROW;
--int		res_search (const char *, int, int, u_char *, int) __THROW;
--int		res_send (const u_char *, int, u_char *, int) __THROW;
--__END_DECLS
--#endif
--
--#define b64_ntop		__b64_ntop
--#define b64_pton		__b64_pton
--#define dn_comp			__dn_comp
--#define dn_count_labels		__dn_count_labels
--#define dn_expand		__dn_expand
--#define dn_skipname		__dn_skipname
--#define fp_resstat		__fp_resstat
--#define loc_aton		__loc_aton
--#define loc_ntoa		__loc_ntoa
--#define p_cdname		__p_cdname
--#define p_cdnname		__p_cdnname
--#define p_class			__p_class
--#define p_fqname		__p_fqname
--#define p_fqnname		__p_fqnname
--#define p_option		__p_option
--#define p_secstodate		__p_secstodate
--#define p_section		__p_section
--#define p_time			__p_time
--#define p_type			__p_type
--#define p_rcode			__p_rcode
--#define putlong			__putlong
--#define putshort		__putshort
--#define res_dnok		__res_dnok
--#define res_hnok		__res_hnok
--#define res_hostalias		__res_hostalias
--#define res_mailok		__res_mailok
--#define res_nameinquery		__res_nameinquery
--#define res_nclose		__res_nclose
--#define res_ninit		__res_ninit
--#define res_nmkquery		__res_nmkquery
--#define res_npquery		__res_npquery
--#define res_nquery		__res_nquery
--#define res_nquerydomain	__res_nquerydomain
--#define res_nsearch		__res_nsearch
--#define res_nsend		__res_nsend
--#define res_nisourserver	__res_nisourserver
--#define res_ownok		__res_ownok
--#define res_queriesmatch	__res_queriesmatch
--#define res_randomid		__res_randomid
--#define sym_ntop		__sym_ntop
--#define sym_ntos		__sym_ntos
--#define sym_ston		__sym_ston
--__BEGIN_DECLS
--int		res_hnok (const char *) __THROW;
--int		res_ownok (const char *) __THROW;
--int		res_mailok (const char *) __THROW;
--int		res_dnok (const char *) __THROW;
--int		sym_ston (const struct res_sym *, const char *, int *) __THROW;
--const char *	sym_ntos (const struct res_sym *, int, int *) __THROW;
--const char *	sym_ntop (const struct res_sym *, int, int *) __THROW;
--int		b64_ntop (u_char const *, size_t, char *, size_t) __THROW;
--int		b64_pton (char const *, u_char *, size_t) __THROW;
--int		loc_aton (const char *__ascii, u_char *__binary) __THROW;
--const char *	loc_ntoa (const u_char *__binary, char *__ascii) __THROW;
--int		dn_skipname (const u_char *, const u_char *) __THROW;
--void		putlong (u_int32_t, u_char *) __THROW;
--void		putshort (u_int16_t, u_char *) __THROW;
--const char *	p_class (int) __THROW;
--const char *	p_time (u_int32_t) __THROW;
--const char *	p_type (int) __THROW;
--const char *	p_rcode (int) __THROW;
--const u_char *	p_cdnname (const u_char *, const u_char *, int, FILE *)
--     __THROW;
--const u_char *	p_cdname (const u_char *, const u_char *, FILE *) __THROW;
--const u_char *	p_fqnname (const u_char *__cp, const u_char *__msg,
--			   int, char *, int) __THROW;
--const u_char *	p_fqname (const u_char *, const u_char *, FILE *) __THROW;
--const char *	p_option (u_long __option) __THROW;
--char *		p_secstodate (u_long) __THROW;
--int		dn_count_labels (const char *) __THROW;
--int		dn_comp (const char *, u_char *, int, u_char **, u_char **)
--     __THROW;
--int		dn_expand (const u_char *, const u_char *, const u_char *,
--			   char *, int) __THROW;
--u_int		res_randomid (void) __THROW;
--int		res_nameinquery (const char *, int, int,
--				 const u_char *, const u_char *) __THROW;
--int		res_queriesmatch (const u_char *, const u_char *,
--				  const u_char *, const u_char *) __THROW;
--const char *	p_section (int __section, int __opcode) __THROW;
--/* Things involving a resolver context. */
--int		res_ninit (res_state) __THROW;
--int		res_nisourserver (const res_state,
--				  const struct sockaddr_in *) __THROW;
--void		fp_resstat (const res_state, FILE *) __THROW;
--void		res_npquery (const res_state, const u_char *, int, FILE *)
--     __THROW;
--const char *	res_hostalias (const res_state, const char *, char *, size_t)
--     __THROW;
--int		res_nquery (res_state, const char *, int, int, u_char *, int)
--     __THROW;
--int		res_nsearch (res_state, const char *, int, int, u_char *, int)
--     __THROW;
--int		res_nquerydomain (res_state, const char *, const char *, int,
--				  int, u_char *, int) __THROW;
--int		res_nmkquery (res_state, int, const char *, int, int,
--			      const u_char *, int, const u_char *, u_char *,
--			      int) __THROW;
--int		res_nsend (res_state, const u_char *, int, u_char *, int)
--     __THROW;
--void		res_nclose (res_state) __THROW;
--__END_DECLS
--#endif
--
--#endif /* !_RESOLV_H_ */
-Index: glibc-2.19/shadow/Makefile
-===================================================================
---- glibc-2.19.orig/shadow/Makefile
-+++ glibc-2.19/shadow/Makefile
-@@ -34,5 +34,6 @@ CFLAGS-fgetspent_r.c = -fexceptions $(li
- CFLAGS-putspent.c = -fexceptions $(libio-mtsafe)
- CFLAGS-getspnam.c = -fexceptions
- CFLAGS-getspnam_r.c = -fexceptions
-+CPPFLAGS-lckpwdf.c = -DSYSCONFDIR='"$(sysconfdir)"'
- 
- include ../Rules
-Index: glibc-2.19/shadow/lckpwdf.c
-===================================================================
---- glibc-2.19.orig/shadow/lckpwdf.c
-+++ glibc-2.19/shadow/lckpwdf.c
-@@ -29,7 +29,7 @@
- 
- 
- /* Name of the lock file.  */
--#define PWD_LOCKFILE "/etc/.pwd.lock"
-+#define PWD_LOCKFILE SYSCONFDIR "/.pwd.lock"
- 
- /* How long to wait for getting the lock before returning with an
-    error.  */
-Index: glibc-2.19/configure.ac
-===================================================================
---- glibc-2.19.orig/configure.ac
-+++ glibc-2.19/configure.ac
-@@ -2173,7 +2173,7 @@ RELEASE=`sed -n -e 's/^#define RELEASE "
- AC_SUBST(VERSION)
- AC_SUBST(RELEASE)
- 
--AC_CONFIG_FILES([config.make Makefile])
-+AC_CONFIG_FILES([config.make Makefile nss/db-Makefile resolv/netdb.h resolv/resolv.h])
- AC_CONFIG_COMMANDS([default],[[
- case $CONFIG_FILES in *config.make*)
- echo "$config_vars" >> config.make;;
-Index: glibc-2.19/resolv/netdb.h.in
-===================================================================
---- /dev/null
-+++ glibc-2.19/resolv/netdb.h.in
-@@ -0,0 +1,715 @@
-+  /* Copyright (C) 1996-2014 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+/* All data returned by the network data base library are supplied in
-+   host order and returned in network order (suitable for use in
-+   system calls).  */
-+
-+#ifndef	_NETDB_H
-+#define	_NETDB_H	1
-+
-+#include <features.h>
-+
-+#include <netinet/in.h>
-+#include <stdint.h>
-+#ifdef __USE_MISC
-+/* This is necessary to make this include file properly replace the
-+   Sun version.  */
-+# include <rpc/netdb.h>
-+#endif
-+
-+#ifdef __USE_GNU
-+# define __need_sigevent_t
-+# include <bits/siginfo.h>
-+# define __need_timespec
-+# include <time.h>
-+#endif
-+
-+#include <bits/netdb.h>
-+
-+/* Absolute file name for network data base files.  */
-+#define	_PATH_HEQUIV		"@libc_cv_sysconfdir@/hosts.equiv"
-+#define	_PATH_HOSTS		"@libc_cv_sysconfdir@/hosts"
-+#define	_PATH_NETWORKS		"@libc_cv_sysconfdir@/networks"
-+#define	_PATH_NSSWITCH_CONF	"@libc_cv_sysconfdir@/nsswitch.conf"
-+#define	_PATH_PROTOCOLS		"@libc_cv_sysconfdir@/protocols"
-+#define	_PATH_SERVICES		"@libc_cv_sysconfdir@/services"
-+
-+
-+__BEGIN_DECLS
-+
-+#if defined __USE_MISC || !defined __USE_XOPEN2K8
-+/* Error status for non-reentrant lookup functions.
-+   We use a macro to access always the thread-specific `h_errno' variable.  */
-+# define h_errno (*__h_errno_location ())
-+
-+/* Function to get address of global `h_errno' variable.  */
-+extern int *__h_errno_location (void) __THROW __attribute__ ((__const__));
-+
-+
-+/* Possible values left in `h_errno'.  */
-+# define HOST_NOT_FOUND	1	/* Authoritative Answer Host not found.  */
-+# define TRY_AGAIN	2	/* Non-Authoritative Host not found,
-+				   or SERVERFAIL.  */
-+# define NO_RECOVERY	3	/* Non recoverable errors, FORMERR, REFUSED,
-+				   NOTIMP.  */
-+# define NO_DATA	4	/* Valid name, no data record of requested
-+				   type.  */
-+#endif
-+#ifdef __USE_MISC
-+# define NETDB_INTERNAL	-1	/* See errno.  */
-+# define NETDB_SUCCESS	0	/* No problem.  */
-+# define NO_ADDRESS	NO_DATA	/* No address, look for MX record.  */
-+#endif
-+
-+#if defined __USE_XOPEN2K || defined __USE_XOPEN_EXTENDED
-+/* Highest reserved Internet port number.  */
-+# define IPPORT_RESERVED	1024
-+#endif
-+
-+#ifdef __USE_GNU
-+/* Scope delimiter for getaddrinfo(), getnameinfo().  */
-+# define SCOPE_DELIMITER	'%'
-+#endif
-+
-+#ifdef __USE_MISC
-+/* Print error indicated by `h_errno' variable on standard error.  STR
-+   if non-null is printed before the error string.  */
-+extern void herror (const char *__str) __THROW;
-+
-+/* Return string associated with error ERR_NUM.  */
-+extern const char *hstrerror (int __err_num) __THROW;
-+#endif
-+
-+
-+/* Description of data base entry for a single host.  */
-+struct hostent
-+{
-+  char *h_name;			/* Official name of host.  */
-+  char **h_aliases;		/* Alias list.  */
-+  int h_addrtype;		/* Host address type.  */
-+  int h_length;			/* Length of address.  */
-+  char **h_addr_list;		/* List of addresses from name server.  */
-+#ifdef __USE_MISC
-+# define	h_addr	h_addr_list[0] /* Address, for backward compatibility.*/
-+#endif
-+};
-+
-+/* Open host data base files and mark them as staying open even after
-+   a later search if STAY_OPEN is non-zero.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern void sethostent (int __stay_open);
-+
-+/* Close host data base files and clear `stay open' flag.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern void endhostent (void);
-+
-+/* Get next entry from host data base file.  Open data base if
-+   necessary.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern struct hostent *gethostent (void);
-+
-+/* Return entry from host data base which address match ADDR with
-+   length LEN and type TYPE.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern struct hostent *gethostbyaddr (const void *__addr, __socklen_t __len,
-+				      int __type);
-+
-+/* Return entry from host data base for host with NAME.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern struct hostent *gethostbyname (const char *__name);
-+
-+#ifdef __USE_MISC
-+/* Return entry from host data base for host with NAME.  AF must be
-+   set to the address type which is `AF_INET' for IPv4 or `AF_INET6'
-+   for IPv6.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern struct hostent *gethostbyname2 (const char *__name, int __af);
-+
-+/* Reentrant versions of the functions above.  The additional
-+   arguments specify a buffer of BUFLEN starting at BUF.  The last
-+   argument is a pointer to a variable which gets the value which
-+   would be stored in the global variable `herrno' by the
-+   non-reentrant functions.
-+
-+   These functions are not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation they are cancellation points and
-+   therefore not marked with __THROW.  */
-+extern int gethostent_r (struct hostent *__restrict __result_buf,
-+			 char *__restrict __buf, size_t __buflen,
-+			 struct hostent **__restrict __result,
-+			 int *__restrict __h_errnop);
-+
-+extern int gethostbyaddr_r (const void *__restrict __addr, __socklen_t __len,
-+			    int __type,
-+			    struct hostent *__restrict __result_buf,
-+			    char *__restrict __buf, size_t __buflen,
-+			    struct hostent **__restrict __result,
-+			    int *__restrict __h_errnop);
-+
-+extern int gethostbyname_r (const char *__restrict __name,
-+			    struct hostent *__restrict __result_buf,
-+			    char *__restrict __buf, size_t __buflen,
-+			    struct hostent **__restrict __result,
-+			    int *__restrict __h_errnop);
-+
-+extern int gethostbyname2_r (const char *__restrict __name, int __af,
-+			     struct hostent *__restrict __result_buf,
-+			     char *__restrict __buf, size_t __buflen,
-+			     struct hostent **__restrict __result,
-+			     int *__restrict __h_errnop);
-+#endif	/* misc */
-+
-+
-+/* Open network data base files and mark them as staying open even
-+   after a later search if STAY_OPEN is non-zero.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern void setnetent (int __stay_open);
-+
-+/* Close network data base files and clear `stay open' flag.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern void endnetent (void);
-+
-+/* Get next entry from network data base file.  Open data base if
-+   necessary.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern struct netent *getnetent (void);
-+
-+/* Return entry from network data base which address match NET and
-+   type TYPE.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern struct netent *getnetbyaddr (uint32_t __net, int __type);
-+
-+/* Return entry from network data base for network with NAME.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern struct netent *getnetbyname (const char *__name);
-+
-+#ifdef	__USE_MISC
-+/* Reentrant versions of the functions above.  The additional
-+   arguments specify a buffer of BUFLEN starting at BUF.  The last
-+   argument is a pointer to a variable which gets the value which
-+   would be stored in the global variable `herrno' by the
-+   non-reentrant functions.
-+
-+   These functions are not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation they are cancellation points and
-+   therefore not marked with __THROW.  */
-+extern int getnetent_r (struct netent *__restrict __result_buf,
-+			char *__restrict __buf, size_t __buflen,
-+			struct netent **__restrict __result,
-+			int *__restrict __h_errnop);
-+
-+extern int getnetbyaddr_r (uint32_t __net, int __type,
-+			   struct netent *__restrict __result_buf,
-+			   char *__restrict __buf, size_t __buflen,
-+			   struct netent **__restrict __result,
-+			   int *__restrict __h_errnop);
-+
-+extern int getnetbyname_r (const char *__restrict __name,
-+			   struct netent *__restrict __result_buf,
-+			   char *__restrict __buf, size_t __buflen,
-+			   struct netent **__restrict __result,
-+			   int *__restrict __h_errnop);
-+#endif	/* misc */
-+
-+
-+/* Description of data base entry for a single service.  */
-+struct servent
-+{
-+  char *s_name;			/* Official service name.  */
-+  char **s_aliases;		/* Alias list.  */
-+  int s_port;			/* Port number.  */
-+  char *s_proto;		/* Protocol to use.  */
-+};
-+
-+/* Open service data base files and mark them as staying open even
-+   after a later search if STAY_OPEN is non-zero.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern void setservent (int __stay_open);
-+
-+/* Close service data base files and clear `stay open' flag.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern void endservent (void);
-+
-+/* Get next entry from service data base file.  Open data base if
-+   necessary.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern struct servent *getservent (void);
-+
-+/* Return entry from network data base for network with NAME and
-+   protocol PROTO.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern struct servent *getservbyname (const char *__name, const char *__proto);
-+
-+/* Return entry from service data base which matches port PORT and
-+   protocol PROTO.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern struct servent *getservbyport (int __port, const char *__proto);
-+
-+
-+#ifdef	__USE_MISC
-+/* Reentrant versions of the functions above.  The additional
-+   arguments specify a buffer of BUFLEN starting at BUF.
-+
-+   These functions are not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation they are cancellation points and
-+   therefore not marked with __THROW.  */
-+extern int getservent_r (struct servent *__restrict __result_buf,
-+			 char *__restrict __buf, size_t __buflen,
-+			 struct servent **__restrict __result);
-+
-+extern int getservbyname_r (const char *__restrict __name,
-+			    const char *__restrict __proto,
-+			    struct servent *__restrict __result_buf,
-+			    char *__restrict __buf, size_t __buflen,
-+			    struct servent **__restrict __result);
-+
-+extern int getservbyport_r (int __port, const char *__restrict __proto,
-+			    struct servent *__restrict __result_buf,
-+			    char *__restrict __buf, size_t __buflen,
-+			    struct servent **__restrict __result);
-+#endif	/* misc */
-+
-+
-+/* Description of data base entry for a single service.  */
-+struct protoent
-+{
-+  char *p_name;			/* Official protocol name.  */
-+  char **p_aliases;		/* Alias list.  */
-+  int p_proto;			/* Protocol number.  */
-+};
-+
-+/* Open protocol data base files and mark them as staying open even
-+   after a later search if STAY_OPEN is non-zero.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern void setprotoent (int __stay_open);
-+
-+/* Close protocol data base files and clear `stay open' flag.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern void endprotoent (void);
-+
-+/* Get next entry from protocol data base file.  Open data base if
-+   necessary.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern struct protoent *getprotoent (void);
-+
-+/* Return entry from protocol data base for network with NAME.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern struct protoent *getprotobyname (const char *__name);
-+
-+/* Return entry from protocol data base which number is PROTO.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern struct protoent *getprotobynumber (int __proto);
-+
-+
-+#ifdef	__USE_MISC
-+/* Reentrant versions of the functions above.  The additional
-+   arguments specify a buffer of BUFLEN starting at BUF.
-+
-+   These functions are not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation they are cancellation points and
-+   therefore not marked with __THROW.  */
-+extern int getprotoent_r (struct protoent *__restrict __result_buf,
-+			  char *__restrict __buf, size_t __buflen,
-+			  struct protoent **__restrict __result);
-+
-+extern int getprotobyname_r (const char *__restrict __name,
-+			     struct protoent *__restrict __result_buf,
-+			     char *__restrict __buf, size_t __buflen,
-+			     struct protoent **__restrict __result);
-+
-+extern int getprotobynumber_r (int __proto,
-+			       struct protoent *__restrict __result_buf,
-+			       char *__restrict __buf, size_t __buflen,
-+			       struct protoent **__restrict __result);
-+
-+
-+/* Establish network group NETGROUP for enumeration.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int setnetgrent (const char *__netgroup);
-+
-+/* Free all space allocated by previous `setnetgrent' call.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern void endnetgrent (void);
-+
-+/* Get next member of netgroup established by last `setnetgrent' call
-+   and return pointers to elements in HOSTP, USERP, and DOMAINP.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int getnetgrent (char **__restrict __hostp,
-+			char **__restrict __userp,
-+			char **__restrict __domainp);
-+
-+
-+/* Test whether NETGROUP contains the triple (HOST,USER,DOMAIN).
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int innetgr (const char *__netgroup, const char *__host,
-+		    const char *__user, const char *__domain);
-+
-+/* Reentrant version of `getnetgrent' where result is placed in BUFFER.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int getnetgrent_r (char **__restrict __hostp,
-+			  char **__restrict __userp,
-+			  char **__restrict __domainp,
-+			  char *__restrict __buffer, size_t __buflen);
-+#endif	/* misc */
-+
-+
-+#ifdef __USE_MISC
-+/* Call `rshd' at port RPORT on remote machine *AHOST to execute CMD.
-+   The local user is LOCUSER, on the remote machine the command is
-+   executed as REMUSER.  In *FD2P the descriptor to the socket for the
-+   connection is returned.  The caller must have the right to use a
-+   reserved port.  When the function returns *AHOST contains the
-+   official host name.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int rcmd (char **__restrict __ahost, unsigned short int __rport,
-+		 const char *__restrict __locuser,
-+		 const char *__restrict __remuser,
-+		 const char *__restrict __cmd, int *__restrict __fd2p);
-+
-+/* This is the equivalent function where the protocol can be selected
-+   and which therefore can be used for IPv6.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int rcmd_af (char **__restrict __ahost, unsigned short int __rport,
-+		    const char *__restrict __locuser,
-+		    const char *__restrict __remuser,
-+		    const char *__restrict __cmd, int *__restrict __fd2p,
-+		    sa_family_t __af);
-+
-+/* Call `rexecd' at port RPORT on remote machine *AHOST to execute
-+   CMD.  The process runs at the remote machine using the ID of user
-+   NAME whose cleartext password is PASSWD.  In *FD2P the descriptor
-+   to the socket for the connection is returned.  When the function
-+   returns *AHOST contains the official host name.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int rexec (char **__restrict __ahost, int __rport,
-+		  const char *__restrict __name,
-+		  const char *__restrict __pass,
-+		  const char *__restrict __cmd, int *__restrict __fd2p);
-+
-+/* This is the equivalent function where the protocol can be selected
-+   and which therefore can be used for IPv6.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int rexec_af (char **__restrict __ahost, int __rport,
-+		     const char *__restrict __name,
-+		     const char *__restrict __pass,
-+		     const char *__restrict __cmd, int *__restrict __fd2p,
-+		     sa_family_t __af);
-+
-+/* Check whether user REMUSER on system RHOST is allowed to login as LOCUSER.
-+   If SUSER is not zero the user tries to become superuser.  Return 0 if
-+   it is possible.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int ruserok (const char *__rhost, int __suser,
-+		    const char *__remuser, const char *__locuser);
-+
-+/* This is the equivalent function where the protocol can be selected
-+   and which therefore can be used for IPv6.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int ruserok_af (const char *__rhost, int __suser,
-+		       const char *__remuser, const char *__locuser,
-+		       sa_family_t __af);
-+
-+/* Check whether user REMUSER on system indicated by IPv4 address
-+   RADDR is allowed to login as LOCUSER.  Non-IPv4 (e.g., IPv6) are
-+   not supported.  If SUSER is not zero the user tries to become
-+   superuser.  Return 0 if it is possible.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int iruserok (uint32_t __raddr, int __suser,
-+		     const char *__remuser, const char *__locuser);
-+
-+/* This is the equivalent function where the pfamiliy if the address
-+   pointed to by RADDR is determined by the value of AF.  It therefore
-+   can be used for IPv6
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int iruserok_af (const void *__raddr, int __suser,
-+			const char *__remuser, const char *__locuser,
-+			sa_family_t __af);
-+
-+/* Try to allocate reserved port, returning a descriptor for a socket opened
-+   at this port or -1 if unsuccessful.  The search for an available port
-+   will start at ALPORT and continues with lower numbers.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int rresvport (int *__alport);
-+
-+/* This is the equivalent function where the protocol can be selected
-+   and which therefore can be used for IPv6.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int rresvport_af (int *__alport, sa_family_t __af);
-+#endif
-+
-+
-+/* Extension from POSIX.1g.  */
-+#ifdef	__USE_POSIX
-+/* Structure to contain information about address of a service provider.  */
-+struct addrinfo
-+{
-+  int ai_flags;			/* Input flags.  */
-+  int ai_family;		/* Protocol family for socket.  */
-+  int ai_socktype;		/* Socket type.  */
-+  int ai_protocol;		/* Protocol for socket.  */
-+  socklen_t ai_addrlen;		/* Length of socket address.  */
-+  struct sockaddr *ai_addr;	/* Socket address for socket.  */
-+  char *ai_canonname;		/* Canonical name for service location.  */
-+  struct addrinfo *ai_next;	/* Pointer to next in list.  */
-+};
-+
-+# ifdef __USE_GNU
-+/* Structure used as control block for asynchronous lookup.  */
-+struct gaicb
-+{
-+  const char *ar_name;		/* Name to look up.  */
-+  const char *ar_service;	/* Service name.  */
-+  const struct addrinfo *ar_request; /* Additional request specification.  */
-+  struct addrinfo *ar_result;	/* Pointer to result.  */
-+  /* The following are internal elements.  */
-+  int __return;
-+  int __glibc_reserved[5];
-+};
-+
-+/* Lookup mode.  */
-+#  define GAI_WAIT	0
-+#  define GAI_NOWAIT	1
-+# endif
-+
-+/* Possible values for `ai_flags' field in `addrinfo' structure.  */
-+# define AI_PASSIVE	0x0001	/* Socket address is intended for `bind'.  */
-+# define AI_CANONNAME	0x0002	/* Request for canonical name.  */
-+# define AI_NUMERICHOST	0x0004	/* Don't use name resolution.  */
-+# define AI_V4MAPPED	0x0008	/* IPv4 mapped addresses are acceptable.  */
-+# define AI_ALL		0x0010	/* Return IPv4 mapped and IPv6 addresses.  */
-+# define AI_ADDRCONFIG	0x0020	/* Use configuration of this host to choose
-+				   returned address type..  */
-+# ifdef __USE_GNU
-+#  define AI_IDN	0x0040	/* IDN encode input (assuming it is encoded
-+				   in the current locale's character set)
-+				   before looking it up. */
-+#  define AI_CANONIDN	0x0080	/* Translate canonical name from IDN format. */
-+#  define AI_IDN_ALLOW_UNASSIGNED 0x0100 /* Don't reject unassigned Unicode
-+					    code points.  */
-+#  define AI_IDN_USE_STD3_ASCII_RULES 0x0200 /* Validate strings according to
-+						STD3 rules.  */
-+# endif
-+# define AI_NUMERICSERV	0x0400	/* Don't use name resolution.  */
-+
-+/* Error values for `getaddrinfo' function.  */
-+# define EAI_BADFLAGS	  -1	/* Invalid value for `ai_flags' field.  */
-+# define EAI_NONAME	  -2	/* NAME or SERVICE is unknown.  */
-+# define EAI_AGAIN	  -3	/* Temporary failure in name resolution.  */
-+# define EAI_FAIL	  -4	/* Non-recoverable failure in name res.  */
-+# define EAI_FAMILY	  -6	/* `ai_family' not supported.  */
-+# define EAI_SOCKTYPE	  -7	/* `ai_socktype' not supported.  */
-+# define EAI_SERVICE	  -8	/* SERVICE not supported for `ai_socktype'.  */
-+# define EAI_MEMORY	  -10	/* Memory allocation failure.  */
-+# define EAI_SYSTEM	  -11	/* System error returned in `errno'.  */
-+# define EAI_OVERFLOW	  -12	/* Argument buffer overflow.  */
-+# ifdef __USE_GNU
-+#  define EAI_NODATA	  -5	/* No address associated with NAME.  */
-+#  define EAI_ADDRFAMILY  -9	/* Address family for NAME not supported.  */
-+#  define EAI_INPROGRESS  -100	/* Processing request in progress.  */
-+#  define EAI_CANCELED	  -101	/* Request canceled.  */
-+#  define EAI_NOTCANCELED -102	/* Request not canceled.  */
-+#  define EAI_ALLDONE	  -103	/* All requests done.  */
-+#  define EAI_INTR	  -104	/* Interrupted by a signal.  */
-+#  define EAI_IDN_ENCODE  -105	/* IDN encoding failed.  */
-+# endif
-+
-+# ifdef __USE_MISC
-+#  define NI_MAXHOST      1025
-+#  define NI_MAXSERV      32
-+# endif
-+
-+# define NI_NUMERICHOST	1	/* Don't try to look up hostname.  */
-+# define NI_NUMERICSERV 2	/* Don't convert port number to name.  */
-+# define NI_NOFQDN	4	/* Only return nodename portion.  */
-+# define NI_NAMEREQD	8	/* Don't return numeric addresses.  */
-+# define NI_DGRAM	16	/* Look up UDP service rather than TCP.  */
-+# ifdef __USE_GNU
-+#  define NI_IDN	32	/* Convert name from IDN format.  */
-+#  define NI_IDN_ALLOW_UNASSIGNED 64 /* Don't reject unassigned Unicode
-+					code points.  */
-+#  define NI_IDN_USE_STD3_ASCII_RULES 128 /* Validate strings according to
-+					     STD3 rules.  */
-+# endif
-+
-+/* Translate name of a service location and/or a service name to set of
-+   socket addresses.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern int getaddrinfo (const char *__restrict __name,
-+			const char *__restrict __service,
-+			const struct addrinfo *__restrict __req,
-+			struct addrinfo **__restrict __pai);
-+
-+/* Free `addrinfo' structure AI including associated storage.  */
-+extern void freeaddrinfo (struct addrinfo *__ai) __THROW;
-+
-+/* Convert error return from getaddrinfo() to a string.  */
-+extern const char *gai_strerror (int __ecode) __THROW;
-+
-+/* Translate a socket address to a location and service name.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern int getnameinfo (const struct sockaddr *__restrict __sa,
-+			socklen_t __salen, char *__restrict __host,
-+			socklen_t __hostlen, char *__restrict __serv,
-+			socklen_t __servlen, int __flags);
-+#endif	/* POSIX */
-+
-+#ifdef __USE_GNU
-+/* Enqueue ENT requests from the LIST.  If MODE is GAI_WAIT wait until all
-+   requests are handled.  If WAIT is GAI_NOWAIT return immediately after
-+   queueing the requests and signal completion according to SIG.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int getaddrinfo_a (int __mode, struct gaicb *__list[__restrict_arr],
-+			  int __ent, struct sigevent *__restrict __sig);
-+
-+/* Suspend execution of the thread until at least one of the ENT requests
-+   in LIST is handled.  If TIMEOUT is not a null pointer it specifies the
-+   longest time the function keeps waiting before returning with an error.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int gai_suspend (const struct gaicb *const __list[], int __ent,
-+			const struct timespec *__timeout);
-+
-+/* Get the error status of the request REQ.  */
-+extern int gai_error (struct gaicb *__req) __THROW;
-+
-+/* Cancel the requests associated with GAICBP.  */
-+extern int gai_cancel (struct gaicb *__gaicbp) __THROW;
-+#endif	/* GNU */
-+
-+__END_DECLS
-+
-+#endif	/* netdb.h */
-Index: glibc-2.19/resolv/resolv.h.in
-===================================================================
---- /dev/null
-+++ glibc-2.19/resolv/resolv.h.in
-@@ -0,0 +1,389 @@
-+/*
-+ * Copyright (c) 1983, 1987, 1989
-+ *    The Regents of the University of California.  All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 4. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+/*
-+ * Portions Copyright (c) 1996-1999 by Internet Software Consortium.
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
-+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
-+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-+ * SOFTWARE.
-+ */
-+
-+/*
-+ *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
-+ *	$BINDId: resolv.h,v 8.31 2000/03/30 20:16:50 vixie Exp $
-+ */
-+
-+#ifndef _RESOLV_H_
-+
-+/* These headers are needed for types used in the `struct res_state'
-+   declaration.  */
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+
-+#ifndef __need_res_state
-+# define _RESOLV_H_
-+
-+# include <sys/param.h>
-+# include <sys/cdefs.h>
-+# include <stdio.h>
-+# include <arpa/nameser.h>
-+#endif
-+
-+#ifndef __res_state_defined
-+# define __res_state_defined
-+
-+typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error }
-+	res_sendhookact;
-+
-+typedef res_sendhookact (*res_send_qhook) (struct sockaddr_in * const *__ns,
-+					   const u_char **__query,
-+					   int *__querylen,
-+					   u_char *__ans,
-+					   int __anssiz,
-+					   int *__resplen);
-+
-+typedef res_sendhookact (*res_send_rhook) (const struct sockaddr_in *__ns,
-+					   const u_char *__query,
-+					   int __querylen,
-+					   u_char *__ans,
-+					   int __anssiz,
-+					   int *__resplen);
-+
-+/*
-+ * Global defines and variables for resolver stub.
-+ */
-+# define MAXNS			3	/* max # name servers we'll track */
-+# define MAXDFLSRCH		3	/* # default domain levels to try */
-+# define MAXDNSRCH		6	/* max # domains in search path */
-+# define LOCALDOMAINPARTS	2	/* min levels in name that is "local" */
-+
-+# define RES_TIMEOUT		5	/* min. seconds between retries */
-+# define MAXRESOLVSORT		10	/* number of net to sort on */
-+# define RES_MAXNDOTS		15	/* should reflect bit field size */
-+# define RES_MAXRETRANS		30	/* only for resolv.conf/RES_OPTIONS */
-+# define RES_MAXRETRY		5	/* only for resolv.conf/RES_OPTIONS */
-+# define RES_DFLRETRY		2	/* Default #/tries. */
-+# define RES_MAXTIME		65535	/* Infinity, in milliseconds. */
-+
-+struct __res_state {
-+	int	retrans;		/* retransmition time interval */
-+	int	retry;			/* number of times to retransmit */
-+	u_long	options;		/* option flags - see below. */
-+	int	nscount;		/* number of name servers */
-+	struct sockaddr_in
-+		nsaddr_list[MAXNS];	/* address of name server */
-+# define nsaddr	nsaddr_list[0]		/* for backward compatibility */
-+	u_short	id;			/* current message id */
-+	/* 2 byte hole here.  */
-+	char	*dnsrch[MAXDNSRCH+1];	/* components of domain to search */
-+	char	defdname[256];		/* default domain (deprecated) */
-+	u_long	pfcode;			/* RES_PRF_ flags - see below. */
-+	unsigned ndots:4;		/* threshold for initial abs. query */
-+	unsigned nsort:4;		/* number of elements in sort_list[] */
-+	unsigned ipv6_unavail:1;	/* connecting to IPv6 server failed */
-+	unsigned unused:23;
-+	struct {
-+		struct in_addr	addr;
-+		u_int32_t	mask;
-+	} sort_list[MAXRESOLVSORT];
-+	/* 4 byte hole here on 64-bit architectures.  */
-+	res_send_qhook qhook;		/* query hook */
-+	res_send_rhook rhook;		/* response hook */
-+	int	res_h_errno;		/* last one set for this context */
-+	int	_vcsock;		/* PRIVATE: for res_send VC i/o */
-+	u_int	_flags;			/* PRIVATE: see below */
-+	/* 4 byte hole here on 64-bit architectures.  */
-+	union {
-+		char	pad[52];	/* On an i386 this means 512b total. */
-+		struct {
-+			u_int16_t		nscount;
-+			u_int16_t		nsmap[MAXNS];
-+			int			nssocks[MAXNS];
-+			u_int16_t		nscount6;
-+			u_int16_t		nsinit;
-+			struct sockaddr_in6	*nsaddrs[MAXNS];
-+#ifdef _LIBC
-+			unsigned long long int	initstamp
-+			  __attribute__((packed));
-+#else
-+			unsigned int		_initstamp[2];
-+#endif
-+		} _ext;
-+	} _u;
-+};
-+
-+typedef struct __res_state *res_state;
-+# undef __need_res_state
-+#endif
-+
-+#ifdef _RESOLV_H_
-+/*
-+ * Revision information.  This is the release date in YYYYMMDD format.
-+ * It can change every day so the right thing to do with it is use it
-+ * in preprocessor commands such as "#if (__RES > 19931104)".  Do not
-+ * compare for equality; rather, use it to determine whether your resolver
-+ * is new enough to contain a certain feature.
-+ */
-+
-+#define	__RES	19991006
-+
-+/*
-+ * Resolver configuration file.
-+ * Normally not present, but may contain the address of the
-+ * inital name server(s) to query and the domain search list.
-+ */
-+
-+#ifndef _PATH_RESCONF
-+#define _PATH_RESCONF        "@libc_cv_sysconfdir@/resolv.conf"
-+#endif
-+
-+struct res_sym {
-+	int	number;		/* Identifying number, like T_MX */
-+	char *	name;		/* Its symbolic name, like "MX" */
-+	char *	humanname;	/* Its fun name, like "mail exchanger" */
-+};
-+
-+/*
-+ * Resolver flags (used to be discrete per-module statics ints).
-+ */
-+#define	RES_F_VC	0x00000001	/* socket is TCP */
-+#define	RES_F_CONN	0x00000002	/* socket is connected */
-+#define RES_F_EDNS0ERR	0x00000004	/* EDNS0 caused errors */
-+
-+/* res_findzonecut() options */
-+#define	RES_EXHAUSTIVE	0x00000001	/* always do all queries */
-+
-+/*
-+ * Resolver options (keep these in synch with res_debug.c, please)
-+ */
-+#define RES_INIT	0x00000001	/* address initialized */
-+#define RES_DEBUG	0x00000002	/* print debug messages */
-+#define RES_AAONLY	0x00000004	/* authoritative answers only (!IMPL)*/
-+#define RES_USEVC	0x00000008	/* use virtual circuit */
-+#define RES_PRIMARY	0x00000010	/* query primary server only (!IMPL) */
-+#define RES_IGNTC	0x00000020	/* ignore trucation errors */
-+#define RES_RECURSE	0x00000040	/* recursion desired */
-+#define RES_DEFNAMES	0x00000080	/* use default domain name */
-+#define RES_STAYOPEN	0x00000100	/* Keep TCP socket open */
-+#define RES_DNSRCH	0x00000200	/* search up local domain tree */
-+#define	RES_INSECURE1	0x00000400	/* type 1 security disabled */
-+#define	RES_INSECURE2	0x00000800	/* type 2 security disabled */
-+#define	RES_NOALIASES	0x00001000	/* shuts off HOSTALIASES feature */
-+#define	RES_USE_INET6	0x00002000	/* use/map IPv6 in gethostbyname() */
-+#define RES_ROTATE	0x00004000	/* rotate ns list after each query */
-+#define	RES_NOCHECKNAME	0x00008000	/* do not check names for sanity (!IMPL) */
-+#define	RES_KEEPTSIG	0x00010000	/* do not strip TSIG records */
-+#define	RES_BLAST	0x00020000	/* blast all recursive servers */
-+#define RES_USEBSTRING	0x00040000	/* IPv6 reverse lookup with byte
-+					   strings */
-+#define RES_NOIP6DOTINT	0x00080000	/* Do not use .ip6.int in IPv6
-+					   reverse lookup */
-+#define RES_USE_EDNS0	0x00100000	/* Use EDNS0.  */
-+#define RES_SNGLKUP	0x00200000	/* one outstanding request at a time */
-+#define RES_SNGLKUPREOP	0x00400000	/* -"-, but open new socket for each
-+					   request */
-+#define RES_USE_DNSSEC	0x00800000	/* use DNSSEC using OK bit in OPT */
-+#define RES_NOTLDQUERY	0x01000000	/* Do not look up unqualified name
-+					   as a TLD.  */
-+
-+#define RES_DEFAULT	(RES_RECURSE|RES_DEFNAMES|RES_DNSRCH|RES_NOIP6DOTINT)
-+
-+/*
-+ * Resolver "pfcode" values.  Used by dig.
-+ */
-+#define RES_PRF_STATS	0x00000001
-+#define RES_PRF_UPDATE	0x00000002
-+#define RES_PRF_CLASS   0x00000004
-+#define RES_PRF_CMD	0x00000008
-+#define RES_PRF_QUES	0x00000010
-+#define RES_PRF_ANS	0x00000020
-+#define RES_PRF_AUTH	0x00000040
-+#define RES_PRF_ADD	0x00000080
-+#define RES_PRF_HEAD1	0x00000100
-+#define RES_PRF_HEAD2	0x00000200
-+#define RES_PRF_TTLID	0x00000400
-+#define RES_PRF_HEADX	0x00000800
-+#define RES_PRF_QUERY	0x00001000
-+#define RES_PRF_REPLY	0x00002000
-+#define RES_PRF_INIT	0x00004000
-+/*			0x00008000	*/
-+
-+/* Things involving an internal (static) resolver context. */
-+__BEGIN_DECLS
-+extern struct __res_state *__res_state(void) __attribute__ ((__const__));
-+__END_DECLS
-+#define _res (*__res_state())
-+
-+#ifndef __BIND_NOSTATIC
-+#define fp_nquery		__fp_nquery
-+#define fp_query		__fp_query
-+#define hostalias		__hostalias
-+#define p_query			__p_query
-+#define res_close		__res_close
-+#define res_init		__res_init
-+#define res_isourserver		__res_isourserver
-+#define res_mkquery		__res_mkquery
-+#define res_query		__res_query
-+#define res_querydomain		__res_querydomain
-+#define res_search		__res_search
-+#define res_send		__res_send
-+
-+__BEGIN_DECLS
-+void		fp_nquery (const u_char *, int, FILE *) __THROW;
-+void		fp_query (const u_char *, FILE *) __THROW;
-+const char *	hostalias (const char *) __THROW;
-+void		p_query (const u_char *) __THROW;
-+void		res_close (void) __THROW;
-+int		res_init (void) __THROW;
-+int		res_isourserver (const struct sockaddr_in *) __THROW;
-+int		res_mkquery (int, const char *, int, int, const u_char *,
-+			     int, const u_char *, u_char *, int) __THROW;
-+int		res_query (const char *, int, int, u_char *, int) __THROW;
-+int		res_querydomain (const char *, const char *, int, int,
-+				 u_char *, int) __THROW;
-+int		res_search (const char *, int, int, u_char *, int) __THROW;
-+int		res_send (const u_char *, int, u_char *, int) __THROW;
-+__END_DECLS
-+#endif
-+
-+#define b64_ntop		__b64_ntop
-+#define b64_pton		__b64_pton
-+#define dn_comp			__dn_comp
-+#define dn_count_labels		__dn_count_labels
-+#define dn_expand		__dn_expand
-+#define dn_skipname		__dn_skipname
-+#define fp_resstat		__fp_resstat
-+#define loc_aton		__loc_aton
-+#define loc_ntoa		__loc_ntoa
-+#define p_cdname		__p_cdname
-+#define p_cdnname		__p_cdnname
-+#define p_class			__p_class
-+#define p_fqname		__p_fqname
-+#define p_fqnname		__p_fqnname
-+#define p_option		__p_option
-+#define p_secstodate		__p_secstodate
-+#define p_section		__p_section
-+#define p_time			__p_time
-+#define p_type			__p_type
-+#define p_rcode			__p_rcode
-+#define putlong			__putlong
-+#define putshort		__putshort
-+#define res_dnok		__res_dnok
-+#define res_hnok		__res_hnok
-+#define res_hostalias		__res_hostalias
-+#define res_mailok		__res_mailok
-+#define res_nameinquery		__res_nameinquery
-+#define res_nclose		__res_nclose
-+#define res_ninit		__res_ninit
-+#define res_nmkquery		__res_nmkquery
-+#define res_npquery		__res_npquery
-+#define res_nquery		__res_nquery
-+#define res_nquerydomain	__res_nquerydomain
-+#define res_nsearch		__res_nsearch
-+#define res_nsend		__res_nsend
-+#define res_nisourserver	__res_nisourserver
-+#define res_ownok		__res_ownok
-+#define res_queriesmatch	__res_queriesmatch
-+#define res_randomid		__res_randomid
-+#define sym_ntop		__sym_ntop
-+#define sym_ntos		__sym_ntos
-+#define sym_ston		__sym_ston
-+__BEGIN_DECLS
-+int		res_hnok (const char *) __THROW;
-+int		res_ownok (const char *) __THROW;
-+int		res_mailok (const char *) __THROW;
-+int		res_dnok (const char *) __THROW;
-+int		sym_ston (const struct res_sym *, const char *, int *) __THROW;
-+const char *	sym_ntos (const struct res_sym *, int, int *) __THROW;
-+const char *	sym_ntop (const struct res_sym *, int, int *) __THROW;
-+int		b64_ntop (u_char const *, size_t, char *, size_t) __THROW;
-+int		b64_pton (char const *, u_char *, size_t) __THROW;
-+int		loc_aton (const char *__ascii, u_char *__binary) __THROW;
-+const char *	loc_ntoa (const u_char *__binary, char *__ascii) __THROW;
-+int		dn_skipname (const u_char *, const u_char *) __THROW;
-+void		putlong (u_int32_t, u_char *) __THROW;
-+void		putshort (u_int16_t, u_char *) __THROW;
-+const char *	p_class (int) __THROW;
-+const char *	p_time (u_int32_t) __THROW;
-+const char *	p_type (int) __THROW;
-+const char *	p_rcode (int) __THROW;
-+const u_char *	p_cdnname (const u_char *, const u_char *, int, FILE *)
-+     __THROW;
-+const u_char *	p_cdname (const u_char *, const u_char *, FILE *) __THROW;
-+const u_char *	p_fqnname (const u_char *__cp, const u_char *__msg,
-+			   int, char *, int) __THROW;
-+const u_char *	p_fqname (const u_char *, const u_char *, FILE *) __THROW;
-+const char *	p_option (u_long __option) __THROW;
-+char *		p_secstodate (u_long) __THROW;
-+int		dn_count_labels (const char *) __THROW;
-+int		dn_comp (const char *, u_char *, int, u_char **, u_char **)
-+     __THROW;
-+int		dn_expand (const u_char *, const u_char *, const u_char *,
-+			   char *, int) __THROW;
-+u_int		res_randomid (void) __THROW;
-+int		res_nameinquery (const char *, int, int,
-+				 const u_char *, const u_char *) __THROW;
-+int		res_queriesmatch (const u_char *, const u_char *,
-+				  const u_char *, const u_char *) __THROW;
-+const char *	p_section (int __section, int __opcode) __THROW;
-+/* Things involving a resolver context. */
-+int		res_ninit (res_state) __THROW;
-+int		res_nisourserver (const res_state,
-+				  const struct sockaddr_in *) __THROW;
-+void		fp_resstat (const res_state, FILE *) __THROW;
-+void		res_npquery (const res_state, const u_char *, int, FILE *)
-+     __THROW;
-+const char *	res_hostalias (const res_state, const char *, char *, size_t)
-+     __THROW;
-+int		res_nquery (res_state, const char *, int, int, u_char *, int)
-+     __THROW;
-+int		res_nsearch (res_state, const char *, int, int, u_char *, int)
-+     __THROW;
-+int		res_nquerydomain (res_state, const char *, const char *, int,
-+				  int, u_char *, int) __THROW;
-+int		res_nmkquery (res_state, int, const char *, int, int,
-+			      const u_char *, int, const u_char *, u_char *,
-+			      int) __THROW;
-+int		res_nsend (res_state, const u_char *, int, u_char *, int)
-+     __THROW;
-+void		res_nclose (res_state) __THROW;
-+__END_DECLS
-+#endif
-+
-+#endif /* !_RESOLV_H_ */
-Index: glibc-2.19/configure
-===================================================================
---- glibc-2.19.orig/configure
-+++ glibc-2.19/configure
-@@ -7387,7 +7387,7 @@ RELEASE=`sed -n -e 's/^#define RELEASE "
- 
- 
- 
--ac_config_files="$ac_config_files config.make Makefile"
-+ac_config_files="$ac_config_files config.make Makefile nss/db-Makefile resolv/netdb.h resolv/resolv.h"
- 
- ac_config_commands="$ac_config_commands default"
- 
-@@ -8107,6 +8107,9 @@ do
-     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-     "config.make") CONFIG_FILES="$CONFIG_FILES config.make" ;;
-     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+    "nss/db-Makefile") CONFIG_FILES="$CONFIG_FILES nss/db-Makefile" ;;
-+    "resolv/netdb.h") CONFIG_FILES="$CONFIG_FILES resolv/netdb.h" ;;
-+    "resolv/resolv.h") CONFIG_FILES="$CONFIG_FILES resolv/resolv.h" ;;
-     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
- 
-   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

diff --git a/sys-libs/glibc/files/2.19/glibc-2.19-hardened-configure-picdefault.patch b/sys-libs/glibc/files/2.19/glibc-2.19-hardened-configure-picdefault.patch
deleted file mode 100644
index 341d8c5..0000000
--- a/sys-libs/glibc/files/2.19/glibc-2.19-hardened-configure-picdefault.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Prevent default-fPIE from confusing configure into thinking
-PIC code is default.  This causes glibc to build both PIC and
-non-PIC code as normal, which on the hardened compiler generates
-PIC and PIE.
-
-Patch by Kevin F. Quinn <kevquinn@g.o>
-Fixed for glibc 2.19 by Magnus Granberg <zorry@×××.nu>
-
---- configure.ac
-+++ configure.ac
-@@ -2145,7 +2145,7 @@
- # error PIC is default.
- #endif
- EOF
--if eval "${CC-cc} -S conftest.c 2>&AS_MESSAGE_LOG_FD 1>&AS_MESSAGE_LOG_FD"; then
-+if eval "${CC-cc} -fno-PIE -S conftest.c 2>&AS_MESSAGE_LOG_FD 1>&AS_MESSAGE_LOG_FD"; then
-   libc_cv_pic_default=no
- fi
- rm -f conftest.*])
---- configure
-+++ configure
-@@ -7698,7 +7698,7 @@
- # error PIC is default.
- #endif
- EOF
--if eval "${CC-cc} -S conftest.c 2>&5 1>&5"; then
-+if eval "${CC-cc} -fno-PIE -S conftest.c 2>&5 1>&5"; then
-   libc_cv_pic_default=no
- fi
- rm -f conftest.*

diff --git a/sys-libs/glibc/files/2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch b/sys-libs/glibc/files/2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch
deleted file mode 100644
index 72a616a..0000000
--- a/sys-libs/glibc/files/2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://bugs.gentoo.org/503838
-http://gcc.gnu.org/PR60465
-https://sourceware.org/ml/libc-alpha/2015-12/msg00556.html
-https://trofi.github.io/posts/189-glibc-on-ia64-or-how-relocations-bootstrap.html
-
-newer versions of gcc generate relocations in the elf_get_dynamic_info func
-which glibc relies on to populate some info structs.  those structs are then
-used by ldso to process relocations in itself.  glibc requires that there are
-no relocations until that point (*after* elf_get_dynamic_info), so we end up
-crashing during elf_get_dynamic_info because the relocation has not yet been
-processed.
-
-this hack shuffles the code in a way that tricks gcc into not generating the
-relocation.  we need to figure out something better for upstream.
-
---- a/elf/get-dynamic-info.h
-+++ b/elf/get-dynamic-info.h
-@@ -66,8 +66,12 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp)
- 	info[DT_VALTAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM
- 	     + DT_VERSIONTAGNUM + DT_EXTRANUM] = dyn;
-       else if ((d_tag_utype) DT_ADDRTAGIDX (dyn->d_tag) < DT_ADDRNUM)
--	info[DT_ADDRTAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM
--	     + DT_VERSIONTAGNUM + DT_EXTRANUM + DT_VALNUM] = dyn;
-+	{
-+	  d_tag_utype i =
-+	      DT_ADDRTAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM
-+	      + DT_VERSIONTAGNUM + DT_EXTRANUM + DT_VALNUM;
-+	  info[i] = dyn;
-+	}
-       ++dyn;
-     }
- 

diff --git a/sys-libs/glibc/files/2.19/glibc-2.19-vdso-disable.patch b/sys-libs/glibc/files/2.19/glibc-2.19-vdso-disable.patch
deleted file mode 100644
index 31ed0d4..0000000
--- a/sys-libs/glibc/files/2.19/glibc-2.19-vdso-disable.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Disable vdso for some buggy kernels
-http://thread.gmane.org/gmane.comp.lib.glibc.user/1903
-
-Index: glibc-2.19/elf/dl-support.c
-===================================================================
---- glibc-2.19.orig/elf/dl-support.c
-+++ glibc-2.19/elf/dl-support.c
-@@ -260,16 +260,6 @@ _dl_aux_init (ElfW(auxv_t) *av)
-       case AT_FPUCW:
- 	GLRO(dl_fpu_control) = av->a_un.a_val;
- 	break;
--#ifdef NEED_DL_SYSINFO
--      case AT_SYSINFO:
--	GL(dl_sysinfo) = av->a_un.a_val;
--	break;
--#endif
--#ifdef NEED_DL_SYSINFO_DSO
--      case AT_SYSINFO_EHDR:
--	GL(dl_sysinfo_dso) = (void *) av->a_un.a_val;
--	break;
--#endif
-       case AT_UID:
- 	uid ^= av->a_un.a_val;
- 	seen |= 1;
-Index: glibc-2.19/elf/setup-vdso.h
-===================================================================
---- glibc-2.19.orig/elf/setup-vdso.h
-+++ glibc-2.19/elf/setup-vdso.h
-@@ -20,7 +20,7 @@ static inline void __attribute__ ((alway
- setup_vdso (struct link_map *main_map __attribute__ ((unused)),
- 	    struct link_map ***first_preload __attribute__ ((unused)))
- {
--#ifdef NEED_DL_SYSINFO_DSO
-+#if 0
-   if (GLRO(dl_sysinfo_dso) == NULL)
-     return;
- 

diff --git a/sys-libs/glibc/files/2.20/glibc-2.20-configurable-paths.patch b/sys-libs/glibc/files/2.20/glibc-2.20-configurable-paths.patch
deleted file mode 100644
index 1480595..0000000
--- a/sys-libs/glibc/files/2.20/glibc-2.20-configurable-paths.patch
+++ /dev/null
@@ -1,3012 +0,0 @@
-Index: glibc-2.20/nis/Makefile
-===================================================================
---- glibc-2.20.orig/nis/Makefile
-+++ glibc-2.20/nis/Makefile
-@@ -58,6 +58,11 @@ libnsl-routines = yp_xdr ypclnt ypupdate
- 		  nis_clone_res nss-default
- 
- libnss_compat-routines	:= $(addprefix compat-,grp pwd spwd initgroups)
-+SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"'
-+CPPFLAGS-compat-grp.c = $(SYSCONF-FLAGS)
-+CPPFLAGS-compat-pwd.c = $(SYSCONF-FLAGS)
-+CPPFLAGS-compat-spwd.c = $(SYSCONF-FLAGS)
-+CPPFLAGS-compat-initgroups.c = $(SYSCONF-FLAGS)
- libnss_compat-inhibit-o	= $(filter-out .os,$(object-suffixes))
- 
- libnss_nis-routines	:= $(addprefix nis-,$(databases)) nis-initgroups \
-Index: glibc-2.20/nis/nss_compat/compat-grp.c
-===================================================================
---- glibc-2.20.orig/nis/nss_compat/compat-grp.c
-+++ glibc-2.20/nis/nss_compat/compat-grp.c
-@@ -120,7 +120,7 @@ internal_setgrent (ent_t *ent, int stayo
- 
-   if (ent->stream == NULL)
-     {
--      ent->stream = fopen ("/etc/group", "rme");
-+      ent->stream = fopen (SYSCONFDIR "/group", "rme");
- 
-       if (ent->stream == NULL)
- 	status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL;
-Index: glibc-2.20/nis/nss_compat/compat-initgroups.c
-===================================================================
---- glibc-2.20.orig/nis/nss_compat/compat-initgroups.c
-+++ glibc-2.20/nis/nss_compat/compat-initgroups.c
-@@ -136,7 +136,7 @@ internal_setgrent (ent_t *ent)
-   else
-     ent->blacklist.current = 0;
- 
--  ent->stream = fopen ("/etc/group", "rme");
-+  ent->stream = fopen (SYSCONFDIR "/group", "rme");
- 
-   if (ent->stream == NULL)
-     status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL;
-Index: glibc-2.20/nis/nss_compat/compat-pwd.c
-===================================================================
---- glibc-2.20.orig/nis/nss_compat/compat-pwd.c
-+++ glibc-2.20/nis/nss_compat/compat-pwd.c
-@@ -235,7 +235,7 @@ internal_setpwent (ent_t *ent, int stayo
- 
-   if (ent->stream == NULL)
-     {
--      ent->stream = fopen ("/etc/passwd", "rme");
-+      ent->stream = fopen (SYSCONFDIR "/passwd", "rme");
- 
-       if (ent->stream == NULL)
- 	status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL;
-Index: glibc-2.20/nis/nss_compat/compat-spwd.c
-===================================================================
---- glibc-2.20.orig/nis/nss_compat/compat-spwd.c
-+++ glibc-2.20/nis/nss_compat/compat-spwd.c
-@@ -191,7 +191,7 @@ internal_setspent (ent_t *ent, int stayo
- 
-   if (ent->stream == NULL)
-     {
--      ent->stream = fopen ("/etc/shadow", "rme");
-+      ent->stream = fopen (SYSCONFDIR "/shadow", "rme");
- 
-       if (ent->stream == NULL)
- 	status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL;
-Index: glibc-2.20/nss/Makefile
-===================================================================
---- glibc-2.20.orig/nss/Makefile
-+++ glibc-2.20/nss/Makefile
-@@ -41,6 +41,8 @@ extra-objs		+= $(makedb-modules:=.o)
- 
- tests			= test-netdb tst-nss-test1 test-digits-dots
- xtests			= bug-erange
-+SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"'
-+CPPFLAGS-bug-erange.c = $(SYSCONF-FLAGS)
- 
- # Specify rules for the nss_* modules.  We have some services.
- services		:= files db
-@@ -57,6 +59,8 @@ vpath %.c $(subdir-dirs) ../locale/progr
- 
- libnss_files-routines	:= $(addprefix files-,$(databases)) \
- 			   files-initgroups files-have_o_cloexec files-init
-+CPPFLAGS-files-init.c = $(SYSCONF-FLAGS)
-+CPPFLAGS-files-initgroups.c = $(SYSCONF-FLAGS)
- 
- libnss_db-dbs		:= $(addprefix db-,\
- 				       $(filter-out hosts network key alias,\
-@@ -102,7 +106,7 @@ $(libnss_db-dbs:%=$(objpfx)%.c): $(objpf
- 
- $(objpfx)makedb: $(makedb-modules:%=$(objpfx)%.o)
- 
--$(inst_vardbdir)/Makefile: db-Makefile $(+force)
-+$(inst_vardbdir)/Makefile: $(objpfx)db-Makefile $(+force)
- 	$(do-install)
- 
- CFLAGS-nss_test1.c = -DNOT_IN_libc=1
-Index: glibc-2.20/nss/bug-erange.c
-===================================================================
---- glibc-2.20.orig/nss/bug-erange.c
-+++ glibc-2.20/nss/bug-erange.c
-@@ -37,7 +37,7 @@ main (void)
-     {
-       printf ("gethostbyname_r failed: %s (errno: %m)\n", strerror (res));
- 
--      if (access ("/etc/resolv.conf", R_OK))
-+      if (access (SYSCONFDIR "/resolv.conf", R_OK))
- 	{
- 	  puts ("DNS probably not set up");
- 	  return 0;
-Index: glibc-2.20/nss/nss_files/files-init.c
-===================================================================
---- glibc-2.20.orig/nss/nss_files/files-init.c
-+++ glibc-2.20/nss/nss_files/files-init.c
-@@ -35,33 +35,33 @@ static union							\
-     }								\
-   }
- 
--TF (pwd, "/etc/passwd");
--TF (grp, "/etc/group");
--TF (hst, "/etc/hosts");
--TF (resolv, "/etc/resolv.conf", .call_res_init = 1);
--TF (serv, "/etc/services");
--TF (netgr, "/etc/netgroup");
-+TF (pwd, SYSCONFDIR "/passwd");
-+TF (grp, SYSCONFDIR "/group");
-+TF (hst, SYSCONFDIR "/hosts");
-+TF (resolv, SYSCONFDIR "/resolv.conf", .call_res_init = 1);
-+TF (serv, SYSCONFDIR "/services");
-+TF (netgr, SYSCONFDIR "/netgroup");
- 
- 
- void
- _nss_files_init (void (*cb) (size_t, struct traced_file *))
- {
--  strcpy (pwd_traced_file.file.fname, "/etc/passwd");
-+  strcpy (pwd_traced_file.file.fname, SYSCONFDIR "/passwd");
-   cb (pwddb, &pwd_traced_file.file);
- 
--  strcpy (grp_traced_file.file.fname, "/etc/group");
-+  strcpy (grp_traced_file.file.fname, SYSCONFDIR "/group");
-   cb (grpdb, &grp_traced_file.file);
- 
--  strcpy (hst_traced_file.file.fname, "/etc/hosts");
-+  strcpy (hst_traced_file.file.fname, SYSCONFDIR "/hosts");
-   cb (hstdb, &hst_traced_file.file);
- 
--  strcpy (resolv_traced_file.file.fname, "/etc/resolv.conf");
-+  strcpy (resolv_traced_file.file.fname, SYSCONFDIR "/resolv.conf");
-   cb (hstdb, &resolv_traced_file.file);
- 
--  strcpy (serv_traced_file.file.fname, "/etc/services");
-+  strcpy (serv_traced_file.file.fname, SYSCONFDIR "/services");
-   cb (servdb, &serv_traced_file.file);
- 
--  strcpy (netgr_traced_file.file.fname, "/etc/netgroup");
-+  strcpy (netgr_traced_file.file.fname, SYSCONFDIR "/netgroup");
-   cb (netgrdb, &netgr_traced_file.file);
- }
- 
-Index: glibc-2.20/nss/nss_files/files-initgroups.c
-===================================================================
---- glibc-2.20.orig/nss/nss_files/files-initgroups.c
-+++ glibc-2.20/nss/nss_files/files-initgroups.c
-@@ -31,7 +31,7 @@ _nss_files_initgroups_dyn (const char *u
- 			   long int *size, gid_t **groupsp, long int limit,
- 			   int *errnop)
- {
--  FILE *stream = fopen ("/etc/group", "rce");
-+  FILE *stream = fopen (SYSCONFDIR "/group", "rce");
-   if (stream == NULL)
-     {
-       *errnop = errno;
-Index: glibc-2.20/nss/db-Makefile
-===================================================================
---- glibc-2.20.orig/nss/db-Makefile
-+++ /dev/null
-@@ -1,166 +0,0 @@
--# Makefile to (re-)generate db versions of system database files.
--# Copyright (C) 1996-2014 Free Software Foundation, Inc.
--# This file is part of the GNU C Library.
--# Contributed by Ulrich Drepper <drepper@××××××.com>, 1996.
--#
--
--# The GNU C Library is free software; you can redistribute it and/or
--# modify it under the terms of the GNU Lesser General Public
--# License as published by the Free Software Foundation; either
--# version 2.1 of the License, or (at your option) any later version.
--
--# The GNU C Library is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--# Lesser General Public License for more details.
--
--# You should have received a copy of the GNU Lesser General Public
--# License along with the GNU C Library; if not, see
--# <http://www.gnu.org/licenses/>.
--
--DATABASES = $(wildcard /etc/passwd /etc/group /etc/ethers /etc/protocols \
--		       /etc/rpc /etc/services /etc/shadow /etc/gshadow \
--		       /etc/netgroup)
--
--VAR_DB = /var/db
--
--AWK = awk
--MAKEDB = makedb --quiet
--
--all: $(patsubst %,$(VAR_DB)/%.db,$(notdir $(DATABASES)))
--
--
--$(VAR_DB)/passwd.db: /etc/passwd
--	@echo -n "$(patsubst %.db,%,$(@F))... "
--	@$(AWK) 'BEGIN { FS=":"; OFS=":" } \
--		 /^[ \t]*$$/ { next } \
--		 /^[ \t]*#/ { next } \
--		 /^[^#]/ { printf ".%s ", $$1; print; \
--			   printf "=%s ", $$3; print }' $^ | \
--	$(MAKEDB) -o $@ -
--	@echo "done."
--
--$(VAR_DB)/group.db: /etc/group
--	@echo -n "$(patsubst %.db,%,$(@F))... "
--	@$(AWK) 'BEGIN { FS=":"; OFS=":" } \
--		 /^[ \t]*$$/ { next } \
--		 /^[ \t]*#/ { next } \
--		 /^[^#]/ { printf ".%s ", $$1; print; \
--			   printf "=%s ", $$3; print; \
--			   if ($$4 != "") { \
--			     split($$4, grmems, ","); \
--			     for (memidx in grmems) { \
--			       mem=grmems[memidx]; \
--			       if (members[mem] == "") \
--				 members[mem]=$$3; \
--			       else \
--				 members[mem]=members[mem] "," $$3; \
--			     } \
--			     delete grmems; } } \
--		 END { for (mem in members) \
--			 printf ":%s %s %s\n", mem, mem, members[mem]; }' $^ | \
--	$(MAKEDB) -o $@ -
--	@echo "done."
--
--$(VAR_DB)/ethers.db: /etc/ethers
--	@echo -n "$(patsubst %.db,%,$(@F))... "
--	@$(AWK) '/^[ \t]*$$/ { next } \
--		 /^[ \t]*#/ { next } \
--		 /^[^#]/ { printf ".%s ", $$1; print; \
--			   printf "=%s ", $$2; print }' $^ | \
--	$(MAKEDB) -o $@ -
--	@echo "done."
--
--$(VAR_DB)/protocols.db: /etc/protocols
--	@echo -n "$(patsubst %.db,%,$(@F))... "
--	@$(AWK) '/^[ \t]*$$/ { next } \
--		 /^[ \t]*#/ { next } \
--		 /^[^#]/ { printf ".%s ", $$1; print; \
--			   printf "=%s ", $$2; print; \
--			   for (i = 3; i <= NF && !($$i ~ /^#/); ++i) \
--			     { printf ".%s ", $$i; print } }' $^ | \
--	$(MAKEDB) -o $@ -
--	@echo "done."
--
--$(VAR_DB)/rpc.db: /etc/rpc
--	@echo -n "$(patsubst %.db,%,$(@F))... "
--	@$(AWK) '/^[ \t]*$$/ { next } \
--		 /^[ \t]*#/ { next } \
--		 /^[^#]/ { printf ".%s ", $$1; print; \
--			   printf "=%s ", $$2; print; \
--			   for (i = 3; i <= NF && !($$i ~ /^#/); ++i) \
--			     { printf ".%s ", $$i; print } }' $^ | \
--	$(MAKEDB) -o $@ -
--	@echo "done."
--
--$(VAR_DB)/services.db: /etc/services
--	@echo -n "$(patsubst %.db,%,$(@F))... "
--	@$(AWK) 'BEGIN { FS="[ \t/]+" } \
--		 /^[ \t]*$$/ { next } \
--		 /^[ \t]*#/ { next } \
--		 /^[^#]/ { sub(/[ \t]*#.*$$/, "");\
--			   printf ":%s/%s ", $$1, $$3; print; \
--			   printf ":%s/ ", $$1; print; \
--			   printf "=%s/%s ", $$2, $$3; print; \
--			   printf "=%s/ ", $$2; print; \
--			   for (i = 4; i <= NF && !($$i ~ /^#/); ++i) \
--			     { printf ":%s/%s ", $$i, $$3; print; \
--			       printf ":%s/ ", $$i; print } }' $^ | \
--	$(MAKEDB) -o $@ -
--	@echo "done."
--
--$(VAR_DB)/shadow.db: /etc/shadow
--	@echo -n "$(patsubst %.db,%,$(@F))... "
--	@$(AWK) 'BEGIN { FS=":"; OFS=":" } \
--		 /^[ \t]*$$/ { next } \
--		 /^[ \t]*#/ { next } \
--		 /^[^#]/ { printf ".%s ", $$1; print }' $^ | \
--	(umask 077 && $(MAKEDB) -o $@ -)
--	@echo "done."
--	@if chgrp shadow $@ 2>/dev/null; then \
--	  chmod g+r $@; \
--	else \
--	  chown 0 $@; chgrp 0 $@; chmod 600 $@; \
--	  echo; \
--	  echo "Warning: The shadow password database $@"; \
--	  echo "has been set to be readable only by root.  You may want"; \
--	  echo "to make it readable by the \`shadow' group depending"; \
--	  echo "on your configuration."; \
--	  echo; \
--	fi
--
--$(VAR_DB)/gshadow.db: /etc/gshadow
--	@echo -n "$(patsubst %.db,%,$(@F))... "
--	@$(AWK) 'BEGIN { FS=":"; OFS=":" } \
--		 /^[ \t]*$$/ { next } \
--		 /^[ \t]*#/ { next } \
--		 /^[^#]/ { printf ".%s ", $$1; print }' $^ | \
--	(umask 077 && $(MAKEDB) -o $@ -)
--	@echo "done."
--	@if chgrp shadow $@ 2>/dev/null; then \
--	  chmod g+r $@; \
--	else \
--	  chown 0 $@; chgrp 0 $@; chmod 600 $@; \
--	  echo; \
--	  echo "Warning: The shadow group database $@"; \
--	  echo "has been set to be readable only by root.  You may want"; \
--	  echo "to make it readable by the \`shadow' group depending"; \
--	  echo "on your configuration."; \
--	  echo; \
--	fi
--
--$(VAR_DB)/netgroup.db: /etc/netgroup
--	@echo -n "$(patsubst %.db,%,$(@F))... "
--	@$(AWK) 'BEGIN { ini=1 } \
--		 /^[ \t]*$$/ { next } \
--		 /^[ \t]*#/ { next } \
--		 /^[^#]/ { if (sub(/[ \t]*\\$$/, " ") == 0) end="\n"; \
--			   else end=""; \
--			   gsub(/[ \t]+/, " "); \
--			   sub(/^[ \t]*/, ""); \
--			   if (ini == 0) printf "%s%s", $$0, end; \
--			   else printf ".%s %s%s", $$1, $$0, end; \
--			   ini=end == "" ? 0 : 1; } \
--			   END { if (ini==0) printf "\n" }' $^ | \
--	$(MAKEDB) -o $@ -
--	@echo "done."
-Index: glibc-2.20/nss/db-Makefile.in
-===================================================================
---- /dev/null
-+++ glibc-2.20/nss/db-Makefile.in
-@@ -0,0 +1,173 @@
-+
-+# Makefile to (re-)generate db versions of system database files.
-+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
-+# This file is part of the GNU C Library.
-+# Contributed by Ulrich Drepper <drepper@××××××.com>, 1996.
-+#
-+
-+# The GNU C Library is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Lesser General Public
-+# License as published by the Free Software Foundation; either
-+# version 2.1 of the License, or (at your option) any later version.
-+
-+# The GNU C Library is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# Lesser General Public License for more details.
-+
-+# You should have received a copy of the GNU Lesser General Public
-+# License along with the GNU C Library; if not, see
-+# <http://www.gnu.org/licenses/>.
-+
-+DATABASES = $(wildcard @libc_cv_sysconfdir@/passwd	\
-+		       @libc_cv_sysconfdir@/group	\
-+		       @libc_cv_sysconfdir@/ethers	\
-+		       @libc_cv_sysconfdir@/protocols	\
-+		       @libc_cv_sysconfdir@/rpc		\
-+		       @libc_cv_sysconfdir@/services	\
-+		       @libc_cv_sysconfdir@/shadow	\
-+		       @libc_cv_sysconfdir@/gshadow	\
-+		       @libc_cv_sysconfdir@/netgroup)
-+
-+VAR_DB = /var/db
-+
-+AWK = awk
-+MAKEDB = makedb --quiet
-+
-+all: $(patsubst %,$(VAR_DB)/%.db,$(notdir $(DATABASES)))
-+
-+
-+$(VAR_DB)/passwd.db: @libc_cv_sysconfdir@/passwd
-+	@echo -n "$(patsubst %.db,%,$(@F))... "
-+	@$(AWK) 'BEGIN { FS=":"; OFS=":" } \
-+		 /^[ \t]*$$/ { next } \
-+		 /^[ \t]*#/ { next } \
-+		 /^[^#]/ { printf ".%s ", $$1; print; \
-+			   printf "=%s ", $$3; print }' $^ | \
-+	$(MAKEDB) -o $@ -
-+	@echo "done."
-+
-+$(VAR_DB)/group.db: @libc_cv_sysconfdir@/group
-+	@echo -n "$(patsubst %.db,%,$(@F))... "
-+	@$(AWK) 'BEGIN { FS=":"; OFS=":" } \
-+		 /^[ \t]*$$/ { next } \
-+		 /^[ \t]*#/ { next } \
-+		 /^[^#]/ { printf ".%s ", $$1; print; \
-+			   printf "=%s ", $$3; print; \
-+			   if ($$4 != "") { \
-+			     split($$4, grmems, ","); \
-+			     for (memidx in grmems) { \
-+			       mem=grmems[memidx]; \
-+			       if (members[mem] == "") \
-+				 members[mem]=$$3; \
-+			       else \
-+				 members[mem]=members[mem] "," $$3; \
-+			     } \
-+			     delete grmems; } } \
-+		 END { for (mem in members) \
-+			 printf ":%s %s %s\n", mem, mem, members[mem]; }' $^ | \
-+	$(MAKEDB) -o $@ -
-+	@echo "done."
-+
-+$(VAR_DB)/ethers.db: @libc_cv_sysconfdir@/ethers
-+	@echo -n "$(patsubst %.db,%,$(@F))... "
-+	@$(AWK) '/^[ \t]*$$/ { next } \
-+		 /^[ \t]*#/ { next } \
-+		 /^[^#]/ { printf ".%s ", $$1; print; \
-+			   printf "=%s ", $$2; print }' $^ | \
-+	$(MAKEDB) -o $@ -
-+	@echo "done."
-+
-+$(VAR_DB)/protocols.db: @libc_cv_sysconfdir@/protocols
-+	@echo -n "$(patsubst %.db,%,$(@F))... "
-+	@$(AWK) '/^[ \t]*$$/ { next } \
-+		 /^[ \t]*#/ { next } \
-+		 /^[^#]/ { printf ".%s ", $$1; print; \
-+			   printf "=%s ", $$2; print; \
-+			   for (i = 3; i <= NF && !($$i ~ /^#/); ++i) \
-+			     { printf ".%s ", $$i; print } }' $^ | \
-+	$(MAKEDB) -o $@ -
-+	@echo "done."
-+
-+$(VAR_DB)/rpc.db: @libc_cv_sysconfdir@/rpc
-+	@echo -n "$(patsubst %.db,%,$(@F))... "
-+	@$(AWK) '/^[ \t]*$$/ { next } \
-+		 /^[ \t]*#/ { next } \
-+		 /^[^#]/ { printf ".%s ", $$1; print; \
-+			   printf "=%s ", $$2; print; \
-+			   for (i = 3; i <= NF && !($$i ~ /^#/); ++i) \
-+			     { printf ".%s ", $$i; print } }' $^ | \
-+	$(MAKEDB) -o $@ -
-+	@echo "done."
-+
-+$(VAR_DB)/services.db: @libc_cv_sysconfdir@/services
-+	@echo -n "$(patsubst %.db,%,$(@F))... "
-+	@$(AWK) 'BEGIN { FS="[ \t/]+" } \
-+		 /^[ \t]*$$/ { next } \
-+		 /^[ \t]*#/ { next } \
-+		 /^[^#]/ { sub(/[ \t]*#.*$$/, "");\
-+			   printf ":%s/%s ", $$1, $$3; print; \
-+			   printf ":%s/ ", $$1; print; \
-+			   printf "=%s/%s ", $$2, $$3; print; \
-+			   printf "=%s/ ", $$2; print; \
-+			   for (i = 4; i <= NF && !($$i ~ /^#/); ++i) \
-+			     { printf ":%s/%s ", $$i, $$3; print; \
-+			       printf ":%s/ ", $$i; print } }' $^ | \
-+	$(MAKEDB) -o $@ -
-+	@echo "done."
-+
-+$(VAR_DB)/shadow.db: @libc_cv_sysconfdir@/shadow
-+	@echo -n "$(patsubst %.db,%,$(@F))... "
-+	@$(AWK) 'BEGIN { FS=":"; OFS=":" } \
-+		 /^[ \t]*$$/ { next } \
-+		 /^[ \t]*#/ { next } \
-+		 /^[^#]/ { printf ".%s ", $$1; print }' $^ | \
-+	(umask 077 && $(MAKEDB) -o $@ -)
-+	@echo "done."
-+	@if chgrp shadow $@ 2>/dev/null; then \
-+	  chmod g+r $@; \
-+	else \
-+	  chown 0 $@; chgrp 0 $@; chmod 600 $@; \
-+	  echo; \
-+	  echo "Warning: The shadow password database $@"; \
-+	  echo "has been set to be readable only by root.  You may want"; \
-+	  echo "to make it readable by the \`shadow' group depending"; \
-+	  echo "on your configuration."; \
-+	  echo; \
-+	fi
-+
-+$(VAR_DB)/gshadow.db: @libc_cv_sysconfdir@/gshadow
-+	@echo -n "$(patsubst %.db,%,$(@F))... "
-+	@$(AWK) 'BEGIN { FS=":"; OFS=":" } \
-+		 /^[ \t]*$$/ { next } \
-+		 /^[ \t]*#/ { next } \
-+		 /^[^#]/ { printf ".%s ", $$1; print }' $^ | \
-+	(umask 077 && $(MAKEDB) -o $@ -)
-+	@echo "done."
-+	@if chgrp shadow $@ 2>/dev/null; then \
-+	  chmod g+r $@; \
-+	else \
-+	  chown 0 $@; chgrp 0 $@; chmod 600 $@; \
-+	  echo; \
-+	  echo "Warning: The shadow group database $@"; \
-+	  echo "has been set to be readable only by root.  You may want"; \
-+	  echo "to make it readable by the \`shadow' group depending"; \
-+	  echo "on your configuration."; \
-+	  echo; \
-+	fi
-+
-+$(VAR_DB)/netgroup.db: @libc_cv_sysconfdir@/netgroup
-+	@echo -n "$(patsubst %.db,%,$(@F))... "
-+	@$(AWK) 'BEGIN { ini=1 } \
-+		 /^[ \t]*$$/ { next } \
-+		 /^[ \t]*#/ { next } \
-+		 /^[^#]/ { if (sub(/[ \t]*\\$$/, " ") == 0) end="\n"; \
-+			   else end=""; \
-+			   gsub(/[ \t]+/, " "); \
-+			   sub(/^[ \t]*/, ""); \
-+			   if (ini == 0) printf "%s%s", $$0, end; \
-+			   else printf ".%s %s%s", $$1, $$0, end; \
-+			   ini=end == "" ? 0 : 1; } \
-+			   END { if (ini==0) printf "\n" }' $^ | \
-+	$(MAKEDB) -o $@ -
-+	@echo "done."
-Index: glibc-2.20/resolv/netdb.h
-===================================================================
---- glibc-2.20.orig/resolv/netdb.h
-+++ /dev/null
-@@ -1,715 +0,0 @@
--  /* Copyright (C) 1996-2014 Free Software Foundation, Inc.
--   This file is part of the GNU C Library.
--
--   The GNU C Library is free software; you can redistribute it and/or
--   modify it under the terms of the GNU Lesser General Public
--   License as published by the Free Software Foundation; either
--   version 2.1 of the License, or (at your option) any later version.
--
--   The GNU C Library is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--   Lesser General Public License for more details.
--
--   You should have received a copy of the GNU Lesser General Public
--   License along with the GNU C Library; if not, see
--   <http://www.gnu.org/licenses/>.  */
--
--/* All data returned by the network data base library are supplied in
--   host order and returned in network order (suitable for use in
--   system calls).  */
--
--#ifndef	_NETDB_H
--#define	_NETDB_H	1
--
--#include <features.h>
--
--#include <netinet/in.h>
--#include <stdint.h>
--#ifdef __USE_MISC
--/* This is necessary to make this include file properly replace the
--   Sun version.  */
--# include <rpc/netdb.h>
--#endif
--
--#ifdef __USE_GNU
--# define __need_sigevent_t
--# include <bits/siginfo.h>
--# define __need_timespec
--# include <time.h>
--#endif
--
--#include <bits/netdb.h>
--
--/* Absolute file name for network data base files.  */
--#define	_PATH_HEQUIV		"/etc/hosts.equiv"
--#define	_PATH_HOSTS		"/etc/hosts"
--#define	_PATH_NETWORKS		"/etc/networks"
--#define	_PATH_NSSWITCH_CONF	"/etc/nsswitch.conf"
--#define	_PATH_PROTOCOLS		"/etc/protocols"
--#define	_PATH_SERVICES		"/etc/services"
--
--
--__BEGIN_DECLS
--
--#if defined __USE_MISC || !defined __USE_XOPEN2K8
--/* Error status for non-reentrant lookup functions.
--   We use a macro to access always the thread-specific `h_errno' variable.  */
--# define h_errno (*__h_errno_location ())
--
--/* Function to get address of global `h_errno' variable.  */
--extern int *__h_errno_location (void) __THROW __attribute__ ((__const__));
--
--
--/* Possible values left in `h_errno'.  */
--# define HOST_NOT_FOUND	1	/* Authoritative Answer Host not found.  */
--# define TRY_AGAIN	2	/* Non-Authoritative Host not found,
--				   or SERVERFAIL.  */
--# define NO_RECOVERY	3	/* Non recoverable errors, FORMERR, REFUSED,
--				   NOTIMP.  */
--# define NO_DATA	4	/* Valid name, no data record of requested
--				   type.  */
--#endif
--#ifdef __USE_MISC
--# define NETDB_INTERNAL	-1	/* See errno.  */
--# define NETDB_SUCCESS	0	/* No problem.  */
--# define NO_ADDRESS	NO_DATA	/* No address, look for MX record.  */
--#endif
--
--#if defined __USE_XOPEN2K || defined __USE_XOPEN_EXTENDED
--/* Highest reserved Internet port number.  */
--# define IPPORT_RESERVED	1024
--#endif
--
--#ifdef __USE_GNU
--/* Scope delimiter for getaddrinfo(), getnameinfo().  */
--# define SCOPE_DELIMITER	'%'
--#endif
--
--#ifdef __USE_MISC
--/* Print error indicated by `h_errno' variable on standard error.  STR
--   if non-null is printed before the error string.  */
--extern void herror (const char *__str) __THROW;
--
--/* Return string associated with error ERR_NUM.  */
--extern const char *hstrerror (int __err_num) __THROW;
--#endif
--
--
--/* Description of data base entry for a single host.  */
--struct hostent
--{
--  char *h_name;			/* Official name of host.  */
--  char **h_aliases;		/* Alias list.  */
--  int h_addrtype;		/* Host address type.  */
--  int h_length;			/* Length of address.  */
--  char **h_addr_list;		/* List of addresses from name server.  */
--#ifdef __USE_MISC
--# define	h_addr	h_addr_list[0] /* Address, for backward compatibility.*/
--#endif
--};
--
--/* Open host data base files and mark them as staying open even after
--   a later search if STAY_OPEN is non-zero.
--
--   This function is a possible cancellation point and therefore not
--   marked with __THROW.  */
--extern void sethostent (int __stay_open);
--
--/* Close host data base files and clear `stay open' flag.
--
--   This function is a possible cancellation point and therefore not
--   marked with __THROW.  */
--extern void endhostent (void);
--
--/* Get next entry from host data base file.  Open data base if
--   necessary.
--
--   This function is a possible cancellation point and therefore not
--   marked with __THROW.  */
--extern struct hostent *gethostent (void);
--
--/* Return entry from host data base which address match ADDR with
--   length LEN and type TYPE.
--
--   This function is a possible cancellation point and therefore not
--   marked with __THROW.  */
--extern struct hostent *gethostbyaddr (const void *__addr, __socklen_t __len,
--				      int __type);
--
--/* Return entry from host data base for host with NAME.
--
--   This function is a possible cancellation point and therefore not
--   marked with __THROW.  */
--extern struct hostent *gethostbyname (const char *__name);
--
--#ifdef __USE_MISC
--/* Return entry from host data base for host with NAME.  AF must be
--   set to the address type which is `AF_INET' for IPv4 or `AF_INET6'
--   for IPv6.
--
--   This function is not part of POSIX and therefore no official
--   cancellation point.  But due to similarity with an POSIX interface
--   or due to the implementation it is a cancellation point and
--   therefore not marked with __THROW.  */
--extern struct hostent *gethostbyname2 (const char *__name, int __af);
--
--/* Reentrant versions of the functions above.  The additional
--   arguments specify a buffer of BUFLEN starting at BUF.  The last
--   argument is a pointer to a variable which gets the value which
--   would be stored in the global variable `herrno' by the
--   non-reentrant functions.
--
--   These functions are not part of POSIX and therefore no official
--   cancellation point.  But due to similarity with an POSIX interface
--   or due to the implementation they are cancellation points and
--   therefore not marked with __THROW.  */
--extern int gethostent_r (struct hostent *__restrict __result_buf,
--			 char *__restrict __buf, size_t __buflen,
--			 struct hostent **__restrict __result,
--			 int *__restrict __h_errnop);
--
--extern int gethostbyaddr_r (const void *__restrict __addr, __socklen_t __len,
--			    int __type,
--			    struct hostent *__restrict __result_buf,
--			    char *__restrict __buf, size_t __buflen,
--			    struct hostent **__restrict __result,
--			    int *__restrict __h_errnop);
--
--extern int gethostbyname_r (const char *__restrict __name,
--			    struct hostent *__restrict __result_buf,
--			    char *__restrict __buf, size_t __buflen,
--			    struct hostent **__restrict __result,
--			    int *__restrict __h_errnop);
--
--extern int gethostbyname2_r (const char *__restrict __name, int __af,
--			     struct hostent *__restrict __result_buf,
--			     char *__restrict __buf, size_t __buflen,
--			     struct hostent **__restrict __result,
--			     int *__restrict __h_errnop);
--#endif	/* misc */
--
--
--/* Open network data base files and mark them as staying open even
--   after a later search if STAY_OPEN is non-zero.
--
--   This function is a possible cancellation point and therefore not
--   marked with __THROW.  */
--extern void setnetent (int __stay_open);
--
--/* Close network data base files and clear `stay open' flag.
--
--   This function is a possible cancellation point and therefore not
--   marked with __THROW.  */
--extern void endnetent (void);
--
--/* Get next entry from network data base file.  Open data base if
--   necessary.
--
--   This function is a possible cancellation point and therefore not
--   marked with __THROW.  */
--extern struct netent *getnetent (void);
--
--/* Return entry from network data base which address match NET and
--   type TYPE.
--
--   This function is a possible cancellation point and therefore not
--   marked with __THROW.  */
--extern struct netent *getnetbyaddr (uint32_t __net, int __type);
--
--/* Return entry from network data base for network with NAME.
--
--   This function is a possible cancellation point and therefore not
--   marked with __THROW.  */
--extern struct netent *getnetbyname (const char *__name);
--
--#ifdef	__USE_MISC
--/* Reentrant versions of the functions above.  The additional
--   arguments specify a buffer of BUFLEN starting at BUF.  The last
--   argument is a pointer to a variable which gets the value which
--   would be stored in the global variable `herrno' by the
--   non-reentrant functions.
--
--   These functions are not part of POSIX and therefore no official
--   cancellation point.  But due to similarity with an POSIX interface
--   or due to the implementation they are cancellation points and
--   therefore not marked with __THROW.  */
--extern int getnetent_r (struct netent *__restrict __result_buf,
--			char *__restrict __buf, size_t __buflen,
--			struct netent **__restrict __result,
--			int *__restrict __h_errnop);
--
--extern int getnetbyaddr_r (uint32_t __net, int __type,
--			   struct netent *__restrict __result_buf,
--			   char *__restrict __buf, size_t __buflen,
--			   struct netent **__restrict __result,
--			   int *__restrict __h_errnop);
--
--extern int getnetbyname_r (const char *__restrict __name,
--			   struct netent *__restrict __result_buf,
--			   char *__restrict __buf, size_t __buflen,
--			   struct netent **__restrict __result,
--			   int *__restrict __h_errnop);
--#endif	/* misc */
--
--
--/* Description of data base entry for a single service.  */
--struct servent
--{
--  char *s_name;			/* Official service name.  */
--  char **s_aliases;		/* Alias list.  */
--  int s_port;			/* Port number.  */
--  char *s_proto;		/* Protocol to use.  */
--};
--
--/* Open service data base files and mark them as staying open even
--   after a later search if STAY_OPEN is non-zero.
--
--   This function is a possible cancellation point and therefore not
--   marked with __THROW.  */
--extern void setservent (int __stay_open);
--
--/* Close service data base files and clear `stay open' flag.
--
--   This function is a possible cancellation point and therefore not
--   marked with __THROW.  */
--extern void endservent (void);
--
--/* Get next entry from service data base file.  Open data base if
--   necessary.
--
--   This function is a possible cancellation point and therefore not
--   marked with __THROW.  */
--extern struct servent *getservent (void);
--
--/* Return entry from network data base for network with NAME and
--   protocol PROTO.
--
--   This function is a possible cancellation point and therefore not
--   marked with __THROW.  */
--extern struct servent *getservbyname (const char *__name, const char *__proto);
--
--/* Return entry from service data base which matches port PORT and
--   protocol PROTO.
--
--   This function is a possible cancellation point and therefore not
--   marked with __THROW.  */
--extern struct servent *getservbyport (int __port, const char *__proto);
--
--
--#ifdef	__USE_MISC
--/* Reentrant versions of the functions above.  The additional
--   arguments specify a buffer of BUFLEN starting at BUF.
--
--   These functions are not part of POSIX and therefore no official
--   cancellation point.  But due to similarity with an POSIX interface
--   or due to the implementation they are cancellation points and
--   therefore not marked with __THROW.  */
--extern int getservent_r (struct servent *__restrict __result_buf,
--			 char *__restrict __buf, size_t __buflen,
--			 struct servent **__restrict __result);
--
--extern int getservbyname_r (const char *__restrict __name,
--			    const char *__restrict __proto,
--			    struct servent *__restrict __result_buf,
--			    char *__restrict __buf, size_t __buflen,
--			    struct servent **__restrict __result);
--
--extern int getservbyport_r (int __port, const char *__restrict __proto,
--			    struct servent *__restrict __result_buf,
--			    char *__restrict __buf, size_t __buflen,
--			    struct servent **__restrict __result);
--#endif	/* misc */
--
--
--/* Description of data base entry for a single service.  */
--struct protoent
--{
--  char *p_name;			/* Official protocol name.  */
--  char **p_aliases;		/* Alias list.  */
--  int p_proto;			/* Protocol number.  */
--};
--
--/* Open protocol data base files and mark them as staying open even
--   after a later search if STAY_OPEN is non-zero.
--
--   This function is a possible cancellation point and therefore not
--   marked with __THROW.  */
--extern void setprotoent (int __stay_open);
--
--/* Close protocol data base files and clear `stay open' flag.
--
--   This function is a possible cancellation point and therefore not
--   marked with __THROW.  */
--extern void endprotoent (void);
--
--/* Get next entry from protocol data base file.  Open data base if
--   necessary.
--
--   This function is a possible cancellation point and therefore not
--   marked with __THROW.  */
--extern struct protoent *getprotoent (void);
--
--/* Return entry from protocol data base for network with NAME.
--
--   This function is a possible cancellation point and therefore not
--   marked with __THROW.  */
--extern struct protoent *getprotobyname (const char *__name);
--
--/* Return entry from protocol data base which number is PROTO.
--
--   This function is a possible cancellation point and therefore not
--   marked with __THROW.  */
--extern struct protoent *getprotobynumber (int __proto);
--
--
--#ifdef	__USE_MISC
--/* Reentrant versions of the functions above.  The additional
--   arguments specify a buffer of BUFLEN starting at BUF.
--
--   These functions are not part of POSIX and therefore no official
--   cancellation point.  But due to similarity with an POSIX interface
--   or due to the implementation they are cancellation points and
--   therefore not marked with __THROW.  */
--extern int getprotoent_r (struct protoent *__restrict __result_buf,
--			  char *__restrict __buf, size_t __buflen,
--			  struct protoent **__restrict __result);
--
--extern int getprotobyname_r (const char *__restrict __name,
--			     struct protoent *__restrict __result_buf,
--			     char *__restrict __buf, size_t __buflen,
--			     struct protoent **__restrict __result);
--
--extern int getprotobynumber_r (int __proto,
--			       struct protoent *__restrict __result_buf,
--			       char *__restrict __buf, size_t __buflen,
--			       struct protoent **__restrict __result);
--
--
--/* Establish network group NETGROUP for enumeration.
--
--   This function is not part of POSIX and therefore no official
--   cancellation point.  But due to similarity with an POSIX interface
--   or due to the implementation it is a cancellation point and
--   therefore not marked with __THROW.  */
--extern int setnetgrent (const char *__netgroup);
--
--/* Free all space allocated by previous `setnetgrent' call.
--
--   This function is not part of POSIX and therefore no official
--   cancellation point.  But due to similarity with an POSIX interface
--   or due to the implementation it is a cancellation point and
--   therefore not marked with __THROW.  */
--extern void endnetgrent (void);
--
--/* Get next member of netgroup established by last `setnetgrent' call
--   and return pointers to elements in HOSTP, USERP, and DOMAINP.
--
--   This function is not part of POSIX and therefore no official
--   cancellation point.  But due to similarity with an POSIX interface
--   or due to the implementation it is a cancellation point and
--   therefore not marked with __THROW.  */
--extern int getnetgrent (char **__restrict __hostp,
--			char **__restrict __userp,
--			char **__restrict __domainp);
--
--
--/* Test whether NETGROUP contains the triple (HOST,USER,DOMAIN).
--
--   This function is not part of POSIX and therefore no official
--   cancellation point.  But due to similarity with an POSIX interface
--   or due to the implementation it is a cancellation point and
--   therefore not marked with __THROW.  */
--extern int innetgr (const char *__netgroup, const char *__host,
--		    const char *__user, const char *__domain);
--
--/* Reentrant version of `getnetgrent' where result is placed in BUFFER.
--
--   This function is not part of POSIX and therefore no official
--   cancellation point.  But due to similarity with an POSIX interface
--   or due to the implementation it is a cancellation point and
--   therefore not marked with __THROW.  */
--extern int getnetgrent_r (char **__restrict __hostp,
--			  char **__restrict __userp,
--			  char **__restrict __domainp,
--			  char *__restrict __buffer, size_t __buflen);
--#endif	/* misc */
--
--
--#ifdef __USE_MISC
--/* Call `rshd' at port RPORT on remote machine *AHOST to execute CMD.
--   The local user is LOCUSER, on the remote machine the command is
--   executed as REMUSER.  In *FD2P the descriptor to the socket for the
--   connection is returned.  The caller must have the right to use a
--   reserved port.  When the function returns *AHOST contains the
--   official host name.
--
--   This function is not part of POSIX and therefore no official
--   cancellation point.  But due to similarity with an POSIX interface
--   or due to the implementation it is a cancellation point and
--   therefore not marked with __THROW.  */
--extern int rcmd (char **__restrict __ahost, unsigned short int __rport,
--		 const char *__restrict __locuser,
--		 const char *__restrict __remuser,
--		 const char *__restrict __cmd, int *__restrict __fd2p);
--
--/* This is the equivalent function where the protocol can be selected
--   and which therefore can be used for IPv6.
--
--   This function is not part of POSIX and therefore no official
--   cancellation point.  But due to similarity with an POSIX interface
--   or due to the implementation it is a cancellation point and
--   therefore not marked with __THROW.  */
--extern int rcmd_af (char **__restrict __ahost, unsigned short int __rport,
--		    const char *__restrict __locuser,
--		    const char *__restrict __remuser,
--		    const char *__restrict __cmd, int *__restrict __fd2p,
--		    sa_family_t __af);
--
--/* Call `rexecd' at port RPORT on remote machine *AHOST to execute
--   CMD.  The process runs at the remote machine using the ID of user
--   NAME whose cleartext password is PASSWD.  In *FD2P the descriptor
--   to the socket for the connection is returned.  When the function
--   returns *AHOST contains the official host name.
--
--   This function is not part of POSIX and therefore no official
--   cancellation point.  But due to similarity with an POSIX interface
--   or due to the implementation it is a cancellation point and
--   therefore not marked with __THROW.  */
--extern int rexec (char **__restrict __ahost, int __rport,
--		  const char *__restrict __name,
--		  const char *__restrict __pass,
--		  const char *__restrict __cmd, int *__restrict __fd2p);
--
--/* This is the equivalent function where the protocol can be selected
--   and which therefore can be used for IPv6.
--
--   This function is not part of POSIX and therefore no official
--   cancellation point.  But due to similarity with an POSIX interface
--   or due to the implementation it is a cancellation point and
--   therefore not marked with __THROW.  */
--extern int rexec_af (char **__restrict __ahost, int __rport,
--		     const char *__restrict __name,
--		     const char *__restrict __pass,
--		     const char *__restrict __cmd, int *__restrict __fd2p,
--		     sa_family_t __af);
--
--/* Check whether user REMUSER on system RHOST is allowed to login as LOCUSER.
--   If SUSER is not zero the user tries to become superuser.  Return 0 if
--   it is possible.
--
--   This function is not part of POSIX and therefore no official
--   cancellation point.  But due to similarity with an POSIX interface
--   or due to the implementation it is a cancellation point and
--   therefore not marked with __THROW.  */
--extern int ruserok (const char *__rhost, int __suser,
--		    const char *__remuser, const char *__locuser);
--
--/* This is the equivalent function where the protocol can be selected
--   and which therefore can be used for IPv6.
--
--   This function is not part of POSIX and therefore no official
--   cancellation point.  But due to similarity with an POSIX interface
--   or due to the implementation it is a cancellation point and
--   therefore not marked with __THROW.  */
--extern int ruserok_af (const char *__rhost, int __suser,
--		       const char *__remuser, const char *__locuser,
--		       sa_family_t __af);
--
--/* Check whether user REMUSER on system indicated by IPv4 address
--   RADDR is allowed to login as LOCUSER.  Non-IPv4 (e.g., IPv6) are
--   not supported.  If SUSER is not zero the user tries to become
--   superuser.  Return 0 if it is possible.
--
--   This function is not part of POSIX and therefore no official
--   cancellation point.  But due to similarity with an POSIX interface
--   or due to the implementation it is a cancellation point and
--   therefore not marked with __THROW.  */
--extern int iruserok (uint32_t __raddr, int __suser,
--		     const char *__remuser, const char *__locuser);
--
--/* This is the equivalent function where the pfamiliy if the address
--   pointed to by RADDR is determined by the value of AF.  It therefore
--   can be used for IPv6
--
--   This function is not part of POSIX and therefore no official
--   cancellation point.  But due to similarity with an POSIX interface
--   or due to the implementation it is a cancellation point and
--   therefore not marked with __THROW.  */
--extern int iruserok_af (const void *__raddr, int __suser,
--			const char *__remuser, const char *__locuser,
--			sa_family_t __af);
--
--/* Try to allocate reserved port, returning a descriptor for a socket opened
--   at this port or -1 if unsuccessful.  The search for an available port
--   will start at ALPORT and continues with lower numbers.
--
--   This function is not part of POSIX and therefore no official
--   cancellation point.  But due to similarity with an POSIX interface
--   or due to the implementation it is a cancellation point and
--   therefore not marked with __THROW.  */
--extern int rresvport (int *__alport);
--
--/* This is the equivalent function where the protocol can be selected
--   and which therefore can be used for IPv6.
--
--   This function is not part of POSIX and therefore no official
--   cancellation point.  But due to similarity with an POSIX interface
--   or due to the implementation it is a cancellation point and
--   therefore not marked with __THROW.  */
--extern int rresvport_af (int *__alport, sa_family_t __af);
--#endif
--
--
--/* Extension from POSIX.1g.  */
--#ifdef	__USE_POSIX
--/* Structure to contain information about address of a service provider.  */
--struct addrinfo
--{
--  int ai_flags;			/* Input flags.  */
--  int ai_family;		/* Protocol family for socket.  */
--  int ai_socktype;		/* Socket type.  */
--  int ai_protocol;		/* Protocol for socket.  */
--  socklen_t ai_addrlen;		/* Length of socket address.  */
--  struct sockaddr *ai_addr;	/* Socket address for socket.  */
--  char *ai_canonname;		/* Canonical name for service location.  */
--  struct addrinfo *ai_next;	/* Pointer to next in list.  */
--};
--
--# ifdef __USE_GNU
--/* Structure used as control block for asynchronous lookup.  */
--struct gaicb
--{
--  const char *ar_name;		/* Name to look up.  */
--  const char *ar_service;	/* Service name.  */
--  const struct addrinfo *ar_request; /* Additional request specification.  */
--  struct addrinfo *ar_result;	/* Pointer to result.  */
--  /* The following are internal elements.  */
--  int __return;
--  int __glibc_reserved[5];
--};
--
--/* Lookup mode.  */
--#  define GAI_WAIT	0
--#  define GAI_NOWAIT	1
--# endif
--
--/* Possible values for `ai_flags' field in `addrinfo' structure.  */
--# define AI_PASSIVE	0x0001	/* Socket address is intended for `bind'.  */
--# define AI_CANONNAME	0x0002	/* Request for canonical name.  */
--# define AI_NUMERICHOST	0x0004	/* Don't use name resolution.  */
--# define AI_V4MAPPED	0x0008	/* IPv4 mapped addresses are acceptable.  */
--# define AI_ALL		0x0010	/* Return IPv4 mapped and IPv6 addresses.  */
--# define AI_ADDRCONFIG	0x0020	/* Use configuration of this host to choose
--				   returned address type..  */
--# ifdef __USE_GNU
--#  define AI_IDN	0x0040	/* IDN encode input (assuming it is encoded
--				   in the current locale's character set)
--				   before looking it up. */
--#  define AI_CANONIDN	0x0080	/* Translate canonical name from IDN format. */
--#  define AI_IDN_ALLOW_UNASSIGNED 0x0100 /* Don't reject unassigned Unicode
--					    code points.  */
--#  define AI_IDN_USE_STD3_ASCII_RULES 0x0200 /* Validate strings according to
--						STD3 rules.  */
--# endif
--# define AI_NUMERICSERV	0x0400	/* Don't use name resolution.  */
--
--/* Error values for `getaddrinfo' function.  */
--# define EAI_BADFLAGS	  -1	/* Invalid value for `ai_flags' field.  */
--# define EAI_NONAME	  -2	/* NAME or SERVICE is unknown.  */
--# define EAI_AGAIN	  -3	/* Temporary failure in name resolution.  */
--# define EAI_FAIL	  -4	/* Non-recoverable failure in name res.  */
--# define EAI_FAMILY	  -6	/* `ai_family' not supported.  */
--# define EAI_SOCKTYPE	  -7	/* `ai_socktype' not supported.  */
--# define EAI_SERVICE	  -8	/* SERVICE not supported for `ai_socktype'.  */
--# define EAI_MEMORY	  -10	/* Memory allocation failure.  */
--# define EAI_SYSTEM	  -11	/* System error returned in `errno'.  */
--# define EAI_OVERFLOW	  -12	/* Argument buffer overflow.  */
--# ifdef __USE_GNU
--#  define EAI_NODATA	  -5	/* No address associated with NAME.  */
--#  define EAI_ADDRFAMILY  -9	/* Address family for NAME not supported.  */
--#  define EAI_INPROGRESS  -100	/* Processing request in progress.  */
--#  define EAI_CANCELED	  -101	/* Request canceled.  */
--#  define EAI_NOTCANCELED -102	/* Request not canceled.  */
--#  define EAI_ALLDONE	  -103	/* All requests done.  */
--#  define EAI_INTR	  -104	/* Interrupted by a signal.  */
--#  define EAI_IDN_ENCODE  -105	/* IDN encoding failed.  */
--# endif
--
--# ifdef __USE_MISC
--#  define NI_MAXHOST      1025
--#  define NI_MAXSERV      32
--# endif
--
--# define NI_NUMERICHOST	1	/* Don't try to look up hostname.  */
--# define NI_NUMERICSERV 2	/* Don't convert port number to name.  */
--# define NI_NOFQDN	4	/* Only return nodename portion.  */
--# define NI_NAMEREQD	8	/* Don't return numeric addresses.  */
--# define NI_DGRAM	16	/* Look up UDP service rather than TCP.  */
--# ifdef __USE_GNU
--#  define NI_IDN	32	/* Convert name from IDN format.  */
--#  define NI_IDN_ALLOW_UNASSIGNED 64 /* Don't reject unassigned Unicode
--					code points.  */
--#  define NI_IDN_USE_STD3_ASCII_RULES 128 /* Validate strings according to
--					     STD3 rules.  */
--# endif
--
--/* Translate name of a service location and/or a service name to set of
--   socket addresses.
--
--   This function is a possible cancellation point and therefore not
--   marked with __THROW.  */
--extern int getaddrinfo (const char *__restrict __name,
--			const char *__restrict __service,
--			const struct addrinfo *__restrict __req,
--			struct addrinfo **__restrict __pai);
--
--/* Free `addrinfo' structure AI including associated storage.  */
--extern void freeaddrinfo (struct addrinfo *__ai) __THROW;
--
--/* Convert error return from getaddrinfo() to a string.  */
--extern const char *gai_strerror (int __ecode) __THROW;
--
--/* Translate a socket address to a location and service name.
--
--   This function is a possible cancellation point and therefore not
--   marked with __THROW.  */
--extern int getnameinfo (const struct sockaddr *__restrict __sa,
--			socklen_t __salen, char *__restrict __host,
--			socklen_t __hostlen, char *__restrict __serv,
--			socklen_t __servlen, int __flags);
--#endif	/* POSIX */
--
--#ifdef __USE_GNU
--/* Enqueue ENT requests from the LIST.  If MODE is GAI_WAIT wait until all
--   requests are handled.  If WAIT is GAI_NOWAIT return immediately after
--   queueing the requests and signal completion according to SIG.
--
--   This function is not part of POSIX and therefore no official
--   cancellation point.  But due to similarity with an POSIX interface
--   or due to the implementation it is a cancellation point and
--   therefore not marked with __THROW.  */
--extern int getaddrinfo_a (int __mode, struct gaicb *__list[__restrict_arr],
--			  int __ent, struct sigevent *__restrict __sig);
--
--/* Suspend execution of the thread until at least one of the ENT requests
--   in LIST is handled.  If TIMEOUT is not a null pointer it specifies the
--   longest time the function keeps waiting before returning with an error.
--
--   This function is not part of POSIX and therefore no official
--   cancellation point.  But due to similarity with an POSIX interface
--   or due to the implementation it is a cancellation point and
--   therefore not marked with __THROW.  */
--extern int gai_suspend (const struct gaicb *const __list[], int __ent,
--			const struct timespec *__timeout);
--
--/* Get the error status of the request REQ.  */
--extern int gai_error (struct gaicb *__req) __THROW;
--
--/* Cancel the requests associated with GAICBP.  */
--extern int gai_cancel (struct gaicb *__gaicbp) __THROW;
--#endif	/* GNU */
--
--__END_DECLS
--
--#endif	/* netdb.h */
-Index: glibc-2.20/resolv/resolv.h
-===================================================================
---- glibc-2.20.orig/resolv/resolv.h
-+++ /dev/null
-@@ -1,389 +0,0 @@
--/*
-- * Copyright (c) 1983, 1987, 1989
-- *    The Regents of the University of California.  All rights reserved.
-- *
-- * Redistribution and use in source and binary forms, with or without
-- * modification, are permitted provided that the following conditions
-- * are met:
-- * 1. Redistributions of source code must retain the above copyright
-- *    notice, this list of conditions and the following disclaimer.
-- * 2. Redistributions in binary form must reproduce the above copyright
-- *    notice, this list of conditions and the following disclaimer in the
-- *    documentation and/or other materials provided with the distribution.
-- * 4. Neither the name of the University nor the names of its contributors
-- *    may be used to endorse or promote products derived from this software
-- *    without specific prior written permission.
-- *
-- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-- * SUCH DAMAGE.
-- */
--
--/*
-- * Portions Copyright (c) 1996-1999 by Internet Software Consortium.
-- *
-- * Permission to use, copy, modify, and distribute this software for any
-- * purpose with or without fee is hereby granted, provided that the above
-- * copyright notice and this permission notice appear in all copies.
-- *
-- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
-- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
-- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-- * SOFTWARE.
-- */
--
--/*
-- *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
-- *	$BINDId: resolv.h,v 8.31 2000/03/30 20:16:50 vixie Exp $
-- */
--
--#ifndef _RESOLV_H_
--
--/* These headers are needed for types used in the `struct res_state'
--   declaration.  */
--#include <sys/types.h>
--#include <netinet/in.h>
--
--#ifndef __need_res_state
--# define _RESOLV_H_
--
--# include <sys/param.h>
--# include <sys/cdefs.h>
--# include <stdio.h>
--# include <arpa/nameser.h>
--#endif
--
--#ifndef __res_state_defined
--# define __res_state_defined
--
--typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error }
--	res_sendhookact;
--
--typedef res_sendhookact (*res_send_qhook) (struct sockaddr_in * const *__ns,
--					   const u_char **__query,
--					   int *__querylen,
--					   u_char *__ans,
--					   int __anssiz,
--					   int *__resplen);
--
--typedef res_sendhookact (*res_send_rhook) (const struct sockaddr_in *__ns,
--					   const u_char *__query,
--					   int __querylen,
--					   u_char *__ans,
--					   int __anssiz,
--					   int *__resplen);
--
--/*
-- * Global defines and variables for resolver stub.
-- */
--# define MAXNS			3	/* max # name servers we'll track */
--# define MAXDFLSRCH		3	/* # default domain levels to try */
--# define MAXDNSRCH		6	/* max # domains in search path */
--# define LOCALDOMAINPARTS	2	/* min levels in name that is "local" */
--
--# define RES_TIMEOUT		5	/* min. seconds between retries */
--# define MAXRESOLVSORT		10	/* number of net to sort on */
--# define RES_MAXNDOTS		15	/* should reflect bit field size */
--# define RES_MAXRETRANS		30	/* only for resolv.conf/RES_OPTIONS */
--# define RES_MAXRETRY		5	/* only for resolv.conf/RES_OPTIONS */
--# define RES_DFLRETRY		2	/* Default #/tries. */
--# define RES_MAXTIME		65535	/* Infinity, in milliseconds. */
--
--struct __res_state {
--	int	retrans;		/* retransmition time interval */
--	int	retry;			/* number of times to retransmit */
--	u_long	options;		/* option flags - see below. */
--	int	nscount;		/* number of name servers */
--	struct sockaddr_in
--		nsaddr_list[MAXNS];	/* address of name server */
--# define nsaddr	nsaddr_list[0]		/* for backward compatibility */
--	u_short	id;			/* current message id */
--	/* 2 byte hole here.  */
--	char	*dnsrch[MAXDNSRCH+1];	/* components of domain to search */
--	char	defdname[256];		/* default domain (deprecated) */
--	u_long	pfcode;			/* RES_PRF_ flags - see below. */
--	unsigned ndots:4;		/* threshold for initial abs. query */
--	unsigned nsort:4;		/* number of elements in sort_list[] */
--	unsigned ipv6_unavail:1;	/* connecting to IPv6 server failed */
--	unsigned unused:23;
--	struct {
--		struct in_addr	addr;
--		u_int32_t	mask;
--	} sort_list[MAXRESOLVSORT];
--	/* 4 byte hole here on 64-bit architectures.  */
--	res_send_qhook qhook;		/* query hook */
--	res_send_rhook rhook;		/* response hook */
--	int	res_h_errno;		/* last one set for this context */
--	int	_vcsock;		/* PRIVATE: for res_send VC i/o */
--	u_int	_flags;			/* PRIVATE: see below */
--	/* 4 byte hole here on 64-bit architectures.  */
--	union {
--		char	pad[52];	/* On an i386 this means 512b total. */
--		struct {
--			u_int16_t		nscount;
--			u_int16_t		nsmap[MAXNS];
--			int			nssocks[MAXNS];
--			u_int16_t		nscount6;
--			u_int16_t		nsinit;
--			struct sockaddr_in6	*nsaddrs[MAXNS];
--#ifdef _LIBC
--			unsigned long long int	initstamp
--			  __attribute__((packed));
--#else
--			unsigned int		_initstamp[2];
--#endif
--		} _ext;
--	} _u;
--};
--
--typedef struct __res_state *res_state;
--# undef __need_res_state
--#endif
--
--#ifdef _RESOLV_H_
--/*
-- * Revision information.  This is the release date in YYYYMMDD format.
-- * It can change every day so the right thing to do with it is use it
-- * in preprocessor commands such as "#if (__RES > 19931104)".  Do not
-- * compare for equality; rather, use it to determine whether your resolver
-- * is new enough to contain a certain feature.
-- */
--
--#define	__RES	19991006
--
--/*
-- * Resolver configuration file.
-- * Normally not present, but may contain the address of the
-- * inital name server(s) to query and the domain search list.
-- */
--
--#ifndef _PATH_RESCONF
--#define _PATH_RESCONF        "/etc/resolv.conf"
--#endif
--
--struct res_sym {
--	int	number;		/* Identifying number, like T_MX */
--	char *	name;		/* Its symbolic name, like "MX" */
--	char *	humanname;	/* Its fun name, like "mail exchanger" */
--};
--
--/*
-- * Resolver flags (used to be discrete per-module statics ints).
-- */
--#define	RES_F_VC	0x00000001	/* socket is TCP */
--#define	RES_F_CONN	0x00000002	/* socket is connected */
--#define RES_F_EDNS0ERR	0x00000004	/* EDNS0 caused errors */
--
--/* res_findzonecut() options */
--#define	RES_EXHAUSTIVE	0x00000001	/* always do all queries */
--
--/*
-- * Resolver options (keep these in synch with res_debug.c, please)
-- */
--#define RES_INIT	0x00000001	/* address initialized */
--#define RES_DEBUG	0x00000002	/* print debug messages */
--#define RES_AAONLY	0x00000004	/* authoritative answers only (!IMPL)*/
--#define RES_USEVC	0x00000008	/* use virtual circuit */
--#define RES_PRIMARY	0x00000010	/* query primary server only (!IMPL) */
--#define RES_IGNTC	0x00000020	/* ignore trucation errors */
--#define RES_RECURSE	0x00000040	/* recursion desired */
--#define RES_DEFNAMES	0x00000080	/* use default domain name */
--#define RES_STAYOPEN	0x00000100	/* Keep TCP socket open */
--#define RES_DNSRCH	0x00000200	/* search up local domain tree */
--#define	RES_INSECURE1	0x00000400	/* type 1 security disabled */
--#define	RES_INSECURE2	0x00000800	/* type 2 security disabled */
--#define	RES_NOALIASES	0x00001000	/* shuts off HOSTALIASES feature */
--#define	RES_USE_INET6	0x00002000	/* use/map IPv6 in gethostbyname() */
--#define RES_ROTATE	0x00004000	/* rotate ns list after each query */
--#define	RES_NOCHECKNAME	0x00008000	/* do not check names for sanity (!IMPL) */
--#define	RES_KEEPTSIG	0x00010000	/* do not strip TSIG records */
--#define	RES_BLAST	0x00020000	/* blast all recursive servers */
--#define RES_USEBSTRING	0x00040000	/* IPv6 reverse lookup with byte
--					   strings */
--#define RES_NOIP6DOTINT	0x00080000	/* Do not use .ip6.int in IPv6
--					   reverse lookup */
--#define RES_USE_EDNS0	0x00100000	/* Use EDNS0.  */
--#define RES_SNGLKUP	0x00200000	/* one outstanding request at a time */
--#define RES_SNGLKUPREOP	0x00400000	/* -"-, but open new socket for each
--					   request */
--#define RES_USE_DNSSEC	0x00800000	/* use DNSSEC using OK bit in OPT */
--#define RES_NOTLDQUERY	0x01000000	/* Do not look up unqualified name
--					   as a TLD.  */
--
--#define RES_DEFAULT	(RES_RECURSE|RES_DEFNAMES|RES_DNSRCH|RES_NOIP6DOTINT)
--
--/*
-- * Resolver "pfcode" values.  Used by dig.
-- */
--#define RES_PRF_STATS	0x00000001
--#define RES_PRF_UPDATE	0x00000002
--#define RES_PRF_CLASS   0x00000004
--#define RES_PRF_CMD	0x00000008
--#define RES_PRF_QUES	0x00000010
--#define RES_PRF_ANS	0x00000020
--#define RES_PRF_AUTH	0x00000040
--#define RES_PRF_ADD	0x00000080
--#define RES_PRF_HEAD1	0x00000100
--#define RES_PRF_HEAD2	0x00000200
--#define RES_PRF_TTLID	0x00000400
--#define RES_PRF_HEADX	0x00000800
--#define RES_PRF_QUERY	0x00001000
--#define RES_PRF_REPLY	0x00002000
--#define RES_PRF_INIT	0x00004000
--/*			0x00008000	*/
--
--/* Things involving an internal (static) resolver context. */
--__BEGIN_DECLS
--extern struct __res_state *__res_state(void) __attribute__ ((__const__));
--__END_DECLS
--#define _res (*__res_state())
--
--#ifndef __BIND_NOSTATIC
--#define fp_nquery		__fp_nquery
--#define fp_query		__fp_query
--#define hostalias		__hostalias
--#define p_query			__p_query
--#define res_close		__res_close
--#define res_init		__res_init
--#define res_isourserver		__res_isourserver
--#define res_mkquery		__res_mkquery
--#define res_query		__res_query
--#define res_querydomain		__res_querydomain
--#define res_search		__res_search
--#define res_send		__res_send
--
--__BEGIN_DECLS
--void		fp_nquery (const u_char *, int, FILE *) __THROW;
--void		fp_query (const u_char *, FILE *) __THROW;
--const char *	hostalias (const char *) __THROW;
--void		p_query (const u_char *) __THROW;
--void		res_close (void) __THROW;
--int		res_init (void) __THROW;
--int		res_isourserver (const struct sockaddr_in *) __THROW;
--int		res_mkquery (int, const char *, int, int, const u_char *,
--			     int, const u_char *, u_char *, int) __THROW;
--int		res_query (const char *, int, int, u_char *, int) __THROW;
--int		res_querydomain (const char *, const char *, int, int,
--				 u_char *, int) __THROW;
--int		res_search (const char *, int, int, u_char *, int) __THROW;
--int		res_send (const u_char *, int, u_char *, int) __THROW;
--__END_DECLS
--#endif
--
--#define b64_ntop		__b64_ntop
--#define b64_pton		__b64_pton
--#define dn_comp			__dn_comp
--#define dn_count_labels		__dn_count_labels
--#define dn_expand		__dn_expand
--#define dn_skipname		__dn_skipname
--#define fp_resstat		__fp_resstat
--#define loc_aton		__loc_aton
--#define loc_ntoa		__loc_ntoa
--#define p_cdname		__p_cdname
--#define p_cdnname		__p_cdnname
--#define p_class			__p_class
--#define p_fqname		__p_fqname
--#define p_fqnname		__p_fqnname
--#define p_option		__p_option
--#define p_secstodate		__p_secstodate
--#define p_section		__p_section
--#define p_time			__p_time
--#define p_type			__p_type
--#define p_rcode			__p_rcode
--#define putlong			__putlong
--#define putshort		__putshort
--#define res_dnok		__res_dnok
--#define res_hnok		__res_hnok
--#define res_hostalias		__res_hostalias
--#define res_mailok		__res_mailok
--#define res_nameinquery		__res_nameinquery
--#define res_nclose		__res_nclose
--#define res_ninit		__res_ninit
--#define res_nmkquery		__res_nmkquery
--#define res_npquery		__res_npquery
--#define res_nquery		__res_nquery
--#define res_nquerydomain	__res_nquerydomain
--#define res_nsearch		__res_nsearch
--#define res_nsend		__res_nsend
--#define res_nisourserver	__res_nisourserver
--#define res_ownok		__res_ownok
--#define res_queriesmatch	__res_queriesmatch
--#define res_randomid		__res_randomid
--#define sym_ntop		__sym_ntop
--#define sym_ntos		__sym_ntos
--#define sym_ston		__sym_ston
--__BEGIN_DECLS
--int		res_hnok (const char *) __THROW;
--int		res_ownok (const char *) __THROW;
--int		res_mailok (const char *) __THROW;
--int		res_dnok (const char *) __THROW;
--int		sym_ston (const struct res_sym *, const char *, int *) __THROW;
--const char *	sym_ntos (const struct res_sym *, int, int *) __THROW;
--const char *	sym_ntop (const struct res_sym *, int, int *) __THROW;
--int		b64_ntop (u_char const *, size_t, char *, size_t) __THROW;
--int		b64_pton (char const *, u_char *, size_t) __THROW;
--int		loc_aton (const char *__ascii, u_char *__binary) __THROW;
--const char *	loc_ntoa (const u_char *__binary, char *__ascii) __THROW;
--int		dn_skipname (const u_char *, const u_char *) __THROW;
--void		putlong (u_int32_t, u_char *) __THROW;
--void		putshort (u_int16_t, u_char *) __THROW;
--const char *	p_class (int) __THROW;
--const char *	p_time (u_int32_t) __THROW;
--const char *	p_type (int) __THROW;
--const char *	p_rcode (int) __THROW;
--const u_char *	p_cdnname (const u_char *, const u_char *, int, FILE *)
--     __THROW;
--const u_char *	p_cdname (const u_char *, const u_char *, FILE *) __THROW;
--const u_char *	p_fqnname (const u_char *__cp, const u_char *__msg,
--			   int, char *, int) __THROW;
--const u_char *	p_fqname (const u_char *, const u_char *, FILE *) __THROW;
--const char *	p_option (u_long __option) __THROW;
--char *		p_secstodate (u_long) __THROW;
--int		dn_count_labels (const char *) __THROW;
--int		dn_comp (const char *, u_char *, int, u_char **, u_char **)
--     __THROW;
--int		dn_expand (const u_char *, const u_char *, const u_char *,
--			   char *, int) __THROW;
--u_int		res_randomid (void) __THROW;
--int		res_nameinquery (const char *, int, int,
--				 const u_char *, const u_char *) __THROW;
--int		res_queriesmatch (const u_char *, const u_char *,
--				  const u_char *, const u_char *) __THROW;
--const char *	p_section (int __section, int __opcode) __THROW;
--/* Things involving a resolver context. */
--int		res_ninit (res_state) __THROW;
--int		res_nisourserver (const res_state,
--				  const struct sockaddr_in *) __THROW;
--void		fp_resstat (const res_state, FILE *) __THROW;
--void		res_npquery (const res_state, const u_char *, int, FILE *)
--     __THROW;
--const char *	res_hostalias (const res_state, const char *, char *, size_t)
--     __THROW;
--int		res_nquery (res_state, const char *, int, int, u_char *, int)
--     __THROW;
--int		res_nsearch (res_state, const char *, int, int, u_char *, int)
--     __THROW;
--int		res_nquerydomain (res_state, const char *, const char *, int,
--				  int, u_char *, int) __THROW;
--int		res_nmkquery (res_state, int, const char *, int, int,
--			      const u_char *, int, const u_char *, u_char *,
--			      int) __THROW;
--int		res_nsend (res_state, const u_char *, int, u_char *, int)
--     __THROW;
--void		res_nclose (res_state) __THROW;
--__END_DECLS
--#endif
--
--#endif /* !_RESOLV_H_ */
-Index: glibc-2.20/shadow/Makefile
-===================================================================
---- glibc-2.20.orig/shadow/Makefile
-+++ glibc-2.20/shadow/Makefile
-@@ -36,5 +36,6 @@ CFLAGS-fgetspent_r.c = -fexceptions $(li
- CFLAGS-putspent.c = -fexceptions $(libio-mtsafe)
- CFLAGS-getspnam.c = -fexceptions
- CFLAGS-getspnam_r.c = -fexceptions
-+CPPFLAGS-lckpwdf.c = -DSYSCONFDIR='"$(sysconfdir)"'
- 
- include ../Rules
-Index: glibc-2.20/shadow/lckpwdf.c
-===================================================================
---- glibc-2.20.orig/shadow/lckpwdf.c
-+++ glibc-2.20/shadow/lckpwdf.c
-@@ -29,7 +29,7 @@
- 
- 
- /* Name of the lock file.  */
--#define PWD_LOCKFILE "/etc/.pwd.lock"
-+#define PWD_LOCKFILE SYSCONFDIR "/.pwd.lock"
- 
- /* How long to wait for getting the lock before returning with an
-    error.  */
-Index: glibc-2.20/configure.ac
-===================================================================
---- glibc-2.20.orig/configure.ac
-+++ glibc-2.20/configure.ac
-@@ -2038,7 +2038,8 @@ RELEASE=`sed -n -e 's/^#define RELEASE "
- AC_SUBST(VERSION)
- AC_SUBST(RELEASE)
- 
--AC_CONFIG_FILES([config.make Makefile])
-+AC_CONFIG_FILES([config.make Makefile nss/db-Makefile resolv/netdb.h resolv/resolv.h
-+  sysdeps/generic/ldconfig.h])
- AC_CONFIG_COMMANDS([default],[[
- case $CONFIG_FILES in *config.make*)
- echo "$config_vars" >> config.make;;
-Index: glibc-2.20/resolv/netdb.h.in
-===================================================================
---- /dev/null
-+++ glibc-2.20/resolv/netdb.h.in
-@@ -0,0 +1,715 @@
-+  /* Copyright (C) 1996-2014 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+/* All data returned by the network data base library are supplied in
-+   host order and returned in network order (suitable for use in
-+   system calls).  */
-+
-+#ifndef	_NETDB_H
-+#define	_NETDB_H	1
-+
-+#include <features.h>
-+
-+#include <netinet/in.h>
-+#include <stdint.h>
-+#ifdef __USE_MISC
-+/* This is necessary to make this include file properly replace the
-+   Sun version.  */
-+# include <rpc/netdb.h>
-+#endif
-+
-+#ifdef __USE_GNU
-+# define __need_sigevent_t
-+# include <bits/siginfo.h>
-+# define __need_timespec
-+# include <time.h>
-+#endif
-+
-+#include <bits/netdb.h>
-+
-+/* Absolute file name for network data base files.  */
-+#define	_PATH_HEQUIV		"@libc_cv_sysconfdir@/hosts.equiv"
-+#define	_PATH_HOSTS		"@libc_cv_sysconfdir@/hosts"
-+#define	_PATH_NETWORKS		"@libc_cv_sysconfdir@/networks"
-+#define	_PATH_NSSWITCH_CONF	"@libc_cv_sysconfdir@/nsswitch.conf"
-+#define	_PATH_PROTOCOLS		"@libc_cv_sysconfdir@/protocols"
-+#define	_PATH_SERVICES		"@libc_cv_sysconfdir@/services"
-+
-+
-+__BEGIN_DECLS
-+
-+#if defined __USE_MISC || !defined __USE_XOPEN2K8
-+/* Error status for non-reentrant lookup functions.
-+   We use a macro to access always the thread-specific `h_errno' variable.  */
-+# define h_errno (*__h_errno_location ())
-+
-+/* Function to get address of global `h_errno' variable.  */
-+extern int *__h_errno_location (void) __THROW __attribute__ ((__const__));
-+
-+
-+/* Possible values left in `h_errno'.  */
-+# define HOST_NOT_FOUND	1	/* Authoritative Answer Host not found.  */
-+# define TRY_AGAIN	2	/* Non-Authoritative Host not found,
-+				   or SERVERFAIL.  */
-+# define NO_RECOVERY	3	/* Non recoverable errors, FORMERR, REFUSED,
-+				   NOTIMP.  */
-+# define NO_DATA	4	/* Valid name, no data record of requested
-+				   type.  */
-+#endif
-+#ifdef __USE_MISC
-+# define NETDB_INTERNAL	-1	/* See errno.  */
-+# define NETDB_SUCCESS	0	/* No problem.  */
-+# define NO_ADDRESS	NO_DATA	/* No address, look for MX record.  */
-+#endif
-+
-+#if defined __USE_XOPEN2K || defined __USE_XOPEN_EXTENDED
-+/* Highest reserved Internet port number.  */
-+# define IPPORT_RESERVED	1024
-+#endif
-+
-+#ifdef __USE_GNU
-+/* Scope delimiter for getaddrinfo(), getnameinfo().  */
-+# define SCOPE_DELIMITER	'%'
-+#endif
-+
-+#ifdef __USE_MISC
-+/* Print error indicated by `h_errno' variable on standard error.  STR
-+   if non-null is printed before the error string.  */
-+extern void herror (const char *__str) __THROW;
-+
-+/* Return string associated with error ERR_NUM.  */
-+extern const char *hstrerror (int __err_num) __THROW;
-+#endif
-+
-+
-+/* Description of data base entry for a single host.  */
-+struct hostent
-+{
-+  char *h_name;			/* Official name of host.  */
-+  char **h_aliases;		/* Alias list.  */
-+  int h_addrtype;		/* Host address type.  */
-+  int h_length;			/* Length of address.  */
-+  char **h_addr_list;		/* List of addresses from name server.  */
-+#ifdef __USE_MISC
-+# define	h_addr	h_addr_list[0] /* Address, for backward compatibility.*/
-+#endif
-+};
-+
-+/* Open host data base files and mark them as staying open even after
-+   a later search if STAY_OPEN is non-zero.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern void sethostent (int __stay_open);
-+
-+/* Close host data base files and clear `stay open' flag.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern void endhostent (void);
-+
-+/* Get next entry from host data base file.  Open data base if
-+   necessary.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern struct hostent *gethostent (void);
-+
-+/* Return entry from host data base which address match ADDR with
-+   length LEN and type TYPE.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern struct hostent *gethostbyaddr (const void *__addr, __socklen_t __len,
-+				      int __type);
-+
-+/* Return entry from host data base for host with NAME.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern struct hostent *gethostbyname (const char *__name);
-+
-+#ifdef __USE_MISC
-+/* Return entry from host data base for host with NAME.  AF must be
-+   set to the address type which is `AF_INET' for IPv4 or `AF_INET6'
-+   for IPv6.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern struct hostent *gethostbyname2 (const char *__name, int __af);
-+
-+/* Reentrant versions of the functions above.  The additional
-+   arguments specify a buffer of BUFLEN starting at BUF.  The last
-+   argument is a pointer to a variable which gets the value which
-+   would be stored in the global variable `herrno' by the
-+   non-reentrant functions.
-+
-+   These functions are not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation they are cancellation points and
-+   therefore not marked with __THROW.  */
-+extern int gethostent_r (struct hostent *__restrict __result_buf,
-+			 char *__restrict __buf, size_t __buflen,
-+			 struct hostent **__restrict __result,
-+			 int *__restrict __h_errnop);
-+
-+extern int gethostbyaddr_r (const void *__restrict __addr, __socklen_t __len,
-+			    int __type,
-+			    struct hostent *__restrict __result_buf,
-+			    char *__restrict __buf, size_t __buflen,
-+			    struct hostent **__restrict __result,
-+			    int *__restrict __h_errnop);
-+
-+extern int gethostbyname_r (const char *__restrict __name,
-+			    struct hostent *__restrict __result_buf,
-+			    char *__restrict __buf, size_t __buflen,
-+			    struct hostent **__restrict __result,
-+			    int *__restrict __h_errnop);
-+
-+extern int gethostbyname2_r (const char *__restrict __name, int __af,
-+			     struct hostent *__restrict __result_buf,
-+			     char *__restrict __buf, size_t __buflen,
-+			     struct hostent **__restrict __result,
-+			     int *__restrict __h_errnop);
-+#endif	/* misc */
-+
-+
-+/* Open network data base files and mark them as staying open even
-+   after a later search if STAY_OPEN is non-zero.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern void setnetent (int __stay_open);
-+
-+/* Close network data base files and clear `stay open' flag.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern void endnetent (void);
-+
-+/* Get next entry from network data base file.  Open data base if
-+   necessary.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern struct netent *getnetent (void);
-+
-+/* Return entry from network data base which address match NET and
-+   type TYPE.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern struct netent *getnetbyaddr (uint32_t __net, int __type);
-+
-+/* Return entry from network data base for network with NAME.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern struct netent *getnetbyname (const char *__name);
-+
-+#ifdef	__USE_MISC
-+/* Reentrant versions of the functions above.  The additional
-+   arguments specify a buffer of BUFLEN starting at BUF.  The last
-+   argument is a pointer to a variable which gets the value which
-+   would be stored in the global variable `herrno' by the
-+   non-reentrant functions.
-+
-+   These functions are not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation they are cancellation points and
-+   therefore not marked with __THROW.  */
-+extern int getnetent_r (struct netent *__restrict __result_buf,
-+			char *__restrict __buf, size_t __buflen,
-+			struct netent **__restrict __result,
-+			int *__restrict __h_errnop);
-+
-+extern int getnetbyaddr_r (uint32_t __net, int __type,
-+			   struct netent *__restrict __result_buf,
-+			   char *__restrict __buf, size_t __buflen,
-+			   struct netent **__restrict __result,
-+			   int *__restrict __h_errnop);
-+
-+extern int getnetbyname_r (const char *__restrict __name,
-+			   struct netent *__restrict __result_buf,
-+			   char *__restrict __buf, size_t __buflen,
-+			   struct netent **__restrict __result,
-+			   int *__restrict __h_errnop);
-+#endif	/* misc */
-+
-+
-+/* Description of data base entry for a single service.  */
-+struct servent
-+{
-+  char *s_name;			/* Official service name.  */
-+  char **s_aliases;		/* Alias list.  */
-+  int s_port;			/* Port number.  */
-+  char *s_proto;		/* Protocol to use.  */
-+};
-+
-+/* Open service data base files and mark them as staying open even
-+   after a later search if STAY_OPEN is non-zero.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern void setservent (int __stay_open);
-+
-+/* Close service data base files and clear `stay open' flag.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern void endservent (void);
-+
-+/* Get next entry from service data base file.  Open data base if
-+   necessary.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern struct servent *getservent (void);
-+
-+/* Return entry from network data base for network with NAME and
-+   protocol PROTO.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern struct servent *getservbyname (const char *__name, const char *__proto);
-+
-+/* Return entry from service data base which matches port PORT and
-+   protocol PROTO.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern struct servent *getservbyport (int __port, const char *__proto);
-+
-+
-+#ifdef	__USE_MISC
-+/* Reentrant versions of the functions above.  The additional
-+   arguments specify a buffer of BUFLEN starting at BUF.
-+
-+   These functions are not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation they are cancellation points and
-+   therefore not marked with __THROW.  */
-+extern int getservent_r (struct servent *__restrict __result_buf,
-+			 char *__restrict __buf, size_t __buflen,
-+			 struct servent **__restrict __result);
-+
-+extern int getservbyname_r (const char *__restrict __name,
-+			    const char *__restrict __proto,
-+			    struct servent *__restrict __result_buf,
-+			    char *__restrict __buf, size_t __buflen,
-+			    struct servent **__restrict __result);
-+
-+extern int getservbyport_r (int __port, const char *__restrict __proto,
-+			    struct servent *__restrict __result_buf,
-+			    char *__restrict __buf, size_t __buflen,
-+			    struct servent **__restrict __result);
-+#endif	/* misc */
-+
-+
-+/* Description of data base entry for a single service.  */
-+struct protoent
-+{
-+  char *p_name;			/* Official protocol name.  */
-+  char **p_aliases;		/* Alias list.  */
-+  int p_proto;			/* Protocol number.  */
-+};
-+
-+/* Open protocol data base files and mark them as staying open even
-+   after a later search if STAY_OPEN is non-zero.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern void setprotoent (int __stay_open);
-+
-+/* Close protocol data base files and clear `stay open' flag.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern void endprotoent (void);
-+
-+/* Get next entry from protocol data base file.  Open data base if
-+   necessary.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern struct protoent *getprotoent (void);
-+
-+/* Return entry from protocol data base for network with NAME.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern struct protoent *getprotobyname (const char *__name);
-+
-+/* Return entry from protocol data base which number is PROTO.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern struct protoent *getprotobynumber (int __proto);
-+
-+
-+#ifdef	__USE_MISC
-+/* Reentrant versions of the functions above.  The additional
-+   arguments specify a buffer of BUFLEN starting at BUF.
-+
-+   These functions are not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation they are cancellation points and
-+   therefore not marked with __THROW.  */
-+extern int getprotoent_r (struct protoent *__restrict __result_buf,
-+			  char *__restrict __buf, size_t __buflen,
-+			  struct protoent **__restrict __result);
-+
-+extern int getprotobyname_r (const char *__restrict __name,
-+			     struct protoent *__restrict __result_buf,
-+			     char *__restrict __buf, size_t __buflen,
-+			     struct protoent **__restrict __result);
-+
-+extern int getprotobynumber_r (int __proto,
-+			       struct protoent *__restrict __result_buf,
-+			       char *__restrict __buf, size_t __buflen,
-+			       struct protoent **__restrict __result);
-+
-+
-+/* Establish network group NETGROUP for enumeration.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int setnetgrent (const char *__netgroup);
-+
-+/* Free all space allocated by previous `setnetgrent' call.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern void endnetgrent (void);
-+
-+/* Get next member of netgroup established by last `setnetgrent' call
-+   and return pointers to elements in HOSTP, USERP, and DOMAINP.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int getnetgrent (char **__restrict __hostp,
-+			char **__restrict __userp,
-+			char **__restrict __domainp);
-+
-+
-+/* Test whether NETGROUP contains the triple (HOST,USER,DOMAIN).
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int innetgr (const char *__netgroup, const char *__host,
-+		    const char *__user, const char *__domain);
-+
-+/* Reentrant version of `getnetgrent' where result is placed in BUFFER.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int getnetgrent_r (char **__restrict __hostp,
-+			  char **__restrict __userp,
-+			  char **__restrict __domainp,
-+			  char *__restrict __buffer, size_t __buflen);
-+#endif	/* misc */
-+
-+
-+#ifdef __USE_MISC
-+/* Call `rshd' at port RPORT on remote machine *AHOST to execute CMD.
-+   The local user is LOCUSER, on the remote machine the command is
-+   executed as REMUSER.  In *FD2P the descriptor to the socket for the
-+   connection is returned.  The caller must have the right to use a
-+   reserved port.  When the function returns *AHOST contains the
-+   official host name.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int rcmd (char **__restrict __ahost, unsigned short int __rport,
-+		 const char *__restrict __locuser,
-+		 const char *__restrict __remuser,
-+		 const char *__restrict __cmd, int *__restrict __fd2p);
-+
-+/* This is the equivalent function where the protocol can be selected
-+   and which therefore can be used for IPv6.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int rcmd_af (char **__restrict __ahost, unsigned short int __rport,
-+		    const char *__restrict __locuser,
-+		    const char *__restrict __remuser,
-+		    const char *__restrict __cmd, int *__restrict __fd2p,
-+		    sa_family_t __af);
-+
-+/* Call `rexecd' at port RPORT on remote machine *AHOST to execute
-+   CMD.  The process runs at the remote machine using the ID of user
-+   NAME whose cleartext password is PASSWD.  In *FD2P the descriptor
-+   to the socket for the connection is returned.  When the function
-+   returns *AHOST contains the official host name.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int rexec (char **__restrict __ahost, int __rport,
-+		  const char *__restrict __name,
-+		  const char *__restrict __pass,
-+		  const char *__restrict __cmd, int *__restrict __fd2p);
-+
-+/* This is the equivalent function where the protocol can be selected
-+   and which therefore can be used for IPv6.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int rexec_af (char **__restrict __ahost, int __rport,
-+		     const char *__restrict __name,
-+		     const char *__restrict __pass,
-+		     const char *__restrict __cmd, int *__restrict __fd2p,
-+		     sa_family_t __af);
-+
-+/* Check whether user REMUSER on system RHOST is allowed to login as LOCUSER.
-+   If SUSER is not zero the user tries to become superuser.  Return 0 if
-+   it is possible.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int ruserok (const char *__rhost, int __suser,
-+		    const char *__remuser, const char *__locuser);
-+
-+/* This is the equivalent function where the protocol can be selected
-+   and which therefore can be used for IPv6.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int ruserok_af (const char *__rhost, int __suser,
-+		       const char *__remuser, const char *__locuser,
-+		       sa_family_t __af);
-+
-+/* Check whether user REMUSER on system indicated by IPv4 address
-+   RADDR is allowed to login as LOCUSER.  Non-IPv4 (e.g., IPv6) are
-+   not supported.  If SUSER is not zero the user tries to become
-+   superuser.  Return 0 if it is possible.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int iruserok (uint32_t __raddr, int __suser,
-+		     const char *__remuser, const char *__locuser);
-+
-+/* This is the equivalent function where the pfamiliy if the address
-+   pointed to by RADDR is determined by the value of AF.  It therefore
-+   can be used for IPv6
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int iruserok_af (const void *__raddr, int __suser,
-+			const char *__remuser, const char *__locuser,
-+			sa_family_t __af);
-+
-+/* Try to allocate reserved port, returning a descriptor for a socket opened
-+   at this port or -1 if unsuccessful.  The search for an available port
-+   will start at ALPORT and continues with lower numbers.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int rresvport (int *__alport);
-+
-+/* This is the equivalent function where the protocol can be selected
-+   and which therefore can be used for IPv6.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int rresvport_af (int *__alport, sa_family_t __af);
-+#endif
-+
-+
-+/* Extension from POSIX.1g.  */
-+#ifdef	__USE_POSIX
-+/* Structure to contain information about address of a service provider.  */
-+struct addrinfo
-+{
-+  int ai_flags;			/* Input flags.  */
-+  int ai_family;		/* Protocol family for socket.  */
-+  int ai_socktype;		/* Socket type.  */
-+  int ai_protocol;		/* Protocol for socket.  */
-+  socklen_t ai_addrlen;		/* Length of socket address.  */
-+  struct sockaddr *ai_addr;	/* Socket address for socket.  */
-+  char *ai_canonname;		/* Canonical name for service location.  */
-+  struct addrinfo *ai_next;	/* Pointer to next in list.  */
-+};
-+
-+# ifdef __USE_GNU
-+/* Structure used as control block for asynchronous lookup.  */
-+struct gaicb
-+{
-+  const char *ar_name;		/* Name to look up.  */
-+  const char *ar_service;	/* Service name.  */
-+  const struct addrinfo *ar_request; /* Additional request specification.  */
-+  struct addrinfo *ar_result;	/* Pointer to result.  */
-+  /* The following are internal elements.  */
-+  int __return;
-+  int __glibc_reserved[5];
-+};
-+
-+/* Lookup mode.  */
-+#  define GAI_WAIT	0
-+#  define GAI_NOWAIT	1
-+# endif
-+
-+/* Possible values for `ai_flags' field in `addrinfo' structure.  */
-+# define AI_PASSIVE	0x0001	/* Socket address is intended for `bind'.  */
-+# define AI_CANONNAME	0x0002	/* Request for canonical name.  */
-+# define AI_NUMERICHOST	0x0004	/* Don't use name resolution.  */
-+# define AI_V4MAPPED	0x0008	/* IPv4 mapped addresses are acceptable.  */
-+# define AI_ALL		0x0010	/* Return IPv4 mapped and IPv6 addresses.  */
-+# define AI_ADDRCONFIG	0x0020	/* Use configuration of this host to choose
-+				   returned address type..  */
-+# ifdef __USE_GNU
-+#  define AI_IDN	0x0040	/* IDN encode input (assuming it is encoded
-+				   in the current locale's character set)
-+				   before looking it up. */
-+#  define AI_CANONIDN	0x0080	/* Translate canonical name from IDN format. */
-+#  define AI_IDN_ALLOW_UNASSIGNED 0x0100 /* Don't reject unassigned Unicode
-+					    code points.  */
-+#  define AI_IDN_USE_STD3_ASCII_RULES 0x0200 /* Validate strings according to
-+						STD3 rules.  */
-+# endif
-+# define AI_NUMERICSERV	0x0400	/* Don't use name resolution.  */
-+
-+/* Error values for `getaddrinfo' function.  */
-+# define EAI_BADFLAGS	  -1	/* Invalid value for `ai_flags' field.  */
-+# define EAI_NONAME	  -2	/* NAME or SERVICE is unknown.  */
-+# define EAI_AGAIN	  -3	/* Temporary failure in name resolution.  */
-+# define EAI_FAIL	  -4	/* Non-recoverable failure in name res.  */
-+# define EAI_FAMILY	  -6	/* `ai_family' not supported.  */
-+# define EAI_SOCKTYPE	  -7	/* `ai_socktype' not supported.  */
-+# define EAI_SERVICE	  -8	/* SERVICE not supported for `ai_socktype'.  */
-+# define EAI_MEMORY	  -10	/* Memory allocation failure.  */
-+# define EAI_SYSTEM	  -11	/* System error returned in `errno'.  */
-+# define EAI_OVERFLOW	  -12	/* Argument buffer overflow.  */
-+# ifdef __USE_GNU
-+#  define EAI_NODATA	  -5	/* No address associated with NAME.  */
-+#  define EAI_ADDRFAMILY  -9	/* Address family for NAME not supported.  */
-+#  define EAI_INPROGRESS  -100	/* Processing request in progress.  */
-+#  define EAI_CANCELED	  -101	/* Request canceled.  */
-+#  define EAI_NOTCANCELED -102	/* Request not canceled.  */
-+#  define EAI_ALLDONE	  -103	/* All requests done.  */
-+#  define EAI_INTR	  -104	/* Interrupted by a signal.  */
-+#  define EAI_IDN_ENCODE  -105	/* IDN encoding failed.  */
-+# endif
-+
-+# ifdef __USE_MISC
-+#  define NI_MAXHOST      1025
-+#  define NI_MAXSERV      32
-+# endif
-+
-+# define NI_NUMERICHOST	1	/* Don't try to look up hostname.  */
-+# define NI_NUMERICSERV 2	/* Don't convert port number to name.  */
-+# define NI_NOFQDN	4	/* Only return nodename portion.  */
-+# define NI_NAMEREQD	8	/* Don't return numeric addresses.  */
-+# define NI_DGRAM	16	/* Look up UDP service rather than TCP.  */
-+# ifdef __USE_GNU
-+#  define NI_IDN	32	/* Convert name from IDN format.  */
-+#  define NI_IDN_ALLOW_UNASSIGNED 64 /* Don't reject unassigned Unicode
-+					code points.  */
-+#  define NI_IDN_USE_STD3_ASCII_RULES 128 /* Validate strings according to
-+					     STD3 rules.  */
-+# endif
-+
-+/* Translate name of a service location and/or a service name to set of
-+   socket addresses.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern int getaddrinfo (const char *__restrict __name,
-+			const char *__restrict __service,
-+			const struct addrinfo *__restrict __req,
-+			struct addrinfo **__restrict __pai);
-+
-+/* Free `addrinfo' structure AI including associated storage.  */
-+extern void freeaddrinfo (struct addrinfo *__ai) __THROW;
-+
-+/* Convert error return from getaddrinfo() to a string.  */
-+extern const char *gai_strerror (int __ecode) __THROW;
-+
-+/* Translate a socket address to a location and service name.
-+
-+   This function is a possible cancellation point and therefore not
-+   marked with __THROW.  */
-+extern int getnameinfo (const struct sockaddr *__restrict __sa,
-+			socklen_t __salen, char *__restrict __host,
-+			socklen_t __hostlen, char *__restrict __serv,
-+			socklen_t __servlen, int __flags);
-+#endif	/* POSIX */
-+
-+#ifdef __USE_GNU
-+/* Enqueue ENT requests from the LIST.  If MODE is GAI_WAIT wait until all
-+   requests are handled.  If WAIT is GAI_NOWAIT return immediately after
-+   queueing the requests and signal completion according to SIG.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int getaddrinfo_a (int __mode, struct gaicb *__list[__restrict_arr],
-+			  int __ent, struct sigevent *__restrict __sig);
-+
-+/* Suspend execution of the thread until at least one of the ENT requests
-+   in LIST is handled.  If TIMEOUT is not a null pointer it specifies the
-+   longest time the function keeps waiting before returning with an error.
-+
-+   This function is not part of POSIX and therefore no official
-+   cancellation point.  But due to similarity with an POSIX interface
-+   or due to the implementation it is a cancellation point and
-+   therefore not marked with __THROW.  */
-+extern int gai_suspend (const struct gaicb *const __list[], int __ent,
-+			const struct timespec *__timeout);
-+
-+/* Get the error status of the request REQ.  */
-+extern int gai_error (struct gaicb *__req) __THROW;
-+
-+/* Cancel the requests associated with GAICBP.  */
-+extern int gai_cancel (struct gaicb *__gaicbp) __THROW;
-+#endif	/* GNU */
-+
-+__END_DECLS
-+
-+#endif	/* netdb.h */
-Index: glibc-2.20/resolv/resolv.h.in
-===================================================================
---- /dev/null
-+++ glibc-2.20/resolv/resolv.h.in
-@@ -0,0 +1,389 @@
-+/*
-+ * Copyright (c) 1983, 1987, 1989
-+ *    The Regents of the University of California.  All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 4. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+/*
-+ * Portions Copyright (c) 1996-1999 by Internet Software Consortium.
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
-+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
-+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-+ * SOFTWARE.
-+ */
-+
-+/*
-+ *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
-+ *	$BINDId: resolv.h,v 8.31 2000/03/30 20:16:50 vixie Exp $
-+ */
-+
-+#ifndef _RESOLV_H_
-+
-+/* These headers are needed for types used in the `struct res_state'
-+   declaration.  */
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+
-+#ifndef __need_res_state
-+# define _RESOLV_H_
-+
-+# include <sys/param.h>
-+# include <sys/cdefs.h>
-+# include <stdio.h>
-+# include <arpa/nameser.h>
-+#endif
-+
-+#ifndef __res_state_defined
-+# define __res_state_defined
-+
-+typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error }
-+	res_sendhookact;
-+
-+typedef res_sendhookact (*res_send_qhook) (struct sockaddr_in * const *__ns,
-+					   const u_char **__query,
-+					   int *__querylen,
-+					   u_char *__ans,
-+					   int __anssiz,
-+					   int *__resplen);
-+
-+typedef res_sendhookact (*res_send_rhook) (const struct sockaddr_in *__ns,
-+					   const u_char *__query,
-+					   int __querylen,
-+					   u_char *__ans,
-+					   int __anssiz,
-+					   int *__resplen);
-+
-+/*
-+ * Global defines and variables for resolver stub.
-+ */
-+# define MAXNS			3	/* max # name servers we'll track */
-+# define MAXDFLSRCH		3	/* # default domain levels to try */
-+# define MAXDNSRCH		6	/* max # domains in search path */
-+# define LOCALDOMAINPARTS	2	/* min levels in name that is "local" */
-+
-+# define RES_TIMEOUT		5	/* min. seconds between retries */
-+# define MAXRESOLVSORT		10	/* number of net to sort on */
-+# define RES_MAXNDOTS		15	/* should reflect bit field size */
-+# define RES_MAXRETRANS		30	/* only for resolv.conf/RES_OPTIONS */
-+# define RES_MAXRETRY		5	/* only for resolv.conf/RES_OPTIONS */
-+# define RES_DFLRETRY		2	/* Default #/tries. */
-+# define RES_MAXTIME		65535	/* Infinity, in milliseconds. */
-+
-+struct __res_state {
-+	int	retrans;		/* retransmition time interval */
-+	int	retry;			/* number of times to retransmit */
-+	u_long	options;		/* option flags - see below. */
-+	int	nscount;		/* number of name servers */
-+	struct sockaddr_in
-+		nsaddr_list[MAXNS];	/* address of name server */
-+# define nsaddr	nsaddr_list[0]		/* for backward compatibility */
-+	u_short	id;			/* current message id */
-+	/* 2 byte hole here.  */
-+	char	*dnsrch[MAXDNSRCH+1];	/* components of domain to search */
-+	char	defdname[256];		/* default domain (deprecated) */
-+	u_long	pfcode;			/* RES_PRF_ flags - see below. */
-+	unsigned ndots:4;		/* threshold for initial abs. query */
-+	unsigned nsort:4;		/* number of elements in sort_list[] */
-+	unsigned ipv6_unavail:1;	/* connecting to IPv6 server failed */
-+	unsigned unused:23;
-+	struct {
-+		struct in_addr	addr;
-+		u_int32_t	mask;
-+	} sort_list[MAXRESOLVSORT];
-+	/* 4 byte hole here on 64-bit architectures.  */
-+	res_send_qhook qhook;		/* query hook */
-+	res_send_rhook rhook;		/* response hook */
-+	int	res_h_errno;		/* last one set for this context */
-+	int	_vcsock;		/* PRIVATE: for res_send VC i/o */
-+	u_int	_flags;			/* PRIVATE: see below */
-+	/* 4 byte hole here on 64-bit architectures.  */
-+	union {
-+		char	pad[52];	/* On an i386 this means 512b total. */
-+		struct {
-+			u_int16_t		nscount;
-+			u_int16_t		nsmap[MAXNS];
-+			int			nssocks[MAXNS];
-+			u_int16_t		nscount6;
-+			u_int16_t		nsinit;
-+			struct sockaddr_in6	*nsaddrs[MAXNS];
-+#ifdef _LIBC
-+			unsigned long long int	initstamp
-+			  __attribute__((packed));
-+#else
-+			unsigned int		_initstamp[2];
-+#endif
-+		} _ext;
-+	} _u;
-+};
-+
-+typedef struct __res_state *res_state;
-+# undef __need_res_state
-+#endif
-+
-+#ifdef _RESOLV_H_
-+/*
-+ * Revision information.  This is the release date in YYYYMMDD format.
-+ * It can change every day so the right thing to do with it is use it
-+ * in preprocessor commands such as "#if (__RES > 19931104)".  Do not
-+ * compare for equality; rather, use it to determine whether your resolver
-+ * is new enough to contain a certain feature.
-+ */
-+
-+#define	__RES	19991006
-+
-+/*
-+ * Resolver configuration file.
-+ * Normally not present, but may contain the address of the
-+ * inital name server(s) to query and the domain search list.
-+ */
-+
-+#ifndef _PATH_RESCONF
-+#define _PATH_RESCONF        "@libc_cv_sysconfdir@/resolv.conf"
-+#endif
-+
-+struct res_sym {
-+	int	number;		/* Identifying number, like T_MX */
-+	char *	name;		/* Its symbolic name, like "MX" */
-+	char *	humanname;	/* Its fun name, like "mail exchanger" */
-+};
-+
-+/*
-+ * Resolver flags (used to be discrete per-module statics ints).
-+ */
-+#define	RES_F_VC	0x00000001	/* socket is TCP */
-+#define	RES_F_CONN	0x00000002	/* socket is connected */
-+#define RES_F_EDNS0ERR	0x00000004	/* EDNS0 caused errors */
-+
-+/* res_findzonecut() options */
-+#define	RES_EXHAUSTIVE	0x00000001	/* always do all queries */
-+
-+/*
-+ * Resolver options (keep these in synch with res_debug.c, please)
-+ */
-+#define RES_INIT	0x00000001	/* address initialized */
-+#define RES_DEBUG	0x00000002	/* print debug messages */
-+#define RES_AAONLY	0x00000004	/* authoritative answers only (!IMPL)*/
-+#define RES_USEVC	0x00000008	/* use virtual circuit */
-+#define RES_PRIMARY	0x00000010	/* query primary server only (!IMPL) */
-+#define RES_IGNTC	0x00000020	/* ignore trucation errors */
-+#define RES_RECURSE	0x00000040	/* recursion desired */
-+#define RES_DEFNAMES	0x00000080	/* use default domain name */
-+#define RES_STAYOPEN	0x00000100	/* Keep TCP socket open */
-+#define RES_DNSRCH	0x00000200	/* search up local domain tree */
-+#define	RES_INSECURE1	0x00000400	/* type 1 security disabled */
-+#define	RES_INSECURE2	0x00000800	/* type 2 security disabled */
-+#define	RES_NOALIASES	0x00001000	/* shuts off HOSTALIASES feature */
-+#define	RES_USE_INET6	0x00002000	/* use/map IPv6 in gethostbyname() */
-+#define RES_ROTATE	0x00004000	/* rotate ns list after each query */
-+#define	RES_NOCHECKNAME	0x00008000	/* do not check names for sanity (!IMPL) */
-+#define	RES_KEEPTSIG	0x00010000	/* do not strip TSIG records */
-+#define	RES_BLAST	0x00020000	/* blast all recursive servers */
-+#define RES_USEBSTRING	0x00040000	/* IPv6 reverse lookup with byte
-+					   strings */
-+#define RES_NOIP6DOTINT	0x00080000	/* Do not use .ip6.int in IPv6
-+					   reverse lookup */
-+#define RES_USE_EDNS0	0x00100000	/* Use EDNS0.  */
-+#define RES_SNGLKUP	0x00200000	/* one outstanding request at a time */
-+#define RES_SNGLKUPREOP	0x00400000	/* -"-, but open new socket for each
-+					   request */
-+#define RES_USE_DNSSEC	0x00800000	/* use DNSSEC using OK bit in OPT */
-+#define RES_NOTLDQUERY	0x01000000	/* Do not look up unqualified name
-+					   as a TLD.  */
-+
-+#define RES_DEFAULT	(RES_RECURSE|RES_DEFNAMES|RES_DNSRCH|RES_NOIP6DOTINT)
-+
-+/*
-+ * Resolver "pfcode" values.  Used by dig.
-+ */
-+#define RES_PRF_STATS	0x00000001
-+#define RES_PRF_UPDATE	0x00000002
-+#define RES_PRF_CLASS   0x00000004
-+#define RES_PRF_CMD	0x00000008
-+#define RES_PRF_QUES	0x00000010
-+#define RES_PRF_ANS	0x00000020
-+#define RES_PRF_AUTH	0x00000040
-+#define RES_PRF_ADD	0x00000080
-+#define RES_PRF_HEAD1	0x00000100
-+#define RES_PRF_HEAD2	0x00000200
-+#define RES_PRF_TTLID	0x00000400
-+#define RES_PRF_HEADX	0x00000800
-+#define RES_PRF_QUERY	0x00001000
-+#define RES_PRF_REPLY	0x00002000
-+#define RES_PRF_INIT	0x00004000
-+/*			0x00008000	*/
-+
-+/* Things involving an internal (static) resolver context. */
-+__BEGIN_DECLS
-+extern struct __res_state *__res_state(void) __attribute__ ((__const__));
-+__END_DECLS
-+#define _res (*__res_state())
-+
-+#ifndef __BIND_NOSTATIC
-+#define fp_nquery		__fp_nquery
-+#define fp_query		__fp_query
-+#define hostalias		__hostalias
-+#define p_query			__p_query
-+#define res_close		__res_close
-+#define res_init		__res_init
-+#define res_isourserver		__res_isourserver
-+#define res_mkquery		__res_mkquery
-+#define res_query		__res_query
-+#define res_querydomain		__res_querydomain
-+#define res_search		__res_search
-+#define res_send		__res_send
-+
-+__BEGIN_DECLS
-+void		fp_nquery (const u_char *, int, FILE *) __THROW;
-+void		fp_query (const u_char *, FILE *) __THROW;
-+const char *	hostalias (const char *) __THROW;
-+void		p_query (const u_char *) __THROW;
-+void		res_close (void) __THROW;
-+int		res_init (void) __THROW;
-+int		res_isourserver (const struct sockaddr_in *) __THROW;
-+int		res_mkquery (int, const char *, int, int, const u_char *,
-+			     int, const u_char *, u_char *, int) __THROW;
-+int		res_query (const char *, int, int, u_char *, int) __THROW;
-+int		res_querydomain (const char *, const char *, int, int,
-+				 u_char *, int) __THROW;
-+int		res_search (const char *, int, int, u_char *, int) __THROW;
-+int		res_send (const u_char *, int, u_char *, int) __THROW;
-+__END_DECLS
-+#endif
-+
-+#define b64_ntop		__b64_ntop
-+#define b64_pton		__b64_pton
-+#define dn_comp			__dn_comp
-+#define dn_count_labels		__dn_count_labels
-+#define dn_expand		__dn_expand
-+#define dn_skipname		__dn_skipname
-+#define fp_resstat		__fp_resstat
-+#define loc_aton		__loc_aton
-+#define loc_ntoa		__loc_ntoa
-+#define p_cdname		__p_cdname
-+#define p_cdnname		__p_cdnname
-+#define p_class			__p_class
-+#define p_fqname		__p_fqname
-+#define p_fqnname		__p_fqnname
-+#define p_option		__p_option
-+#define p_secstodate		__p_secstodate
-+#define p_section		__p_section
-+#define p_time			__p_time
-+#define p_type			__p_type
-+#define p_rcode			__p_rcode
-+#define putlong			__putlong
-+#define putshort		__putshort
-+#define res_dnok		__res_dnok
-+#define res_hnok		__res_hnok
-+#define res_hostalias		__res_hostalias
-+#define res_mailok		__res_mailok
-+#define res_nameinquery		__res_nameinquery
-+#define res_nclose		__res_nclose
-+#define res_ninit		__res_ninit
-+#define res_nmkquery		__res_nmkquery
-+#define res_npquery		__res_npquery
-+#define res_nquery		__res_nquery
-+#define res_nquerydomain	__res_nquerydomain
-+#define res_nsearch		__res_nsearch
-+#define res_nsend		__res_nsend
-+#define res_nisourserver	__res_nisourserver
-+#define res_ownok		__res_ownok
-+#define res_queriesmatch	__res_queriesmatch
-+#define res_randomid		__res_randomid
-+#define sym_ntop		__sym_ntop
-+#define sym_ntos		__sym_ntos
-+#define sym_ston		__sym_ston
-+__BEGIN_DECLS
-+int		res_hnok (const char *) __THROW;
-+int		res_ownok (const char *) __THROW;
-+int		res_mailok (const char *) __THROW;
-+int		res_dnok (const char *) __THROW;
-+int		sym_ston (const struct res_sym *, const char *, int *) __THROW;
-+const char *	sym_ntos (const struct res_sym *, int, int *) __THROW;
-+const char *	sym_ntop (const struct res_sym *, int, int *) __THROW;
-+int		b64_ntop (u_char const *, size_t, char *, size_t) __THROW;
-+int		b64_pton (char const *, u_char *, size_t) __THROW;
-+int		loc_aton (const char *__ascii, u_char *__binary) __THROW;
-+const char *	loc_ntoa (const u_char *__binary, char *__ascii) __THROW;
-+int		dn_skipname (const u_char *, const u_char *) __THROW;
-+void		putlong (u_int32_t, u_char *) __THROW;
-+void		putshort (u_int16_t, u_char *) __THROW;
-+const char *	p_class (int) __THROW;
-+const char *	p_time (u_int32_t) __THROW;
-+const char *	p_type (int) __THROW;
-+const char *	p_rcode (int) __THROW;
-+const u_char *	p_cdnname (const u_char *, const u_char *, int, FILE *)
-+     __THROW;
-+const u_char *	p_cdname (const u_char *, const u_char *, FILE *) __THROW;
-+const u_char *	p_fqnname (const u_char *__cp, const u_char *__msg,
-+			   int, char *, int) __THROW;
-+const u_char *	p_fqname (const u_char *, const u_char *, FILE *) __THROW;
-+const char *	p_option (u_long __option) __THROW;
-+char *		p_secstodate (u_long) __THROW;
-+int		dn_count_labels (const char *) __THROW;
-+int		dn_comp (const char *, u_char *, int, u_char **, u_char **)
-+     __THROW;
-+int		dn_expand (const u_char *, const u_char *, const u_char *,
-+			   char *, int) __THROW;
-+u_int		res_randomid (void) __THROW;
-+int		res_nameinquery (const char *, int, int,
-+				 const u_char *, const u_char *) __THROW;
-+int		res_queriesmatch (const u_char *, const u_char *,
-+				  const u_char *, const u_char *) __THROW;
-+const char *	p_section (int __section, int __opcode) __THROW;
-+/* Things involving a resolver context. */
-+int		res_ninit (res_state) __THROW;
-+int		res_nisourserver (const res_state,
-+				  const struct sockaddr_in *) __THROW;
-+void		fp_resstat (const res_state, FILE *) __THROW;
-+void		res_npquery (const res_state, const u_char *, int, FILE *)
-+     __THROW;
-+const char *	res_hostalias (const res_state, const char *, char *, size_t)
-+     __THROW;
-+int		res_nquery (res_state, const char *, int, int, u_char *, int)
-+     __THROW;
-+int		res_nsearch (res_state, const char *, int, int, u_char *, int)
-+     __THROW;
-+int		res_nquerydomain (res_state, const char *, const char *, int,
-+				  int, u_char *, int) __THROW;
-+int		res_nmkquery (res_state, int, const char *, int, int,
-+			      const u_char *, int, const u_char *, u_char *,
-+			      int) __THROW;
-+int		res_nsend (res_state, const u_char *, int, u_char *, int)
-+     __THROW;
-+void		res_nclose (res_state) __THROW;
-+__END_DECLS
-+#endif
-+
-+#endif /* !_RESOLV_H_ */
-Index: glibc-2.20/configure
-===================================================================
---- glibc-2.20.orig/configure
-+++ glibc-2.20/configure
-@@ -7177,7 +7177,7 @@ RELEASE=`sed -n -e 's/^#define RELEASE "
- 
- 
- 
--ac_config_files="$ac_config_files config.make Makefile"
-+ac_config_files="$ac_config_files config.make Makefile nss/db-Makefile resolv/netdb.h resolv/resolv.h sysdeps/generic/ldconfig.h"
- 
- ac_config_commands="$ac_config_commands default"
- 
-@@ -7897,6 +7897,10 @@ do
-     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-     "config.make") CONFIG_FILES="$CONFIG_FILES config.make" ;;
-     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+    "nss/db-Makefile") CONFIG_FILES="$CONFIG_FILES nss/db-Makefile" ;;
-+    "resolv/netdb.h") CONFIG_FILES="$CONFIG_FILES resolv/netdb.h" ;;
-+    "resolv/resolv.h") CONFIG_FILES="$CONFIG_FILES resolv/resolv.h" ;;
-+    "sysdeps/generic/ldconfig.h") CONFIG_FILES="$CONFIG_FILES sysdeps/generic/ldconfig.h" ;;
-     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
- 
-   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-Index: glibc-2.20/sysdeps/generic/ldconfig.h
-===================================================================
---- glibc-2.20.orig/sysdeps/generic/ldconfig.h
-+++ /dev/null
-@@ -1,94 +0,0 @@
--/* Copyright (C) 1999-2014 Free Software Foundation, Inc.
--   This file is part of the GNU C Library.
--   Contributed by Andreas Jaeger <aj@××××.de>, 1999.
--
--   The GNU C Library is free software; you can redistribute it and/or
--   modify it under the terms of the GNU Lesser General Public
--   License as published by the Free Software Foundation; either
--   version 2.1 of the License, or (at your option) any later version.
--
--   The GNU C Library is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--   Lesser General Public License for more details.
--
--   You should have received a copy of the GNU Lesser General Public
--   License along with the GNU C Library; if not, see
--   <http://www.gnu.org/licenses/>.  */
--
--#ifndef _LDCONFIG_H
--#define _LDCONFIG_H
--
--#include <stdint.h>
--
--#define FLAG_ANY			-1
--#define FLAG_TYPE_MASK			0x00ff
--#define FLAG_LIBC4			0x0000
--#define FLAG_ELF			0x0001
--#define FLAG_ELF_LIBC5			0x0002
--#define FLAG_ELF_LIBC6			0x0003
--#define FLAG_REQUIRED_MASK		0xff00
--#define FLAG_SPARC_LIB64		0x0100
--#define FLAG_IA64_LIB64			0x0200
--#define FLAG_X8664_LIB64		0x0300
--#define FLAG_S390_LIB64			0x0400
--#define FLAG_POWERPC_LIB64		0x0500
--#define FLAG_MIPS64_LIBN32		0x0600
--#define FLAG_MIPS64_LIBN64		0x0700
--#define FLAG_X8664_LIBX32		0x0800
--#define FLAG_ARM_LIBHF			0x0900
--#define FLAG_AARCH64_LIB64		0x0a00
--#define FLAG_ARM_LIBSF			0x0b00
--#define FLAG_MIPS_LIB32_NAN2008		0x0c00
--#define FLAG_MIPS64_LIBN32_NAN2008	0x0d00
--#define FLAG_MIPS64_LIBN64_NAN2008	0x0e00
--
--/* Name of auxiliary cache.  */
--#define _PATH_LDCONFIG_AUX_CACHE "/var/cache/ldconfig/aux-cache"
--
--/* Declared in cache.c.  */
--extern void print_cache (const char *cache_name);
--
--extern void init_cache (void);
--
--extern void save_cache (const char *cache_name);
--
--extern void add_to_cache (const char *path, const char *lib, int flags,
--			  unsigned int osversion, uint64_t hwcap);
--
--extern void init_aux_cache (void);
--
--extern void load_aux_cache (const char *aux_cache_name);
--
--extern int search_aux_cache (struct stat64 *stat_buf, int *flags,
--			     unsigned int *osversion, char **soname);
--
--extern void add_to_aux_cache (struct stat64 *stat_buf, int flags,
--			      unsigned int osversion, const char *soname);
--
--extern void save_aux_cache (const char *aux_cache_name);
--
--/* Declared in readlib.c.  */
--extern int process_file (const char *real_file_name, const char *file_name,
--			 const char *lib, int *flag, unsigned int *osversion,
--			 char **soname, int is_link, struct stat64 *stat_buf);
--
--extern char *implicit_soname (const char *lib, int flag);
--
--/* Declared in readelflib.c.  */
--extern int process_elf_file (const char *file_name, const char *lib, int *flag,
--			     unsigned int *osversion, char **soname,
--			     void *file_contents, size_t file_length);
--
--/* Declared in chroot_canon.c.  */
--extern char *chroot_canon (const char *chroot, const char *name);
--
--/* Declared in ldconfig.c.  */
--extern int opt_verbose;
--
--extern int opt_format;
--
--/* Prototypes for a few program-wide used functions.  */
--#include <programs/xmalloc.h>
--
--#endif /* ! _LDCONFIG_H  */
-Index: glibc-2.20/sysdeps/generic/ldconfig.h.in
-===================================================================
---- /dev/null
-+++ glibc-2.20/sysdeps/generic/ldconfig.h.in
-@@ -0,0 +1,94 @@
-+/* Copyright (C) 1999-2014 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Andreas Jaeger <aj@××××.de>, 1999.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+#ifndef _LDCONFIG_H
-+#define _LDCONFIG_H
-+
-+#include <stdint.h>
-+
-+#define FLAG_ANY			-1
-+#define FLAG_TYPE_MASK			0x00ff
-+#define FLAG_LIBC4			0x0000
-+#define FLAG_ELF			0x0001
-+#define FLAG_ELF_LIBC5			0x0002
-+#define FLAG_ELF_LIBC6			0x0003
-+#define FLAG_REQUIRED_MASK		0xff00
-+#define FLAG_SPARC_LIB64		0x0100
-+#define FLAG_IA64_LIB64			0x0200
-+#define FLAG_X8664_LIB64		0x0300
-+#define FLAG_S390_LIB64			0x0400
-+#define FLAG_POWERPC_LIB64		0x0500
-+#define FLAG_MIPS64_LIBN32		0x0600
-+#define FLAG_MIPS64_LIBN64		0x0700
-+#define FLAG_X8664_LIBX32		0x0800
-+#define FLAG_ARM_LIBHF			0x0900
-+#define FLAG_AARCH64_LIB64		0x0a00
-+#define FLAG_ARM_LIBSF			0x0b00
-+#define FLAG_MIPS_LIB32_NAN2008		0x0c00
-+#define FLAG_MIPS64_LIBN32_NAN2008	0x0d00
-+#define FLAG_MIPS64_LIBN64_NAN2008	0x0e00
-+
-+/* Name of auxiliary cache.  */
-+#define _PATH_LDCONFIG_AUX_CACHE "@libc_cv_localstatedir@/cache/ldconfig/aux-cache"
-+
-+/* Declared in cache.c.  */
-+extern void print_cache (const char *cache_name);
-+
-+extern void init_cache (void);
-+
-+extern void save_cache (const char *cache_name);
-+
-+extern void add_to_cache (const char *path, const char *lib, int flags,
-+			  unsigned int osversion, uint64_t hwcap);
-+
-+extern void init_aux_cache (void);
-+
-+extern void load_aux_cache (const char *aux_cache_name);
-+
-+extern int search_aux_cache (struct stat64 *stat_buf, int *flags,
-+			     unsigned int *osversion, char **soname);
-+
-+extern void add_to_aux_cache (struct stat64 *stat_buf, int flags,
-+			      unsigned int osversion, const char *soname);
-+
-+extern void save_aux_cache (const char *aux_cache_name);
-+
-+/* Declared in readlib.c.  */
-+extern int process_file (const char *real_file_name, const char *file_name,
-+			 const char *lib, int *flag, unsigned int *osversion,
-+			 char **soname, int is_link, struct stat64 *stat_buf);
-+
-+extern char *implicit_soname (const char *lib, int flag);
-+
-+/* Declared in readelflib.c.  */
-+extern int process_elf_file (const char *file_name, const char *lib, int *flag,
-+			     unsigned int *osversion, char **soname,
-+			     void *file_contents, size_t file_length);
-+
-+/* Declared in chroot_canon.c.  */
-+extern char *chroot_canon (const char *chroot, const char *name);
-+
-+/* Declared in ldconfig.c.  */
-+extern int opt_verbose;
-+
-+extern int opt_format;
-+
-+/* Prototypes for a few program-wide used functions.  */
-+#include <programs/xmalloc.h>
-+
-+#endif /* ! _LDCONFIG_H  */

diff --git a/sys-libs/glibc/files/2.20/glibc-2.20-gentoo-chk_fail.c b/sys-libs/glibc/files/2.20/glibc-2.20-gentoo-chk_fail.c
deleted file mode 100644
index a8ab9d8..0000000
--- a/sys-libs/glibc/files/2.20/glibc-2.20-gentoo-chk_fail.c
+++ /dev/null
@@ -1,299 +0,0 @@
-/* Copyright (C) 2004-2014 Free Software Foundation, Inc.
-   Copyright (C) 2006-2014 Gentoo Foundation Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* Hardened Gentoo SSP and FORTIFY handler
-
-   A failure handler that does not use functions from the rest of glibc;
-   it uses the INTERNAL_SYSCALL methods directly.  This helps ensure no
-   possibility of recursion into the handler.
-
-   Direct all bug reports to http://bugs.gentoo.org/
-
-   People who have contributed significantly to the evolution of this file:
-   Ned Ludd - <solar[@]gentoo.org>
-   Alexander Gabert - <pappy[@]gentoo.org>
-   The PaX Team - <pageexec[@]freemail.hu>
-   Peter S. Mazinger - <ps.m[@]gmx.net>
-   Yoann Vandoorselaere - <yoann[@]prelude-ids.org>
-   Robert Connolly - <robert[@]linuxfromscratch.org>
-   Cory Visi <cory[@]visi.name>
-   Mike Frysinger <vapier[@]gentoo.org>
-   Magnus Granberg <zorry[@]gentoo.org>
-   Kevin F. Quinn - <kevquinn[@]gentoo.org>
- */
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <signal.h>
-
-#include <sys/types.h>
-
-#include <sysdep-cancel.h>
-#include <sys/syscall.h>
-
-#include <kernel-features.h>
-
-#include <alloca.h>
-/* from sysdeps */
-#include <socketcall.h>
-/* for the stuff in bits/socket.h */
-#include <sys/socket.h>
-#include <sys/un.h>
-
-/* Sanity check on SYSCALL macro names - force compilation
- * failure if the names used here do not exist
- */
-#if !defined __NR_socketcall && !defined __NR_socket
-# error Cannot do syscall socket or socketcall
-#endif
-#if !defined __NR_socketcall && !defined __NR_connect
-# error Cannot do syscall connect or socketcall
-#endif
-#ifndef __NR_write
-# error Cannot do syscall write
-#endif
-#ifndef __NR_close
-# error Cannot do syscall close
-#endif
-#ifndef __NR_getpid
-# error Cannot do syscall getpid
-#endif
-#ifndef __NR_kill
-# error Cannot do syscall kill
-#endif
-#ifndef __NR_exit
-# error Cannot do syscall exit
-#endif
-#ifdef SSP_SMASH_DUMPS_CORE
-# define ENABLE_SSP_SMASH_DUMPS_CORE 1
-# if !defined _KERNEL_NSIG && !defined _NSIG
-#  error No _NSIG or _KERNEL_NSIG for rt_sigaction
-# endif
-# if !defined __NR_sigaction && !defined __NR_rt_sigaction
-#  error Cannot do syscall sigaction or rt_sigaction
-# endif
-/* Although rt_sigaction expects sizeof(sigset_t) - it expects the size
- * of the _kernel_ sigset_t which is not the same as the user sigset_t.
- * Most arches have this as _NSIG bits - mips has _KERNEL_NSIG bits for
- * some reason.
- */
-# ifdef _KERNEL_NSIG
-#  define _SSP_NSIG _KERNEL_NSIG
-# else
-#  define _SSP_NSIG _NSIG
-# endif
-#else
-# define _SSP_NSIG 0
-# define ENABLE_SSP_SMASH_DUMPS_CORE 0
-#endif
-
-/* Define DO_SIGACTION - default to newer rt signal interface but
- * fallback to old as needed.
- */
-#ifdef __NR_rt_sigaction
-# define DO_SIGACTION(signum, act, oldact) \
-	INLINE_SYSCALL(rt_sigaction, 4, signum, act, oldact, _SSP_NSIG/8)
-#else
-# define DO_SIGACTION(signum, act, oldact) \
-	INLINE_SYSCALL(sigaction, 3, signum, act, oldact)
-#endif
-
-/* Define DO_SOCKET/DO_CONNECT functions to deal with socketcall vs socket/connect */
-#if defined(__NR_socket) && defined(__NR_connect)
-# define USE_OLD_SOCKETCALL 0
-#else
-# define USE_OLD_SOCKETCALL 1
-#endif
-
-/* stub out the __NR_'s so we can let gcc optimize away dead code */
-#ifndef __NR_socketcall
-# define __NR_socketcall 0
-#endif
-#ifndef __NR_socket
-# define __NR_socket 0
-#endif
-#ifndef __NR_connect
-# define __NR_connect 0
-#endif
-#define DO_SOCKET(result, domain, type, protocol) \
-	do { \
-		if (USE_OLD_SOCKETCALL) { \
-			socketargs[0] = domain; \
-			socketargs[1] = type; \
-			socketargs[2] = protocol; \
-			socketargs[3] = 0; \
-			result = INLINE_SYSCALL(socketcall, 2, SOCKOP_socket, socketargs); \
-		} else \
-			result = INLINE_SYSCALL(socket, 3, domain, type, protocol); \
-	} while (0)
-#define DO_CONNECT(result, sockfd, serv_addr, addrlen) \
-	do { \
-		if (USE_OLD_SOCKETCALL) { \
-			socketargs[0] = sockfd; \
-			socketargs[1] = (unsigned long int)serv_addr; \
-			socketargs[2] = addrlen; \
-			socketargs[3] = 0; \
-			result = INLINE_SYSCALL(socketcall, 2, SOCKOP_connect, socketargs); \
-		} else \
-			result = INLINE_SYSCALL(connect, 3, sockfd, serv_addr, addrlen); \
-	} while (0)
-
-#ifndef _PATH_LOG
-# define _PATH_LOG "/dev/log"
-#endif
-
-static const char path_log[] = _PATH_LOG;
-
-/* For building glibc with SSP switched on, define __progname to a
- * constant if building for the run-time loader, to avoid pulling
- * in more of libc.so into ld.so
- */
-#ifdef IS_IN_rtld
-static const char *__progname = "<ldso>";
-#else
-extern const char *__progname;
-#endif
-
-#ifdef GENTOO_SSP_HANDLER
-# define ERROR_MSG "stack smashing"
-#else
-# define ERROR_MSG "buffer overflow"
-#endif
-
-/* Common handler code, used by chk_fail
- * Inlined to ensure no self-references to the handler within itself.
- * Data static to avoid putting more than necessary on the stack,
- * to aid core debugging.
- */
-__attribute__ ((__noreturn__, __always_inline__))
-static inline void
-__hardened_gentoo_fail(void)
-{
-#define MESSAGE_BUFSIZ 512
-	static pid_t pid;
-	static int plen, i, hlen;
-	static char message[MESSAGE_BUFSIZ];
-	/* <11> is LOG_USER|LOG_ERR. A dummy date for loggers to skip over. */
-	static const char msg_header[] = "<11>" __DATE__ " " __TIME__ " glibc-gentoo-hardened-check: ";
-	static const char msg_ssd[] = "*** " ERROR_MSG " detected ***: ";
-	static const char msg_terminated[] = " terminated; ";
-	static const char msg_report[] = "report to " REPORT_BUGS_TO "\n";
-	static const char msg_unknown[] = "<unknown>";
-	static int log_socket, connect_result;
-	static struct sockaddr_un sock;
-	static unsigned long int socketargs[4];
-
-	/* Build socket address */
-	sock.sun_family = AF_UNIX;
-	i = 0;
-	while (path_log[i] != '\0' && i < sizeof(sock.sun_path) - 1) {
-		sock.sun_path[i] = path_log[i];
-		++i;
-	}
-	sock.sun_path[i] = '\0';
-
-	/* Try SOCK_DGRAM connection to syslog */
-	connect_result = -1;
-	DO_SOCKET(log_socket, AF_UNIX, SOCK_DGRAM, 0);
-	if (log_socket != -1)
-		DO_CONNECT(connect_result, log_socket, &sock, sizeof(sock));
-	if (connect_result == -1) {
-		if (log_socket != -1)
-			INLINE_SYSCALL(close, 1, log_socket);
-		/* Try SOCK_STREAM connection to syslog */
-		DO_SOCKET(log_socket, AF_UNIX, SOCK_STREAM, 0);
-		if (log_socket != -1)
-			DO_CONNECT(connect_result, log_socket, &sock, sizeof(sock));
-	}
-
-	/* Build message.  Messages are generated both in the old style and new style,
-	 * so that log watchers that are configured for the old-style message continue
-	 * to work.
-	 */
-#define strconcat(str) \
-	({ \
-		i = 0; \
-		while ((str[i] != '\0') && ((i + plen) < (MESSAGE_BUFSIZ - 1))) { \
-			message[plen + i] = str[i]; \
-			++i; \
-		} \
-		plen += i; \
-	})
-
-	/* Tersely log the failure */
-	plen = 0;
-	strconcat(msg_header);
-	hlen = plen;
-	strconcat(msg_ssd);
-	if (__progname != NULL)
-		strconcat(__progname);
-	else
-		strconcat(msg_unknown);
-	strconcat(msg_terminated);
-	strconcat(msg_report);
-
-	/* Write out error message to STDERR, to syslog if open */
-	INLINE_SYSCALL(write, 3, STDERR_FILENO, message + hlen, plen - hlen);
-	if (connect_result != -1) {
-		INLINE_SYSCALL(write, 3, log_socket, message, plen);
-		INLINE_SYSCALL(close, 1, log_socket);
-	}
-
-	/* Time to kill self since we have no idea what is going on */
-	pid = INLINE_SYSCALL(getpid, 0);
-
-	if (ENABLE_SSP_SMASH_DUMPS_CORE) {
-		/* Remove any user-supplied handler for SIGABRT, before using it. */
-#if 0
-		/*
-		 * Note: Disabled because some programs catch & process their
-		 * own crashes.  We've already enabled this code path which
-		 * means we want to let core dumps happen.
-		 */
-		static struct sigaction default_abort_act;
-		default_abort_act.sa_handler = SIG_DFL;
-		default_abort_act.sa_sigaction = NULL;
-		__sigfillset(&default_abort_act.sa_mask);
-		default_abort_act.sa_flags = 0;
-		if (DO_SIGACTION(SIGABRT, &default_abort_act, NULL) == 0)
-#endif
-			INLINE_SYSCALL(kill, 2, pid, SIGABRT);
-	}
-
-	/* SIGKILL is only signal which cannot be caught */
-	INLINE_SYSCALL(kill, 2, pid, SIGKILL);
-
-	/* In case the kill didn't work, exit anyway.
-	 * The loop prevents gcc thinking this routine returns.
-	 */
-	while (1)
-		INLINE_SYSCALL(exit, 1, 137);
-}
-
-__attribute__ ((__noreturn__))
-#ifdef GENTOO_SSP_HANDLER
-void __stack_chk_fail(void)
-#else
-void __chk_fail(void)
-#endif
-{
-	__hardened_gentoo_fail();
-}

diff --git a/sys-libs/glibc/files/2.20/glibc-2.20-gentoo-stack_chk_fail.c b/sys-libs/glibc/files/2.20/glibc-2.20-gentoo-stack_chk_fail.c
deleted file mode 100644
index 4a537bb..0000000
--- a/sys-libs/glibc/files/2.20/glibc-2.20-gentoo-stack_chk_fail.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define GENTOO_SSP_HANDLER
-#include <debug/chk_fail.c>

diff --git a/sys-libs/glibc/files/2.20/glibc-2.20-hardened-inittls-nosysenter.patch b/sys-libs/glibc/files/2.20/glibc-2.20-hardened-inittls-nosysenter.patch
deleted file mode 100644
index 35eabe9..0000000
--- a/sys-libs/glibc/files/2.20/glibc-2.20-hardened-inittls-nosysenter.patch
+++ /dev/null
@@ -1,306 +0,0 @@
-When building glibc PIE (which is not something upstream support),
-several modifications are necessary to the glibc build process.
-
-First, any syscalls in PIEs must be of the PIC variant, otherwise
-textrels ensue.  Then, any syscalls made before the initialisation
-of the TLS will fail on i386, as the sysenter variant on i386 uses
-the TLS, giving rise to a chicken-and-egg situation.  This patch
-defines a PIC syscall variant that doesn't use sysenter, even when the sysenter
-version is normally used, and uses the non-sysenter version for the brk
-syscall that is performed by the TLS initialisation.  Further, the TLS
-initialisation is moved in this case prior to the initialisation of
-dl_osversion, as that requires further syscalls.
-
-csu/libc-start.c: Move initial TLS initialization to before the
-initialisation of dl_osversion, when INTERNAL_SYSCALL_PRE_TLS is defined
-
-csu/libc-tls.c: Use the no-sysenter version of sbrk when
-INTERNAL_SYSCALL_PRE_TLS is defined.
-
-misc/sbrk.c: Define a no-sysenter version of sbrk, using the no-sysenter
-version of brk - if INTERNAL_SYSCALL_PRE_TLS is defined.
-
-misc/brk.c: Define a no-sysenter version of brk if
-INTERNAL_SYSCALL_PRE_TLS is defined.
-
-sysdeps/unix/sysv/linux/i386/sysdep.h: Define INTERNAL_SYSCALL_PRE_TLS
-Make INTERNAL_SYSCALL always use the PIC variant, even if not SHARED.
-
-Patch by Kevin F. Quinn <kevquinn@g.o>
-Fixed for 2.10 by Magnus Granberg <zorry@×××.nu>
-Fixed for 2.18 by Magnus Granberg <zorry@g.o>
-Fixed for 2.20 by Francisco Blas Izquierdo Riera <klondike@g.o>
-
---- a/csu/libc-start.c
-+++ b/csu/libc-start.c
-@@ -28,6 +28,7 @@
- extern int __libc_multiple_libcs;
- 
- #include <tls.h>
-+#include <sysdep.h>
- #ifndef SHARED
- # include <dl-osinfo.h>
- extern void __pthread_initialize_minimal (void);
-@@ -170,6 +171,11 @@ LIBC_START_MAIN (int (*main) (int, char
-         }
-     }
- 
-+# ifdef INTERNAL_SYSCALL_PRE_TLS
-+  /* Do the initial TLS initialization before _dl_osversion,
-+     since the latter uses the uname syscall.  */
-+  __pthread_initialize_minimal ();
-+# endif
- # ifdef DL_SYSDEP_OSCHECK
-   if (!__libc_multiple_libcs)
-     {
-@@ -138,10 +144,12 @@
-     }
- # endif
- 
-+# ifndef INTERNAL_SYSCALL_PRE_TLS
-   /* Initialize the thread library at least a bit since the libgcc
-      functions are using thread functions if these are available and
-      we need to setup errno.  */
-   __pthread_initialize_minimal ();
-+# endif
- 
-   /* Set up the stack checker's canary.  */
-   uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard ();
---- a/csu/libc-tls.c
-+++ b/csu/libc-tls.c
-@@ -22,12 +22,17 @@
- #include <unistd.h>
- #include <stdio.h>
- #include <sys/param.h>
-+#include <sysdep.h>
- 
- 
- #ifdef SHARED
-  #error makefile bug, this file is for static only
- #endif
- 
-+#ifdef INTERNAL_SYSCALL_PRE_TLS
-+extern void *__sbrk_nosysenter (intptr_t __delta);
-+#endif
-+
- dtv_t _dl_static_dtv[2 + TLS_SLOTINFO_SURPLUS];
- 
- 
-@@ -139,20 +144,29 @@ __libc_setup_tls (size_t tcbsize, size_t
- 
-      The initialized value of _dl_tls_static_size is provided by dl-open.c
-      to request some surplus that permits dynamic loading of modules with
--     IE-model TLS.  */
-+     IE-model TLS.
-+
-+     Where the normal sbrk would use a syscall that needs the TLS (i386)
-+     use the special non-sysenter version instead.  */
-+#ifdef INTERNAL_SYSCALL_PRE_TLS
-+# define __sbrk __sbrk_nosysenter
-+#endif
- #if TLS_TCB_AT_TP
-   tcb_offset = roundup (memsz + GL(dl_tls_static_size), tcbalign);
-   tlsblock = __sbrk (tcb_offset + tcbsize + max_align);
- #elif TLS_DTV_AT_TP
-   tcb_offset = roundup (tcbsize, align ?: 1);
-   tlsblock = __sbrk (tcb_offset + memsz + max_align
- 		     + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size));
-   tlsblock += TLS_PRE_TCB_SIZE;
- #else
-   /* In case a model with a different layout for the TCB and DTV
-      is defined add another #elif here and in the following #ifs.  */
- # error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined"
- #endif
-+#ifdef INTERNAL_SYSCALL_PRE_TLS
-+# undef __sbrk
-+#endif
- 
-   /* Align the TLS block.  */
-   tlsblock = (void *) (((uintptr_t) tlsblock + max_align - 1)
---- a/misc/sbrk.c
-+++ b/misc/sbrk.c
-@@ -18,6 +18,7 @@
- #include <errno.h>
- #include <stdint.h>
- #include <unistd.h>
-+#include <sysdep.h>
- 
- /* Defined in brk.c.  */
- extern void *__curbrk;
-@@ -29,6 +30,35 @@
- /* Extend the process's data space by INCREMENT.
-    If INCREMENT is negative, shrink data space by - INCREMENT.
-    Return start of new space allocated, or -1 for errors.  */
-+#ifdef INTERNAL_SYSCALL_PRE_TLS
-+/* This version is used by csu/libc-tls.c whem initialising the TLS
-+   if the SYSENTER version requires the TLS (which it does on i386).
-+   Obviously using the TLS before it is initialised is broken. */
-+extern int __brk_nosysenter (void *addr);
-+void *
-+__sbrk_nosysenter (intptr_t increment)
-+{
-+  void *oldbrk;
-+
-+  /* If this is not part of the dynamic library or the library is used via
-+     dynamic loading in a statically linked program update __curbrk from the
-+     kernel's brk value.  That way two separate instances of __brk and __sbrk
-+     can share the heap, returning interleaved pieces of it.  */
-+  if (__curbrk == NULL || __libc_multiple_libcs)
-+    if (__brk_nosysenter (0) < 0)		/* Initialize the break.  */
-+      return (void *) -1;
-+
-+  if (increment == 0)
-+    return __curbrk;
-+
-+  oldbrk = __curbrk;
-+  if (__brk_nosysenter (oldbrk + increment) < 0)
-+    return (void *) -1;
-+
-+  return oldbrk;
-+}
-+#endif
-+
- void *
- __sbrk (intptr_t increment)
- {
---- a/sysdeps/unix/sysv/linux/i386/brk.c
-+++ b/sysdeps/unix/sysv/linux/i386/brk.c
-@@ -31,6 +31,30 @@
-    linker.  */
- weak_alias (__curbrk, ___brk_addr)
- 
-+#ifdef INTERNAL_SYSCALL_PRE_TLS
-+/* This version is used by csu/libc-tls.c whem initialising the TLS
-+   if the SYSENTER version requires the TLS (which it does on i386).
-+   Obviously using the TLS before it is initialised is broken.  */
-+int
-+__brk_nosysenter (void *addr)
-+{
-+  void *newbrk;
-+
-+  INTERNAL_SYSCALL_DECL (err);
-+  newbrk = (void *) INTERNAL_SYSCALL_PRE_TLS (brk, err, 1, addr);
-+
-+  __curbrk = newbrk;
-+
-+  if (newbrk < addr)
-+    {
-+      __set_errno (ENOMEM);
-+      return -1;
-+    }
-+
-+  return 0;
-+}
-+#endif
-+
- int
- __brk (void *addr)
- {
---- a/sysdeps/unix/sysv/linux/i386/sysdep.h
-+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
-@@ -187,7 +187,7 @@
- /* The original calling convention for system calls on Linux/i386 is
-    to use int $0x80.  */
- #ifdef I386_USE_SYSENTER
--# ifdef SHARED
-+# ifdef __PIC__
- #  define ENTER_KERNEL call *%gs:SYSINFO_OFFSET
- # else
- #  define ENTER_KERNEL call *_dl_sysinfo
-@@ -358,7 +358,7 @@
-    possible to use more than four parameters.  */
- #undef INTERNAL_SYSCALL
- #ifdef I386_USE_SYSENTER
--# ifdef SHARED
-+# ifdef __PIC__
- #  define INTERNAL_SYSCALL(name, err, nr, args...) \
-   ({									      \
-     register unsigned int resultvar;					      \
-@@ -384,6 +384,18 @@
-     : "0" (name), "i" (offsetof (tcbhead_t, sysinfo))			      \
-       ASMFMT_##nr(args) : "memory", "cc");				      \
-     (int) resultvar; })
-+#  define INTERNAL_SYSCALL_PRE_TLS(name, err, nr, args...) \
-+  ({									      \
-+    register unsigned int resultvar;					      \
-+    EXTRAVAR_##nr							      \
-+    asm volatile (							      \
-+    LOADARGS_NOSYSENTER_##nr						      \
-+    "movl %1, %%eax\n\t"						      \
-+    "int $0x80\n\t"							      \
-+    RESTOREARGS_NOSYSENTER_##nr						      \
-+    : "=a" (resultvar)							      \
-+    : "i" (__NR_##name) ASMFMT_##nr(args) : "memory", "cc");		      \
-+    (int) resultvar; })
- # else
- #  define INTERNAL_SYSCALL(name, err, nr, args...) \
-   ({									      \
-@@ -447,12 +459,20 @@
- 
- #define LOADARGS_0
- #ifdef __PIC__
--# if defined I386_USE_SYSENTER && defined SHARED
-+# if defined I386_USE_SYSENTER && defined __PIC__
- #  define LOADARGS_1 \
-     "bpushl .L__X'%k3, %k3\n\t"
- #  define LOADARGS_5 \
-     "movl %%ebx, %4\n\t"						      \
-     "movl %3, %%ebx\n\t"
-+#  define LOADARGS_NOSYSENTER_1 \
-+    "bpushl .L__X'%k2, %k2\n\t"
-+#  define LOADARGS_NOSYSENTER_2	LOADARGS_NOSYSENTER_1
-+#  define LOADARGS_NOSYSENTER_3	LOADARGS_3
-+#  define LOADARGS_NOSYSENTER_4	LOADARGS_3
-+#  define LOADARGS_NOSYSENTER_5 \
-+    "movl %%ebx, %3\n\t"						      \
-+    "movl %2, %%ebx\n\t"
- # else
- #  define LOADARGS_1 \
-     "bpushl .L__X'%k2, %k2\n\t"
-@@ -474,11 +494,18 @@
- 
- #define RESTOREARGS_0
- #ifdef __PIC__
--# if defined I386_USE_SYSENTER && defined SHARED
-+# if defined I386_USE_SYSENTER && defined __PIC__
- #  define RESTOREARGS_1 \
-     "bpopl .L__X'%k3, %k3\n\t"
- #  define RESTOREARGS_5 \
-     "movl %4, %%ebx"
-+#  define RESTOREARGS_NOSYSENTER_1 \
-+    "bpopl .L__X'%k2, %k2\n\t"
-+#  define RESTOREARGS_NOSYSENTER_2	RESTOREARGS_NOSYSENTER_1
-+#  define RESTOREARGS_NOSYSENTER_3	RESTOREARGS_3
-+#  define RESTOREARGS_NOSYSENTER_4	RESTOREARGS_3
-+#  define RESTOREARGS_NOSYSENTER_5 \
-+    "movl %3, %%ebx"
- # else
- #  define RESTOREARGS_1 \
-     "bpopl .L__X'%k2, %k2\n\t"
---- a/sysdeps/i386/nptl/tls.h
-+++ b/sysdeps/i386/nptl/tls.h
-@@ -189,6 +189,15 @@
-   desc->vals[3] = 0x51;
- }
- 
-+/* We have no sysenter until the tls is initialized which is a
-+   problem for PIC. Thus we need to do the right call depending
-+   on the situation.  */
-+#ifndef INTERNAL_SYSCALL_PRE_TLS
-+# define TLS_INIT_SYSCALL INTERNAL_SYSCALL
-+#else
-+# define TLS_INIT_SYSCALL INTERNAL_SYSCALL_PRE_TLS
-+#endif
-+
- /* Code to initially initialize the thread pointer.  This might need
-    special attention since 'errno' is not yet available and if the
-    operation can cause a failure 'errno' must not be touched.  */
-@@ -209,7 +218,7 @@
- 									      \
-      /* Install the TLS.  */						      \
-      INTERNAL_SYSCALL_DECL (err);					      \
--     _result = INTERNAL_SYSCALL (set_thread_area, err, 1, &_segdescr.desc);   \
-+     _result = TLS_INIT_SYSCALL (set_thread_area, err, 1, &_segdescr.desc);   \
- 									      \
-      if (_result == 0)							      \
-        /* We know the index in the GDT, now load the segment register.	      \

diff --git a/sys-libs/glibc/files/2.20/glibc-2.20-vdso-disable.patch b/sys-libs/glibc/files/2.20/glibc-2.20-vdso-disable.patch
deleted file mode 100644
index 2b2de6b..0000000
--- a/sys-libs/glibc/files/2.20/glibc-2.20-vdso-disable.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-disable vdso loading in ELF handler unconditionally for some buggy kernel
-like that shipped with RHEL(likely CentOS and SL) 5.6
-
-  https://bugzilla.redhat.com/show_bug.cgi?id=673616
-
-Benda Xu <heroxbd@g.o> (24 Nov, 2014)
-
-Index: work/glibc-2.20/sysdeps/unix/sysv/linux/dl-sysdep.h
-===================================================================
---- work.orig/glibc-2.20/sysdeps/unix/sysv/linux/dl-sysdep.h
-+++ work/glibc-2.20/sysdeps/unix/sysv/linux/dl-sysdep.h
-@@ -23,7 +23,7 @@
-    machines, we should look at it for unwind information even if
-    we aren't making direct use of it.  So enable this across the board.  */
- 
--#define NEED_DL_SYSINFO_DSO	1
-+#define NEED_DL_SYSINFO_DSO	0
- 
- 
- #ifndef __ASSEMBLER__

diff --git a/sys-libs/glibc/files/2.3.3/glibc-2.3.3-localedef-fix-trampoline.patch b/sys-libs/glibc/files/2.3.3/glibc-2.3.3-localedef-fix-trampoline.patch
deleted file mode 100644
index 7c4399f..0000000
--- a/sys-libs/glibc/files/2.3.3/glibc-2.3.3-localedef-fix-trampoline.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-#! /bin/sh -e
-
-# DP: Description: Fix localedef segfault when run under exec-shield,
-#        PaX or similar. (#231438, #198099)
-# DP: Dpatch Author: James Troup <james@××××××.org>
-# DP: Patch Author: (probably) Jakub Jelinek <jakub@××××××.com>
-# DP: Upstream status: Unknown
-# DP: Status Details: Unknown
-# DP: Date: 2004-03-16
-
-if [ $# -ne 2 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch) patch -d "$2" -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p1 < $0;;
-    *)
-	echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-	exit 1
-esac
-exit 0
-
---- glibc-2.3.3-net/locale/programs/3level.h	16 Jun 2003 07:19:09 -0000	1.1.1.5
-+++ glibc-2.3.3-redhat/locale/programs/3level.h	16 Jun 2003 09:32:40 -0000	1.4
-@@ -204,6 +204,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t,
- 	}
-     }
- }
-+
-+/* GCC ATM seems to do a poor job with pointers to nested functions passed
-+   to inlined functions.  Help it a little bit with this hack.  */
-+#define wchead_table_iterate(tp, fn) \
-+do									      \
-+  {									      \
-+    struct wchead_table *t = (tp);					      \
-+    uint32_t index1;							      \
-+    for (index1 = 0; index1 < t->level1_size; index1++)			      \
-+      {									      \
-+	uint32_t lookup1 = t->level1[index1];				      \
-+	if (lookup1 != ((uint32_t) ~0))					      \
-+	  {								      \
-+	    uint32_t lookup1_shifted = lookup1 << t->q;			      \
-+	    uint32_t index2;						      \
-+	    for (index2 = 0; index2 < (1 << t->q); index2++)		      \
-+	      {								      \
-+		uint32_t lookup2 = t->level2[index2 + lookup1_shifted];	      \
-+		if (lookup2 != ((uint32_t) ~0))				      \
-+		  {							      \
-+		    uint32_t lookup2_shifted = lookup2 << t->p;		      \
-+		    uint32_t index3;					      \
-+		    for (index3 = 0; index3 < (1 << t->p); index3++)	      \
-+		      {							      \
-+			struct element_t *lookup3			      \
-+			  = t->level3[index3 + lookup2_shifted];	      \
-+			if (lookup3 != NULL)				      \
-+			  fn ((((index1 << t->q) + index2) << t->p) + index3, \
-+			      lookup3);					      \
-+		      }							      \
-+		  }							      \
-+	      }								      \
-+	  }								      \
-+      }									      \
-+  } while (0)
-+
- #endif
- 
- #ifndef NO_FINALIZE

diff --git a/sys-libs/glibc/files/2.5/glibc-2.5-gentoo-stack_chk_fail.c b/sys-libs/glibc/files/2.5/glibc-2.5-gentoo-stack_chk_fail.c
deleted file mode 100644
index e304440..0000000
--- a/sys-libs/glibc/files/2.5/glibc-2.5-gentoo-stack_chk_fail.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* Copyright (C) 2006 Gentoo Foundation Inc.
- * License terms as above.
- *
- * Hardened Gentoo SSP handler
- *
- * An SSP failure handler that does not use functions from the rest of
- * glibc; it uses the INTERNAL_SYSCALL methods directly.  This ensures
- * no possibility of recursion into the handler.
- *
- * Direct all bug reports to http://bugs.gentoo.org/
- *
- * Re-written from the glibc-2.3 Hardened Gentoo SSP handler
- * by Kevin F. Quinn - <kevquinn[@]gentoo.org>
- *
- * The following people contributed to the glibc-2.3 Hardened
- * Gentoo SSP handler, from which this implementation draws much:
- *
- * Ned Ludd - <solar[@]gentoo.org>
- * Alexander Gabert - <pappy[@]gentoo.org>
- * The PaX Team - <pageexec[@]freemail.hu>
- * Peter S. Mazinger - <ps.m[@]gmx.net>
- * Yoann Vandoorselaere - <yoann[@]prelude-ids.org>
- * Robert Connolly - <robert[@]linuxfromscratch.org>
- * Cory Visi <cory[@]visi.name>
- * Mike Frysinger <vapier[@]gentoo.org>
- */
-
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <signal.h>
-
-#include <sys/types.h>
-
-#include <sysdep-cancel.h>
-#include <sys/syscall.h>
-#include <bp-checks.h>
-
-#include <kernel-features.h>
-
-#include <alloca.h>
-/* from sysdeps */
-#include <socketcall.h>
-/* for the stuff in bits/socket.h */
-#include <sys/socket.h>
-#include <sys/un.h>
-
-
-/* Sanity check on SYSCALL macro names - force compilation
- * failure if the names used here do not exist
- */
-#if !defined __NR_socketcall && !defined __NR_socket
-# error Cannot do syscall socket or socketcall
-#endif
-#if !defined __NR_socketcall && !defined __NR_connect
-# error Cannot do syscall connect or socketcall
-#endif
-#ifndef __NR_write
-# error Cannot do syscall write
-#endif
-#ifndef __NR_close
-# error Cannot do syscall close
-#endif
-#ifndef __NR_getpid
-# error Cannot do syscall getpid
-#endif
-#ifndef __NR_kill
-# error Cannot do syscall kill
-#endif
-#ifndef __NR_exit
-# error Cannot do syscall exit
-#endif
-#ifdef SSP_SMASH_DUMPS_CORE
-# if !defined _KERNEL_NSIG && !defined _NSIG
-#  error No _NSIG or _KERNEL_NSIG for rt_sigaction
-# endif
-# if !defined __NR_sigation && !defined __NR_rt_sigaction
-#  error Cannot do syscall sigaction or rt_sigaction
-# endif
-#endif
-
-
-
-/* Define DO_SOCKET/DO_CONNECT macros to deal with socketcall vs socket/connect */
-#ifdef __NR_socketcall
-
-# define DO_SOCKET(result,domain,type,protocol) \
-	{socketargs[0] = domain; \
-	socketargs[1] = type; \
-	socketargs[2] = protocol; \
-	socketargs[3] = 0; \
-	result = INLINE_SYSCALL(socketcall,2,SOCKOP_socket,socketargs);}
-
-# define DO_CONNECT(result,sockfd,serv_addr,addrlen) \
-	{socketargs[0] = sockfd; \
-	socketargs[1] = (unsigned long int)serv_addr; \
-	socketargs[2] = addrlen; \
-	socketargs[3] = 0; \
-	result = INLINE_SYSCALL(socketcall,2,SOCKOP_connect,socketargs);}
-
-#else
-
-# define DO_SOCKET(result,domain,type,protocol) \
-	{result = INLINE_SYSCALL(socket,3,domain,type,protocol);}
-
-# define DO_CONNECT(result,sockfd,serv_addr,addrlen) \
-	{result = INLINE_SYSCALL(connect,3,sockfd,serv_addr,addrlen);}
-
-#endif
-/* __NR_socketcall */
-
-
-#ifndef _PATH_LOG
-# define _PATH_LOG "/dev/log"
-#endif
-
-static const char path_log[]=_PATH_LOG;
-
-/* For building glibc with SSP switched on, define __progname to a
- * constant if building for the run-time loader, to avoid pulling
- * in more of libc.so into ld.so
- */
-#ifdef IS_IN_rtld
-static char *__progname = "<rtld>";
-#else
-extern char *__progname;
-#endif
-
-
-/* Common handler code, used by stack_chk_fail and __stack_smash_handler
- * Inlined to ensure no self-references to the handler within itself.
- * Data static to avoid putting more than necessary on the stack,
- * to aid core debugging.
- */
-static inline void
-__attribute__ ((__noreturn__ , __always_inline__))
-__hardened_gentoo_stack_chk_fail (char func[], int damaged)
-{
-#define MESSAGE_BUFSIZ 256
-	static pid_t pid;
-	static int plen, i;
-	static char message[MESSAGE_BUFSIZ];
-	static const char msg_ssa[]=": stack smashing attack";
-	static const char msg_inf[]=" in function ";
-	static const char msg_ssd[]="*** stack smashing detected ***: ";
-	static const char msg_terminated[]=" - terminated\n";
-	static const char msg_report[]="Report to http://bugs.gentoo.org/\n";
-	static const char msg_unknown[]="<unknown>";
-#ifdef SSP_SMASH_DUMPS_CORE
-	static struct sigaction default_abort_act;
-#endif
-	static int log_socket, connect_result;
-	static struct sockaddr_un sock;
-#ifdef __NR_socketcall
-	static unsigned long int socketargs[4];
-#endif
-
-	/* Build socket address
-	 */
-	sock.sun_family = AF_UNIX;
-	i=0;
-	while ((path_log[i] != '\0') && (i<(sizeof(sock.sun_path)-1)))
-	  {
-		sock.sun_path[i]=path_log[i];
-		i++;
-	  }
-	sock.sun_path[i]='\0';
-
-	/* Try SOCK_DGRAM connection to syslog */
-	connect_result=-1;
-	DO_SOCKET(log_socket,AF_UNIX,SOCK_DGRAM,0);
-	if (log_socket != -1)
-		DO_CONNECT(connect_result,log_socket,(&sock),(sizeof(sock)));
-	if (connect_result == -1)
-	  {
-		if (log_socket != -1)
-			INLINE_SYSCALL(close,1,log_socket);
-		/* Try SOCK_STREAM connection to syslog */
-		DO_SOCKET(log_socket,AF_UNIX,SOCK_STREAM,0);
-		if (log_socket != -1)
-			DO_CONNECT(connect_result,log_socket,(&sock),(sizeof(sock)));
-	  }
-
-	/* Build message.  Messages are generated both in the old style and new style,
-	 * so that log watchers that are configured for the old-style message continue
-	 * to work.
-	 */
-#define strconcat(str) \
-		{i=0; while ((str[i] != '\0') && ((i+plen)<(MESSAGE_BUFSIZ-1))) \
-		{\
-			message[plen+i]=str[i];\
-			i++;\
-		}\
-		plen+=i;}
-
-	/* R.Henderson post-gcc-4 style message */
-	plen=0;
-	strconcat(msg_ssd);
-	if (__progname != (char *)0)
-		strconcat(__progname)
-	else
-		strconcat(msg_unknown);
-	strconcat(msg_terminated);
-
-	/* Write out error message to STDERR, to syslog if open */
-	INLINE_SYSCALL(write,3,STDERR_FILENO,message,plen);
-	if (connect_result != -1)
-		INLINE_SYSCALL(write,3,log_socket,message,plen);
-
-	/* Dr. Etoh pre-gcc-4 style message */
-	plen=0;
-	if (__progname != (char *)0)
-		strconcat(__progname)
-	else
-		strconcat(msg_unknown);
-	strconcat(msg_ssa);
-	strconcat(msg_inf);
-	if (func!=NULL)
-		strconcat(func)
-	else
-		strconcat(msg_unknown);
-	strconcat(msg_terminated);
-	/* Write out error message to STDERR, to syslog if open */
-	INLINE_SYSCALL(write,3,STDERR_FILENO,message,plen);
-	if (connect_result != -1)
-		INLINE_SYSCALL(write,3,log_socket,message,plen);
-
-	/* Direct reports to bugs.gentoo.org */
-	plen=0;
-	strconcat(msg_report);
-	message[plen++]='\0';
-
-	/* Write out error message to STDERR, to syslog if open */
-	INLINE_SYSCALL(write,3,STDERR_FILENO,message,plen);
-	if (connect_result != -1)
-		INLINE_SYSCALL(write,3,log_socket,message,plen);
-
-	if (log_socket != -1)
-		INLINE_SYSCALL(close,1,log_socket);
-
-	/* Suicide */
-	pid=INLINE_SYSCALL(getpid,0);
-#ifdef SSP_SMASH_DUMPS_CORE
-	/* Remove any user-supplied handler for SIGABRT, before using it */
-	default_abort_act.sa_handler = SIG_DFL;
-	default_abort_act.sa_sigaction = NULL;
-	__sigfillset(&default_abort_act.sa_mask);
-	default_abort_act.sa_flags = 0;
-	/* sigaction doesn't exist on amd64; however rt_sigaction seems to
-	 * exist everywhere.  rt_sigaction has an extra parameter - the
-	 * size of sigset_t.
-	 */
-# ifdef __NR_sigation
-	if (INLINE_SYSCALL(sigaction,3,SIGABRT,&default_abort_act,NULL) == 0)
-# else
-	/* Although rt_sigaction expects sizeof(sigset_t) - it expects the size
-	 * of the _kernel_ sigset_t which is not the same as the user sigset_t.
-	 * Most arches have this as _NSIG bits - mips has _KERNEL_NSIG bits for
-	 * some reason.
-	 */
-#  ifdef _KERNEL_NSIG
-	if (INLINE_SYSCALL(rt_sigaction,4,SIGABRT,&default_abort_act,NULL,_KERNEL_NSIG/8) == 0)
-#  else
-	if (INLINE_SYSCALL(rt_sigaction,4,SIGABRT,&default_abort_act,NULL,_NSIG/8) == 0)
-#  endif
-# endif
-		INLINE_SYSCALL(kill,2,pid,SIGABRT);
-#endif
-	/* Note; actions cannot be added to SIGKILL */
-	INLINE_SYSCALL(kill,2,pid,SIGKILL);
-
-	/* In case the kill didn't work, exit anyway
-	 * The loop prevents gcc thinking this routine returns
-	 */
-	while (1) INLINE_SYSCALL(exit,0);
-}
-
-void
-__attribute__ ((__noreturn__))
-	__stack_chk_fail (void)
-{
-	__hardened_gentoo_stack_chk_fail(NULL,0);
-}
-
-#ifdef ENABLE_OLD_SSP_COMPAT
-void
-__attribute__ ((__noreturn__))
-__stack_smash_handler(char func[], int damaged)
-{
-	__hardened_gentoo_stack_chk_fail(func,damaged);
-}
-#endif
-

diff --git a/sys-libs/glibc/files/2.5/glibc-2.5-hardened-configure-picdefault.patch b/sys-libs/glibc/files/2.5/glibc-2.5-hardened-configure-picdefault.patch
deleted file mode 100644
index 253a61b..0000000
--- a/sys-libs/glibc/files/2.5/glibc-2.5-hardened-configure-picdefault.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Prevent default-fPIE from confusing configure into thinking
-PIC code is default.  This causes glibc to build both PIC and
-non-PIC code as normal, which on the hardened compiler generates
-PIC and PIE.
-
-Patch by Kevin F. Quinn <kevquinn@g.o>
-
---- configure.in
-+++ configure.in
-@@ -2145,7 +2145,7 @@
- # error PIC is default.
- #endif
- EOF
--if eval "${CC-cc} -S conftest.c 2>&AS_MESSAGE_LOG_FD 1>&AS_MESSAGE_LOG_FD"; then
-+if eval "${CC-cc} -fno-PIE -S conftest.c 2>&AS_MESSAGE_LOG_FD 1>&AS_MESSAGE_LOG_FD"; then
-   pic_default=no
- fi
- rm -f conftest.*])
---- configure
-+++ configure
-@@ -7698,7 +7698,7 @@
- # error PIC is default.
- #endif
- EOF
--if eval "${CC-cc} -S conftest.c 2>&5 1>&5"; then
-+if eval "${CC-cc} -fno-PIE -S conftest.c 2>&5 1>&5"; then
-   pic_default=no
- fi
- rm -f conftest.*

diff --git a/sys-libs/glibc/files/2.5/glibc-2.5-hardened-inittls-nosysenter.patch b/sys-libs/glibc/files/2.5/glibc-2.5-hardened-inittls-nosysenter.patch
deleted file mode 100644
index 420e6fd..0000000
--- a/sys-libs/glibc/files/2.5/glibc-2.5-hardened-inittls-nosysenter.patch
+++ /dev/null
@@ -1,283 +0,0 @@
-When building glibc PIE (which is not something upstream support),
-several modifications are necessary to the glibc build process.
-
-First, any syscalls in PIEs must be of the PIC variant, otherwise
-textrels ensue.  Then, any syscalls made before the initialisation
-of the TLS will fail on i386, as the sysenter variant on i386 uses
-the TLS, giving rise to a chicken-and-egg situation.  This patch
-defines a PIC syscall variant that doesn't use sysenter, even when the sysenter
-version is normally used, and uses the non-sysenter version for the brk
-syscall that is performed by the TLS initialisation.  Further, the TLS
-initialisation is moved in this case prior to the initialisation of
-dl_osversion, as that requires further syscalls.
-
-csu/libc-start.c: Move initial TLS initialization to before the
-initialisation of dl_osversion, when INTERNAL_SYSCALL_NOSYSENTER is defined
-
-csu/libc-tls.c: Use the no-sysenter version of sbrk when
-INTERNAL_SYSCALL_NOSYSENTER is defined.
-
-misc/sbrk.c: Define a no-sysenter version of sbrk, using the no-sysenter
-version of brk - if INTERNAL_SYSCALL_NOSYSENTER is defined.
-
-misc/brk.c: Define a no-sysenter version of brk if
-INTERNAL_SYSCALL_NOSYSENTER is defined.
-
-sysdeps/unix/sysv/linux/i386/sysdep.h: Define INTERNAL_SYSCALL_NOSYSENTER
-Make INTERNAL_SYSCALL always use the PIC variant, even if not SHARED.
-
-Patch by Kevin F. Quinn <kevquinn@g.o>
-
---- csu/libc-start.c.orig	2007-01-21 11:51:06.000000000 +0100
-+++ csu/libc-start.c	2007-01-21 11:55:57.000000000 +0100
-@@ -28,6 +28,7 @@
- extern int __libc_multiple_libcs;
- 
- #include <tls.h>
-+#include <sysdep.h>
- #ifndef SHARED
- # include <dl-osinfo.h>
- extern void __pthread_initialize_minimal (void)
-@@ -133,6 +134,14 @@
- #  endif
-   _dl_aux_init (auxvec);
- # endif
-+# ifdef INTERNAL_SYSCALL_NOSYSENTER
-+  /* Do the initial TLS initialization before _dl_osversion,
-+     since the latter uses the uname syscall.  */
-+#  if !(USE_TLS - 0) && !defined NONTLS_INIT_TP
-+  if (__pthread_initialize_minimal)
-+#  endif
-+    __pthread_initialize_minimal ();
-+# endif
- # ifdef DL_SYSDEP_OSCHECK
-   if (!__libc_multiple_libcs)
-     {
-@@ -142,15 +151,17 @@
-     }
- # endif
- 
-+# ifndef INTERNAL_SYSCALL_NOSYSENTER
-   /* Initialize the thread library at least a bit since the libgcc
-      functions are using thread functions if these are available and
-      we need to setup errno.  If there is no thread library and we
-      handle TLS the function is defined in the libc to initialized the
-      TLS handling.  */
--# if !(USE_TLS - 0) && !defined NONTLS_INIT_TP
-+#  if !(USE_TLS - 0) && !defined NONTLS_INIT_TP
-   if (__pthread_initialize_minimal)
--# endif
-+#  endif
-     __pthread_initialize_minimal ();
-+# endif
- #endif
- 
- # ifndef SHARED
---- csu/libc-tls.c.orig	2007-01-21 11:37:02.000000000 +0100
-+++ csu/libc-tls.c	2007-01-21 12:09:33.000000000 +0100
-@@ -23,6 +23,7 @@
- #include <unistd.h>
- #include <stdio.h>
- #include <sys/param.h>
-+#include <sysdep.h>
- 
- 
- #ifdef SHARED
-@@ -30,6 +31,9 @@
- #endif
- 
- #ifdef USE_TLS
-+# ifdef INTERNAL_SYSCALL_NOSYSENTER
-+extern void *__sbrk_nosysenter (intptr_t __delta);
-+# endif
- extern ElfW(Phdr) *_dl_phdr;
- extern size_t _dl_phnum;
- 
-@@ -142,14 +146,26 @@
- 
-      The initialized value of _dl_tls_static_size is provided by dl-open.c
-      to request some surplus that permits dynamic loading of modules with
--     IE-model TLS.  */
-+     IE-model TLS.
-+	 
-+	 Where the normal sbrk would use a syscall that needs the TLS (i386)
-+	 use the special non-sysenter version instead.  */
- # if TLS_TCB_AT_TP
-   tcb_offset = roundup (memsz + GL(dl_tls_static_size), tcbalign);
-+#  ifdef INTERNAL_SYSCALL_NOSYSENTER
-+  tlsblock = __sbrk_nosysenter (tcb_offset + tcbsize + max_align);
-+#  else
-   tlsblock = __sbrk (tcb_offset + tcbsize + max_align);
-+#  endif
- # elif TLS_DTV_AT_TP
-   tcb_offset = roundup (tcbsize, align ?: 1);
-+#  ifdef INTERNAL_SYSCALL_NOSYSENTER
-+  tlsblock = __sbrk_nosysenter (tcb_offset + memsz + max_align
-+		     + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size));
-+#  else
-   tlsblock = __sbrk (tcb_offset + memsz + max_align
- 		     + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size));
-+#  endif
-   tlsblock += TLS_PRE_TCB_SIZE;
- # else
-   /* In case a model with a different layout for the TCB and DTV
---- misc/sbrk.c.orig	2007-01-21 11:38:27.000000000 +0100
-+++ misc/sbrk.c	2007-01-21 12:07:29.000000000 +0100
-@@ -18,6 +18,7 @@
- 
- #include <unistd.h>
- #include <errno.h>
-+#include <sysdep.h>
- 
- /* Defined in brk.c.  */
- extern void *__curbrk;
-@@ -29,6 +30,35 @@
- /* Extend the process's data space by INCREMENT.
-    If INCREMENT is negative, shrink data space by - INCREMENT.
-    Return start of new space allocated, or -1 for errors.  */
-+#ifdef INTERNAL_SYSCALL_NOSYSENTER
-+/* This version is used by csu/libc-tls.c whem initialising the TLS
-+   if the SYSENTER version requires the TLS (which it does on i386).
-+   Obviously using the TLS before it is initialised is broken. */
-+extern int __brk_nosysenter (void *addr);
-+void *
-+__sbrk_nosysenter (intptr_t increment)
-+{
-+  void *oldbrk;
-+
-+  /* If this is not part of the dynamic library or the library is used
-+     via dynamic loading in a statically linked program update
-+     __curbrk from the kernel's brk value.  That way two separate
-+     instances of __brk and __sbrk can share the heap, returning
-+     interleaved pieces of it.  */
-+  if (__curbrk == NULL || __libc_multiple_libcs)
-+    if (__brk_nosysenter (0) < 0)		/* Initialize the break.  */
-+      return (void *) -1;
-+
-+  if (increment == 0)
-+    return __curbrk;
-+
-+  oldbrk = __curbrk;
-+  if (__brk_nosysenter (oldbrk + increment) < 0)
-+    return (void *) -1;
-+
-+  return oldbrk;
-+}
-+#endif
- void *
- __sbrk (intptr_t increment)
- {
---- sysdeps/unix/sysv/linux/i386/brk.c.orig	2007-01-21 11:39:16.000000000 +0100
-+++ sysdeps/unix/sysv/linux/i386/brk.c	2007-01-21 11:44:01.000000000 +0100
-@@ -31,6 +31,30 @@
-    linker.  */
- weak_alias (__curbrk, ___brk_addr)
- 
-+#ifdef INTERNAL_SYSCALL_NOSYSENTER
-+/* This version is used by csu/libc-tls.c whem initialising the TLS
-+ * if the SYSENTER version requires the TLS (which it does on i386).
-+ * Obviously using the TLS before it is initialised is broken. */
-+int
-+__brk_nosysenter (void *addr)
-+{
-+  void *__unbounded newbrk;
-+
-+  INTERNAL_SYSCALL_DECL (err);
-+  newbrk = (void *__unbounded) INTERNAL_SYSCALL_NOSYSENTER (brk, err, 1,
-+						 __ptrvalue (addr));
-+
-+  __curbrk = newbrk;
-+
-+  if (newbrk < addr)
-+    {
-+      __set_errno (ENOMEM);
-+      return -1;
-+    }
-+
-+  return 0;
-+}
-+#endif
- int
- __brk (void *addr)
- {
---- sysdeps/unix/sysv/linux/i386/sysdep.h.orig	2007-01-21 13:08:00.000000000 +0100
-+++ sysdeps/unix/sysv/linux/i386/sysdep.h	2007-01-21 13:19:10.000000000 +0100
-@@ -187,7 +187,7 @@
- /* The original calling convention for system calls on Linux/i386 is
-    to use int $0x80.  */
- #ifdef I386_USE_SYSENTER
--# ifdef SHARED
-+# if defined SHARED || defined __PIC__
- #  define ENTER_KERNEL call *%gs:SYSINFO_OFFSET
- # else
- #  define ENTER_KERNEL call *_dl_sysinfo
-@@ -358,7 +358,7 @@
-    possible to use more than four parameters.  */
- #undef INTERNAL_SYSCALL
- #ifdef I386_USE_SYSENTER
--# ifdef SHARED
-+# if defined SHARED || defined __PIC__
- #  define INTERNAL_SYSCALL(name, err, nr, args...) \
-   ({									      \
-     register unsigned int resultvar;					      \
-@@ -384,6 +384,18 @@
-     : "0" (name), "i" (offsetof (tcbhead_t, sysinfo))			      \
-       ASMFMT_##nr(args) : "memory", "cc");				      \
-     (int) resultvar; })
-+#  define INTERNAL_SYSCALL_NOSYSENTER(name, err, nr, args...) \
-+  ({									      \
-+    register unsigned int resultvar;					      \
-+    EXTRAVAR_##nr							      \
-+    asm volatile (							      \
-+    LOADARGS_NOSYSENTER_##nr						      \
-+    "movl %1, %%eax\n\t"						      \
-+    "int $0x80\n\t"							      \
-+    RESTOREARGS_NOSYSENTER_##nr						      \
-+    : "=a" (resultvar)							      \
-+    : "i" (__NR_##name) ASMFMT_##nr(args) : "memory", "cc");		      \
-+    (int) resultvar; })
- # else
- #  define INTERNAL_SYSCALL(name, err, nr, args...) \
-   ({									      \
-@@ -447,12 +459,20 @@
- 
- #define LOADARGS_0
- #ifdef __PIC__
--# if defined I386_USE_SYSENTER && defined SHARED
-+# if defined I386_USE_SYSENTER && ( defined SHARED || defined __PIC__ )
- #  define LOADARGS_1 \
-     "bpushl .L__X'%k3, %k3\n\t"
- #  define LOADARGS_5 \
-     "movl %%ebx, %4\n\t"						      \
-     "movl %3, %%ebx\n\t"
-+#  define LOADARGS_NOSYSENTER_1 \
-+    "bpushl .L__X'%k2, %k2\n\t"
-+#  define LOADARGS_NOSYSENTER_2	LOADARGS_NOSYSENTER_1
-+#  define LOADARGS_NOSYSENTER_3	LOADARGS_3
-+#  define LOADARGS_NOSYSENTER_4	LOADARGS_3
-+#  define LOADARGS_NOSYSENTER_5 \
-+    "movl %%ebx, %3\n\t"						      \
-+    "movl %2, %%ebx\n\t"
- # else
- #  define LOADARGS_1 \
-     "bpushl .L__X'%k2, %k2\n\t"
-@@ -474,11 +495,18 @@
- 
- #define RESTOREARGS_0
- #ifdef __PIC__
--# if defined I386_USE_SYSENTER && defined SHARED
-+# if defined I386_USE_SYSENTER && ( defined SHARED || defined __PIC__ )
- #  define RESTOREARGS_1 \
-     "bpopl .L__X'%k3, %k3\n\t"
- #  define RESTOREARGS_5 \
-     "movl %4, %%ebx"
-+#  define RESTOREARGS_NOSYSENTER_1 \
-+    "bpopl .L__X'%k2, %k2\n\t"
-+#  define RESTOREARGS_NOSYSENTER_2	RESTOREARGS_NOSYSENTER_1
-+#  define RESTOREARGS_NOSYSENTER_3	RESTOREARGS_3
-+#  define RESTOREARGS_NOSYSENTER_4	RESTOREARGS_3
-+#  define RESTOREARGS_NOSYSENTER_5 \
-+    "movl %3, %%ebx"
- # else
- #  define RESTOREARGS_1 \
-     "bpopl .L__X'%k2, %k2\n\t"

diff --git a/sys-libs/glibc/files/2.5/glibc-2.5-hardened-pie.patch b/sys-libs/glibc/files/2.5/glibc-2.5-hardened-pie.patch
deleted file mode 100644
index 46f3de4..0000000
--- a/sys-libs/glibc/files/2.5/glibc-2.5-hardened-pie.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Change link commands for glibc executables to build PIEs
-
-Patch by Kevin F. Quinn <kevquinn@g.o>
-
---- Makeconfig
-+++ Makeconfig
-@@ -415,10 +415,10 @@
- 
- # Command for linking programs with the C library.
- ifndef +link
--+link = $(CC) -nostdlib -nostartfiles -o $@ \
-++link = $(CC) -nostdlib -nostartfiles -fPIE -pie -o $@ \
- 	      $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \
- 	      $(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \
--	      $(addprefix $(csu-objpfx),$(start-installed-name)) \
-+	      $(addprefix $(csu-objpfx),S$(start-installed-name)) \
- 	      $(+preinit) $(+prector) \
- 	      $(filter-out $(addprefix $(csu-objpfx),start.o \
- 						     $(start-installed-name))\
-@@ -429,7 +429,7 @@
- ifndef +link-static
- +link-static = $(CC) -nostdlib -nostartfiles -static -o $@ \
- 	      $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F))  \
--	      $(addprefix $(csu-objpfx),$(static-start-installed-name)) \
-+	      $(addprefix $(csu-objpfx),S$(static-start-installed-name)) \
- 	      $(+preinit) $(+prector) \
- 	      $(filter-out $(addprefix $(csu-objpfx),start.o \
- 						     $(start-installed-name))\
-@@ -528,8 +528,8 @@
- ifeq ($(elf),yes)
- +preinit = $(addprefix $(csu-objpfx),crti.o)
- +postinit = $(addprefix $(csu-objpfx),crtn.o)
--+prector = `$(CC) --print-file-name=crtbegin.o`
--+postctor = `$(CC) --print-file-name=crtend.o`
-++prector = `$(CC) --print-file-name=crtbeginS.o`
-++postctor = `$(CC) --print-file-name=crtendS.o`
- +interp = $(addprefix $(elf-objpfx),interp.os)
- endif
- csu-objpfx = $(common-objpfx)csu/

diff --git a/sys-libs/glibc/files/2.6/glibc-2.6-gentoo-stack_chk_fail.c b/sys-libs/glibc/files/2.6/glibc-2.6-gentoo-stack_chk_fail.c
deleted file mode 100644
index 217bf1a..0000000
--- a/sys-libs/glibc/files/2.6/glibc-2.6-gentoo-stack_chk_fail.c
+++ /dev/null
@@ -1,321 +0,0 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* Copyright (C) 2006-2007 Gentoo Foundation Inc.
- * License terms as above.
- *
- * Hardened Gentoo SSP handler
- *
- * An SSP failure handler that does not use functions from the rest of
- * glibc; it uses the INTERNAL_SYSCALL methods directly.  This ensures
- * no possibility of recursion into the handler.
- *
- * Direct all bug reports to http://bugs.gentoo.org/
- *
- * Re-written from the glibc-2.3 Hardened Gentoo SSP handler
- * by Kevin F. Quinn - <kevquinn[@]gentoo.org>
- *
- * The following people contributed to the glibc-2.3 Hardened
- * Gentoo SSP handler, from which this implementation draws much:
- *
- * Ned Ludd - <solar[@]gentoo.org>
- * Alexander Gabert - <pappy[@]gentoo.org>
- * The PaX Team - <pageexec[@]freemail.hu>
- * Peter S. Mazinger - <ps.m[@]gmx.net>
- * Yoann Vandoorselaere - <yoann[@]prelude-ids.org>
- * Robert Connolly - <robert[@]linuxfromscratch.org>
- * Cory Visi <cory[@]visi.name>
- * Mike Frysinger <vapier[@]gentoo.org>
- */
-
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <signal.h>
-
-#include <sys/types.h>
-
-#include <sysdep-cancel.h>
-#include <sys/syscall.h>
-#include <bp-checks.h>
-
-#include <kernel-features.h>
-
-#include <alloca.h>
-/* from sysdeps */
-#include <socketcall.h>
-/* for the stuff in bits/socket.h */
-#include <sys/socket.h>
-#include <sys/un.h>
-
-
-/* Sanity check on SYSCALL macro names - force compilation
- * failure if the names used here do not exist
- */
-#if !defined __NR_socketcall && !defined __NR_socket
-# error Cannot do syscall socket or socketcall
-#endif
-#if !defined __NR_socketcall && !defined __NR_connect
-# error Cannot do syscall connect or socketcall
-#endif
-#ifndef __NR_write
-# error Cannot do syscall write
-#endif
-#ifndef __NR_close
-# error Cannot do syscall close
-#endif
-#ifndef __NR_getpid
-# error Cannot do syscall getpid
-#endif
-#ifndef __NR_kill
-# error Cannot do syscall kill
-#endif
-#ifndef __NR_exit
-# error Cannot do syscall exit
-#endif
-#ifdef SSP_SMASH_DUMPS_CORE
-# define ENABLE_SSP_SMASH_DUMPS_CORE 1
-# if !defined _KERNEL_NSIG && !defined _NSIG
-#  error No _NSIG or _KERNEL_NSIG for rt_sigaction
-# endif
-# if !defined __NR_sigaction && !defined __NR_rt_sigaction
-#  error Cannot do syscall sigaction or rt_sigaction
-# endif
-/* Although rt_sigaction expects sizeof(sigset_t) - it expects the size
- * of the _kernel_ sigset_t which is not the same as the user sigset_t.
- * Most arches have this as _NSIG bits - mips has _KERNEL_NSIG bits for
- * some reason.
- */
-# ifdef _KERNEL_NSIG
-#  define _SSP_NSIG _KERNEL_NSIG
-# else
-#  define _SSP_NSIG _NSIG
-# endif
-#else
-# define _SSP_NSIG 0
-# define ENABLE_SSP_SMASH_DUMPS_CORE 0
-#endif
-
-/* Define DO_SIGACTION - default to newer rt signal interface but
- * fallback to old as needed.
- */
-#ifdef __NR_rt_sigaction
-# define DO_SIGACTION(signum, act, oldact) \
-	INLINE_SYSCALL(rt_sigaction, 4, signum, act, oldact, _SSP_NSIG/8)
-#else
-# define DO_SIGACTION(signum, act, oldact) \
-	INLINE_SYSCALL(sigaction, 3, signum, act, oldact)
-#endif
-
-/* Define DO_SOCKET/DO_CONNECT functions to deal with socketcall vs socket/connect */
-#if defined(__NR_socket) && defined(__NR_connect)
-# define USE_OLD_SOCKETCALL 0
-#else
-# define USE_OLD_SOCKETCALL 1
-#endif
-/* stub out the __NR_'s so we can let gcc optimize away dead code */
-#ifndef __NR_socketcall
-# define __NR_socketcall 0
-#endif
-#ifndef __NR_socket
-# define __NR_socket 0
-#endif
-#ifndef __NR_connect
-# define __NR_connect 0
-#endif
-#define DO_SOCKET(result, domain, type, protocol) \
-	do { \
-		if (USE_OLD_SOCKETCALL) { \
-			socketargs[0] = domain; \
-			socketargs[1] = type; \
-			socketargs[2] = protocol; \
-			socketargs[3] = 0; \
-			result = INLINE_SYSCALL(socketcall, 2, SOCKOP_socket, socketargs); \
-		} else \
-			result = INLINE_SYSCALL(socket, 3, domain, type, protocol); \
-	} while (0)
-#define DO_CONNECT(result, sockfd, serv_addr, addrlen) \
-	do { \
-		if (USE_OLD_SOCKETCALL) { \
-			socketargs[0] = sockfd; \
-			socketargs[1] = (unsigned long int)serv_addr; \
-			socketargs[2] = addrlen; \
-			socketargs[3] = 0; \
-			result = INLINE_SYSCALL(socketcall, 2, SOCKOP_connect, socketargs); \
-		} else \
-			result = INLINE_SYSCALL(connect, 3, sockfd, serv_addr, addrlen); \
-	} while (0)
-
-#ifndef _PATH_LOG
-# define _PATH_LOG "/dev/log"
-#endif
-
-static const char path_log[] = _PATH_LOG;
-
-/* For building glibc with SSP switched on, define __progname to a
- * constant if building for the run-time loader, to avoid pulling
- * in more of libc.so into ld.so
- */
-#ifdef IS_IN_rtld
-static char *__progname = "<rtld>";
-#else
-extern char *__progname;
-#endif
-
-
-/* Common handler code, used by stack_chk_fail and __stack_smash_handler
- * Inlined to ensure no self-references to the handler within itself.
- * Data static to avoid putting more than necessary on the stack,
- * to aid core debugging.
- */
-__attribute__ ((__noreturn__ , __always_inline__))
-static inline void
-__hardened_gentoo_stack_chk_fail(char func[], int damaged)
-{
-#define MESSAGE_BUFSIZ 256
-	static pid_t pid;
-	static int plen, i;
-	static char message[MESSAGE_BUFSIZ];
-	static const char msg_ssa[] = ": stack smashing attack";
-	static const char msg_inf[] = " in function ";
-	static const char msg_ssd[] = "*** stack smashing detected ***: ";
-	static const char msg_terminated[] = " - terminated\n";
-	static const char msg_report[] = "Report to http://bugs.gentoo.org/\n";
-	static const char msg_unknown[] = "<unknown>";
-	static int log_socket, connect_result;
-	static struct sockaddr_un sock;
-	static unsigned long int socketargs[4];
-
-	/* Build socket address
-	 */
-	sock.sun_family = AF_UNIX;
-	i = 0;
-	while ((path_log[i] != '\0') && (i<(sizeof(sock.sun_path)-1))) {
-		sock.sun_path[i] = path_log[i];
-		i++;
-	}
-	sock.sun_path[i] = '\0';
-
-	/* Try SOCK_DGRAM connection to syslog */
-	connect_result = -1;
-	DO_SOCKET(log_socket, AF_UNIX, SOCK_DGRAM, 0);
-	if (log_socket != -1)
-		DO_CONNECT(connect_result, log_socket, &sock, sizeof(sock));
-	if (connect_result == -1) {
-		if (log_socket != -1)
-			INLINE_SYSCALL(close, 1, log_socket);
-		/* Try SOCK_STREAM connection to syslog */
-		DO_SOCKET(log_socket, AF_UNIX, SOCK_STREAM, 0);
-		if (log_socket != -1)
-			DO_CONNECT(connect_result, log_socket, &sock, sizeof(sock));
-	}
-
-	/* Build message.  Messages are generated both in the old style and new style,
-	 * so that log watchers that are configured for the old-style message continue
-	 * to work.
-	 */
-#define strconcat(str) \
-		{i=0; while ((str[i] != '\0') && ((i+plen)<(MESSAGE_BUFSIZ-1))) \
-		{\
-			message[plen+i]=str[i];\
-			i++;\
-		}\
-		plen+=i;}
-
-	/* R.Henderson post-gcc-4 style message */
-	plen = 0;
-	strconcat(msg_ssd);
-	if (__progname != (char *)0)
-		strconcat(__progname)
-	else
-		strconcat(msg_unknown);
-	strconcat(msg_terminated);
-
-	/* Write out error message to STDERR, to syslog if open */
-	INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen);
-	if (connect_result != -1)
-		INLINE_SYSCALL(write, 3, log_socket, message, plen);
-
-	/* Dr. Etoh pre-gcc-4 style message */
-	plen = 0;
-	if (__progname != (char *)0)
-		strconcat(__progname)
-	else
-		strconcat(msg_unknown);
-	strconcat(msg_ssa);
-	strconcat(msg_inf);
-	if (func != NULL)
-		strconcat(func)
-	else
-		strconcat(msg_unknown);
-	strconcat(msg_terminated);
-	/* Write out error message to STDERR, to syslog if open */
-	INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen);
-	if (connect_result != -1)
-		INLINE_SYSCALL(write, 3, log_socket, message, plen);
-
-	/* Direct reports to bugs.gentoo.org */
-	plen=0;
-	strconcat(msg_report);
-	message[plen++]='\0';
-
-	/* Write out error message to STDERR, to syslog if open */
-	INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen);
-	if (connect_result != -1)
-		INLINE_SYSCALL(write, 3, log_socket, message, plen);
-
-	if (log_socket != -1)
-		INLINE_SYSCALL(close, 1, log_socket);
-
-	/* Suicide */
-	pid = INLINE_SYSCALL(getpid, 0);
-
-	if (ENABLE_SSP_SMASH_DUMPS_CORE) {
-		static struct sigaction default_abort_act;
-		/* Remove any user-supplied handler for SIGABRT, before using it */
-		default_abort_act.sa_handler = SIG_DFL;
-		default_abort_act.sa_sigaction = NULL;
-		__sigfillset(&default_abort_act.sa_mask);
-		default_abort_act.sa_flags = 0;
-		if (DO_SIGACTION(SIGABRT, &default_abort_act, NULL) == 0)
-			INLINE_SYSCALL(kill, 2, pid, SIGABRT);
-	}
-
-	/* Note; actions cannot be added to SIGKILL */
-	INLINE_SYSCALL(kill, 2, pid, SIGKILL);
-
-	/* In case the kill didn't work, exit anyway
-	 * The loop prevents gcc thinking this routine returns
-	 */
-	while (1)
-		INLINE_SYSCALL(exit, 0);
-}
-
-__attribute__ ((__noreturn__))
-void __stack_chk_fail(void)
-{
-	__hardened_gentoo_stack_chk_fail(NULL, 0);
-}
-
-#ifdef ENABLE_OLD_SSP_COMPAT
-__attribute__ ((__noreturn__))
-void __stack_smash_handler(char func[], int damaged)
-{
-	__hardened_gentoo_stack_chk_fail(func, damaged);
-}
-#endif

diff --git a/sys-libs/glibc/files/2.6/glibc-2.6-hardened-inittls-nosysenter.patch b/sys-libs/glibc/files/2.6/glibc-2.6-hardened-inittls-nosysenter.patch
deleted file mode 100644
index be8ca19..0000000
--- a/sys-libs/glibc/files/2.6/glibc-2.6-hardened-inittls-nosysenter.patch
+++ /dev/null
@@ -1,273 +0,0 @@
-When building glibc PIE (which is not something upstream support),
-several modifications are necessary to the glibc build process.
-
-First, any syscalls in PIEs must be of the PIC variant, otherwise
-textrels ensue.  Then, any syscalls made before the initialisation
-of the TLS will fail on i386, as the sysenter variant on i386 uses
-the TLS, giving rise to a chicken-and-egg situation.  This patch
-defines a PIC syscall variant that doesn't use sysenter, even when the sysenter
-version is normally used, and uses the non-sysenter version for the brk
-syscall that is performed by the TLS initialisation.  Further, the TLS
-initialisation is moved in this case prior to the initialisation of
-dl_osversion, as that requires further syscalls.
-
-csu/libc-start.c: Move initial TLS initialization to before the
-initialisation of dl_osversion, when INTERNAL_SYSCALL_NOSYSENTER is defined
-
-csu/libc-tls.c: Use the no-sysenter version of sbrk when
-INTERNAL_SYSCALL_NOSYSENTER is defined.
-
-misc/sbrk.c: Define a no-sysenter version of sbrk, using the no-sysenter
-version of brk - if INTERNAL_SYSCALL_NOSYSENTER is defined.
-
-misc/brk.c: Define a no-sysenter version of brk if
-INTERNAL_SYSCALL_NOSYSENTER is defined.
-
-sysdeps/unix/sysv/linux/i386/sysdep.h: Define INTERNAL_SYSCALL_NOSYSENTER
-Make INTERNAL_SYSCALL always use the PIC variant, even if not SHARED.
-
-Patch by Kevin F. Quinn <kevquinn@g.o>
-
---- csu/libc-start.c
-+++ csu/libc-start.c
-@@ -28,6 +28,7 @@
- extern int __libc_multiple_libcs;
- 
- #include <tls.h>
-+#include <sysdep.h>
- #ifndef SHARED
- # include <dl-osinfo.h>
- extern void __pthread_initialize_minimal (void);
-@@ -129,6 +130,11 @@
- #  endif
-   _dl_aux_init (auxvec);
- # endif
-+# ifdef INTERNAL_SYSCALL_NOSYSENTER
-+  /* Do the initial TLS initialization before _dl_osversion,
-+     since the latter uses the uname syscall.  */
-+  __pthread_initialize_minimal ();
-+# endif
- # ifdef DL_SYSDEP_OSCHECK
-   if (!__libc_multiple_libcs)
-     {
-@@ -138,10 +144,12 @@
-     }
- # endif
- 
-+# ifndef INTERNAL_SYSCALL_NOSYSENTER
-   /* Initialize the thread library at least a bit since the libgcc
-      functions are using thread functions if these are available and
-      we need to setup errno.  */
-   __pthread_initialize_minimal ();
-+# endif
- #endif
- 
- # ifndef SHARED
---- csu/libc-tls.c
-+++ csu/libc-tls.c
-@@ -23,6 +23,7 @@
- #include <unistd.h>
- #include <stdio.h>
- #include <sys/param.h>
-+#include <sysdep.h>
- 
- 
- #ifdef SHARED
-@@ -29,6 +30,9 @@
-  #error makefile bug, this file is for static only
- #endif
- 
-+#ifdef INTERNAL_SYSCALL_NOSYSENTER
-+extern void *__sbrk_nosysenter (intptr_t __delta);
-+#endif
- extern ElfW(Phdr) *_dl_phdr;
- extern size_t _dl_phnum;
- 
-@@ -141,14 +145,26 @@
- 
-      The initialized value of _dl_tls_static_size is provided by dl-open.c
-      to request some surplus that permits dynamic loading of modules with
--     IE-model TLS.  */
-+     IE-model TLS.
-+     
-+     Where the normal sbrk would use a syscall that needs the TLS (i386)
-+     use the special non-sysenter version instead.  */
- #if TLS_TCB_AT_TP
-   tcb_offset = roundup (memsz + GL(dl_tls_static_size), tcbalign);
-+# ifdef INTERNAL_SYSCALL_NOSYSENTER
-+  tlsblock = __sbrk_nosysenter (tcb_offset + tcbsize + max_align);
-+# else
-   tlsblock = __sbrk (tcb_offset + tcbsize + max_align);
-+# endif
- #elif TLS_DTV_AT_TP
-   tcb_offset = roundup (tcbsize, align ?: 1);
-+# ifdef INTERNAL_SYSCALL_NOSYSENTER
-+  tlsblock = __sbrk_nosysenter (tcb_offset + memsz + max_align
-+		     + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size));
-+# else
-   tlsblock = __sbrk (tcb_offset + memsz + max_align
- 		     + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size));
-+# endif
-   tlsblock += TLS_PRE_TCB_SIZE;
- #else
-   /* In case a model with a different layout for the TCB and DTV
---- misc/sbrk.c
-+++ misc/sbrk.c
-@@ -18,6 +18,7 @@
- 
- #include <unistd.h>
- #include <errno.h>
-+#include <sysdep.h>
- 
- /* Defined in brk.c.  */
- extern void *__curbrk;
-@@ -29,6 +30,35 @@
- /* Extend the process's data space by INCREMENT.
-    If INCREMENT is negative, shrink data space by - INCREMENT.
-    Return start of new space allocated, or -1 for errors.  */
-+#ifdef INTERNAL_SYSCALL_NOSYSENTER
-+/* This version is used by csu/libc-tls.c whem initialising the TLS
-+   if the SYSENTER version requires the TLS (which it does on i386).
-+   Obviously using the TLS before it is initialised is broken. */
-+extern int __brk_nosysenter (void *addr);
-+void *
-+__sbrk_nosysenter (intptr_t increment)
-+{
-+  void *oldbrk;
-+
-+  /* If this is not part of the dynamic library or the library is used
-+     via dynamic loading in a statically linked program update
-+     __curbrk from the kernel's brk value.  That way two separate
-+     instances of __brk and __sbrk can share the heap, returning
-+     interleaved pieces of it.  */
-+  if (__curbrk == NULL || __libc_multiple_libcs)
-+    if (__brk_nosysenter (0) < 0)		/* Initialize the break.  */
-+      return (void *) -1;
-+
-+  if (increment == 0)
-+    return __curbrk;
-+
-+  oldbrk = __curbrk;
-+  if (__brk_nosysenter (oldbrk + increment) < 0)
-+    return (void *) -1;
-+
-+  return oldbrk;
-+}
-+#endif
- void *
- __sbrk (intptr_t increment)
- {
---- sysdeps/unix/sysv/linux/i386/brk.c
-+++ sysdeps/unix/sysv/linux/i386/brk.c
-@@ -31,6 +31,30 @@
-    linker.  */
- weak_alias (__curbrk, ___brk_addr)
- 
-+#ifdef INTERNAL_SYSCALL_NOSYSENTER
-+/* This version is used by csu/libc-tls.c whem initialising the TLS
-+ * if the SYSENTER version requires the TLS (which it does on i386).
-+ * Obviously using the TLS before it is initialised is broken. */
-+int
-+__brk_nosysenter (void *addr)
-+{
-+  void *__unbounded newbrk;
-+
-+  INTERNAL_SYSCALL_DECL (err);
-+  newbrk = (void *__unbounded) INTERNAL_SYSCALL_NOSYSENTER (brk, err, 1,
-+						 __ptrvalue (addr));
-+
-+  __curbrk = newbrk;
-+
-+  if (newbrk < addr)
-+    {
-+      __set_errno (ENOMEM);
-+      return -1;
-+    }
-+
-+  return 0;
-+}
-+#endif
- int
- __brk (void *addr)
- {
---- sysdeps/unix/sysv/linux/i386/sysdep.h
-+++ sysdeps/unix/sysv/linux/i386/sysdep.h
-@@ -187,7 +187,7 @@
- /* The original calling convention for system calls on Linux/i386 is
-    to use int $0x80.  */
- #ifdef I386_USE_SYSENTER
--# ifdef SHARED
-+# if defined SHARED || defined __PIC__
- #  define ENTER_KERNEL call *%gs:SYSINFO_OFFSET
- # else
- #  define ENTER_KERNEL call *_dl_sysinfo
-@@ -358,7 +358,7 @@
-    possible to use more than four parameters.  */
- #undef INTERNAL_SYSCALL
- #ifdef I386_USE_SYSENTER
--# ifdef SHARED
-+# if defined SHARED || defined __PIC__
- #  define INTERNAL_SYSCALL(name, err, nr, args...) \
-   ({									      \
-     register unsigned int resultvar;					      \
-@@ -384,6 +384,18 @@
-     : "0" (name), "i" (offsetof (tcbhead_t, sysinfo))			      \
-       ASMFMT_##nr(args) : "memory", "cc");				      \
-     (int) resultvar; })
-+#  define INTERNAL_SYSCALL_NOSYSENTER(name, err, nr, args...) \
-+  ({									      \
-+    register unsigned int resultvar;					      \
-+    EXTRAVAR_##nr							      \
-+    asm volatile (							      \
-+    LOADARGS_NOSYSENTER_##nr						      \
-+    "movl %1, %%eax\n\t"						      \
-+    "int $0x80\n\t"							      \
-+    RESTOREARGS_NOSYSENTER_##nr						      \
-+    : "=a" (resultvar)							      \
-+    : "i" (__NR_##name) ASMFMT_##nr(args) : "memory", "cc");		      \
-+    (int) resultvar; })
- # else
- #  define INTERNAL_SYSCALL(name, err, nr, args...) \
-   ({									      \
-@@ -447,12 +459,20 @@
- 
- #define LOADARGS_0
- #ifdef __PIC__
--# if defined I386_USE_SYSENTER && defined SHARED
-+# if defined I386_USE_SYSENTER && ( defined SHARED || defined __PIC__ )
- #  define LOADARGS_1 \
-     "bpushl .L__X'%k3, %k3\n\t"
- #  define LOADARGS_5 \
-     "movl %%ebx, %4\n\t"						      \
-     "movl %3, %%ebx\n\t"
-+#  define LOADARGS_NOSYSENTER_1 \
-+    "bpushl .L__X'%k2, %k2\n\t"
-+#  define LOADARGS_NOSYSENTER_2	LOADARGS_NOSYSENTER_1
-+#  define LOADARGS_NOSYSENTER_3	LOADARGS_3
-+#  define LOADARGS_NOSYSENTER_4	LOADARGS_3
-+#  define LOADARGS_NOSYSENTER_5 \
-+    "movl %%ebx, %3\n\t"						      \
-+    "movl %2, %%ebx\n\t"
- # else
- #  define LOADARGS_1 \
-     "bpushl .L__X'%k2, %k2\n\t"
-@@ -474,11 +495,18 @@
- 
- #define RESTOREARGS_0
- #ifdef __PIC__
--# if defined I386_USE_SYSENTER && defined SHARED
-+# if defined I386_USE_SYSENTER && ( defined SHARED || defined __PIC__ )
- #  define RESTOREARGS_1 \
-     "bpopl .L__X'%k3, %k3\n\t"
- #  define RESTOREARGS_5 \
-     "movl %4, %%ebx"
-+#  define RESTOREARGS_NOSYSENTER_1 \
-+    "bpopl .L__X'%k2, %k2\n\t"
-+#  define RESTOREARGS_NOSYSENTER_2	RESTOREARGS_NOSYSENTER_1
-+#  define RESTOREARGS_NOSYSENTER_3	RESTOREARGS_3
-+#  define RESTOREARGS_NOSYSENTER_4	RESTOREARGS_3
-+#  define RESTOREARGS_NOSYSENTER_5 \
-+    "movl %3, %%ebx"
- # else
- #  define RESTOREARGS_1 \
-     "bpopl .L__X'%k2, %k2\n\t"

diff --git a/sys-libs/glibc/files/2.7/glibc-2.7-hardened-inittls-nosysenter.patch b/sys-libs/glibc/files/2.7/glibc-2.7-hardened-inittls-nosysenter.patch
deleted file mode 100644
index ecf57a9..0000000
--- a/sys-libs/glibc/files/2.7/glibc-2.7-hardened-inittls-nosysenter.patch
+++ /dev/null
@@ -1,273 +0,0 @@
-When building glibc PIE (which is not something upstream support),
-several modifications are necessary to the glibc build process.
-
-First, any syscalls in PIEs must be of the PIC variant, otherwise
-textrels ensue.  Then, any syscalls made before the initialisation
-of the TLS will fail on i386, as the sysenter variant on i386 uses
-the TLS, giving rise to a chicken-and-egg situation.  This patch
-defines a PIC syscall variant that doesn't use sysenter, even when the sysenter
-version is normally used, and uses the non-sysenter version for the brk
-syscall that is performed by the TLS initialisation.  Further, the TLS
-initialisation is moved in this case prior to the initialisation of
-dl_osversion, as that requires further syscalls.
-
-csu/libc-start.c: Move initial TLS initialization to before the
-initialisation of dl_osversion, when INTERNAL_SYSCALL_NOSYSENTER is defined
-
-csu/libc-tls.c: Use the no-sysenter version of sbrk when
-INTERNAL_SYSCALL_NOSYSENTER is defined.
-
-misc/sbrk.c: Define a no-sysenter version of sbrk, using the no-sysenter
-version of brk - if INTERNAL_SYSCALL_NOSYSENTER is defined.
-
-misc/brk.c: Define a no-sysenter version of brk if
-INTERNAL_SYSCALL_NOSYSENTER is defined.
-
-sysdeps/unix/sysv/linux/i386/sysdep.h: Define INTERNAL_SYSCALL_NOSYSENTER
-Make INTERNAL_SYSCALL always use the PIC variant, even if not SHARED.
-
-Patch by Kevin F. Quinn <kevquinn@g.o>
-
---- csu/libc-start.c
-+++ csu/libc-start.c
-@@ -28,6 +28,7 @@
- extern int __libc_multiple_libcs;
- 
- #include <tls.h>
-+#include <sysdep.h>
- #ifndef SHARED
- # include <dl-osinfo.h>
- extern void __pthread_initialize_minimal (void);
-@@ -129,6 +130,11 @@
- #  endif
-   _dl_aux_init (auxvec);
- # endif
-+# ifdef INTERNAL_SYSCALL_NOSYSENTER
-+  /* Do the initial TLS initialization before _dl_osversion,
-+     since the latter uses the uname syscall.  */
-+  __pthread_initialize_minimal ();
-+# endif
- # ifdef DL_SYSDEP_OSCHECK
-   if (!__libc_multiple_libcs)
-     {
-@@ -138,10 +144,12 @@
-     }
- # endif
- 
-+# ifndef INTERNAL_SYSCALL_NOSYSENTER
-   /* Initialize the thread library at least a bit since the libgcc
-      functions are using thread functions if these are available and
-      we need to setup errno.  */
-   __pthread_initialize_minimal ();
-+# endif
- 
-   /* Set up the stack checker's canary.  */
-   uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard ();
---- csu/libc-tls.c
-+++ csu/libc-tls.c
-@@ -23,6 +23,7 @@
- #include <unistd.h>
- #include <stdio.h>
- #include <sys/param.h>
-+#include <sysdep.h>
- 
- 
- #ifdef SHARED
-@@ -29,6 +30,9 @@
-  #error makefile bug, this file is for static only
- #endif
- 
-+#ifdef INTERNAL_SYSCALL_NOSYSENTER
-+extern void *__sbrk_nosysenter (intptr_t __delta);
-+#endif
- extern ElfW(Phdr) *_dl_phdr;
- extern size_t _dl_phnum;
- 
-@@ -141,14 +145,26 @@
- 
-      The initialized value of _dl_tls_static_size is provided by dl-open.c
-      to request some surplus that permits dynamic loading of modules with
--     IE-model TLS.  */
-+     IE-model TLS.
-+     
-+     Where the normal sbrk would use a syscall that needs the TLS (i386)
-+     use the special non-sysenter version instead.  */
- #if TLS_TCB_AT_TP
-   tcb_offset = roundup (memsz + GL(dl_tls_static_size), tcbalign);
-+# ifdef INTERNAL_SYSCALL_NOSYSENTER
-+  tlsblock = __sbrk_nosysenter (tcb_offset + tcbsize + max_align);
-+# else
-   tlsblock = __sbrk (tcb_offset + tcbsize + max_align);
-+# endif
- #elif TLS_DTV_AT_TP
-   tcb_offset = roundup (tcbsize, align ?: 1);
-+# ifdef INTERNAL_SYSCALL_NOSYSENTER
-+  tlsblock = __sbrk_nosysenter (tcb_offset + memsz + max_align
-+		     + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size));
-+# else
-   tlsblock = __sbrk (tcb_offset + memsz + max_align
- 		     + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size));
-+# endif
-   tlsblock += TLS_PRE_TCB_SIZE;
- #else
-   /* In case a model with a different layout for the TCB and DTV
---- misc/sbrk.c
-+++ misc/sbrk.c
-@@ -18,6 +18,7 @@
- 
- #include <unistd.h>
- #include <errno.h>
-+#include <sysdep.h>
- 
- /* Defined in brk.c.  */
- extern void *__curbrk;
-@@ -29,6 +30,35 @@
- /* Extend the process's data space by INCREMENT.
-    If INCREMENT is negative, shrink data space by - INCREMENT.
-    Return start of new space allocated, or -1 for errors.  */
-+#ifdef INTERNAL_SYSCALL_NOSYSENTER
-+/* This version is used by csu/libc-tls.c whem initialising the TLS
-+   if the SYSENTER version requires the TLS (which it does on i386).
-+   Obviously using the TLS before it is initialised is broken. */
-+extern int __brk_nosysenter (void *addr);
-+void *
-+__sbrk_nosysenter (intptr_t increment)
-+{
-+  void *oldbrk;
-+
-+  /* If this is not part of the dynamic library or the library is used
-+     via dynamic loading in a statically linked program update
-+     __curbrk from the kernel's brk value.  That way two separate
-+     instances of __brk and __sbrk can share the heap, returning
-+     interleaved pieces of it.  */
-+  if (__curbrk == NULL || __libc_multiple_libcs)
-+    if (__brk_nosysenter (0) < 0)		/* Initialize the break.  */
-+      return (void *) -1;
-+
-+  if (increment == 0)
-+    return __curbrk;
-+
-+  oldbrk = __curbrk;
-+  if (__brk_nosysenter (oldbrk + increment) < 0)
-+    return (void *) -1;
-+
-+  return oldbrk;
-+}
-+#endif
- void *
- __sbrk (intptr_t increment)
- {
---- sysdeps/unix/sysv/linux/i386/brk.c
-+++ sysdeps/unix/sysv/linux/i386/brk.c
-@@ -31,6 +31,30 @@
-    linker.  */
- weak_alias (__curbrk, ___brk_addr)
- 
-+#ifdef INTERNAL_SYSCALL_NOSYSENTER
-+/* This version is used by csu/libc-tls.c whem initialising the TLS
-+ * if the SYSENTER version requires the TLS (which it does on i386).
-+ * Obviously using the TLS before it is initialised is broken. */
-+int
-+__brk_nosysenter (void *addr)
-+{
-+  void *__unbounded newbrk;
-+
-+  INTERNAL_SYSCALL_DECL (err);
-+  newbrk = (void *__unbounded) INTERNAL_SYSCALL_NOSYSENTER (brk, err, 1,
-+						 __ptrvalue (addr));
-+
-+  __curbrk = newbrk;
-+
-+  if (newbrk < addr)
-+    {
-+      __set_errno (ENOMEM);
-+      return -1;
-+    }
-+
-+  return 0;
-+}
-+#endif
- int
- __brk (void *addr)
- {
---- sysdeps/unix/sysv/linux/i386/sysdep.h
-+++ sysdeps/unix/sysv/linux/i386/sysdep.h
-@@ -187,7 +187,7 @@
- /* The original calling convention for system calls on Linux/i386 is
-    to use int $0x80.  */
- #ifdef I386_USE_SYSENTER
--# ifdef SHARED
-+# if defined SHARED || defined __PIC__
- #  define ENTER_KERNEL call *%gs:SYSINFO_OFFSET
- # else
- #  define ENTER_KERNEL call *_dl_sysinfo
-@@ -358,7 +358,7 @@
-    possible to use more than four parameters.  */
- #undef INTERNAL_SYSCALL
- #ifdef I386_USE_SYSENTER
--# ifdef SHARED
-+# if defined SHARED || defined __PIC__
- #  define INTERNAL_SYSCALL(name, err, nr, args...) \
-   ({									      \
-     register unsigned int resultvar;					      \
-@@ -384,6 +384,18 @@
-     : "0" (name), "i" (offsetof (tcbhead_t, sysinfo))			      \
-       ASMFMT_##nr(args) : "memory", "cc");				      \
-     (int) resultvar; })
-+#  define INTERNAL_SYSCALL_NOSYSENTER(name, err, nr, args...) \
-+  ({									      \
-+    register unsigned int resultvar;					      \
-+    EXTRAVAR_##nr							      \
-+    asm volatile (							      \
-+    LOADARGS_NOSYSENTER_##nr						      \
-+    "movl %1, %%eax\n\t"						      \
-+    "int $0x80\n\t"							      \
-+    RESTOREARGS_NOSYSENTER_##nr						      \
-+    : "=a" (resultvar)							      \
-+    : "i" (__NR_##name) ASMFMT_##nr(args) : "memory", "cc");		      \
-+    (int) resultvar; })
- # else
- #  define INTERNAL_SYSCALL(name, err, nr, args...) \
-   ({									      \
-@@ -447,12 +459,20 @@
- 
- #define LOADARGS_0
- #ifdef __PIC__
--# if defined I386_USE_SYSENTER && defined SHARED
-+# if defined I386_USE_SYSENTER && ( defined SHARED || defined __PIC__ )
- #  define LOADARGS_1 \
-     "bpushl .L__X'%k3, %k3\n\t"
- #  define LOADARGS_5 \
-     "movl %%ebx, %4\n\t"						      \
-     "movl %3, %%ebx\n\t"
-+#  define LOADARGS_NOSYSENTER_1 \
-+    "bpushl .L__X'%k2, %k2\n\t"
-+#  define LOADARGS_NOSYSENTER_2	LOADARGS_NOSYSENTER_1
-+#  define LOADARGS_NOSYSENTER_3	LOADARGS_3
-+#  define LOADARGS_NOSYSENTER_4	LOADARGS_3
-+#  define LOADARGS_NOSYSENTER_5 \
-+    "movl %%ebx, %3\n\t"						      \
-+    "movl %2, %%ebx\n\t"
- # else
- #  define LOADARGS_1 \
-     "bpushl .L__X'%k2, %k2\n\t"
-@@ -474,11 +495,18 @@
- 
- #define RESTOREARGS_0
- #ifdef __PIC__
--# if defined I386_USE_SYSENTER && defined SHARED
-+# if defined I386_USE_SYSENTER && ( defined SHARED || defined __PIC__ )
- #  define RESTOREARGS_1 \
-     "bpopl .L__X'%k3, %k3\n\t"
- #  define RESTOREARGS_5 \
-     "movl %4, %%ebx"
-+#  define RESTOREARGS_NOSYSENTER_1 \
-+    "bpopl .L__X'%k2, %k2\n\t"
-+#  define RESTOREARGS_NOSYSENTER_2	RESTOREARGS_NOSYSENTER_1
-+#  define RESTOREARGS_NOSYSENTER_3	RESTOREARGS_3
-+#  define RESTOREARGS_NOSYSENTER_4	RESTOREARGS_3
-+#  define RESTOREARGS_NOSYSENTER_5 \
-+    "movl %3, %%ebx"
- # else
- #  define RESTOREARGS_1 \
-     "bpopl .L__X'%k2, %k2\n\t"

diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit
deleted file mode 100644
index e56f10e..0000000
--- a/sys-libs/glibc/files/eblits/common.eblit
+++ /dev/null
@@ -1,380 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-alt_prefix() {
-	is_crosscompile && echo /usr/${CTARGET}
-}
-
-if [[ ${EAPI:-0} == [012] ]] ; then
-	: ${ED:=${D}}
-	: ${EROOT:=${ROOT}}
-fi
-# This indirection is for binpkgs. #523332
-_nonfatal() { nonfatal "$@" ; }
-if [[ ${EAPI:-0} == [0123] ]] ; then
-	nonfatal() { "$@" ; }
-	_nonfatal() { "$@" ; }
-fi
-
-# We need to be able to set alternative headers for
-# compiling for non-native platform
-# Will also become useful for testing kernel-headers without screwing up
-# the whole system.
-# note: intentionally undocumented.
-alt_headers() {
-	echo ${ALT_HEADERS:=$(alt_prefix)/usr/include}
-}
-alt_build_headers() {
-	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
-		ALT_BUILD_HEADERS="${EPREFIX}$(alt_headers)"
-		if tc-is-cross-compiler ; then
-			ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
-			if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
-				local header_path=$(echo '#include <linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h')
-				ALT_BUILD_HEADERS=${header_path%/linux/version.h}
-			fi
-		fi
-	fi
-	echo "${ALT_BUILD_HEADERS}"
-}
-
-alt_libdir() {
-	echo $(alt_prefix)/$(get_libdir)
-}
-alt_usrlibdir() {
-	echo $(alt_prefix)/usr/$(get_libdir)
-}
-
-builddir() {
-	echo "${WORKDIR}/build-${ABI}-${CTARGET}-$1"
-}
-
-setup_target_flags() {
-	# This largely mucks with compiler flags.  None of which should matter
-	# when building up just the headers.
-	just_headers && return 0
-
-	case $(tc-arch) in
-		x86)
-			# -march needed for #185404 #199334
-			# TODO: When creating the first glibc cross-compile, this test will
-			# always fail as it does a full link which in turn requires glibc.
-			# Probably also applies when changing multilib profile settings (e.g.
-			# enabling x86 when the profile was amd64-only previously).
-			# We could change main to _start and pass -nostdlib here so that we
-			# only test the gcc code compilation.  Or we could do a compile and
-			# then look for the symbol via scanelf.
-			if ! glibc_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then
-				local t=${CTARGET_OPT:-${CTARGET}}
-				t=${t%%-*}
-				filter-flags '-march=*'
-				export CFLAGS="-march=${t} ${CFLAGS}"
-				einfo "Auto adding -march=${t} to CFLAGS #185404"
-			fi
-		;;
-		amd64)
-			# -march needed for #185404 #199334
-			# Note: This test only matters when the x86 ABI is enabled, so we could
-			# optimize a bit and elide it.
-			# TODO: See cross-compile issues listed above for x86.
-			if ! glibc_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then
-				local t=${CTARGET_OPT:-${CTARGET}}
-				t=${t%%-*}
-				# Normally the target is x86_64-xxx, so turn that into the -march that
-				# gcc actually accepts. #528708
-				[[ ${t} == "x86_64" ]] && t="x86-64"
-				filter-flags '-march=*'
-				# ugly, ugly, ugly.  ugly.
-				CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}")
-				export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
-				einfo "Auto adding -march=${t} to CFLAGS_x86 #185404"
-			fi
-		;;
-		mips)
-			# The mips abi cannot support the GNU style hashes. #233233
-			filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both
-		;;
-		ppc)
-			append-flags "-freorder-blocks"
-		;;
-		sparc)
-			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
-			filter-flags "-fcall-used-g7"
-			append-flags "-fcall-used-g6"
-
-			# If the CHOST is the basic one (e.g. not sparcv9-xxx already),
-			# try to pick a better one so glibc can use cpu-specific .S files.
-			# We key off the CFLAGS to get a good value.  Also need to handle
-			# version skew.
-			# We can't force users to set their CHOST to their exact machine
-			# as many of these are not recognized by config.sub/gcc and such :(.
-			# Note: If the mcpu values don't scale, we might try probing CPP defines.
-			# Note: Should we factor in -Wa,-AvXXX flags too ?  Or -mvis/etc... ?
-
-			local cpu
-			case ${CTARGET} in
-			sparc64-*)
-				case $(get-flag mcpu) in
-				niagara[234])
-					if version_is_at_least 2.8 ; then
-						cpu="sparc64v2"
-					elif version_is_at_least 2.4 ; then
-						cpu="sparc64v"
-					elif version_is_at_least 2.2.3 ; then
-						cpu="sparc64b"
-					fi
-					;;
-				niagara)
-					if version_is_at_least 2.4 ; then
-						cpu="sparc64v"
-					elif version_is_at_least 2.2.3 ; then
-						cpu="sparc64b"
-					fi
-					;;
-				ultrasparc3)
-					cpu="sparc64b"
-					;;
-				*)
-					# We need to force at least v9a because the base build doesn't
-					# work with just v9.
-					# https://sourceware.org/bugzilla/show_bug.cgi?id=19477
-					[[ -z ${cpu} ]] && append-flags "-Wa,-xarch=v9a"
-					;;
-				esac
-				;;
-			sparc-*)
-				case $(get-flag mcpu) in
-				niagara[234])
-					if version_is_at_least 2.8 ; then
-						cpu="sparcv9v2"
-					elif version_is_at_least 2.4 ; then
-						cpu="sparcv9v"
-					elif version_is_at_least 2.2.3 ; then
-						cpu="sparcv9b"
-					else
-						cpu="sparcv9"
-					fi
-					;;
-				niagara)
-					if version_is_at_least 2.4 ; then
-						cpu="sparcv9v"
-					elif version_is_at_least 2.2.3 ; then
-						cpu="sparcv9b"
-					else
-						cpu="sparcv9"
-					fi
-					;;
-				ultrasparc3)
-					cpu="sparcv9b"
-					;;
-				v9|ultrasparc)
-					cpu="sparcv9"
-					;;
-				v8|supersparc|hypersparc|leon|leon3)
-					cpu="sparcv8"
-					;;
-				esac
-			;;
-			esac
-			[[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}"
-		;;
-	esac
-}
-
-setup_flags() {
-	# Make sure host make.conf doesn't pollute us
-	if is_crosscompile || tc-is-cross-compiler ; then
-		CHOST=${CTARGET} strip-unsupported-flags
-	fi
-
-	# Store our CFLAGS because it's changed depending on which CTARGET
-	# we are building when pulling glibc on a multilib profile
-	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
-	CFLAGS=${CFLAGS_BASE}
-	CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}}
-	CXXFLAGS=${CXXFLAGS_BASE}
-	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
-	ASFLAGS=${ASFLAGS_BASE}
-
-	# Over-zealous CFLAGS can often cause problems.  What may work for one
-	# person may not work for another.  To avoid a large influx of bugs
-	# relating to failed builds, we strip most CFLAGS out to ensure as few
-	# problems as possible.
-	strip-flags
-	strip-unsupported-flags
-	filter-flags -m32 -m64 -mabi=*
-
-	# Bug 492892.
-	filter-flags -frecord-gcc-switches
-
-	unset CBUILD_OPT CTARGET_OPT
-	if use multilib ; then
-		CTARGET_OPT=$(get_abi_CTARGET)
-		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
-	fi
-
-	setup_target_flags
-
-	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
-		CBUILD_OPT=${CTARGET_OPT}
-	fi
-
-	# Lock glibc at -O2 -- linuxthreads needs it and we want to be
-	# conservative here.  -fno-strict-aliasing is to work around #155906
-	filter-flags -O?
-	append-flags -O2 -fno-strict-aliasing
-
-	# Can't build glibc itself with fortify code.  Newer versions add
-	# this flag for us, so no need to do it manually.
-	version_is_at_least 2.16 ${PV} || append-cppflags -U_FORTIFY_SOURCE
-
-	# building glibc with SSP is fraught with difficulty, especially
-	# due to __stack_chk_fail_local which would mean significant changes
-	# to the glibc build process. See bug #94325 #293721
-	# Note we have to handle both user-given CFLAGS and gcc defaults via
-	# spec rules here.  We can't simply add -fno-stack-protector as it gets
-	# added before user flags, and we can't just filter-flags because
-	# _filter_hardened doesn't support globs.
-	filter-flags -fstack-protector*
-	gcc-specs-ssp && append-flags $(test-flags -fno-stack-protector)
-
-	if use hardened && gcc-specs-pie ; then
-		# Force PIC macro definition for all compilations since they're all
-		# either -fPIC or -fPIE with the default-PIE compiler.
-		append-cppflags -DPIC
-	else
-		# Don't build -fPIE without the default-PIE compiler and the
-		# hardened-pie patch
-		filter-flags -fPIE
-	fi
-}
-
-want_nptl() {
-	[[ -z ${LT_VER} ]] && return 0
-	want_tls || return 1
-	use nptl || return 1
-
-	# Older versions of glibc had incomplete arch support for nptl.
-	# But if you're building those now, you can handle USE=nptl yourself.
-	return 0
-}
-
-want_linuxthreads() {
-	[[ -z ${LT_VER} ]] && return 1
-	use linuxthreads
-}
-
-want_tls() {
-	# Archs that can use TLS (Thread Local Storage)
-	case $(tc-arch) in
-		x86)
-			# requires i486 or better #106556
-			[[ ${CTARGET} == i[4567]86* ]] && return 0
-			return 1
-		;;
-	esac
-
-	return 0
-}
-
-want__thread() {
-	want_tls || return 1
-
-	# For some reason --with-tls --with__thread is causing segfaults on sparc32.
-	[[ ${PROFILE_ARCH} == "sparc" ]] && return 1
-
-	[[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD}
-
-	# only test gcc -- cant test linking yet
-	tc-has-tls -c ${CTARGET}
-	WANT__THREAD=$?
-
-	return ${WANT__THREAD}
-}
-
-use_multiarch() {
-	# Make sure binutils is new enough to support indirect functions #336792
-	# This funky sed supports gold and bfd linkers.
-	local bver nver
-	bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}')
-	case $(tc-arch ${CTARGET}) in
-	amd64|x86) nver="2.20" ;;
-	arm)       nver="2.22" ;;
-	hppa)      nver="2.23" ;;
-	ppc|ppc64) nver="2.20" ;;
-	# ifunc was added in 2.23, but glibc also needs machinemode which is in 2.24.
-	s390)      nver="2.24" ;;
-	sparc)     nver="2.21" ;;
-	*)         return 1 ;;
-	esac
-	version_is_at_least ${nver} ${bver}
-}
-
-# Setup toolchain variables that had historically
-# been defined in the profiles for these archs.
-setup_env() {
-	# silly users
-	unset LD_RUN_PATH
-	unset LD_ASSUME_KERNEL
-
-	multilib_env ${CTARGET_OPT:-${CTARGET}}
-	if is_crosscompile || tc-is-cross-compiler ; then
-		if ! use multilib ; then
-			MULTILIB_ABIS=${DEFAULT_ABI}
-		else
-			MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
-		fi
-
-		# If the user has CFLAGS_<CTARGET> in their make.conf, use that,
-		# and fall back on CFLAGS.
-		local VAR=CFLAGS_${CTARGET//[-.]/_}
-		CFLAGS=${!VAR-${CFLAGS}}
-	fi
-
-	setup_flags
-
-	export ABI=${ABI:-${DEFAULT_ABI:-default}}
-
-	local VAR=CFLAGS_${ABI}
-	# We need to export CFLAGS with abi information in them because glibc's
-	# configure script checks CFLAGS for some targets (like mips).  Keep
-	# around the original clean value to avoid appending multiple ABIs on
-	# top of each other.
-	: ${__GLIBC_CC:=$(tc-getCC ${CTARGET_OPT:-${CTARGET}})}
-	export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}"
-}
-
-foreach_abi() {
-	setup_env
-
-	local ret=0
-	local abilist=""
-	if use multilib ; then
-		abilist=$(get_install_abis)
-	else
-		abilist=${DEFAULT_ABI}
-	fi
-	evar_push ABI
-	export ABI
-	for ABI in ${abilist:-default} ; do
-		setup_env
-		einfo "Running $1 for ABI ${ABI}"
-		$1
-		: $(( ret |= $? ))
-	done
-	evar_pop
-	return ${ret}
-}
-
-just_headers() {
-	is_crosscompile && use crosscompile_opts_headers-only
-}
-
-glibc_banner() {
-	local b="Gentoo ${PVR}"
-	[[ -n ${SNAP_VER} ]] && b+=" snapshot ${SNAP_VER}"
-	[[ -n ${BRANCH_UPDATE} ]] && b+=" branch ${BRANCH_UPDATE}"
-	[[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" p${PATCH_VER}"
-	echo "${b}"
-}

diff --git a/sys-libs/glibc/files/eblits/pkg_postinst.eblit b/sys-libs/glibc/files/eblits/pkg_postinst.eblit
deleted file mode 100644
index 8178fa1..0000000
--- a/sys-libs/glibc/files/eblits/pkg_postinst.eblit
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-eblit-glibc-pkg_postinst() {
-	# nothing to do if just installing headers
-	just_headers && return
-
-	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
-		# Generate fastloading iconv module configuration file.
-		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}"
-	fi
-
-	if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then
-		# Reload init ... if in a chroot or a diff init package, ignore
-		# errors from this step #253697
-		/sbin/telinit U 2>/dev/null
-
-		# if the host locales.gen contains no entries, we'll install everything
-		local locale_list="${EROOT}etc/locale.gen"
-		if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
-			ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
-			locale_list="${EROOT}usr/share/i18n/SUPPORTED"
-		fi
-		locale-gen -j $(makeopts_jobs) --config "${locale_list}"
-	fi
-}

diff --git a/sys-libs/glibc/files/eblits/pkg_preinst.eblit b/sys-libs/glibc/files/eblits/pkg_preinst.eblit
deleted file mode 100644
index f40f402..0000000
--- a/sys-libs/glibc/files/eblits/pkg_preinst.eblit
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Simple test to make sure our new glibc isnt completely broken.
-# Make sure we don't test with statically built binaries since
-# they will fail.  Also, skip if this glibc is a cross compiler.
-#
-# If coreutils is built with USE=multicall, some of these files
-# will just be wrapper scripts, not actual ELFs we can test.
-glibc_sanity_check() {
-	cd / #228809
-
-	# We enter ${ED} so to avoid trouble if the path contains
-	# special characters; for instance if the path contains the
-	# colon character (:), then the linker will try to split it
-	# and look for the libraries in an unexpected place. This can
-	# lead to unsafe code execution if the generated prefix is
-	# within a world-writable directory.
-	# (e.g. /var/tmp/portage:${HOSTNAME})
-	pushd "${ED}"/$(get_libdir) >/dev/null
-
-	local x striptest
-	for x in cal date env free ls true uname uptime ; do
-		x=$(type -p ${x})
-		[[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue
-		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
-		case ${striptest} in
-		*"statically linked"*) continue;;
-		*"ASCII text"*) continue;;
-		esac
-		# We need to clear the locale settings as the upgrade might want
-		# incompatible locale data.  This test is not for verifying that.
-		LC_ALL=C \
-		./ld-*.so --library-path . ${x} > /dev/null \
-			|| die "simple run test (${x}) failed"
-	done
-
-	popd >/dev/null
-}
-
-eblit-glibc-pkg_preinst() {
-	# nothing to do if just installing headers
-	just_headers && return
-
-	# prepare /etc/ld.so.conf.d/ for files
-	mkdir -p "${EROOT}"/etc/ld.so.conf.d
-
-	# Default /etc/hosts.conf:multi to on for systems with small dbs.
-	if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then
-		sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf
-		elog "Defaulting /etc/host.conf:multi to on"
-	fi
-
-	[[ ${ROOT} != "/" ]] && return 0
-	[[ -d ${ED}/$(get_libdir) ]] || return 0
-	[[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
-
-	# For newer EAPIs, this was run in pkg_pretend.
-	if [[ ${EAPI:-0} == [0123] ]] ; then
-		check_devpts
-	fi
-}

diff --git a/sys-libs/glibc/files/eblits/pkg_pretend.eblit b/sys-libs/glibc/files/eblits/pkg_pretend.eblit
deleted file mode 100644
index c900ccc..0000000
--- a/sys-libs/glibc/files/eblits/pkg_pretend.eblit
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-glibc_compile_test() {
-	local ret save_cflags=${CFLAGS}
-	CFLAGS+=" $1"
-	shift
-
-	pushd "${T}" >/dev/null
-
-	rm -f glibc-test*
-	printf '%b' "$*" > glibc-test.c
-
-	_nonfatal emake -s glibc-test
-	ret=$?
-
-	popd >/dev/null
-
-	CFLAGS=${save_cflags}
-	return ${ret}
-}
-
-glibc_run_test() {
-	local ret
-
-	if [[ ${EMERGE_FROM} == "binary" ]] ; then
-		# ignore build failures when installing a binary package #324685
-		glibc_compile_test "" "$@" 2>/dev/null || return 0
-	else
-		if ! glibc_compile_test "" "$@" ; then
-			ewarn "Simple build failed ... assuming this is desired #324685"
-			return 0
-		fi
-	fi
-
-	pushd "${T}" >/dev/null
-
-	./glibc-test
-	ret=$?
-	rm -f glibc-test*
-
-	popd >/dev/null
-
-	return ${ret}
-}
-
-check_devpts() {
-	# Make sure devpts is mounted correctly for use w/out setuid pt_chown.
-
-	# If merely building the binary package, then there's nothing to verify.
-	[[ ${MERGE_TYPE} == "buildonly" ]] && return
-
-	# Only sanity check when installing the native glibc.
-	[[ ${ROOT} != "/" ]] && return
-
-	# Older versions always installed setuid, so no need to check.
-	in_iuse suid || return
-
-	# If they're opting in to the old suid code, then no need to check.
-	use suid && return
-
-	if awk '$3 == "devpts" && $4 ~ /[, ]gid=5[, ]/ { exit 1 }' /proc/mounts ; then
-		eerror "In order to use glibc with USE=-suid, you must make sure that"
-		eerror "you have devpts mounted at /dev/pts with the gid=5 option."
-		eerror "Openrc should do this for you, so you should check /etc/fstab"
-		eerror "and make sure you do not have any invalid settings there."
-		# Do not die on older kernels as devpts did not export these settings #489520.
-		if version_is_at_least 2.6.25 $(uname -r) ; then
-			die "mount & fix your /dev/pts settings"
-		fi
-	fi
-}
-
-eblit-glibc-pkg_pretend() {
-	# For older EAPIs, this is run in pkg_preinst.
-	if [[ ${EAPI:-0} != [0123] ]] ; then
-		check_devpts
-	fi
-
-	# prevent native builds from downgrading ... maybe update to allow people
-	# to change between diff -r versions ? (2.3.6-r4 -> 2.3.6-r2)
-	if [[ ${MERGE_TYPE} != "buildonly" ]] && \
-	   [[ ${ROOT} == "/" ]] && \
-	   [[ ${CBUILD} == ${CHOST} ]] && \
-	   [[ ${CHOST} == ${CTARGET} ]] ; then
-		if has_version '>'${CATEGORY}/${PF} ; then
-			eerror "Sanity check to keep you from breaking your system:"
-			eerror " Downgrading glibc is not supported and a sure way to destruction"
-			die "aborting to save your system"
-		fi
-
-		if ! glibc_run_test '#include <pwd.h>\nint main(){return getpwuid(0)==0;}\n'
-		then
-			eerror "Your patched vendor kernel is broken.  You need to get an"
-			eerror "update from whoever is providing the kernel to you."
-			eerror "http://sourceware.org/bugzilla/show_bug.cgi?id=5227"
-			eerror "http://bugs.gentoo.org/262698"
-			die "keeping your system alive, say thank you"
-		fi
-
-		if ! glibc_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n'
-		then
-			eerror "Your old kernel is broken.  You need to update it to"
-			eerror "a newer version as syscall(<bignum>) will break."
-			eerror "http://bugs.gentoo.org/279260"
-			die "keeping your system alive, say thank you"
-		fi
-	fi
-
-	# users have had a chance to phase themselves, time to give em the boot
-	if [[ -e ${EROOT}/etc/locale.gen ]] && [[ -e ${EROOT}/etc/locales.build ]] ; then
-		eerror "You still haven't deleted ${EROOT}/etc/locales.build."
-		eerror "Do so now after making sure ${EROOT}/etc/locale.gen is kosher."
-		die "lazy upgrader detected"
-	fi
-
-	if [[ ${CTARGET} == i386-* ]] ; then
-		eerror "i386 CHOSTs are no longer supported."
-		eerror "Chances are you don't actually want/need i386."
-		eerror "Please read http://www.gentoo.org/doc/en/change-chost.xml"
-		die "please fix your CHOST"
-	fi
-
-	if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
-		ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
-		ewarn "This will result in a 50% performance penalty when running with a 32bit"
-		ewarn "hypervisor, which is probably not what you want."
-	fi
-
-	use hardened && ! gcc-specs-pie && \
-		ewarn "PIE hardening not applied, as your compiler doesn't default to PIE"
-
-	# Make sure host system is up to date #394453
-	if has_version '<sys-libs/glibc-2.13' && \
-	   [[ -n $(scanelf -qys__guard -F'#s%F' "${EROOT}"/lib*/l*-*.so) ]]
-	then
-		ebegin "Scanning system for __guard to see if you need to rebuild first ..."
-		local files=$(
-			scanelf -qys__guard -F'#s%F' \
-				"${EROOT}"/*bin/ \
-				"${EROOT}"/lib* \
-				"${EROOT}"/usr/*bin/ \
-				"${EROOT}"/usr/lib* | \
-				egrep -v \
-					-e "^${EROOT}/lib.*/(libc|ld)-2.*.so$" \
-					-e "^${EROOT}/sbin/(ldconfig|sln)$"
-		)
-		[[ -z ${files} ]]
-		if ! eend $? ; then
-			eerror "Your system still has old SSP __guard symbols.  You need to"
-			eerror "rebuild all the packages that provide these files first:"
-			eerror "${files}"
-			die "old __guard detected"
-		fi
-	fi
-}

diff --git a/sys-libs/glibc/files/eblits/pkg_setup.eblit b/sys-libs/glibc/files/eblits/pkg_setup.eblit
deleted file mode 100644
index 2aff258..0000000
--- a/sys-libs/glibc/files/eblits/pkg_setup.eblit
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-[[ ${EAPI:-0} == [0123] ]] && source "${FILESDIR}/eblits/pkg_pretend.eblit"
-
-eblit-glibc-pkg_setup() {
-	[[ ${EAPI:-0} == [0123] ]] && eblit-glibc-pkg_pretend
-}

diff --git a/sys-libs/glibc/files/eblits/src_compile.eblit b/sys-libs/glibc/files/eblits/src_compile.eblit
deleted file mode 100644
index 7a38b3e..0000000
--- a/sys-libs/glibc/files/eblits/src_compile.eblit
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-[[ ${EAPI:-0} == [01] ]] && source "${FILESDIR}/eblits/src_configure.eblit"
-
-toolchain-glibc_src_compile() {
-	local t
-	for t in linuxthreads nptl ; do
-		if want_${t} ; then
-			[[ ${EAPI:-0} == [01] ]] && glibc_do_configure ${t}
-			emake -C "$(builddir ${t})" || die "make ${t} for ${ABI} failed"
-		fi
-	done
-}
-
-eblit-glibc-src_compile() {
-	if just_headers ; then
-		[[ ${EAPI:-0} == [01] ]] && toolchain-glibc_headers_configure
-		return
-	fi
-
-	foreach_abi toolchain-glibc_src_compile
-}

diff --git a/sys-libs/glibc/files/eblits/src_configure.eblit b/sys-libs/glibc/files/eblits/src_configure.eblit
deleted file mode 100644
index 5f2fec0..0000000
--- a/sys-libs/glibc/files/eblits/src_configure.eblit
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-dump_toolchain_settings() {
-	echo
-
-	einfo "$*"
-
-	local v
-	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC LD {AS,C,CPP,CXX,LD}FLAGS ; do
-		einfo " $(printf '%15s' ${v}:)   ${!v}"
-	done
-
-	# The glibc configure script doesn't properly use LDFLAGS all the time.
-	export CC="$(tc-getCC ${CTARGET}) ${LDFLAGS}"
-	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
-	echo
-}
-
-glibc_do_configure() {
-	# Glibc does not work with gold (for various reasons) #269274.
-	tc-ld-disable-gold
-
-	dump_toolchain_settings "Configuring glibc for $1"
-
-	local myconf=()
-
-	# set addons
-	pushd "${S}" > /dev/null
-	local addons=$(echo */configure | sed \
-		-e 's:/configure::g' \
-		-e 's:\(linuxthreads\|nptl\|rtkaio\|glibc-compat\)\( \|$\)::g' \
-		-e 's: \+$::' \
-		-e 's! !,!g' \
-		-e 's!^!,!' \
-		-e '/^,\*$/d')
-	[[ -d ports ]] && addons+=",ports"
-	popd > /dev/null
-
-	myconf+=( $(use_enable hardened stackguard-randomization) )
-	if has_version '<sys-libs/glibc-2.13' ; then
-		myconf+=( --enable-old-ssp-compat )
-	fi
-
-	[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
-
-	if [[ $1 == "linuxthreads" ]] ; then
-		if want_tls ; then
-			myconf+=( --with-tls )
-
-			if ! want__thread || use glibc-compat20 || [[ ${LT_KER_VER} == 2.[02].* ]] ; then
-				myconf+=( --without-__thread )
-			else
-				myconf+=( --with-__thread )
-			fi
-		else
-			myconf+=( --without-tls --without-__thread )
-		fi
-
-		myconf+=( --disable-sanity-checks )
-		addons="linuxthreads${addons}"
-		myconf+=( --enable-kernel=${LT_KER_VER} )
-	elif [[ $1 == "nptl" ]] ; then
-		# Newer versions require nptl, so there is no addon for it.
-		version_is_at_least 2.20 || addons="nptl${addons}"
-		myconf+=( --enable-kernel=${NPTL_KERN_VER} )
-	else
-		die "invalid pthread option"
-	fi
-	myconf+=( --enable-add-ons="${addons#,}" )
-
-	# Since SELinux support is only required for nscd, only enable it if:
-	# 1. USE selinux
-	# 2. only for the primary ABI on multilib systems
-	# 3. Not a crosscompile
-	if ! is_crosscompile && use selinux ; then
-		if use multilib ; then
-			if is_final_abi ; then
-				myconf+=( --with-selinux )
-			else
-				myconf+=( --without-selinux )
-			fi
-		else
-			myconf+=( --with-selinux )
-		fi
-	else
-		myconf+=( --without-selinux )
-	fi
-
-	# Force a few tests where we always know the answer but
-	# configure is incapable of finding it.
-	if is_crosscompile ; then
-		export \
-			libc_cv_c_cleanup=yes \
-			libc_cv_forced_unwind=yes
-	fi
-
-	myconf+=(
-		--without-cvs
-		--disable-werror
-		--enable-bind-now
-		--build=${CBUILD_OPT:-${CBUILD}}
-		--host=${CTARGET_OPT:-${CTARGET}}
-		$(use_enable profile)
-		$(use_with gd)
-		--with-headers=$(alt_build_headers)
-		--libexecdir="${EPREFIX}/usr/$(get_libdir)/misc/glibc"
-		--with-bugurl=http://bugs.gentoo.org/
-		--with-pkgversion="$(glibc_banner)"
-		$(use_multiarch || echo --disable-multi-arch)
-		$(in_iuse rpc && use_enable rpc obsolete-rpc || echo --enable-obsolete-rpc)
-		$(in_iuse systemtap && use_enable systemtap)
-		$(in_iuse nscd && use_enable nscd)
-		${EXTRA_ECONF}
-	)
-
-	# We rely on sys-libs/timezone-data for timezone tools normally.
-	if version_is_at_least 2.23 ; then
-		myconf+=( $(use_enable vanilla timezone-tools) )
-	fi
-
-	# These libs don't have configure flags.
-	ac_cv_lib_audit_audit_log_user_avc_message=$(in_iuse audit && usex audit || echo no)
-	ac_cv_lib_cap_cap_init=$(in_iuse caps && usex caps || echo no)
-
-	# There is no configure option for this and we need to export it
-	# since the glibc build will re-run configure on itself
-	export libc_cv_slibdir="${EPREFIX}/$(get_libdir)"
-	export libc_cv_rootsbindir="${EPREFIX}/sbin"
-
-	# We take care of patching our binutils to use both hash styles,
-	# and many people like to force gnu hash style only, so disable
-	# this overriding check.  #347761
-	export libc_cv_hashstyle=no
-
-	# Overtime, generating info pages can be painful.  So disable this for
-	# versions older than the latest stable to avoid the issue (this ver
-	# should be updated from time to time).  #464394 #465816
-	if ! version_is_at_least 2.17 ; then
-		export ac_cv_prog_MAKEINFO=:
-	fi
-
-	local builddir=$(builddir "$1")
-	mkdir -p "${builddir}"
-	cd "${builddir}"
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	# ia64 static cross-compilers are a pita in so much that they
-	# can't produce static ELFs (as the libgcc.a is broken).  so
-	# disable building of the programs for those targets if it
-	# doesn't work.
-	# XXX: We could turn this into a compiler test, but ia64 is
-	# the only one that matters, so this should be fine for now.
-	if is_crosscompile && [[ ${CTARGET} == ia64* ]] ; then
-		sed -i '1i+link-static = touch $@' config.make
-	fi
-
-	# If we're trying to migrate between ABI sets, we need
-	# to lie and use a local copy of gcc.  Like if the system
-	# is built with MULTILIB_ABIS="amd64 x86" but we want to
-	# add x32 to it, gcc/glibc don't yet support x32.
-	if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib ; then
-		echo 'main(){}' > "${T}"/test.c
-		if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then
-			sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die
-			mkdir -p sunrpc
-			cp $(which rpcgen) sunrpc/cross-rpcgen || die
-			touch -t 202001010101 sunrpc/cross-rpcgen || die
-		fi
-	fi
-}
-
-toolchain-glibc_headers_configure() {
-	export ABI=default
-
-	local builddir=$(builddir "headers")
-	mkdir -p "${builddir}"
-	cd "${builddir}"
-
-	# if we don't have a compiler yet, we cant really test it now ...
-	# hopefully they don't affect header geneation, so let's hope for
-	# the best here ...
-	local v vars=(
-		ac_cv_header_cpuid_h=yes
-		libc_cv_{386,390,alpha,arm,hppa,ia64,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes
-		libc_cv_asm_cfi_directives=yes
-		libc_cv_broken_visibility_attribute=no
-		libc_cv_c_cleanup=yes
-		libc_cv_forced_unwind=yes
-		libc_cv_gcc___thread=yes
-		libc_cv_mlong_double_128=yes
-		libc_cv_mlong_double_128ibm=yes
-		libc_cv_ppc_machine=yes
-		libc_cv_ppc_rel16=yes
-		libc_cv_predef_{fortify_source,stack_protector}=no
-		libc_cv_visibility_attribute=yes
-		libc_cv_z_combreloc=yes
-		libc_cv_z_execstack=yes
-		libc_cv_z_initfirst=yes
-		libc_cv_z_nodelete=yes
-		libc_cv_z_nodlopen=yes
-		libc_cv_z_relro=yes
-		libc_mips_abi=${ABI}
-		libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard)
-		# These libs don't have configure flags.
-		ac_cv_lib_audit_audit_log_user_avc_message=no
-		ac_cv_lib_cap_cap_init=no
-	)
-	einfo "Forcing cached settings:"
-	for v in "${vars[@]}" ; do
-		einfo " ${v}"
-		export ${v}
-	done
-
-	# Blow away some random CC settings that screw things up. #550192
-	if [[ -d ${S}/sysdeps/mips ]]; then
-		pushd "${S}"/sysdeps/mips >/dev/null
-		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die
-		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die
-		popd >/dev/null
-	fi
-
-	local myconf=()
-	myconf+=(
-		--disable-sanity-checks
-		--enable-hacker-mode
-		--without-cvs
-		--disable-werror
-		--enable-bind-now
-		--build=${CBUILD_OPT:-${CBUILD}}
-		--host=${CTARGET_OPT:-${CTARGET}}
-		--with-headers=$(alt_build_headers)
-		${EXTRA_ECONF}
-	)
-
-	local addons
-	[[ -d ${S}/ports ]] && addons+=",ports"
-	# Newer versions require nptl, so there is no addon for it.
-	version_is_at_least 2.20 || addons+=",nptl"
-	myconf+=( --enable-add-ons="${addons#,}" )
-
-	# Nothing is compiled here which would affect the headers for the target.
-	# So forcing CC/CFLAGS is sane.
-	CC="$(tc-getBUILD_CC)" \
-	CFLAGS="-O1 -pipe" \
-	CPPFLAGS="-U_FORTIFY_SOURCE" \
-	LDFLAGS="" \
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-toolchain-glibc_src_configure() {
-	if just_headers ; then
-		toolchain-glibc_headers_configure
-	else
-		want_linuxthreads && glibc_do_configure linuxthreads
-		want_nptl && glibc_do_configure nptl
-	fi
-}
-
-eblit-glibc-src_configure() {
-	foreach_abi toolchain-glibc_src_configure
-}

diff --git a/sys-libs/glibc/files/eblits/src_install.eblit b/sys-libs/glibc/files/eblits/src_install.eblit
deleted file mode 100644
index a23173e..0000000
--- a/sys-libs/glibc/files/eblits/src_install.eblit
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-toolchain-glibc_src_install() {
-	local builddir=$(builddir $(want_linuxthreads && echo linuxthreads || echo nptl))
-	cd "${builddir}"
-
-	emake install_root="${D}$(alt_prefix)" install || die
-
-	if want_linuxthreads && want_nptl ; then
-		einfo "Installing NPTL to $(alt_libdir)/tls/..."
-		cd "$(builddir nptl)"
-		dodir $(alt_libdir)/tls $(alt_usrlibdir)/nptl
-
-		local l src_lib
-		for l in libc libm librt libpthread libthread_db ; do
-			# take care of shared lib first ...
-			l=${l}.so
-			if [[ -e ${l} ]] ; then
-				src_lib=${l}
-			else
-				src_lib=$(eval echo */${l})
-			fi
-			cp -a ${src_lib} "${ED}"$(alt_libdir)/tls/${l} || die "copying nptl ${l}"
-			fperms a+rx $(alt_libdir)/tls/${l}
-			dosym ${l} $(alt_libdir)/tls/$(scanelf -qSF'%S#F' ${src_lib})
-
-			# then grab the linker script or the symlink ...
-			if [[ -L ${ED}$(alt_usrlibdir)/${l} ]] ; then
-				dosym $(alt_libdir)/tls/${l} $(alt_usrlibdir)/nptl/${l}
-			else
-				sed \
-					-e "s:/${l}:/tls/${l}:g" \
-					-e "s:/${l/%.so/_nonshared.a}:/nptl/${l/%.so/_nonshared.a}:g" \
-					"${ED}"$(alt_usrlibdir)/${l} > "${ED}"$(alt_usrlibdir)/nptl/${l}
-			fi
-
-			# then grab the static lib ...
-			src_lib=${src_lib/%.so/.a}
-			[[ ! -e ${src_lib} ]] && src_lib=${src_lib/%.a/_pic.a}
-			cp -a ${src_lib} "${ED}"$(alt_usrlibdir)/nptl/ || die "copying nptl ${src_lib}"
-			src_lib=${src_lib/%.a/_nonshared.a}
-			if [[ -e ${src_lib} ]] ; then
-				cp -a ${src_lib} "${ED}"$(alt_usrlibdir)/nptl/ || die "copying nptl ${src_lib}"
-			fi
-		done
-
-		# use the nptl linker instead of the linuxthreads one as the linuxthreads
-		# one may lack TLS support and that can be really bad for business
-		cp -a elf/ld.so "${ED}"$(alt_libdir)/$(scanelf -qSF'%S#F' elf/ld.so) || die "copying nptl interp"
-	fi
-
-	# We'll take care of the cache ourselves
-	rm -f "${ED}"/etc/ld.so.cache
-
-	# Everything past this point just needs to be done once ...
-	is_final_abi || return 0
-
-	# Make sure the non-native interp can be found on multilib systems even
-	# if the main library set isn't installed into the right place.  Maybe
-	# we should query the active gcc for info instead of hardcoding it ?
-	local i ldso_abi ldso_name
-	local ldso_abi_list=(
-		# x86
-		amd64   /lib64/ld-linux-x86-64.so.2
-		x32     /libx32/ld-linux-x32.so.2
-		x86     /lib/ld-linux.so.2
-		# mips
-		o32     /lib/ld.so.1
-		n32     /lib32/ld.so.1
-		n64     /lib64/ld.so.1
-		# powerpc
-		ppc     /lib/ld.so.1
-		ppc64   /lib64/ld64.so.1
-		# s390
-		s390    /lib/ld.so.1
-		s390x   /lib/ld64.so.1
-		# sparc
-		sparc32 /lib/ld-linux.so.2
-		sparc64 /lib64/ld-linux.so.2
-	)
-	case $(tc-endian) in
-	little)
-		ldso_abi_list+=(
-			# arm
-			arm64   /lib/ld-linux-aarch64.so.1
-		)
-		;;
-	big)
-		ldso_abi_list+=(
-			# arm
-			arm64   /lib/ld-linux-aarch64_be.so.1
-		)
-		;;
-	esac
-	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib
-	fi
-	for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do
-		ldso_abi=${ldso_abi_list[i]}
-		has ${ldso_abi} $(get_install_abis) || continue
-
-		ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
-		if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
-			dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
-		fi
-	done
-
-	# With devpts under Linux mounted properly, we do not need the pt_chown
-	# binary to be setuid.  This is because the default owners/perms will be
-	# exactly what we want.
-	if in_iuse suid && ! use suid ; then
-		find "${ED}" -name pt_chown -exec chmod -s {} +
-	fi
-
-	#################################################################
-	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
-	# Make sure we install some symlink hacks so that when we build
-	# a 2nd stage cross-compiler, gcc finds the target system
-	# headers correctly.  See gcc/doc/gccinstall.info
-	if is_crosscompile ; then
-		# We need to make sure that /lib and /usr/lib always exists.
-		# gcc likes to use relative paths to get to its multilibs like
-		# /usr/lib/../lib64/.  So while we don't install any files into
-		# /usr/lib/, we do need it to exist.
-		cd "${ED}"$(alt_libdir)/..
-		[[ -e lib ]] || mkdir lib
-		cd "${ED}"$(alt_usrlibdir)/..
-		[[ -e lib ]] || mkdir lib
-
-		dosym usr/include $(alt_prefix)/sys-include
-		return 0
-	fi
-
-	# Files for Debian-style locale updating
-	dodir /usr/share/i18n
-	sed \
-		-e "/^#/d" \
-		-e "/SUPPORTED-LOCALES=/d" \
-		-e "s: \\\\::g" -e "s:/: :g" \
-		"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
-		|| die "generating /usr/share/i18n/SUPPORTED failed"
-	cd "${WORKDIR}"/extra/locale
-	dosbin locale-gen || die
-	doman *.[0-8]
-	insinto /etc
-	doins locale.gen || die
-
-	# Make sure all the ABI's can find the locales and so we only
-	# have to generate one set
-	local a
-	keepdir /usr/$(get_libdir)/locale
-	for a in $(get_install_abis) ; do
-		if [[ ! -e ${ED}/usr/$(get_abi_LIBDIR ${a})/locale ]] ; then
-			dosym /usr/$(get_libdir)/locale /usr/$(get_abi_LIBDIR ${a})/locale
-		fi
-	done
-
-	cd "${S}"
-
-	# Install misc network config files
-	insinto /etc
-	doins nscd/nscd.conf posix/gai.conf nss/nsswitch.conf || die
-	doins "${WORKDIR}"/extra/etc/*.conf || die
-
-	if ! in_iuse nscd || use nscd ; then
-		doinitd "${WORKDIR}"/extra/etc/nscd || die
-
-		local nscd_args=(
-			-e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):"
-		)
-		version_is_at_least 2.16 || nscd_args+=( -e 's: --foreground : :' )
-		sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
-
-		# Newer versions of glibc include the nscd.service themselves.
-		# TODO: Drop the $FILESDIR copy once 2.19 goes stable.
-		if version_is_at_least 2.19 ; then
-			systemd_dounit nscd/nscd.service || die
-			systemd_newtmpfilesd nscd/nscd.tmpfiles nscd.conf || die
-		else
-			systemd_dounit "${FILESDIR}"/nscd.service || die
-			systemd_newtmpfilesd "${FILESDIR}"/nscd.tmpfilesd nscd.conf || die
-		fi
-	else
-		# Do this since extra/etc/*.conf above might have nscd.conf.
-		rm -f "${ED}"/etc/nscd.conf
-	fi
-
-	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
-	doenvd "${T}"/00glibc || die
-
-	for d in BUGS ChangeLog* CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
-		[[ -s ${d} ]] && dodoc ${d}
-	done
-
-	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
-	# creation of the "factory" symlink in pkg_postinst().
-	rm -f "${ED}"/etc/localtime
-}
-
-toolchain-glibc_headers_install() {
-	local builddir=$(builddir "headers")
-	cd "${builddir}"
-	emake install_root="${D}$(alt_prefix)" install-headers || die
-	if ! version_is_at_least 2.16 ; then
-		insinto $(alt_headers)/bits
-		doins bits/stdio_lim.h || die
-	fi
-	insinto $(alt_headers)/gnu
-	doins "${S}"/include/gnu/stubs.h || die "doins include gnu"
-	# Make sure we install the sys-include symlink so that when
-	# we build a 2nd stage cross-compiler, gcc finds the target
-	# system headers correctly.  See gcc/doc/gccinstall.info
-	dosym usr/include $(alt_prefix)/sys-include
-}
-
-src_strip() {
-	# gdb is lame and requires some debugging information to remain in
-	# libpthread, so we need to strip it by hand.  libthread_db makes no
-	# sense stripped as it is only used when debugging.
-	local pthread=$(has splitdebug ${FEATURES} && echo "libthread_db" || echo "lib{pthread,thread_db}")
-	env \
-		-uRESTRICT \
-		CHOST=${CTARGET} \
-		STRIP_MASK="/*/{,tls/}${pthread}*" \
-		prepallstrip
-	# if user has stripping enabled and does not have split debug turned on,
-	# then leave the debugging sections in libpthread.
-	if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then
-		${STRIP:-${CTARGET}-strip} --strip-debug "${ED}"/*/libpthread-*.so
-	fi
-}
-
-eblit-glibc-src_install() {
-	if just_headers ; then
-		export ABI=default
-		toolchain-glibc_headers_install
-		return
-	fi
-
-	foreach_abi toolchain-glibc_src_install
-	src_strip
-}

diff --git a/sys-libs/glibc/files/eblits/src_prepare.eblit b/sys-libs/glibc/files/eblits/src_prepare.eblit
deleted file mode 100644
index 162cf53..0000000
--- a/sys-libs/glibc/files/eblits/src_prepare.eblit
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-eblit-glibc-src_prepare() {
-	# XXX: We should do the branchupdate, before extracting the manpages and
-	# infopages else it does not help much (mtimes change if there is a change
-	# to them with branchupdate)
-	if [[ -n ${BRANCH_UPDATE} ]] ; then
-		epatch "${DISTDIR}"/glibc-${RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
-
-		# Snapshot date patch
-		einfo "Patching version to display snapshot date ..."
-		sed -i -e "s:\(#define RELEASE\).*:\1 \"${BRANCH_UPDATE}\":" version.h
-	fi
-
-	# tag, glibc is it
-	if ! version_is_at_least 2.17 ; then
-		[[ -e csu/Banner ]] && die "need new banner location"
-		glibc_banner > csu/Banner
-	fi
-	if [[ -n ${PATCH_VER} ]] && ! use vanilla ; then
-		EPATCH_MULTI_MSG="Applying Gentoo Glibc Patchset ${RELEASE_VER}-${PATCH_VER} ..." \
-		EPATCH_EXCLUDE=${GLIBC_PATCH_EXCLUDE} \
-		EPATCH_SUFFIX="patch" \
-		ARCH=$(tc-arch) \
-		epatch "${WORKDIR}"/patches
-	fi
-
-	if just_headers ; then
-		if [[ -e ports/sysdeps/mips/preconfigure ]] ; then
-			# mips peeps like to screw with us.  if building headers,
-			# we don't have a real compiler, so we can't let them
-			# insert -mabi on us.
-			sed -i '/CPPFLAGS=.*-mabi/s|.*|:|' ports/sysdeps/mips/preconfigure || die
-			find ports/sysdeps/mips/ -name Makefile -exec sed -i '/^CC.*-mabi=/s:-mabi=.*:-D_MIPS_SZPTR=32:' {} +
-		fi
-	fi
-
-	epatch_user
-
-	gnuconfig_update
-
-	# Glibc is stupid sometimes, and doesn't realize that with a
-	# static C-Only gcc, -lgcc_eh doesn't exist.
-	# http://sourceware.org/ml/libc-alpha/2003-09/msg00100.html
-	# http://sourceware.org/ml/libc-alpha/2005-02/msg00042.html
-	# But! Finally fixed in recent versions:
-	# http://sourceware.org/ml/libc-alpha/2012-05/msg01865.html
-	if ! version_is_at_least 2.16 ; then
-		echo 'int main(){}' > "${T}"/gcc_eh_test.c
-		if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/gcc_eh_test.c -lgcc_eh 2>/dev/null ; then
-			sed -i -e 's:-lgcc_eh::' Makeconfig || die "sed gcc_eh"
-		fi
-	fi
-
-	cd "${WORKDIR}"
-	find . -type f '(' -size 0 -o -name "*.orig" ')' -delete
-	find . -name configure -exec touch {} +
-
-	# Fix permissions on some of the scripts.
-	chmod u+x "${S}"/scripts/*.sh
-}

diff --git a/sys-libs/glibc/files/eblits/src_test.eblit b/sys-libs/glibc/files/eblits/src_test.eblit
deleted file mode 100644
index fc5b950..0000000
--- a/sys-libs/glibc/files/eblits/src_test.eblit
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-glibc_src_test() {
-	cd "$(builddir $1)"
-	nonfatal emake -j1 check && return 0
-	einfo "make check failed - re-running with --keep-going to get the rest of the results"
-	nonfatal emake -j1 -k check
-	ewarn "make check failed for ${ABI}-${CTARGET}-$1"
-	return 1
-}
-
-toolchain-glibc_src_test() {
-	local ret=0 t
-	for t in linuxthreads nptl ; do
-		if want_${t} ; then
-			glibc_src_test ${t}
-			: $(( ret |= $? ))
-		fi
-	done
-	return ${ret}
-}
-
-eblit-glibc-src_test() {
-	# Give tests more time to complete.
-	export TIMEOUTFACTOR=5
-
-	foreach_abi toolchain-glibc_src_test || die "tests failed"
-}

diff --git a/sys-libs/glibc/files/eblits/src_unpack.eblit b/sys-libs/glibc/files/eblits/src_unpack.eblit
deleted file mode 100644
index 8d4c740..0000000
--- a/sys-libs/glibc/files/eblits/src_unpack.eblit
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-[[ ${EAPI:-0} == [01] ]] && source "${FILESDIR}/eblits/src_prepare.eblit"
-
-int_to_KV() {
-	local version=$1 major minor micro
-	major=$((version / 65536))
-	minor=$(((version % 65536) / 256))
-	micro=$((version % 256))
-	echo ${major}.${minor}.${micro}
-}
-
-eend_KV() {
-	[[ $(KV_to_int $1) -ge $(KV_to_int $2) ]]
-	eend $?
-}
-
-get_kheader_version() {
-	printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \
-	$(tc-getCPP ${CTARGET}) -I "${EPREFIX}/$(alt_build_headers)" - | \
-	tail -n 1
-}
-
-check_nptl_support() {
-	# don't care about the compiler here as we arent using it
-	just_headers && return
-
-	local run_kv build_kv want_kv
-	run_kv=$(int_to_KV $(get_KV))
-	build_kv=$(int_to_KV $(get_kheader_version))
-	want_kv=${NPTL_KERN_VER}
-
-	ebegin "Checking gcc for __thread support"
-	if ! eend $(want__thread ; echo $?) ; then
-		echo
-		eerror "Could not find a gcc that supports the __thread directive!"
-		eerror "Please update your binutils/gcc and try again."
-		die "No __thread support in gcc!"
-	fi
-
-	if ! is_crosscompile && ! tc-is-cross-compiler ; then
-		# Building fails on an non-supporting kernel
-		ebegin "Checking kernel version (${run_kv} >= ${want_kv})"
-		if ! eend_KV ${run_kv} ${want_kv} ; then
-			echo
-			eerror "You need a kernel of at least ${want_kv} for NPTL support!"
-			die "Kernel version too low!"
-		fi
-	fi
-
-	ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})"
-	if ! eend_KV ${build_kv} ${want_kv} ; then
-		echo
-		eerror "You need linux-headers of at least ${want_kv} for NPTL support!"
-		die "linux-headers version too low!"
-	fi
-}
-
-unpack_pkg() {
-	local a=${PN}
-	[[ -n ${SNAP_VER} ]] && a="${a}-${RELEASE_VER}"
-	[[ -n $1 ]] && a="${a}-$1"
-	if [[ -n ${SNAP_VER} ]] ; then
-		a="${a}-${SNAP_VER}"
-	else
-		if [[ -n $2 ]] ; then
-			a="${a}-$2"
-		else
-			a="${a}-${RELEASE_VER}"
-		fi
-	fi
-	if has ${a}.tar.xz ${A} ; then
-		unpacker ${a}.tar.xz
-	else
-		unpack ${a}.tar.bz2
-	fi
-	[[ -n $1 ]] && { mv ${a} $1 || die ; }
-}
-
-toolchain-glibc_src_unpack() {
-	# Check NPTL support _before_ we unpack things to save some time
-	want_nptl && check_nptl_support
-
-	if [[ -n ${EGIT_REPO_URIS} ]] ; then
-		local i d
-		for ((i=0; i<${#EGIT_REPO_URIS[@]}; ++i)) ; do
-			EGIT_REPO_URI=${EGIT_REPO_URIS[$i]}
-			EGIT_SOURCEDIR=${EGIT_SOURCEDIRS[$i]}
-			git-2_src_unpack
-		done
-	else
-		unpack_pkg
-	fi
-
-	cd "${S}"
-	touch locale/C-translit.h #185476 #218003
-	[[ -n ${LT_VER}     ]] && unpack_pkg linuxthreads ${LT_VER}
-	[[ -n ${PORTS_VER}  ]] && unpack_pkg ports ${PORTS_VER}
-	[[ -n ${LIBIDN_VER} ]] && unpack_pkg libidn
-
-	if [[ -n ${PATCH_VER} ]] ; then
-		cd "${WORKDIR}"
-		unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2
-		# pull out all the addons
-		local d
-		for d in extra/*/configure ; do
-			d=${d%/configure}
-			[[ -d ${S}/${d} ]] && die "${d} already exists in \${S}"
-			mv "${d}" "${S}" || die "moving ${d} failed"
-		done
-	fi
-}
-
-eblit-glibc-src_unpack() {
-	setup_env
-
-	toolchain-glibc_src_unpack
-	[[ ${EAPI:-0} == [01] ]] && cd "${S}" && eblit-glibc-src_prepare
-}

diff --git a/sys-libs/glibc/files/nscd b/sys-libs/glibc/files/nscd
deleted file mode 100644
index b102de0..0000000
--- a/sys-libs/glibc/files/nscd
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/nscd,v 1.7 2007/02/23 12:09:39 uberlord Exp $
-
-depend() {
-	use dns ldap net slapd
-}
-
-checkconfig() {
-	if [ ! -d /var/run/nscd ] ; then
-		mkdir -p /var/run/nscd
-		chmod 755 /var/run/nscd
-	fi
-	if [ -z "${NSCD_PERMS_OK}" ] && [ "$(stat -c %a /var/run/nscd)" != "755" ] ; then
-		echo ""
-		ewarn "nscd run dir is not world readable, you should reset the perms:"
-		ewarn "chmod 755 /var/run/nscd"
-		ewarn "chmod a+rw /var/run/nscd/socket"
-		echo ""
-		ewarn "To disable this warning, set 'NSCD_PERMS_OK' in /etc/conf.d/nscd"
-		echo ""
-	fi
-}
-
-start() {
-	checkconfig
-
-	ebegin "Starting Name Service Cache Daemon"
-	local secure=`while read curline ; do
-		table=${curline%:*}
-		entries=${curline##$table:}
-		table=${table%%[^a-z]*}
-		case $table in
-			passwd*|group*|hosts)
-			for entry in $entries ; do
-			case $entry in
-				nisplus*)
-					/usr/sbin/nscd_nischeck $table || \
-					/echo "-S $table,yes"
-				;;
-			esac
-			done
-		;;
-		esac
-		done < /etc/nsswitch.conf`
-	local pidfile="$(strings /usr/sbin/nscd | grep nscd.pid)"
-	mkdir -p "$(dirname ${pidfile})"
-	save_options pidfile "${pidfile}"
-	start-stop-daemon --start --quiet \
-		--exec /usr/sbin/nscd --pidfile "${pidfile}" \
-		-- $secure
-	eend $?
-}
-
-stop() {
-	local pidfile="$(get_options pidfile)"
-	[ -n "${pidfile}" ] && pidfile="--pidfile ${pidfile}"
-	ebegin "Shutting down Name Service Cache Daemon"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/nscd ${pidfile}
-	eend $?
-}
-
-# vim:ts=4

diff --git a/sys-libs/glibc/files/nscd.service b/sys-libs/glibc/files/nscd.service
deleted file mode 100644
index 25a3b1d..0000000
--- a/sys-libs/glibc/files/nscd.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Name Service Cache Daemon
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/nscd -F
-ExecStop=/usr/sbin/nscd --shutdown
-ExecReload=/usr/sbin/nscd -i passwd
-ExecReload=/usr/sbin/nscd -i group
-ExecReload=/usr/sbin/nscd -i hosts
-ExecReload=/usr/sbin/nscd -i services
-Restart=always
-
-[Install]
-WantedBy=multi-user.target

diff --git a/sys-libs/glibc/files/nscd.tmpfilesd b/sys-libs/glibc/files/nscd.tmpfilesd
deleted file mode 100644
index 52edbba..0000000
--- a/sys-libs/glibc/files/nscd.tmpfilesd
+++ /dev/null
@@ -1,4 +0,0 @@
-# Configuration to create /run/nscd directory
-# Used as part of systemd's tmpfiles
-
-d /run/nscd 0755 root root

diff --git a/sys-libs/glibc/files/nsswitch.conf b/sys-libs/glibc/files/nsswitch.conf
deleted file mode 100644
index eb16961..0000000
--- a/sys-libs/glibc/files/nsswitch.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# /etc/nsswitch.conf:
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/nsswitch.conf,v 1.1 2005/05/17 00:52:41 vapier Exp $
-
-passwd:      compat
-shadow:      compat
-group:       compat
-
-# passwd:    db files nis
-# shadow:    db files nis
-# group:     db files nis
-
-hosts:       files dns
-networks:    files dns
-
-services:    db files
-protocols:   db files
-rpc:         db files
-ethers:      db files
-netmasks:    files
-netgroup:    files
-bootparams:  files
-
-automount:   files
-aliases:     files

diff --git a/sys-libs/glibc/glibc-2.15-r1.ebuild b/sys-libs/glibc/glibc-2.15-r1.ebuild
deleted file mode 100644
index 757f34d..0000000
--- a/sys-libs/glibc/glibc-2.15-r1.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r1.ebuild,v 1.17 2013/04/05 00:25:16 vapier Exp $
-
-inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing
-
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
-
-LICENSE="LGPL-2.1+ BSD HPND inner-net"
-KEYWORDS="~amd64 -hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-RESTRICT="strip" # strip ourself #46186
-EMULTILIB_PKG="true"
-
-# Configuration variables
-RELEASE_VER=""
-BRANCH_UPDATE=""
-SNAP_VER=""
-case ${PV} in
-9999*)
-	EGIT_REPO_URIS=( "git://sourceware.org/git/glibc.git" "git://sourceware.org/git/glibc-ports.git" )
-	EGIT_SOURCEDIRS=( "${S}" "${S}/ports" )
-	inherit git-2
-	;;
-*_p*)
-	RELEASE_VER=${PV%_p*}
-	SNAP_VER=${PV#*_p}
-	;;
-*)
-	RELEASE_VER=${PV}
-	;;
-esac
-LIBIDN_VER=""                                  # it's integrated into the main tarball now
-PATCH_VER="13"                                 # Gentoo patchset
-PORTS_VER=${RELEASE_VER}                       # version of glibc ports addon
-LT_VER=""                                      # version of linuxthreads addon
-NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
-#LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
-
-IUSE="debug gd hardened multilib selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
-[[ -n ${RELEASE_VER} ]] && S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
-
-# Here's how the cross-compile logic breaks down ...
-#  CTARGET - machine that will target the binaries
-#  CHOST   - machine that will host the binaries
-#  CBUILD  - machine that will build the binaries
-# If CTARGET != CHOST, it means you want a libc for cross-compiling.
-# If CHOST != CBUILD, it means you want to cross-compile the libc.
-#  CBUILD = CHOST = CTARGET    - native build/install
-#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
-#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
-#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
-# For install paths:
-#  CHOST = CTARGET  - install into /
-#  CHOST != CTARGET - install into /usr/CTARGET/
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER/2.6.9/2.6.20}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-# Why SLOT 2.2 you ask yourself while sippin your tea ?
-# Everyone knows 2.2 > 0, duh.
-SLOT="2.2"
-
-# General: We need a new-enough binutils for as-needed
-# arch: we need to make sure our binutils/gcc supports TLS
-DEPEND=">=sys-devel/gcc-3.4.4
-	arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 )
-	x86? ( >=sys-devel/gcc-4.3 )
-	amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 )
-	ppc? ( >=sys-devel/gcc-4.1.0 )
-	ppc64? ( >=sys-devel/gcc-4.1.0 )
-	>=sys-devel/binutils-2.15.94
-	${LT_VER:+nptl? (} >=sys-kernel/linux-headers-${NPTL_KERN_VER} ${LT_VER:+)}
-	>=app-misc/pax-utils-0.1.10
-	virtual/os-headers
-	!<sys-apps/sandbox-1.2.18.1-r2
-	!<sys-apps/portage-2.1.2
-	!<sys-devel/patch-2.6
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="!sys-kernel/ps3-sources
-	selinux? ( sys-libs/libselinux )
-	!sys-libs/nss-db"
-
-if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
-	[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
-else
-	DEPEND="${DEPEND} !vanilla? ( >=sys-libs/timezone-data-2007c )"
-	RDEPEND="${RDEPEND}
-		vanilla? ( !sys-libs/timezone-data )
-		!vanilla? ( sys-libs/timezone-data )"
-fi
-
-SRC_URI=$(
-	upstream_uris() {
-		echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
-	}
-	gentoo_uris() {
-		local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
-		devspace=${devspace//HTTP/http://dev.gentoo.org/}
-		echo mirror://gentoo/$1 ${devspace//URI/$1}
-	}
-
-	TARNAME=${PN}
-	if [[ -n ${SNAP_VER} ]] ; then
-		TARNAME="${PN}-${RELEASE_VER}"
-		[[ -n ${PORTS_VER} ]] && PORTS_VER=${SNAP_VER}
-		upstream_uris ${TARNAME}-${SNAP_VER}.tar.bz2
-	elif [[ -z ${EGIT_REPO_URIS} ]] ; then
-		upstream_uris ${TARNAME}-${RELEASE_VER}.tar.xz
-	fi
-	[[ -n ${LIBIDN_VER}    ]] && upstream_uris glibc-libidn-${LIBIDN_VER}.tar.bz2
-	[[ -n ${PORTS_VER}     ]] && upstream_uris ${TARNAME}-ports-${PORTS_VER}.tar.xz
-	[[ -n ${LT_VER}        ]] && upstream_uris ${TARNAME}-linuxthreads-${LT_VER}.tar.bz2
-	[[ -n ${BRANCH_UPDATE} ]] && gentoo_uris glibc-${RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
-	[[ -n ${PATCH_VER}     ]] && gentoo_uris glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2
-)
-
-# eblit-include [--skip] <function> [version]
-eblit-include() {
-	local skipable=false
-	[[ $1 == "--skip" ]] && skipable=true && shift
-	[[ $1 == pkg_* ]] && skipable=true
-
-	local e v func=$1 ver=$2
-	[[ -z ${func} ]] && die "Usage: eblit-include <function> [version]"
-	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
-		e="${FILESDIR}/eblits/${func}${v}.eblit"
-		if [[ -e ${e} ]] ; then
-			source "${e}"
-			return 0
-		fi
-	done
-	${skipable} && return 0
-	die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/"
-}
-
-# eblit-run-maybe <function>
-# run the specified function if it is defined
-eblit-run-maybe() {
-	[[ $(type -t "$@") == "function" ]] && "$@"
-}
-
-# eblit-run <function> [version]
-# aka: src_unpack() { eblit-run src_unpack ; }
-eblit-run() {
-	eblit-include --skip common "${*:2}"
-	eblit-include "$@"
-	eblit-run-maybe eblit-$1-pre
-	eblit-${PN}-$1
-	eblit-run-maybe eblit-$1-post
-}
-
-src_unpack()  { eblit-run src_unpack  ; }
-src_compile() { eblit-run src_compile ; }
-src_test()    { eblit-run src_test    ; }
-src_install() { eblit-run src_install ; }
-
-# FILESDIR might not be available during binpkg install
-for x in setup {pre,post}inst ; do
-	e="${FILESDIR}/eblits/pkg_${x}.eblit"
-	if [[ -e ${e} ]] ; then
-		. "${e}"
-		eval "pkg_${x}() { eblit-run pkg_${x} ; }"
-	fi
-done
-
-eblit-src_unpack-pre() {
-	GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch"
-}
-
-eblit-src_unpack-post() {
-	if use hardened ; then
-		cd "${S}"
-		einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
-		gcc-specs-pie && epatch "${FILESDIR}"/2.12/glibc-2.12-hardened-pie.patch
-		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch
-		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch
-
-		einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
-		cp -f "${FILESDIR}"/2.6/glibc-2.6-gentoo-stack_chk_fail.c \
-			debug/stack_chk_fail.c || die
-		cp -f "${FILESDIR}"/2.10/glibc-2.10-gentoo-chk_fail.c \
-			debug/chk_fail.c || die
-
-		if use debug ; then
-			# When using Hardened Gentoo stack handler, have smashes dump core for
-			# analysis - debug only, as core could be an information leak
-			# (paranoia).
-			sed -i \
-				-e '/^CFLAGS-backtrace.c/ iCFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				debug/Makefile \
-				|| die "Failed to modify debug/Makefile for debug stack handler"
-			sed -i \
-				-e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				debug/Makefile \
-				|| die "Failed to modify debug/Makefile for debug fortify handler"
-		fi
-
-		# Build nscd with ssp-all
-		sed -i \
-			-e 's:-fstack-protector$:-fstack-protector-all:' \
-			nscd/Makefile \
-			|| die "Failed to ensure nscd builds with ssp-all"
-	fi
-}
-
-eblit-pkg_preinst-post() {
-	if [[ ${CTARGET} == arm* ]] ; then
-		# Backwards compat support for renaming hardfp ldsos #417287
-		local oldso='/lib/ld-linux.so.3'
-		local nldso='/lib/ld-linux-armhf.so.3'
-		if [[ -e ${D}${nldso} ]] ; then
-			if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then
-				ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})."
-				ewarn "Please rebuild all packages using this old ldso as compat"
-				ewarn "support will be dropped in the future."
-				ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}"
-			fi
-		fi
-	fi
-}

diff --git a/sys-libs/glibc/glibc-2.15-r2.ebuild b/sys-libs/glibc/glibc-2.15-r2.ebuild
deleted file mode 100644
index 2d106b9..0000000
--- a/sys-libs/glibc/glibc-2.15-r2.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r2.ebuild,v 1.30 2013/04/05 00:25:16 vapier Exp $
-
-inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing
-
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
-
-LICENSE="LGPL-2.1+ BSD HPND inner-net"
-KEYWORDS="alpha amd64 arm -hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
-RESTRICT="strip" # strip ourself #46186
-EMULTILIB_PKG="true"
-
-# Configuration variables
-RELEASE_VER=""
-BRANCH_UPDATE=""
-SNAP_VER=""
-case ${PV} in
-9999*)
-	EGIT_REPO_URIS=( "git://sourceware.org/git/glibc.git" "git://sourceware.org/git/glibc-ports.git" )
-	EGIT_SOURCEDIRS=( "${S}" "${S}/ports" )
-	inherit git-2
-	;;
-*_p*)
-	RELEASE_VER=${PV%_p*}
-	SNAP_VER=${PV#*_p}
-	;;
-*)
-	RELEASE_VER=${PV}
-	;;
-esac
-LIBIDN_VER=""                                  # it's integrated into the main tarball now
-PATCH_VER="21"                                 # Gentoo patchset
-PORTS_VER=${RELEASE_VER}                       # version of glibc ports addon
-NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
-
-IUSE="debug gd hardened multilib selinux profile vanilla crosscompile_opts_headers-only"
-[[ -n ${RELEASE_VER} ]] && S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
-
-# Here's how the cross-compile logic breaks down ...
-#  CTARGET - machine that will target the binaries
-#  CHOST   - machine that will host the binaries
-#  CBUILD  - machine that will build the binaries
-# If CTARGET != CHOST, it means you want a libc for cross-compiling.
-# If CHOST != CBUILD, it means you want to cross-compile the libc.
-#  CBUILD = CHOST = CTARGET    - native build/install
-#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
-#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
-#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
-# For install paths:
-#  CHOST = CTARGET  - install into /
-#  CHOST != CTARGET - install into /usr/CTARGET/
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER/2.6.9/2.6.20}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-# Why SLOT 2.2 you ask yourself while sippin your tea ?
-# Everyone knows 2.2 > 0, duh.
-SLOT="2.2"
-
-# General: We need a new-enough binutils for as-needed
-# arch: we need to make sure our binutils/gcc supports TLS
-DEPEND=">=sys-devel/gcc-3.4.4
-	arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 )
-	x86? ( >=sys-devel/gcc-4.3 )
-	amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 )
-	ppc? ( >=sys-devel/gcc-4.1.0 )
-	ppc64? ( >=sys-devel/gcc-4.1.0 )
-	>=sys-devel/binutils-2.15.94
-	>=app-misc/pax-utils-0.1.10
-	virtual/os-headers
-	!<sys-apps/sandbox-1.2.18.1-r2
-	!<sys-apps/portage-2.1.2
-	!<sys-devel/patch-2.6
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="!sys-kernel/ps3-sources
-	selinux? ( sys-libs/libselinux )
-	!sys-libs/nss-db"
-
-if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
-	[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
-else
-	DEPEND="${DEPEND} !vanilla? ( >=sys-libs/timezone-data-2007c )"
-	RDEPEND="${RDEPEND}
-		vanilla? ( !sys-libs/timezone-data )
-		!vanilla? ( sys-libs/timezone-data )"
-fi
-
-SRC_URI=$(
-	upstream_uris() {
-		echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
-	}
-	gentoo_uris() {
-		local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
-		devspace=${devspace//HTTP/http://dev.gentoo.org/}
-		echo mirror://gentoo/$1 ${devspace//URI/$1}
-	}
-
-	TARNAME=${PN}
-	if [[ -n ${SNAP_VER} ]] ; then
-		TARNAME="${PN}-${RELEASE_VER}"
-		[[ -n ${PORTS_VER} ]] && PORTS_VER=${SNAP_VER}
-		upstream_uris ${TARNAME}-${SNAP_VER}.tar.bz2
-	elif [[ -z ${EGIT_REPO_URIS} ]] ; then
-		upstream_uris ${TARNAME}-${RELEASE_VER}.tar.xz
-	fi
-	[[ -n ${LIBIDN_VER}    ]] && upstream_uris glibc-libidn-${LIBIDN_VER}.tar.bz2
-	[[ -n ${PORTS_VER}     ]] && upstream_uris ${TARNAME}-ports-${PORTS_VER}.tar.xz
-	[[ -n ${BRANCH_UPDATE} ]] && gentoo_uris glibc-${RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
-	[[ -n ${PATCH_VER}     ]] && gentoo_uris glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2
-)
-
-# eblit-include [--skip] <function> [version]
-eblit-include() {
-	local skipable=false
-	[[ $1 == "--skip" ]] && skipable=true && shift
-	[[ $1 == pkg_* ]] && skipable=true
-
-	local e v func=$1 ver=$2
-	[[ -z ${func} ]] && die "Usage: eblit-include <function> [version]"
-	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
-		e="${FILESDIR}/eblits/${func}${v}.eblit"
-		if [[ -e ${e} ]] ; then
-			source "${e}"
-			return 0
-		fi
-	done
-	${skipable} && return 0
-	die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/"
-}
-
-# eblit-run-maybe <function>
-# run the specified function if it is defined
-eblit-run-maybe() {
-	[[ $(type -t "$@") == "function" ]] && "$@"
-}
-
-# eblit-run <function> [version]
-# aka: src_unpack() { eblit-run src_unpack ; }
-eblit-run() {
-	eblit-include --skip common "${*:2}"
-	eblit-include "$@"
-	eblit-run-maybe eblit-$1-pre
-	eblit-${PN}-$1
-	eblit-run-maybe eblit-$1-post
-}
-
-src_unpack()  { eblit-run src_unpack  ; }
-src_compile() { eblit-run src_compile ; }
-src_test()    { eblit-run src_test    ; }
-src_install() { eblit-run src_install ; }
-
-# FILESDIR might not be available during binpkg install
-for x in setup {pre,post}inst ; do
-	e="${FILESDIR}/eblits/pkg_${x}.eblit"
-	if [[ -e ${e} ]] ; then
-		. "${e}"
-		eval "pkg_${x}() { eblit-run pkg_${x} ; }"
-	fi
-done
-
-eblit-src_unpack-post() {
-	if use hardened ; then
-		cd "${S}"
-		einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
-		gcc-specs-pie && epatch "${FILESDIR}"/2.12/glibc-2.12-hardened-pie.patch
-		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch
-		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch
-
-		einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
-		cp -f "${FILESDIR}"/2.6/glibc-2.6-gentoo-stack_chk_fail.c \
-			debug/stack_chk_fail.c || die
-		cp -f "${FILESDIR}"/2.10/glibc-2.10-gentoo-chk_fail.c \
-			debug/chk_fail.c || die
-
-		if use debug ; then
-			# When using Hardened Gentoo stack handler, have smashes dump core for
-			# analysis - debug only, as core could be an information leak
-			# (paranoia).
-			sed -i \
-				-e '/^CFLAGS-backtrace.c/ iCFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				debug/Makefile \
-				|| die "Failed to modify debug/Makefile for debug stack handler"
-			sed -i \
-				-e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				debug/Makefile \
-				|| die "Failed to modify debug/Makefile for debug fortify handler"
-		fi
-
-		# Build nscd with ssp-all
-		sed -i \
-			-e 's:-fstack-protector$:-fstack-protector-all:' \
-			nscd/Makefile \
-			|| die "Failed to ensure nscd builds with ssp-all"
-	fi
-}
-
-eblit-pkg_preinst-post() {
-	if [[ ${CTARGET} == arm* ]] ; then
-		# Backwards compat support for renaming hardfp ldsos #417287
-		local oldso='/lib/ld-linux.so.3'
-		local nldso='/lib/ld-linux-armhf.so.3'
-		if [[ -e ${D}${nldso} ]] ; then
-			if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then
-				ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})."
-				ewarn "Please rebuild all packages using this old ldso as compat"
-				ewarn "support will be dropped in the future."
-				ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}"
-			fi
-		fi
-	fi
-}

diff --git a/sys-libs/glibc/glibc-2.15-r3.ebuild b/sys-libs/glibc/glibc-2.15-r3.ebuild
deleted file mode 100644
index fb2b257..0000000
--- a/sys-libs/glibc/glibc-2.15-r3.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r3.ebuild,v 1.14 2013/05/09 04:41:16 vapier Exp $
-
-inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing
-
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
-
-LICENSE="LGPL-2.1+ BSD HPND inner-net"
-KEYWORDS="alpha amd64 arm -hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-RESTRICT="strip" # strip ourself #46186
-EMULTILIB_PKG="true"
-
-# Configuration variables
-RELEASE_VER=""
-BRANCH_UPDATE=""
-SNAP_VER=""
-case ${PV} in
-9999*)
-	EGIT_REPO_URIS=( "git://sourceware.org/git/glibc.git" "git://sourceware.org/git/glibc-ports.git" )
-	EGIT_SOURCEDIRS=( "${S}" "${S}/ports" )
-	inherit git-2
-	;;
-*_p*)
-	RELEASE_VER=${PV%_p*}
-	SNAP_VER=${PV#*_p}
-	;;
-*)
-	RELEASE_VER=${PV}
-	;;
-esac
-LIBIDN_VER=""                                  # it's integrated into the main tarball now
-PATCH_VER="23"                                 # Gentoo patchset
-PORTS_VER=${RELEASE_VER}                       # version of glibc ports addon
-NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
-
-IUSE="debug gd hardened multilib selinux profile vanilla crosscompile_opts_headers-only"
-[[ -n ${RELEASE_VER} ]] && S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
-
-# Here's how the cross-compile logic breaks down ...
-#  CTARGET - machine that will target the binaries
-#  CHOST   - machine that will host the binaries
-#  CBUILD  - machine that will build the binaries
-# If CTARGET != CHOST, it means you want a libc for cross-compiling.
-# If CHOST != CBUILD, it means you want to cross-compile the libc.
-#  CBUILD = CHOST = CTARGET    - native build/install
-#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
-#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
-#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
-# For install paths:
-#  CHOST = CTARGET  - install into /
-#  CHOST != CTARGET - install into /usr/CTARGET/
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER/2.6.9/2.6.20}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-# Why SLOT 2.2 you ask yourself while sippin your tea ?
-# Everyone knows 2.2 > 0, duh.
-SLOT="2.2"
-
-# General: We need a new-enough binutils for as-needed
-# arch: we need to make sure our binutils/gcc supports TLS
-DEPEND=">=sys-devel/gcc-3.4.4
-	arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 )
-	x86? ( >=sys-devel/gcc-4.3 )
-	amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 )
-	ppc? ( >=sys-devel/gcc-4.1.0 )
-	ppc64? ( >=sys-devel/gcc-4.1.0 )
-	>=sys-devel/binutils-2.15.94
-	>=app-misc/pax-utils-0.1.10
-	virtual/os-headers
-	!<sys-apps/sandbox-1.2.18.1-r2
-	!<sys-apps/portage-2.1.2
-	!<sys-devel/patch-2.6
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="!sys-kernel/ps3-sources
-	selinux? ( sys-libs/libselinux )
-	!sys-libs/nss-db"
-
-if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
-	[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
-else
-	DEPEND="${DEPEND} !vanilla? ( >=sys-libs/timezone-data-2007c )"
-	RDEPEND="${RDEPEND}
-		vanilla? ( !sys-libs/timezone-data )
-		!vanilla? ( sys-libs/timezone-data )"
-fi
-
-SRC_URI=$(
-	upstream_uris() {
-		echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
-	}
-	gentoo_uris() {
-		local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
-		devspace=${devspace//HTTP/http://dev.gentoo.org/}
-		echo mirror://gentoo/$1 ${devspace//URI/$1}
-	}
-
-	TARNAME=${PN}
-	if [[ -n ${SNAP_VER} ]] ; then
-		TARNAME="${PN}-${RELEASE_VER}"
-		[[ -n ${PORTS_VER} ]] && PORTS_VER=${SNAP_VER}
-		upstream_uris ${TARNAME}-${SNAP_VER}.tar.bz2
-	elif [[ -z ${EGIT_REPO_URIS} ]] ; then
-		upstream_uris ${TARNAME}-${RELEASE_VER}.tar.xz
-	fi
-	[[ -n ${LIBIDN_VER}    ]] && upstream_uris glibc-libidn-${LIBIDN_VER}.tar.bz2
-	[[ -n ${PORTS_VER}     ]] && upstream_uris ${TARNAME}-ports-${PORTS_VER}.tar.xz
-	[[ -n ${BRANCH_UPDATE} ]] && gentoo_uris glibc-${RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
-	[[ -n ${PATCH_VER}     ]] && gentoo_uris glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2
-)
-
-# eblit-include [--skip] <function> [version]
-eblit-include() {
-	local skipable=false
-	[[ $1 == "--skip" ]] && skipable=true && shift
-	[[ $1 == pkg_* ]] && skipable=true
-
-	local e v func=$1 ver=$2
-	[[ -z ${func} ]] && die "Usage: eblit-include <function> [version]"
-	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
-		e="${FILESDIR}/eblits/${func}${v}.eblit"
-		if [[ -e ${e} ]] ; then
-			source "${e}"
-			return 0
-		fi
-	done
-	${skipable} && return 0
-	die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/"
-}
-
-# eblit-run-maybe <function>
-# run the specified function if it is defined
-eblit-run-maybe() {
-	[[ $(type -t "$@") == "function" ]] && "$@"
-}
-
-# eblit-run <function> [version]
-# aka: src_unpack() { eblit-run src_unpack ; }
-eblit-run() {
-	eblit-include --skip common "${*:2}"
-	eblit-include "$@"
-	eblit-run-maybe eblit-$1-pre
-	eblit-${PN}-$1
-	eblit-run-maybe eblit-$1-post
-}
-
-src_unpack()  { eblit-run src_unpack  ; }
-src_compile() { eblit-run src_compile ; }
-src_test()    { eblit-run src_test    ; }
-src_install() { eblit-run src_install ; }
-
-# FILESDIR might not be available during binpkg install
-for x in setup {pre,post}inst ; do
-	e="${FILESDIR}/eblits/pkg_${x}.eblit"
-	if [[ -e ${e} ]] ; then
-		. "${e}"
-		eval "pkg_${x}() { eblit-run pkg_${x} ; }"
-	fi
-done
-
-eblit-src_unpack-post() {
-	epatch "${FILESDIR}"/2.15/glibc-2.15-localstatedir-backport.patch
-
-	if use hardened ; then
-		cd "${S}"
-		einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
-		gcc-specs-pie && epatch "${FILESDIR}"/2.12/glibc-2.12-hardened-pie.patch
-		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch
-		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch
-
-		einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
-		cp -f "${FILESDIR}"/2.6/glibc-2.6-gentoo-stack_chk_fail.c \
-			debug/stack_chk_fail.c || die
-		cp -f "${FILESDIR}"/2.10/glibc-2.10-gentoo-chk_fail.c \
-			debug/chk_fail.c || die
-
-		if use debug ; then
-			# When using Hardened Gentoo stack handler, have smashes dump core for
-			# analysis - debug only, as core could be an information leak
-			# (paranoia).
-			sed -i \
-				-e '/^CFLAGS-backtrace.c/ iCFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				debug/Makefile \
-				|| die "Failed to modify debug/Makefile for debug stack handler"
-			sed -i \
-				-e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				debug/Makefile \
-				|| die "Failed to modify debug/Makefile for debug fortify handler"
-		fi
-
-		# Build nscd with ssp-all
-		sed -i \
-			-e 's:-fstack-protector$:-fstack-protector-all:' \
-			nscd/Makefile \
-			|| die "Failed to ensure nscd builds with ssp-all"
-	fi
-}
-
-eblit-pkg_preinst-post() {
-	if [[ ${CTARGET} == arm* ]] ; then
-		# Backwards compat support for renaming hardfp ldsos #417287
-		local oldso='/lib/ld-linux.so.3'
-		local nldso='/lib/ld-linux-armhf.so.3'
-		if [[ -e ${D}${nldso} ]] ; then
-			if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then
-				ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})."
-				ewarn "Please rebuild all packages using this old ldso as compat"
-				ewarn "support will be dropped in the future."
-				ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}"
-			fi
-		fi
-	fi
-}

diff --git a/sys-libs/glibc/glibc-2.17.ebuild b/sys-libs/glibc/glibc-2.17.ebuild
deleted file mode 100644
index 40b2f6c..0000000
--- a/sys-libs/glibc/glibc-2.17.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild,v 1.16 2013/06/27 12:19:41 jer Exp $
-
-inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing prefix
-
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
-
-LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-RESTRICT="strip" # strip ourself #46186
-EMULTILIB_PKG="true"
-
-# Configuration variables
-RELEASE_VER=""
-case ${PV} in
-9999*)
-	EGIT_REPO_URIS="git://sourceware.org/git/glibc.git"
-	EGIT_SOURCEDIRS="${S}"
-	inherit git-2
-	;;
-*)
-	RELEASE_VER=${PV}
-	;;
-esac
-PATCH_VER="7"                                  # Gentoo patchset
-NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"}       # min kernel version nptl requires
-
-IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
-
-# Here's how the cross-compile logic breaks down ...
-#  CTARGET - machine that will target the binaries
-#  CHOST   - machine that will host the binaries
-#  CBUILD  - machine that will build the binaries
-# If CTARGET != CHOST, it means you want a libc for cross-compiling.
-# If CHOST != CBUILD, it means you want to cross-compile the libc.
-#  CBUILD = CHOST = CTARGET    - native build/install
-#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
-#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
-#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
-# For install paths:
-#  CHOST = CTARGET  - install into /
-#  CHOST != CTARGET - install into /usr/CTARGET/
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER/2.6.16/2.6.20}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-# Why SLOT 2.2 you ask yourself while sippin your tea ?
-# Everyone knows 2.2 > 0, duh.
-SLOT="2.2"
-
-# General: We need a new-enough binutils/gcc to match upstream baseline.
-# arch: we need to make sure our binutils/gcc supports TLS.
-DEPEND=">=app-misc/pax-utils-0.1.10
-	!<sys-apps/sandbox-1.6
-	!<sys-apps/portage-2.1.2
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="!sys-kernel/ps3-sources
-	selinux? ( sys-libs/libselinux )
-	!sys-libs/nss-db"
-
-if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND+=" !crosscompile_opts_headers-only? (
-		>=${CATEGORY}/binutils-2.20
-		>=${CATEGORY}/gcc-4.3
-	)"
-	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
-else
-	DEPEND+="
-		>=sys-devel/binutils-2.20
-		>=sys-devel/gcc-4.3
-		virtual/os-headers
-		!vanilla? ( >=sys-libs/timezone-data-2012c )"
-	RDEPEND+="
-		vanilla? ( !sys-libs/timezone-data )
-		!vanilla? ( sys-libs/timezone-data )"
-fi
-
-SRC_URI=$(
-	upstream_uris() {
-		echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
-	}
-	gentoo_uris() {
-		local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
-		devspace=${devspace//HTTP/http://dev.gentoo.org/}
-		echo mirror://gentoo/$1 ${devspace//URI/$1}
-	}
-
-	[[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz
-	[[ -n ${PATCH_VER}      ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2
-)
-
-# eblit-include [--skip] <function> [version]
-eblit-include() {
-	local skipable=false
-	[[ $1 == "--skip" ]] && skipable=true && shift
-	[[ $1 == pkg_* ]] && skipable=true
-
-	local e v func=$1 ver=$2
-	[[ -z ${func} ]] && die "Usage: eblit-include <function> [version]"
-	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
-		e="${FILESDIR}/eblits/${func}${v}.eblit"
-		if [[ -e ${e} ]] ; then
-			source "${e}"
-			return 0
-		fi
-	done
-	${skipable} && return 0
-	die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/"
-}
-
-# eblit-run-maybe <function>
-# run the specified function if it is defined
-eblit-run-maybe() {
-	[[ $(type -t "$@") == "function" ]] && "$@"
-}
-
-# eblit-run <function> [version]
-# aka: src_unpack() { eblit-run src_unpack ; }
-eblit-run() {
-	eblit-include --skip common "${*:2}"
-	eblit-include "$@"
-	eblit-run-maybe eblit-$1-pre
-	eblit-${PN}-$1
-	eblit-run-maybe eblit-$1-post
-}
-
-src_unpack()  { eblit-run src_unpack  ; }
-src_compile() { eblit-run src_compile ; }
-src_test()    { eblit-run src_test    ; }
-src_install() { eblit-run src_install ; }
-
-# FILESDIR might not be available during binpkg install
-for x in setup {pre,post}inst ; do
-	e="${FILESDIR}/eblits/pkg_${x}.eblit"
-	if [[ -e ${e} ]] ; then
-		. "${e}"
-		eval "pkg_${x}() { eblit-run pkg_${x} ; }"
-	fi
-done
-
-eblit-src_unpack-pre() {
-	GLIBC_PATCH_EXCLUDE+=" 6600_mips_librt-mips.patch" #456912
-}
-
-eblit-src_unpack-post() {
-	if use hardened ; then
-		cd "${S}"
-		einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
-		gcc-specs-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch
-		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch
-		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch
-
-		einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
-		cp -f "${FILESDIR}"/2.6/glibc-2.6-gentoo-stack_chk_fail.c \
-			debug/stack_chk_fail.c || die
-		cp -f "${FILESDIR}"/2.10/glibc-2.10-gentoo-chk_fail.c \
-			debug/chk_fail.c || die
-
-		if use debug ; then
-			# When using Hardened Gentoo stack handler, have smashes dump core for
-			# analysis - debug only, as core could be an information leak
-			# (paranoia).
-			sed -i \
-				-e '/^CFLAGS-backtrace.c/ iCFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				debug/Makefile \
-				|| die "Failed to modify debug/Makefile for debug stack handler"
-			sed -i \
-				-e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				debug/Makefile \
-				|| die "Failed to modify debug/Makefile for debug fortify handler"
-		fi
-
-		# Build nscd with ssp-all
-		sed -i \
-			-e 's:-fstack-protector$:-fstack-protector-all:' \
-			nscd/Makefile \
-			|| die "Failed to ensure nscd builds with ssp-all"
-	fi
-
-	# RHEL(likely CentOS and SL) 5.6 have kernels with vdso bug,
-	#     https://bugzilla.redhat.com/show_bug.cgi?id=673616
-	# we disable vdso loading in ELF handler, as suggest by Mike Frysinger
-	#     http://article.gmane.org/gmane.comp.lib.glibc.user/1904
-	# Benda Xu <heroxbd@g.o> (3 Jul, 2013)
-	elog "Your kernel is known to have vdso bug, disabling this feature"
-	epatch "${FILESDIR}"/2.17/vdso-disable.patch
-
-	epatch "${FILESDIR}"/2.17/locale-gen_prefix.patch
-	eprefixify "${WORKDIR}"/extra/locale/locale-gen
-
-	cd "${S}"
-	epatch "${FILESDIR}"/2.17/glibc-2.17-runtime-prefix.patch
-	eprefixify glibc-compat/nss_{compat/compat-{grp,{,s}pwd},files/files-netgrp}.c \
-		nis/nss_compat/compat-{grp,initgroups,{,s}pwd}.c \
-		nss/{db-Makefile,{bug-erange,nss_files/files-init{,groups}}.c} \
-		resolv/{netdb,resolv}.h sysdeps/{{generic,unix/sysv/linux}/paths.h,posix/system.c} \
-		libio/iopopen.c
-	epatch "${FILESDIR}"/${PV}/${P}-shadow-prefix.patch
-}
-
-eblit-pkg_preinst-post() {
-	if [[ ${CTARGET} == arm* ]] ; then
-		# Backwards compat support for renaming hardfp ldsos #417287
-		local oldso='/lib/ld-linux.so.3'
-		local nldso='/lib/ld-linux-armhf.so.3'
-		if [[ -e ${D}${nldso} ]] ; then
-			if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then
-				ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})."
-				ewarn "Please rebuild all packages using this old ldso as compat"
-				ewarn "support will be dropped in the future."
-				ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}"
-			fi
-		fi
-	fi
-}

diff --git a/sys-libs/glibc/glibc-2.19-r1.ebuild b/sys-libs/glibc/glibc-2.19-r1.ebuild
deleted file mode 100644
index 8758b70..0000000
--- a/sys-libs/glibc/glibc-2.19-r1.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.19-r1.ebuild,v 1.11 2014/10/26 08:05:50 vapier Exp $
-
-inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing prefix
-
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
-
-LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-RESTRICT="strip" # strip ourself #46186
-EMULTILIB_PKG="true"
-
-# Configuration variables
-RELEASE_VER=""
-case ${PV} in
-9999*)
-	EGIT_REPO_URIS="git://sourceware.org/git/glibc.git"
-	EGIT_SOURCEDIRS="${S}"
-	inherit git-2
-	;;
-*)
-	RELEASE_VER=${PV}
-	;;
-esac
-GCC_BOOTSTRAP_VER="4.7.3-r1"
-PATCH_VER="3"                                  # Gentoo patchset
-NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"}       # min kernel version nptl requires
-
-IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only rap"
-
-# Here's how the cross-compile logic breaks down ...
-#  CTARGET - machine that will target the binaries
-#  CHOST   - machine that will host the binaries
-#  CBUILD  - machine that will build the binaries
-# If CTARGET != CHOST, it means you want a libc for cross-compiling.
-# If CHOST != CBUILD, it means you want to cross-compile the libc.
-#  CBUILD = CHOST = CTARGET    - native build/install
-#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
-#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
-#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
-# For install paths:
-#  CHOST = CTARGET  - install into /
-#  CHOST != CTARGET - install into /usr/CTARGET/
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER/2.6.16/2.6.20}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-# Why SLOT 2.2 you ask yourself while sippin your tea ?
-# Everyone knows 2.2 > 0, duh.
-SLOT="2.2"
-
-# General: We need a new-enough binutils/gcc to match upstream baseline.
-# arch: we need to make sure our binutils/gcc supports TLS.
-DEPEND=">=app-misc/pax-utils-0.1.10
-	!<sys-apps/sandbox-1.6
-	!<sys-apps/portage-2.1.2
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="!sys-kernel/ps3-sources
-	selinux? ( sys-libs/libselinux )
-	!sys-libs/nss-db"
-
-if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND+=" !crosscompile_opts_headers-only? (
-		>=${CATEGORY}/binutils-2.20
-		>=${CATEGORY}/gcc-4.3
-	)"
-	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
-else
-	DEPEND+="
-		>=sys-devel/binutils-2.20
-		>=sys-devel/gcc-4.3
-		virtual/os-headers
-		!vanilla? ( >=sys-libs/timezone-data-2012c )"
-	RDEPEND+="
-		vanilla? ( !sys-libs/timezone-data )
-		!vanilla? ( sys-libs/timezone-data )"
-fi
-
-upstream_uris() {
-	echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
-}
-gentoo_uris() {
-	local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
-	devspace=${devspace//HTTP/http://dev.gentoo.org/}
-	echo mirror://gentoo/$1 ${devspace//URI/$1}
-}
-SRC_URI=$(
-	[[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz
-	[[ -n ${PATCH_VER}      ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2
-)
-SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}"
-
-# eblit-include [--skip] <function> [version]
-eblit-include() {
-	local skipable=false
-	[[ $1 == "--skip" ]] && skipable=true && shift
-	[[ $1 == pkg_* ]] && skipable=true
-
-	local e v func=$1 ver=$2
-	[[ -z ${func} ]] && die "Usage: eblit-include <function> [version]"
-	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
-		e="${FILESDIR}/eblits/${func}${v}.eblit"
-		if [[ -e ${e} ]] ; then
-			source "${e}"
-			return 0
-		fi
-	done
-	${skipable} && return 0
-	die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/"
-}
-
-# eblit-run-maybe <function>
-# run the specified function if it is defined
-eblit-run-maybe() {
-	[[ $(type -t "$@") == "function" ]] && "$@"
-}
-
-# eblit-run <function> [version]
-# aka: src_unpack() { eblit-run src_unpack ; }
-eblit-run() {
-	eblit-include --skip common "${*:2}"
-	eblit-include "$@"
-	eblit-run-maybe eblit-$1-pre
-	eblit-${PN}-$1
-	eblit-run-maybe eblit-$1-post
-}
-
-src_unpack()  { eblit-run src_unpack  ; }
-src_compile() { eblit-run src_compile ; }
-src_test()    { eblit-run src_test    ; }
-src_install() { eblit-run src_install ; }
-
-# FILESDIR might not be available during binpkg install
-for x in setup {pre,post}inst ; do
-	e="${FILESDIR}/eblits/pkg_${x}.eblit"
-	if [[ -e ${e} ]] ; then
-		. "${e}"
-		eval "pkg_${x}() { eblit-run pkg_${x} ; }"
-	fi
-done
-
-eblit-src_unpack-pre() {
-	[[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2
-}
-
-eblit-src_unpack-post() {
-	eprefixify extra/locale/locale-gen
-
-	cd "${S}"
-
-	if use hardened ; then
-		einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
-		gcc-specs-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch
-		epatch "${FILESDIR}"/2.19/glibc-2.19-hardened-configure-picdefault.patch
-		epatch "${FILESDIR}"/2.18/glibc-2.18-hardened-inittls-nosysenter.patch
-
-		einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
-		cp -f "${FILESDIR}"/2.18/glibc-2.18-gentoo-stack_chk_fail.c \
-			debug/stack_chk_fail.c || die
-		cp -f "${FILESDIR}"/2.18/glibc-2.18-gentoo-chk_fail.c \
-			debug/chk_fail.c || die
-
-		if use debug ; then
-			# When using Hardened Gentoo stack handler, have smashes dump core for
-			# analysis - debug only, as core could be an information leak
-			# (paranoia).
-			sed -i \
-				-e '/^CFLAGS-backtrace.c/ iCFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				debug/Makefile \
-				|| die "Failed to modify debug/Makefile for debug stack handler"
-			sed -i \
-				-e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				debug/Makefile \
-				|| die "Failed to modify debug/Makefile for debug fortify handler"
-		fi
-
-		# Build nscd with ssp-all
-		sed -i \
-			-e 's:-fstack-protector$:-fstack-protector-all:' \
-			nscd/Makefile \
-			|| die "Failed to ensure nscd builds with ssp-all"
-	fi
-
-	if use rap; then
-		if type -p lsb_release > lsb-loc; then
-			local lsb_id=$(lsb_release -i)
-			local lsb_rel=$(lsb_release -r)
-		fi
-
-		if [[ ${lsb_id} == *CentOS ]] || [[ ${lsb_id} == *RedHat* ]]; then
-			if [[ ${lsb_rel} == *5.6 ]]; then
-				elog "Your kernel is known to have vdso bug, disabling this feature"
-				elog "https://bugzilla.redhat.com/show_bug.cgi?id=678613"
-				epatch "${FILESDIR}"/${PV}/${P}-vdso-disable.patch
-			fi
-		fi
-	fi
-}
-
-eblit-pkg_preinst-post() {
-	if [[ ${CTARGET} == arm* ]] ; then
-		# Backwards compat support for renaming hardfp ldsos #417287
-		local oldso='/lib/ld-linux.so.3'
-		local nldso='/lib/ld-linux-armhf.so.3'
-		if [[ -e ${D}${nldso} ]] ; then
-			if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then
-				ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})."
-				ewarn "Please rebuild all packages using this old ldso as compat"
-				ewarn "support will be dropped in the future."
-				ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}"
-			fi
-		fi
-	fi
-}

diff --git a/sys-libs/glibc/metadata.xml b/sys-libs/glibc/metadata.xml
deleted file mode 100644
index f1f3fd9..0000000
--- a/sys-libs/glibc/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>toolchain</herd>
-<use>
- <flag name='gd'>build memusage and memusagestat tools</flag>
- <flag name='nscd'>Build, and enable support for, the Name Service Cache Daemon</flag>
- <flag name='suid'>Make internal pt_chown helper setuid -- not needed if using Linux and have /dev/pts mounted with gid=5</flag>
- <flag name='systemtap'>enable systemtap static probe points</flag>
-</use>
-</pkgmetadata>