Merge pull request #458 from glevand/for-merge-bumps

bump packages for arm64
2025-08-18 10:27:00 +02:00 · 2016-07-08 11:53:19 -07:00 · 2016-07-08 11:53:19 -07:00 · 88b2f49aa2
commit 88b2f49aa2
parent 6b5d735ed2 753a290099
507 changed files with 28000 additions and 22185 deletions
--- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/ChangeLog
+++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/ChangeLog
@ -1,672 +1,260 @@
 # ChangeLog for app-crypt/pinentry
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.173 2015/05/14 15:18:15 k_f Exp $
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# (auto-generated from git log)

-  14 May 2015; Kristian Fiskerstrand <k_f@gentoo.org> -pinentry-0.9.0-r1.ebuild,
-  -pinentry-0.9.0-r2.ebuild:
-  Cleanup old
+*pinentry-0.9.5 (09 Aug 2015)
+*pinentry-0.9.0-r3 (09 Aug 2015)
+*pinentry-0.9.0 (09 Aug 2015)

-*pinentry-0.9.2-r1 (14 May 2015)
+  09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org>
+  +files/pinentry-0.8.2-ncurses.patch, +files/pinentry-0.8.2-texi.patch,
+  +files/pinentry-0.9.0-accessibility.patch,
+  +files/pinentry-0.9.4-actually_respect_users_pm.patch,
+  +files/pinentry-0.9.5-build.patch, +metadata.xml, +pinentry-0.9.0.ebuild,
+  +pinentry-0.9.0-r3.ebuild, +pinentry-0.9.5.ebuild:
+  proj/gentoo: Initial commit

-  14 May 2015; Kristian Fiskerstrand <k_f@gentoo.org> +pinentry-0.9.2-r1.ebuild,
-  -pinentry-0.9.2.ebuild:
-  Enable the GNOME3 pinentry if gnome-keyring USE flag is set
+  This commit represents a new era for Gentoo:
+  Storing the gentoo-x86 tree in Git, as converted from CVS.

-*pinentry-0.9.2 (13 May 2015)
+  This commit is the start of the NEW history.
+  Any historical data is intended to be grafted onto this point.

-  13 May 2015; Kristian Fiskerstrand <k_f@gentoo.org>
-  +files/pinentry-0.9.2-cmd_confirm.patch, +files/pinentry-0.9.2-gnome3.patch,
-  +files/pinentry-0.9.2-handlers-return.patch,
-  +files/pinentry-0.9.2-linking-order.patch,
-  +files/pinentry-0.9.2-management.patch, +files/pinentry-0.9.2-memory.patch,
-  +files/pinentry-0.9.2-simplify.patch, +pinentry-0.9.2.ebuild:
-  new upstream version 0.9.2 with fixes
+  Creation process:
+  1. Take final CVS checkout snapshot
+  2. Remove ALL ChangeLog* files
+  3. Transform all Manifests to thin
+  4. Remove empty Manifests
+  5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
+  5.1. Do not touch files with -kb/-ko keyword flags.

-  05 May 2015; Alon Bar-Lev <alonbl@gentoo.org> pinentry-0.9.1.ebuild:
-  Remove aix hack as upstream addressed the issue
+  Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+  X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration
+  tests
+  X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this
+  project
+  X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo
+  developer, wrote Git features for the migration
+  X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve
+  cvs2svn
+  X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
+  X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014
+  work in migration
+  X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
+  X-Thanks: All of other Gentoo developers - many ideas and lots of paint on
+  the bikeshed

-*pinentry-0.9.1 (03 May 2015)
+  16 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml,
+  pinentry-0.9.0.ebuild, pinentry-0.9.0-r3.ebuild, pinentry-0.9.5.ebuild:
+  Use slot operators for ncurses

-  03 May 2015; Alon Bar-Lev <alonbl@gentoo.org>
-  +files/pinentry-0.9.1-memleak.patch, +pinentry-0.9.1.ebuild:
-  Version bump, bug#548456
+  Package-Manager: portage-2.2.20.1
+  Signed-off-by: Justin Lecher <jlec@gentoo.org>

-  30 Apr 2015; Alon Bar-Lev <alonbl@gentoo.org> pinentry-0.9.0-r3.ebuild:
-  Fix gcc-5 qt issue, bug#547528, thanks to Mark Wright
+  16 Aug 2015; Kristian Fiskerstrand <k_f@gentoo.org>
+  -files/pinentry-0.9.4-actually_respect_users_pm.patch:
+  Remove unused patch file

-  31 Mar 2015; Ulrich Müller <ulm@gentoo.org> pinentry-0.9.0.ebuild,
-  pinentry-0.9.0-r1.ebuild, pinentry-0.9.0-r2.ebuild, pinentry-0.9.0-r3.ebuild:
-  Update dependency after package move of eselect modules to app-eselect.
+  pinentry-0.9.4-actually_respect_users_pm.patch is no longer used
+  since the bump to 0.9.5. Cleaning up.

-*pinentry-0.9.0-r3 (22 Mar 2015)
+  Package-Manager: portage-2.2.20.1

-  22 Mar 2015; Kristian Fiskerstrand <k_f@gentoo.org> +pinentry-0.9.0-r3.ebuild:
-  Use qt4_get_bindir from qmake-utils instead of hardcoding moc path. Fixes
-  #544110
+  24 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Use https by default

-*pinentry-0.9.0-r2 (01 Mar 2015)
+  Convert all URLs for sites supporting encrypted connections from http to
+  https

-  01 Mar 2015; Kristian Fiskerstrand <k_f@gentoo.org>
-  +files/pinentry-0.9.0-accessibility.patch, +pinentry-0.9.0-r2.ebuild:
-  Fix for bug #541400
+  Signed-off-by: Justin Lecher <jlec@gentoo.org>

-  28 Feb 2015; Alon Bar-Lev <alonbl@gentoo.org> -pinentry-0.8.2.ebuild,
-  -pinentry-0.8.3.ebuild, -pinentry-0.8.4.ebuild:
-  Cleanup
+  24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml:
+  Revert DOCTYPE SYSTEM https changes in metadata.xml

-  28 Feb 2015; Agostino Sarubbo <ago@gentoo.org> pinentry-0.9.0.ebuild:
-  Stable for ia64, wrt bug #540002
+  repoman does not yet accept the https version.
+  This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450.

-  27 Feb 2015; Agostino Sarubbo <ago@gentoo.org> pinentry-0.9.0.ebuild:
-  Stable for sparc, wrt bug #540002
+  Bug: https://bugs.gentoo.org/552720

-  26 Feb 2015; Markus Meier <maekke@gentoo.org> pinentry-0.9.0.ebuild:
-  arm stable, bug #540002
+  26 Aug 2015; Mike Frysinger <vapier@gentoo.org> pinentry-0.9.0.ebuild,
+  pinentry-0.9.0-r3.ebuild, pinentry-0.9.5.ebuild:
+  sys-libs/ncurses: move to SLOT=0 #557472

-  25 Feb 2015; Agostino Sarubbo <ago@gentoo.org> pinentry-0.9.0.ebuild:
-  Stable for x86, wrt bug #540002
+  Use SLOT=0 for installing of main development files like other packages
+  so we can use other SLOTs for installing SONAME libs for binary packages.

-  24 Feb 2015; Agostino Sarubbo <ago@gentoo.org> pinentry-0.9.0.ebuild:
-  Stable for alpha, wrt bug #540002
+  05 Sep 2015; Mikle Kolyada <zlogene@gentoo.org> pinentry-0.9.5.ebuild:
+  amd64 stable wrt bug #552614

-  23 Feb 2015; Agostino Sarubbo <ago@gentoo.org> pinentry-0.9.0.ebuild:
-  Stable for ppc64, wrt bug #540002
+  Package-Manager: portage-2.2.20.1

-  21 Feb 2015; Agostino Sarubbo <ago@gentoo.org> pinentry-0.9.0.ebuild:
-  Stable for ppc, wrt bug #540002
+  08 Sep 2015; Jeroen Roovers <jer@gentoo.org> pinentry-0.9.5.ebuild:
+  Stable for HPPA PPC64 (bug #552614).

-  19 Feb 2015; Agostino Sarubbo <ago@gentoo.org> pinentry-0.9.0.ebuild:
-  Stable for amd64, wrt bug #540002
+  Package-Manager: portage-2.2.20.1

-*pinentry-0.9.0-r1 (17 Feb 2015)
+  12 Sep 2015; Agostino Sarubbo <ago@gentoo.org> pinentry-0.9.5.ebuild:
+  x86 stable wrt bug #552614

-  17 Feb 2015; Alon Bar-Lev <alonbl@gentoo.org> +pinentry-0.9.0-r1.ebuild,
-  metadata.xml:
-  Add support to clipboard in qt, bug#540348, thanks to Ezio
+  Package-Manager: portage-2.2.20.1
+  RepoMan-Options: --include-arches="x86"

-  14 Feb 2015; Jeroen Roovers <jer@gentoo.org> pinentry-0.9.0.ebuild:
-  Stable for HPPA (bug #540002).
+*pinentry-0.9.6 (14 Sep 2015)

-*pinentry-0.9.0 (19 Nov 2014)
+  14 Sep 2015; Kristian Fiskerstrand <k_f@gentoo.org> +pinentry-0.9.6.ebuild:
+  Version bump to 0.9.6

-  19 Nov 2014; Kristian Fiskerstrand <k_f@gentoo.org> +pinentry-0.9.0.ebuild:
-  Bump pinentry to 0.9.0
+  Package-Manager: portage-2.2.20.1

-*pinentry-0.8.4 (08 Oct 2014)
+  14 Sep 2015; Kristian Fiskerstrand <k_f@gentoo.org> pinentry-0.9.6.ebuild:
+  Fix version bump to 0.9.6

-  08 Oct 2014; Alon Bar-Lev <alonbl@gentoo.org> +pinentry-0.8.4.ebuild:
-  Version bump, bug#524742
+  Package-Manager: portage-2.2.20.1

-  03 Apr 2014; Michael Haubenwallner <haubi@gentoo.org> pinentry-0.8.3.ebuild:
-  Add ~ppc-aix keyword.
+  16 Sep 2015; Tobias Klausmann <klausman@gentoo.org> pinentry-0.9.5.ebuild:
+  add alpha keyword

-  20 Jan 2014; Mike Frysinger <vapier@gentoo.org> pinentry-0.8.2.ebuild,
-  pinentry-0.8.3.ebuild:
-  Add arm64 love.
+  Gentoo-Bug: 552614

-  27 Dec 2013; Alon Bar-Lev <alonbl@gentoo.org> pinentry-0.8.3.ebuild:
-  Fix aix build, bug#493384, thanks to Michael Haubenwallner
+  Package-Manager: portage-2.2.20.1

-  06 Nov 2013; Alon Bar-Lev <alonbl@gentoo.org> pinentry-0.8.2.ebuild,
-  pinentry-0.8.3.ebuild:
-  add gettext build dependency as we are autoreconfing, bug#490522, thanks to
-  yegle
+*pinentry-0.9.6-r1 (18 Sep 2015)

-*pinentry-0.8.3 (07 Oct 2013)
+  18 Sep 2015; Kristian Fiskerstrand <k_f@gentoo.org>
+  +files/pinentry-0.9.6-Disable-Qt5-support-to-force-Qt4.patch,
+  +pinentry-0.9.6-r1.ebuild:
+  Fix Qt4 support

-  07 Oct 2013; Tim Harder <radhermit@gentoo.org> +pinentry-0.8.3.ebuild:
-  Version bump (bug #487188).
+  Pinentry 0.9.6 introduced automatic detection of Qt version and added
+  support
+  for Qt5 using automagic. This revbump removes Qt5 support and explicitly
+  require Qt4 as in previous versions until this can be set using USE flag
+  to get proper dependencies.

-  15 Jun 2013; Alon Bar-Lev <alonbl@gentoo.org>
-  +files/pinentry-0.8.2-texi.patch, pinentry-0.8.2.ebuild:
-  fix texi issue with recent compiler, bug#472700, thanks to Bryan Baldwin
+  Additionally upstream renamed the pinentry-qt4 binary to pinentry-qt, so a
+  symlink is generated to ensure backwards compatibility.

-  02 Jun 2013; Alon Bar-Lev <alonbl@gentoo.org> -pinentry-0.8.1.ebuild:
-  cleanup old ebuild
+  Package-Manager: portage-2.2.20.1

-  05 May 2013; Alon Bar-Lev <alonbl@gentoo.org>
-  +files/pinentry-0.8.2-ncurses.patch, pinentry-0.8.2.ebuild:
-  support sys-libs/ncurses[tinfo], per bug#468430
+*pinentry-0.9.6-r2 (21 Sep 2015)

-  02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> pinentry-0.8.1.ebuild,
-  pinentry-0.8.2.ebuild:
-  Move Qt dependencies to the new category
+  21 Sep 2015; Kristian Fiskerstrand <k_f@gentoo.org>
+  +files/pinentry-0.9.6-Remove-detection-of-Qt5.patch,
+  +pinentry-0.9.6-r2.ebuild:
+  Completely remove Qt5 detection

-  20 Feb 2013; Zac Medico <zmedico@gentoo.org> pinentry-0.8.2.ebuild:
-  Add ~arm-linux keyword.
+  Revision bump that removes more of the Qt5 automagic that resulted in
+  failed builds in 0.9.6-r1

-  16 Dec 2012; Raúl Porcel <armin76@gentoo.org> pinentry-0.8.2.ebuild:
-  alpha/ia64/s390/sh/sparc stable wrt #443522
+  Bug: 560786

-  28 Nov 2012; Tim Harder <radhermit@gentoo.org> metadata.xml:
-  Add to crypto herd.
+  Package-Manager: portage-2.2.20.1

-  25 Nov 2012; Sven Wegener <swegener@gentoo.org> metadata.xml:
-  Move to maintainer-needed.
+  21 Sep 2015; Kristian Fiskerstrand <k_f@gentoo.org>
+  -files/pinentry-0.9.6-Disable-Qt5-support-to-force-Qt4.patch,
+  -pinentry-0.9.6-r1.ebuild:
+  Remove flawed revision 0.9.6-r1

-  22 Nov 2012; Agostino Sarubbo <ago@gentoo.org> pinentry-0.8.2.ebuild:
-  Stable for x86, tested by Vincent Olivert Riera <peratu@carrosses.com>, wrt
-  bug #443522
+  Package-Manager: portage-2.2.20.1

-  20 Nov 2012; Anthony G. Basile <blueness@gentoo.org> pinentry-0.8.2.ebuild:
-  stable arm, bug #443522
+*pinentry-0.9.6-r3 (21 Sep 2015)

-  19 Nov 2012; Jeroen Roovers <jer@gentoo.org> pinentry-0.8.2.ebuild:
-  Stable for HPPA (bug #443522).
+  21 Sep 2015; Kristian Fiskerstrand <k_f@gentoo.org>
+  +pinentry-0.9.6-r3.ebuild:
+  Add explicit dep for app-crypt/gcr

-  17 Nov 2012; Anthony G. Basile <blueness@gentoo.org> pinentry-0.8.2.ebuild:
-  stable ppc64, bug #443522
+  When gnome-keyring USE is selected

-  17 Nov 2012; Agostino Sarubbo <ago@gentoo.org> pinentry-0.8.2.ebuild:
-  Stable for ppc, tested by Vicente Olivert Riera <peratu@carrosses.com>, wrt
-  bug #443522
+  Bug: 560322

-  16 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> pinentry-0.8.2.ebuild:
-  Better fix the static issue with ncurses, thanks to Diego.
+  Package-Manager: portage-2.2.20.1

-  16 Nov 2012; Agostino Sarubbo <ago@gentoo.org> pinentry-0.8.2.ebuild:
-  Stable for amd64, wrt bug #443522
+*pinentry-0.9.6-r4 (24 Sep 2015)

-  16 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> pinentry-0.8.2.ebuild:
-  Do not call ar directly, fixes bug#443526.
+  24 Sep 2015; Kristian Fiskerstrand <k_f@gentoo.org>
+  +pinentry-0.9.6-r4.ebuild:
+  Restructure dependencies in 0.9.6-r4

-  16 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> pinentry-0.8.2.ebuild:
-  Try to fix building with static useflag enabled
+  Package-Manager: portage-2.2.20.1

-  16 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> pinentry-0.8.2.ebuild:
-  Bump eapi in the ebuild and solve the log message print. Wrt bug#440540.
+  27 Sep 2015; Markus Meier <maekke@gentoo.org> pinentry-0.9.5.ebuild:
+  arm stable, bug #552614

-  29 Oct 2012; Tomáš Chvátal <scarabeus@gentoo.org>
-  -files/pinentry-0.7.5-grab.patch, -files/pinentry-0.8.0-qt-fix.patch,
-  -pinentry-0.8.0-r1.ebuild, -pinentry-0.8.0.ebuild:
-  Drop older.
+  Package-Manager: portage-2.2.20.1
+  RepoMan-Options: --include-arches="arm"

-  09 Sep 2012; Raúl Porcel <armin76@gentoo.org> pinentry-0.8.1.ebuild:
-  alpha/ia64/s390/sh/sparc stable wrt #421593
+*pinentry-0.9.6-r5 (29 Sep 2015)

-  03 Sep 2012; Michael Palimaka <kensington@gentoo.org>
-  pinentry-0.8.0-r1.ebuild, pinentry-0.8.0.ebuild, pinentry-0.8.1.ebuild,
-  pinentry-0.8.2.ebuild:
-  Add missing slot dependencies on Qt.
+  29 Sep 2015; Kristian Fiskerstrand <k_f@gentoo.org>
+  +files/pinentry-0.9.6-add-disable-pinentry-qt5-option.patch,
+  +pinentry-0.9.6-r5.ebuild:
+  0.9.6-r5: Add Qt5 support

-  17 Aug 2012; Anthony G. Basile <blueness@gentoo.org> pinentry-0.8.1.ebuild:
-  Stable ppc ppc64, bug #421593
+  Package-Manager: portage-2.2.20.1

-*pinentry-0.8.2 (14 Aug 2012)
+  29 Sep 2015; Kristian Fiskerstrand <k_f@gentoo.org> -pinentry-0.9.6.ebuild,
+  -pinentry-0.9.6-r2.ebuild, -pinentry-0.9.6-r3.ebuild:
+  Remove some older 0.9.6 revisions

-  14 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> +pinentry-0.8.2.ebuild:
-  Version bump, I was testing if it had fixed the issue from bug#400751 but it
-  did not. Commiting as it works perfect otherwise.
+  Package-Manager: portage-2.2.20.1

-  03 Jul 2012; Jeroen Roovers <jer@gentoo.org> pinentry-0.8.1.ebuild:
-  Stable for HPPA (bug #421593).
+  10 Oct 2015; Mikle Kolyada <zlogene@gentoo.org> pinentry-0.9.5.ebuild:
+  sparc stable wrt bug #552614

-  25 Jun 2012; Markus Meier <maekke@gentoo.org> pinentry-0.8.1.ebuild:
-  arm stable, bug #421593
+  Package-Manager: portage-2.2.20.1

-  19 Jun 2012; Agostino Sarubbo <ago@gentoo.org> pinentry-0.8.1.ebuild:
-  Stable for amd64, wrt bug #421593
+*pinentry-0.9.6-r6 (26 Oct 2015)

-  17 Jun 2012; Jeff Horelick <jdhore@gentoo.org> pinentry-0.8.1.ebuild:
-  marked x86 per bug 421593
+  26 Oct 2015; Kristian Fiskerstrand <k_f@gentoo.org>
+  +pinentry-0.9.6-r6.ebuild:
+  Enable qt5 as possible single backend and fix symlink

-  09 May 2012; Alexis Ballier <aballier@gentoo.org> pinentry-0.8.1.ebuild:
-  keyword ~amd64-fbsd
+  Enable qt5 as the only single backend and fix issue where pinentry-qt4
+  symlink
+  was created unconditionally

-  03 May 2012; Jeff Horelick <jdhore@gentoo.org> pinentry-0.8.0.ebuild,
-  pinentry-0.8.0-r1.ebuild, pinentry-0.8.1.ebuild:
-  dev-util/pkgconfig -> virtual/pkgconfig
+  Bug: 564000
+  Bug: 563520

-  18 Feb 2012; Fabian Groffen <grobian@gentoo.org> pinentry-0.8.1.ebuild:
-  Remove existing file in Prefix
+  Package-Manager: portage-2.2.20.1

-  26 Aug 2011; Fabian Groffen <grobian@gentoo.org> pinentry-0.8.1.ebuild:
-  Explicitly disable X11, such that Darwin users don't have hanging pinentry
-  clients due to pinentry looking into the void for an X11 server.
+  10 Nov 2015; Agostino Sarubbo <ago@gentoo.org> pinentry-0.9.5.ebuild:
+  ppc stable wrt bug #552614

-  25 Mar 2011; Sven Wegener <swegener@gentoo.org> pinentry-0.8.0.ebuild,
-  pinentry-0.8.0-r1.ebuild, pinentry-0.8.1.ebuild:
-  Add dev-util/pkgconfig to DEPEND, bug #360411.
+  Package-Manager: portage-2.2.20.1
+  RepoMan-Options: --include-arches="ppc"

-*pinentry-0.8.1 (15 Jan 2011)
+  10 Nov 2015; Agostino Sarubbo <ago@gentoo.org> pinentry-0.9.5.ebuild:
+  ia64 stable wrt bug #552614

-  15 Jan 2011; Sven Wegener <swegener@gentoo.org> +pinentry-0.8.1.ebuild:
-  Version bump, bug #351115.
+  Package-Manager: portage-2.2.20.1
+  RepoMan-Options: --include-arches="ia64"

-  30 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
-  pinentry-0.8.0-r1.ebuild:
-  Use eselect-pinentry.
+*pinentry-0.9.7 (15 Dec 2015)

-*pinentry-0.8.0-r1 (25 Sep 2010)
+  15 Dec 2015; Kristian Fiskerstrand <k_f@gentoo.org> +pinentry-0.9.7.ebuild:
+  Version bump to 0.9.7

-  25 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
-  +pinentry-0.8.0-r1.ebuild:
-  Revision bump wrt #328189 by Federico Zenith. Fix USE static deps wrt
-  #331739 by "wd".
+  Package-Manager: portage-2.2.20.1

-  05 Sep 2010; Raúl Porcel <armin76@gentoo.org> pinentry-0.8.0.ebuild:
-  ia64/s390/sh/sparc stable wrt #299388
+  15 Dec 2015; Kristian Fiskerstrand <k_f@gentoo.org>
+  -pinentry-0.9.6-r4.ebuild, -pinentry-0.9.6-r5.ebuild:
+  Cleanup some older versions

-  23 Aug 2010; Jeroen Roovers <jer@gentoo.org> pinentry-0.8.0.ebuild:
-  Stable for HPPA (bug #299388).
+  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
+  Replace all herds with appropriate projects (GLEP 67)

-  19 Jul 2010; Markus Meier <maekke@gentoo.org> pinentry-0.8.0.ebuild:
-  arm stable, bug #299388
+  Replace all uses of herd with appropriate project maintainers, or no
+  maintainers in case of herds requested to be disbanded.

-  19 Jul 2010; Joseph Jezak <josejx@gentoo.org> pinentry-0.8.0.ebuild:
-  Marked ppc stable for bug #299388.
+  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
+  Set appropriate maintainer types in metadata.xml (GLEP 67)

-  18 Jul 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  pinentry-0.8.0.ebuild, +files/pinentry-0.8.0-qt-fix.patch:
-  Non-maintainer commit - this has been affecting me for a long time and
-  it's quite upsetting.
-  Added upstream patch to ensure pinentry is displayed in the foreground
-  with qt - https://bugs.g10code.com/gnupg/issue1162
-  Thanks to rubik's cube <daniel.hornung@gmx.de> - fixes bug 328189.
+  07 Jul 2016; Patrice Clement <monsieurp@gentoo.org>
+  -files/pinentry-0.9.6-Remove-detection-of-Qt5.patch:
+  remove unused patch

-  11 Jul 2010; Tobias Klausmann <klausman@gentoo.org> pinentry-0.8.0.ebuild:
-  Stable on alpha, bug #299388
+  Closes: https://github.com/gentoo/gentoo/pull/1826

-  04 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> pinentry-0.8.0.ebuild:
-  ppc64 stable wrt #299388
+  Signed-off-by: Patrice Clement <monsieurp@gentoo.org>

-  27 Jun 2010; Christian Faulhammer <fauli@gentoo.org>
-  pinentry-0.8.0.ebuild:
-  add ~x86-freebsd
-
-  24 Jun 2010; Christoph Mende <angelos@gentoo.org> pinentry-0.8.0.ebuild:
-  Stable on amd64 wrt bug #299388
-
-  20 Jun 2010; Christian Faulhammer <fauli@gentoo.org>
-  pinentry-0.8.0.ebuild:
-  fix HOMEPAGE
-
-  20 Jun 2010; Christian Faulhammer <fauli@gentoo.org>
-  pinentry-0.8.0.ebuild:
-  stable x86, bug 299388
-
-  30 May 2010; Fabian Groffen <grobian@gentoo.org> pinentry-0.8.0.ebuild:
-  Marked ~sparc-solaris, ~sparc64-solaris
-
-*pinentry-0.8.0 (26 Apr 2010)
-
-  26 Apr 2010; Christian Faulhammer <fauli@gentoo.org>
-  +pinentry-0.8.0.ebuild:
-  version bump for bug 308695
-
-  01 Apr 2010; Jonathan Callen <abcd@gentoo.org> pinentry-0.7.6.ebuild:
-  Bump to EAPI=3, add prefix keywords
-
-  02 Jan 2010; Ben de Groot <yngwin@gentoo.org> pinentry-0.7.5.ebuild,
-  pinentry-0.7.5-r1.ebuild, pinentry-0.7.6.ebuild:
-  Drop qt3 support
-
-  15 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-  pinentry-0.7.6.ebuild:
-  Disable support for Qt-4 when "static" USE flag is enabled (bug #277963).
-
-  04 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-  pinentry-0.7.6.ebuild, -files/pinentry-0.7.6-qt4-moc-fix.diff:
-  Properly regenerate .moc files.
-
-*pinentry-0.7.6 (04 Jul 2009)
-
-  04 Jul 2009; Sven Wegener <swegener@gentoo.org> +pinentry-0.7.6.ebuild,
-  +files/pinentry-0.7.6-qt4-moc-fix.diff:
-  Version bump, bug #274999 by Lars Wendler.
-
-  02 May 2009; Sven Wegener <swegener@gentoo.org> pinentry-0.7.5.ebuild,
-  pinentry-0.7.5-r1.ebuild:
-  Migrate gtk to slot dependency, bug #268218.
-
-*pinentry-0.7.5-r1 (22 Jan 2009)
-
-  22 Jan 2009; Sven Wegener <swegener@gentoo.org> +pinentry-0.7.5-r1.ebuild:
-  Add support for the static USE flag, bug #247770.
-
-  06 Jan 2009; Sven Wegener <swegener@gentoo.org>
-  -files/pinentry-0.7.2-grab.patch, -files/0.7.2-info.patch,
-  -files/pinentry-0.7.4-grab.patch, -files/0.7.2-libcap.patch,
-  -pinentry-0.7.3.ebuild, -pinentry-0.7.4-r1.ebuild:
-  Cleanup.
-
-  27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> pinentry-0.7.3.ebuild,
-  pinentry-0.7.4-r1.ebuild, pinentry-0.7.5.ebuild:
-  QA: Get rid of deprecated qt_min_version().
-
-  18 Jun 2008; Jeroen Roovers <jer@gentoo.org> pinentry-0.7.5.ebuild:
-  Stable for HPPA (bug #217845).
-
-  12 May 2008; Markus Rothe <corsair@gentoo.org> pinentry-0.7.5.ebuild:
-  Stable on ppc64
-
-  03 May 2008; Richard Freeman <rich0@gentoo.org> pinentry-0.7.5.ebuild:
-  amd64 stable - 217845
-
-  17 Apr 2008; nixnut <nixnut@gentoo.org> pinentry-0.7.5.ebuild:
-  Stable on ppc wrt bug 217845
-
-  17 Apr 2008; Raúl Porcel <armin76@gentoo.org> pinentry-0.7.5.ebuild:
-  ia64/sparc/x86 stable wrt #217845
-
-  16 Apr 2008; Tobias Klausmann <klausman@gentoo.org> pinentry-0.7.5.ebuild:
-  Stable on alpha, bug #217845
-
-*pinentry-0.7.5 (23 Mar 2008)
-
-  23 Mar 2008; Sven Wegener <swegener@gentoo.org>
-  +files/pinentry-0.7.5-grab.patch, +files/pinentry-gmem.patch,
-  pinentry-0.7.3.ebuild, pinentry-0.7.4-r1.ebuild, +pinentry-0.7.5.ebuild:
-  Version bump, bug #213383. Drop bindnow-flags, bug #213669. Workaround for
-  API change in >=glib-2.16.1, bug #213382.
-
-  13 Feb 2008; Alon Bar-Lev <alonbl@gentoo.org> -pinentry-0.7.2-r3.ebuild:
-  Cleanup
-
-  21 Jan 2008; Jeroen Roovers <jer@gentoo.org> pinentry-0.7.4-r1.ebuild:
-  Stable for HPPA (bug #206664).
-
-  20 Jan 2008; Raúl Porcel <armin76@gentoo.org> pinentry-0.7.4-r1.ebuild:
-  alpha/ia64/sparc/x86 stable wrt #206664
-
-  20 Jan 2008; Christoph Mende <angelos@gentoo.org>
-  pinentry-0.7.4-r1.ebuild:
-  Stable on amd64 wrt bug #206664
-
-  20 Jan 2008; nixnut <nixnut@gentoo.org> pinentry-0.7.4-r1.ebuild:
-  Stable on ppc wrt bug 206664
-
-  20 Jan 2008; Brent Baude <ranger@gentoo.org> ChangeLog:
-  Marking pinentry-0.7.4-r1 ppc64 for bug 206664
-
-  20 Jan 2008; Brent Baude <ranger@gentoo.org> pinentry-0.7.4-r1.ebuild:
-  Marking pinentry-0.7.4-r1 ppc64 for bug 206664
-
-*pinentry-0.7.4-r1 (22 Dec 2007)
-
-  22 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org>
-  files/pinentry-0.7.4-grab.patch, -pinentry-0.7.4.ebuild,
-  +pinentry-0.7.4-r1.ebuild:
-  Fix grab (again), this time, remove the map-event completely, bug#201951
-
-  21 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org> pinentry-0.7.4.ebuild:
-  Readd flag-o-matic
-
-  20 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org>
-  +files/pinentry-0.7.4-grab.patch, pinentry-0.7.4.ebuild:
-  Readd grab patch, bug#165493
-
-  20 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org>
-  +files/pinentry-0.7.4-grab.patch, pinentry-0.7.4.ebuild:
-  Readd grab patch, bug#165493
-
-*pinentry-0.7.4 (20 Dec 2007)
-
-  20 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org> -pinentry-0.7.2-r4.ebuild,
-  +pinentry-0.7.4.ebuild:
-  Version bump
-
-  09 Oct 2007; Christoph Mende <angelos@gentoo.org> pinentry-0.7.3.ebuild:
-  Stable on amd64 wrt bug #194113
-
-  03 Oct 2007; Tom Gall <tgall@gentoo.org> pinentry-0.7.3.ebuild:
-  stable on ppc64
-
-  02 Oct 2007; Raúl Porcel <armin76@gentoo.org> pinentry-0.7.3.ebuild:
-  alpha/ia64 stable wrt #194113
-
-  30 Sep 2007; Markus Meier <maekke@gentoo.org> pinentry-0.7.3.ebuild:
-  x86 stable, bug #194113
-
-  29 Sep 2007; Lars Weiler <pylon@gentoo.org> pinentry-0.7.3.ebuild:
-  stable ppc, bug #194113
-
-  29 Sep 2007; Jeroen Roovers <jer@gentoo.org> pinentry-0.7.3.ebuild:
-  Stable for HPPA (bug #194113).
-
-  28 Sep 2007; Ferris McCormick <fmccor@gentoo.org> pinentry-0.7.3.ebuild:
-  Sparc stable --- Bug #194113 --- Acts like Manual Sec. 2 says.
-
-*pinentry-0.7.3 (06 Jul 2007)
-
-  06 Jul 2007; Alon Bar-Lev <alonbl@gentoo.org> +pinentry-0.7.3.ebuild:
-  Version bump
-
-*pinentry-0.7.2-r4 (15 Jun 2007)
-
-  15 Jun 2007; Alon Bar-Lev <alonbl@gentoo.org>
-  +files/pinentry-0.7.2-grab.patch, +pinentry-0.7.2-r4.ebuild:
-  Fix gtk2+ grab issue, bug#165493, thanks to Vincent Pit
-
-  24 Apr 2007; Sven Wegener <swegener@gentoo.org> -pinentry-0.7.2-r2.ebuild:
-  Cleanup.
-
-  12 Apr 2007; Christian Faulhammer <opfer@gentoo.org>
-  pinentry-0.7.2-r3.ebuild:
-  stable amd64, bug 167230
-
-  01 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
-  pinentry-0.7.2-r3.ebuild:
-  stable x86; bug 167230
-
-  24 Jan 2007; Marius Mauch <genone@gentoo.org> pinentry-0.7.2-r2.ebuild,
-  pinentry-0.7.2-r3.ebuild:
-  Replacing einfo with elog
-
-  09 Jan 2007; Sven Wegener <swegener@gentoo.org> pinentry-0.7.2-r3.ebuild:
-  Add WANT_AUTO* variables, should fix bug #161165.
-
-  10 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org>
-  pinentry-0.7.2-r3.ebuild:
-  Stable on sparc
-
-  24 Sep 2006; Sven Wegener <swegener@gentoo.org> +files/0.7.2-info.patch,
-  pinentry-0.7.2-r3.ebuild:
-  Use correct format for direntry to make emacs users happy, bug #133048.
-
-  16 Sep 2006; Tobias Scherbaum <dertobi123@gentoo.org>
-  pinentry-0.7.2-r3.ebuild:
-  ppc stable
-
-  19 Aug 2006; Bryan Østergaard <kloeri@gentoo.org>
-  pinentry-0.7.2-r3.ebuild:
-  Stable on alpha.
-
-  22 Jul 2006; <psi29a@gentoo.org> pinentry-0.7.2-r3.ebuild:
-  stable on mips
-
-  12 Jul 2006; Aron Griffis <agriffis@gentoo.org> pinentry-0.7.2-r3.ebuild:
-  Mark 0.7.2-r3 stable on ia64
-
-  12 Jul 2006; Danny van Dyk <kugelfang@gentoo.org>
-  pinentry-0.7.2-r3.ebuild:
-  QA: Changed qt to qt3.
-
-  26 Jun 2006; Javier Villavicencio <the_paya@gentoo.org>
-  pinentry-0.7.2-r3.ebuild:
-  Add ~x86-fbsd keyword.
-
-  23 Jun 2006; Doug Goldstein <cardoe@gentoo.org> pinentry-0.7.2-r2.ebuild,
-  pinentry-0.7.2-r3.ebuild:
-  USE flag qt->qt3/qt4 change
-
-  05 Jun 2006; Guy Martin <gmsoft@gentoo.org> pinentry-0.7.2-r3.ebuild:
-  Stable on hppa.
-
-  18 May 2006; Sven Wegener <swegener@gentoo.org> -pinentry-0.7.2.ebuild:
-  Remove old version.
-
-  16 May 2006; Markus Rothe <corsair@gentoo.org> pinentry-0.7.2-r3.ebuild:
-  Stable on ppc64; bug #132343
-
-  27 Apr 2006; Marien Zwart <marienz@gentoo.org>
-  files/digest-pinentry-0.7.2, files/digest-pinentry-0.7.2-r2,
-  files/digest-pinentry-0.7.2-r3, Manifest:
-  Fixing SHA256 digest for real, pass three...
-
-  27 Apr 2006; Marien Zwart <marienz@gentoo.org>
-  files/digest-pinentry-0.7.2, files/digest-pinentry-0.7.2-r2,
-  files/digest-pinentry-0.7.2-r3, Manifest:
-  Fixing SHA256 digest, pass two.
-
-  22 Apr 2006; Markus Rothe <corsair@gentoo.org> pinentry-0.7.2-r3.ebuild:
-  Added ~ppc64; bug #130718
-
-*pinentry-0.7.2-r3 (23 Feb 2006)
-
-  23 Feb 2006; Sven Wegener <swegener@gentoo.org> +files/0.7.2-libcap.patch,
-  +pinentry-0.7.2-r3.ebuild:
-  Revision bump to include optional capabilities support. Thanks to Diego in
-  bug #108845.
-
-  06 Feb 2006; Herbie Hopkins <herbs@gentoo.org> pinentry-0.7.2-r2.ebuild:
-  Fix problem detecting qt on amd64's no-symlink profile.
-
-  03 Jan 2006; <plasmaroo@gentoo.org> pinentry-0.7.2-r2.ebuild:
-  Stable on IA64.
-
-  30 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org>
-  pinentry-0.7.2-r2.ebuild:
-  Stable on alpha wrt security bug #116822
-
-  29 Dec 2005; Tobias Scherbaum <dertobi123@gentoo.org>
-  pinentry-0.7.2-r2.ebuild:
-  ppc stable, bug #116822
-
-  28 Dec 2005; Mark Loeser <halcy0n@gentoo.org> pinentry-0.7.2-r2.ebuild:
-  Stable on x86; bug #116822
-
-  28 Dec 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  pinentry-0.7.2-r2.ebuild:
-  Stable on sparc wrt security #116822
-
-  28 Dec 2005; Simon Stelling <blubb@gentoo.org> pinentry-0.7.2-r2.ebuild:
-  stable on amd64 wrt bug 116822
-
-*pinentry-0.7.2-r2 (27 Dec 2005)
-
-  27 Dec 2005; Sven Wegener <swegener@gentoo.org> pinentry-0.7.2.ebuild,
-  -pinentry-0.7.2-r1.ebuild, +pinentry-0.7.2-r2.ebuild:
-  Fix the fperms call, security bug #116822.
-
-  25 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
-  pinentry-0.7.2-r1.ebuild:
-  Use bindnow-flags function instead of -Wl,-z,now.
-
-*pinentry-0.7.2-r1 (22 Sep 2005)
-
-  22 Sep 2005; Sven Wegener <swegener@gentoo.org> +pinentry-0.7.2-r1.ebuild:
-  Deprecate gtk2 USE flag, bug #106560.
-
-  19 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> pinentry-0.7.2.ebuild:
-  Stable on sparc
-
-  07 Aug 2005; Daniel Black <dragonheart@gentoo.org> pinentry-0.7.2.ebuild:
-  changed to mirror://gnupg
-
-  31 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> pinentry-0.7.2.ebuild:
-  Added ~mips.
-
-  28 Jul 2005; Caleb Tennis <caleb@gentoo.org> pinentry-0.7.2.ebuild:
-  Made qt dep qt3 explicit per bug #100235
-
-  08 May 2005; Sven Wegener <swegener@gentoo.org>
-  -files/qt-compile-fix.diff, -pinentry-0.7.1-r1.ebuild:
-  Removed old ebuild.
-
-  01 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> pinentry-0.7.2.ebuild:
-  Stable on ppc.
-
-  15 Mar 2005; Michael Cummings <mcummings@gentoo.org> pinentry-0.7.2.ebuild:
-  Keywording for ~sparc - makes manifest signing so much nicer. Bug 85376
-
-  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> pinentry-0.7.2.ebuild:
-  Marked stable on amd64.
-
-  12 Mar 2005; Aron Griffis <agriffis@gentoo.org> pinentry-0.7.2.ebuild:
-  stable on alpha, ia64 and x86
-
-*pinentry-0.7.2 (28 Jan 2005)
-
-  28 Jan 2005; Sven Wegener <swegener@gentoo.org>
-  -pinentry-0.7.1_p20041207.ebuild, +pinentry-0.7.2.ebuild:
-  Version bump, bug #79801.
-
-  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-*pinentry-0.7.1_p20041207 (07 Dec 2004)
-
-  07 Dec 2004; Sven Wegener <swegener@gentoo.org> metadata.xml,
-  -pinentry-0.7.0.ebuild, +pinentry-0.7.1_p20041207.ebuild:
-  Version bump, CVS snapshot with gtk+-2 support. Closes bug #73704.
-
-  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
-  pinentry-0.7.0.ebuild, pinentry-0.7.1-r1.ebuild:
-  Masked pinentry-0.7.1-r1.ebuild stable for ppc
-
-  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
-  pinentry-0.7.0.ebuild:
-  Masked pinentry-0.7.0.ebuild stable for ppc
-
-  25 Aug 2004; Travis Tilley <lv@gentoo.org> pinentry-0.7.1-r1.ebuild:
-  stable on amd64
-
-  07 Aug 2004; Daniel Black <dragonheart@gentoo.org> -pinentry-0.6.9.ebuild,
-  pinentry-0.7.1-r1.ebuild, -pinentry-0.7.1.ebuild:
-  Version 0.7.1 was broken. added x86 keyword to 0.7.1-r1. removed old version
-
-*pinentry-0.7.1-r1 (21 Jun 2004)
-
-  21 Jun 2004; Bryan Østergaard <kloeri@gentoo.org>
-  +files/qt-compile-fix.diff, +pinentry-0.7.1-r1.ebuild:
-  Add qt compile fix submitted by Sebastian Trueg
-  <trueg@informatik.uni-freiburg.de> in bug #54225. Also use emake and einstall.
-
-  07 Jun 2004; Daniel Black <dragonheart@gentoo.org> +metadata.xml,
-  pinentry-0.7.0.ebuild, pinentry-0.7.1.ebuild:
-  x86 keyword
-
-  20 May 2004; <paul@gentoo.org> pinentry-0.7.1.ebuild:
-  Works on amd64 perfectly
-
-*pinentry-0.7.1 (01 May 2004)
-
-  01 May 2004; Bryan Østergaard <kloeri@gentoo.org> +pinentry-0.7.1.ebuild:
-  Bump version, bug #48917.
-
-  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> pinentry-0.6.9.ebuild:
-  Add die following econf for bug 48950
-
-*pinentry-0.7.0 (28 Feb 2004)
-
-  28 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
-  Version bumpage.  Cause the ebuild to fall back to ncurses if user
-  has -gtk -qt and -ncurses in USE instead of calling die itself.
-
-*pinentry-0.6.9 (21 Sep 2003)
-
-  21 Sep 2003; Caleb Tennis <caleb@gentoo.org> pinentry-0.6.8.ebuild,
-  pinentry-0.6.8.ebuild, pinentry-0.6.9.ebuild:
-  version bump, old one didn't compile with qt-3.2
-
-*pinentry-0.6.8 (07 Apr 2003)
-
-  07 Apr 2003; danarmak <danarmak@gentoo.org> pinentry-0.6.8.ebuild:
-  New upstream version. Added because the kmail page about Aegypten says it is
-  needed. Makes patch from 0.6.7-r1 unnecessary as it was taken from the
-  pinentry cvs in the first place.
-
-*pinentry-0.6.7-r1 (07 Feb 2003)
-
-  05 Mar 2003; Bartosch Pixa <darkspecter@gentoo.org>
-  pinentry-0.6.7-r1.ebuild:
-  set ~ppc in keywords
-
-  07 Feb 2003; J Robert Ray <jrray@gentoo.org> : Added patch to correct
-  problem with pinentry-qt.  Thanks to Paul de Vrieze <gentoo-bugs@devrieze.net>.
-
-*pinentry-0.6.7 (06 Feb 2003)
-
-  06 Feb 2003; J Robert Ray <jrray@gentoo.org> : Initial ebuild.  QT support
-  is currently broken and disabled.
--- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/ChangeLog-2015
+++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/ChangeLog-2015
@ -0,0 +1,721 @@
+# ChangeLog for app-crypt/pinentry
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.182 2015/07/18 08:18:39 alonbl Exp $
+
+  18 Jul 2015; Alon Bar-Lev <alonbl@gentoo.org> pinentry-0.9.5.ebuild:
+  Add emacs USE
+
+  18 Jul 2015; Alon Bar-Lev <alonbl@gentoo.org>
+  files/pinentry-0.9.5-build.patch:
+  Even better pkg-config resolution, bug#554686
+
+  18 Jul 2015; Alon Bar-Lev <alonbl@gentoo.org>
+  files/pinentry-0.9.5-build.patch:
+  Add pkg-config detection instead of initialization as pinentry does not use it
+  correctly, bug#554686
+
+  18 Jul 2015; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/pinentry-0.9.5-build.patch, pinentry-0.9.5.ebuild:
+  Add pkg-config initialization, add pkg-config as DEPEND as most need it
+  anyway, bug#554686
+
+*pinentry-0.9.5 (01 Jul 2015)
+
+  01 Jul 2015; Kristian Fiskerstrand <k_f@gentoo.org> +pinentry-0.9.5.ebuild,
+  -pinentry-0.9.4-r1.ebuild:
+  Version bump to pinentry 0.9.5
+
+  07 Jun 2015; Kristian Fiskerstrand <k_f@gentoo.org>
+  -files/pinentry-0.9.1-memleak.patch:
+  Remove a redundant patch file after previous cleanup
+
+  07 Jun 2015; Kristian Fiskerstrand <k_f@gentoo.org>
+  -files/pinentry-0.9.2-cmd_confirm.patch, -files/pinentry-0.9.2-gnome3.patch,
+  -files/pinentry-0.9.2-handlers-return.patch,
+  -files/pinentry-0.9.2-linking-order.patch,
+  -files/pinentry-0.9.2-management.patch, -files/pinentry-0.9.2-memory.patch,
+  -files/pinentry-0.9.2-simplify.patch, -pinentry-0.9.1.ebuild,
+  -pinentry-0.9.2-r1.ebuild, -pinentry-0.9.4.ebuild:
+  Remove old versions
+
+*pinentry-0.9.4-r1 (07 Jun 2015)
+
+  07 Jun 2015; Kristian Fiskerstrand <k_f@gentoo.org>
+  +files/pinentry-0.9.4-actually_respect_users_pm.patch,
+  +pinentry-0.9.4-r1.ebuild:
+  Add a patch from upstream master to actually respect the user's choice of
+  using an external password manager for the gnome3 pinentry
+
+*pinentry-0.9.4 (07 Jun 2015)
+
+  07 Jun 2015; Kristian Fiskerstrand <k_f@gentoo.org> +pinentry-0.9.4.ebuild:
+  New upstream version 0.9.4
+
+  14 May 2015; Kristian Fiskerstrand <k_f@gentoo.org> -pinentry-0.9.0-r1.ebuild,
+  -pinentry-0.9.0-r2.ebuild:
+  Cleanup old
+
+*pinentry-0.9.2-r1 (14 May 2015)
+
+  14 May 2015; Kristian Fiskerstrand <k_f@gentoo.org> +pinentry-0.9.2-r1.ebuild,
+  -pinentry-0.9.2.ebuild:
+  Enable the GNOME3 pinentry if gnome-keyring USE flag is set
+
+*pinentry-0.9.2 (13 May 2015)
+
+  13 May 2015; Kristian Fiskerstrand <k_f@gentoo.org>
+  +files/pinentry-0.9.2-cmd_confirm.patch, +files/pinentry-0.9.2-gnome3.patch,
+  +files/pinentry-0.9.2-handlers-return.patch,
+  +files/pinentry-0.9.2-linking-order.patch,
+  +files/pinentry-0.9.2-management.patch, +files/pinentry-0.9.2-memory.patch,
+  +files/pinentry-0.9.2-simplify.patch, +pinentry-0.9.2.ebuild:
+  new upstream version 0.9.2 with fixes
+
+  05 May 2015; Alon Bar-Lev <alonbl@gentoo.org> pinentry-0.9.1.ebuild:
+  Remove aix hack as upstream addressed the issue
+
+*pinentry-0.9.1 (03 May 2015)
+
+  03 May 2015; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/pinentry-0.9.1-memleak.patch, +pinentry-0.9.1.ebuild:
+  Version bump, bug#548456
+
+  30 Apr 2015; Alon Bar-Lev <alonbl@gentoo.org> pinentry-0.9.0-r3.ebuild:
+  Fix gcc-5 qt issue, bug#547528, thanks to Mark Wright
+
+  31 Mar 2015; Ulrich Müller <ulm@gentoo.org> pinentry-0.9.0.ebuild,
+  pinentry-0.9.0-r1.ebuild, pinentry-0.9.0-r2.ebuild, pinentry-0.9.0-r3.ebuild:
+  Update dependency after package move of eselect modules to app-eselect.
+
+*pinentry-0.9.0-r3 (22 Mar 2015)
+
+  22 Mar 2015; Kristian Fiskerstrand <k_f@gentoo.org> +pinentry-0.9.0-r3.ebuild:
+  Use qt4_get_bindir from qmake-utils instead of hardcoding moc path. Fixes
+  #544110
+
+*pinentry-0.9.0-r2 (01 Mar 2015)
+
+  01 Mar 2015; Kristian Fiskerstrand <k_f@gentoo.org>
+  +files/pinentry-0.9.0-accessibility.patch, +pinentry-0.9.0-r2.ebuild:
+  Fix for bug #541400
+
+  28 Feb 2015; Alon Bar-Lev <alonbl@gentoo.org> -pinentry-0.8.2.ebuild,
+  -pinentry-0.8.3.ebuild, -pinentry-0.8.4.ebuild:
+  Cleanup
+
+  28 Feb 2015; Agostino Sarubbo <ago@gentoo.org> pinentry-0.9.0.ebuild:
+  Stable for ia64, wrt bug #540002
+
+  27 Feb 2015; Agostino Sarubbo <ago@gentoo.org> pinentry-0.9.0.ebuild:
+  Stable for sparc, wrt bug #540002
+
+  26 Feb 2015; Markus Meier <maekke@gentoo.org> pinentry-0.9.0.ebuild:
+  arm stable, bug #540002
+
+  25 Feb 2015; Agostino Sarubbo <ago@gentoo.org> pinentry-0.9.0.ebuild:
+  Stable for x86, wrt bug #540002
+
+  24 Feb 2015; Agostino Sarubbo <ago@gentoo.org> pinentry-0.9.0.ebuild:
+  Stable for alpha, wrt bug #540002
+
+  23 Feb 2015; Agostino Sarubbo <ago@gentoo.org> pinentry-0.9.0.ebuild:
+  Stable for ppc64, wrt bug #540002
+
+  21 Feb 2015; Agostino Sarubbo <ago@gentoo.org> pinentry-0.9.0.ebuild:
+  Stable for ppc, wrt bug #540002
+
+  19 Feb 2015; Agostino Sarubbo <ago@gentoo.org> pinentry-0.9.0.ebuild:
+  Stable for amd64, wrt bug #540002
+
+*pinentry-0.9.0-r1 (17 Feb 2015)
+
+  17 Feb 2015; Alon Bar-Lev <alonbl@gentoo.org> +pinentry-0.9.0-r1.ebuild,
+  metadata.xml:
+  Add support to clipboard in qt, bug#540348, thanks to Ezio
+
+  14 Feb 2015; Jeroen Roovers <jer@gentoo.org> pinentry-0.9.0.ebuild:
+  Stable for HPPA (bug #540002).
+
+*pinentry-0.9.0 (19 Nov 2014)
+
+  19 Nov 2014; Kristian Fiskerstrand <k_f@gentoo.org> +pinentry-0.9.0.ebuild:
+  Bump pinentry to 0.9.0
+
+*pinentry-0.8.4 (08 Oct 2014)
+
+  08 Oct 2014; Alon Bar-Lev <alonbl@gentoo.org> +pinentry-0.8.4.ebuild:
+  Version bump, bug#524742
+
+  03 Apr 2014; Michael Haubenwallner <haubi@gentoo.org> pinentry-0.8.3.ebuild:
+  Add ~ppc-aix keyword.
+
+  20 Jan 2014; Mike Frysinger <vapier@gentoo.org> pinentry-0.8.2.ebuild,
+  pinentry-0.8.3.ebuild:
+  Add arm64 love.
+
+  27 Dec 2013; Alon Bar-Lev <alonbl@gentoo.org> pinentry-0.8.3.ebuild:
+  Fix aix build, bug#493384, thanks to Michael Haubenwallner
+
+  06 Nov 2013; Alon Bar-Lev <alonbl@gentoo.org> pinentry-0.8.2.ebuild,
+  pinentry-0.8.3.ebuild:
+  add gettext build dependency as we are autoreconfing, bug#490522, thanks to
+  yegle
+
+*pinentry-0.8.3 (07 Oct 2013)
+
+  07 Oct 2013; Tim Harder <radhermit@gentoo.org> +pinentry-0.8.3.ebuild:
+  Version bump (bug #487188).
+
+  15 Jun 2013; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/pinentry-0.8.2-texi.patch, pinentry-0.8.2.ebuild:
+  fix texi issue with recent compiler, bug#472700, thanks to Bryan Baldwin
+
+  02 Jun 2013; Alon Bar-Lev <alonbl@gentoo.org> -pinentry-0.8.1.ebuild:
+  cleanup old ebuild
+
+  05 May 2013; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/pinentry-0.8.2-ncurses.patch, pinentry-0.8.2.ebuild:
+  support sys-libs/ncurses[tinfo], per bug#468430
+
+  02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> pinentry-0.8.1.ebuild,
+  pinentry-0.8.2.ebuild:
+  Move Qt dependencies to the new category
+
+  20 Feb 2013; Zac Medico <zmedico@gentoo.org> pinentry-0.8.2.ebuild:
+  Add ~arm-linux keyword.
+
+  16 Dec 2012; Raúl Porcel <armin76@gentoo.org> pinentry-0.8.2.ebuild:
+  alpha/ia64/s390/sh/sparc stable wrt #443522
+
+  28 Nov 2012; Tim Harder <radhermit@gentoo.org> metadata.xml:
+  Add to crypto herd.
+
+  25 Nov 2012; Sven Wegener <swegener@gentoo.org> metadata.xml:
+  Move to maintainer-needed.
+
+  22 Nov 2012; Agostino Sarubbo <ago@gentoo.org> pinentry-0.8.2.ebuild:
+  Stable for x86, tested by Vincent Olivert Riera <peratu@carrosses.com>, wrt
+  bug #443522
+
+  20 Nov 2012; Anthony G. Basile <blueness@gentoo.org> pinentry-0.8.2.ebuild:
+  stable arm, bug #443522
+
+  19 Nov 2012; Jeroen Roovers <jer@gentoo.org> pinentry-0.8.2.ebuild:
+  Stable for HPPA (bug #443522).
+
+  17 Nov 2012; Anthony G. Basile <blueness@gentoo.org> pinentry-0.8.2.ebuild:
+  stable ppc64, bug #443522
+
+  17 Nov 2012; Agostino Sarubbo <ago@gentoo.org> pinentry-0.8.2.ebuild:
+  Stable for ppc, tested by Vicente Olivert Riera <peratu@carrosses.com>, wrt
+  bug #443522
+
+  16 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> pinentry-0.8.2.ebuild:
+  Better fix the static issue with ncurses, thanks to Diego.
+
+  16 Nov 2012; Agostino Sarubbo <ago@gentoo.org> pinentry-0.8.2.ebuild:
+  Stable for amd64, wrt bug #443522
+
+  16 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> pinentry-0.8.2.ebuild:
+  Do not call ar directly, fixes bug#443526.
+
+  16 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> pinentry-0.8.2.ebuild:
+  Try to fix building with static useflag enabled
+
+  16 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> pinentry-0.8.2.ebuild:
+  Bump eapi in the ebuild and solve the log message print. Wrt bug#440540.
+
+  29 Oct 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/pinentry-0.7.5-grab.patch, -files/pinentry-0.8.0-qt-fix.patch,
+  -pinentry-0.8.0-r1.ebuild, -pinentry-0.8.0.ebuild:
+  Drop older.
+
+  09 Sep 2012; Raúl Porcel <armin76@gentoo.org> pinentry-0.8.1.ebuild:
+  alpha/ia64/s390/sh/sparc stable wrt #421593
+
+  03 Sep 2012; Michael Palimaka <kensington@gentoo.org>
+  pinentry-0.8.0-r1.ebuild, pinentry-0.8.0.ebuild, pinentry-0.8.1.ebuild,
+  pinentry-0.8.2.ebuild:
+  Add missing slot dependencies on Qt.
+
+  17 Aug 2012; Anthony G. Basile <blueness@gentoo.org> pinentry-0.8.1.ebuild:
+  Stable ppc ppc64, bug #421593
+
+*pinentry-0.8.2 (14 Aug 2012)
+
+  14 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> +pinentry-0.8.2.ebuild:
+  Version bump, I was testing if it had fixed the issue from bug#400751 but it
+  did not. Commiting as it works perfect otherwise.
+
+  03 Jul 2012; Jeroen Roovers <jer@gentoo.org> pinentry-0.8.1.ebuild:
+  Stable for HPPA (bug #421593).
+
+  25 Jun 2012; Markus Meier <maekke@gentoo.org> pinentry-0.8.1.ebuild:
+  arm stable, bug #421593
+
+  19 Jun 2012; Agostino Sarubbo <ago@gentoo.org> pinentry-0.8.1.ebuild:
+  Stable for amd64, wrt bug #421593
+
+  17 Jun 2012; Jeff Horelick <jdhore@gentoo.org> pinentry-0.8.1.ebuild:
+  marked x86 per bug 421593
+
+  09 May 2012; Alexis Ballier <aballier@gentoo.org> pinentry-0.8.1.ebuild:
+  keyword ~amd64-fbsd
+
+  03 May 2012; Jeff Horelick <jdhore@gentoo.org> pinentry-0.8.0.ebuild,
+  pinentry-0.8.0-r1.ebuild, pinentry-0.8.1.ebuild:
+  dev-util/pkgconfig -> virtual/pkgconfig
+
+  18 Feb 2012; Fabian Groffen <grobian@gentoo.org> pinentry-0.8.1.ebuild:
+  Remove existing file in Prefix
+
+  26 Aug 2011; Fabian Groffen <grobian@gentoo.org> pinentry-0.8.1.ebuild:
+  Explicitly disable X11, such that Darwin users don't have hanging pinentry
+  clients due to pinentry looking into the void for an X11 server.
+
+  25 Mar 2011; Sven Wegener <swegener@gentoo.org> pinentry-0.8.0.ebuild,
+  pinentry-0.8.0-r1.ebuild, pinentry-0.8.1.ebuild:
+  Add dev-util/pkgconfig to DEPEND, bug #360411.
+
+*pinentry-0.8.1 (15 Jan 2011)
+
+  15 Jan 2011; Sven Wegener <swegener@gentoo.org> +pinentry-0.8.1.ebuild:
+  Version bump, bug #351115.
+
+  30 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
+  pinentry-0.8.0-r1.ebuild:
+  Use eselect-pinentry.
+
+*pinentry-0.8.0-r1 (25 Sep 2010)
+
+  25 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +pinentry-0.8.0-r1.ebuild:
+  Revision bump wrt #328189 by Federico Zenith. Fix USE static deps wrt
+  #331739 by "wd".
+
+  05 Sep 2010; Raúl Porcel <armin76@gentoo.org> pinentry-0.8.0.ebuild:
+  ia64/s390/sh/sparc stable wrt #299388
+
+  23 Aug 2010; Jeroen Roovers <jer@gentoo.org> pinentry-0.8.0.ebuild:
+  Stable for HPPA (bug #299388).
+
+  19 Jul 2010; Markus Meier <maekke@gentoo.org> pinentry-0.8.0.ebuild:
+  arm stable, bug #299388
+
+  19 Jul 2010; Joseph Jezak <josejx@gentoo.org> pinentry-0.8.0.ebuild:
+  Marked ppc stable for bug #299388.
+
+  18 Jul 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  pinentry-0.8.0.ebuild, +files/pinentry-0.8.0-qt-fix.patch:
+  Non-maintainer commit - this has been affecting me for a long time and
+  it's quite upsetting.
+  Added upstream patch to ensure pinentry is displayed in the foreground
+  with qt - https://bugs.g10code.com/gnupg/issue1162
+  Thanks to rubik's cube <daniel.hornung@gmx.de> - fixes bug 328189.
+
+  11 Jul 2010; Tobias Klausmann <klausman@gentoo.org> pinentry-0.8.0.ebuild:
+  Stable on alpha, bug #299388
+
+  04 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> pinentry-0.8.0.ebuild:
+  ppc64 stable wrt #299388
+
+  27 Jun 2010; Christian Faulhammer <fauli@gentoo.org>
+  pinentry-0.8.0.ebuild:
+  add ~x86-freebsd
+
+  24 Jun 2010; Christoph Mende <angelos@gentoo.org> pinentry-0.8.0.ebuild:
+  Stable on amd64 wrt bug #299388
+
+  20 Jun 2010; Christian Faulhammer <fauli@gentoo.org>
+  pinentry-0.8.0.ebuild:
+  fix HOMEPAGE
+
+  20 Jun 2010; Christian Faulhammer <fauli@gentoo.org>
+  pinentry-0.8.0.ebuild:
+  stable x86, bug 299388
+
+  30 May 2010; Fabian Groffen <grobian@gentoo.org> pinentry-0.8.0.ebuild:
+  Marked ~sparc-solaris, ~sparc64-solaris
+
+*pinentry-0.8.0 (26 Apr 2010)
+
+  26 Apr 2010; Christian Faulhammer <fauli@gentoo.org>
+  +pinentry-0.8.0.ebuild:
+  version bump for bug 308695
+
+  01 Apr 2010; Jonathan Callen <abcd@gentoo.org> pinentry-0.7.6.ebuild:
+  Bump to EAPI=3, add prefix keywords
+
+  02 Jan 2010; Ben de Groot <yngwin@gentoo.org> pinentry-0.7.5.ebuild,
+  pinentry-0.7.5-r1.ebuild, pinentry-0.7.6.ebuild:
+  Drop qt3 support
+
+  15 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  pinentry-0.7.6.ebuild:
+  Disable support for Qt-4 when "static" USE flag is enabled (bug #277963).
+
+  04 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  pinentry-0.7.6.ebuild, -files/pinentry-0.7.6-qt4-moc-fix.diff:
+  Properly regenerate .moc files.
+
+*pinentry-0.7.6 (04 Jul 2009)
+
+  04 Jul 2009; Sven Wegener <swegener@gentoo.org> +pinentry-0.7.6.ebuild,
+  +files/pinentry-0.7.6-qt4-moc-fix.diff:
+  Version bump, bug #274999 by Lars Wendler.
+
+  02 May 2009; Sven Wegener <swegener@gentoo.org> pinentry-0.7.5.ebuild,
+  pinentry-0.7.5-r1.ebuild:
+  Migrate gtk to slot dependency, bug #268218.
+
+*pinentry-0.7.5-r1 (22 Jan 2009)
+
+  22 Jan 2009; Sven Wegener <swegener@gentoo.org> +pinentry-0.7.5-r1.ebuild:
+  Add support for the static USE flag, bug #247770.
+
+  06 Jan 2009; Sven Wegener <swegener@gentoo.org>
+  -files/pinentry-0.7.2-grab.patch, -files/0.7.2-info.patch,
+  -files/pinentry-0.7.4-grab.patch, -files/0.7.2-libcap.patch,
+  -pinentry-0.7.3.ebuild, -pinentry-0.7.4-r1.ebuild:
+  Cleanup.
+
+  27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> pinentry-0.7.3.ebuild,
+  pinentry-0.7.4-r1.ebuild, pinentry-0.7.5.ebuild:
+  QA: Get rid of deprecated qt_min_version().
+
+  18 Jun 2008; Jeroen Roovers <jer@gentoo.org> pinentry-0.7.5.ebuild:
+  Stable for HPPA (bug #217845).
+
+  12 May 2008; Markus Rothe <corsair@gentoo.org> pinentry-0.7.5.ebuild:
+  Stable on ppc64
+
+  03 May 2008; Richard Freeman <rich0@gentoo.org> pinentry-0.7.5.ebuild:
+  amd64 stable - 217845
+
+  17 Apr 2008; nixnut <nixnut@gentoo.org> pinentry-0.7.5.ebuild:
+  Stable on ppc wrt bug 217845
+
+  17 Apr 2008; Raúl Porcel <armin76@gentoo.org> pinentry-0.7.5.ebuild:
+  ia64/sparc/x86 stable wrt #217845
+
+  16 Apr 2008; Tobias Klausmann <klausman@gentoo.org> pinentry-0.7.5.ebuild:
+  Stable on alpha, bug #217845
+
+*pinentry-0.7.5 (23 Mar 2008)
+
+  23 Mar 2008; Sven Wegener <swegener@gentoo.org>
+  +files/pinentry-0.7.5-grab.patch, +files/pinentry-gmem.patch,
+  pinentry-0.7.3.ebuild, pinentry-0.7.4-r1.ebuild, +pinentry-0.7.5.ebuild:
+  Version bump, bug #213383. Drop bindnow-flags, bug #213669. Workaround for
+  API change in >=glib-2.16.1, bug #213382.
+
+  13 Feb 2008; Alon Bar-Lev <alonbl@gentoo.org> -pinentry-0.7.2-r3.ebuild:
+  Cleanup
+
+  21 Jan 2008; Jeroen Roovers <jer@gentoo.org> pinentry-0.7.4-r1.ebuild:
+  Stable for HPPA (bug #206664).
+
+  20 Jan 2008; Raúl Porcel <armin76@gentoo.org> pinentry-0.7.4-r1.ebuild:
+  alpha/ia64/sparc/x86 stable wrt #206664
+
+  20 Jan 2008; Christoph Mende <angelos@gentoo.org>
+  pinentry-0.7.4-r1.ebuild:
+  Stable on amd64 wrt bug #206664
+
+  20 Jan 2008; nixnut <nixnut@gentoo.org> pinentry-0.7.4-r1.ebuild:
+  Stable on ppc wrt bug 206664
+
+  20 Jan 2008; Brent Baude <ranger@gentoo.org> ChangeLog:
+  Marking pinentry-0.7.4-r1 ppc64 for bug 206664
+
+  20 Jan 2008; Brent Baude <ranger@gentoo.org> pinentry-0.7.4-r1.ebuild:
+  Marking pinentry-0.7.4-r1 ppc64 for bug 206664
+
+*pinentry-0.7.4-r1 (22 Dec 2007)
+
+  22 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  files/pinentry-0.7.4-grab.patch, -pinentry-0.7.4.ebuild,
+  +pinentry-0.7.4-r1.ebuild:
+  Fix grab (again), this time, remove the map-event completely, bug#201951
+
+  21 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org> pinentry-0.7.4.ebuild:
+  Readd flag-o-matic
+
+  20 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/pinentry-0.7.4-grab.patch, pinentry-0.7.4.ebuild:
+  Readd grab patch, bug#165493
+
+  20 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/pinentry-0.7.4-grab.patch, pinentry-0.7.4.ebuild:
+  Readd grab patch, bug#165493
+
+*pinentry-0.7.4 (20 Dec 2007)
+
+  20 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org> -pinentry-0.7.2-r4.ebuild,
+  +pinentry-0.7.4.ebuild:
+  Version bump
+
+  09 Oct 2007; Christoph Mende <angelos@gentoo.org> pinentry-0.7.3.ebuild:
+  Stable on amd64 wrt bug #194113
+
+  03 Oct 2007; Tom Gall <tgall@gentoo.org> pinentry-0.7.3.ebuild:
+  stable on ppc64
+
+  02 Oct 2007; Raúl Porcel <armin76@gentoo.org> pinentry-0.7.3.ebuild:
+  alpha/ia64 stable wrt #194113
+
+  30 Sep 2007; Markus Meier <maekke@gentoo.org> pinentry-0.7.3.ebuild:
+  x86 stable, bug #194113
+
+  29 Sep 2007; Lars Weiler <pylon@gentoo.org> pinentry-0.7.3.ebuild:
+  stable ppc, bug #194113
+
+  29 Sep 2007; Jeroen Roovers <jer@gentoo.org> pinentry-0.7.3.ebuild:
+  Stable for HPPA (bug #194113).
+
+  28 Sep 2007; Ferris McCormick <fmccor@gentoo.org> pinentry-0.7.3.ebuild:
+  Sparc stable --- Bug #194113 --- Acts like Manual Sec. 2 says.
+
+*pinentry-0.7.3 (06 Jul 2007)
+
+  06 Jul 2007; Alon Bar-Lev <alonbl@gentoo.org> +pinentry-0.7.3.ebuild:
+  Version bump
+
+*pinentry-0.7.2-r4 (15 Jun 2007)
+
+  15 Jun 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/pinentry-0.7.2-grab.patch, +pinentry-0.7.2-r4.ebuild:
+  Fix gtk2+ grab issue, bug#165493, thanks to Vincent Pit
+
+  24 Apr 2007; Sven Wegener <swegener@gentoo.org> -pinentry-0.7.2-r2.ebuild:
+  Cleanup.
+
+  12 Apr 2007; Christian Faulhammer <opfer@gentoo.org>
+  pinentry-0.7.2-r3.ebuild:
+  stable amd64, bug 167230
+
+  01 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  pinentry-0.7.2-r3.ebuild:
+  stable x86; bug 167230
+
+  24 Jan 2007; Marius Mauch <genone@gentoo.org> pinentry-0.7.2-r2.ebuild,
+  pinentry-0.7.2-r3.ebuild:
+  Replacing einfo with elog
+
+  09 Jan 2007; Sven Wegener <swegener@gentoo.org> pinentry-0.7.2-r3.ebuild:
+  Add WANT_AUTO* variables, should fix bug #161165.
+
+  10 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org>
+  pinentry-0.7.2-r3.ebuild:
+  Stable on sparc
+
+  24 Sep 2006; Sven Wegener <swegener@gentoo.org> +files/0.7.2-info.patch,
+  pinentry-0.7.2-r3.ebuild:
+  Use correct format for direntry to make emacs users happy, bug #133048.
+
+  16 Sep 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  pinentry-0.7.2-r3.ebuild:
+  ppc stable
+
+  19 Aug 2006; Bryan Østergaard <kloeri@gentoo.org>
+  pinentry-0.7.2-r3.ebuild:
+  Stable on alpha.
+
+  22 Jul 2006; <psi29a@gentoo.org> pinentry-0.7.2-r3.ebuild:
+  stable on mips
+
+  12 Jul 2006; Aron Griffis <agriffis@gentoo.org> pinentry-0.7.2-r3.ebuild:
+  Mark 0.7.2-r3 stable on ia64
+
+  12 Jul 2006; Danny van Dyk <kugelfang@gentoo.org>
+  pinentry-0.7.2-r3.ebuild:
+  QA: Changed qt to qt3.
+
+  26 Jun 2006; Javier Villavicencio <the_paya@gentoo.org>
+  pinentry-0.7.2-r3.ebuild:
+  Add ~x86-fbsd keyword.
+
+  23 Jun 2006; Doug Goldstein <cardoe@gentoo.org> pinentry-0.7.2-r2.ebuild,
+  pinentry-0.7.2-r3.ebuild:
+  USE flag qt->qt3/qt4 change
+
+  05 Jun 2006; Guy Martin <gmsoft@gentoo.org> pinentry-0.7.2-r3.ebuild:
+  Stable on hppa.
+
+  18 May 2006; Sven Wegener <swegener@gentoo.org> -pinentry-0.7.2.ebuild:
+  Remove old version.
+
+  16 May 2006; Markus Rothe <corsair@gentoo.org> pinentry-0.7.2-r3.ebuild:
+  Stable on ppc64; bug #132343
+
+  27 Apr 2006; Marien Zwart <marienz@gentoo.org>
+  files/digest-pinentry-0.7.2, files/digest-pinentry-0.7.2-r2,
+  files/digest-pinentry-0.7.2-r3, Manifest:
+  Fixing SHA256 digest for real, pass three...
+
+  27 Apr 2006; Marien Zwart <marienz@gentoo.org>
+  files/digest-pinentry-0.7.2, files/digest-pinentry-0.7.2-r2,
+  files/digest-pinentry-0.7.2-r3, Manifest:
+  Fixing SHA256 digest, pass two.
+
+  22 Apr 2006; Markus Rothe <corsair@gentoo.org> pinentry-0.7.2-r3.ebuild:
+  Added ~ppc64; bug #130718
+
+*pinentry-0.7.2-r3 (23 Feb 2006)
+
+  23 Feb 2006; Sven Wegener <swegener@gentoo.org> +files/0.7.2-libcap.patch,
+  +pinentry-0.7.2-r3.ebuild:
+  Revision bump to include optional capabilities support. Thanks to Diego in
+  bug #108845.
+
+  06 Feb 2006; Herbie Hopkins <herbs@gentoo.org> pinentry-0.7.2-r2.ebuild:
+  Fix problem detecting qt on amd64's no-symlink profile.
+
+  03 Jan 2006; <plasmaroo@gentoo.org> pinentry-0.7.2-r2.ebuild:
+  Stable on IA64.
+
+  30 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  pinentry-0.7.2-r2.ebuild:
+  Stable on alpha wrt security bug #116822
+
+  29 Dec 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  pinentry-0.7.2-r2.ebuild:
+  ppc stable, bug #116822
+
+  28 Dec 2005; Mark Loeser <halcy0n@gentoo.org> pinentry-0.7.2-r2.ebuild:
+  Stable on x86; bug #116822
+
+  28 Dec 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  pinentry-0.7.2-r2.ebuild:
+  Stable on sparc wrt security #116822
+
+  28 Dec 2005; Simon Stelling <blubb@gentoo.org> pinentry-0.7.2-r2.ebuild:
+  stable on amd64 wrt bug 116822
+
+*pinentry-0.7.2-r2 (27 Dec 2005)
+
+  27 Dec 2005; Sven Wegener <swegener@gentoo.org> pinentry-0.7.2.ebuild,
+  -pinentry-0.7.2-r1.ebuild, +pinentry-0.7.2-r2.ebuild:
+  Fix the fperms call, security bug #116822.
+
+  25 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  pinentry-0.7.2-r1.ebuild:
+  Use bindnow-flags function instead of -Wl,-z,now.
+
+*pinentry-0.7.2-r1 (22 Sep 2005)
+
+  22 Sep 2005; Sven Wegener <swegener@gentoo.org> +pinentry-0.7.2-r1.ebuild:
+  Deprecate gtk2 USE flag, bug #106560.
+
+  19 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> pinentry-0.7.2.ebuild:
+  Stable on sparc
+
+  07 Aug 2005; Daniel Black <dragonheart@gentoo.org> pinentry-0.7.2.ebuild:
+  changed to mirror://gnupg
+
+  31 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> pinentry-0.7.2.ebuild:
+  Added ~mips.
+
+  28 Jul 2005; Caleb Tennis <caleb@gentoo.org> pinentry-0.7.2.ebuild:
+  Made qt dep qt3 explicit per bug #100235
+
+  08 May 2005; Sven Wegener <swegener@gentoo.org>
+  -files/qt-compile-fix.diff, -pinentry-0.7.1-r1.ebuild:
+  Removed old ebuild.
+
+  01 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> pinentry-0.7.2.ebuild:
+  Stable on ppc.
+
+  15 Mar 2005; Michael Cummings <mcummings@gentoo.org> pinentry-0.7.2.ebuild:
+  Keywording for ~sparc - makes manifest signing so much nicer. Bug 85376
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> pinentry-0.7.2.ebuild:
+  Marked stable on amd64.
+
+  12 Mar 2005; Aron Griffis <agriffis@gentoo.org> pinentry-0.7.2.ebuild:
+  stable on alpha, ia64 and x86
+
+*pinentry-0.7.2 (28 Jan 2005)
+
+  28 Jan 2005; Sven Wegener <swegener@gentoo.org>
+  -pinentry-0.7.1_p20041207.ebuild, +pinentry-0.7.2.ebuild:
+  Version bump, bug #79801.
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*pinentry-0.7.1_p20041207 (07 Dec 2004)
+
+  07 Dec 2004; Sven Wegener <swegener@gentoo.org> metadata.xml,
+  -pinentry-0.7.0.ebuild, +pinentry-0.7.1_p20041207.ebuild:
+  Version bump, CVS snapshot with gtk+-2 support. Closes bug #73704.
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  pinentry-0.7.0.ebuild, pinentry-0.7.1-r1.ebuild:
+  Masked pinentry-0.7.1-r1.ebuild stable for ppc
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  pinentry-0.7.0.ebuild:
+  Masked pinentry-0.7.0.ebuild stable for ppc
+
+  25 Aug 2004; Travis Tilley <lv@gentoo.org> pinentry-0.7.1-r1.ebuild:
+  stable on amd64
+
+  07 Aug 2004; Daniel Black <dragonheart@gentoo.org> -pinentry-0.6.9.ebuild,
+  pinentry-0.7.1-r1.ebuild, -pinentry-0.7.1.ebuild:
+  Version 0.7.1 was broken. added x86 keyword to 0.7.1-r1. removed old version
+
+*pinentry-0.7.1-r1 (21 Jun 2004)
+
+  21 Jun 2004; Bryan Østergaard <kloeri@gentoo.org>
+  +files/qt-compile-fix.diff, +pinentry-0.7.1-r1.ebuild:
+  Add qt compile fix submitted by Sebastian Trueg
+  <trueg@informatik.uni-freiburg.de> in bug #54225. Also use emake and einstall.
+
+  07 Jun 2004; Daniel Black <dragonheart@gentoo.org> +metadata.xml,
+  pinentry-0.7.0.ebuild, pinentry-0.7.1.ebuild:
+  x86 keyword
+
+  20 May 2004; <paul@gentoo.org> pinentry-0.7.1.ebuild:
+  Works on amd64 perfectly
+
+*pinentry-0.7.1 (01 May 2004)
+
+  01 May 2004; Bryan Østergaard <kloeri@gentoo.org> +pinentry-0.7.1.ebuild:
+  Bump version, bug #48917.
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> pinentry-0.6.9.ebuild:
+  Add die following econf for bug 48950
+
+*pinentry-0.7.0 (28 Feb 2004)
+
+  28 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bumpage.  Cause the ebuild to fall back to ncurses if user
+  has -gtk -qt and -ncurses in USE instead of calling die itself.
+
+*pinentry-0.6.9 (21 Sep 2003)
+
+  21 Sep 2003; Caleb Tennis <caleb@gentoo.org> pinentry-0.6.8.ebuild,
+  pinentry-0.6.8.ebuild, pinentry-0.6.9.ebuild:
+  version bump, old one didn't compile with qt-3.2
+
+*pinentry-0.6.8 (07 Apr 2003)
+
+  07 Apr 2003; danarmak <danarmak@gentoo.org> pinentry-0.6.8.ebuild:
+  New upstream version. Added because the kmail page about Aegypten says it is
+  needed. Makes patch from 0.6.7-r1 unnecessary as it was taken from the
+  pinentry cvs in the first place.
+
+*pinentry-0.6.7-r1 (07 Feb 2003)
+
+  05 Mar 2003; Bartosch Pixa <darkspecter@gentoo.org>
+  pinentry-0.6.7-r1.ebuild:
+  set ~ppc in keywords
+
+  07 Feb 2003; J Robert Ray <jrray@gentoo.org> : Added patch to correct
+  problem with pinentry-qt.  Thanks to Paul de Vrieze <gentoo-bugs@devrieze.net>.
+
+*pinentry-0.6.7 (06 Feb 2003)
+
+  06 Feb 2003; J Robert Ray <jrray@gentoo.org> : Initial ebuild.  QT support
+  is currently broken and disabled.
--- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/Manifest
+++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/Manifest
@ -1,33 +1,17 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX pinentry-0.8.2-ncurses.patch 824 SHA256 7d5e485e2c6dcce80ab63055d24761f53ae28e19b5ab2dacc424ebc7677805e8 SHA512 415ad55fd7a4ab66e87e5db76b1314b00f5a86552804f1f431a533ba1e7ec3f2c7136096106688b572639ceb637fdf0c3e25d96aa2e07fd1f6f295d39e1d4901 WHIRLPOOL 5483ccb6041e769387685ce987a19a2aa50835781a391169abbe7a838325149b81ce186692dbdc588858f74ef912a80f1eca6efb0f3421ace57925ca9c6f9ca5
 AUX pinentry-0.8.2-texi.patch 688 SHA256 47c5280fb82d0ba15338c60765c1ee37b368baf774a821f7afe85a7bf16dcbbc SHA512 4cd0b58a8719d0569d9a3c7c8258e609ccd6239436e3b981afcfb95859f8f4b898a8c29db3b310fb3611b285e58f89b09c9c9f8607a9168ee26ffc054ed9f680 WHIRLPOOL fd574ed478dcd9ff1a9306da1122f20d6f894ca055ed4f368f6796c5b41bfcff9c7842c8ed9a9b8a235ccd4031a153d9f0cf43e60e0cec16e482bcc021a21388
 AUX pinentry-0.9.0-accessibility.patch 2587 SHA256 80adf350a7fa17ab7d60b36d1d373f629c85424de96950c4156fe44e0c2691ae SHA512 2c337e71aad65af0fae7d82bacb08304e1c276cbc0cb318442669a3c711ea0be7b909a5ff9c6a5e846464d1e91645ec5a2c57d9deb5eaaa8b16ce3c5244684a8 WHIRLPOOL 02bf8215210b81f48a16a519b9207356fd32c42a42acd1eaeae9faf81e5f8b500c006a3491948b48df855b7a44cde4976753a71494ff1a1b1b407d2ed653af56
-AUX pinentry-0.9.1-memleak.patch 732 SHA256 53643494cdef3d0f9e1261c5c364e6eb42e2fc5e15259018572869f5c3bf4377 SHA512 2fd2d94a0894ef0ac895176ddc034d381a696cf8c4a5a9824d40ed0723953e85d561a9f03f8aef2ba2141eb71c1dc0b352f81346fd838b4fdff09f11f275a881 WHIRLPOOL 3525bee3c00718f19b6c30fbef1e98a19e105367150a3a9b9470900494d7eeb58128f19903917fe0878f7c5f7a67a9cb75cda464bc14b0b1a766c7d871733cf9
-AUX pinentry-0.9.2-cmd_confirm.patch 1341 SHA256 695557bdf9e3c7c206d07229665a79f7dbe5dde74694f602514c4fd2403b4d4e SHA512 c5c1417732f3d07a5f04e0fdfd2fc469e38bd03ddac7d9d269e1635674a4a8a7b7431e92e8a5da0c0d83d4ab040f79b6cb79fe5597a239f07c36f6839a51ed74 WHIRLPOOL 95a8a73478be25bf747d315c96a8d456e4482f6c89fd36893cb4244bff5c0b65721e9fdaf28110063c05fa1c77314113c014f5725efdfb60fc9e4c315ef2a324
-AUX pinentry-0.9.2-gnome3.patch 13855 SHA256 01fcec036a2eb9d56e156387a023594855ad27ba203ce06883cee32e8e6b51bb SHA512 9cfbdb66cb10b76f9f2fead8ff1c641ea2998748f74a8515e4f5dd1f8de99e4a601d07fa72ecfa73486631790dc8197c5f0942e1b0e2e648136d93cb22711975 WHIRLPOOL 40da7fafc4613278ad29dd6d8e322434f6e732a8205183f73a12d05622bd05f2cd6affec7d583ee49874872c0b1914036b9b185f2d44620d0df58d3da22b5192
-AUX pinentry-0.9.2-handlers-return.patch 953 SHA256 14f4295211550e64ee9797999e7bf87bd3b68092577c586358fc43e38d27b377 SHA512 c2acacc7244eb4fae7863b867913e2819e10e8aacde294e2528de0a35de0c4b7c23676720bbbd70d0e5aef8e8f6e03ceb499dd58d799e4e0b2bee087b80103bf WHIRLPOOL aa83879b5497f2507eae0d34f2538ef45182695e1bd2995be7d8cc9bf58ec2eec5732b49bee61ea4a18b9e73e08982268aa8aa124326851939c9ad5faab4b08f
-AUX pinentry-0.9.2-linking-order.patch 3866 SHA256 6937de3e176de2fb3425ba449fb4caab61cf1382135fa4ca2a5f9d4f0b500aac SHA512 50665ae47e955991f588cacd753ed4ec8e071e779cf016c25958e944da44aa6bbdbd911070f49d3431277619d242e3ee34e1d9c7747ce36d0f3018a52b7f9e3a WHIRLPOOL 44013aa6785a70e3564d1847c1d2205776461e093fab64503f7c69bc57c9e0d0ecc5f652cb6cbab28a16c65c6163d1b3f0cf9efa26add48950f502560644c93b
-AUX pinentry-0.9.2-management.patch 3590 SHA256 7890e73e0e5545ce817f96f0ab89fbb6626cb7166f03a9338f80bd0f26bfc03f SHA512 fba43beaed1f5856cc7fe20cc985d782fef9b75eb9464c0b8f82b426af6922a9da298a9461a251aba26c5cf1410ffdd2f09657bd73dedbc7b338e8f673a50a04 WHIRLPOOL 47bf4c3b30a329cc79580626e89b0fbbc78d91e466f2b5c7ba79b1f96f5a24b016ef912833bbb43cabaa47084061cc554b4222a76d7d0bedf574f3ac247b803d
-AUX pinentry-0.9.2-memory.patch 919 SHA256 788f73e7817b27adb5a0d2befb95da3c653291c2151bcbe493b2ec65f72eabf0 SHA512 2aa4e68b6d2c1100652c9a007381b5c181f761cd6cc30e5769a8fe02aa05933294841131815ea5706e010ab1e083da28094a3b1d61ebd393c084eff040330fc6 WHIRLPOOL 87f0c639ed5a61404c34b80bbe0d30e52c27fd407dfe4f938720953c76dcc15c024688252da0d9107fab7daecb04b565df202a723436b0bafda02d48e3ef56cf
-AUX pinentry-0.9.2-simplify.patch 1431 SHA256 093d623379ff571b23ceddd71f62e4792f1a004517bd43212ab1534efff46382 SHA512 2a541abfa8529050d6bba6381e852e8c1d66ae9c7dc07f25b0e4b313cbc6ec4a87cc44f19cc400de23a094b994d17871a2a9471e18a3fcba187968334e5524c7 WHIRLPOOL 312fb2d8fadab742a6af449b59a2319e5e1b7bc27fdef131f2e77480c1b916d131bae5a28456c1f09ce7a531e2d8862d9424a9a87b3877d246aaac67bacaf18d
+AUX pinentry-0.9.5-build.patch 1632 SHA256 e78b4299eafd4cf90914f11882a19c2f26eac37efc6ffd0c639ea6a79c2e7927 SHA512 9d4f5dea925710da263546f52c685e82ddce66a52c3d2e16e52411b27a4adba07d28502af174217f138660eb8b016beb17a2e23a45edb757f49f80854f56a699 WHIRLPOOL 5fada469994b8fc155401d733a6a0f1ba226f6c4caeece77885b19608bf5649db4137ab584485965c439da8249598d1e0591e1934bf3748a0d8e1384a79f02bd
+AUX pinentry-0.9.6-add-disable-pinentry-qt5-option.patch 1810 SHA256 f19a155be0632ce3dbfa5dd17c01b9d54aa8abd130d411a82152b48ca35daf7a SHA512 e336403faf12e6deadd33fd7c87fbd45ba8fe0173b328881bca43b021170f523c5459d3e62651ef1d47a0bb8d5dc194125b29cbd09934653f98fbd5ece21f1b5 WHIRLPOOL 6d577042df3b8ce5c4729b761940ed95785c788a1e754d20d3a465f531ab63fb2c4c457193c2ad70ac2a302f344b17e457718f4e3480474a1f0366501dbf4986
 DIST pinentry-0.9.0.tar.bz2 464272 SHA256 90045a07ab8e1a8e1ecf5d19b51691f195525e579fa5d71d7e92c120b05490ab SHA512 2cc53a5c3852edaf6e940228d9b43fe4709344eba5fe230b7afd22b2c0239d0b258917d75661d80590b2d61c6fe9dac8ad15a0b4a0a0e7fba90a9e1c07364edd WHIRLPOOL 3f77a8aa2d44c7206d877e31088ec927473441e61f06e788330545d75ac489e6e9d5bf0026b23d0824304dad54ce8e61c4571d186df7ad0edc2d644ca3af04ac
-DIST pinentry-0.9.1.tar.bz2 482295 SHA256 9cd08e856b395df3adc7124170b53f77c6d5c8bf88e899e818648ec70d3e9695 SHA512 2462d25a471a6053a0d1b67a05d1a828b9d14ca4aeced352376ff16b6aa4d03fd6d1013aee1b07b97f9ee73f218065c48fe2746bbf27f3cb2bd9aa0b9c9c1a50 WHIRLPOOL 2e74e31567b26d0ee1d0d962f9c4dee6bd9c5a8679751dc85a14d3f2d47bc83aa068ac9810261c1e47a08eacb25777926be3de0db9e3d20d3d8348033c6b13c5
-DIST pinentry-0.9.2.tar.bz2 495742 SHA256 fd8bc1592ceb22bb492b07cb29b1b140bb882c859e6503b974254c0a4b4134d1 SHA512 68ba5643b9dc4e71b28f964172c7f37a67d1b22914c649c612e001c7c5ca0c40a0a2ec0974f50dbdc8dd98cc6266688c71d67e922db4334536797d331b0203cf WHIRLPOOL 457c8408ed04b2b5f72761d0b24cf1f07b1b81bb431cc666ee88015fda5a868a4ad296ac82fc98c79d5af5c1fdfdc597cb38914088143fb08e7838c9b572a090
-EBUILD pinentry-0.9.0-r3.ebuild 3136 SHA256 fbd8f91d0c28a92bc6923d19d0414f3c1b4035e6ce59eb7fdb153e5fe63f4551 SHA512 40c06d484b680507b18fdfdbbe17da15c1f41b9b7c87e8a3435b88d363f26d7ac8ec8d045c8e9f9988d110fe8ae826c249d5549974fe5bd60544718efadc4671 WHIRLPOOL 4053c9edbb0c036790166ba62ba25017eee419e43d5fadc2f561913d0a584fcb7d0b72e4da5e6a529316e06b23314bd88c17099e2fafe6c2b71a101129b7010f
-EBUILD pinentry-0.9.0.ebuild 2901 SHA256 e890a9acc471f6252fe4658e7f5b54a99525c06d5cf96681c3d0483dd9735829 SHA512 cfcd1733d69eebcf8e1c01d275edf7e50be76ddfe1fb439ebde80d7ae3f188d1f4feafa4fe471beb59a6d82aab4edf681a122f4acf74083b0e7816605faf0c7a WHIRLPOOL 5502e3e32b46d1aec265eeac5467772c95d7d404b5afe3e1a4b56333e8d581b4e8270b5cad44c66db99949229cbf6d3a38c12c7ca43174a87da6f3bc090775ff
-EBUILD pinentry-0.9.1.ebuild 2721 SHA256 97ba93a30e757ab11988a9f1ed9ece1175d61d0c353063a4372105dc6a37037f SHA512 a123d2bfea94b23b70ecee4c7f52ba8fe0cc163850f8dcad8952e137067c0717a089ef880f16454e296e86af983cb132b618ad3e750590cc891f741351b1651b WHIRLPOOL dbc1dca7cc2a7a98b27481f0eca034dc1ac73e80b3d5c94be8176564aff4e921704059ca510f6fc3fbaf485e714511231bc035177e40903b35bf701273b3f4ab
-EBUILD pinentry-0.9.2-r1.ebuild 3131 SHA256 2d498e346d2d422bb9d455e057ec4862afa0081f62371245984627f969f358f2 SHA512 92a39f12d2ca574e8f5358a60f7b62b81d0ac2306faaa52bf1118dc16a2d1e9e1115af682d3aaa55f63af4d0f9d849102005b60853dc366480442730194a1ff6 WHIRLPOOL fcf2c42bb9a7cd7324ae635088e313b20b10e6689274b4c7ce35f22b9a571c7ea2056e55d2b29e1eaf6f9cc3e275743a4face1b918f031a569e9d4556226e8e8
-MISC ChangeLog 23654 SHA256 80c43debd66f2fdb1f27590fd09c175e4a3321307658b5b26abb9a21c479e475 SHA512 e009debc609d71fdd6cfb8f1e0badbd201a853b7114cdd7d90e8262151c196badb16b5aaef06ee5cc9c7142627e2210f6158fb0768dd22f81216b027dad079ea WHIRLPOOL af8a8649adc3516e14564c038debdfba6e666192256d025ec16c27d9a5d3a4b222a81024339af6a298cb0786b3906598f76bfb10c2b2d2a6394cb214fd1222e5
-MISC metadata.xml 232 SHA256 0f9362f8e4539dec9b2feb1bd93d34e4dff44290f4dac44dd50f9d44de62360e SHA512 79b3d9679dd2d61479a24ef159f6a23758dad2b77679824bae7758c8f47375b4548e0adf135b3dae5c6d6eff23d134f9477a06fd29789d4fb98670431670bb01 WHIRLPOOL 2ac86da5a1d1512f358400d0616ca3baba6ad55d68ad68296975192cf4f60ed55a3faefe0c3290720d61f117e6c8b24b37cd017e8b8c21c77f977dda8d3212fa
-----BEGIN PGP SIGNATURE-----
-
-iQEcBAEBCAAGBQJVVLy5AAoJEP7VAChXwav6j/YH/A14DfR6901qyl1VtfYlLJfW
-tsJgsEXrU+T781NG5fu/73Y+CFVLBU4p2/6b1xjKTskncADW4DhdtIc2zS8GvjXV
-uvLXFOrdAS+bC4R/hQO7mIkQxqWIkpSEpu42YHZAMMzTOfNa83JCY8R6YHUBfbVh
-6FrzjGB6llrOKFq/nvU05R7XC9MoKV9sRvzBBoGDVckwrsIzuPBnH5x1lw0Z9i2u
-l4O68D0wFxwwJP6tfH8xLP79vrbXsHAVXdM3Z9AJS+wq/pLOGiS4XLlSMN3t7dW/
-D8S6HjuTI2Sc0LPj53IJy7o0UExuzlfkGiOG9FMRDmuucAZUSTXigVf45J0GA9g=
-=nZKb
-----END PGP SIGNATURE-----
+DIST pinentry-0.9.5.tar.bz2 514677 SHA256 6a57fd3afc0d8aaa5599ffcb3ea4e7c42c113a181e8870122203ea018384688c SHA512 31a190cacf45fd3ff5128a6a1a9f317fb09850fd595d5985392ea306ed65fa9232e2203458a9989eaac3b6e9d07199e01557912051f00a9a395cd1db61b44c39 WHIRLPOOL 52e9664d7cf0e804bb14b9586a89aca4037d3324261ac8931ed26365c32ae038b45eca9b7b6637b46f9231ff2db6a9e0a96a611404e48659c7ba009b84c40727
+DIST pinentry-0.9.6.tar.bz2 432889 SHA256 2a1124e9097f24f866cab7982610677e222cea71be0a71a5566f223177e01e66 SHA512 c9f94e5ce5baf6779f6effc13f82c8c7f99d426dc232114fc4e11a8684eaefbaf4f60363db78cdb9f4c8e91ba7af40779ec1c5d7e01ee15b84c7de77ccf46e72 WHIRLPOOL 954d185ce60eeb28717dd5986c4bdfda0472944b99d52caa213919b4dd1368b2d2b4cff27bfc4158a0fd7f70f7f6549b3415de7ba33239ec9305a2e0e0bdcbc0
+DIST pinentry-0.9.7.tar.bz2 432978 SHA256 6398208394972bbf897c3325780195584682a0d0c164ca5a0da35b93b1e4e7b2 SHA512 9c5bc8f7246e8b0affd83fea6e64c47cecf6a12515a82dd2a6712b230306a9c3c97da4dbf6519ea98c85c88bf180a5a2b8c46cedcd594f224e5a08f2f0e35bf0 WHIRLPOOL eb3f72acf6990d61b4279de89a334e68c6052a3edef789aab2a421c2e489c1286b756bf3c9b8e6dd4cee3716e32b53d0e9d41db15a5069e010fe713dfba0596a
+EBUILD pinentry-0.9.0-r3.ebuild 3031 SHA256 0c0ecf8b1cfcd961b5707f86dd671fc318318183ab26d8fcfc057c844bd4972f SHA512 c00d23ab91d4b7f17c60d6b185b4e5efb07ca272c8462c9980f021646d8650f1f0f527ea6cca2a00f3c516539a8f62e5fe281ae656f1f91f659803867528cddc WHIRLPOOL b0fc56776ccf6c17ba77298938e43293ea7fb2ae301430bb6aad8acb758209924f7834440f7965e9ff0944888e981a811c6d47fc37ac0cb3f41e3db6f7143f2b
+EBUILD pinentry-0.9.0.ebuild 2801 SHA256 3d0e728992ad56c7fd10d14b6ca5c02792b269fdc4d4c3beabad59422a453fbe SHA512 a9fc226f3f803ac9c55b92e7124d233391a4069d6feca5d45bad4986864dc55babca2812f0a077f219d25c891171bc3f8da803d5b54fdbf0018e1e7ca1cc2999 WHIRLPOOL 6e2699f0dbdbca9f5cdc9e78b09fc27daddcb391f446291e0651945bf9327631e5626833810cb8de74b35c4d0c93d410b56af70c69a6695fe52f0d07d5c3133f
+EBUILD pinentry-0.9.5.ebuild 2814 SHA256 3b3933b6c426ecc648eea6c84c7782e3f6bde6c9e036879bd2369de61ea204ce SHA512 6ee8c4b85f1f00133f4cf38eb11becf626e9b598087fbcca960a8b1a6d63fe2dd435535fe853ac14f939e7e407f952c59b3ac51a2e3a1eb2672db57a7b5b9261 WHIRLPOOL de819041d1cd1a57b1cc5573828163f88d0572f107212e2daa2b59b6e98f807cde33e2d13f3e3334d15252c143bdb405f3847861791a8cf3271c83775e830480
+EBUILD pinentry-0.9.6-r6.ebuild 3330 SHA256 23f5ceb1b56767ab5d6cc45201eb567ea663725a53200340c6ba8d0da7164ee0 SHA512 ee0ce6c522192a9f5526b46d4d919dd34cc8085a46b58e59825925be6be531eca1f0d8fda183272651fa26791daed5854f3496897e6346cf1b3747107498cb30 WHIRLPOOL 6967f58bbf3f7c25ae92598e979449de5634739c21e21faff5a672d7fcf92164f7f155434b2b9095ec48fe9b7de0e803849df804b7ddc0bd41fedf332ddc2fec
+EBUILD pinentry-0.9.7.ebuild 3267 SHA256 0803f590e248ffc5cce3e6ce558be144f70ceda8392e8c7e45afe7c1652785de SHA512 56eb916d00b9b1e6aaf9b94417c74002a393c8c1be03dd0853167d035e1baa28a02bee5508f2aae3ce0508b7a5ab5ade791b1c0468b9a79556948ecb7d9a3856 WHIRLPOOL c0738aa6bd77b757d4df63c558e330bc737cfa5cab9a13074077a11ce3b6818c54001dd82465323efc8948256a3b43a42c851532b54ee917f15bb253804f8a59
+MISC ChangeLog 8256 SHA256 d5ba3c55fcf770bbdd31e4ad74ef2497903a96ed17d8c664440f844f48cb081e SHA512 de2a41e9da59690fe8c89d0a178b1acaf182ea593ae46d4a84e868daef76353968a59cb7ac5f17e087ac76c0b2f7dfbc31c0e2114918f4416e90868cd7235fa2 WHIRLPOOL 70b63e72f0b50151518f82bc980076e0f55f1aaec887cbae533a755ff7c1e9417788d62bba7d1cf86ec7ee2b3597d875dca6406c34559b054d6032e374e67d3d
+MISC ChangeLog-2015 25487 SHA256 599f868331443fbdf95c4b9ef073517aeb355df82a2878199d311310891ebaa1 SHA512 b6cbb7b6abb7ba7e70094d334d18da227aec8b0e7654af58736fd6a5626dd178c23ac7524abddaf2dbf67037f117e98d6bf4a3757f0c2bb9428e55f0154c8f96 WHIRLPOOL 7683a728f4a93c78d60061a1a85785a3a7271e5854a81e7485fae2760190d49edd1d43e68db525ffc785a1ae45cb52b7df7af9a47d77b84c8a5c397ee4a29d56
+MISC metadata.xml 316 SHA256 53d51710114a2dd932a24af75b9530398486b640bf00be802927683b6a361b4e SHA512 b5dfbe41242975b38089914c0373835afc5dea7b1c704fff016f8a8ee074c6b1b40c3b5beb13bc4294d79996fca62a67300e449d0c992f2104aa5f2abf003f03 WHIRLPOOL 1a60aec45779e161767393ebe1bbcea75b58f46b619682dbaf2eb2f4bf659ec2cd4a893efab0243feb39514ce5ce17d0f3deb577c7ecd7a8598fc7e3b298720f
--- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.1-memleak.patch
+++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.1-memleak.patch
@ -1,26 +0,0 @@
-From 03e4207f11e228a4c079af991f82507539793bae Mon Sep 17 00:00:00 2001
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 28 Apr 2015 13:01:16 -0400
-Subject: [PATCH] fix small memory leak in pinentry-curses
-
-* pinentry/pinentry-curses.c: free internally allocated local string.
---
- pinentry/pinentry-curses.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/pinentry/pinentry-curses.c b/pinentry/pinentry-curses.c
-index 4b7080e..043f8a9 100644
--- a/pinentry/pinentry-curses.c
-+++ b/pinentry/pinentry-curses.c
-@@ -199,6 +199,8 @@ utf8_to_local (char *lc_ctype, char *string)
-   memset (&ps, 0, sizeof(mbstate_t));
-   mbsrtowcs (wcs, &p, len, &ps);
- 
-+  free (local);
-+  
-  leave:
-   if (old_ctype)
-     {
-- 
-2.1.4
-
--- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-cmd_confirm.patch
+++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-cmd_confirm.patch
@ -1,47 +0,0 @@
-From 29236f84aca64be72c97a9b5513457a4e45afbc6 Mon Sep 17 00:00:00 2001
-From: "Neal H. Walfield" <neal@gnu.org>
-Date: Mon, 11 May 2015 16:14:58 +0200
-Subject: [PATCH] Implement cmd_confirm in terms of cmd_message.
-
-* pinentry/pinentry.c (cmd_confirm): Implement cmd_confirm in terms of
-cmd_message.
---
- pinentry/pinentry.c | 22 +---------------------
- 1 file changed, 1 insertion(+), 21 deletions(-)
-
-diff --git a/pinentry/pinentry.c b/pinentry/pinentry.c
-index f28c576..11a8027 100644
--- a/pinentry/pinentry.c
-+++ b/pinentry/pinentry.c
-@@ -1146,27 +1146,7 @@ cmd_confirm (ASSUAN_CONTEXT ctx, char *line)
- static int
- cmd_message (ASSUAN_CONTEXT ctx, char *line)
- {
-  int result;
-
-  pinentry.one_button = 1;
-  pinentry.quality_bar = 0;
-  pinentry.close_button = 0;
-  pinentry.locale_err = 0;
-  pinentry.specific_err = 0;
-  result = (*pinentry_cmd_handler) (&pinentry);
-  if (pinentry.error)
-    {
-      free (pinentry.error);
-      pinentry.error = NULL;
-    }
-
-  if (pinentry.close_button)
-    assuan_write_status (ctx, "BUTTON_INFO", "close");
-
-  return result ? 0
-                : (pinentry.specific_err? pinentry.specific_err :
-                   pinentry.locale_err? ASSUAN_Locale_Problem
-                                      : 0);
-+  return cmd_confirm (ctx, "--one-button");
- }
- 
- /* GETINFO <what>
-- 
-2.1.4
-
--- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-gnome3.patch
+++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-gnome3.patch
@ -1,518 +0,0 @@
-From be87785005d256b7f3dacc607ba5ea0a14de8593 Mon Sep 17 00:00:00 2001
-From: "Neal H. Walfield" <neal@gnu.org>
-Date: Tue, 12 May 2015 17:07:49 +0200
-Subject: [PATCH] Add a GNOME3 pinentry based on gcr.
-
-* configure.ac (--enable-pinentry-gnome3): Option to enable the GNOME3
-pinentry.
-(pinentry_gnome_3): Set to yes if enabled and gcr-3 and gcr-base-3 gcr
-is available.
-(GNOME3CFLAGS): Define and AC_SUBST.
-(GNOME3LIBS): Define and AC_SUBST.
-(GCR_API_SUBJECT_TO_CHANGE): Define.
-(BUILD_PINENTRY_GNOME_3): Define.
-* Makefile.am (pinentry_gnome_3): Define.
-(SUBDIRS): Add ${pinentry_gnome_3}.
-* gnome3/Makefile.am: New file.
-* gnome3/pinentry-gnome3.c: New file.
---
- Makefile.am              |  11 +-
- configure.ac             |  62 +++++++++--
- gnome3/Makefile.am       |  39 +++++++
- gnome3/pinentry-gnome3.c | 271 +++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 370 insertions(+), 13 deletions(-)
- create mode 100644 gnome3/Makefile.am
- create mode 100644 gnome3/pinentry-gnome3.c
-
-diff --git a/Makefile.am b/Makefile.am
-index f8f7aac..177f37e 100644
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,5 +1,5 @@
- # Makefile.am
-# Copyright (C) 2002, 2012 g10 Code GmbH
-+# Copyright (C) 2002, 2012, 2015 g10 Code GmbH
- #
- # This file is part of PINENTRY.
- #
-@@ -46,6 +46,12 @@ else
- pinentry_gtk_2 =
- endif
- 
-+if BUILD_PINENTRY_GNOME_3
-+pinentry_gnome_3 = gnome3
-+else
-+pinentry_gnome_3 =
-+endif
-+
- if BUILD_PINENTRY_QT4
- pinentry_qt4 = qt4
- else
-@@ -59,7 +65,8 @@ pinentry_w32 =
- endif
- 
- SUBDIRS = assuan secmem pinentry ${pinentry_curses} ${pinentry_tty} \
-	  ${pinentry_gtk_2} ${pinentry_qt4} ${pinentry_w32} doc
-+	${pinentry_gtk_2} ${pinentry_gnome_3} ${pinentry_qt4} \
-+	${pinentry_w32} doc
- 
- 
- install-exec-local:
-diff --git a/configure.ac b/configure.ac
-index c50ce68..9948d1f 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -274,28 +274,34 @@ fi
- 
- 
- dnl
-dnl Check for GTK+-2 pinentry program.
-+dnl Check for GTK+-2 / GNOME3 pinentry programs.
- dnl
- AC_ARG_ENABLE(pinentry-gtk2,
-             AC_HELP_STRING([--enable-pinentry-gtk2], [build GTK+-2 pinentry]),
-             pinentry_gtk_2=$enableval, pinentry_gtk_2=maybe)
- 
-+AC_ARG_ENABLE(pinentry-gnome3,
-+            AC_HELP_STRING([--enable-pinentry-gnome3], [build GNOME 3 pinentry]),
-+            pinentry_gnome_3=$enableval, pinentry_gnome_3=maybe)
-+
- dnl check for pkg-config
-if test "$pinentry_gtk_2" != "no"; then
-+if test "$pinentry_gtk_2" != "no" -o "$pinentry_gnome_3" != "no"; then
-         AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
- 	if test x"${PKG_CONFIG}" = xno ; then
- 		pinentry_gtk_2=no
-+		pinentry_gnome_3=no
- 	fi
- fi
- 
- dnl check if the module gtk+-2.0 exists
-if test "$pinentry_gtk_2" != "no"; then
-+if test "$pinentry_gtk_2" != "no" -o "$pinentry_gnome_3" != "no"; then
- 	AC_MSG_CHECKING([for gtk+-2])
- 	"${PKG_CONFIG}" --exists gtk+-2.0
- 	if test $? -ne 0 ; then
- 		AC_MSG_RESULT([no])
- 		AC_MSG_WARN([pkg-config could not find the module gtk+-2.0])
- 		pinentry_gtk_2=no
-+		pinentry_gnome_3=no
- 	else
- 		AC_MSG_RESULT([yes])
- 		AC_MSG_CHECKING([gtk+-2 version >= 2.4.0])
-@@ -305,17 +311,45 @@ if test "$pinentry_gtk_2" != "no"; then
- 		if test $? -ne 0 ; then
- 			AC_MSG_WARN([building GTK+-2 pinentry disabled])
- 			pinentry_gtk_2=no
-+			pinentry_gnome_3=no
- 		else
- 			GTK2CFLAGS=`"${PKG_CONFIG}" --cflags gtk+-2.0`
- 			GTK2LIBS=`"${PKG_CONFIG}" --libs gtk+-2.0`
- 			AC_SUBST(GTK2CFLAGS)
- 			AC_SUBST(GTK2LIBS)
-			pinentry_gtk_2=yes
-+			if test "$pinentry_gtk_2" != "no"
-+			then
-+			  pinentry_gtk_2=yes
-+			fi
-+			if test "$pinentry_gnome_3" != "no"
-+			then
-+			  pinentry_gnome_3=yes
-+			fi
- 		fi
- 	fi
- fi
- AM_CONDITIONAL(BUILD_PINENTRY_GTK_2, test "$pinentry_gtk_2" = "yes")
- 
-+if test "$pinentry_gnome_3" != "no"; then
-+	AC_MSG_CHECKING([for gcr])
-+	"${PKG_CONFIG}" --exists gcr-3,gcr-base-3
-+	if test $? -ne 0 ; then
-+		AC_MSG_RESULT([no])
-+		AC_MSG_WARN([pkg-config could not find the module gcr-3,gcr-base-3])
-+		pinentry_gnome_3=no
-+	else
-+		AC_MSG_RESULT([yes])
-+		GNOME3CFLAGS=`"${PKG_CONFIG}" --cflags gcr-3,gcr-base-3`
-+		GNOME3LIBS=`"${PKG_CONFIG}" --libs gcr-3,gcr-base-3`
-+		AC_SUBST(GNOME3CFLAGS)
-+		AC_SUBST(GNOME3LIBS)
-+		AC_DEFINE(GCR_API_SUBJECT_TO_CHANGE, 1, [Nod nod])
-+		pinentry_gnome_3=yes
-+	fi
-+fi
-+
-+AM_CONDITIONAL(BUILD_PINENTRY_GNOME_3, test "$pinentry_gnome_3" = "yes")
-+
- dnl
- dnl Check for libsecret.
- dnl
-@@ -450,16 +484,20 @@ else
-   if test "$pinentry_qt4" = "yes"; then
-     PINENTRY_DEFAULT=pinentry-qt4
-   else
-    if test "$pinentry_curses" = "yes"; then
-      PINENTRY_DEFAULT=pinentry-curses
-+    if test "$pinentry_gnome_3" = "yes"; then
-+      PINENTRY_DEFAULT=pinentry-gnome3
-     else
-      if test "$pinentry_tty" = "yes"; then
-        PINENTRY_DEFAULT=pinentry-tty
-+      if test "$pinentry_curses" = "yes"; then
-+        PINENTRY_DEFAULT=pinentry-curses
-       else
-        if test "$pinentry_w32" = "yes"; then
-          PINENTRY_DEFAULT=pinentry-w32
-+        if test "$pinentry_tty" = "yes"; then
-+          PINENTRY_DEFAULT=pinentry-tty
-         else
-          AC_MSG_ERROR([[No pinentry enabled.]])
-+          if test "$pinentry_w32" = "yes"; then
-+            PINENTRY_DEFAULT=pinentry-w32
-+          else
-+            AC_MSG_ERROR([[No pinentry enabled.]])
-+          fi
-         fi
-       fi
-     fi
-@@ -475,6 +513,7 @@ pinentry/Makefile
- curses/Makefile
- tty/Makefile
- gtk+-2/Makefile
-+gnome3/Makefile
- qt4/Makefile
- w32/Makefile
- doc/Makefile
-@@ -493,6 +532,7 @@ AC_MSG_NOTICE([
- 	Curses Pinentry ..: $pinentry_curses
- 	TTY Pinentry .....: $pinentry_tty
- 	GTK+-2 Pinentry ..: $pinentry_gtk_2
-+	GNOME 3 Pinentry .: $pinentry_gnome_3
- 	Qt4 Pinentry .....: $pinentry_qt4 $pinentry_qt4_clip_msg
- 	W32 Pinentry .....: $pinentry_w32
- 
-diff --git a/gnome3/Makefile.am b/gnome3/Makefile.am
-new file mode 100644
-index 0000000..78df706
--- /dev/null
-+++ b/gnome3/Makefile.am
-@@ -0,0 +1,39 @@
-+# Makefile.am - PIN entry GTK+ frontend.
-+# Copyright (C) 2002, 2015 g10 Code GmbH
-+#
-+# This file is part of PINENTRY.
-+#
-+# PINENTRY is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+# 
-+# PINENTRY 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 General Public License for more details.
-+# 
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-+
-+## Process this file with automake to produce Makefile.in
-+
-+bin_PROGRAMS = pinentry-gnome3
-+
-+if FALLBACK_CURSES
-+ncurses_include = $(NCURSES_INCLUDE)
-+libcurses = ../pinentry/libpinentry-curses.a $(LIBCURSES) $(LIBICONV)
-+else
-+ncurses_include =
-+libcurses =
-+endif
-+
-+AM_CPPFLAGS = $(COMMON_CFLAGS) $(GNOME3CFLAGS) \
-+	$(ncurses_include) -I$(top_srcdir)/assuan \
-+	-I$(top_srcdir)/secmem -I$(top_srcdir)/pinentry
-+LDADD = $(COMMON_LIBS) \
-+	../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a \
-+	$(LIBCAP) $(GNOME3LIBS) $(libcurses)
-+
-+pinentry_gnome3_SOURCES = pinentry-gnome3.c
-diff --git a/gnome3/pinentry-gnome3.c b/gnome3/pinentry-gnome3.c
-new file mode 100644
-index 0000000..74ec89c
--- /dev/null
-+++ b/gnome3/pinentry-gnome3.c
-@@ -0,0 +1,271 @@
-+/* pinentry-gnome3.c
-+   Copyright (C) 2015 g10 Code GmbH
-+
-+   pinentry-gnome-3 is a pinentry application for GNOME 3.  It tries
-+   to follow the Gnome Human Interface Guide as close as possible.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2 of the License, or
-+   (at your option) any later version.
-+
-+   This program 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 General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
-+
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
-+#include <gtk/gtk.h>
-+#include <gcr/gcr-base.h>
-+
-+#include <string.h>
-+
-+#include "assuan.h"
-+
-+#include "memory.h"
-+
-+#include "pinentry.h"
-+
-+#ifdef FALLBACK_CURSES
-+#include "pinentry-curses.h"
-+#endif
-+
-+
-+#define PGMNAME "pinentry-gnome3"
-+
-+#ifndef VERSION
-+#  define VERSION
-+#endif
-+
-+static gchar *
-+pinentry_utf8_validate (gchar *text)
-+{
-+  gchar *result;
-+
-+  if (!text)
-+    return NULL;
-+
-+  if (g_utf8_validate (text, -1, NULL))
-+    return g_strdup (text);
-+
-+  /* Failure: Assume that it was encoded in the current locale and
-+     convert it to utf-8.  */
-+  result = g_locale_to_utf8 (text, -1, NULL, NULL, NULL);
-+  if (!result)
-+    {
-+      gchar *p;
-+
-+      result = p = g_strdup (text);
-+      while (!g_utf8_validate (p, -1, (const gchar **) &p))
-+	*p = '?';
-+    }
-+  return result;
-+}
-+
-+static GcrPrompt *
-+create_prompt (pinentry_t pe, int confirm)
-+{
-+  GcrPrompt *prompt;
-+  GError *error = NULL;
-+  char *msg;
-+
-+  /* Create the prompt.  */
-+  prompt = GCR_PROMPT (gcr_system_prompt_open (-1, NULL, &error));
-+  if (! prompt)
-+    {
-+      g_warning ("couldn't create prompt for gnupg passphrase: %s",
-+		 error->message);
-+      g_error_free (error);
-+      return NULL;
-+    }
-+
-+  /* Set the messages for the various buttons, etc.  */
-+  if (pe->title)
-+    {
-+      msg = pinentry_utf8_validate (pe->title);
-+      gcr_prompt_set_title (prompt, msg);
-+      g_free (msg);
-+    }
-+
-+  if (pe->description)
-+    {
-+      msg = pinentry_utf8_validate (pe->description);
-+      gcr_prompt_set_description (prompt, msg);
-+      g_free (msg);
-+    }
-+
-+  /* An error occured during the last prompt.  */
-+  if (pe->error)
-+    {
-+      msg = pinentry_utf8_validate (pe->error);
-+      gcr_prompt_set_warning (prompt, msg);
-+      g_free (msg);
-+    }
-+
-+  if (! pe->prompt && confirm)
-+    gcr_prompt_set_message (prompt, "Message");
-+  else if (! pe->prompt && ! confirm)
-+    gcr_prompt_set_message (prompt, "Enter Passphrase");
-+  else
-+    {
-+      msg = pinentry_utf8_validate (pe->prompt);
-+      gcr_prompt_set_message (prompt, msg);
-+      g_free (msg);
-+    }
-+
-+  if (! confirm)
-+    gcr_prompt_set_password_new (prompt, !!pe->repeat_passphrase);
-+
-+  if (pe->ok || pe->default_ok)
-+    {
-+      msg = pinentry_utf8_validate (pe->ok ?: pe->default_ok);
-+      gcr_prompt_set_continue_label (prompt, msg);
-+      g_free (msg);
-+    }
-+  /* XXX: Disable this button if pe->one_button is set.  */
-+  if (pe->cancel || pe->default_cancel)
-+    {
-+      msg = pinentry_utf8_validate (pe->cancel ?: pe->default_cancel);
-+      gcr_prompt_set_cancel_label (prompt, msg);
-+      g_free (msg);
-+    }
-+
-+  if (confirm && pe->notok)
-+    {
-+      /* XXX: Add support for the third option.  */
-+    }
-+
-+  /* XXX: gcr expects a string; we have a int.  */
-+  // gcr_prompt_set_caller_window (prompt, pe->parent_wid);
-+
-+  if (! confirm && pe->allow_external_password_cache && pe->keyinfo)
-+    {
-+      if (pe->default_pwmngr)
-+	{
-+	  msg = pinentry_utf8_validate (pe->default_pwmngr);
-+	  gcr_prompt_set_choice_label (prompt, msg);
-+	  g_free (msg);
-+	}
-+      else
-+	gcr_prompt_set_choice_label
-+	  (prompt, "Automatically unlock this key, whenever I'm logged in");
-+    }
-+
-+  return prompt;
-+}
-+
-+static int
-+gnome3_cmd_handler (pinentry_t pe)
-+{
-+  GcrPrompt *prompt = NULL;
-+  GError *error = NULL;
-+  int ret = -1;
-+
-+  if (pe->pin)
-+    /* Passphrase mode.  */
-+    {
-+      const char *password;
-+
-+      prompt = create_prompt (pe, 0);
-+      if (! prompt)
-+	/* Something went wrong.  */
-+	{
-+	  pe->canceled = 1;
-+	  return -1;
-+	}
-+
-+      /* "The returned password is valid until the next time a method
-+	 is called to display another prompt."  */
-+      password = gcr_prompt_password_run (prompt, NULL, &error);
-+      if (error)
-+	/* Error.  */
-+	{
-+	  pe->specific_err = ASSUAN_General_Error;
-+	  g_error_free (error);
-+	  ret = -1;
-+	}
-+      else if (! password && ! error)
-+	/* User cancelled the operation.  */
-+	ret = -1;
-+      else
-+	{
-+	  pinentry_setbufferlen (pe, strlen (password) + 1);
-+	  if (pe->pin)
-+	    strcpy (pe->pin, password);
-+
-+	  if (pe->repeat_passphrase)
-+	    pe->repeat_okay = 1;
-+
-+	  ret = 1;
-+	}
-+    }
-+  else
-+    /* Message box mode.  */
-+    {
-+      GcrPromptReply reply;
-+
-+      prompt = create_prompt (pe, 1);
-+      if (! prompt)
-+	/* Something went wrong.  */
-+	{
-+	  pe->canceled = 1;
-+	  return -1;
-+	}
-+
-+      /* XXX: We don't support a third button!  */
-+
-+      reply = gcr_prompt_confirm_run (prompt, NULL, &error);
-+      if (error)
-+	{
-+	  pe->specific_err = ASSUAN_General_Error;
-+	  ret = 0;
-+	}
-+      else if (reply == GCR_PROMPT_REPLY_CONTINUE
-+	       /* XXX: Hack since gcr doesn't yet support one button
-+		  message boxes treat cancel the same as okay.  */
-+	       || pe->one_button)
-+	/* Confirmation.  */
-+	ret = 1;
-+      else
-+	/* GCR_PROMPT_REPLY_CANCEL */
-+	{
-+	  pe->canceled = 1;
-+	  ret = 0;
-+	}
-+    }
-+
-+  if (prompt)
-+    g_clear_object (&prompt);
-+  return ret;
-+}
-+
-+pinentry_cmd_handler_t pinentry_cmd_handler = gnome3_cmd_handler;
-+
-+int
-+main (int argc, char *argv[])
-+{
-+  pinentry_init (PGMNAME);
-+
-+#ifdef FALLBACK_CURSES
-+  if (pinentry_have_display (argc, argv))
-+    gtk_init (&argc, &argv);
-+  else
-+    pinentry_cmd_handler = curses_cmd_handler;
-+#else
-+  gtk_init (&argc, &argv);
-+#endif
-+
-+  pinentry_parse_opts (argc, argv);
-+
-+  if (pinentry_loop ())
-+    return 1;
-+
-+  return 0;
-+}
-- 
-2.1.4
-
--- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-handlers-return.patch
+++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-handlers-return.patch
@ -1,28 +0,0 @@
-From 3062742b945f95d72001896f8ba5468b9e63aa9b Mon Sep 17 00:00:00 2001
-From: "Neal H. Walfield" <neal@gnu.org>
-Date: Wed, 13 May 2015 14:20:23 +0200
-Subject: [PATCH 1/1] Don't interpret the handler's return value as the
- passphrase's length.
-
-* pinentry/pinentry.c (cmd_getpin): Don't interpret the return value
-as the passphrase length.  Use strlen instead.
---
- pinentry/pinentry.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pinentry/pinentry.c b/pinentry/pinentry.c
-index 53216fc..836ee14 100644
--- a/pinentry/pinentry.c
-+++ b/pinentry/pinentry.c
-@@ -1109,7 +1109,7 @@ cmd_getpin (ASSUAN_CONTEXT ctx, char *line)
-     {
-       if (pinentry.repeat_okay)
-         assuan_write_status (ctx, "PIN_REPEATED", "");
-      result = assuan_send_data (ctx, pinentry.pin, result);
-+      result = assuan_send_data (ctx, pinentry.pin, strlen(pinentry.pin));
-       if (!result)
- 	result = assuan_send_data (ctx, NULL, 0);
- 
-- 
-2.1.4
-
--- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-linking-order.patch
+++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-linking-order.patch
@ -1,104 +0,0 @@
-From 496235af8dfd373b54e5610f86bf1cada175ac23 Mon Sep 17 00:00:00 2001
-From: "Neal H. Walfield" <neal@gnu.org>
-Date: Wed, 13 May 2015 21:47:11 +0200
-Subject: [PATCH 1/1] Fix linking order to work when linked with --as-needed.
-
-* curses/Makefile.am (LDADD): Add $(COMMON_LIBS) after all of the
-local objects and object archives.
-* gnome3/Makefile.am (LDADD): Likewise.
-* gtk+-2/Makefile.am (LDADD): Likewise.
-* qt4/Makefile.am (pinentry_qt4_LDADD): Likewise.
-* tty/Makefile.am (LDADD): Likewise.
-
-Reported-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
---
- curses/Makefile.am | 5 ++---
- gnome3/Makefile.am | 5 ++---
- gtk+-2/Makefile.am | 5 ++---
- qt4/Makefile.am    | 6 +++---
- tty/Makefile.am    | 4 ++--
- 5 files changed, 11 insertions(+), 14 deletions(-)
-
-diff --git a/curses/Makefile.am b/curses/Makefile.am
-index e8ea031..4d764c7 100644
--- a/curses/Makefile.am
-+++ b/curses/Makefile.am
-@@ -22,9 +22,8 @@
- bin_PROGRAMS = pinentry-curses
- 
- AM_CPPFLAGS = $(COMMON_CFLAGS) $(NCURSES_INCLUDE) -I$(top_srcdir)/pinentry
-LDADD = $(COMMON_LIBS) \
-	../pinentry/libpinentry.a ../pinentry/libpinentry-curses.a \
-+LDADD = ../pinentry/libpinentry.a ../pinentry/libpinentry-curses.a \
- 	../assuan/libassuan.a ../secmem/libsecmem.a \
-	$(LIBCAP) $(LIBCURSES) $(LIBICONV)
-+	$(COMMON_LIBS) $(LIBCAP) $(LIBCURSES) $(LIBICONV)
- 
- pinentry_curses_SOURCES = pinentry-curses.c
-diff --git a/gnome3/Makefile.am b/gnome3/Makefile.am
-index 78df706..46639de 100644
--- a/gnome3/Makefile.am
-+++ b/gnome3/Makefile.am
-@@ -32,8 +32,7 @@ endif
- AM_CPPFLAGS = $(COMMON_CFLAGS) $(GNOME3CFLAGS) \
- 	$(ncurses_include) -I$(top_srcdir)/assuan \
- 	-I$(top_srcdir)/secmem -I$(top_srcdir)/pinentry
-LDADD = $(COMMON_LIBS) \
-	../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a \
-	$(LIBCAP) $(GNOME3LIBS) $(libcurses)
-+LDADD = ../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a \
-+	$(COMMON_LIBS) $(LIBCAP) $(GNOME3LIBS) $(libcurses)
- 
- pinentry_gnome3_SOURCES = pinentry-gnome3.c
-diff --git a/gtk+-2/Makefile.am b/gtk+-2/Makefile.am
-index c98139f..7e37469 100644
--- a/gtk+-2/Makefile.am
-+++ b/gtk+-2/Makefile.am
-@@ -31,9 +31,8 @@ endif
- 
- AM_CPPFLAGS = $(COMMON_CFLAGS) $(GTK2CFLAGS) $(ncurses_include) \
- 	-I$(top_srcdir)/secmem -I$(top_srcdir)/pinentry
-LDADD = $(COMMON_LIBS) \
-	../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a \
-	$(LIBCAP) $(GTK2LIBS) $(libcurses)
-+LDADD = ../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a \
-+	$(COMMON_LIBS) $(LIBCAP) $(GTK2LIBS) $(libcurses)
- 
- pinentry_gtk_2_SOURCES = pinentry-gtk-2.c \
- 	gtksecentry.c gtksecentry.h gseal-gtk-compat.h
-diff --git a/qt4/Makefile.am b/qt4/Makefile.am
-index 31274bb..816aade 100644
--- a/qt4/Makefile.am
-+++ b/qt4/Makefile.am
-@@ -38,10 +38,10 @@ AM_CPPFLAGS = $(COMMON_CFLAGS) \
- 	-I$(top_srcdir) -I$(top_srcdir)/assuan -I$(top_srcdir)/secmem \
- 	$(ncurses_include) -I$(top_srcdir)/pinentry
- AM_CXXFLAGS = $(QT4_CORE_CFLAGS) $(QT4_GUI_CFLAGS)
-pinentry_qt4_LDADD = $(COMMON_LIBS) \
-	$(QT4_CORE_LIBS) $(QT4_GUI_LIBS) $(libcurses) \
-+pinentry_qt4_LDADD = \
- 	../pinentry/libpinentry.a $(top_builddir)/assuan/libassuan.a \
-	$(top_builddir)/secmem/libsecmem.a $(LIBCAP)
-+	$(top_builddir)/secmem/libsecmem.a \
-+	$(COMMON_LIBS) $(QT4_CORE_LIBS) $(QT4_GUI_LIBS) $(libcurses) $(LIBCAP)
- 
- BUILT_SOURCES = \
- 	pinentryconfirm.moc qsecurelineedit.moc pinentrydialog.moc
-diff --git a/tty/Makefile.am b/tty/Makefile.am
-index 798c08f..aa805b2 100644
--- a/tty/Makefile.am
-+++ b/tty/Makefile.am
-@@ -21,8 +21,8 @@
- bin_PROGRAMS = pinentry-tty
- 
- AM_CPPFLAGS = $(COMMON_CFLAGS) -I$(top_srcdir)/pinentry
-LDADD = $(COMMON_LIBS) ../pinentry/libpinentry.a \
-+LDADD = ../pinentry/libpinentry.a \
- 	../assuan/libassuan.a ../secmem/libsecmem.a \
-	$(LIBCAP) $(LIBICONV)
-+	$(COMMON_LIBS) $(LIBCAP) $(LIBICONV)
- 
- pinentry_tty_SOURCES = pinentry-tty.c
-- 
-2.1.4
-
--- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-management.patch
+++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-management.patch
@ -1,136 +0,0 @@
-From bdd81974633f8e31d582b62999ef9b004bc3b95e Mon Sep 17 00:00:00 2001
-From: "Neal H. Walfield" <neal@gnu.org>
-Date: Wed, 13 May 2015 13:52:03 +0200
-Subject: [PATCH 1/1] Make the management of pinentry.pin more explicit.
-
-* pinentry/pinentry.c: Include <assert.h>.
-(pinentry): Set pin_len to 0.
-(pinentry_setbufferlen): If len is less than 2048, set it to 2048.
-Add an assertion.
-(pinentry_setbuffer_clear): New function that releases the pin buffer.
-(pinentry_setbuffer_init): New function that initializes the pin
-buffer.
-(cmd_getpin): Use pinentry_setbuffer_init and pinentry_setbuffer_clear
-instead of manual memory management.
-(cmd_confirm): Use pinentry_setbuffer_clear instead of manual memory
-management.
---
- pinentry/pinentry.c | 52 +++++++++++++++++++++++++++++++++++++++-------------
- 1 file changed, 39 insertions(+), 13 deletions(-)
-
-diff --git a/pinentry/pinentry.c b/pinentry/pinentry.c
-index 3a44851..53216fc 100644
--- a/pinentry/pinentry.c
-+++ b/pinentry/pinentry.c
-@@ -27,6 +27,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#include <assert.h>
- #ifndef HAVE_W32CE_SYSTEM
- # include <locale.h>
- #endif
-@@ -67,7 +68,7 @@ struct pinentry pinentry =
-     NULL,	/* Not-Ok button.  */
-     NULL,	/* Cancel button.  */
-     NULL,	/* PIN.  */
-    2048,	/* PIN length.  */
-+    0,		/* PIN length.  */
-     0,          /* pin_from_cache.  */
-     0,		/* Display.  */
-     0,		/* TTY name.  */
-@@ -354,8 +355,18 @@ char *
- pinentry_setbufferlen (pinentry_t pin, int len)
- {
-   char *newp;
-  if (len < pinentry.pin_len)
-+
-+  if (pin->pin_len)
-+    assert (pin->pin);
-+  else
-+    assert (!pin->pin);
-+
-+  if (len < 2048)
-+    len = 2048;
-+
-+  if (len <= pin->pin_len)
-     return NULL;
-+
-   newp = secmem_realloc (pin->pin, len);
-   if (newp)
-     {
-@@ -371,6 +382,28 @@ pinentry_setbufferlen (pinentry_t pin, int len)
-   return newp;
- }
- 
-+static void
-+pinentry_setbuffer_clear (pinentry_t pin)
-+{
-+  if (! pin->pin)
-+    {
-+      assert (pin->pin_len == 0);
-+      return;
-+    }
-+
-+  assert (pin->pin_len > 0);
-+
-+  secmem_free (pin->pin);
-+  pin->pin = NULL;
-+  pin->pin_len = 0;
-+}
-+
-+static void
-+pinentry_setbuffer_init (pinentry_t pin)
-+{
-+  pinentry_setbuffer_clear (pin);
-+  pinentry_setbufferlen (pin, 0);
-+}
- 
- /* Initialize the secure memory subsystem, drop privileges and return.
-    Must be called early. */
-@@ -983,7 +1016,7 @@ cmd_getpin (ASSUAN_CONTEXT ctx, char *line)
-   int set_prompt = 0;
-   int just_read_password_from_cache = 0;
- 
-  pinentry.pin = secmem_malloc (pinentry.pin_len);
-+  pinentry_setbuffer_init (&pinentry);
-   if (!pinentry.pin)
-     return ASSUAN_Out_Of_Core;
- 
-@@ -1065,11 +1098,7 @@ cmd_getpin (ASSUAN_CONTEXT ctx, char *line)
- 
-   if (result < 0)
-     {
-      if (pinentry.pin)
-	{
-	  secmem_free (pinentry.pin);
-	  pinentry.pin = NULL;
-	}
-+      pinentry_setbuffer_clear (&pinentry);
-       if (pinentry.specific_err)
-         return pinentry.specific_err;
-       return pinentry.locale_err? ASSUAN_Locale_Problem: ASSUAN_Canceled;
-@@ -1094,11 +1123,7 @@ cmd_getpin (ASSUAN_CONTEXT ctx, char *line)
- 	password_cache_save (pinentry.keyinfo, pinentry.pin);
-     }
- 
-  if (pinentry.pin)
-    {
-      secmem_free (pinentry.pin);
-      pinentry.pin = NULL;
-    }
-+  pinentry_setbuffer_clear (&pinentry);
- 
-   return result;
- }
-@@ -1122,6 +1147,7 @@ cmd_confirm (ASSUAN_CONTEXT ctx, char *line)
-   pinentry.locale_err = 0;
-   pinentry.specific_err = 0;
-   pinentry.canceled = 0;
-+  pinentry_setbuffer_clear (&pinentry);
-   result = (*pinentry_cmd_handler) (&pinentry);
-   if (pinentry.error)
-     {
-- 
-2.1.4
-
--- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-memory.patch
+++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-memory.patch
@ -1,32 +0,0 @@
-From aa04dac66f2ee949e8789a3c91090b01646f2e57 Mon Sep 17 00:00:00 2001
-From: "Neal H. Walfield" <neal@gnu.org>
-Date: Mon, 11 May 2015 16:14:18 +0200
-Subject: [PATCH] Fix memory allocation in pinentry_setbufferlen.
-
-* pinentry/pinentry.c (pinentry_setbufferlen): Set PIN->PIN to a
-buffer that is LEN bytes large, not 2 * PIN->PIN_LENGTH.
---
- pinentry/pinentry.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pinentry/pinentry.c b/pinentry/pinentry.c
-index 51c873c..f28c576 100644
--- a/pinentry/pinentry.c
-+++ b/pinentry/pinentry.c
-@@ -356,11 +356,11 @@ pinentry_setbufferlen (pinentry_t pin, int len)
-   char *newp;
-   if (len < pinentry.pin_len)
-     return NULL;
-  newp = secmem_realloc (pin->pin, 2 * pin->pin_len);
-+  newp = secmem_realloc (pin->pin, len);
-   if (newp)
-     {
-       pin->pin = newp;
-      pin->pin_len *= 2;
-+      pin->pin_len = len;
-     }
-   else
-     {
-- 
-2.1.4
-
--- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-simplify.patch
+++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.2-simplify.patch
@ -1,48 +0,0 @@
-From 831782b3b625ca81624fae0ee184da0d2fc46d96 Mon Sep 17 00:00:00 2001
-From: "Neal H. Walfield" <neal@gnu.org>
-Date: Mon, 11 May 2015 16:35:12 +0200
-Subject: [PATCH 1/1] Simplify code.
-
-* pinentry/pinentry.c (cmd_confirm): Don't use nested ternary
-expressions.
---
- pinentry/pinentry.c | 23 +++++++++++++++--------
- 1 file changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/pinentry/pinentry.c b/pinentry/pinentry.c
-index 11a8027..3a44851 100644
--- a/pinentry/pinentry.c
-+++ b/pinentry/pinentry.c
-@@ -1132,14 +1132,21 @@ cmd_confirm (ASSUAN_CONTEXT ctx, char *line)
-   if (pinentry.close_button)
-     assuan_write_status (ctx, "BUTTON_INFO", "close");
- 
-  return result ? 0
-                : (pinentry.specific_err? pinentry.specific_err :
-                   pinentry.locale_err? ASSUAN_Locale_Problem
-                                      : (pinentry.one_button
-                                         ? 0
-                                         : (pinentry.canceled
-                                            ? ASSUAN_Canceled
-                                            : ASSUAN_Not_Confirmed)));
-+  if (result)
-+    return 0;
-+
-+  if (pinentry.specific_err)
-+    return pinentry.specific_err;
-+
-+  if (pinentry.locale_err)
-+    return ASSUAN_Locale_Problem;
-+
-+  if (pinentry.one_button)
-+    return 0;
-+
-+  if (pinentry.canceled)
-+    return ASSUAN_Canceled;
-+  return ASSUAN_Not_Confirmed;
- }
- 
- 
-- 
-2.1.4
-
--- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.5-build.patch
+++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.5-build.patch
@ -0,0 +1,52 @@
+From 29384a828ad83644df9093bb292194d1ac6e689b Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 18 Jul 2015 10:14:49 +0300
+Subject: [PATCH] build: add pkg-config initialization and modify detection
+
+add PKG_PROG_PKG_CONFIG as the qt4 detection and curses detection are
+already using pkg.m4 which require proper initialization.
+
+modify the manual detection of pkg-config based on the error value of
+the PKG_PROG_PKG_CONFIG and not the manual one as there is a conflict
+between empty and 'no'.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ configure.ac | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b71cb17..7afa318 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -85,6 +85,7 @@ AC_PROG_RANLIB
+ # for Qt and autoconf does does not allow that.
+ AC_PROG_CXX
+ AC_PROG_LN_S
+PKG_PROG_PKG_CONFIG
+ AC_CHECK_TOOL(WINDRES, windres, :)
+ AC_CHECK_PROGS(GITLOG_TO_CHANGELOG, gitlog-to-changelog,
+                [build-aux/gitlog-to-changelog])
+@@ -430,8 +431,7 @@ AC_ARG_ENABLE(pinentry-gnome3,
+ 
+ dnl check for pkg-config
+ if test "$pinentry_gtk_2" != "no" -o "$pinentry_gnome_3" != "no"; then
+-        AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+-	if test x"${PKG_CONFIG}" = xno ; then
+	if test -z "${PKG_CONFIG}"; then
+ 		pinentry_gtk_2=no
+ 		pinentry_gnome_3=no
+ 	fi
+@@ -504,8 +504,7 @@ AC_ARG_ENABLE(libsecret,
+ 
+ dnl check for pkg-config
+ if test "$libsecret" != "no"; then
+-        AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+-	if test x"${PKG_CONFIG}" = xno ; then
+	if test -z "${PKG_CONFIG}" ; then
+ 		libsecret=no
+ 	fi
+ fi
+-- 
+2.3.6
+
--- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.6-add-disable-pinentry-qt5-option.patch
+++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.6-add-disable-pinentry-qt5-option.patch
@ -0,0 +1,55 @@
+From 08ec9556c8a384ea7bb5d42d3f6aab6c2f6a8786 Mon Sep 17 00:00:00 2001
+From: Andre Heinecke <aheinecke@intevation.de>
+Date: Fri, 25 Sep 2015 15:56:55 +0200
+Subject: [PATCH] Add option to disable looking for qt5
+
+* m4/qt.m4 (FIND_QT): Add --disable-pinentry-qt5 option to
+disable qt5 support even if it is available.
+
+--
+As requested by Kristan F.
+
+GnuPG-bug-id: 2105
+---
+ m4/qt.m4 | 23 ++++++++++++++++-------
+ 1 file changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/m4/qt.m4 b/m4/qt.m4
+index 0a7ea99..0e47ec6 100644
+--- a/m4/qt.m4
+++ b/m4/qt.m4
+@@ -28,15 +28,24 @@ dnl The moc lookup code is based on libpoppler (rev. d821207)
+ 
+ AC_DEFUN([FIND_QT],
+ [
+-  PKG_CHECK_MODULES(PINENTRY_QT,
+-                    Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Widgets >= 5.0.0,
+-                    [have_qt5_libs="yes"],
+-                    [have_qt5_libs="no"])
+  AC_ARG_ENABLE(pinentry-qt5,
+                AC_HELP_STRING([--disable-pinentry-qt5],
+                           [Don't use qt5 even if it is available.]),
+                enable_pinentry_qt5=$enableval,
+                enable_pinentry_qt5="try")
+ 
+-  if "$PKG_CONFIG" --variable qt_config Qt5Core | grep -q "reduce_relocations"; then
+-    PINENTRY_QT_CFLAGS="$PINENTRY_QT_CFLAGS -fpic"
+-  fi
+  have_qt5_libs="no";
+
+  if test "$enable_pinentry_qt5" != "no"; then
+    PKG_CHECK_MODULES(PINENTRY_QT,
+                      Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Widgets >= 5.0.0,
+                      [have_qt5_libs="yes"],
+                      [have_qt5_libs="no"])
+ 
+    if "$PKG_CONFIG" --variable qt_config Qt5Core | grep -q "reduce_relocations"; then
+      PINENTRY_QT_CFLAGS="$PINENTRY_QT_CFLAGS -fpic"
+    fi
+  fi
+   if test "$have_qt5_libs" = "yes"; then
+     AC_CHECK_TOOL(MOC, moc)
+     AC_MSG_CHECKING([moc version])
+-- 
+2.1.4
+
--- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/metadata.xml
@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
-<use>
-	<flag name='clipboard'>Enable clipboard integration</flag>
-</use>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<use>
+		<flag name="clipboard">Enable clipboard integration</flag>
+	</use>
 </pkgmetadata>
--- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.0-r3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.0-r3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.9.0-r3.ebuild,v 1.3 2015/04/30 19:51:33 alonbl Exp $
+# $Id$

 EAPI=5

@ -19,9 +19,9 @@ RDEPEND="
 	app-eselect/eselect-pinentry
 	caps? ( sys-libs/libcap )
 	gtk? ( x11-libs/gtk+:2 )
-	ncurses? ( sys-libs/ncurses )
+	ncurses? ( sys-libs/ncurses:0= )
 	qt4? ( >=dev-qt/qtgui-4.4.1:4 )
-	static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] )
+	static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
 "
 DEPEND="${RDEPEND}
 	sys-devel/gettext
--- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.9.0.ebuild,v 1.11 2015/03/31 17:18:11 ulm Exp $
+# $Id$

 EAPI=5

@ -19,9 +19,9 @@ RDEPEND="
 	app-eselect/eselect-pinentry
 	caps? ( sys-libs/libcap )
 	gtk? ( x11-libs/gtk+:2 )
-	ncurses? ( sys-libs/ncurses )
+	ncurses? ( sys-libs/ncurses:0= )
 	qt4? ( >=dev-qt/qtgui-4.4.1:4 )
-	static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] )
+	static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
 "
 DEPEND="${RDEPEND}
 	sys-devel/gettext
--- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.5.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.5.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.9.1.ebuild,v 1.2 2015/05/05 16:24:05 alonbl Exp $
+# $Id$

 EAPI=5

-inherit qmake-utils autotools multilib eutils flag-o-matic toolchain-funcs
+inherit autotools qmake-utils multilib eutils flag-o-matic toolchain-funcs

 DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
 HOMEPAGE="http://gnupg.org/aegypten2/index.html"
@ -12,21 +12,23 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="clipboard gtk ncurses qt4 caps static"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="clipboard emacs gtk ncurses qt4 caps gnome-keyring static"

 RDEPEND="
+	>=dev-libs/libgpg-error-1.17
+	>=dev-libs/libassuan-2
 	app-eselect/eselect-pinentry
 	caps? ( sys-libs/libcap )
 	gtk? ( x11-libs/gtk+:2 )
-	ncurses? ( sys-libs/ncurses )
+	ncurses? ( sys-libs/ncurses:0= )
 	qt4? ( >=dev-qt/qtgui-4.4.1:4 )
-	static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] )
+	static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
 "
 DEPEND="${RDEPEND}
 	sys-devel/gettext
-	gtk? ( virtual/pkgconfig )
-	qt4? ( virtual/pkgconfig )
+	virtual/pkgconfig
+	gnome-keyring? ( app-crypt/libsecret )
 "
 REQUIRED_USE="
 	|| ( ncurses gtk qt4 )
@ -39,7 +41,7 @@ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )

 src_prepare() {
 	epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch"
-	epatch "${FILESDIR}/${P}-memleak.patch"
+	epatch "${FILESDIR}/${P}-build.patch"
 	eautoreconf
 }

@ -52,12 +54,15 @@ src_configure() {

 	econf \
 		--enable-pinentry-tty \
+		$(use_enable emacs pinentry-emacs) \
 		$(use_enable gtk pinentry-gtk2) \
 		$(use_enable ncurses pinentry-curses) \
 		$(use_enable ncurses fallback-curses) \
 		$(use_enable qt4 pinentry-qt4) \
 		$(use qt4 && use_enable clipboard pinentry-qt4-clipboard) \
 		$(use_with caps libcap) \
+		$(use_enable gnome-keyring libsecret) \
+		$(use_enable gnome-keyring pinentry-gnome3) \
 		MOC="$(qt4_get_bindir)"/moc
 }

--- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.6-r6.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.6-r6.ebuild
@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools qmake-utils multilib eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
+HOMEPAGE="http://gnupg.org/aegypten2/index.html"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="emacs gtk ncurses qt4 qt5 caps gnome-keyring static"
+
+CDEPEND="
+	>=dev-libs/libgpg-error-1.17
+	>=dev-libs/libassuan-2
+	>=dev-libs/libgcrypt-1.6.3
+	ncurses? ( sys-libs/ncurses:0= )
+	gtk? ( x11-libs/gtk+:2 )
+	qt4? (
+		>=dev-qt/qtgui-4.4.1:4
+	     )
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	     )
+	caps? ( sys-libs/libcap )
+	static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
+	app-eselect/eselect-pinentry
+	gnome-keyring? ( app-crypt/libsecret )
+"
+
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+RDEPEND="
+	${CDEPEND}
+	gnome-keyring? ( app-crypt/gcr )
+"
+
+REQUIRED_USE="
+	|| ( ncurses gtk qt4 qt5 )
+	gtk? ( !static )
+	qt4? ( !static )
+	qt5? ( !static )
+	static? ( ncurses )
+	?? ( qt4 qt5 )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch"
+	epatch "${FILESDIR}/${P}-add-disable-pinentry-qt5-option.patch"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+	use static && append-ldflags -static
+	[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
+
+	QT_MOC=""
+	if use qt4; then
+		myconf+=( --enable-pinentry-qt
+			  --disable-pinentry-qt5
+			)
+		QT_MOC="$(qt4_get_bindir)"/moc
+		# Issues finding qt on multilib systems
+		export QTLIB="$(qt4_get_libdir)"
+	elif use qt5; then
+		myconf+=( --enable-pinentry-qt )
+		QT_MOC="$(qt5_get_bindir)"/moc
+		export QTLIB="$(qt5_get_libdir)"
+	else
+		myconf+=( --disable-pinentry-qt )
+	fi
+
+	econf \
+		--enable-pinentry-tty \
+		$(use_enable emacs pinentry-emacs) \
+		$(use_enable gtk pinentry-gtk2) \
+		$(use_enable ncurses pinentry-curses) \
+		$(use_enable ncurses fallback-curses) \
+		$(use_with caps libcap) \
+		$(use_enable gnome-keyring libsecret) \
+		$(use_enable gnome-keyring pinentry-gnome3) \
+		"${myconf[@]}" \
+		MOC="${QT_MOC}"
+}
+
+src_install() {
+	default
+	rm -f "${ED}"/usr/bin/pinentry || die
+
+	if use qt4 || use qt5; then
+		dosym pinentry-qt /usr/bin/pinentry-qt4
+	fi
+}
+
+pkg_postinst() {
+	if ! has_version 'app-crypt/pinentry' || has_version '<app-crypt/pinentry-0.7.3'; then
+		elog "We no longer install pinentry-curses and pinentry-qt SUID root by default."
+		elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes."
+		elog "The soft resource limit for memory locking specifies the limit an"
+		elog "unprivileged process may lock into memory. You can also use POSIX"
+		elog "capabilities to allow pinentry to lock memory. To do so activate the caps"
+		elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of"
+		elog "your users."
+	fi
+
+	eselect pinentry update ifunset
+}
+
+pkg_postrm() {
+	eselect pinentry update ifunset
+}
--- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.2-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.2-r1.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.9.2-r1.ebuild,v 1.1 2015/05/14 08:12:20 k_f Exp $
+# $Id$

 EAPI=5

-inherit qmake-utils autotools multilib eutils flag-o-matic toolchain-funcs
+inherit autotools qmake-utils multilib eutils flag-o-matic toolchain-funcs

 DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
 HOMEPAGE="http://gnupg.org/aegypten2/index.html"
@ -13,66 +13,94 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="clipboard gtk ncurses qt4 caps gnome-keyring static"
+IUSE="emacs gtk ncurses qt4 qt5 caps gnome-keyring static"

-RDEPEND="
-	app-eselect/eselect-pinentry
-	caps? ( sys-libs/libcap )
+CDEPEND="
+	>=dev-libs/libgpg-error-1.17
+	>=dev-libs/libassuan-2.1
+	>=dev-libs/libgcrypt-1.6.3
+	ncurses? ( sys-libs/ncurses:0= )
 	gtk? ( x11-libs/gtk+:2 )
-	ncurses? ( sys-libs/ncurses )
-	qt4? ( >=dev-qt/qtgui-4.4.1:4 )
-	static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	gtk? ( virtual/pkgconfig )
-	qt4? ( virtual/pkgconfig )
+	qt4? (
+		>=dev-qt/qtgui-4.4.1:4
+	     )
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	     )
+	caps? ( sys-libs/libcap )
+	static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
+	app-eselect/eselect-pinentry
 	gnome-keyring? ( app-crypt/libsecret )
 "
+
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+RDEPEND="
+	${CDEPEND}
+	gnome-keyring? ( app-crypt/gcr )
+"
+
 REQUIRED_USE="
-	|| ( ncurses gtk qt4 )
+	|| ( ncurses gtk qt4 qt5 )
 	gtk? ( !static )
 	qt4? ( !static )
+	qt5? ( !static )
 	static? ( ncurses )
+	?? ( qt4 qt5 )
 "

 DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )

 src_prepare() {
 	epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch"
-	epatch "${FILESDIR}/${P}-handlers-return.patch"
-	epatch "${FILESDIR}/${P}-gnome3.patch"
-	epatch "${FILESDIR}/${P}-simplify.patch"
-	epatch "${FILESDIR}/${P}-cmd_confirm.patch"
-	epatch "${FILESDIR}/${P}-memory.patch"
-	epatch "${FILESDIR}/${P}-management.patch"
-	epatch "${FILESDIR}/${P}-linking-order.patch"
 	eautoreconf
 }

 src_configure() {
+	local myconf=()
 	use static && append-ldflags -static
 	[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11

-	# Issues finding qt on multilib systems
-	export QTLIB="${QTDIR}/$(get_libdir)"
+	QT_MOC=""
+	if use qt4; then
+		myconf+=( --enable-pinentry-qt
+			  --disable-pinentry-qt5
+			)
+		QT_MOC="$(qt4_get_bindir)"/moc
+		# Issues finding qt on multilib systems
+		export QTLIB="$(qt4_get_libdir)"
+	elif use qt5; then
+		myconf+=( --enable-pinentry-qt )
+		QT_MOC="$(qt5_get_bindir)"/moc
+		export QTLIB="$(qt5_get_libdir)"
+	else
+		myconf+=( --disable-pinentry-qt )
+	fi

 	econf \
 		--enable-pinentry-tty \
+		$(use_enable emacs pinentry-emacs) \
 		$(use_enable gtk pinentry-gtk2) \
 		$(use_enable ncurses pinentry-curses) \
 		$(use_enable ncurses fallback-curses) \
-		$(use_enable qt4 pinentry-qt4) \
-		$(use qt4 && use_enable clipboard pinentry-qt4-clipboard) \
 		$(use_with caps libcap) \
 		$(use_enable gnome-keyring libsecret) \
 		$(use_enable gnome-keyring pinentry-gnome3) \
-		MOC="$(qt4_get_bindir)"/moc
+		"${myconf[@]}" \
+		MOC="${QT_MOC}"
 }

 src_install() {
 	default
 	rm -f "${ED}"/usr/bin/pinentry || die
+
+	if use qt4 || use qt5; then
+		dosym pinentry-qt /usr/bin/pinentry-qt4
+	fi
 }

 pkg_postinst() {
@ -85,6 +113,7 @@ pkg_postinst() {
 		elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of"
 		elog "your users."
 	fi
+
 	eselect pinentry update ifunset
 }

--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/ChangeLog
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/ChangeLog
@ -165,3 +165,24 @@

  Package-Manager: portage-2.2.27

+*vim-7.4.1583 (17 Mar 2016)
+
+  17 Mar 2016; Tim Harder <radhermit@gentoo.org> +vim-7.4.1583.ebuild:
+  version bump to 7.4.1583
+
+  17 Mar 2016; Tim Harder <radhermit@gentoo.org> vim-7.4.1583.ebuild,
+  vim-9999.ebuild:
+  drop unnecessary test hacks
+
+  20 Apr 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
+  Fix racket category
+
+*vim-7.4.1821 (08 May 2016)
+
+  08 May 2016; Tim Harder <radhermit@gentoo.org> +vim-7.4.1821.ebuild:
+  version bump to 7.4.1821
+
+  08 May 2016; Tim Harder <radhermit@gentoo.org> -vim-7.4.1089.ebuild,
+  -vim-7.4.1229.ebuild, -vim-7.4.1342.ebuild:
+  remove old
+
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/Manifest
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/Manifest
@ -1,15 +1,13 @@
 AUX vim-completion 1004 SHA256 8191a5a47e03de62d67ad6936259c8eb005e50b52d94994bcf4164e54ffefdae SHA512 dccf663a93efdf2ec3be69f49e418a0ef66277e2fae6c12287adde772592e19f5130388a04242121846f1dae39f78b30780c99dc6fe1b847f4f08354bda3cc41 WHIRLPOOL 0f5d9ed640ecd3520c79e9abb4473bbca66f145106d2c997791eacf6f0f93131f102d55b2f056f87484c5d5ca781af958fd48f1a24e2c2c1a4ac1be378700f84
-DIST vim-7.4.1089.tar.gz 12548552 SHA256 e52f7653a36b690441b47a273b1db72f0eb1e5f6729af25110a84088ca73e872 SHA512 0fca208152b3c33cebfba4c2a33a6e59643a8c2650863b56b5a5c1863eb20238c412453d9e53cf75feaef8a5ef8aa8b33b601670e39c1b3effc02ed193bbd91f WHIRLPOOL 87f61548b29755ab1a90999af99c46fc649589e6d2e132623c04a2fa24400738255648a43d79192b2b6eb2b34ed49dd8d439e65870025983738247368f2f8598
-DIST vim-7.4.1229.tar.gz 12576784 SHA256 8a782e97916d57c44dcd84d38002884e05f335311600d73500cee47908e1822d SHA512 ac139e828f95319d668091e79295f7be88011c9fe0417736d051c844ec49a50ebdcec6c655f839025ee78349c36891ce1ed27467ff31ec5d1b7fc1c3a70bf5dd WHIRLPOOL 8da7059a35fbebd3fc9a360c861c2fcde197b807fe0a0ed9864b7f5ed0419488a6308a520fd97d0690e9fd10a3974fcdf228dd5d81d5848679ca74f4554d784d
-DIST vim-7.4.1342.tar.gz 12608839 SHA256 af2776a7bdc87748734391ab05d2f8280829f837b8e520d1372dcf52176bbc4c SHA512 ec288aae83b0f98a62366781940b82b10871adeab91ca2596584caaedd7eb29696e4fa0aa6fcb71c144959be700836a765e8c4fea3038f50f8f6a3abe340091a WHIRLPOOL fc51a1adc36d036cdfae81ef8ddccf086bcfb2680fa32158cbe3b0c7d171b713e7f7fdf66eb5b9fd61cc1fb102a5d76d9aba00296089b1602c17f0fffe187adf
+DIST vim-7.4.1583.tar.gz 12559634 SHA256 dbe697fcacca5c50535714a31dbd02e7691943491c4004a867edd4a6fcdc9cf5 SHA512 6e049ea8e711382fd4f69360afaeac904ad7721ccb7bf9990754983efd66963e1bc24919483ac8f4cbededcd22e1e58c2e246d524f059a0648600e49b550fc2b WHIRLPOOL a4e18bfa89b1a2620e96b6688cac41bed8d68d3adb7f8c7b3580a9ae40df0c39d612c051c73b2b91cf3d5d18348651e4bd4808f40b44132ebcc648bc554e451f
+DIST vim-7.4.1821.tar.gz 12565373 SHA256 452b6346f64b23ab0e7483091ddc09b62540f149fa786bdd14d6712d8b66e1cf SHA512 6bc3698c715860837ab264b9312207f85e0c2a603c15eca92678f301175db93195d83d3f26c4815fc6f0757e5051945b88ce415f358b7396520df6231314cc64 WHIRLPOOL 3699966e5c599ca9090486006a8e1bab5720854f9c44fc249f5cb31d6198e048a6523697ce6416c835154c737ffab87482a72ebe1af321874eef3461b69de90b
 DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2
 DIST vim-7.4.769.tar.gz 12189043 SHA256 c89568f3dfcefd773bfbb0958c1cf58a0b0ceedb9d0c264250b379a77ad02e9e SHA512 00048c1d579c409767308c991e5de4ed54e9e50db7e97b0d148f0667742d5e46047c702bee693a5caf13a1603548ab783f7fa846574841d807ffbaa97d7f611e WHIRLPOOL 28ada4763250bbed6f9a1768e81a79b75db64f0ef25296c5d4825f21d21d6e88ff24d488e841e6ba492e363da6d3a3e75e9ec2f2881a731e7ed261c7d21ffd3c
 DIST vim-7.4.827-gentoo-patches.tar.bz2 3106 SHA256 1d2bb395fa79dde8e3dbc0a94e4b9591f9cb544d4e52a1ecd2eac4122e55b740 SHA512 122dbcdee115ce0979ce8c5a54623ed405e889fb18967d7c9208d924bd62a7dd615544538040aef19449410c0ea5783c1832a317a1afd056d4d387c43e7a5988 WHIRLPOOL 23afe4d61b8c2f6a4d7e0e3a64a0d7c79a72ea3c317d93e969f01706c666217d19c866db56e0b09428c77d44e2adbf86edbbf4f3dbe521481c234cc66c0bafed
-EBUILD vim-7.4.1089.ebuild 10712 SHA256 9db9fd564a0526b92608548e9629ca56e98951a5c1d3beb535e3e2df6f80a672 SHA512 8d2690151702e082e93026ee8cf8226c2223dfd4bb5d9b198e16fe457cd5c50e6f4e8cfea05ac19d41d42750f28d7790ee71ead947053667875ce05e108f3534 WHIRLPOOL f2599b2a9d5a9dcf6235357126e300cc6082f1faa80241755078146c95c55e7e8cbd872ac831726814939312bd75f2420a6284677227b7be6b241766ad15624a
-EBUILD vim-7.4.1229.ebuild 10739 SHA256 fbbbf83021c05b5383f07daa251f1559e3674ff952d13996ade7e37a3ddb8b7b SHA512 1d6e8e90c0b36c67ac76beac15f0ecfd9dedbc61d88e081cf70228576e795d9222374142826f107efd777da06ff8603861711ebc6c485fe82646514e9c600f01 WHIRLPOOL 0c6d92de69d491c4c9900055555b8bec8ddd9abe273fe035f34e9375786a1bb6f66868e67987dc31b692e0b27772480406caf1e8713c99b711d323277e614a67
-EBUILD vim-7.4.1342.ebuild 10739 SHA256 fbbbf83021c05b5383f07daa251f1559e3674ff952d13996ade7e37a3ddb8b7b SHA512 1d6e8e90c0b36c67ac76beac15f0ecfd9dedbc61d88e081cf70228576e795d9222374142826f107efd777da06ff8603861711ebc6c485fe82646514e9c600f01 WHIRLPOOL 0c6d92de69d491c4c9900055555b8bec8ddd9abe273fe035f34e9375786a1bb6f66868e67987dc31b692e0b27772480406caf1e8713c99b711d323277e614a67
+EBUILD vim-7.4.1583.ebuild 10309 SHA256 c357d69a04ec49e7ed653b17ad3ed9d1f4f8dfd1f0b5417ddd9a242bf9d57190 SHA512 cfc536b741dbe23dffe9f6405b2ce1b530cfbb8ccc29a15ae2be335933f8d2e88469eed7db4e06d6ad5a5b518877af7b5d7284bc8b11a14891114b3e01dd0205 WHIRLPOOL 75b2b1616731fda54d5f3fd4c2f62798a655951371f0669a1847021cdad3f72d461083777ce7cf4b37a9926c75670f1ffd86849fd7f93ec471f718544e45255a
+EBUILD vim-7.4.1821.ebuild 10310 SHA256 8199a400ffc1c72086c78c396650955f6d28a577ef551f726281ec628e5ce2c7 SHA512 b30f3fca378772a070d58be798604e595b1a49656650de771ee78a4ff14a1ec3f68fd195002935a5e31eac25f25444b78dd2078255c683d0e2454aeef73a440e WHIRLPOOL f99659f0fe46896eaf6f0e7f4b6ff0f4e1ff6e068340aa099c99e39e58477a1125e96aa1a14256370710900fca6c5df15fa54aef53ddd0c875f402bb1b4dcf3d
 EBUILD vim-7.4.769.ebuild 11412 SHA256 af7e06a8eaa8005e0bbeb70ce0bb935e3ff2c57c34080e535737daa5bd3bfd56 SHA512 6831c59cfc99fc1ec1e414486105917ed968c19103362264cc7fe9c922aac2e3ac9c5b18304b1e2f913d63dffeca2b4b8873c519b6ce43a2a38c5d551fc685d3 WHIRLPOOL 42a8fa174cbef56302ec4edb220aa374de46e3745420847d9270867682e2805737916001869a71d2f4e85594d4a10f5db59109744f751ea013377ebdb14b87a8
-EBUILD vim-9999.ebuild 10739 SHA256 fbbbf83021c05b5383f07daa251f1559e3674ff952d13996ade7e37a3ddb8b7b SHA512 1d6e8e90c0b36c67ac76beac15f0ecfd9dedbc61d88e081cf70228576e795d9222374142826f107efd777da06ff8603861711ebc6c485fe82646514e9c600f01 WHIRLPOOL 0c6d92de69d491c4c9900055555b8bec8ddd9abe273fe035f34e9375786a1bb6f66868e67987dc31b692e0b27772480406caf1e8713c99b711d323277e614a67
-MISC ChangeLog 5385 SHA256 395e9d1128ccbc5c05de5c50269f187714c5384fa265db745fb29ec8851a06ff SHA512 b5617d77ad0820850ded2a2c16c5c25f7ed72c229ca32e6f3175c5e5766e5d381cd75ebb7d8a9ab86ffb795c05379d7537a83badc0a87236292be2430c85803d WHIRLPOOL 387902fb76fe77747e5ca64daa9d7b5544148850db36c1546d16dc0188f5df851c8acb605e4894b3fd2ba26a51e7d437c2b35f1e8276a5fb05e96e33f1680326
+EBUILD vim-9999.ebuild 10310 SHA256 8199a400ffc1c72086c78c396650955f6d28a577ef551f726281ec628e5ce2c7 SHA512 b30f3fca378772a070d58be798604e595b1a49656650de771ee78a4ff14a1ec3f68fd195002935a5e31eac25f25444b78dd2078255c683d0e2454aeef73a440e WHIRLPOOL f99659f0fe46896eaf6f0e7f4b6ff0f4e1ff6e068340aa099c99e39e58477a1125e96aa1a14256370710900fca6c5df15fa54aef53ddd0c875f402bb1b4dcf3d
+MISC ChangeLog 5979 SHA256 8633f61ee6bfeb3a5231fe35503008e43b959d0a8b27d7d9cd20d8229ac29b0d SHA512 500c78cb4f0ff43e0fc64f8053b75377948dfb77ccd0bfd6345ca95d79a95a1170a48ef86e1d2c9506eedff65d9625209678ef1d4746aa588f7d060c75f35a16 WHIRLPOOL 49536e694693d1709758fff20149b6dbb985e015ca461298bcac04f631f5eba42db44796f168285d47ef9ea7095190d1cc95820cef2340bfcc743d1a43ccf411
 MISC ChangeLog-2015 67669 SHA256 86ac1b2a4e92a9eab943636dde488ccb9351b509b3775e8e11f30e5367d48732 SHA512 f84c582b834fdb2907730b9f409f243e10d98777083a8b9a5b689a803d974f2181a93c7de6d197f4482e6b054992f1324d5e0e9d580f7cc89d6d48947a3e9ed7 WHIRLPOOL 047df580ce408d600fd30222ecd55b24414ee3aaea8cd156728a371a878ee0da86ec18843699bc961a911429c57bbf578bd2d4569c2d116f8cf1bac110ee79b4
-MISC metadata.xml 777 SHA256 0533dc873535b3c1cdf3604a820f9e5e2349d297db9a00c4881dd05f5f54e10f SHA512 f3eb1be8ac05547945e27147680af4ab24a9022781edff74648921189149ceddf098a46e7c26d430d6cfb9ef82e3f94310b6bc170d78e7f97314759acfd49154 WHIRLPOOL e5002d29db44939ff083b9678e9d019c7c9927f294d98404e84d5b16db68fdf2a8b0ea89713115c160f1f8e7ee29e6309f9dee75455d7742e776c52decd82139
+MISC metadata.xml 779 SHA256 d9701e486eaad4caac728b1eecdcf0a9f88aefe093d6846f559821fdaecc8f83 SHA512 4e6fd3126e8b090f1cd89418ace750073a1dd0bbaa5fecca9be10fb19c70147e7d97b71ab1e3ffc480427a0477bd6fa5e27c475d5685c43e9d0137ea1df5d31d WHIRLPOOL df429412c61fc3023f1cee9f3899978ff3bb9841332915e13a1478ac76215d1d773248efbc31bbf774168b3a88d7a04fa8d985b64b20cd3925f369249a2e50d2
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/metadata.xml
@ -7,7 +7,7 @@
  </maintainer>
  <use>
    <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
-    <flag name="racket">Enable support for Scheme using <pkg>dev-lang/racket</pkg></flag>
+    <flag name="racket">Enable support for Scheme using <pkg>dev-scheme/racket</pkg></flag>
    <flag name="vim-pager">Install vimpager and vimmanpager links</flag>
    <flag name="X">Link console vim against X11 libraries to enable title and
 	  clipboard features in xterm</flag>
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-7.4.1089.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-7.4.1089.ebuild
@ -1,364 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-VIM_VERSION="7.4"
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-PYTHON_REQ_USE=threads
-inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-r1
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-7.4.827-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Vim, an improved vi-style text editor"
-HOMEPAGE="http://www.vim.org/"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager"
-REQUIRED_USE="
-	luajit? ( lua )
-	python? (
-		|| ( $(python_gen_useflags '*') )
-		?? ( $(python_gen_useflags 'python2*') )
-		?? ( $(python_gen_useflags 'python3*') )
-	)
-"
-
-RDEPEND="
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0
-	nls? ( virtual/libintl )
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	cscope? ( dev-util/cscope )
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	lua? (
-		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua:0[deprecated] )
-	)
-	!minimal? (
-		~app-editors/vim-core-${PV}
-		dev-util/ctags
-	)
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) )
-	selinux? ( sys-libs/libselinux )
-	tcl? ( dev-lang/tcl:0= )
-	X? ( x11-libs/libXt )
-"
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home
-	export HOME="${T}"/home
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		if [[ -d "${WORKDIR}"/patches/ ]]; then
-			# Gentoo patches to fix runtime issues, cross-compile errors, etc
-			EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
-				epatch "${WORKDIR}"/patches/
-		fi
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
-		|| die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.in || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
-
-	# conditionally make the manpager.sh script
-	if use vim-pager ; then
-		cat <<-END > "${S}"/runtime/macros/manpager.sh
-			#!/bin/sh
-			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
-					vim \\
-						-c 'let no_plugin_maps = 1' \\
-						-c 'set nolist nomod ft=man ts=8' \\
-						-c 'let g:showmarks_enable=0' \\
-						-c 'runtime! macros/less.vim' -
-			END
-	fi
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]] ; then
-		sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile
-	fi
-
-	if version_is_at_least 7.3.122 ; then
-		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
-	fi
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	if version_is_at_least 7.3 ; then
-		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
-			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.in is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -f src/auto/configure
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
-		[[ -e ${file} ]] && addwrite $file
-	done
-
-	if use minimal ; then
-		myconf=(
-			--with-features=tiny
-			--disable-nls
-			--disable-multibyte
-			--disable-acl
-			--enable-gui=no
-			--without-x
-			--disable-darwin
-			--disable-luainterp
-			--disable-perlinterp
-			--disable-pythoninterp
-			--disable-mzschemeinterp
-			--disable-rubyinterp
-			--disable-selinux
-			--disable-tclinterp
-			--disable-gpm
-		)
-	else
-		use debug && append-flags "-DDEBUG"
-
-		myconf=(
-			--with-features=huge
-			--enable-multibyte
-			$(use_enable acl)
-			$(use_enable cscope)
-			$(use_enable gpm)
-			$(use_enable lua luainterp)
-			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
-			$(use_with luajit)
-			$(use_enable nls)
-			$(use_enable perl perlinterp)
-			$(use_enable racket mzschemeinterp)
-			$(use_enable ruby rubyinterp)
-			$(use_enable selinux)
-			$(use_enable tcl tclinterp)
-		)
-
-		if use python ; then
-			py_add_interp() {
-				local v
-
-				[[ ${EPYTHON} == python3* ]] && v=3
-				myconf+=(
-					--enable-python${v}interp
-					vi_cv_path_python${v}="${PYTHON}"
-				)
-			}
-
-			python_foreach_impl py_add_interp
-		else
-			myconf+=(
-				--disable-pythoninterp
-				--disable-python3interp
-			)
-		fi
-
-		# --with-features=huge forces on cscope even if we --disable it. We need
-		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-		if ! use cscope ; then
-			sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
-				die "couldn't disable cscope"
-		fi
-
-		# don't test USE=X here ... see bug #19115
-		# but need to provide a way to link against X ... see bug #20093
-		myconf+=(
-			--enable-gui=no
-			--disable-darwin
-			$(use_with X x)
-		)
-	fi
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	echo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	echo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	echo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	# We've got to call make test from within testdir, since the Makefiles
-	# don't pass through our VIMPROG argument
-	cd "${S}"/src/testdir
-
-	# Test 49 won't work inside a portage environment
-	einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
-	sed -i 's~test49.out~~g' Makefile
-
-	# We don't want to rebuild vim before running the tests
-	sed -i 's,: \$(VIMPROG),: ,' Makefile
-
-	# Don't try to do the additional GUI test
-	emake -j1 VIMPROG=../vim nongui
-}
-
-# Make convenience symlinks, hopefully without stepping on toes.  Some
-# of these links are "owned" by the vim ebuild when it is installed,
-# but they might be good for gvim as well (see bug 45828)
-update_vim_symlinks() {
-	local f syms
-	syms="vimdiff rvim rview"
-	einfo "Calling eselect vi update..."
-	# Call this with --if-unset to respect user's choice (bug 187449)
-	eselect vi update --if-unset
-
-	# Make or remove convenience symlink, vim -> gvim
-	if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
-		ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
-	elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
-		rm "${EROOT}"/usr/bin/vim
-	fi
-
-	# Make or remove convenience symlinks to vim
-	if [[ -f "${EROOT}"/usr/bin/vim ]]; then
-		for f in ${syms}; do
-			ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
-		done
-	else
-		for f in ${syms}; do
-			if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
-				rm -f "${EROOT}"/usr/bin/${f}
-			fi
-		done
-	fi
-
-	# This will still break if you merge then remove the vi package,
-	# but there's only so much you can do, eh?  Unfortunately we don't
-	# have triggers like are done in rpm-land.
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
-	#       managed by eselect-vi
-	dobin src/vim
-	dosym vim /usr/bin/vimdiff
-	dosym vim /usr/bin/rvim
-	dosym vim /usr/bin/rview
-	if use vim-pager ; then
-		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
-		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
-		insinto ${vimfiles}/macros
-		doins runtime/macros/manpager.sh
-		fperms a+x ${vimfiles}/macros/manpager.sh
-	fi
-
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-	# keep in sync with 'complete ... -F' list
-	bashcomp_alias vim ex vi view rvim rview vimdiff
-
-	# We shouldn't be installing the ex or view man page symlinks, as they
-	# are managed by eselect-vi
-	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Make convenience symlinks
-	update_vim_symlinks
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Make convenience symlinks
-	update_vim_symlinks
-}
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-7.4.1583.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-7.4.1583.ebuild
@ -271,19 +271,7 @@ src_test() {
 	# Don't let vim talk to X
 	unset DISPLAY

-	# We've got to call make test from within testdir, since the Makefiles
-	# don't pass through our VIMPROG argument
-	cd "${S}"/src/testdir
-
-	# Test 49 won't work inside a portage environment
-	einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
-	sed -i 's~test49.out~~g' Makefile
-
-	# We don't want to rebuild vim before running the tests
-	sed -i 's,: \$(VIMPROG),: ,' Makefile
-
-	# Don't try to do the additional GUI test
-	emake -j1 VIMPROG=../vim nongui
+	emake -j1 -C src/testdir nongui
 }

 # Make convenience symlinks, hopefully without stepping on toes.  Some
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-7.4.1821.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-7.4.1821.ebuild
@ -34,7 +34,7 @@ REQUIRED_USE="

 RDEPEND="
 	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:=
+	>=sys-libs/ncurses-5.2-r2:0=
 	nls? ( virtual/libintl )
 	acl? ( kernel_linux? ( sys-apps/acl ) )
 	cscope? ( dev-util/cscope )
@ -271,19 +271,7 @@ src_test() {
 	# Don't let vim talk to X
 	unset DISPLAY

-	# We've got to call make test from within testdir, since the Makefiles
-	# don't pass through our VIMPROG argument
-	cd "${S}"/src/testdir
-
-	# Test 49 won't work inside a portage environment
-	einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
-	sed -i 's~test49.out~~g' Makefile
-
-	# We don't want to rebuild vim before running the tests
-	sed -i 's,: \$(VIMPROG),: ,' Makefile
-
-	# Don't try to do the additional GUI test
-	emake -j1 VIMPROG=../vim nongui
+	emake -j1 -C src/testdir nongui
 }

 # Make convenience symlinks, hopefully without stepping on toes.  Some
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9999.ebuild
@ -34,7 +34,7 @@ REQUIRED_USE="

 RDEPEND="
 	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:=
+	>=sys-libs/ncurses-5.2-r2:0=
 	nls? ( virtual/libintl )
 	acl? ( kernel_linux? ( sys-apps/acl ) )
 	cscope? ( dev-util/cscope )
@ -271,19 +271,7 @@ src_test() {
 	# Don't let vim talk to X
 	unset DISPLAY

-	# We've got to call make test from within testdir, since the Makefiles
-	# don't pass through our VIMPROG argument
-	cd "${S}"/src/testdir
-
-	# Test 49 won't work inside a portage environment
-	einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
-	sed -i 's~test49.out~~g' Makefile
-
-	# We don't want to rebuild vim before running the tests
-	sed -i 's,: \$(VIMPROG),: ,' Makefile
-
-	# Don't try to do the additional GUI test
-	emake -j1 VIMPROG=../vim nongui
+	emake -j1 -C src/testdir nongui
 }

 # Make convenience symlinks, hopefully without stepping on toes.  Some
--- a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/ChangeLog
+++ b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/ChangeLog
@ -1,431 +1,229 @@
 # ChangeLog for app-text/asciidoc
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/ChangeLog,v 1.107 2015/04/08 07:30:31 mgorny Exp $
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# (auto-generated from git log)

-  08 Apr 2015; Michał Górny <mgorny@gentoo.org> asciidoc-8.6.8-r1.ebuild,
+*asciidoc-9999 (09 Aug 2015)
+*asciidoc-8.6.9-r1 (09 Aug 2015)
+*asciidoc-8.6.9 (09 Aug 2015)
+*asciidoc-8.6.8-r1 (09 Aug 2015)
+*asciidoc-8.6.5 (09 Aug 2015)
+
+  09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org> +asciidoc-8.6.5.ebuild,
+  +asciidoc-8.6.8-r1.ebuild, +asciidoc-8.6.9.ebuild,
+  +asciidoc-8.6.9-r1.ebuild, +asciidoc-9999.ebuild, +metadata.xml:
+  proj/gentoo: Initial commit
+
+  This commit represents a new era for Gentoo:
+  Storing the gentoo-x86 tree in Git, as converted from CVS.
+
+  This commit is the start of the NEW history.
+  Any historical data is intended to be grafted onto this point.
+
+  Creation process:
+  1. Take final CVS checkout snapshot
+  2. Remove ALL ChangeLog* files
+  3. Transform all Manifests to thin
+  4. Remove empty Manifests
+  5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
+  5.1. Do not touch files with -kb/-ko keyword flags.
+
+  Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+  X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration
+  tests
+  X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this
+  project
+  X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo
+  developer, wrote Git features for the migration
+  X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve
+  cvs2svn
+  X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
+  X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014
+  work in migration
+  X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
+  X-Thanks: All of other Gentoo developers - many ideas and lots of paint on
+  the bikeshed
+
+  24 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Use https by default
+
+  Convert all URLs for sites supporting encrypted connections from http to
+  https
+
+  Signed-off-by: Justin Lecher <jlec@gentoo.org>
+
+  24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml:
+  Revert DOCTYPE SYSTEM https changes in metadata.xml
+
+  repoman does not yet accept the https version.
+  This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450.
+
+  Bug: https://bugs.gentoo.org/552720
+
+*asciidoc-8.6.9-r2 (13 Nov 2015)
+
+  13 Nov 2015; Marc Joliet <marcec@gmx.de> +asciidoc-8.6.9-r2.ebuild:
+  revbump to 8.6.9-r2 to add deps
+
+  Also, drop keywords to match app-text/dblatex.
+
+  Gentoo-bug: 366763
+  Signed-off-by: Marc Joliet <marcec@gmx.de>
+
+  13 Nov 2015; Marc Joliet <marcec@gmx.de> asciidoc-9999.ebuild:
+  apply dep fixes to -9999
+
+  Gentoo-bug: 366763
+  Signed-off-by: Marc Joliet <marcec@gmx.de>
+
+  13 Nov 2015; Marc Joliet <marcec@gmx.de> metadata.xml:
+  add myself as proxy-maintainer
+
+  Add myself as proxy-maintainer, replacing the previous maintainer at his
+  suggestion.
+
+  Signed-off-by: Marc Joliet <marcec@gmx.de>
+
+  13 Nov 2015; Marc Joliet <marcec@gmx.de> asciidoc-8.6.9-r2.ebuild,
  asciidoc-9999.ebuild:
-  Remove old Python implementations
+  add a dep on app-text/highlight

-  06 Dec 2014; Agostino Sarubbo <ago@gentoo.org> asciidoc-8.6.9-r1.ebuild:
-  Stable for ia64, wrt bug #529410
+  It is another provider for the "highlight" USE flag.

-  04 Dec 2014; Agostino Sarubbo <ago@gentoo.org> asciidoc-8.6.9-r1.ebuild:
-  Stable for ppc64, wrt bug #529410
+  Signed-off-by: Marc Joliet <marcec@gmx.de>

-  03 Dec 2014; Agostino Sarubbo <ago@gentoo.org> asciidoc-8.6.9-r1.ebuild:
-  Stable for ppc, wrt bug #529410
-
-  03 Dec 2014; Dirkjan Ochtman <djc@gentoo.org> asciidoc-8.6.9-r1.ebuild,
-  asciidoc-8.6.9.ebuild:
-  Remove some old python implementations
-
-  02 Dec 2014; Pacho Ramos <pacho@gentoo.org> asciidoc-8.6.9-r1.ebuild:
-  x86 stable, bug #529410
-
-  02 Dec 2014; Agostino Sarubbo <ago@gentoo.org> asciidoc-8.6.9-r1.ebuild:
-  Stable for alpha, wrt bug #529410
-
-  01 Dec 2014; Agostino Sarubbo <ago@gentoo.org> asciidoc-8.6.9-r1.ebuild:
-  Stable for sparc, wrt bug #529410
-
-  26 Nov 2014; Agostino Sarubbo <ago@gentoo.org> asciidoc-8.6.9-r1.ebuild:
-  Stable for amd64, wrt bug #529410
-
-  19 Nov 2014; Markus Meier <maekke@gentoo.org> asciidoc-8.6.9-r1.ebuild:
-  arm stable, bug #529410
-
-  19 Nov 2014; Jeroen Roovers <jer@gentoo.org> asciidoc-8.6.9-r1.ebuild:
-  Stable for HPPA (bug #529410).
-
-*asciidoc-8.6.9-r1 (03 Nov 2014)
-
-  03 Nov 2014; Dirkjan Ochtman <djc@gentoo.org> +asciidoc-8.6.9-r1.ebuild:
-  Add asciidoc-8.6.9-r1 with fixes from Calchan (fixes bug 483336)
-
-  23 Sep 2014; Dirkjan Ochtman <djc@gentoo.org> metadata.xml:
-  Add myself as a maintainer
-
-*asciidoc-8.6.9 (23 Sep 2014)
-
-  23 Sep 2014; Dirkjan Ochtman <djc@gentoo.org> +asciidoc-8.6.9.ebuild:
-  Version bump asciidoc to 8.6.9 (bug 494250)
-
-  31 Mar 2014; Michał Górny <mgorny@gentoo.org> asciidoc-8.6.8-r1.ebuild,
+  13 Nov 2015; Marc Joliet <marcec@gmx.de> asciidoc-8.6.9-r2.ebuild,
  asciidoc-9999.ebuild:
-  Add support for the new PyPy slotting.
+  change order of highlight deps

-  18 Jan 2014; Mike Frysinger <vapier@gentoo.org> asciidoc-8.6.5.ebuild,
-  asciidoc-8.6.8-r1.ebuild, asciidoc-9999.ebuild:
-  Add arm64 love.
+  Change the order of the highlight USE flag deps so that
+  dev-util/source-highlight becomes the default in order to match upstream.

-  13 Oct 2013; Pacho Ramos <pacho@gentoo.org> asciidoc-8.6.8-r1.ebuild:
-  Fix REQUIRED_USE as pointed by Nikoli
+  Gentoo-bug: 552148
+  Signed-off-by: Marc Joliet <marcec@gmx.de>

-  05 Sep 2013; Michał Górny <mgorny@gentoo.org> asciidoc-8.6.8-r1.ebuild,
+  13 Nov 2015; Marc Joliet <marcec@gmx.de> asciidoc-8.6.9-r2.ebuild,
  asciidoc-9999.ebuild:
-  Clean up PYTHON_COMPAT from old implementations.
+  split highlight deps by newline

-  21 Jul 2013; Pacho Ramos <pacho@gentoo.org> -asciidoc-8.2.6.ebuild,
-  -asciidoc-8.6.7.ebuild, -asciidoc-8.6.8.ebuild, metadata.xml:
-  Cleanup due http://gentoo.2317880.n4.nabble.com/sgml-herd-has-no-maintainers-
-  again-td259655.html
+  Signed-off-by: Marc Joliet <marcec@gmx.de>

-  30 Jun 2013; Justin Lecher <jlec@gentoo.org> asciidoc-8.6.8-r1.ebuild,
+  14 Nov 2015; Marc Joliet <marcec@gmx.de> asciidoc-8.6.9-r1.ebuild,
+  asciidoc-8.6.9-r2.ebuild, asciidoc-9999.ebuild:
+  trim description to <80 chars
+
+  The new description is taken verbatim from the first sentence at
+  http://asciidoc.org/userguide.html#_introduction.
+
+  Signed-off-by: Marc Joliet <marcec@gmx.de>
+
+  16 Nov 2015; Marc Joliet <marcec@gmx.de> asciidoc-8.6.9-r2.ebuild,
  asciidoc-9999.ebuild:
-  Fix usage of python-r1.eclass
+  use readme.gentoo for some deps

-  23 Feb 2013; Zac Medico <zmedico@gentoo.org> asciidoc-8.6.8-r1.ebuild,
+  Use readme.gentoo to refer to the a2x(1) man page for a list of runtime
+  dependencies instead of forcing the app-text/dblatex and lynx/w3m
+  dependencies.
+
+  Since this commit removes the direct dependency on app-text/dblatex, it also
+  restores previously dropped KEYWORDS to ~arch.
+
+  Gentoo-bug: 565844
+  Signed-off-by: Marc Joliet <marcec@gmx.de>
+
+  16 Nov 2015; Marc Joliet <marcec@gmx.de> -asciidoc-8.6.5.ebuild:
+  drop old 8.6.5
+
+  It uses the deprecated EAPI 3, the deprecated python eclass, and supports
+  fewer
+  KEYWORDS than the newer versions.
+
+  Signed-off-by: Marc Joliet <marcec@gmx.de>
+
+  16 Nov 2015; Marc Joliet <marcec@gmx.de> -asciidoc-8.6.8-r1.ebuild:
+  drop old 8.6.8-r1
+
+  Signed-off-by: Marc Joliet <marcec@gmx.de>
+
+  16 Nov 2015; Marc Joliet <marcec@gmx.de> -asciidoc-8.6.9.ebuild:
+  drop old 8.6.9
+
+  It suffers from bug #483336, which was fixed in -r1.
+
+  Signed-off-by: Marc Joliet <marcec@gmx.de>
+
+  20 Nov 2015; Marc Joliet <marcec@gmx.de> asciidoc-8.6.9-r2.ebuild,
  asciidoc-9999.ebuild:
-  Add ~arm-linux and ~x86-linux keywords.
+  remove vim-syntax from IUSE

-*asciidoc-8.6.8-r1 (23 Feb 2013)
+  The vim-syntax USE flag is useless now, for the following reasons:

-  23 Feb 2013; Mike Gilbert <floppym@gentoo.org> +asciidoc-8.6.8-r1.ebuild,
-  asciidoc-9999.ebuild:
-  Convert to python-single-r1, bug 458802 by mgorny.
+  - The actions it controls have no effect, since the Makefile.in doesn't do
+    anything vim-related anymore, as mentioned in the CHANGELOG.
+  - Vim comes with its own syntax file since version 7.4, which is maintained
+  (by
+    AsciiDoc upstream, according to its header) and was last updated in 2014,
+    whereas the upstream syntax file has not been changed since 2013.

-  27 Dec 2012; Christoph Junghans <ottxor@gentoo.org> asciidoc-8.2.6.ebuild,
-  asciidoc-8.6.5.ebuild, asciidoc-8.6.7.ebuild, asciidoc-8.6.8.ebuild,
-  asciidoc-9999.ebuild:
-  mercurial.eclass respects  now
+  Gentoo-bug: 530808
+  Signed-off-by: Marc Joliet <marcec@gmx.de>

-  15 Sep 2012; Mike Gilbert <floppym@gentoo.org> +asciidoc-8.2.6.ebuild:
-  Restore old version needed by dev-vcs/stgit-0.15-r1.
+  20 Nov 2015; Marc Joliet <marcec@gmx.de> asciidoc-8.6.9-r2.ebuild:
+  8.6.9-r2: fix docompress call

-  10 Sep 2012; Mike Gilbert <floppym@gentoo.org> -asciidoc-8.2.6.ebuild,
-  -asciidoc-8.5.3.ebuild, -asciidoc-8.6.3.ebuild, -asciidoc-8.6.4.ebuild:
-  Remove old.
+  Docompress should only be called when USE=examples.

-*asciidoc-8.6.8 (10 Sep 2012)
+  Gentoo-bug: 555400
+  Signed-off-by: Marc Joliet <marcec@gmx.de>

-  10 Sep 2012; Mike Gilbert <floppym@gentoo.org> +asciidoc-8.6.8.ebuild,
-  asciidoc-9999.ebuild:
-  Version bump for bug 430260 by Sean McCovern.
+  21 Dec 2015; Patrice Clement <monsieurp@gentoo.org> asciidoc-9999.ebuild:
+  9999: fix a typo

-  26 Apr 2012; Alexis Ballier <aballier@gentoo.org> asciidoc-8.6.7.ebuild,
-  asciidoc-9999.ebuild:
-  keyword ~amd64-fbsd
+  Package-Manager: portage-2.2.24
+  Signed-off-by: Marc Joliet <marcec@gmx.de>

-  08 Apr 2012; Raúl Porcel <armin76@gentoo.org> asciidoc-8.6.5.ebuild:
-  alpha/ia64/s390/sh/sparc stable wrt #388225
+  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
+  Replace all herds with appropriate projects (GLEP 67)

-  07 Apr 2012; Markus Meier <maekke@gentoo.org> asciidoc-8.6.5.ebuild:
-  x86 stable, bug #388225
+  Replace all uses of herd with appropriate project maintainers, or no
+  maintainers in case of herds requested to be disbanded.

-  28 Mar 2012; Markus Meier <maekke@gentoo.org> asciidoc-8.6.5.ebuild:
-  arm stable, bug #388225
+  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
+  Set appropriate maintainer types in metadata.xml (GLEP 67)

-  25 Mar 2012; Brent Baude <ranger@gentoo.org> asciidoc-8.6.5.ebuild:
-  Marking asciidoc-8.6.5 ppc64 for bug 388225
+  22 Mar 2016; Agostino Sarubbo <ago@gentoo.org> asciidoc-8.6.9-r2.ebuild:
+  amd64 stable wrt bug #577838

-  25 Mar 2012; Jeroen Roovers <jer@gentoo.org> asciidoc-8.6.5.ebuild:
-  Stable for HPPA (bug #388225).
+  Package-Manager: portage-2.2.26
+  RepoMan-Options: --include-arches="amd64"
+  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>

-  25 Mar 2012; Brent Baude <ranger@gentoo.org> asciidoc-8.6.5.ebuild:
-  Marking asciidoc-8.6.5 ppc for bug 388225
+*asciidoc-8.6.9-r3 (24 Mar 2016)

-  24 Mar 2012; Agostino Sarubbo <ago@gentoo.org> asciidoc-8.6.5.ebuild:
-  Stable for amd64, wrt bug #388225
+  24 Mar 2016; Patrice Clement <monsieurp@gentoo.org>
+  +asciidoc-8.6.9-r3.ebuild:
+  move to readme.gentoo-r1 eclass

-  23 Mar 2012; Mike Gilbert <floppym@gentoo.org> asciidoc-8.6.5.ebuild,
-  asciidoc-8.6.7.ebuild, asciidoc-9999.ebuild:
-  sed || die. Reported by Maurizio Camisaschi in bug 388225.
+  Package-Manager: portage-2.2.26
+  Signed-off-by: Marc Joliet <marcec@gmx.de>
+  Closes: https://github.com/gentoo/gentoo/pull/1128

-*asciidoc-8.6.7 (19 Mar 2012)
+  01 Apr 2016; Markus Meier <maekke@gentoo.org> asciidoc-8.6.9-r2.ebuild:
+  arm stable, bug #577838

-  19 Mar 2012; Sebastian Pipping <sping@gentoo.org> +asciidoc-8.6.7.ebuild,
-  asciidoc-9999.ebuild:
-  Bump to 8.6.7, allow pygments for USE=highlight (bug #383291)
+  Package-Manager: portage-2.2.28
+  RepoMan-Options: --include-arches="arm"

-  30 Jun 2011; Sebastian Pipping <sping@gentoo.org> asciidoc-8.5.3.ebuild,
-  asciidoc-8.6.3.ebuild, asciidoc-8.6.4.ebuild, asciidoc-8.6.5.ebuild,
-  asciidoc-9999.ebuild:
-  Add "graphviz? ( media-gfx/graphviz )" to runtime dependencies (bug #361255)
+  25 Jun 2016; Agostino Sarubbo <ago@gentoo.org> asciidoc-8.6.9-r2.ebuild:
+  x86 stable wrt bug #577838

-  27 Jun 2011; Sebastian Pipping <sping@gentoo.org> asciidoc-8.5.3.ebuild,
-  asciidoc-8.6.3.ebuild, asciidoc-8.6.4.ebuild, asciidoc-8.6.5.ebuild,
-  asciidoc-9999.ebuild:
-  Remove runtime dependency on graphviz (bug #361255)
+  Package-Manager: portage-2.2.28
+  RepoMan-Options: --include-arches="x86"
+  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>

-*asciidoc-8.6.5 (22 May 2011)
+  06 Jul 2016; Agostino Sarubbo <ago@gentoo.org> asciidoc-8.6.9-r2.ebuild:
+  ppc stable wrt bug #577838

-  22 May 2011; Sebastian Pipping <sping@gentoo.org> +asciidoc-8.6.5.ebuild:
-  Bump to 8.6.5, looks trivial
+  Package-Manager: portage-2.2.28
+  RepoMan-Options: --include-arches="ppc"
+  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>

-  05 Apr 2011; Ulrich Mueller <ulm@gentoo.org> asciidoc-8.2.6.ebuild:
-  Depend on dev-lang/python because virtual/python will go away, bug 358849.
-
-  23 Feb 2011; Sebastian Pipping <sping@gentoo.org> asciidoc-8.6.4.ebuild,
-  metadata.xml:
-  Bring back ~hppa keyword (bug #356069), add use flag "highlight" (bug
-  #344289)
-
-  22 Feb 2011; Jeroen Roovers <jer@gentoo.org> asciidoc-8.6.4.ebuild:
-  Drop HPPA because of missing dep on media-sound/lilypond (bug #356069).
-
-*asciidoc-8.6.4 (22 Feb 2011)
-
-  22 Feb 2011; Sebastian Pipping <sping@gentoo.org> +asciidoc-8.6.4.ebuild,
-  asciidoc-9999.ebuild:
-  Bump to 8.6.4, integrate test suite, sync live ebuild
-
-*asciidoc-9999 (14 Nov 2010)
-*asciidoc-8.6.3 (14 Nov 2010)
-
-  14 Nov 2010; Sebastian Pipping <sping@gentoo.org> +asciidoc-8.6.3.ebuild,
-  +asciidoc-9999.ebuild:
-  Bump to 8.6.3 (bug #339068), migrate to a hybrid release/live ebuild.
-  Upstream is not shipping HTML docs anymore: for now we don't build them
-  downstream.
-
-  15 Oct 2010; Brent Baude <ranger@gentoo.org> asciidoc-8.5.3.ebuild:
-  stable ppc, bug 332577
-
-  30 Sep 2010; Fabian Groffen <grobian@gentoo.org> asciidoc-8.5.3.ebuild:
-  Marked ~x86-solaris
-
-  19 Sep 2010; Raúl Porcel <armin76@gentoo.org> asciidoc-8.5.3.ebuild:
-  ia64/s390/sh/sparc stable wrt #332577
-
-  19 Sep 2010; Tobias Klausmann <klausman@gentoo.org> asciidoc-8.5.3.ebuild:
-  Stable on alpha, bug #332577, thanks to mattst88 for testing
-
-  23 Aug 2010; Markus Meier <maekke@gentoo.org> asciidoc-8.5.3.ebuild:
-  arm stable, bug #332577
-
-  20 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> asciidoc-8.5.3.ebuild:
-  ppc64 stable wrt #332577
-
-  17 Aug 2010; Jeroen Roovers <jer@gentoo.org> asciidoc-8.5.3.ebuild:
-  Stable for HPPA (bug #332577).
-
-  14 Aug 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
-  asciidoc-8.5.3.ebuild:
-  x86 stable wrt bug #332577
-
-  13 Aug 2010; Markos Chandras <hwoarang@gentoo.org> asciidoc-8.5.3.ebuild:
-  Stable on amd64 wrt bug #332577
-
-  13 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
-  asciidoc-8.5.3.ebuild:
-  Forgot to set active python version.
-
-*asciidoc-8.5.3 (13 Aug 2010)
-
-  13 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
-  -asciidoc-8.5.1.ebuild, +asciidoc-8.5.3.ebuild:
-  Version bump. Remove older.
-
-  05 Apr 2010; Jonathan Callen <abcd@gentoo.org> asciidoc-8.5.1.ebuild:
-  Bump to EAPI=3, add prefix keywords
-
-*asciidoc-8.5.1 (04 Dec 2009)
-
-  04 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
-  -asciidoc-7.0.4.ebuild, -asciidoc-8.1.0.ebuild, -asciidoc-8.2.7.ebuild,
-  -asciidoc-8.4.4.ebuild, -asciidoc-8.4.5.ebuild, -asciidoc-8.5.0.ebuild,
-  +asciidoc-8.5.1.ebuild:
-  Cleanup: remove older versions; bump to 8.5.1; fix dependencies
-  (previously DEPEND and RDEPEND were swapped); remove doc USE flag, always
-  install the HTML documentation; use /usr/share to install the data files
-  (closes bug #274319).
-
-*asciidoc-8.5.0 (06 Nov 2009)
-
-  06 Nov 2009; Patrick Lauer <patrick@gentoo.org> +asciidoc-8.5.0.ebuild:
-  Bump to 8.5.0, fixes #290747
-
-  27 Jun 2009; Patrick Lauer <patrick@gentoo.org> asciidoc-8.4.5.ebuild:
-  Adding app-text/docbook-xml-dtd-4.5 to RDEPEND in the hope to fix #272010
-
-*asciidoc-8.4.5 (27 Jun 2009)
-
-  27 Jun 2009; Patrick Lauer <patrick@gentoo.org> +asciidoc-8.4.5.ebuild:
-  Bump to 8.4.5, small fixes by Tim Harder. Closes #275570
-
-*asciidoc-8.4.4 (22 May 2009)
-
-  22 May 2009; Patrick Lauer <patrick@gentoo.org> +asciidoc-8.4.4.ebuild:
-  Bump to 8.4.4, closes #270644. Ebuild fixups by Andre-Patrick Bubel
-
-  13 Nov 2008; Brent Baude <ranger@gentoo.org> asciidoc-8.2.6.ebuild:
-  stable ppc64, bug 224743
-
-  08 Nov 2008; nixnut <nixnut@gentoo.org> asciidoc-8.2.6.ebuild:
-  Stable on ppc wrt bug 224743
-
-  07 Nov 2008; Raúl Porcel <armin76@gentoo.org> asciidoc-8.2.6.ebuild:
-  alpha/ia64 stable wrt #224743
-
-  06 Nov 2008; Jeroen Roovers <jer@gentoo.org> asciidoc-8.2.6.ebuild:
-  Stable for HPPA (bug #224743).
-
-  02 Nov 2008; Ferris McCormick <fmccor@gentoo.org> asciidoc-8.2.6.ebuild:
-  Sparc stable, Bug #224743.
-
-  02 Nov 2008; Markus Meier <maekke@gentoo.org> asciidoc-8.2.6.ebuild:
-  amd64/x86 stable, bug #224743
-
-*asciidoc-8.2.7 (18 Oct 2008)
-
-  18 Oct 2008; Peter Volkov <pva@gentoo.org> +asciidoc-8.2.7.ebuild:
-  Version bump, thank Alex Efros for report, bug #240355, also should fix
-  bug #193966.
-
-*asciidoc-8.2.6 (16 Jun 2008)
-
-  16 Jun 2008; Leonardo Boshell <leonardop@gentoo.org>
-  -asciidoc-7.1.2.ebuild, +asciidoc-8.2.6.ebuild:
-  Version bump. Added 'vim-syntax' flag (thanks to Vaclav Slavik for the
-  patch on bug #190702).
-
-  25 Jan 2008; Fabian Groffen <grobian@gentoo.org> asciidoc-7.0.4.ebuild,
-  asciidoc-7.1.2.ebuild, asciidoc-8.1.0.ebuild:
-  Dropped ppc-macos keyword, see you in prefix
-
-  16 May 2007; Greg Kroah-Hartman <gregkh@gentoo.org> asciidoc-8.1.0.ebuild:
-  add ~arm, ~s390, ~sh, and ~x86-fbsd so that dev-util/tig can rely on this
-  package.
-
-  12 Mar 2007; Leonardo Boshell <leonardop@gentoo.org> metadata.xml:
-  Replacing text-markup herd with the new sgml herd.
-
-  12 Jan 2007; Robin H. Johnson <robbat2@gentoo.org> asciidoc-7.1.2.ebuild,
-  asciidoc-8.1.0.ebuild:
-  a2x calls xsltproc at runtime, so fix deps.
-
-*asciidoc-8.1.0 (02 Nov 2006)
-
-  02 Nov 2006; Leonardo Boshell <leonardop@gentoo.org>
-  -asciidoc-7.0.1.ebuild, -asciidoc-7.0.1-r1.ebuild, +asciidoc-8.1.0.ebuild:
-  Version bump (bug #146419). Install the HTML documentation sources. Added
-  'examples' USE flag. Use the upstream installation script instead of
-  copying most of the files manually.
-
-  12 Jul 2006; Aron Griffis <agriffis@gentoo.org> asciidoc-7.0.4.ebuild:
-  Mark 7.0.4 stable on ia64
-
-  05 May 2006; Joshua Jackson <tsunam@gentoo.org> asciidoc-7.0.4.ebuild:
-  Stable on x86; bug #131825
-
-  01 May 2006; <tcort@gentoo.org> asciidoc-7.0.4.ebuild:
-  Stable on alpha and amd64 wrt Bug #131825.
-
-  01 May 2006; Michael Hanselmann <hansmi@gentoo.org> asciidoc-7.0.4.ebuild:
-  Stable on mips.
-
-  01 May 2006; Markus Rothe <corsair@gentoo.org> asciidoc-7.0.4.ebuild:
-  Stable on ppc64
-
-  01 May 2006; Jason Wever <weeve@gentoo.org> asciidoc-7.0.4.ebuild:
-  Stable on SPARC wrt bug #131825.
-
-  30 Apr 2006; Rene Nussbaumer <killerfox@gentoo.org> asciidoc-7.0.4.ebuild:
-  Stable on hppa, ppc.
-
-*asciidoc-7.1.2 (23 Apr 2006)
-
-  23 Apr 2006; Alexandre Buisse <nattfodd@gentoo.org>
-  -asciidoc-7.0.2.ebuild, +asciidoc-7.1.2.ebuild:
-  Bump to 7.1.2 (asked in bug #130692).
-
-  07 Feb 2006; Aron Griffis <agriffis@gentoo.org> asciidoc-7.0.1-r1.ebuild:
-  Mark 7.0.1-r1 stable on alpha
-
-  06 Feb 2006; Aron Griffis <agriffis@gentoo.org> asciidoc-7.0.1-r1.ebuild:
-  Mark 7.0.1-r1 stable on ia64
-
-  22 Jan 2006; Rene Nussbaumer <killerfox@gentoo.org> asciidoc-7.0.4.ebuild:
-  Unstable on hppa.
-
-  12 Jan 2006; Gustavo Zacarias <gustavoz@gentoo.org>
-  asciidoc-7.0.1-r1.ebuild:
-  Stable on sparc
-
-*asciidoc-7.0.4 (05 Jan 2006)
-
-  05 Jan 2006; Alexandre Buisse <nattfodd@gentoo.org>
-  +asciidoc-7.0.4.ebuild:
-  Bump to 7.0.4 (bug #114190).
-
-  30 Nov 2005; Tom Gall <tgall@gentoo.org> asciidoc-7.0.1-r1.ebuild:
-  stable on ppc64
- 
-*asciidoc-7.0.2 (18 Nov 2005)
-
-  18 Nov 2005; Leonardo Boshell <leonardop@gentoo.org>
-  +asciidoc-7.0.2.ebuild:
-  New release (bug #108897).
-
-  01 Oct 2005; Fabian Groffen <grobian@gentoo.org> asciidoc-7.0.1-r1.ebuild:
-  Marking ~ppc-macos (bug #107530)
-  Fixing a dead symlinks issue which is fatal on OSX.
-
-  28 Sep 2005; Ilya A. Volynets-Evenbakh <ilya@total-knowledge.com>
-  asciidoc-7.0.1-r1.ebuild:
-  mark ~mips
-
-  18 Sep 2005; Markus Rothe <corsair@gentoo.org> asciidoc-7.0.1-r1.ebuild:
-  Added ~ppc64 (bug #106318)
-
-  23 Aug 2005; Aron Griffis <agriffis@gentoo.org> asciidoc-7.0.1.ebuild:
-  stable on ia64
-
-  13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> asciidoc-7.0.1.ebuild:
-  Stable on ppc.
-
-  13 Aug 2005; Luis Medinas <metalgod@gentoo.org> asciidoc-7.0.1.ebuild:
-  Stable on AMD64.
-
-  13 Aug 2005; Carlos Silva <r3pek@gentoo.org> asciidoc-7.0.1-r1.ebuild:
-  Marked ~sparc. closes bug #102096
-
-*asciidoc-7.0.1-r1 (11 Aug 2005)
-
-  11 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
-  asciidoc-7.0.1-r1.ebuild:
-  Fixed installation of filters (bug #102124).
-
-  03 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org> asciidoc-7.0.1.ebuild:
-  stable on alpha
-
-  01 Aug 2005; Leonardo Boshell <leonardop@gentoo.org> asciidoc-7.0.1.ebuild:
-  Stable on x86.
-
-  13 Jul 2005; Joseph Jezak <josejx@gentoo.org> asciidoc-6.0.3-r1.ebuild:
-  Marked ppc stable for bug #98896.
-
-  13 Jul 2005; Aron Griffis <agriffis@gentoo.org> asciidoc-6.0.3-r1.ebuild:
-  stable on alpha amd64 ia64
-
-*asciidoc-7.0.1 (01 Jul 2005)
-
-  01 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> asciidoc-7.0.1.ebuild:
-  New release, resolves bug #96102. Patch no longer necessary. Modified
-  src_install() to follow upstream packager notes more closely.
-
-  01 Jul 2005; Leonardo Boshell <leonardop@gentoo.org>
-  asciidoc-6.0.3-r1.ebuild:
-  Stable on x86.
-
-  24 Jun 2005; Aron Griffis <agriffis@gentoo.org> asciidoc-6.0.3-r1.ebuild:
-  marked ~ia64 as a mercurial dep
-
-  13 Jun 2005; Fernando J. Pereda <ferdy@gentoo.org> asciidoc-6.0.3.ebuild,
-  asciidoc-6.0.3-r1.ebuild:
-  marked ~alpha as a cogito dependency
-
-*asciidoc-6.0.3-r1 (05 Jun 2005)
-
-  05 Jun 2005; Lars Weiler <pylon@gentoo.org> +files/asciidoc-name.patch,
-  +asciidoc-6.0.3-r1.ebuild:
-  Applied patch; bug #95127.
-
-  04 Jun 2005; Lars Weiler <pylon@gentoo.org> asciidoc-6.0.3.ebuild:
-  Added ~ppc.
-
-*asciidoc-6.0.3 (29 May 2005)
-
-  29 May 2005; Mamoru KOMACHI <usata@gentoo.org> +metadata.xml,
-  +asciidoc-6.0.3.ebuild:
-  Initial import. Thanks to Brandon Philips <brandon@ifup.org>; bug #91096.
--- a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/ChangeLog-2015
+++ b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/ChangeLog-2015
@ -0,0 +1,440 @@
+# ChangeLog for app-text/asciidoc
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/ChangeLog,v 1.110 2015/07/19 09:38:02 djc Exp $
+
+  19 Jul 2015; Dirkjan Ochtman <djc@gentoo.org> asciidoc-8.6.9-r1.ebuild:
+  Remove python 3.3, 3.4 compatibility again (bug 554786)
+
+  12 Jul 2015; Dirkjan Ochtman <djc@gentoo.org> asciidoc-8.6.9-r1.ebuild:
+  Add python 3.3, 3.4 compatibility (fixes bug 546110)
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
+
+  08 Apr 2015; Michał Górny <mgorny@gentoo.org> asciidoc-8.6.8-r1.ebuild,
+  asciidoc-9999.ebuild:
+  Remove old Python implementations
+
+  06 Dec 2014; Agostino Sarubbo <ago@gentoo.org> asciidoc-8.6.9-r1.ebuild:
+  Stable for ia64, wrt bug #529410
+
+  04 Dec 2014; Agostino Sarubbo <ago@gentoo.org> asciidoc-8.6.9-r1.ebuild:
+  Stable for ppc64, wrt bug #529410
+
+  03 Dec 2014; Agostino Sarubbo <ago@gentoo.org> asciidoc-8.6.9-r1.ebuild:
+  Stable for ppc, wrt bug #529410
+
+  03 Dec 2014; Dirkjan Ochtman <djc@gentoo.org> asciidoc-8.6.9-r1.ebuild,
+  asciidoc-8.6.9.ebuild:
+  Remove some old python implementations
+
+  02 Dec 2014; Pacho Ramos <pacho@gentoo.org> asciidoc-8.6.9-r1.ebuild:
+  x86 stable, bug #529410
+
+  02 Dec 2014; Agostino Sarubbo <ago@gentoo.org> asciidoc-8.6.9-r1.ebuild:
+  Stable for alpha, wrt bug #529410
+
+  01 Dec 2014; Agostino Sarubbo <ago@gentoo.org> asciidoc-8.6.9-r1.ebuild:
+  Stable for sparc, wrt bug #529410
+
+  26 Nov 2014; Agostino Sarubbo <ago@gentoo.org> asciidoc-8.6.9-r1.ebuild:
+  Stable for amd64, wrt bug #529410
+
+  19 Nov 2014; Markus Meier <maekke@gentoo.org> asciidoc-8.6.9-r1.ebuild:
+  arm stable, bug #529410
+
+  19 Nov 2014; Jeroen Roovers <jer@gentoo.org> asciidoc-8.6.9-r1.ebuild:
+  Stable for HPPA (bug #529410).
+
+*asciidoc-8.6.9-r1 (03 Nov 2014)
+
+  03 Nov 2014; Dirkjan Ochtman <djc@gentoo.org> +asciidoc-8.6.9-r1.ebuild:
+  Add asciidoc-8.6.9-r1 with fixes from Calchan (fixes bug 483336)
+
+  23 Sep 2014; Dirkjan Ochtman <djc@gentoo.org> metadata.xml:
+  Add myself as a maintainer
+
+*asciidoc-8.6.9 (23 Sep 2014)
+
+  23 Sep 2014; Dirkjan Ochtman <djc@gentoo.org> +asciidoc-8.6.9.ebuild:
+  Version bump asciidoc to 8.6.9 (bug 494250)
+
+  31 Mar 2014; Michał Górny <mgorny@gentoo.org> asciidoc-8.6.8-r1.ebuild,
+  asciidoc-9999.ebuild:
+  Add support for the new PyPy slotting.
+
+  18 Jan 2014; Mike Frysinger <vapier@gentoo.org> asciidoc-8.6.5.ebuild,
+  asciidoc-8.6.8-r1.ebuild, asciidoc-9999.ebuild:
+  Add arm64 love.
+
+  13 Oct 2013; Pacho Ramos <pacho@gentoo.org> asciidoc-8.6.8-r1.ebuild:
+  Fix REQUIRED_USE as pointed by Nikoli
+
+  05 Sep 2013; Michał Górny <mgorny@gentoo.org> asciidoc-8.6.8-r1.ebuild,
+  asciidoc-9999.ebuild:
+  Clean up PYTHON_COMPAT from old implementations.
+
+  21 Jul 2013; Pacho Ramos <pacho@gentoo.org> -asciidoc-8.2.6.ebuild,
+  -asciidoc-8.6.7.ebuild, -asciidoc-8.6.8.ebuild, metadata.xml:
+  Cleanup due http://gentoo.2317880.n4.nabble.com/sgml-herd-has-no-maintainers-
+  again-td259655.html
+
+  30 Jun 2013; Justin Lecher <jlec@gentoo.org> asciidoc-8.6.8-r1.ebuild,
+  asciidoc-9999.ebuild:
+  Fix usage of python-r1.eclass
+
+  23 Feb 2013; Zac Medico <zmedico@gentoo.org> asciidoc-8.6.8-r1.ebuild,
+  asciidoc-9999.ebuild:
+  Add ~arm-linux and ~x86-linux keywords.
+
+*asciidoc-8.6.8-r1 (23 Feb 2013)
+
+  23 Feb 2013; Mike Gilbert <floppym@gentoo.org> +asciidoc-8.6.8-r1.ebuild,
+  asciidoc-9999.ebuild:
+  Convert to python-single-r1, bug 458802 by mgorny.
+
+  27 Dec 2012; Christoph Junghans <ottxor@gentoo.org> asciidoc-8.2.6.ebuild,
+  asciidoc-8.6.5.ebuild, asciidoc-8.6.7.ebuild, asciidoc-8.6.8.ebuild,
+  asciidoc-9999.ebuild:
+  mercurial.eclass respects  now
+
+  15 Sep 2012; Mike Gilbert <floppym@gentoo.org> +asciidoc-8.2.6.ebuild:
+  Restore old version needed by dev-vcs/stgit-0.15-r1.
+
+  10 Sep 2012; Mike Gilbert <floppym@gentoo.org> -asciidoc-8.2.6.ebuild,
+  -asciidoc-8.5.3.ebuild, -asciidoc-8.6.3.ebuild, -asciidoc-8.6.4.ebuild:
+  Remove old.
+
+*asciidoc-8.6.8 (10 Sep 2012)
+
+  10 Sep 2012; Mike Gilbert <floppym@gentoo.org> +asciidoc-8.6.8.ebuild,
+  asciidoc-9999.ebuild:
+  Version bump for bug 430260 by Sean McCovern.
+
+  26 Apr 2012; Alexis Ballier <aballier@gentoo.org> asciidoc-8.6.7.ebuild,
+  asciidoc-9999.ebuild:
+  keyword ~amd64-fbsd
+
+  08 Apr 2012; Raúl Porcel <armin76@gentoo.org> asciidoc-8.6.5.ebuild:
+  alpha/ia64/s390/sh/sparc stable wrt #388225
+
+  07 Apr 2012; Markus Meier <maekke@gentoo.org> asciidoc-8.6.5.ebuild:
+  x86 stable, bug #388225
+
+  28 Mar 2012; Markus Meier <maekke@gentoo.org> asciidoc-8.6.5.ebuild:
+  arm stable, bug #388225
+
+  25 Mar 2012; Brent Baude <ranger@gentoo.org> asciidoc-8.6.5.ebuild:
+  Marking asciidoc-8.6.5 ppc64 for bug 388225
+
+  25 Mar 2012; Jeroen Roovers <jer@gentoo.org> asciidoc-8.6.5.ebuild:
+  Stable for HPPA (bug #388225).
+
+  25 Mar 2012; Brent Baude <ranger@gentoo.org> asciidoc-8.6.5.ebuild:
+  Marking asciidoc-8.6.5 ppc for bug 388225
+
+  24 Mar 2012; Agostino Sarubbo <ago@gentoo.org> asciidoc-8.6.5.ebuild:
+  Stable for amd64, wrt bug #388225
+
+  23 Mar 2012; Mike Gilbert <floppym@gentoo.org> asciidoc-8.6.5.ebuild,
+  asciidoc-8.6.7.ebuild, asciidoc-9999.ebuild:
+  sed || die. Reported by Maurizio Camisaschi in bug 388225.
+
+*asciidoc-8.6.7 (19 Mar 2012)
+
+  19 Mar 2012; Sebastian Pipping <sping@gentoo.org> +asciidoc-8.6.7.ebuild,
+  asciidoc-9999.ebuild:
+  Bump to 8.6.7, allow pygments for USE=highlight (bug #383291)
+
+  30 Jun 2011; Sebastian Pipping <sping@gentoo.org> asciidoc-8.5.3.ebuild,
+  asciidoc-8.6.3.ebuild, asciidoc-8.6.4.ebuild, asciidoc-8.6.5.ebuild,
+  asciidoc-9999.ebuild:
+  Add "graphviz? ( media-gfx/graphviz )" to runtime dependencies (bug #361255)
+
+  27 Jun 2011; Sebastian Pipping <sping@gentoo.org> asciidoc-8.5.3.ebuild,
+  asciidoc-8.6.3.ebuild, asciidoc-8.6.4.ebuild, asciidoc-8.6.5.ebuild,
+  asciidoc-9999.ebuild:
+  Remove runtime dependency on graphviz (bug #361255)
+
+*asciidoc-8.6.5 (22 May 2011)
+
+  22 May 2011; Sebastian Pipping <sping@gentoo.org> +asciidoc-8.6.5.ebuild:
+  Bump to 8.6.5, looks trivial
+
+  05 Apr 2011; Ulrich Mueller <ulm@gentoo.org> asciidoc-8.2.6.ebuild:
+  Depend on dev-lang/python because virtual/python will go away, bug 358849.
+
+  23 Feb 2011; Sebastian Pipping <sping@gentoo.org> asciidoc-8.6.4.ebuild,
+  metadata.xml:
+  Bring back ~hppa keyword (bug #356069), add use flag "highlight" (bug
+  #344289)
+
+  22 Feb 2011; Jeroen Roovers <jer@gentoo.org> asciidoc-8.6.4.ebuild:
+  Drop HPPA because of missing dep on media-sound/lilypond (bug #356069).
+
+*asciidoc-8.6.4 (22 Feb 2011)
+
+  22 Feb 2011; Sebastian Pipping <sping@gentoo.org> +asciidoc-8.6.4.ebuild,
+  asciidoc-9999.ebuild:
+  Bump to 8.6.4, integrate test suite, sync live ebuild
+
+*asciidoc-9999 (14 Nov 2010)
+*asciidoc-8.6.3 (14 Nov 2010)
+
+  14 Nov 2010; Sebastian Pipping <sping@gentoo.org> +asciidoc-8.6.3.ebuild,
+  +asciidoc-9999.ebuild:
+  Bump to 8.6.3 (bug #339068), migrate to a hybrid release/live ebuild.
+  Upstream is not shipping HTML docs anymore: for now we don't build them
+  downstream.
+
+  15 Oct 2010; Brent Baude <ranger@gentoo.org> asciidoc-8.5.3.ebuild:
+  stable ppc, bug 332577
+
+  30 Sep 2010; Fabian Groffen <grobian@gentoo.org> asciidoc-8.5.3.ebuild:
+  Marked ~x86-solaris
+
+  19 Sep 2010; Raúl Porcel <armin76@gentoo.org> asciidoc-8.5.3.ebuild:
+  ia64/s390/sh/sparc stable wrt #332577
+
+  19 Sep 2010; Tobias Klausmann <klausman@gentoo.org> asciidoc-8.5.3.ebuild:
+  Stable on alpha, bug #332577, thanks to mattst88 for testing
+
+  23 Aug 2010; Markus Meier <maekke@gentoo.org> asciidoc-8.5.3.ebuild:
+  arm stable, bug #332577
+
+  20 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> asciidoc-8.5.3.ebuild:
+  ppc64 stable wrt #332577
+
+  17 Aug 2010; Jeroen Roovers <jer@gentoo.org> asciidoc-8.5.3.ebuild:
+  Stable for HPPA (bug #332577).
+
+  14 Aug 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  asciidoc-8.5.3.ebuild:
+  x86 stable wrt bug #332577
+
+  13 Aug 2010; Markos Chandras <hwoarang@gentoo.org> asciidoc-8.5.3.ebuild:
+  Stable on amd64 wrt bug #332577
+
+  13 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  asciidoc-8.5.3.ebuild:
+  Forgot to set active python version.
+
+*asciidoc-8.5.3 (13 Aug 2010)
+
+  13 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -asciidoc-8.5.1.ebuild, +asciidoc-8.5.3.ebuild:
+  Version bump. Remove older.
+
+  05 Apr 2010; Jonathan Callen <abcd@gentoo.org> asciidoc-8.5.1.ebuild:
+  Bump to EAPI=3, add prefix keywords
+
+*asciidoc-8.5.1 (04 Dec 2009)
+
+  04 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  -asciidoc-7.0.4.ebuild, -asciidoc-8.1.0.ebuild, -asciidoc-8.2.7.ebuild,
+  -asciidoc-8.4.4.ebuild, -asciidoc-8.4.5.ebuild, -asciidoc-8.5.0.ebuild,
+  +asciidoc-8.5.1.ebuild:
+  Cleanup: remove older versions; bump to 8.5.1; fix dependencies
+  (previously DEPEND and RDEPEND were swapped); remove doc USE flag, always
+  install the HTML documentation; use /usr/share to install the data files
+  (closes bug #274319).
+
+*asciidoc-8.5.0 (06 Nov 2009)
+
+  06 Nov 2009; Patrick Lauer <patrick@gentoo.org> +asciidoc-8.5.0.ebuild:
+  Bump to 8.5.0, fixes #290747
+
+  27 Jun 2009; Patrick Lauer <patrick@gentoo.org> asciidoc-8.4.5.ebuild:
+  Adding app-text/docbook-xml-dtd-4.5 to RDEPEND in the hope to fix #272010
+
+*asciidoc-8.4.5 (27 Jun 2009)
+
+  27 Jun 2009; Patrick Lauer <patrick@gentoo.org> +asciidoc-8.4.5.ebuild:
+  Bump to 8.4.5, small fixes by Tim Harder. Closes #275570
+
+*asciidoc-8.4.4 (22 May 2009)
+
+  22 May 2009; Patrick Lauer <patrick@gentoo.org> +asciidoc-8.4.4.ebuild:
+  Bump to 8.4.4, closes #270644. Ebuild fixups by Andre-Patrick Bubel
+
+  13 Nov 2008; Brent Baude <ranger@gentoo.org> asciidoc-8.2.6.ebuild:
+  stable ppc64, bug 224743
+
+  08 Nov 2008; nixnut <nixnut@gentoo.org> asciidoc-8.2.6.ebuild:
+  Stable on ppc wrt bug 224743
+
+  07 Nov 2008; Raúl Porcel <armin76@gentoo.org> asciidoc-8.2.6.ebuild:
+  alpha/ia64 stable wrt #224743
+
+  06 Nov 2008; Jeroen Roovers <jer@gentoo.org> asciidoc-8.2.6.ebuild:
+  Stable for HPPA (bug #224743).
+
+  02 Nov 2008; Ferris McCormick <fmccor@gentoo.org> asciidoc-8.2.6.ebuild:
+  Sparc stable, Bug #224743.
+
+  02 Nov 2008; Markus Meier <maekke@gentoo.org> asciidoc-8.2.6.ebuild:
+  amd64/x86 stable, bug #224743
+
+*asciidoc-8.2.7 (18 Oct 2008)
+
+  18 Oct 2008; Peter Volkov <pva@gentoo.org> +asciidoc-8.2.7.ebuild:
+  Version bump, thank Alex Efros for report, bug #240355, also should fix
+  bug #193966.
+
+*asciidoc-8.2.6 (16 Jun 2008)
+
+  16 Jun 2008; Leonardo Boshell <leonardop@gentoo.org>
+  -asciidoc-7.1.2.ebuild, +asciidoc-8.2.6.ebuild:
+  Version bump. Added 'vim-syntax' flag (thanks to Vaclav Slavik for the
+  patch on bug #190702).
+
+  25 Jan 2008; Fabian Groffen <grobian@gentoo.org> asciidoc-7.0.4.ebuild,
+  asciidoc-7.1.2.ebuild, asciidoc-8.1.0.ebuild:
+  Dropped ppc-macos keyword, see you in prefix
+
+  16 May 2007; Greg Kroah-Hartman <gregkh@gentoo.org> asciidoc-8.1.0.ebuild:
+  add ~arm, ~s390, ~sh, and ~x86-fbsd so that dev-util/tig can rely on this
+  package.
+
+  12 Mar 2007; Leonardo Boshell <leonardop@gentoo.org> metadata.xml:
+  Replacing text-markup herd with the new sgml herd.
+
+  12 Jan 2007; Robin H. Johnson <robbat2@gentoo.org> asciidoc-7.1.2.ebuild,
+  asciidoc-8.1.0.ebuild:
+  a2x calls xsltproc at runtime, so fix deps.
+
+*asciidoc-8.1.0 (02 Nov 2006)
+
+  02 Nov 2006; Leonardo Boshell <leonardop@gentoo.org>
+  -asciidoc-7.0.1.ebuild, -asciidoc-7.0.1-r1.ebuild, +asciidoc-8.1.0.ebuild:
+  Version bump (bug #146419). Install the HTML documentation sources. Added
+  'examples' USE flag. Use the upstream installation script instead of
+  copying most of the files manually.
+
+  12 Jul 2006; Aron Griffis <agriffis@gentoo.org> asciidoc-7.0.4.ebuild:
+  Mark 7.0.4 stable on ia64
+
+  05 May 2006; Joshua Jackson <tsunam@gentoo.org> asciidoc-7.0.4.ebuild:
+  Stable on x86; bug #131825
+
+  01 May 2006; <tcort@gentoo.org> asciidoc-7.0.4.ebuild:
+  Stable on alpha and amd64 wrt Bug #131825.
+
+  01 May 2006; Michael Hanselmann <hansmi@gentoo.org> asciidoc-7.0.4.ebuild:
+  Stable on mips.
+
+  01 May 2006; Markus Rothe <corsair@gentoo.org> asciidoc-7.0.4.ebuild:
+  Stable on ppc64
+
+  01 May 2006; Jason Wever <weeve@gentoo.org> asciidoc-7.0.4.ebuild:
+  Stable on SPARC wrt bug #131825.
+
+  30 Apr 2006; Rene Nussbaumer <killerfox@gentoo.org> asciidoc-7.0.4.ebuild:
+  Stable on hppa, ppc.
+
+*asciidoc-7.1.2 (23 Apr 2006)
+
+  23 Apr 2006; Alexandre Buisse <nattfodd@gentoo.org>
+  -asciidoc-7.0.2.ebuild, +asciidoc-7.1.2.ebuild:
+  Bump to 7.1.2 (asked in bug #130692).
+
+  07 Feb 2006; Aron Griffis <agriffis@gentoo.org> asciidoc-7.0.1-r1.ebuild:
+  Mark 7.0.1-r1 stable on alpha
+
+  06 Feb 2006; Aron Griffis <agriffis@gentoo.org> asciidoc-7.0.1-r1.ebuild:
+  Mark 7.0.1-r1 stable on ia64
+
+  22 Jan 2006; Rene Nussbaumer <killerfox@gentoo.org> asciidoc-7.0.4.ebuild:
+  Unstable on hppa.
+
+  12 Jan 2006; Gustavo Zacarias <gustavoz@gentoo.org>
+  asciidoc-7.0.1-r1.ebuild:
+  Stable on sparc
+
+*asciidoc-7.0.4 (05 Jan 2006)
+
+  05 Jan 2006; Alexandre Buisse <nattfodd@gentoo.org>
+  +asciidoc-7.0.4.ebuild:
+  Bump to 7.0.4 (bug #114190).
+
+  30 Nov 2005; Tom Gall <tgall@gentoo.org> asciidoc-7.0.1-r1.ebuild:
+  stable on ppc64
+ 
+*asciidoc-7.0.2 (18 Nov 2005)
+
+  18 Nov 2005; Leonardo Boshell <leonardop@gentoo.org>
+  +asciidoc-7.0.2.ebuild:
+  New release (bug #108897).
+
+  01 Oct 2005; Fabian Groffen <grobian@gentoo.org> asciidoc-7.0.1-r1.ebuild:
+  Marking ~ppc-macos (bug #107530)
+  Fixing a dead symlinks issue which is fatal on OSX.
+
+  28 Sep 2005; Ilya A. Volynets-Evenbakh <ilya@total-knowledge.com>
+  asciidoc-7.0.1-r1.ebuild:
+  mark ~mips
+
+  18 Sep 2005; Markus Rothe <corsair@gentoo.org> asciidoc-7.0.1-r1.ebuild:
+  Added ~ppc64 (bug #106318)
+
+  23 Aug 2005; Aron Griffis <agriffis@gentoo.org> asciidoc-7.0.1.ebuild:
+  stable on ia64
+
+  13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> asciidoc-7.0.1.ebuild:
+  Stable on ppc.
+
+  13 Aug 2005; Luis Medinas <metalgod@gentoo.org> asciidoc-7.0.1.ebuild:
+  Stable on AMD64.
+
+  13 Aug 2005; Carlos Silva <r3pek@gentoo.org> asciidoc-7.0.1-r1.ebuild:
+  Marked ~sparc. closes bug #102096
+
+*asciidoc-7.0.1-r1 (11 Aug 2005)
+
+  11 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  asciidoc-7.0.1-r1.ebuild:
+  Fixed installation of filters (bug #102124).
+
+  03 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org> asciidoc-7.0.1.ebuild:
+  stable on alpha
+
+  01 Aug 2005; Leonardo Boshell <leonardop@gentoo.org> asciidoc-7.0.1.ebuild:
+  Stable on x86.
+
+  13 Jul 2005; Joseph Jezak <josejx@gentoo.org> asciidoc-6.0.3-r1.ebuild:
+  Marked ppc stable for bug #98896.
+
+  13 Jul 2005; Aron Griffis <agriffis@gentoo.org> asciidoc-6.0.3-r1.ebuild:
+  stable on alpha amd64 ia64
+
+*asciidoc-7.0.1 (01 Jul 2005)
+
+  01 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> asciidoc-7.0.1.ebuild:
+  New release, resolves bug #96102. Patch no longer necessary. Modified
+  src_install() to follow upstream packager notes more closely.
+
+  01 Jul 2005; Leonardo Boshell <leonardop@gentoo.org>
+  asciidoc-6.0.3-r1.ebuild:
+  Stable on x86.
+
+  24 Jun 2005; Aron Griffis <agriffis@gentoo.org> asciidoc-6.0.3-r1.ebuild:
+  marked ~ia64 as a mercurial dep
+
+  13 Jun 2005; Fernando J. Pereda <ferdy@gentoo.org> asciidoc-6.0.3.ebuild,
+  asciidoc-6.0.3-r1.ebuild:
+  marked ~alpha as a cogito dependency
+
+*asciidoc-6.0.3-r1 (05 Jun 2005)
+
+  05 Jun 2005; Lars Weiler <pylon@gentoo.org> +files/asciidoc-name.patch,
+  +asciidoc-6.0.3-r1.ebuild:
+  Applied patch; bug #95127.
+
+  04 Jun 2005; Lars Weiler <pylon@gentoo.org> asciidoc-6.0.3.ebuild:
+  Added ~ppc.
+
+*asciidoc-6.0.3 (29 May 2005)
+
+  29 May 2005; Mamoru KOMACHI <usata@gentoo.org> +metadata.xml,
+  +asciidoc-6.0.3.ebuild:
+  Initial import. Thanks to Brandon Philips <brandon@ifup.org>; bug #91096.
--- a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/Manifest
+++ b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/Manifest
@ -1,32 +1,8 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST asciidoc-8.6.5.tar.gz 867402 SHA256 f9da38afaf04186145739c10551341a448b3bf50a37a10392fbe584e9fb2a85f SHA512 bece29540d36a9e071a0746b08ef21a0ecf68a40ae3d593d98dd33d0ab5fcfa85b7895b545b9e5a8e33f78c7ecb142758697decf45e9c2ce26b068ca77c1f2e6 WHIRLPOOL 0c6a85fe848205cbe1b13a8717718b2c6fd6613ded252da13ead4145fdaed5ab763fb5c3c80997e69f39897c3cdd48309e9ef832f36027af75af3381255f22e8
-DIST asciidoc-8.6.8.tar.gz 900422 SHA256 ffb67f59dccaf6f15db72fcd04fdf21a2f9b703d31f94fcd0c49a424a9fcfbc4 SHA512 74c5444124f138862a92a1884b8afe8f968c9a2bbe5a8bbaa9413b0fa4f29fb1ab2eab3c59a68e6c6ddd518866f504e34f43c81406a77c1b2033fbff79df7373 WHIRLPOOL 64a8e20b9718368da7a409cd93ad1906975a09594490982d915146ab721c9b969d714a86318c65e6a328716fbe151d3d2effb012e86a3207fd7717fdbd88ee2c
 DIST asciidoc-8.6.9.tar.gz 907253 SHA256 78db9d0567c8ab6570a6eff7ffdf84eadd91f2dfc0a92a2d0105d323cab4e1f0 SHA512 1984482010dbd35c3a1def67f4915ce83ecfc29a7463f84aa312107d7a9ff647978f57615462c65e885bea424eed89a212df728cc3acd3c63df1c763dfa5e955 WHIRLPOOL dbd576ed3b7bcaf46afd33d9aae7a94f82fb171fa73f0b99f737b6934f62927ea11e1290aeac141ce5de27f66a56d7ed2d110f2b0d84e0598e858eac0e52b35d
-EBUILD asciidoc-8.6.5.ebuild 2741 SHA256 4f4ef36e8bd51493dd9698360d18e8083b867fac559b75cedd215951ff3cfff2 SHA512 3fceda4db6c90d8416e82210122b10a460f3e3bf6e135a7cc60e2d9a3ebda2c3cff194fd4cab07e7bf7277bff8c9858b0382c8a5eeae903e8c4cb612661f2cce WHIRLPOOL 275fbcdd2e3692cd0d7f8e4b748de562eccddfddc4cb297ddf84fd3044903c8c8867e366196263553661d6c373eff58de564eea8eddc2c8e17913c04babdcb45
-EBUILD asciidoc-8.6.8-r1.ebuild 2809 SHA256 32ae93b2fa3a30ae866e61332189270a952e40e125a60620de084155418229bd SHA512 68b07c58511bdbf050e48bc13846094e787dee8c37c3851fad964814b3730761a95b12ac629679d8df87dd386cca3ef5fd0156198b1532ba00ef6481eb3338f3 WHIRLPOOL 709f1f94ee1a4b47847c07fb6b23b6e07426adbba82e86f0561fb1749fbf0db28435ac4480f8b4f9e00d9383a572b68c3555ce80ace9ee1c1ed2bf871562edc5
-EBUILD asciidoc-8.6.9-r1.ebuild 2429 SHA256 e09dcb5f3bac2f247182c11fd90930355d58f8ae784017ce630eb982fbaea50a SHA512 955c321f649cf8087d2e5163e7f6f3db6b4021c1c33335fb3bde86ac0297499b154ca2d3e1933e1dd37f536cbaac2850b678833f891ac09dd9ccd4fe8803b632 WHIRLPOOL 10ea309292cf9b96b0bcd22537bb848d2752b89c9c0a9946b68f42e01cf78b51e3af46f84aa483a4b3f3b3171e4e4fa1780899e1465e35f6e18332cdefe3a9f0
-EBUILD asciidoc-8.6.9.ebuild 2803 SHA256 ac63b4a521e62a924ca31411f4f52126d247e90b9e1d0bb7ba08bee896252e81 SHA512 48b9425bf8fc9c226d324867b153ffe0ee823e30bcb3df14d6c4b71144a945b82065e8bb88c9dc200fb9706a03c92414ff12ea417668e215098b5c2730bcb998 WHIRLPOOL 9d4db2397b6af289bee95168a6e0ee2d30b54187dd76454847dac34e6c6fc70044daeb615c7a7fd02221c2c4e6c02194dd3382d0e2f24e99893e5ab9fe329123
-EBUILD asciidoc-9999.ebuild 2821 SHA256 bfe39c9734d153a71d1850e986e12c017828aa8c04d376f52467ceddfbca8b73 SHA512 90d2fdef6ebd84115968aff97d5f7ec87f2f25df9ddae53621d7bcc85423f236cd7a5b1b6e3daeafe06c791d8505ceda8a688e9403153aea467c49ed1ae12c9e WHIRLPOOL 039b7810c4ee34b4a28f8d334ec7c9e19613d7b62899caa1428b6abc3302c2d4035dfc7dc506998e2c32deb704c5c2b0999f2c4edbb64a6f25d1e6c665e2b180
-MISC ChangeLog 15209 SHA256 c78d0686ea1fef632ea9caf85787d7b3463b81365a5fde4af24c1d2c6abafa4f SHA512 f450f6ed93ea8cfe4ff28aa5db1d782cfa23c9c0c1068e0ec332ab372173d89763904294730441fa69c0d05776c04fca34d49bad17bc2d7269f807bac6ce4e8c WHIRLPOOL 7fb90e120f3cef3e53ac0fd3ba47703f1b4e6fae54cef907b6f5f651251759af5a7cbf8599c0eb5db20a3eedb49447dd4dade1048b34efd3dc7b98efd8963f20
-MISC metadata.xml 320 SHA256 848322dd58123a1cf9d2e35e2d32705defd8eb80f2efc29da1ff54ab54531f11 SHA512 90215098e0d41b4c642891af0be5067dc12bcc7cb394b25258c20feadf514931e203fa695c14b1567c478f6e9667eb4153c75c3d49db67ae8ebd78ed2d3f5596 WHIRLPOOL 9bade435bfee544a1b31bb9462a7f0054dfdb1f03454bcb1d6b62418ebce827a6453b301d48ba8213563e5796eebe687eef99a6ad6d7402c4fc9365da0603333
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQJ8BAEBCABmBQJVJNl/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOI2EQAKgpasA90qyjtpM9bsgBpExm
-4LZp6OrB10uCR1z8lR9irCaxkkcMhUEX/Woee9HsPGH0j8KrKwkzKjKht/5hCpaA
-BzS7plhhYJIJW5zfG9Hjtx+S3JgdMNqa0gDvy+UlRrTG+2HW4k6M2xrtjWi/HSRD
-F3khJFUT4R/mgmGTkIsHfJdgXPFSnU4ljRYSLTtYA6JfkNIVIDZ8pioQtKvDlrNF
-5WNbLwEtJhIy2iILUs7n+i3muU0gXjc2/vaqgyBV9aF6GZfXM3+/P5BHYnylAGmr
-ROwjzEHQcksLzA4XU5XE8ulBwDrw4TCJ0URgsEQTCXPm/Fbyc2QK0WbLvlphvWUV
-lwwbXNzGSXKRqOmxgDpEI4ilN7aXQdBwAzzq5CBLG4OxSACdzCH2dm55z/AON6yP
-DJO/Rc4QSx2xvypIqhRSzCWx7V/YzbrhD0d8Z2J0teuS5TdH/gBnBXBJtJtc5jv8
-Qr1ujnmX+OZ2jBEqphGg8ilqDfsieSIobiP/kWEYlDS0Tohd4Kw3H6CgNEh8KDzF
-kuylInuT5sdT9Nn+LDY2hel1aVkh8sx7I4wPjQr8aXvakgtB0XKlS+NYqHk8JOVn
-Kg28mce3M+e2L/FcawAJNWrqnQJ45JeOP8T0NeZ144z7/1/j7vLzSm/DoAlSV1eu
-QLSEt/l/PtZKtk1OPe9p
-=5Cch
-----END PGP SIGNATURE-----
+EBUILD asciidoc-8.6.9-r1.ebuild 2299 SHA256 0cf6f353471b8046da35aed702795d877166d07ad70f4399a6861e1084e05608 SHA512 697eb2c1121dee2b82ec988117040dc571735ba88f735ae24f85aaa97531e8d4859a5dbafe99b645b221c96894acabebfc34223bf7c5fbfeb04330bc5efd3846 WHIRLPOOL 4b8bfb858f136fef7e1d920a0a1e299ab0c5bc0deb74f2957b47074a5f6a9fff7cfee2179c8683db72ac0b98739d78a75d3ae93ac22818ea89cbc83547727577
+EBUILD asciidoc-8.6.9-r2.ebuild 2217 SHA256 de12cbcdb944102301376340b4937f37cfd3a2132416c8a10f50aa23bac15103 SHA512 ca5e3e09409b9e84ae2ecef04a989568ab733ce9d9c26adeb4757ed71bd316c1190c06133e20b88a700a873b9ad76dba9dba6ee8d04bc2190394a94b69790bdf WHIRLPOOL be28245bf507c6aa501d2fd392f29e23fa46fb9bf84f52fbbcd6e3647103cbf75ab1c425d60209c96c3e03f9dde31025b36883907013cba6628a23530415679d
+EBUILD asciidoc-8.6.9-r3.ebuild 2269 SHA256 48a6b018ed1ab595f3d7010e02acbe2e992b660682aafcc3b7e0e4b6e33c03bd SHA512 b562dc076c10d5d67340bf79b3fe107baf6cf0af2ce77bea9ff647fb0c5ddf4bcf3e01d4326864e57c6374b01c35070e23ced6f8a5ac3a01caefb89375233225 WHIRLPOOL 025d43c7bf48a536b6c03e9b376ddeff6055c9d75c18f28e96cb88e29a55d3b25a31477755373b444d5cd2061f70efff7f0ca688aca8ed809ef4f1d705b14349
+EBUILD asciidoc-9999.ebuild 2604 SHA256 796f4ce19efac53bef459806d0f27b9bdd6962e838a543ca78c1aba6e220ad0c SHA512 334df580d9f8d43d930663b1e47949e2a8dbb23d07343abc705252abb0affd0e6d85f6a876a6a26d066873febb6574552578ab9bbe6eddd07dcb619aa8878af3 WHIRLPOOL b85f19cb4fefd02a0def72c64848744f2d693eb3ea35e59a2a441e4c2f5444ad291831ef48dfdada4943b2986797c083f56126e27b2250804bb3e7118b18f175
+MISC ChangeLog 7613 SHA256 f2e5480ce1086322c8d0c94eeda6b8059e306cb34dc0071ebc4c7e95d85ce57f SHA512 b7c8419e504fe96956140696b8043ef08140b8721c63e7f304ba7946284db2cee99fddfb38314510bec905fa1a3f3c34896c5ed98e7e6e529228fba141205064 WHIRLPOOL 0da82702938f375f877e9a504d891ad812453f3c5965a7f4a9f4bfecbb8e4cc5a769a704eed858c95306a40442a4fa18fee281e8cb071b30ecd184002dca9772
+MISC ChangeLog-2015 15568 SHA256 d7ba2f8295a1a51593f0394adbb65476298ea2aef511db8c101748a3ad0d59d2 SHA512 3fd8c898a19c9821c2a5cd949e62b5f0076b2d28864785d7f276b0f5eed477bd1980b4cff1731067d150086612d9b1a3844f6ab879873516ef2f7c0c2c43b2d4 WHIRLPOOL ceda16169a2d0f36b1b4ea3a91cded15ee8dcade4148502030e4511bd4fa9e8104ff4c2e0258fc0955e29bb0524b02819d6cd2e743e74b73acb7581777c442b0
+MISC metadata.xml 583 SHA256 745ad8106536c9e69d0697772abfd3a4366b01fa922e292c3b16831311e93e3c SHA512 cf654b12cae851d762b538926912ed626a5681033f9c579ca9e62d442345c8efe5a5373784c702994c2b97a0acf7f251d257da29dc3960a2dc8c1b84327f11af WHIRLPOOL 3c9119d5f49082d19e4d0fe1903fdf41d062ca9d5ab7c3befd1e19ac9e7e94ed6683b378bc7fa04b32b7060b6b64159502d15b92202f37344302971978cce58b
--- a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-8.6.5.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-8.6.5.ebuild
@ -1,106 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-8.6.5.ebuild,v 1.13 2014/01/18 11:51:03 vapier Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-RESTRICT_PYTHON_ABIS="3.*"
-
-[ "$PV" == "9999" ] && inherit mercurial autotools
-inherit python
-
-DESCRIPTION="A text document format for writing short documents, articles, books and UNIX man pages"
-HOMEPAGE="http://www.methods.co.nz/asciidoc/"
-if [ "$PV" == "9999" ]; then
-	EHG_REPO_URI="https://asciidoc.googlecode.com/hg/"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples graphviz highlight test vim-syntax"
-
-RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75
-		dev-libs/libxslt
-		graphviz? ( media-gfx/graphviz )
-		app-text/docbook-xml-dtd:4.5
-		highlight? ( dev-util/source-highlight )
-"
-DEPEND="test? ( dev-util/source-highlight
-			media-sound/lilypond
-			media-gfx/imagemagick
-			dev-texlive/texlive-latex
-			app-text/dvipng
-			media-gfx/graphviz )
-"
-
-if [ "$PV" == "9999" ]; then
-	DEPEND="${DEPEND}
-		dev-util/aap
-		www-client/lynx
-		dev-util/source-highlight"
-fi
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	if ! use vim-syntax; then
-		sed -i -e '/^install/s/install-vim//' Makefile.in || die
-	else
-		sed -i\
-			-e "/^vimdir/s:@sysconfdir@/vim:${EPREFIX}/usr/share/vim/vimfiles:" \
-			-e 's:/etc/vim::' \
-			Makefile.in || die
-	fi
-
-	# Only needed for prefix - harmless (does nothing) otherwise
-	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
-		"${S}/asciidoc.py" || die
-
-	[ "$PV" == "9999" ] && eautoconf
-}
-
-src_configure() {
-	econf --sysconfdir="${EPREFIX}"/usr/share
-}
-
-src_compile() {
-	default
-
-	if [ "$PV" == "9999" ]; then
-		( cd doc && aap -f main.aap ../{CHANGELOG,README,BUGS} )
-	fi
-}
-
-src_install() {
-	use vim-syntax && dodir /usr/share/vim/vimfiles
-
-	emake DESTDIR="${D}" install || die "install failed"
-
-	python_convert_shebangs -r 2 "${D}"
-
-	if use examples; then
-		# This is a symlink to a directory
-		rm examples/website/images || die
-
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die
-		dosym ../../../asciidoc/images /usr/share/doc/${PF}/examples || die
-	fi
-
-	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
-			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt || die
-}
-
-src_test() {
-	cd tests || die
-	ASCIIDOC_PY=../asciidoc.py "$(PYTHON)" test${PN}.py update || die
-	ASCIIDOC_PY=../asciidoc.py "$(PYTHON)" test${PN}.py run || die
-}
--- a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-8.6.8-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-8.6.8-r1.ebuild
@ -1,107 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-8.6.8-r1.ebuild,v 1.8 2015/04/08 07:30:31 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-[ "$PV" == "9999" ] && inherit mercurial autotools
-inherit python-single-r1
-
-DESCRIPTION="A text document format for writing short documents, articles, books and UNIX man pages"
-HOMEPAGE="http://www.methods.co.nz/asciidoc/"
-if [ "$PV" == "9999" ]; then
-	EHG_REPO_URI="https://asciidoc.googlecode.com/hg/"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples graphviz highlight test vim-syntax"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75
-		dev-libs/libxslt
-		graphviz? ( media-gfx/graphviz )
-		app-text/docbook-xml-dtd:4.5
-		highlight? ( || ( dev-python/pygments[${PYTHON_USEDEP}] dev-util/source-highlight ) )
-		${PYTHON_DEPS}
-"
-DEPEND="test? ( dev-util/source-highlight
-			media-sound/lilypond
-			media-gfx/imagemagick
-			dev-texlive/texlive-latex
-			app-text/dvipng
-			media-gfx/graphviz
-			${PYTHON_DEPS} )
-"
-
-if [ "$PV" == "9999" ]; then
-	DEPEND="${DEPEND}
-		dev-util/aap
-		www-client/lynx
-		dev-util/source-highlight"
-fi
-
-src_prepare() {
-	if ! use vim-syntax; then
-		sed -i -e '/^install/s/install-vim//' Makefile.in || die
-	else
-		sed -i\
-			-e "/^vimdir/s:@sysconfdir@/vim:${EPREFIX}/usr/share/vim/vimfiles:" \
-			-e 's:/etc/vim::' \
-			Makefile.in || die
-	fi
-
-	# Only needed for prefix - harmless (does nothing) otherwise
-	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
-		"${S}/asciidoc.py" || die
-
-	[ "$PV" == "9999" ] && eautoconf
-}
-
-src_configure() {
-	econf --sysconfdir="${EPREFIX}"/usr/share
-}
-
-src_compile() {
-	default
-
-	if [ "$PV" == "9999" ]; then
-		cd doc || die
-		aap -f main.aap ../{CHANGELOG,README,BUGS} || die
-	fi
-}
-
-src_install() {
-	use vim-syntax && dodir /usr/share/vim/vimfiles
-
-	emake DESTDIR="${D}" install
-
-	python_fix_shebang "${ED}"/usr/bin/*.py
-
-	if use examples; then
-		# This is a symlink to a directory
-		rm examples/website/images || die
-
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-		dosym ../../../asciidoc/images /usr/share/doc/${PF}/examples
-	fi
-
-	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
-			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
-}
-
-src_test() {
-	cd tests || die
-	local -x ASCIIDOC_PY=../asciidoc.py
-	"${PYTHON}" test${PN}.py update || die
-	"${PYTHON}" test${PN}.py run || die
-}
--- a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-8.6.9-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-8.6.9-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-8.6.9-r1.ebuild,v 1.11 2014/12/06 16:39:50 ago Exp $
+# $Id$

 EAPI=5

@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )

 inherit python-single-r1

-DESCRIPTION="A text document format for writing short documents, articles, books and UNIX man pages"
+DESCRIPTION="AsciiDoc is a plain text human readable/writable document format"
 HOMEPAGE="http://asciidoc.org/"
 SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
--- a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit readme.gentoo python-single-r1
+
+DESCRIPTION="AsciiDoc is a plain text human readable/writable document format"
+HOMEPAGE="http://asciidoc.org/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples graphviz highlight test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75
+		dev-libs/libxslt
+		graphviz? ( media-gfx/graphviz )
+		app-text/docbook-xml-dtd:4.5
+		highlight? ( || ( dev-util/source-highlight \
+			dev-python/pygments[${PYTHON_USEDEP}] \
+			app-text/highlight )
+		)
+		${PYTHON_DEPS}
+"
+DEPEND="test? ( dev-util/source-highlight
+			media-sound/lilypond
+			media-gfx/imagemagick
+			dev-texlive/texlive-latex
+			app-text/dvipng
+			media-gfx/graphviz
+			${PYTHON_DEPS} )
+"
+
+DOC_CONTENTS="
+If you are going to use a2x, please also look at a2x(1) under
+REQUISITES for a list of runtime dependencies.
+"
+
+src_prepare() {
+	# Only needed for prefix - harmless (does nothing) otherwise
+	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
+		"${S}/asciidoc.py" || die
+}
+
+src_configure() {
+	econf --sysconfdir="${EPREFIX}"/usr/share
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	python_fix_shebang "${ED}"/usr/bin/*.py
+
+	readme.gentoo_create_doc
+	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
+			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
+
+	# Below results in some files being installed twice in different locations, but they are in the right place,
+	# uncompressed, and there won't be any broken links. See bug #483336.
+	if use examples; then
+		cp -rL examples/website "${D}"/usr/share/doc/${PF}/examples || die
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+src_test() {
+	cd tests || die
+	local -x ASCIIDOC_PY=../asciidoc.py
+	"${PYTHON}" test${PN}.py update || die
+	"${PYTHON}" test${PN}.py run || die
+}
--- a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-8.6.9-r3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-8.6.9-r3.ebuild
@ -0,0 +1,81 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+inherit readme.gentoo-r1 python-single-r1
+
+DESCRIPTION="AsciiDoc is a plain text human readable/writable document format"
+HOMEPAGE="http://asciidoc.org/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples graphviz highlight test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75
+		dev-libs/libxslt
+		graphviz? ( media-gfx/graphviz )
+		app-text/docbook-xml-dtd:4.5
+		highlight? ( || ( dev-util/source-highlight \
+			dev-python/pygments[${PYTHON_USEDEP}] \
+			app-text/highlight )
+		)
+		${PYTHON_DEPS}
+"
+DEPEND="test? ( dev-util/source-highlight
+			media-sound/lilypond
+			media-gfx/imagemagick
+			dev-texlive/texlive-latex
+			app-text/dvipng
+			media-gfx/graphviz
+			${PYTHON_DEPS} )
+"
+
+DOC_CONTENTS="
+If you are going to use a2x, please also look at a2x(1) under
+REQUISITES for a list of runtime dependencies.
+"
+
+src_prepare() {
+	# Only needed for prefix - harmless (does nothing) otherwise
+	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
+		"${S}/asciidoc.py" || die
+}
+
+src_configure() {
+	econf --sysconfdir="${EPREFIX}"/usr/share
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	python_fix_shebang "${ED}"/usr/bin/*.py
+
+	readme.gentoo_create_doc
+	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
+			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
+
+	# Below results in some files being installed twice in different locations, but they are in the right place,
+	# uncompressed, and there won't be any broken links. See bug #483336.
+	if use examples; then
+		cp -rL examples/website "${D}"/usr/share/doc/${PF}/examples || die
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+src_test() {
+	cd tests || die
+	local -x ASCIIDOC_PY=../asciidoc.py
+	"${PYTHON}" test${PN}.py update || die
+	"${PYTHON}" test${PN}.py run || die
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
--- a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-8.6.9.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-8.6.9.ebuild
@ -1,107 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-8.6.9.ebuild,v 1.2 2014/12/03 08:21:16 djc Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-[ "$PV" == "9999" ] && inherit mercurial autotools
-inherit python-single-r1
-
-DESCRIPTION="A text document format for writing short documents, articles, books and UNIX man pages"
-HOMEPAGE="http://www.methods.co.nz/asciidoc/"
-if [ "$PV" == "9999" ]; then
-	EHG_REPO_URI="https://asciidoc.googlecode.com/hg/"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples graphviz highlight test vim-syntax"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75
-		dev-libs/libxslt
-		graphviz? ( media-gfx/graphviz )
-		app-text/docbook-xml-dtd:4.5
-		highlight? ( || ( dev-python/pygments[${PYTHON_USEDEP}] dev-util/source-highlight ) )
-		${PYTHON_DEPS}
-"
-DEPEND="test? ( dev-util/source-highlight
-			media-sound/lilypond
-			media-gfx/imagemagick
-			dev-texlive/texlive-latex
-			app-text/dvipng
-			media-gfx/graphviz
-			${PYTHON_DEPS} )
-"
-
-if [ "$PV" == "9999" ]; then
-	DEPEND="${DEPEND}
-		dev-util/aap
-		www-client/lynx
-		dev-util/source-highlight"
-fi
-
-src_prepare() {
-	if ! use vim-syntax; then
-		sed -i -e '/^install/s/install-vim//' Makefile.in || die
-	else
-		sed -i\
-			-e "/^vimdir/s:@sysconfdir@/vim:${EPREFIX}/usr/share/vim/vimfiles:" \
-			-e 's:/etc/vim::' \
-			Makefile.in || die
-	fi
-
-	# Only needed for prefix - harmless (does nothing) otherwise
-	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
-		"${S}/asciidoc.py" || die
-
-	[ "$PV" == "9999" ] && eautoconf
-}
-
-src_configure() {
-	econf --sysconfdir="${EPREFIX}"/usr/share
-}
-
-src_compile() {
-	default
-
-	if [ "$PV" == "9999" ]; then
-		cd doc || die
-		aap -f main.aap ../{CHANGELOG,README,BUGS} || die
-	fi
-}
-
-src_install() {
-	use vim-syntax && dodir /usr/share/vim/vimfiles
-
-	emake DESTDIR="${D}" install
-
-	python_fix_shebang "${ED}"/usr/bin/*.py
-
-	if use examples; then
-		# This is a symlink to a directory
-		rm examples/website/images || die
-
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-		dosym ../../../asciidoc/images /usr/share/doc/${PF}/examples
-	fi
-
-	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
-			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
-}
-
-src_test() {
-	cd tests || die
-	local -x ASCIIDOC_PY=../asciidoc.py
-	"${PYTHON}" test${PN}.py update || die
-	"${PYTHON}" test${PN}.py run || die
-}
--- a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-9999.ebuild
@ -1,15 +1,15 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-9999.ebuild,v 1.17 2015/04/08 07:30:31 mgorny Exp $
+# $Id$

 EAPI=5

 PYTHON_COMPAT=( python2_7 pypy )

 [ "$PV" == "9999" ] && inherit mercurial autotools
-inherit python-single-r1
+inherit readme.gentoo python-single-r1

-DESCRIPTION="A text document format for writing short documents, articles, books and UNIX man pages"
+DESCRIPTION="AsciiDoc is a plain text human readable/writable document format"
 HOMEPAGE="http://www.methods.co.nz/asciidoc/"
 if [ "$PV" == "9999" ]; then
 	EHG_REPO_URI="https://asciidoc.googlecode.com/hg/"
@ -22,7 +22,7 @@ fi

 LICENSE="GPL-2"
 SLOT="0"
-IUSE="examples graphviz highlight test vim-syntax"
+IUSE="examples graphviz highlight test"

 REQUIRED_USE="highlight? ( ${PYTHON_REQUIRED_USE} )"

@ -30,7 +30,10 @@ RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75
 		dev-libs/libxslt
 		graphviz? ( media-gfx/graphviz )
 		app-text/docbook-xml-dtd:4.5
-		highlight? ( || ( dev-python/pygments[${PYTHON_USEDEP}] dev-util/source-highlight ) )
+		highlight? ( || ( dev-util/source-highlight \
+			dev-python/pygments[${PYTHON_USEDEP}] \
+			app-text/highlight )
+		)
 		${PYTHON_DEPS}
 "
 DEPEND="test? ( dev-util/source-highlight
@ -42,6 +45,11 @@ DEPEND="test? ( dev-util/source-highlight
 			${PYTHON_DEPS} )
 "

+DOC_CONTENTS="
+If you are going to use a2x, please also look at a2x(1) under
+REQUISITES for a list of runtime dependencies.
+"
+
 if [ "$PV" == "9999" ]; then
 	DEPEND="${DEPEND}
 		dev-util/aap
@ -50,15 +58,6 @@ if [ "$PV" == "9999" ]; then
 fi

 src_prepare() {
-	if ! use vim-syntax; then
-		sed -i -e '/^install/s/install-vim//' Makefile.in || die
-	else
-		sed -i\
-			-e "/^vimdir/s:@sysconfdir@/vim:${EPREFIX}/usr/share/vim/vimfiles:" \
-			-e 's:/etc/vim::' \
-			Makefile.in || die
-	fi
-
 	# Only needed for prefix - harmless (does nothing) otherwise
 	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
 		"${S}/asciidoc.py" || die
@ -80,8 +79,6 @@ src_compile() {
 }

 src_install() {
-	use vim-syntax && dodir /usr/share/vim/vimfiles
-
 	emake DESTDIR="${D}" install

 	python_fix_shebang "${ED}"/usr/bin/*.py
@ -95,6 +92,7 @@ src_install() {
 		dosym ../../../asciidoc/images /usr/share/doc/${PF}/examples
 	fi

+	readme.gentoo_create_doc
 	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
 			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
 }
--- a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/metadata.xml
@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>djc@gentoo.org</email>
-    <name>Dirkjan Ochtman</name>
-  </maintainer>
-  <use>
-    <flag name="highlight">Enable source code highlighting</flag>
-  </use>
+	<maintainer type="person">
+		<email>marcec@gmx.de</email>
+		<name>Marc Joliet</name>
+		<description>Proxied maintainer. Assign bugs to him.</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="highlight">Enable source code highlighting</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">asciidoc</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/sdk_container/src/third_party/portage-stable/dev-cpp/gmock/ChangeLog
+++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gmock/ChangeLog
@ -1,118 +1,91 @@
 # ChangeLog for dev-cpp/gmock
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/ChangeLog,v 1.33 2015/04/21 19:04:03 pacho Exp $
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# (auto-generated from git log)

-  21 Apr 2015; Pacho Ramos <pacho@gentoo.org> gmock-1.7.0-r1.ebuild:
-  ppc stable wrt bug #525970
+*gmock-1.7.0-r1 (09 Aug 2015)
+*gmock-1.7.0 (09 Aug 2015)
+*gmock-1.6.0 (09 Aug 2015)
+*gmock-1.5.0 (09 Aug 2015)
+*gmock-1.4.0 (09 Aug 2015)

-  02 Apr 2015; Michael Sterrett <mr_bones_@gentoo.org> gmock-1.7.0-r1.ebuild:
-  add missing test to IUSE
+  09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org>
+  +files/gmock-1.4.0-gcc-4.7.patch, +files/gmock-1.4.0-more-gcc-4.7.patch,
+  +gmock-1.4.0.ebuild, +gmock-1.5.0.ebuild, +gmock-1.6.0.ebuild,
+  +gmock-1.7.0.ebuild, +gmock-1.7.0-r1.ebuild, +metadata.xml:
+  proj/gentoo: Initial commit

-  16 Jan 2015; Raúl Porcel <armin76@gentoo.org> gmock-1.7.0-r1.ebuild:
-  alpha/ia64/sparc stable wrt #525970
+  This commit represents a new era for Gentoo:
+  Storing the gentoo-x86 tree in Git, as converted from CVS.

-  19 Nov 2014; Agostino Sarubbo <ago@gentoo.org> gmock-1.7.0-r1.ebuild:
-  Stable for ppc64, wrt bug #529822
+  This commit is the start of the NEW history.
+  Any historical data is intended to be grafted onto this point.

-  25 Oct 2014; Markus Meier <maekke@gentoo.org> gmock-1.7.0-r1.ebuild:
-  arm stable, bug #525970
+  Creation process:
+  1. Take final CVS checkout snapshot
+  2. Remove ALL ChangeLog* files
+  3. Transform all Manifests to thin
+  4. Remove empty Manifests
+  5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
+  5.1. Do not touch files with -kb/-ko keyword flags.

-  23 Oct 2014; Pacho Ramos <pacho@gentoo.org> gmock-1.7.0-r1.ebuild:
-  amd64/x86 stable, bug #525970
+  Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+  X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration
+  tests
+  X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this
+  project
+  X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo
+  developer, wrote Git features for the migration
+  X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve
+  cvs2svn
+  X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
+  X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014
+  work in migration
+  X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
+  X-Thanks: All of other Gentoo developers - many ideas and lots of paint on
+  the bikeshed

-  21 Aug 2014; Raúl Porcel <armin76@gentoo.org> gmock-1.7.0.ebuild:
-  alpha/ia64/sparc stable wrt bug #513804
+  24 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Use https by default

-  15 Aug 2014; Raúl Porcel <armin76@gentoo.org> gmock-1.6.0.ebuild:
-  sparc stable
+  Convert all URLs for sites supporting encrypted connections from http to
+  https

-  23 Jul 2014; Tobias Klausmann <klausman@gentoo.org> gmock-1.6.0.ebuild:
-  Stable on alpha, bug #493400
+  Signed-off-by: Justin Lecher <jlec@gentoo.org>

-  19 Jul 2014; Pacho Ramos <pacho@gentoo.org> gmock-1.7.0.ebuild:
-  amd64/x86 stable, bug #513804
+  24 Aug 2015; Justin Lecher <jlec@gentoo.org> gmock-1.4.0.ebuild,
+  gmock-1.5.0.ebuild, gmock-1.6.0.ebuild, gmock-1.7.0.ebuild,
+  gmock-1.7.0-r1.ebuild:
+  Enable https for all google URIs

-  29 Jun 2014; Markus Meier <maekke@gentoo.org> gmock-1.7.0.ebuild:
-  arm stable, bug #513804
+  Signed-off-by: Justin Lecher <jlec@gentoo.org>

-  23 Jun 2014; Jeroen Roovers <jer@gentoo.org> gmock-1.7.0-r1.ebuild:
-  Stable for HPPA (bug #513804).
+  24 Aug 2015; Justin Lecher <jlec@gentoo.org> gmock-1.4.0.ebuild,
+  gmock-1.5.0.ebuild, gmock-1.6.0.ebuild, gmock-1.7.0.ebuild,
+  gmock-1.7.0-r1.ebuild:
+  Convert URIs for googlecode.com to https

-  04 May 2014; Mike Frysinger <vapier@gentoo.org> gmock-1.7.0-r1.ebuild:
-  Force python-2.x when running tests #455276 by Markus Oehme.
+  Signed-off-by: Justin Lecher <jlec@gentoo.org>

-*gmock-1.7.0-r1 (27 Mar 2014)
+  24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml:
+  Revert DOCTYPE SYSTEM https changes in metadata.xml

-  27 Mar 2014; Mike Frysinger <vapier@gentoo.org> +gmock-1.7.0-r1.ebuild:
-  Add multilib build support.
+  repoman does not yet accept the https version.
+  This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450.

-  14 Feb 2014; Akinori Hattori <hattya@gentoo.org> gmock-1.6.0.ebuild:
-  ia64 stable wrt bug #493400
+  Bug: https://bugs.gentoo.org/552720

-*gmock-1.7.0 (12 Jan 2014)
+  01 Sep 2015; Tobias Klausmann <klausman@gentoo.org> gmock-1.4.0.ebuild,
+  gmock-1.5.0.ebuild, gmock-1.6.0.ebuild, gmock-1.7.0.ebuild,
+  gmock-1.7.0-r1.ebuild:
+  Fixing HOMEPAGE move due to code.google.com shutdown

-  12 Jan 2014; Ryan Hill <dirtyepic@gentoo.org> +gmock-1.7.0.ebuild:
-  Version bump (bug #490406 by Jauhien Piatlicki).
+  Package-Manager: portage-2.2.20.1

-  09 Dec 2013; Jeroen Roovers <jer@gentoo.org> gmock-1.6.0.ebuild:
-  Stable for HPPA (bug #493400).
+  07 Sep 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  ADd missing remote-id entries

-  19 Oct 2013; Mike Frysinger <vapier@gentoo.org> gmock-1.6.0.ebuild:
-  Add keywords for everyone.
+  Signed-off-by: Justin Lecher <jlec@gentoo.org>

-  07 Aug 2013; Sergey Popov <pinkbyte@gentoo.org> gmock-1.6.0.ebuild:
-  Stable on arm, wrt bug #478210
+  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
+  Set appropriate maintainer types in metadata.xml (GLEP 67)

-  28 Aug 2012; Mike Frysinger <vapier@gentoo.org>
-  +files/gmock-1.4.0-more-gcc-4.7.patch, gmock-1.4.0.ebuild:
-  Add another fix from upstream for building with gcc-4.7.
-
-  24 Aug 2012; Michael Weber <xmw@gentoo.org> gmock-1.6.0.ebuild:
-  ppc stable (bug 420853).
-
-  17 Jul 2012; Anthony G. Basile <blueness@gentoo.org> gmock-1.6.0.ebuild:
-  Keyword ~mips ~ppc ~ppc64
-
-  12 Jun 2012; Jeff Horelick <jdhore@gentoo.org> gmock-1.4.0.ebuild,
-  gmock-1.5.0.ebuild:
-  Drop app-arch/unzip from DEPEND on 1.4.0 and 1.5.0 as only 1.6.0 needs it.
-
-  12 Jun 2012; Jeff Horelick <jdhore@gentoo.org> gmock-1.6.0.ebuild:
-  marked x86 per bug 420853
-
-  12 Jun 2012; Agostino Sarubbo <ago@gentoo.org> gmock-1.4.0.ebuild,
-  gmock-1.5.0.ebuild, gmock-1.6.0.ebuild:
-  Add app-arch/unzip as DEPEND per JD request
-
-  12 Jun 2012; Agostino Sarubbo <ago@gentoo.org> gmock-1.6.0.ebuild:
-  Stable for amd64, wrt bug #420853
-
-  30 May 2012; Mike Frysinger <vapier@gentoo.org>
-  +files/gmock-1.4.0-gcc-4.7.patch, gmock-1.4.0.ebuild:
-  Fix via ChromiumOS from upstream for building with gcc-4.7.
-
-*gmock-1.6.0 (30 Mar 2012)
-
-  30 Mar 2012; Mike Frysinger <vapier@gentoo.org> +gmock-1.6.0.ebuild:
-  Version bump.
-
-  20 Feb 2012; Mike Gilbert <floppym@gentoo.org> metadata.xml:
-  Drop no-herd.
-
-  11 Nov 2011; Mike Frysinger <vapier@gentoo.org> gmock-1.4.0.ebuild,
-  gmock-1.5.0.ebuild:
-  Call elibtoolize to fix cross-compiling relink issues.
-
-*gmock-1.4.0 (11 Nov 2011)
-
-  11 Nov 2011; Mike Frysinger <vapier@gentoo.org> +gmock-1.4.0.ebuild:
-  Add an older version to match versions available for gtest.
-
-  11 Nov 2011; Mike Frysinger <vapier@gentoo.org> gmock-1.5.0.ebuild:
-  Update gtest depend after category migration #387155.
-
-*gmock-1.5.0 (14 Oct 2011)
-
-  14 Oct 2011; Mike Frysinger <vapier@gentoo.org> +gmock-1.5.0.ebuild,
-  +metadata.xml:
-  Initial import based on ChromeOS's ebuild.
--- a/sdk_container/src/third_party/portage-stable/dev-cpp/gmock/ChangeLog-2015
+++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gmock/ChangeLog-2015
@ -0,0 +1,121 @@
+# ChangeLog for dev-cpp/gmock
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/ChangeLog,v 1.34 2015/07/29 05:28:07 vapier Exp $
+
+  29 Jul 2015; Mike Frysinger <vapier@gentoo.org> gmock-1.7.0-r1.ebuild:
+  Mark arm64/m68k/s390/sh stable.
+
+  21 Apr 2015; Pacho Ramos <pacho@gentoo.org> gmock-1.7.0-r1.ebuild:
+  ppc stable wrt bug #525970
+
+  02 Apr 2015; Michael Sterrett <mr_bones_@gentoo.org> gmock-1.7.0-r1.ebuild:
+  add missing test to IUSE
+
+  16 Jan 2015; Raúl Porcel <armin76@gentoo.org> gmock-1.7.0-r1.ebuild:
+  alpha/ia64/sparc stable wrt #525970
+
+  19 Nov 2014; Agostino Sarubbo <ago@gentoo.org> gmock-1.7.0-r1.ebuild:
+  Stable for ppc64, wrt bug #529822
+
+  25 Oct 2014; Markus Meier <maekke@gentoo.org> gmock-1.7.0-r1.ebuild:
+  arm stable, bug #525970
+
+  23 Oct 2014; Pacho Ramos <pacho@gentoo.org> gmock-1.7.0-r1.ebuild:
+  amd64/x86 stable, bug #525970
+
+  21 Aug 2014; Raúl Porcel <armin76@gentoo.org> gmock-1.7.0.ebuild:
+  alpha/ia64/sparc stable wrt bug #513804
+
+  15 Aug 2014; Raúl Porcel <armin76@gentoo.org> gmock-1.6.0.ebuild:
+  sparc stable
+
+  23 Jul 2014; Tobias Klausmann <klausman@gentoo.org> gmock-1.6.0.ebuild:
+  Stable on alpha, bug #493400
+
+  19 Jul 2014; Pacho Ramos <pacho@gentoo.org> gmock-1.7.0.ebuild:
+  amd64/x86 stable, bug #513804
+
+  29 Jun 2014; Markus Meier <maekke@gentoo.org> gmock-1.7.0.ebuild:
+  arm stable, bug #513804
+
+  23 Jun 2014; Jeroen Roovers <jer@gentoo.org> gmock-1.7.0-r1.ebuild:
+  Stable for HPPA (bug #513804).
+
+  04 May 2014; Mike Frysinger <vapier@gentoo.org> gmock-1.7.0-r1.ebuild:
+  Force python-2.x when running tests #455276 by Markus Oehme.
+
+*gmock-1.7.0-r1 (27 Mar 2014)
+
+  27 Mar 2014; Mike Frysinger <vapier@gentoo.org> +gmock-1.7.0-r1.ebuild:
+  Add multilib build support.
+
+  14 Feb 2014; Akinori Hattori <hattya@gentoo.org> gmock-1.6.0.ebuild:
+  ia64 stable wrt bug #493400
+
+*gmock-1.7.0 (12 Jan 2014)
+
+  12 Jan 2014; Ryan Hill <dirtyepic@gentoo.org> +gmock-1.7.0.ebuild:
+  Version bump (bug #490406 by Jauhien Piatlicki).
+
+  09 Dec 2013; Jeroen Roovers <jer@gentoo.org> gmock-1.6.0.ebuild:
+  Stable for HPPA (bug #493400).
+
+  19 Oct 2013; Mike Frysinger <vapier@gentoo.org> gmock-1.6.0.ebuild:
+  Add keywords for everyone.
+
+  07 Aug 2013; Sergey Popov <pinkbyte@gentoo.org> gmock-1.6.0.ebuild:
+  Stable on arm, wrt bug #478210
+
+  28 Aug 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/gmock-1.4.0-more-gcc-4.7.patch, gmock-1.4.0.ebuild:
+  Add another fix from upstream for building with gcc-4.7.
+
+  24 Aug 2012; Michael Weber <xmw@gentoo.org> gmock-1.6.0.ebuild:
+  ppc stable (bug 420853).
+
+  17 Jul 2012; Anthony G. Basile <blueness@gentoo.org> gmock-1.6.0.ebuild:
+  Keyword ~mips ~ppc ~ppc64
+
+  12 Jun 2012; Jeff Horelick <jdhore@gentoo.org> gmock-1.4.0.ebuild,
+  gmock-1.5.0.ebuild:
+  Drop app-arch/unzip from DEPEND on 1.4.0 and 1.5.0 as only 1.6.0 needs it.
+
+  12 Jun 2012; Jeff Horelick <jdhore@gentoo.org> gmock-1.6.0.ebuild:
+  marked x86 per bug 420853
+
+  12 Jun 2012; Agostino Sarubbo <ago@gentoo.org> gmock-1.4.0.ebuild,
+  gmock-1.5.0.ebuild, gmock-1.6.0.ebuild:
+  Add app-arch/unzip as DEPEND per JD request
+
+  12 Jun 2012; Agostino Sarubbo <ago@gentoo.org> gmock-1.6.0.ebuild:
+  Stable for amd64, wrt bug #420853
+
+  30 May 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/gmock-1.4.0-gcc-4.7.patch, gmock-1.4.0.ebuild:
+  Fix via ChromiumOS from upstream for building with gcc-4.7.
+
+*gmock-1.6.0 (30 Mar 2012)
+
+  30 Mar 2012; Mike Frysinger <vapier@gentoo.org> +gmock-1.6.0.ebuild:
+  Version bump.
+
+  20 Feb 2012; Mike Gilbert <floppym@gentoo.org> metadata.xml:
+  Drop no-herd.
+
+  11 Nov 2011; Mike Frysinger <vapier@gentoo.org> gmock-1.4.0.ebuild,
+  gmock-1.5.0.ebuild:
+  Call elibtoolize to fix cross-compiling relink issues.
+
+*gmock-1.4.0 (11 Nov 2011)
+
+  11 Nov 2011; Mike Frysinger <vapier@gentoo.org> +gmock-1.4.0.ebuild:
+  Add an older version to match versions available for gtest.
+
+  11 Nov 2011; Mike Frysinger <vapier@gentoo.org> gmock-1.5.0.ebuild:
+  Update gtest depend after category migration #387155.
+
+*gmock-1.5.0 (14 Oct 2011)
+
+  14 Oct 2011; Mike Frysinger <vapier@gentoo.org> +gmock-1.5.0.ebuild,
+  +metadata.xml:
+  Initial import based on ChromeOS's ebuild.
--- a/sdk_container/src/third_party/portage-stable/dev-cpp/gmock/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gmock/Manifest
@ -1,23 +1,14 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gmock-1.4.0-gcc-4.7.patch 6982 SHA256 851343d6d805abd5c03c91c9a6dd0dbcb7db99a60d8a87100025cd167fb5f01c SHA512 fca0b60fe1715613ca7ef6dfd2f1c65c0cbf97a39a4bb86a1396c3acf4a6d5d4a53876187a4888e268abbfe0e7098b6e6d8258563d41c09d1f7709f4034b7936 WHIRLPOOL b76ebbf677d96b6b3c9788c912ee28b8a58ba3cd3f01b6c122d92428288f4de89ec0f5edcc5ebd2c19ae6e7f9c4a577ea6a76cc90dea2b53e3ab8aea0254a25e
 AUX gmock-1.4.0-more-gcc-4.7.patch 5156 SHA256 be933382c5baf74eb3304c619c6f004635b5d92f36562bdf3af61b4b2f8e9600 SHA512 a09bb34261f9af7ec107e026b125d1351dca3d125ad212b382edffe6aae38fc6b9551484169eee58aa8becd8d594fdf36524b1a1bd65bf9911a4a27e946fa6e8 WHIRLPOOL 11000f315bde9f24e1f3b5fdf8faf2f9d42632cac0259dd6d022802c5b7adec8d73b8c8a4a86aa497499745629226626b31709ca85dff0222e22da2b06426fd1
 DIST gmock-1.4.0.tar.bz2 946373 SHA256 21d37c154a7b8d7a8562b9dde82db7db0a6c188b985c4a18ff3413daae8caa8c SHA512 df99aae44d23f4b0b4ce9ac24fde9e72508c9a915323dd07fb475c708953b79310c164141d085a04a9203b6abd759336d55a94979495f429c92f11bc4d1b038c WHIRLPOOL 7a4525a589770cd5de21c0b82a7b9a7219b3fcdef605e0b455dfff50bc87ff1432b3989cc7e0c08c42c68083e2618841a77d8afcf4ed51b3f55f09a5a64c4fb2
 DIST gmock-1.5.0.tar.bz2 1283432 SHA256 d8689a51fbc13f55509f5842fe7d514839d9fd6092743d145304bc2824fc9197 SHA512 b0a3897c801d14a9f59a07911fa77ae15ddae9bef6e2d818583ff0b5085d35507259c195b43a6fe25af70b4d2eee3796889ffcda91d16ce6e6e5b4e462196aa2 WHIRLPOOL f00854ebdece304006907ea2e3906fbe58578a7a3684d93eb8e9f2c26bd100f751878109d5fd13a31cf58463d759fc09c1b07c035107c127c19f572ff264fd76
 DIST gmock-1.6.0.zip 2053682 SHA256 341ad07c31c619ba32c88c2265bc23693da1df062f47f146a7ed340f646d82b7 SHA512 7adff00bb6ff81a6ffb704be71d0747636d69e24b4a8b709e1fb8c177a9a47f6dea8d14fde73034ebfb1529c291c7212a944ad92a34f88abdfe23c2d0b11b6f7 WHIRLPOOL 1a03ff8f2d96287f5deb24f970688f20f3480e77a4a71089ef1399a87f28f616bf0feaedc217e7ac1ca8ca1246e53f5d882f350704be111ae547961949939530
 DIST gmock-1.7.0.zip 2167746 SHA256 26fcbb5925b74ad5fc8c26b0495dfc96353f4d553492eb97e85a8a6d2f43095b SHA512 0ab7bb2614f8c00e4842a6819dbc6d9323c42241335078c23eaee53ed420d42f1845d44334eccbf7c114cc88f6ac7a493e20d9b46c58cdba645bbd400eb6db55 WHIRLPOOL 722ea3f8bd4130662386810ae0270baafcecb6b7066e8a361388d530e7a2bad4e10787c921c6bb5cefb15a640f4302d288d07deea58acf8c5f5ca84d82722c8e
-EBUILD gmock-1.4.0.ebuild 900 SHA256 ac6459b47610fabc4a1976a27b813a5d60bc2ed94b053e0f0f95eaa9317f2919 SHA512 dc4bd30c218906d7a43798dc4393d6b9201328185d6dc5e5fa591ec44419b71814d759e9061b2b7125d1efb41e670e9680c6ccd50be1835e7ae496020a5b6d33 WHIRLPOOL ebec651a934b28ecc628f6abfb3ebea8442b2eb572b5cd4cfafd86f1286454afff51de5260f0d5afe75253a52788b08253af08d7274283df52a7e9bef0b0b89c
-EBUILD gmock-1.5.0.ebuild 801 SHA256 da8e3eb98f7fc07b8909373b612700c8a861c5c92bb48ee27c5addf787848657 SHA512 d1813c15ecc635418c859f69ba49c4ff401daf56bef042d9d8e8abc1f072421af04579f0aea4e4ad6c650b60aaa2f1ccea65bd295a298f0cce5c3cfd5f9ddd52 WHIRLPOOL 47ed5fafcb25a3414bb06c8eb27688c571b42e7b52f84089414e82ac8944b736a66698023b9dd81d3201316af07fe5056c6741e925f185c85efaaa0bccf4dcaf
-EBUILD gmock-1.6.0.ebuild 994 SHA256 11125d6cc9bb5cd44b3dfe187d8474b145cf26008c04abb05c4f031defabbcb0 SHA512 b5f54373e0c0b315d2af747bfb81c1d666e9b06af7045036106691e4101ea1619303f5567d2946e0fd1836154ddb46e8e81c85191d2ababd2ee2a0819791a7d5 WHIRLPOOL e1cd93b256fab9747959623e26b4a6aa3144f48f300930e2d59e514754beb010aeaed4d7231ec2289aa92dc8bb3a3b511071635dcccb43452edbe75427d0d8e6
-EBUILD gmock-1.7.0-r1.ebuild 1348 SHA256 0abb8006c6be48fcb39d4c134f69492fe12fe4bca5dfc18585da7638930178ae SHA512 413dc3f7813d91407b00a8c0d7539ef59f6f507a987587b1b1723eb99eaceffaafb7d03b8cd80d9d53d696039d8e01247cbd458cef327fb190c26716c8406d96 WHIRLPOOL 0af4cbb666c0981af70afc056178bc2f681f10b3f2462859a8c4fa2f45716bcc55469e5081385e537331b8fa2a7564e7acd7d36397982a4b89dc02e8ed14cae1
-EBUILD gmock-1.7.0.ebuild 995 SHA256 f5465b7c26869d5177f6f1450556510fb783c765cb047342bddf1cb6d4046b6f SHA512 1854924a028834da8393ec2046767a77f74972280882c631f0113252d8cfb52453ee4483bcb1dd9b7f9d11ab0b92396518bd8a53c2db652c7b999faa50eef0a8 WHIRLPOOL 06d5808231e8558cbbfa217644b40c5db1993c10c2b2d05923f994e5002fcc50081d052052ffd17e974bc6617428f50402121ab1f45a49bf49bae8e10fa3359c
-MISC ChangeLog 4119 SHA256 db74e0991ea7f5f12309d6b129b5c0a9d9f8141bbe640208422db1260f93e5bc SHA512 a5dc40489fdf527b2ca3c23e49e0098ffeaca2afadddb3788b61a0bae400504d75c6f788f13939d261ff9547ea96ec34835b8068b609d716bb171940eb93dd29 WHIRLPOOL 06eec9b383b8c9090fcc6362f52c599338674ef7d9492a4a0c2c8d205fc9a403a78096f4ddfb6157630e8c4c6170d6051a24beb5abfe523a22a9b4e63b46cf85
-MISC metadata.xml 283 SHA256 c34e015327f31293e860e8b2366e59e1d361c67f47d1c2cb010e16f43521a0f2 SHA512 e85ed05e67750a75476066754448e724ab3e65c91af152befff80c7f66423254311243fa213ba282bcc6456499964d4c969103cad829d8386ab3ef50138b5b81 WHIRLPOOL 3c504418a30332c69ad4282d204ff0ffeef35bc0aff4071d0c7f51704e7a1e091ce7e72826de354f8d1ded20920d61fa60bee4fafd3db8bd43acb9cdce9717bf
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlU2nyQACgkQCaWpQKGI+9QtWQCfUv9Pmyrw0U/seOO4YLpNeQn4
-FIwAnjZ7QHdvcG00VDY10zaXua2Z0c9P
-=Yr6V
-----END PGP SIGNATURE-----
+EBUILD gmock-1.4.0.ebuild 801 SHA256 f2b9b493ba8ba9a7368661dc4eecf577433328c5ef74a6259a7e96ea5892af7d SHA512 ff47d959b2c85b27bf42b80ea15a15b91d8af4ebe5e579091299fbf57c55658aa3b62b9fb573149b228e9df0f92d9f91af18035dfe0192b4026ca5c8b3459214 WHIRLPOOL 7ae5c42eb5016903720228707c26250a3bb53f5ea97c9b34ea533042d59fa8d2dcf3821c087991308147c6746ae28b813714ae18081bb23f9020c1dcda4ba0a8
+EBUILD gmock-1.5.0.ebuild 702 SHA256 b93772de648fc5f3ca62001c9a8d9e494cec09f4fcac891a66336b728fb434f8 SHA512 e4ad63b092eacebdb5ecaae1e9ef659d2110af3b1b22ed2413907361c638eb31df0f11da3dd886d7cc254b7bca30917c4b9153b520c7ea64dd6282a48ec045bd WHIRLPOOL 0de535b2c65a908fab9eae6d18385798c4d500f25029739812bae3be5cd339ac8d186796cac9cf63adae259c0820fb0daeaa65f9ff4ab8cf64e461d145ad221f
+EBUILD gmock-1.6.0.ebuild 893 SHA256 7e0fd1f4bcaa432ddd81363d3f0aabafe545694cbb6631b5dd3cbb167393899e SHA512 6f02a6bd185054054707f1ff9b3d9a338c041f28ab03ff4882c71271a1772aa1c7abcef787609b14b3ea3e45bcdb4d6f46aac3f9e97ee17218961177d9ba0b9a WHIRLPOOL 0fe81556d647e4e5f54b5d5618aad223a7071e209533c766cf916fcdfbb82d65452bbe73b33638cb27a0341a187bcdaf571a13bbf0e9f817b6e8f6cda153d36b
+EBUILD gmock-1.7.0-r1.ebuild 1250 SHA256 93deb4864d29edd865169ec128521dbe1c46dd7420064919e0fdf88484a7479b SHA512 0e99c959e5d3a1bf29bbb0f0c33f80e7ea4070922cb9f86e42a8d2b1d5d2d635bb72e3cfd44a4a362dad4128ba2ccf3014b1a7211d53840e806810d3bb22b32c WHIRLPOOL e62b6d617aca110b0527f9eaf5b74faaa73fc3989408ef3ddb2690b4df12ec1e531f8ddc45514a70667b3fc3975968a4ed1cc69334ee6a9cd727785e1d2b9cb5
+EBUILD gmock-1.7.0.ebuild 895 SHA256 0b11d06dea22f14f12c8b79e53daa896c3d2c315d468c5976f2a053fb05d23ea SHA512 cdfda55f9271dc61bfe21c721e5351bee0ce9d91e54583e6560dbfc6c92ebce44f09393538a778f93c446fa282986bd33f4a4b67df66459a19ccac572b3f6dd0 WHIRLPOOL d61bc43bc82498af9c32b5cb49bba1363964fc33bd9ded846bd3f9a631f8cbc623367ac8cb1f658b46aeadfd42525f91a3c468c1abcf54262394130c6d9f871f
+MISC ChangeLog 3330 SHA256 1cbdc308564969b6c1a97f86dc484c4c8d1ef4eb263960b39b70724f44f2b0ef SHA512 3531e64a57ec586db444e6ab4c105c8c5e51de701f0cac903f0c79c539e765c08766b2cec65ee9239d1a187ae2d2a61d10ac0660a1ad82f3619d9acb2d0a225c WHIRLPOOL 0e7ce418b8e8cb9142a77c2faf0101ca5eccbe5ceeb110af982358efab655313fd3307b9c94c399e01f914ee3df00181d7dbbc074a2966c313fe0dfc7d3d751e
+MISC ChangeLog-2015 4228 SHA256 df7c6913b69a0753e56dc0e56d8f0c91ef1bc812715cc35de5e2ef514c1b972a SHA512 d78535d15a9b53ff974ad3b779f5452fa71c839e1a92092a1f5026a7f1694927283150f96744ff19500a8be27a6160f69b6a5d778c18fc098e00e2d722705a79 WHIRLPOOL ac416ad8f7f7aac26ca2c4dc3624583e867714d147e6d5b4d7dae6607657921e1e36efb2e909aee8867ef93a4e2b4118409fdb6f7e5ae118945e791b3bf8b58c
+MISC metadata.xml 354 SHA256 dd5b363c503f555907c6415e5dbd86c7230860984229cbb8738270999a41ffff SHA512 61df749507137960049707611f4d4fae7183714c1f701c30cf53aecb095341fedabca711c3a8f2d3aca5d9df117e7e219f5a2951729fcc679249d20210239af7 WHIRLPOOL bbd1beee1584af3229638db78a74cc91c54e4d254afb50b1d0d7b72a0f29488bb9707f7569431dcd168b114cc62b8ab536f59be4099121b2aa1a73e5db201342
--- a/sdk_container/src/third_party/portage-stable/dev-cpp/gmock/gmock-1.4.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gmock/gmock-1.4.0.ebuild
@ -1,14 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.4.0.ebuild,v 1.6 2012/08/28 21:52:08 vapier Exp $
+# $Id$

 EAPI="4"

 inherit libtool eutils

 DESCRIPTION="Google's C++ mocking framework"
-HOMEPAGE="http://code.google.com/p/googlemock/"
-SRC_URI="http://googlemock.googlecode.com/files/${P}.tar.bz2"
+HOMEPAGE="https://github.com/google/googlemock"
+SRC_URI="https://googlemock.googlecode.com/files/${P}.tar.bz2"

 LICENSE="BSD"
 SLOT="0"
--- a/sdk_container/src/third_party/portage-stable/dev-cpp/gmock/gmock-1.5.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gmock/gmock-1.5.0.ebuild
@ -1,14 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.5.0.ebuild,v 1.5 2012/06/12 18:58:16 jdhore Exp $
+# $Id$

 EAPI="4"

 inherit libtool

 DESCRIPTION="Google's C++ mocking framework"
-HOMEPAGE="http://code.google.com/p/googlemock/"
-SRC_URI="http://googlemock.googlecode.com/files/${P}.tar.bz2"
+HOMEPAGE="https://github.com/google/googlemock"
+SRC_URI="https://googlemock.googlecode.com/files/${P}.tar.bz2"

 LICENSE="BSD"
 SLOT="0"
--- a/sdk_container/src/third_party/portage-stable/dev-cpp/gmock/gmock-1.6.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gmock/gmock-1.6.0.ebuild
@ -1,14 +1,14 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.6.0.ebuild,v 1.12 2014/08/15 17:45:56 armin76 Exp $
+# $Id$

 EAPI="4"

 inherit libtool

 DESCRIPTION="Google's C++ mocking framework"
-HOMEPAGE="http://code.google.com/p/googlemock/"
-SRC_URI="http://googlemock.googlecode.com/files/${P}.zip"
+HOMEPAGE="https://github.com/google/googlemock"
+SRC_URI="https://googlemock.googlecode.com/files/${P}.zip"

 LICENSE="BSD"
 SLOT="0"
--- a/sdk_container/src/third_party/portage-stable/dev-cpp/gmock/gmock-1.7.0-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gmock/gmock-1.7.0-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.7.0-r1.ebuild,v 1.9 2015/04/21 19:04:03 pacho Exp $
+# $Id$

 EAPI="4"

@ -9,12 +9,12 @@ PYTHON_COMPAT=( python2_7 )
 inherit libtool multilib-minimal python-any-r1

 DESCRIPTION="Google's C++ mocking framework"
-HOMEPAGE="http://code.google.com/p/googlemock/"
-SRC_URI="http://googlemock.googlecode.com/files/${P}.zip"
+HOMEPAGE="https://github.com/google/googlemock"
+SRC_URI="https://googlemock.googlecode.com/files/${P}.zip"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="static-libs test"

 RDEPEND="=dev-cpp/gtest-${PV}*[${MULTILIB_USEDEP}]"
--- a/sdk_container/src/third_party/portage-stable/dev-cpp/gmock/gmock-1.7.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gmock/gmock-1.7.0.ebuild
@ -1,14 +1,14 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.7.0.ebuild,v 1.4 2014/08/21 11:33:45 armin76 Exp $
+# $Id$

 EAPI="4"

 inherit libtool

 DESCRIPTION="Google's C++ mocking framework"
-HOMEPAGE="http://code.google.com/p/googlemock/"
-SRC_URI="http://googlemock.googlecode.com/files/${P}.zip"
+HOMEPAGE="https://github.com/google/googlemock"
+SRC_URI="https://googlemock.googlecode.com/files/${P}.zip"

 LICENSE="BSD"
 SLOT="0"
--- a/sdk_container/src/third_party/portage-stable/dev-cpp/gmock/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gmock/metadata.xml
@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>vapier@gentoo.org</email>
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">googlemock</remote-id>
+		<remote-id type="github">google/googlemock</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/ChangeLog
+++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/ChangeLog
@ -1,200 +1,95 @@
 # ChangeLog for dev-cpp/gtest
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/ChangeLog,v 1.43 2015/04/21 19:04:11 pacho Exp $
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# (auto-generated from git log)

-  21 Apr 2015; Pacho Ramos <pacho@gentoo.org> gtest-1.7.0.ebuild:
-  ppc stable wrt bug #525970
+*gtest-1.7.0 (09 Aug 2015)
+*gtest-1.6.0-r2 (09 Aug 2015)
+*gtest-1.6.0-r1 (09 Aug 2015)
+*gtest-1.6.0 (09 Aug 2015)

-  08 Apr 2015; Michał Górny <mgorny@gentoo.org> gtest-1.6.0-r2.ebuild,
-  gtest-1.7.0.ebuild:
-  Drop old Python implementations
+  09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org>
+  +files/configure-fix-pthread-linking.patch, +gtest-1.6.0.ebuild,
+  +gtest-1.6.0-r1.ebuild, +gtest-1.6.0-r2.ebuild, +gtest-1.7.0.ebuild,
+  +metadata.xml:
+  proj/gentoo: Initial commit

-  19 Nov 2014; Agostino Sarubbo <ago@gentoo.org> gtest-1.7.0.ebuild:
-  Stable for ppc64, wrt bug #529822
+  This commit represents a new era for Gentoo:
+  Storing the gentoo-x86 tree in Git, as converted from CVS.

-  21 Aug 2014; Raúl Porcel <armin76@gentoo.org> gtest-1.7.0.ebuild:
-  alpha/ia64/sparc stable wrt bug #513804
+  This commit is the start of the NEW history.
+  Any historical data is intended to be grafted onto this point.

-  19 Jul 2014; Pacho Ramos <pacho@gentoo.org> gtest-1.7.0.ebuild:
-  amd64/x86 stable, bug #513804
+  Creation process:
+  1. Take final CVS checkout snapshot
+  2. Remove ALL ChangeLog* files
+  3. Transform all Manifests to thin
+  4. Remove empty Manifests
+  5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
+  5.1. Do not touch files with -kb/-ko keyword flags.

-  29 Jun 2014; Markus Meier <maekke@gentoo.org> gtest-1.7.0.ebuild:
-  arm stable, bug #513804
+  Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+  X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration
+  tests
+  X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this
+  project
+  X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo
+  developer, wrote Git features for the migration
+  X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve
+  cvs2svn
+  X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
+  X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014
+  work in migration
+  X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
+  X-Thanks: All of other Gentoo developers - many ideas and lots of paint on
+  the bikeshed

-  20 Jun 2014; Jeroen Roovers <jer@gentoo.org> gtest-1.7.0.ebuild:
-  Stable for HPPA (bug #513804).
+  24 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Use https by default

-  30 Apr 2014; Michał Górny <mgorny@gentoo.org> gtest-1.7.0.ebuild:
-  Simplify multilib code. Set proper flags for autotools-multilib.
+  Convert all URLs for sites supporting encrypted connections from http to
+  https

-*gtest-1.7.0 (06 Nov 2013)
+  Signed-off-by: Justin Lecher <jlec@gentoo.org>

-  06 Nov 2013; Thomas Kahle <tomka@gentoo.org> +gtest-1.7.0.ebuild:
-  bump to 1.7.0
-
-  19 Oct 2013; Mike Frysinger <vapier@gentoo.org> gtest-1.6.0-r2.ebuild:
-  Add m68k keywords.
-
-  16 Aug 2013; Michał Górny <mgorny@gentoo.org> gtest-1.6.0-r2.ebuild:
-  Convert to python-any-r1.
-
-  19 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> gtest-1.6.0-r2.ebuild:
-  Keyword amd64-linux and x86-linux
-
-*gtest-1.6.0-r2 (06 Apr 2013)
-
-  06 Apr 2013; Thomas Kahle <tomka@gentoo.org> +gtest-1.6.0-r2.ebuild:
-  add multilib support, thanks to Karl Lindén (bug 464702)
-
-  29 Mar 2013; Mike Frysinger <vapier@gentoo.org> gtest-1.6.0-r1.ebuild:
-  Remove pointless die with epatch.
-
-  28 Feb 2013; Jeroen Roovers <jer@gentoo.org> gtest-1.6.0-r1.ebuild:
-  Stable for HPPA (bug #456476).
-
-  24 Feb 2013; Agostino Sarubbo <ago@gentoo.org> gtest-1.6.0-r1.ebuild:
-  Stable for sh, wrt bug #456476
-
-  20 Feb 2013; Agostino Sarubbo <ago@gentoo.org> gtest-1.6.0-r1.ebuild:
-  Stable for s390, wrt bug #456476
-
-  12 Feb 2013; Agostino Sarubbo <ago@gentoo.org> gtest-1.6.0-r1.ebuild:
-  Stable for sparc, wrt bug #456476
-
-  12 Feb 2013; Agostino Sarubbo <ago@gentoo.org> gtest-1.6.0-r1.ebuild:
-  Stable for alpha, wrt bug #456476
-
-  12 Feb 2013; Agostino Sarubbo <ago@gentoo.org> gtest-1.6.0-r1.ebuild:
-  Stable for ia64, wrt bug #456476
-
-  11 Feb 2013; Agostino Sarubbo <ago@gentoo.org> gtest-1.6.0-r1.ebuild:
-  Stable for arm, wrt bug #456476
-
-  10 Feb 2013; Agostino Sarubbo <ago@gentoo.org> gtest-1.6.0-r1.ebuild:
-  Stable for ppc, wrt bug #456476
-
-  10 Feb 2013; Agostino Sarubbo <ago@gentoo.org> gtest-1.6.0-r1.ebuild:
-  Stable for ppc64, wrt bug #456476
-
-  10 Feb 2013; Agostino Sarubbo <ago@gentoo.org> gtest-1.6.0-r1.ebuild:
-  Stable for x86, wrt bug #456476
-
-  10 Feb 2013; Agostino Sarubbo <ago@gentoo.org> gtest-1.6.0-r1.ebuild:
-  Stable for amd64, wrt bug #456476
-
-  06 Feb 2013; Thomas Kahle <tomka@gentoo.org> metadata.xml:
-  take maintainership
-
-  03 Feb 2013; Pacho Ramos <pacho@gentoo.org> -files/gtest-1.4.0-asneeded.patch,
-  -files/gtest-1.4.0-gcc-4.7.patch, -files/gtest-1.5.0-asneeded.patch,
-  -gtest-1.4.0.ebuild, -gtest-1.5.0.ebuild, metadata.xml:
-  Cleanup due #22900
-
-  02 Nov 2012; Justin Bronder <jsbronder@gentoo.org> gtest-1.6.0-r1.ebuild:
-  Resolve #361703 by enabling threads unconditionally.
-
-*gtest-1.6.0-r1 (02 Nov 2012)
-
-  02 Nov 2012; Justin Bronder <jsbronder@gentoo.org> +gtest-1.6.0-r1.ebuild,
-  +files/configure-fix-pthread-linking.patch:
-  Fix #371647, no response from maintainer since Oct 17.
-
-  16 Jul 2012; Anthony G. Basile <blueness@gentoo.org> gtest-1.6.0.ebuild:
-  Stable ppc ppc64, bug #420853
-
-  15 Jul 2012; Raúl Porcel <armin76@gentoo.org> gtest-1.6.0.ebuild:
-  alpha/ia64/s390/sh/sparc stable wrt #420853
-
-  28 Jun 2012; Jeroen Roovers <jer@gentoo.org> gtest-1.6.0.ebuild:
-  Stable for HPPA (bug #420853).
-
-  20 Jun 2012; Markus Meier <maekke@gentoo.org> gtest-1.6.0.ebuild:
-  arm stable, bug #420853
-
-  12 Jun 2012; Jeff Horelick <jdhore@gentoo.org> gtest-1.6.0.ebuild:
-  marked x86 per bug 420853
-
-  12 Jun 2012; Agostino Sarubbo <ago@gentoo.org> gtest-1.6.0.ebuild:
-  Stable for amd64, wrt bug #420853
-
-  12 Jun 2012; Mike Frysinger <vapier@gentoo.org> gtest-1.6.0.ebuild:
-  Run elibtoolize to fix cross-compiles.
-
-  01 Jun 2012; Matt Turner <mattst88@gentoo.org> gtest-1.6.0.ebuild:
-  Add app-arch/unzip to DEPEND, bug 410393.
-
-  22 May 2012; Mike Frysinger <vapier@gentoo.org> gtest-1.4.0.ebuild:
-  Stabilize & add arm love.
-
-  09 May 2012; Alexis Ballier <aballier@gentoo.org> gtest-1.6.0.ebuild:
-  keyword ~amd64-fbsd
-
-  20 Apr 2012; Mike Frysinger <vapier@gentoo.org> gtest-1.4.0.ebuild,
-  +files/gtest-1.4.0-gcc-4.7.patch:
-  Add fix from upstream for building with newer gcc versions.
-
-*gtest-1.6.0 (30 Mar 2012)
-
-  30 Mar 2012; Mike Frysinger <vapier@gentoo.org> +gtest-1.6.0.ebuild:
-  Version bump.
-
-  09 Dec 2011; Naohiro Aota <naota@gentoo.org> gtest-1.5.0.ebuild:
-  Add ~x86-fbsd
-
-  11 Nov 2011; Mike Frysinger <vapier@gentoo.org>:
-  Migrate categories from dev-util as this is a C++ testing framework #387155.
-
-  18 Sep 2011; Raúl Porcel <armin76@gentoo.org> gtest-1.5.0.ebuild:
-  alpha/ia64/s390/sh/sparc stable wrt #355085
-
-  12 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> gtest-1.5.0.ebuild:
-  ppc/ppc64 stable wrt #355085
-
-  13 Jun 2011; Matt Turner <mattst88@gentoo.org> gtest-1.5.0.ebuild:
-  Added ~mips, bug 342513
-
-  10 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> gtest-1.5.0.ebuild:
-  Allow parallel build of checks.
-
-  27 Feb 2011; Raúl Porcel <armin76@gentoo.org> gtest-1.5.0.ebuild:
-  Add ~alpha/~ia64/~s390/~sh/~sparc wrt #342513
-
-  20 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org> gtest-1.5.0.ebuild:
-  Marked ~ppc/~ppc64 wrt #342513
-
-  21 Jan 2011; Jeroen Roovers <jer@gentoo.org> gtest-1.5.0.ebuild:
-  Stable for HPPA (bug #350290).
-
-  08 Jan 2011; Markus Meier <maekke@gentoo.org> gtest-1.5.0.ebuild:
-  arm stable, bug #350290
-
-  04 Jan 2011; Markos Chandras <hwoarang@gentoo.org> gtest-1.5.0.ebuild:
-  Stable on amd64 wrt bug #350290
-
-  03 Jan 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> gtest-1.5.0.ebuild:
-  x86 stable wrt bug #350290
-
-  01 Dec 2010; Fabian Groffen <grobian@gentoo.org> gtest-1.5.0.ebuild:
-  Bump EAPI to 3, fix for Prefix, marked ~ppc-macos
-
-  01 Nov 2010; Markus Meier <maekke@gentoo.org> gtest-1.5.0.ebuild:
-  add ~arm, bug #342513
-
-  25 Oct 2010; Jeroen Roovers <jer@gentoo.org> gtest-1.5.0.ebuild:
-  Marked ~hppa (bug #342513).
-
-*gtest-1.5.0 (18 May 2010)
-
-  18 May 2010; MATSUU Takuto <matsuu@gentoo.org> +gtest-1.5.0.ebuild,
-  +files/gtest-1.5.0-asneeded.patch:
-  Version bumped.
-
-  02 Mar 2010; Tiziano Müller <dev-zero@gentoo.org> gtest-1.4.0.ebuild,
+  24 Aug 2015; Justin Lecher <jlec@gentoo.org> gtest-1.6.0.ebuild,
+  gtest-1.6.0-r1.ebuild, gtest-1.6.0-r2.ebuild, gtest-1.7.0.ebuild,
  metadata.xml:
-  Fixed sandbox violation in src_test, install examples on demand, added
-  static-libs use flag, added upstream doc link to metadata.
+  Enable https for all google URIs

-*gtest-1.4.0 (01 Mar 2010)
+  Signed-off-by: Justin Lecher <jlec@gentoo.org>
+
+  24 Aug 2015; Justin Lecher <jlec@gentoo.org> gtest-1.6.0.ebuild,
+  gtest-1.6.0-r1.ebuild, gtest-1.6.0-r2.ebuild, gtest-1.7.0.ebuild:
+  Convert URIs for googlecode.com to https
+
+  Signed-off-by: Justin Lecher <jlec@gentoo.org>
+
+  24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml:
+  Revert DOCTYPE SYSTEM https changes in metadata.xml
+
+  repoman does not yet accept the https version.
+  This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450.
+
+  Bug: https://bugs.gentoo.org/552720
+
+  01 Sep 2015; Tobias Klausmann <klausman@gentoo.org> gtest-1.6.0.ebuild,
+  gtest-1.6.0-r1.ebuild, gtest-1.6.0-r2.ebuild, gtest-1.7.0.ebuild:
+  Fixing HOMEPAGE move due to code.google.com shutdown
+
+  Package-Manager: portage-2.2.20.1
+
+  07 Sep 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  ADd missing remote-id entries
+
+  Signed-off-by: Justin Lecher <jlec@gentoo.org>
+
+*gtest-1.7.0-r1 (22 Dec 2015)
+
+  22 Dec 2015; Thomas Kahle <tomka@gentoo.org> +gtest-1.7.0-r1.ebuild:
+  Try to fix cross-compile (bug 566876)
+
+  Package-Manager: portage-2.2.24
+
+  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
+  Set appropriate maintainer types in metadata.xml (GLEP 67)

-  01 Mar 2010; MATSUU Takuto <matsuu@gentoo.org> +gtest-1.4.0.ebuild,
-  +files/gtest-1.4.0-asneeded.patch, +metadata.xml:
-  Initial import.
--- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/ChangeLog-2015
+++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/ChangeLog-2015
@ -0,0 +1,203 @@
+# ChangeLog for dev-cpp/gtest
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/ChangeLog,v 1.44 2015/07/22 06:17:27 vapier Exp $
+
+  22 Jul 2015; Mike Frysinger <vapier@gentoo.org> gtest-1.7.0.ebuild:
+  Mark arm64/m68k/s390/sh stable.
+
+  21 Apr 2015; Pacho Ramos <pacho@gentoo.org> gtest-1.7.0.ebuild:
+  ppc stable wrt bug #525970
+
+  08 Apr 2015; Michał Górny <mgorny@gentoo.org> gtest-1.6.0-r2.ebuild,
+  gtest-1.7.0.ebuild:
+  Drop old Python implementations
+
+  19 Nov 2014; Agostino Sarubbo <ago@gentoo.org> gtest-1.7.0.ebuild:
+  Stable for ppc64, wrt bug #529822
+
+  21 Aug 2014; Raúl Porcel <armin76@gentoo.org> gtest-1.7.0.ebuild:
+  alpha/ia64/sparc stable wrt bug #513804
+
+  19 Jul 2014; Pacho Ramos <pacho@gentoo.org> gtest-1.7.0.ebuild:
+  amd64/x86 stable, bug #513804
+
+  29 Jun 2014; Markus Meier <maekke@gentoo.org> gtest-1.7.0.ebuild:
+  arm stable, bug #513804
+
+  20 Jun 2014; Jeroen Roovers <jer@gentoo.org> gtest-1.7.0.ebuild:
+  Stable for HPPA (bug #513804).
+
+  30 Apr 2014; Michał Górny <mgorny@gentoo.org> gtest-1.7.0.ebuild:
+  Simplify multilib code. Set proper flags for autotools-multilib.
+
+*gtest-1.7.0 (06 Nov 2013)
+
+  06 Nov 2013; Thomas Kahle <tomka@gentoo.org> +gtest-1.7.0.ebuild:
+  bump to 1.7.0
+
+  19 Oct 2013; Mike Frysinger <vapier@gentoo.org> gtest-1.6.0-r2.ebuild:
+  Add m68k keywords.
+
+  16 Aug 2013; Michał Górny <mgorny@gentoo.org> gtest-1.6.0-r2.ebuild:
+  Convert to python-any-r1.
+
+  19 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> gtest-1.6.0-r2.ebuild:
+  Keyword amd64-linux and x86-linux
+
+*gtest-1.6.0-r2 (06 Apr 2013)
+
+  06 Apr 2013; Thomas Kahle <tomka@gentoo.org> +gtest-1.6.0-r2.ebuild:
+  add multilib support, thanks to Karl Lindén (bug 464702)
+
+  29 Mar 2013; Mike Frysinger <vapier@gentoo.org> gtest-1.6.0-r1.ebuild:
+  Remove pointless die with epatch.
+
+  28 Feb 2013; Jeroen Roovers <jer@gentoo.org> gtest-1.6.0-r1.ebuild:
+  Stable for HPPA (bug #456476).
+
+  24 Feb 2013; Agostino Sarubbo <ago@gentoo.org> gtest-1.6.0-r1.ebuild:
+  Stable for sh, wrt bug #456476
+
+  20 Feb 2013; Agostino Sarubbo <ago@gentoo.org> gtest-1.6.0-r1.ebuild:
+  Stable for s390, wrt bug #456476
+
+  12 Feb 2013; Agostino Sarubbo <ago@gentoo.org> gtest-1.6.0-r1.ebuild:
+  Stable for sparc, wrt bug #456476
+
+  12 Feb 2013; Agostino Sarubbo <ago@gentoo.org> gtest-1.6.0-r1.ebuild:
+  Stable for alpha, wrt bug #456476
+
+  12 Feb 2013; Agostino Sarubbo <ago@gentoo.org> gtest-1.6.0-r1.ebuild:
+  Stable for ia64, wrt bug #456476
+
+  11 Feb 2013; Agostino Sarubbo <ago@gentoo.org> gtest-1.6.0-r1.ebuild:
+  Stable for arm, wrt bug #456476
+
+  10 Feb 2013; Agostino Sarubbo <ago@gentoo.org> gtest-1.6.0-r1.ebuild:
+  Stable for ppc, wrt bug #456476
+
+  10 Feb 2013; Agostino Sarubbo <ago@gentoo.org> gtest-1.6.0-r1.ebuild:
+  Stable for ppc64, wrt bug #456476
+
+  10 Feb 2013; Agostino Sarubbo <ago@gentoo.org> gtest-1.6.0-r1.ebuild:
+  Stable for x86, wrt bug #456476
+
+  10 Feb 2013; Agostino Sarubbo <ago@gentoo.org> gtest-1.6.0-r1.ebuild:
+  Stable for amd64, wrt bug #456476
+
+  06 Feb 2013; Thomas Kahle <tomka@gentoo.org> metadata.xml:
+  take maintainership
+
+  03 Feb 2013; Pacho Ramos <pacho@gentoo.org> -files/gtest-1.4.0-asneeded.patch,
+  -files/gtest-1.4.0-gcc-4.7.patch, -files/gtest-1.5.0-asneeded.patch,
+  -gtest-1.4.0.ebuild, -gtest-1.5.0.ebuild, metadata.xml:
+  Cleanup due #22900
+
+  02 Nov 2012; Justin Bronder <jsbronder@gentoo.org> gtest-1.6.0-r1.ebuild:
+  Resolve #361703 by enabling threads unconditionally.
+
+*gtest-1.6.0-r1 (02 Nov 2012)
+
+  02 Nov 2012; Justin Bronder <jsbronder@gentoo.org> +gtest-1.6.0-r1.ebuild,
+  +files/configure-fix-pthread-linking.patch:
+  Fix #371647, no response from maintainer since Oct 17.
+
+  16 Jul 2012; Anthony G. Basile <blueness@gentoo.org> gtest-1.6.0.ebuild:
+  Stable ppc ppc64, bug #420853
+
+  15 Jul 2012; Raúl Porcel <armin76@gentoo.org> gtest-1.6.0.ebuild:
+  alpha/ia64/s390/sh/sparc stable wrt #420853
+
+  28 Jun 2012; Jeroen Roovers <jer@gentoo.org> gtest-1.6.0.ebuild:
+  Stable for HPPA (bug #420853).
+
+  20 Jun 2012; Markus Meier <maekke@gentoo.org> gtest-1.6.0.ebuild:
+  arm stable, bug #420853
+
+  12 Jun 2012; Jeff Horelick <jdhore@gentoo.org> gtest-1.6.0.ebuild:
+  marked x86 per bug 420853
+
+  12 Jun 2012; Agostino Sarubbo <ago@gentoo.org> gtest-1.6.0.ebuild:
+  Stable for amd64, wrt bug #420853
+
+  12 Jun 2012; Mike Frysinger <vapier@gentoo.org> gtest-1.6.0.ebuild:
+  Run elibtoolize to fix cross-compiles.
+
+  01 Jun 2012; Matt Turner <mattst88@gentoo.org> gtest-1.6.0.ebuild:
+  Add app-arch/unzip to DEPEND, bug 410393.
+
+  22 May 2012; Mike Frysinger <vapier@gentoo.org> gtest-1.4.0.ebuild:
+  Stabilize & add arm love.
+
+  09 May 2012; Alexis Ballier <aballier@gentoo.org> gtest-1.6.0.ebuild:
+  keyword ~amd64-fbsd
+
+  20 Apr 2012; Mike Frysinger <vapier@gentoo.org> gtest-1.4.0.ebuild,
+  +files/gtest-1.4.0-gcc-4.7.patch:
+  Add fix from upstream for building with newer gcc versions.
+
+*gtest-1.6.0 (30 Mar 2012)
+
+  30 Mar 2012; Mike Frysinger <vapier@gentoo.org> +gtest-1.6.0.ebuild:
+  Version bump.
+
+  09 Dec 2011; Naohiro Aota <naota@gentoo.org> gtest-1.5.0.ebuild:
+  Add ~x86-fbsd
+
+  11 Nov 2011; Mike Frysinger <vapier@gentoo.org>:
+  Migrate categories from dev-util as this is a C++ testing framework #387155.
+
+  18 Sep 2011; Raúl Porcel <armin76@gentoo.org> gtest-1.5.0.ebuild:
+  alpha/ia64/s390/sh/sparc stable wrt #355085
+
+  12 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> gtest-1.5.0.ebuild:
+  ppc/ppc64 stable wrt #355085
+
+  13 Jun 2011; Matt Turner <mattst88@gentoo.org> gtest-1.5.0.ebuild:
+  Added ~mips, bug 342513
+
+  10 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> gtest-1.5.0.ebuild:
+  Allow parallel build of checks.
+
+  27 Feb 2011; Raúl Porcel <armin76@gentoo.org> gtest-1.5.0.ebuild:
+  Add ~alpha/~ia64/~s390/~sh/~sparc wrt #342513
+
+  20 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org> gtest-1.5.0.ebuild:
+  Marked ~ppc/~ppc64 wrt #342513
+
+  21 Jan 2011; Jeroen Roovers <jer@gentoo.org> gtest-1.5.0.ebuild:
+  Stable for HPPA (bug #350290).
+
+  08 Jan 2011; Markus Meier <maekke@gentoo.org> gtest-1.5.0.ebuild:
+  arm stable, bug #350290
+
+  04 Jan 2011; Markos Chandras <hwoarang@gentoo.org> gtest-1.5.0.ebuild:
+  Stable on amd64 wrt bug #350290
+
+  03 Jan 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> gtest-1.5.0.ebuild:
+  x86 stable wrt bug #350290
+
+  01 Dec 2010; Fabian Groffen <grobian@gentoo.org> gtest-1.5.0.ebuild:
+  Bump EAPI to 3, fix for Prefix, marked ~ppc-macos
+
+  01 Nov 2010; Markus Meier <maekke@gentoo.org> gtest-1.5.0.ebuild:
+  add ~arm, bug #342513
+
+  25 Oct 2010; Jeroen Roovers <jer@gentoo.org> gtest-1.5.0.ebuild:
+  Marked ~hppa (bug #342513).
+
+*gtest-1.5.0 (18 May 2010)
+
+  18 May 2010; MATSUU Takuto <matsuu@gentoo.org> +gtest-1.5.0.ebuild,
+  +files/gtest-1.5.0-asneeded.patch:
+  Version bumped.
+
+  02 Mar 2010; Tiziano Müller <dev-zero@gentoo.org> gtest-1.4.0.ebuild,
+  metadata.xml:
+  Fixed sandbox violation in src_test, install examples on demand, added
+  static-libs use flag, added upstream doc link to metadata.
+
+*gtest-1.4.0 (01 Mar 2010)
+
+  01 Mar 2010; MATSUU Takuto <matsuu@gentoo.org> +gtest-1.4.0.ebuild,
+  +files/gtest-1.4.0-asneeded.patch, +metadata.xml:
+  Initial import.
--- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/Manifest
@ -1,19 +1,11 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX configure-fix-pthread-linking.patch 3142 SHA256 501f42dd4f4f4412fcb18fc4eb5f1100f5c5a6b19610f6548bccc84989c6f83e SHA512 4347570606853c75e43d3d1abe449cd562538e531136658e6742f8e2dddcc1767932b427a063f711b868467ca85ff947f24c4ed3e328319bd0a739bb66093016 WHIRLPOOL 5ab7be10a9bd675398884f2a4ad8c30fef17412ff3fbaae5d14cf290ebf723ccc005d2ea1dd7ad68c8bd8db57d06cc0fadd79d7f9f2ab46ea5ed0a87df8201fb
 DIST gtest-1.6.0.zip 1121697 SHA256 5ec97df8e75b4ee796604e74716d1b50582beba22c5502edd055a7e67a3965d8 SHA512 f4718dfbfa3339bb9449c3f14e5b44ae405ea7df64c10a0957a6300985b71c4642981d069a1382e27ae041a4e2873527a9e442aff978447e795a190f99fac115 WHIRLPOOL 745a49020d4353ed2fa38adfc80bbd777358c831719bbe3b7c90d243f84256615222ba5f04d48d98b9e1a803bb40766799b3aedd575024c19d853d9239a12f8a
 DIST gtest-1.7.0.zip 1164254 SHA256 247ca18dd83f53deb1328be17e4b1be31514cedfc1e3424f672bf11fd7e0d60d SHA512 8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07 WHIRLPOOL 0c31a385159551859c1afe76480b3fb1b560d666db9a0afc5cbda92bcd53bf129f85a8f902c6ded0779c2b4c49aacec59ba5a4d5ce316a07bf08174f4fc64049
-EBUILD gtest-1.6.0-r1.ebuild 1323 SHA256 a25e2db4552fa335ac8a044e750b2b6fa4920515307ee6f114fd42fd113a25db SHA512 27869b4a124ebcba0679944e537107cc334d5bad17482707700253d04b639c420168de66a0a5b4e66b1142e3edb06ce3a32f185cf418ca7167a55813af32d8a4 WHIRLPOOL e60cb80ac90595d606865002449beaeba674752249466c673bc9a805cafb8c05d476769826703c3ac533433582f6c874753981d193dc1bf90b685a29969577c9
-EBUILD gtest-1.6.0-r2.ebuild 1505 SHA256 aac570056ca175f53516dd7099b4dd25889644f00958f3b812f81a751db21cef SHA512 d76bfc5fd39f5ffd20735566da00b15ac0b2752eccaf7c464ba4ac91870da955fda33602b140d50c65be1d545afe57bb41f9265a0c99f9586d19ec16a2742584 WHIRLPOOL 21e13447b519674ce0e0025d1d1a3d6d28798158afca7ccda14f0671cc23226d2d568b80d3684aa8679fd8308562b0510be5e86a15fb102980f89dd76ef2ebb2
-EBUILD gtest-1.6.0.ebuild 1281 SHA256 9bccd7abfa3d8fafeeb786e975fe3183fa41e2b2428e8887b4b68413e7fc7aad SHA512 8246b7bb2dc68657bda9e7a0fa32f29a6f5b475f127a6450b92467ea3b641fff240282a28e9c2678d9900dc576cd8eca353aaea7a943aebe921e8d6ccd2025d7 WHIRLPOOL 63b2b736ccced1a0bb86b016229fcb58bb9287c54979412a0271dc81de2110f1cf1a9ba5aaeff4bc79dc70882d3379514b84cbf289a93ed9a2c1e2aa46b21632
-EBUILD gtest-1.7.0.ebuild 1332 SHA256 7a8cb33d201b5162efb14c05fa462ea3f7110482dcc191f5c3af104eb39d3db0 SHA512 8b849f9efed55faca4ed86d2672af7f9857e64694348fd32adc6ed0f5961183807e1cb012f70e79e063e8ca3fb798c5e3384674b71bb690dad457a6cfbda2b78 WHIRLPOOL fac07169d06b1bcb8904c2aa94ecc13de9cec14b4ade48b9e5f33281ba22106e80313a34c316027330dadc2ed076c635287cc4f951c0de3210b9e6c0f2850355
-MISC ChangeLog 7016 SHA256 99e38683b4ef6550b356f0abb717c07232e4621402dedf09408d883fca4f2a32 SHA512 a3709f6683819fd48e82fbb29b9a1367aaa36c2e3331a194b7f7c8746f1a153ec3e24f7dcd720e8e9ce51e92f2811b9701ef846aecc6da884eae0705857fb3e5 WHIRLPOOL fffe739c91be4924e36e98fdc7b1784d25b6640ebcd3e67dd2878dce3be7b3d7f128def8c307c523446166917da2d086790f73c4f258454607c74cefb1ea1a91
-MISC metadata.xml 374 SHA256 776842821130b79f552271fe642b3e455006874c6eae5d1b9323e46a1670310a SHA512 a1248ebd1cc76617b425db3d91d8e96894561acb2fcca70c8524f50fa2f933e024d0d4a4d61797a90b42c00a6cfdce8a68057e94a82ce63dfd156037359a60cf WHIRLPOOL 99afc26196452541537ad72d29362547d3154c5f3772d5fd6fb9484ba499ed4b3567873b8eac3c5f2fa7f812b0466f2f3e5c5f25b168e9a069eb4ad2845fa99a
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlU2nywACgkQCaWpQKGI+9TEbACfTV7aoknWO+xqE4DNh1BWRN0j
-SysAn2BoCFhTYhvm3Xl7PPpvafI7xKqA
-=QGeH
-----END PGP SIGNATURE-----
+EBUILD gtest-1.6.0-r1.ebuild 1220 SHA256 d6233f091c7f5e36d3f98015f8a27185552d37bf465d44d7c10fff97e9f79c6b SHA512 7f69342d061d4de45e7274f196ed8cca5bc00b33413228f676bdd27679692913232d4ffb4f87ff9d834a68ffafaefc5d126143de7134a92f9933ee9a803de85d WHIRLPOOL b4ffd94aeaf4e133752650ae765fbb042bea5f09bf6579ae139b40f8bf99d532074fa4058b055eb507fb4a7c6fea52bde20421ce53719d9e31c847c2ed0cb4e9
+EBUILD gtest-1.6.0-r2.ebuild 1403 SHA256 97142499ed3d8384e723bd6bea632f480828711dcbb97d91316404e7d7c2b828 SHA512 745718af0d11754d8b353006b1ab43dafc1aeb9567c60c6e8701a1a7f79eeb6c85ede9a7ecebcf028e1b57dfa67b804a05c265a57bab33e64a37e5aed6d0a3f7 WHIRLPOOL 831ddd73e140b8fab0e81ba0467a93a0f881e1e059d3299b780db4a7827e0b0da999a70cf2f0c1522d5519bd907ac2699a5a580d81b7ea56cdc8a54f6441b431
+EBUILD gtest-1.6.0.ebuild 1179 SHA256 ec05544c8b3e9895e5b4e9e5dcb59ea5db844c4684434be4d0e6721d7fd847a3 SHA512 856cd85c338b1204b110401aed8d32a0d06e74292eac66bb6c43869a7b847ee5a2be4974260ee315fb791b2fba278eea1d8d9f111db39daf72353a5089fff820 WHIRLPOOL 3d6b2cc8fdfc6f82ed0adf47238d75847a23901a754d94c48a6e915f5a18eb1d4a31fd9224918a4cc0818d8f5729fea54be17efea915d4e0b4a3659f273791e8
+EBUILD gtest-1.7.0-r1.ebuild 1278 SHA256 8fa7186ddf9274ece40b09c3fc80f34ab9d788a396cebd6c38e3bc884ada408b SHA512 f8a97736051da5bd7b4783204545158695a764c483fc29f24141cf4f0c31df058f6890ad14fa90423f873302c34612b280a4fbf9f7653f442545ca6c7570fedc WHIRLPOOL ff5a27c84a27aaa226730fbbd6a0b70ef56d56c9ef93fa47e573c7c951d413c7b8c293f76ea7299eddb08dfe714873de0ce72dc8c3aa5f72242ca617d1db18ac
+EBUILD gtest-1.7.0.ebuild 1237 SHA256 32b7f2c90f0776a00f83112d6c627bec3ffaf9aa4b01770b7f66e892e546ad2d SHA512 987f11d767e1298a9a5078e057292fb4dbabf59a3914c6211207ddaafa760cc95692d6d5ac8eb797c60402366f71f6fbcea515246262772e5ffc45ca3601513f WHIRLPOOL d7edc960500c97943eeca3ff7dc643f8f694ad93c534ca0ef5fdf354a44ac9c4ec775ce3a011ec68fe8b2759b00a6f587acc69872f3867c5b7f599affa7a34fa
+MISC ChangeLog 3396 SHA256 b62a1896c5b7e36c6f170de9c92db18e1dd7648603fa9b7589bbdf19a3c40fc8 SHA512 466ee496547fd90e8a0439eed358ddd4401fb26a3de3739a3d9b575a07d40cdd273bf81de65d545e63e722b30dc7ccda51a3a0b747ef1d6cc26e655d89dc2b03 WHIRLPOOL 4c2d85cedcac24ae6fa26658855eb62b16afdf6807b0a4cce65df9208b9ccb4aca769d60d7aca438bc69bd0044860d2f4ea32aec97cd79192ee1cc3a5ae378fd
+MISC ChangeLog-2015 7122 SHA256 04a56c441092e2cc6ea69082630e26a82b369945219147611af9905eadc1d9ff SHA512 1baf81de23ffa96b2970b71238627b1ca895e1b2b943b962fd7782200c891c1e1f3d1ffc1e33aaa7095999c106698b4cff53643c3648bbc522a7edf317f17d8f WHIRLPOOL 22470f963e4d9ec80a3071e3d054768cbe489481365184f834e5e5ff67daa371f40c87cf57b00a3a0637fc9a8f18197b855ea87e7ae58bcc07b61d075a4ecb30
+MISC metadata.xml 448 SHA256 d14d9eeba92c9444b50857a0a040841a160ed955c478899e62cd58d9c8e84e30 SHA512 78940e6d67612ce46bf1d676eb6cc899a33556dbd3e81d6197db6b454df91d23ddd04f2504f42f701ab750b5fec022ec464086a554713c6d83e70b089b60b09b WHIRLPOOL 7cfe71500c3b311714115ca8dfc446f7f4a8b42ace0d4a0a614dfb46d01573dd75508f9308ee3a664b1d26b5004f6fe56a092e8c184c7ddd19d8954c0b0a8f76
--- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.6.0-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.6.0-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.6.0-r1.ebuild,v 1.14 2013/03/29 01:55:22 vapier Exp $
+# $Id$

 EAPI="4"
 PYTHON_DEPEND="2"
@ -8,8 +8,8 @@ PYTHON_DEPEND="2"
 inherit eutils python autotools

 DESCRIPTION="Google C++ Testing Framework"
-HOMEPAGE="http://code.google.com/p/googletest/"
-SRC_URI="http://googletest.googlecode.com/files/${P}.zip"
+HOMEPAGE="https://github.com/google/googletest"
+SRC_URI="https://googletest.googlecode.com/files/${P}.zip"

 LICENSE="BSD"
 SLOT="0"
--- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.6.0-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.6.0-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.6.0-r2.ebuild,v 1.5 2015/04/08 17:46:42 mgorny Exp $
+# $Id$

 EAPI="5"

@ -10,8 +10,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit eutils python-any-r1 autotools-multilib

 DESCRIPTION="Google C++ Testing Framework"
-HOMEPAGE="http://code.google.com/p/googletest/"
-SRC_URI="http://googletest.googlecode.com/files/${P}.zip"
+HOMEPAGE="https://github.com/google/googletest"
+SRC_URI="https://googletest.googlecode.com/files/${P}.zip"

 LICENSE="BSD"
 SLOT="0"
--- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.6.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.6.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.6.0.ebuild,v 1.10 2012/07/16 12:17:56 blueness Exp $
+# $Id$

 EAPI="4"
 PYTHON_DEPEND="2"
@ -8,8 +8,8 @@ PYTHON_DEPEND="2"
 inherit python libtool

 DESCRIPTION="Google C++ Testing Framework"
-HOMEPAGE="http://code.google.com/p/googletest/"
-SRC_URI="http://googletest.googlecode.com/files/${P}.zip"
+HOMEPAGE="https://github.com/google/googletest"
+SRC_URI="https://googletest.googlecode.com/files/${P}.zip"

 LICENSE="BSD"
 SLOT="0"
--- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.7.0-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.7.0-r1.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+# Python is required for tests and some build tasks.
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-any-r1 autotools-multilib
+
+DESCRIPTION="Google C++ Testing Framework"
+HOMEPAGE="https://github.com/google/googletest"
+SRC_URI="https://googletest.googlecode.com/files/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples static-libs"
+
+DEPEND="app-arch/unzip
+	${PYTHON_DEPS}"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}/configure-fix-pthread-linking.patch" #371647
+)
+
+src_prepare() {
+	sed -i -e "s|/tmp|${T}|g" test/gtest-filepath_test.cc || die
+	sed -i -r \
+		-e '/^install-(data|exec)-local:/s|^.*$|&\ndisabled-&|' \
+		Makefile.am || die
+	elibtoolize --reverse-deps
+	autotools-multilib_src_prepare
+}
+
+multilib_src_install() {
+	default
+	multilib_is_native_abi && dobin scripts/gtest-config
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+	einstalldocs
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins samples/*.{cc,h}
+	fi
+}
--- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.7.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.7.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.7.0.ebuild,v 1.9 2015/04/21 19:04:11 pacho Exp $
+# $Id$

 EAPI="5"

@ -12,12 +12,12 @@ PYTHON_COMPAT=( python2_7 )
 inherit eutils python-any-r1 autotools-multilib

 DESCRIPTION="Google C++ Testing Framework"
-HOMEPAGE="http://code.google.com/p/googletest/"
-SRC_URI="http://googletest.googlecode.com/files/${P}.zip"
+HOMEPAGE="https://github.com/google/googletest"
+SRC_URI="https://googletest.googlecode.com/files/${P}.zip"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples static-libs"

 DEPEND="app-arch/unzip
--- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/metadata.xml
@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-	<email>tomka@gentoo.org</email>
-	<name>Thomas Kahle</name>
+	<maintainer type="person">
+		<email>tomka@gentoo.org</email>
+		<name>Thomas Kahle</name>
 	</maintainer>
 	<upstream>
-		<doc lang="en">http://code.google.com/p/googletest/w/list</doc>
+		<doc lang="en">https://code.google.com/p/googletest/w/list</doc>
 		<remote-id type="google-code">googletest</remote-id>
+		<remote-id type="github">google/googletest</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/ChangeLog
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/ChangeLog
--- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/ChangeLog-2015
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/ChangeLog-2015
--- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/Manifest
@ -1,23 +1,29 @@
-AUX maketcllib.sh 879 SHA256 e101ed11d908bfb7f57519a99674160b0273d6500d191f758f8a0d1e6ed78120 SHA512 d6ff354cd0e6e0a4240de1ccc0c93a111dd6cc7795d690bdb9fbc556bbae6aa4190b0c44a1be399b1420e33435f53c232400c46392446edf9a9d983ed28f1d98 WHIRLPOOL cf0f28e2086059b3f549d77f5853c4abd1ee1e9756972b6d8063f3c29ba5f46de2bf68f9392db65531c5f1dbada481cabde726cf92d06701c2aa134240ca9e2d
-AUX sqlite-2.8.15-alignement-fix.patch 538 SHA256 f61f2f36fed61438d13dbb09902078ef11f0c3e8c8a119f84030689a2f2add8f SHA512 be3bb6a620d14e07153476f9fb0658d347a0fdaf44363904be32004836e2727210307ed87fe2b8b01cf4df79cf05947be7b500a9608215a6e950173237e64386 WHIRLPOOL f1e8b388b3256e4f8f7476fa7b369b014902473477f17ff28f45e221aa973b14e9dc54bf6cedda04d2f8772fc87c34f19f14b11a9e67a082cde70f5cfbf32e4b
-AUX sqlite-2.8.16-exit.patch 355 SHA256 ab34a56dc56914fe3396f523a7d917319607dcb03ea33a3327c1e123d315b630 SHA512 937056b0629cd9e254098d40ed9dbc83e40c027727e8b12b2d5ff4513c1aebdb40fc9a7178b0d7554d3854888079ae828699dd27e1752759eb99dbec95c591f3 WHIRLPOOL 180eeca385be1607d8a55ea9aebbe8a0c0d85c7b67b7b1f22e737482b86471dcfc943513b6a6d49d8a49f3df3ce763cfd4b228f385e4b3ecf57419831d139214
-AUX sqlite-2.8.16-multilib.patch 4038 SHA256 4ccbef245ea50f317e34bad5ed07e6917fc08d718c6e57884255799980d6e765 SHA512 2814651e8906032646f46d9af86b5938215f32eb114780321f5a1b0554e8a531b858d7020ed598f109698b616f8bc18b923192dc3decc6c4f36bc173db937f35 WHIRLPOOL 28ba54df12b010c1428b3dcc13d2b6767d4373a07a245d538c3510362f8699779f2a66e47821f6c0d3e1fac80ef0606b955e5a83a59aa59a290e5354241c9d8f
-AUX sqlite-3.8.1-autoconf-dlopen_check.patch 361 SHA256 2bc98779fe2da233592f1d97cef621ea3ae8ba6ab2b322c0cbb3894031cbdcaa SHA512 18f33a03c551d2319eaafba3fb47b70333f4053e4b0ab4c46cb07275467fdbc08121eeaf131b57061c87ce5ac609038a40b7b68db671a5c86d5b75e3c60c3e0c WHIRLPOOL 97a2fe26454d802d30977d88e6e3b86424ab9abfeccadcd406ccd740e0458d20e63951f159f67eca47d524419df57116e470560ece91fb3d2b181d3663028f30
-AUX sqlite-3.8.1-src-dlopen_check.patch 331 SHA256 a8d5a07e3acb65232d33a512567ddb1894c1858bca01c8872cce92f4232af5dd SHA512 d9353bdc0eaabdafff86150b15ccd35b50270c9513f73bf7b2b6f060c642d083e631400b319f584333fbdb002bc148325edcd6fa1ed2968d2c952438851eaa1d WHIRLPOOL ca57d171943ad212ee90d12d99f805f56d7ed7daf49a12cab45d3713820e4c59aa1bf3378d035d4fa2138ad6cd912af6805a07fbc701ec2117f85c8a222823bd
-AUX sqlite-3.8.1-tests-icu-52.patch 1866 SHA256 ca2ec1060cb7dce3e4d56ef1a27866abebf776e7d5d82ac373be2a182fb91abe SHA512 e17eec1d875e3c5fc1a3b664f7bb4d2b015ea1a544150e3eaa199f3fd0ee84f4924f3410182a4e62e280281278b32225c0779d97d85a56e272b6ccd0d900d3d1 WHIRLPOOL e77a681efc81ee4d212f3c68464cbd625b24b06b80ca22a72eaa1ec2b5d3ae0ad42596bae3aa953018569ca9131b686d06b1b68147f4102a33c20dc1c5d4595e
-DIST sqlite-2.8.16.tar.gz 981834 SHA256 d26e8a6fac1ad497a3ade719da4f1d6d60f586fd10f66253f1c3d3db7168984e SHA512 262cacbb9a6e615cd6ce7c2992c4dd5b0cd59de096daa74925e81baef4c0e4b3d9a7e4ebf8f4ba949afac4fe2fbf2c627ead29fa72ff38dffe6446ae46c40d4a WHIRLPOOL 78c4dc05f94d97483c03b1f1eee67f86fd5d9499e82b082ba3951878867d10d18ecbb5cac9086ce509c0cb1cb47b57661709a28d2ee7e61038512d1c11c77bff
-DIST sqlite-autoconf-3081001.tar.gz 2049377 SHA256 5f8f2ae6461e637ff63e50fef10b6962764dfc3b81a8c0f80a19794b9d59f7ca SHA512 8e206952b351ef8a9cf523558574cba9630c8c07ef7ae90fb0712d2b99fea91742a26d0af1b01816593ea769fad343101fdbbab9c1626a4d712bb1a18b2b6b30 WHIRLPOOL 83fd822bd9eb6fedea29d968381726be24153375c06ad8c39d4ef34fd3d2e1001c8d5440880d6a880ba24242cd87782afa445ce145cdf7e75843419275136da5
-DIST sqlite-autoconf-3081002.tar.gz 2049387 SHA256 8382e55a4e7d853c93038562ca3dd00307937fccf1c6b65ddd813e503a56d626 SHA512 afdf11d5482a645c37cc0c4c5c2b3f8c56f26c95ee94658c92bfa0ffeb68981f67834215a45a658f733333c68f28231448e87995f9614a56f9f1672cedd13a65 WHIRLPOOL f3c7b1a11d63213a29f9dc6c04c02db9900b25dd0a8c0551bbf6d220493e7cc420d5775d99147d92c781b7f0068889e6dbeb32a10f447009341827908eee4ad8
-DIST sqlite-autoconf-3081101.tar.gz 2101885 SHA256 fb99b0ac038c4a7e48b44b61836cb41d4eeba36b4d0ee757beeab59031a1d3b6 SHA512 b87e3a94462c26e875833c7f83dcc453146377a403d173169e2db7198bede2467f8c480645141da678e0fd3071764558f2dd2630086964431ead25ac43212ee6 WHIRLPOOL 2045496055b02151211080110dc8fc2c474337788704a0e4db8841a1928b82d6490afa682c8d8b1bb6b9e98808d7eabf0f763a41e4768b1c21629107895bb66b
-DIST sqlite-doc-3081001.zip 5060040 SHA256 0b6c186a2da8b7d7397eb3942e97fd85b88734beb300702ace0dca4a3db729a6 SHA512 76caf476c98d8a0f5da55c4608bfc31235289e3ab2286089195fab86da6b5d98b2d5eb0fe7b81e3aff8f04939c9bcbfded6be22f0eeb21103478bf519e9ff78b WHIRLPOOL 5edd1d06babf19d54e326f6262d45851d43a0907adad66b130c93cf63efbfadcad6dbc98330bd4d2f80d1d528cd9088ada0727475b42005de6bcdbc4914e5d7c
-DIST sqlite-doc-3081002.zip 5068441 SHA256 e355ec10989829d485d2df08f076f6c3f598f7fc1d45d307b4fd70d5e609e6c4 SHA512 c222b250de6c8e182da1b534f459600a81b300c87578f9484b7d6f1fbbfaad9e8be70c306d0200b163850f48c974c55ce25782fefd55672ef72f03dc0b5f8d19 WHIRLPOOL 148bbce9bc3ffb1f9101e45936ce060aa49dbc88647effabf5418fa95ccdb91a4971d171d940de3307a2d59144e73250c43f8d8d79927ac36a1e02784f143061
-DIST sqlite-doc-3081101.zip 5108061 SHA256 89e3fc4bce7463885da3b03602b4260fe07240f9ea674ba4ac7ce2ee4987357f SHA512 8a39e05b1647f4769126234b9759552138f3e3874bc008686ef2f9136833ddc30b3b0696222a736d604e8910a436acedc4954e46894f4adc085eb5f2b6ab9280 WHIRLPOOL f47308753f8df2c497e1bf3cd941b862d69d4f6bbabb2f0606d144966cbb186c5e1513022a5adc122939180fc6cfaa7c83a9537481cce455a83b7bf68deec9cd
-DIST sqlite-src-3081001.zip 7648823 SHA256 def6e2401c8da91b489de19d1a1734f722b4e629148ab804776d27b49ba49e7b SHA512 7604ac35eddd4aca53c02b0ab7ae7682856aec2eb4e6a9627da041ea19d464bb6080a70d84070a94abf77eb14ae616a0a8c5fe2f2a6c19fc899d1b21535d3e1a WHIRLPOOL c44e4f446d12af1f4df49e171276d853381784e979d3521cafbfdd5b5359c792586d298f3573bbda8a260b9008a4b7fcdc4ce0382fdda18574287018a2cb4f4c
-DIST sqlite-src-3081002.zip 7648737 SHA256 fda379bc4590761838d02ac8008433b7c3eae6e120e45d639d24b09d0004b42d SHA512 99661c709ffe8d5776c3ed2c1a64c70f541b68f0c7745e3e769528273966f71eeb29e8911d42ede9420f179b7fcbda63c4d0980a9d7bc05e937d0a6deb7b814f WHIRLPOOL 4e13138a5f92f5c5fe65c8b670097b57ea778244a37a5bcabf75f86f4ac3f0bc17860f3e55833adc9adcc335b6aece396c685421b58ccb0ddca66f37edfda7fc
-DIST sqlite-src-3081101.zip 9057103 SHA256 261ad454663f66fda6101b278bb7b3931cf01884deefbf4ea6b152f83a624662 SHA512 e84048a4a7f9c51219698b59d45c0c533ffe46ba6a20b96ca40f8066fd3825f80f963283d61dc22b2eb5bbca35db3ed4a6e13b1ab3c8b70b0af83469d2760f16 WHIRLPOOL c1add1e5a269546883e58c1666b8acdc58b16b6ad37ea546c99c8ece3348196d5ba33effb17fc773f4d49b1ee45583de7fec3fbe2f6d48e95fdfe4a802c6a824
-EBUILD sqlite-2.8.16-r5.ebuild 2805 SHA256 0a1b775ded2e1e381130e457d2f0ee912dd09669471ae784e13f40157a290c96 SHA512 3c2e62bf8a57df5059672e826086156fe2ae94e574ed894a56365bf7c17016039c94203869e070e6ff2de62c9571c970abeb9a411148db6ace9fd0055128e7ff WHIRLPOOL 0d747751a5869d49e2c99eca375f854e904abe4443f81e4953007b1af44c183b1c71377f2ee02b2a1358d4e44b9fd11ca4e7bf6e39330571ed857b160b2601db
-EBUILD sqlite-3.8.10.1.ebuild 7139 SHA256 458a229d72d32bbb4c9be6ea255f859c3d2fcbc81e6b0b60b4cd7089fc6125e3 SHA512 11b21aef09c72c2a59478a347740dbc668419a98a7de547766de4eaccbeeed00e8dc7ecaeac58dbf4069bc8f50d353d921c86e03f8d5365a91cc009273b3a038 WHIRLPOOL ac9522f482b3fe9d7a9d7d8dc910400b658ab8aeaff70c3a4b31d3c16d5332b3499fb8fd7e73280f53e2e5bc33dcf278a6f05ca5c77469c769053d684358c5be
-EBUILD sqlite-3.8.10.2.ebuild 7135 SHA256 efae2acf47b0f0df2ae8025f10f965ff79abf1245a5fe4e464fe189132d62e59 SHA512 c1833cb655a7275a1a9513b35cdbd2339ebbfbb27f7c63dcaf99abcfa4eee447fad2dea9fa262cdbdbb8e8bd8a8f107cbb0926683c2da42c25460d60f96d48f5 WHIRLPOOL d30b5c1dd26efd1c9e7d833c0eafe54b3e8c8a038dcdbc11101aac72ef11cf60e935dd293bd1f51040ac16cef77d30115ef9039adb4855f6b4b1638865201dd2
-EBUILD sqlite-3.8.11.1.ebuild 7222 SHA256 d90562112e2e3dc8028b49af22993b44d0542cc4034850f17d6ccf6b5ce99461 SHA512 67ae6a238f3f1f0e4f1cae215702a54f7d8335129ee410d344b3066a8c08d5e699ab82bd227903d9f6a3648b5077d580c42f141f41c64566468e355ef5952fa2 WHIRLPOOL ada9ca92b54f1971fbf6b0f1935a13c38918b4779df6eedfafbdfc2bb14a5bdebfdf8b4fba35908d9892bcfe98172f5e586e8ee32a14dd9451442ac2068a2eb1
-MISC ChangeLog 77763 SHA256 c33481b0e8ff18658a72ce845ef033f46d7e2e47fd368f276485936b8249e366 SHA512 ae9ede8a42eb81bdbfd39c201aaed8a295c2eb61999d7961aed59f1d439241b57ffff0548b11317abdf2342a2e35daeb8ba98dea3fbd1904653192c3e2b3c86c WHIRLPOOL 892423e0771ee903650e396b9eb63ca76abe782ce5d3f2e1f993d0c65f3ee1b23e38a743557e09f7d11c6466ffe7c8bf7fb4a372ed58e33c1397d9c9b24f1783
-MISC metadata.xml 641 SHA256 192c0ada0175fbad5202267520fc563ea1559ede7e64b375dd6dbfe96cf4aa0b SHA512 fcc41ad18e6f25d25b32373ac9de9e46d78784778ca3f56d73c95c67e1318808374f408f110db216d314cd2695b87bbb5225ff7e9621e8726db1b3a0559fb94a WHIRLPOOL 3608b2739d8f35ae22dba98cc98a3c9e30584dd34781cf2f6542cf90ec94ceb05bd6abb5f7203d9858556b20c1e322810ee397c14c36d5e5a186ed8c96a46784
+AUX sqlite-3.11.0-full_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch 14405 SHA256 ddce4fdc675e54a0a8a0537a315876cb881e5ae1f0c0193cea28f09b10bc7954 SHA512 4586762f41c6eeca64621e53a7369b9258a88880e52db2e8a98f02f46fe5db5d93cf3104ff8e2c99880c633bba2ce59bcb30552091efb34f6eb19f078fe3eedd WHIRLPOOL b95894b95a0f68378e61d59817de9709dc929f04625ff39a838dbeda57a07ddb636ac614b46e1c22bb0f071440a04c51b98a38d38d93b1d167022be3ee4d0080
+AUX sqlite-3.11.0-full_tarball-build.patch 4933 SHA256 9b76ab242a0486a94f9efeac6f6cab3364c4a5bd47c2b51be098d5db53015118 SHA512 303c419cbcff868249ae4691865f04b732faf0df09d49102ee35fd37df085a5a0e9e4e7ce7c856bb80af3177670ba0bac08ded1244dd452883ac32dab4727877 WHIRLPOOL 5abb65e9255b643af210fbd79d0f414b6393a026252f3faa4d12f40cf238295dfee3e922635879271916a7e817b8330fb459ea8c225dc13a9812d3161a6f5742
+AUX sqlite-3.11.0-nonfull_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch 8426 SHA256 097b2714ddddc7af74ecb8baa68ac1f7b18b73539aaab5315d1fcba52a6c222e SHA512 0ae94f82b016035b2ec415ab271701b7f48e21f0749c1f98dcf1e86f8fba6c5551121fa70791a8c0b1156dccbcf160f05d4f5e0003f53bc820ceff91eb9745f8 WHIRLPOOL b8eb1ccc0cbdf32bf572348aa93119f194b549d9b60d1a9aaf8e91b727bcd53d520247e2f3126c1acb5621338a9f35b32d0695e080a354cfc5a6dde29e181db9
+AUX sqlite-3.11.0-nonfull_tarball-build.patch 1325 SHA256 080dc8d6b7bc465326215bfa08592d5b5bdb7793c095141efa992de4d687f0d3 SHA512 07ef0eacb494a3bcec81cf6a10e86d7bb88b18807226efdffb35f28cd95032b92851db14fc8a1f465312201a866e5d4e1af02f863e89a16b718c6352680036b9 WHIRLPOOL 8bc0bef6f4ebd714ec4ce12660a956fc106f4f25d5514cc578114a4ac64d011ecd7e4597eb93793c79621e03c18a9f70e11c62c26c496eee4a4bdfe23ba9f813
+AUX sqlite-3.12.0-nonfull_tarball-build.patch 403 SHA256 8cc4b6d013c432fe59f4ee10f3b98a2c8ba3471a44f68c92e555e4884b9fe2ce SHA512 6c82a7be2d5f6e898469d8aed78470773617b9d77a9d491454e4b7b29abd6b29bb2854b96318f98eb71215deaa9bc7d753ac57cb52f73cf0aec12a23afdc8294 WHIRLPOOL 94dbe52c9cee7a07df5a647c95044fc3b356b2d2bfbbd0cc0566a31363e26f2990e0eb2ffaacaaf8922d5db4bc1268dba153860cf5f8d79b75ce9c5db3fa37de
+AUX sqlite-3.13.0-full_tarball-build.patch 5192 SHA256 76841d686bb96fbc68ac6fcc773bcf02ad432c900d18c3a4dcd8b5df396dddd1 SHA512 95d421b92cfee4772fea26f699b92a6cafdcbe087370d003960c14f75a714b23d24b15a9c8e31552d224fdaef89d871464519077b211b89e8b97bc1fb53c5428 WHIRLPOOL 8b5c5878c5690ae367f39032dba7cb9a38eb6e446e60f1db74b0272b29003ffaccde872dbec418a6a5fbcced1bc965ce2130b5da78f7151efa9d7a0f574e7e58
+DIST sqlite-autoconf-3110100.tar.gz 2359545 SHA256 533ff1d0271c2e666f01591271cef01a31648563affa0c95e80ef735077d4377 SHA512 c3efd2693e6a9526a2901d9879982a421e81e7e979aef65a160e71b255339344079a1943395480d5c37a1acc6243a8d45f45fa688f7e996774da38a3a99e71a1 WHIRLPOOL b8062e2030dffd8b44cc0eba32c93312b8ae20064004c460321a4251806037fe62ec5ef83499e491cb248786b9302f0495de0c0624128d0063cbff71b77b8864
+DIST sqlite-autoconf-3120000.tar.gz 2374101 SHA256 53ecdbb5287af673eca3710c5f6c2305e73bb2d034f2a28770bea2be92ed269e SHA512 84a9107ca9045ddc724d7e37dfe2b1dc00a106769260c7bd429a95beedc46a906985b65e0b2bf597de23dd56d132b9ef6888a8c4e5f8a731c8a5c026b971d89e WHIRLPOOL 4ec76b383670f2ee9c50870587696a3c86357161344851b487f54a03c668dac8c4272738b44e5a4048dd00bf2b3122904c53b6d2195f9b48aef3ad928f34b85b
+DIST sqlite-autoconf-3120100.tar.gz 2374576 SHA256 1c038519862b3983b0475f3ed3143ce4bbfcd21bfbd0741192f415838c831a7c SHA512 eb0b892bb6a1783df9b712d5f78c9f5fb5aa8ff1b1735fd2806e96b1c04e2a5f87b2e47469185195611a5cf6c446ec32935e9ae0b01734383a8fefc1bcaf5842 WHIRLPOOL 0284241a3fd6dbee16ba5fe4c1a0dc15b1b3134bd39ba8a2219c2da4e426e3572809459bbdc8bbf3fa4ea055406b85c547d8e7f05afcb57baa712653ce0d6f64
+DIST sqlite-autoconf-3120200.tar.gz 2374804 SHA256 fd00770c9afd39db555c78400e52f55e8bd6568c78be23561abb472a22d09abb SHA512 e56b8d5b8fb41d27437659db669259198663c266c0b3faf44ba9b130441550fb79bd040e6488f56280b33230d9cf4e51c7906f968ffdd36206354bfabc4b6eb4 WHIRLPOOL bd1231f0cce91281c9e42338ae698a06446078d2070f4f16b5472ed4004dbf1913339a3f0e5a34d87d0e71390a130c347f3c97353967530b65b23e1492664b7e
+DIST sqlite-autoconf-3130000.tar.gz 2459805 SHA256 e2797026b3310c9d08bd472f6d430058c6dd139ff9d4e30289884ccd9744086b SHA512 c2547ff9a144c46829344058b4f8dcc5b8c9c823cbc667be2944dc7beecb9cc213858cc9ce302a763200278397d9a0fc6bb35c542028a124ef0980fedd574c2f WHIRLPOOL b9bcfb2eecf30719f7a673d569949b4e497c9682de08ca6f0ccc6c67a8f1541a51e88108bebde94a14802516b114c9f8cad83fbdbb130774b3082a8107657255
+DIST sqlite-doc-3110100.zip 5386958 SHA256 3f127c51c7936d13de96255b00a6be3862693ff025f61a1d3d17d3d57ee295d0 SHA512 b8fe71a852ce2fa3d7da27c09e3a1e8d019a9c55eb7e5516425754148f8d8a6cc88571d006768d5fd5b2c72aa513544bfc0ce4208f376099f8f08b7fee480d06 WHIRLPOOL 8cf7b3495ff184622dbf2842931d6b77061dc166c9d66e6bb6e400525c59ccc5b689b22cea45dad0fa7a7117692a1c16fea46aa4789084ce8c4de3655e973812
+DIST sqlite-doc-3120000.zip 5402611 SHA256 346d9d56a0193d9396948192b7eca9e45c2adfeea6bbf71df62502830da510f3 SHA512 7879d006e528d692ea5718f27d03e2dfe2a5e54aa135be983b992836102720df4dc690d84795115a25ed19a663e895a3f3f8a59d0de079c451d215e07081281e WHIRLPOOL 00f5bc4b82af1ba8d43ae4d0761dacd2e608009812a12fee9aedd333baec9b36f74542c60de4acacd19f5ef898d3bd57dfb705f3b21219ba3862ca91c2f76402
+DIST sqlite-doc-3120100.zip 5410493 SHA256 dbe53c076922c711a467dde57432583fbf9a12eac57cb75f6116a310880eb088 SHA512 d0117618d97744255248b9160816203147ba2afdb0bea5fe02d5e464541e09bc9147189317c6f849cc56059d6ae96e3e4b2a30cd8d0bc7b0e1ecacb573cfcdd4 WHIRLPOOL e3f054eda83301b9e4b5170bf9c56895756e4ac78a1c6256467c990fafccaeadec5f7ca54f1bf118bcb950f25db63df6c0972a138d36a10a0a9cfdf688eb207b
+DIST sqlite-doc-3120200.zip 5416790 SHA256 67c640c4b01b961016717db61e3e43c63c33248c78ce0de9f10b88ea7ce97670 SHA512 4ded937565b2d9b63ae55495d4b536bc0056e0d9aa7119ee54ddea127c42ba7de17986db7b85c172043fab1112132cbc126a102b248770fca6cde9a8fda438ae WHIRLPOOL 7eefecb6d0450c85ec3f30cdeb853117f4067e1bace7d3c0524e5c6cb13d2e31772211aec8562f972491da413d9bd79022bc29c16968b086562e7f17bff984eb
+DIST sqlite-doc-3130000.zip 5550186 SHA256 510606a9cdd89814b2d44e7b7f284ebb0a58153e1800de6daadfab445190f79c SHA512 0bf4544a07bd92533bc248dc16ed43c4fcad870ab535591618d3006f38c2741a8c0ed1da082444ea1af2f57936575c678bc12b651252426b908660023b36cd39 WHIRLPOOL 78fd5de701224e39d07fbb03a9193dff45237845b215d83f27a623f289d9da0df7082d53115e90474856b775d350ee3f9d2970ca2c1a4a33b24543de06fd3b9a
+DIST sqlite-src-3110100.zip 9294249 SHA256 ade6aa93fd1d52dec0d8712f9ba4df59ecc6ec442f32ef28631c3b9341aadf97 SHA512 350c3019922a6adc1b7372f5e27c810a08f4bf576ea4e07d46bc59e1939a919d1bda1a29581f4df258f577202d79253292f719ca56ba30d1e7a1a2d801b65a48 WHIRLPOOL 3f7cc7baa7c59930e2e676d859478a68fddd392ccc4747630aa68c3909eb0b633d6031e9a998c1a741054594935dd52b3143ce05b574ff1b14f20f6ededc0a6e
+DIST sqlite-src-3120000.zip 9367749 SHA256 d891e7ffd56cd97d069a6ed99d7e85cbe655b0a97ca6b5398c7806e888642df1 SHA512 9669e33e328b826f4692725ec09e21d85f4f2c386c624a81b0535f41ca7d2f996ebf5018db8ecdfdac18cff39a881a953111801499705dfb599f00e3bb5d10e4 WHIRLPOOL 865aaecbe331ec93b1a8c5b965c3edc43d35994c2db79d336febb27860ee91d68753d3ea274b4639f3e05d3f0a589fb21aedac33bc2120a4de8d094383d7b923
+DIST sqlite-src-3120100.zip 9368459 SHA256 49b9819683f8f7329a78d2008e3f7c4e02126b556b95e5dfe3be102b9e741cff SHA512 6d0d7230343ca460215b5764d4a546631ddc2bcfc0777051379fb4632ccf9c36a53d26eda6811823156be166643c001c994a0f52498c6196ed13b34e931d55e1 WHIRLPOOL e41fd7a1ba870efb5421657975990c1d7e1ecc27023882771474a62e82b2ae305bc3d0b8556e0627de886d35e1b375fec223b3f70582d64fc5345c525b293131
+DIST sqlite-src-3120200.zip 9370396 SHA256 2c16caa653e57f3c71873aa88797c97117981d6b0974254ce24d933dd27f9a86 SHA512 6cc9718c23ca3f65a42cc715eb67c8d174ecf0e397457efb6bfc5bd2efc9a51ea2f84266d31826068bf46efc550eb277b3c8e93cb85c5d23645e8b8ae4e2fc07 WHIRLPOOL ffdbbc384189f0d62a93ee8219051ff936b7c0c2fd39449f6ff72a734ab219f23f049648de7c0ec510a74aad85ba07ef0c8bebea4c3b83e043464744d2c039f4
+DIST sqlite-src-3130000.zip 9506412 SHA256 b46b62dc27abbde52db69d8e2a710469b9af613ba251eb98e412d4f3827f915b SHA512 4cb7531105869ff7db5c08aa8e4d303fa3d80c8c67e21d9a835a09f7dddb4c9dbba837e2030dd4af6bcdb00a305b057cbd6430e11b3f2ae5e470f27b69b6c1e6 WHIRLPOOL 901f6cd343daaa62970f8d768e3c6ccb0b1da75fb5643b27e76f60d224005a08955fde9df5b8bb63250ab27994e2428ce19e21b4a1ccabec47cd4b8df4a13657
+EBUILD sqlite-3.11.1.ebuild 7518 SHA256 de50b5c26c744cfc34ea505f429a340f365efa800370497567c73d94e1c86ff7 SHA512 f95373f37c6b85781f86480fc5214b05e309b37864a6bf1366c021b7d17b6239d3bb17ecd1b2843099646bf0f266c2bbc8c917ab7f4eb1ffd541b39a6306112b WHIRLPOOL 52336e092edb6070ed61f662ca16fdb4557a32888bd6656a68072b985e18459573f506a318afd5f329aba6320fc57436cf1476b3a7dc56a7689d4c105f2b30dc
+EBUILD sqlite-3.12.0.ebuild 6986 SHA256 11a23d8e75c03c4e3515ddb20682d384504bebbdef896dc17c1e09460b2c1528 SHA512 504211d84f97e8da2f4d53c9de8afd89955410a9c91cb0fa5dc48726b4d6b314e1a48f1b6e40f8b6ba2cdec3f517a2b5623fe01e21f417780dfa640bb80b97b1 WHIRLPOOL f1fd886f3ad3ec224283a19287e9f5dbbab4796ce19fd1d57ba0bf76b3ffb2a9228500e5a7a4b6829032142bbc29c37d6cc793a6b9021ae8f2b9b81260eb40f5
+EBUILD sqlite-3.12.1.ebuild 6992 SHA256 6f2e0de7c7bfc1673bd97a0b9a5c0526bea85e08dc8ce742b46d1e0dc44c767e SHA512 2677c1c39a10715c41e0802a5e6df356bbd66f15eeebfd862f26b203e23b472520ac06a5ec823565b57f61e27817cb856de86a7e3861525acc228954eab1c205 WHIRLPOOL afc6c37f03fa6d4d5a5e5d5c7954f37af324e6426505e7653b1fd759f6f6c747278ddeaa48e5d8b9300839267cd140ea074d5be82970ead538588773a0f34a49
+EBUILD sqlite-3.12.2.ebuild 6992 SHA256 6f2e0de7c7bfc1673bd97a0b9a5c0526bea85e08dc8ce742b46d1e0dc44c767e SHA512 2677c1c39a10715c41e0802a5e6df356bbd66f15eeebfd862f26b203e23b472520ac06a5ec823565b57f61e27817cb856de86a7e3861525acc228954eab1c205 WHIRLPOOL afc6c37f03fa6d4d5a5e5d5c7954f37af324e6426505e7653b1fd759f6f6c747278ddeaa48e5d8b9300839267cd140ea074d5be82970ead538588773a0f34a49
+EBUILD sqlite-3.13.0.ebuild 7145 SHA256 e06db96b44d4622e92145f3d0e45a6c7aa41a9eab0c005a56ce11ca25a451b44 SHA512 420723f7fa7676f2b5f72968b75b27cc9fb88879a999ef4e4f4986b473a54477ae5d25859863d4a0682d20b6f219b903ded98ae38039fd9409d8f9b506b7cd2e WHIRLPOOL e727c4325f6e34fe096f3064a9f62a4362a2bad909a7ee0ab5e02735797b7a80772aa0b1e66d58413d993b951d66909b50c5234c523a41d8cacb90af1bc0e761
+MISC ChangeLog 10282 SHA256 54f018e6b56f9b11f23c362a1c94c1ea3dba338ce10f4a771526c6600d67f05f SHA512 88736ab0a9b46ca8d8593e72769267d4ca1454f5b502be243d9e9862c07d8d303891c173fddc61712e9a4ec825fb6fc77b67be8cf4829a540f3ea77a32eea478 WHIRLPOOL 684ac1be5f7af9f917640edada5a366f1591c47a867d3c18170f4e4585bdd11e31a84c3611310bc4e71c28df63128041169e673ec117ff64e92a213877eede68
+MISC ChangeLog-2015 77763 SHA256 c33481b0e8ff18658a72ce845ef033f46d7e2e47fd368f276485936b8249e366 SHA512 ae9ede8a42eb81bdbfd39c201aaed8a295c2eb61999d7961aed59f1d439241b57ffff0548b11317abdf2342a2e35daeb8ba98dea3fbd1904653192c3e2b3c86c WHIRLPOOL 892423e0771ee903650e396b9eb63ca76abe782ce5d3f2e1f993d0c65f3ee1b23e38a743557e09f7d11c6466ffe7c8bf7fb4a372ed58e33c1397d9c9b24f1783
+MISC metadata.xml 745 SHA256 0430582d0c0d1d5687f3e488e11f0b0c60f91fa51196df62c5ccd4a57b79912b SHA512 06ed7007e3ded9f29fadc70c583e9795a8ab5c27578159bb060b39c0cf7de6b4bca06ff0ceeab6710c50db96a44c976c52af2352ee7928211a46d5eca071b849 WHIRLPOOL 7c9f0a1ab683d8c10a5eccebdd88f1f470c72ae4b547fc0a465da4cd6c640d0b8658d9767dfd6e16bdfbb54219edc584b0c7e80ed6b4e963032b7aaeeab672d5
--- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/maketcllib.sh
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/maketcllib.sh
@ -1,40 +0,0 @@
-#!/bin/bash
-#
-# This script was adapted from the one used by Hwaci to build it's 
-# documentation and binaries for shipping to their website. 
-#
-# Any similarity to the original has probably been trampled into
-# oblivion modifying everything for Gentoo.
-#
-echo "Starting TCL Build"
-
-# Set srcdir to the name of the directory that contains the publish.sh
-# script.
-#
-srcdir=`echo "$0" | sed 's%\(^.*\)/[^/][^/]*$%\1%'`
-
-#
-# Build the tclsqlite.so shared library for import into tclsh or wish
-# under Linux
-#
-make target_source
-source /etc/make.conf
-cd tsrc
-rm shell.c
-
-OPTS='-DUSE_TCL_STUBS=1 -DNDEBUG=1'
-TCLSTUBLIB=${TCL_BUILD_STUB_LIB_PATH}
-
-export CFLAGS
-gcc -fPIC $CFLAGS $OPTS -I. -shared *.c $TCLSTUBLIB -o tclsqlite.so
-
-strip tclsqlite.so
-cp tclsqlite.so ..
-
-cd ..
-
-echo "pkg_mkIndex [pwd] tclsqlite.so" >> make_pkgIndex.tcl
-tclsh make_pkgIndex.tcl
-
-echo "Done TCL Build"
-
--- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-2.8.15-alignement-fix.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-2.8.15-alignement-fix.patch
@ -1,12 +0,0 @@
-diff -uNr sqlite.orig/src/vdbeInt.h sqlite/src/vdbeInt.h
--- sqlite.orig/src/vdbeInt.h	2004-10-16 01:33:02.779442000 +0200
-+++ sqlite/src/vdbeInt.h	2004-10-16 01:35:01.139442000 +0200
-@@ -115,7 +115,7 @@
-   int flags;          /* Some combination of MEM_Null, MEM_Str, MEM_Dyn, etc. */
-   double r;           /* Real value */
-   char *z;            /* String value */
-  char zShort[NBFS];  /* Space for short strings */
-+  char zShort[NBFS] __attribute__ ((__aligned__(16))); /* Space for short strings */
- };
- typedef struct Mem Mem;
- 
--- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-2.8.16-exit.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-2.8.16-exit.patch
@ -1,12 +0,0 @@
-temp.c:4:1: warning: incompatible implicit declaration of built-in function ‘exit’
-
--- Makefile.in
-+++ Makefile.in
-@@ -269,6 +269,7 @@
- #
- config.h:	
- 	echo '#include <stdio.h>' >temp.c
-+	echo '#include <stdlib.h>' >>temp.c
- 	echo 'int main(){printf(' >>temp.c
- 	echo '"#define SQLITE_PTR_SZ %d",sizeof(char*));' >>temp.c
- 	echo 'exit(0);}' >>temp.c
--- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-2.8.16-multilib.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-2.8.16-multilib.patch
@ -1,108 +0,0 @@
-diff -Naurp sqlite-2.8.16.orig/Makefile.in sqlite-2.8.16/Makefile.in
--- sqlite-2.8.16.orig/Makefile.in	2005-02-14 00:22:04.000000000 +0000
-+++ sqlite-2.8.16/Makefile.in	2005-02-17 18:22:50.174537727 +0000
-@@ -187,12 +187,12 @@ last_change:	$(SRC)
-           | awk '{print $$5,$$6}' >last_change
- 
- libsqlite.la:	$(LIBOBJ)
-	$(LTLINK) -o libsqlite.la $(LIBOBJ) ${RELEASE} -rpath @exec_prefix@/lib \
-+	$(LTLINK) -o libsqlite.la $(LIBOBJ) ${RELEASE} -rpath @libdir@ \
- 		-version-info "8:6:8"
- 
- libtclsqlite.la:	tclsqlite.lo libsqlite.la
- 	$(LTLINK) -o libtclsqlite.la tclsqlite.lo \
-		libsqlite.la $(LIBTCL) -rpath @exec_prefix@/lib/sqlite \
-+		libsqlite.la $(LIBTCL) -rpath @libdir@/sqlite \
- 		-version-info "8:6:8"
- 
- sqlite@TARGET_EXEEXT@:	$(TOP)/src/shell.c libsqlite.la sqlite.h
-@@ -465,14 +465,14 @@ doc:	$(DOC)
- 	mv $(DOC) doc
- 
- install:	sqlite libsqlite.la sqlite.h
-	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib
-	$(LTINSTALL) libsqlite.la $(DESTDIR)$(exec_prefix)/lib
-+	$(INSTALL) -d $(DESTDIR)@libdir@
-+	$(LTINSTALL) libsqlite.la $(DESTDIR)@libdir@
- 	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/bin
- 	$(LTINSTALL) sqlite $(DESTDIR)$(exec_prefix)/bin
- 	$(INSTALL) -d $(DESTDIR)$(prefix)/include
- 	$(INSTALL) -m 0644 sqlite.h $(DESTDIR)$(prefix)/include
-	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib/pkgconfig; 
-	$(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(exec_prefix)/lib/pkgconfig; 
-+	$(INSTALL) -d $(DESTDIR)@libdir@/pkgconfig; 
-+	$(INSTALL) -m 0644 sqlite.pc $(DESTDIR)@libdir@/pkgconfig; 
- 
- clean:	
- 	rm -f *.lo *.la *.o sqlite@TARGET_EXEEXT@ libsqlite.la sqlite.h opcodes.*
-diff -Naurp sqlite-2.8.16.orig/Makefile.linux-gcc sqlite-2.8.16/Makefile.linux-gcc
--- sqlite-2.8.16.orig/Makefile.linux-gcc	2005-02-14 00:22:04.000000000 +0000
-+++ sqlite-2.8.16/Makefile.linux-gcc	2005-02-17 18:21:47.654969648 +0000
-@@ -14,7 +14,7 @@
- #### The toplevel directory of the source tree.  This is the directory
- #    that contains this "Makefile.in" and the "configure.in" script.
- #
-TOP = ../sqlite
-+TOP = @@S@@
- 
- #### C Compiler and options for use in building executables that
- #    will run on the platform that is doing the build.
-@@ -38,8 +38,8 @@ THREADSAFE = -DTHREADSAFE=0
- #### Specify any extra linker options needed to make the library
- #    thread safe
- #
-#THREADLIB = -lpthread
-THREADLIB = 
-+THREADLIB = -lpthread
-+#THREADLIB = 
- 
- #### Leave MEMORY_DEBUG undefined for maximum speed.  Use MEMORY_DEBUG=1
- #    to check for memory leaks.  Use MEMORY_DEBUG=2 to print a log of all
-@@ -64,7 +64,7 @@ EXE =
- #    will run on the target platform.  This is usually the same
- #    as BCC, unless you are cross-compiling.
- #
-TCC = gcc -O6
-+TCC = @@CC@@ @@CFLAGS@@
- #TCC = gcc -g -O0 -Wall
- #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage
- #TCC = /opt/mingw/bin/i386-mingw32-gcc -O6
-@@ -72,23 +72,23 @@ TCC = gcc -O6
- 
- #### Tools used to build a static library.
- #
-AR = ar cr
-+AR = @@AR@@ cr
- #AR = /opt/mingw/bin/i386-mingw32-ar cr
-RANLIB = ranlib
-+RANLIB = @@RANLIB@@
- #RANLIB = /opt/mingw/bin/i386-mingw32-ranlib
- 
- #### Extra compiler options needed for programs that use the TCL library.
- #
-#TCL_FLAGS =
-+#TCL_FLAGS = @@TCL_FLAGS@@
- #TCL_FLAGS = -DSTATIC_BUILD=1
-TCL_FLAGS = -I/home/drh/tcltk/8.4linux
-+#TCL_FLAGS = -I/home/drh/tcltk/8.4linux
- #TCL_FLAGS = -I/home/drh/tcltk/8.4win -DSTATIC_BUILD=1
- #TCL_FLAGS = -I/home/drh/tcltk/8.3hpux
- 
- #### Linker options needed to link against the TCL library.
- #
-#LIBTCL = -ltcl -lm -ldl
-LIBTCL = /home/drh/tcltk/8.4linux/libtcl8.4g.a -lm -ldl
-+LIBTCL = -ltcl -lm -ldl
-+#LIBTCL = /home/drh/tcltk/8.4linux/libtcl8.4g.a -lm -ldl
- #LIBTCL = /home/drh/tcltk/8.4win/libtcl84s.a -lmsvcrt
- #LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc
- 
-@@ -100,7 +100,7 @@ READLINE_FLAGS = -DHAVE_READLINE=1 -I/us
- #### Linker options needed by programs using readline() must link against.
- #
- #LIBREADLINE =
-LIBREADLINE = -static -lreadline -ltermcap
-+LIBREADLINE = -static -lreadline -lncurses
- 
- #### Should the database engine assume text is coded as UTF-8 or iso8859?
- #
--- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.11.0-full_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.11.0-full_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch
@ -0,0 +1,443 @@
+https://www.sqlite.org/cgi/src/info/374b5108087a2eae
+
+--- ext/fts3/fts3_tokenizer.c
+++ ext/fts3/fts3_tokenizer.c
+@@ -30,6 +30,18 @@
+ #include <string.h>
+ 
+ /*
+** Return true if the two-argument version of fts3_tokenizer()
+** has been activated via a prior call to sqlite3_db_config(db,
+** SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, 0);
+*/
+static int fts3TokenizerEnabled(sqlite3_context *context){
+  sqlite3 *db = sqlite3_context_db_handle(context);
+  int isEnabled = 0;
+  sqlite3_db_config(db,SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER,-1,&isEnabled);
+  return isEnabled;
+}
+
+/*
+ ** Implementation of the SQL scalar function for accessing the underlying 
+ ** hash table. This function may be called as follows:
+ **
+@@ -49,7 +61,7 @@
+ ** is a blob containing the pointer stored as the hash data corresponding
+ ** to string <key-name> (after the hash-table is updated, if applicable).
+ */
+-static void scalarFunc(
+static void fts3TokenizerFunc(
+   sqlite3_context *context,
+   int argc,
+   sqlite3_value **argv
+@@ -67,27 +79,23 @@
+   nName = sqlite3_value_bytes(argv[0])+1;
+ 
+   if( argc==2 ){
+-#ifdef SQLITE_ENABLE_FTS3_TOKENIZER
+-    void *pOld;
+-    int n = sqlite3_value_bytes(argv[1]);
+-    if( zName==0 || n!=sizeof(pPtr) ){
+-      sqlite3_result_error(context, "argument type mismatch", -1);
+-      return;
+-    }
+-    pPtr = *(void **)sqlite3_value_blob(argv[1]);
+-    pOld = sqlite3Fts3HashInsert(pHash, (void *)zName, nName, pPtr);
+-    if( pOld==pPtr ){
+-      sqlite3_result_error(context, "out of memory", -1);
+    if( fts3TokenizerEnabled(context) ){
+      void *pOld;
+      int n = sqlite3_value_bytes(argv[1]);
+      if( zName==0 || n!=sizeof(pPtr) ){
+        sqlite3_result_error(context, "argument type mismatch", -1);
+        return;
+      }
+      pPtr = *(void **)sqlite3_value_blob(argv[1]);
+      pOld = sqlite3Fts3HashInsert(pHash, (void *)zName, nName, pPtr);
+      if( pOld==pPtr ){
+        sqlite3_result_error(context, "out of memory", -1);
+      }
+    }else{
+      sqlite3_result_error(context, "fts3tokenize disabled", -1);
+       return;
+     }
+-#else
+-    sqlite3_result_error(context, "fts3tokenize: " 
+-        "disabled - rebuild with -DSQLITE_ENABLE_FTS3_TOKENIZER", -1
+-    );
+-    return;
+-#endif /* SQLITE_ENABLE_FTS3_TOKENIZER */
+-  }else
+-  {
+  }else{
+     if( zName ){
+       pPtr = sqlite3Fts3HashFind(pHash, zName, nName);
+     }
+@@ -98,7 +106,6 @@
+       return;
+     }
+   }
+-
+   sqlite3_result_blob(context, (void *)&pPtr, sizeof(pPtr), SQLITE_TRANSIENT);
+ }
+ 
+@@ -336,7 +343,6 @@
+   Tcl_DecrRefCount(pRet);
+ }
+ 
+-#ifdef SQLITE_ENABLE_FTS3_TOKENIZER
+ static
+ int registerTokenizer(
+   sqlite3 *db, 
+@@ -358,7 +364,6 @@
+ 
+   return sqlite3_finalize(pStmt);
+ }
+-#endif /* SQLITE_ENABLE_FTS3_TOKENIZER */
+ 
+ 
+ static
+@@ -431,13 +436,13 @@
+   assert( 0==strcmp(sqlite3_errmsg(db), "unknown tokenizer: nosuchtokenizer") );
+ 
+   /* Test the storage function */
+-#ifdef SQLITE_ENABLE_FTS3_TOKENIZER
+-  rc = registerTokenizer(db, "nosuchtokenizer", p1);
+-  assert( rc==SQLITE_OK );
+-  rc = queryTokenizer(db, "nosuchtokenizer", &p2);
+-  assert( rc==SQLITE_OK );
+-  assert( p2==p1 );
+-#endif
+  if( fts3TokenizerEnabled(context) ){
+    rc = registerTokenizer(db, "nosuchtokenizer", p1);
+    assert( rc==SQLITE_OK );
+    rc = queryTokenizer(db, "nosuchtokenizer", &p2);
+    assert( rc==SQLITE_OK );
+    assert( p2==p1 );
+  }
+ 
+   sqlite3_result_text(context, "ok", -1, SQLITE_STATIC);
+ }
+@@ -453,7 +458,7 @@
+ **    sqlite3Fts3HashInit(pHash, FTS3_HASH_STRING, 1);
+ **
+ ** This function adds a scalar function (see header comment above
+-** scalarFunc() in this file for details) and, if ENABLE_TABLE is
+** fts3TokenizerFunc() in this file for details) and, if ENABLE_TABLE is
+ ** defined at compilation time, a temporary virtual table (see header 
+ ** comment above struct HashTableVtab) to the database schema. Both 
+ ** provide read/write access to the contents of *pHash.
+@@ -482,10 +487,10 @@
+ #endif
+ 
+   if( SQLITE_OK==rc ){
+-    rc = sqlite3_create_function(db, zName, 1, any, p, scalarFunc, 0, 0);
+    rc = sqlite3_create_function(db, zName, 1, any, p, fts3TokenizerFunc, 0, 0);
+   }
+   if( SQLITE_OK==rc ){
+-    rc = sqlite3_create_function(db, zName, 2, any, p, scalarFunc, 0, 0);
+    rc = sqlite3_create_function(db, zName, 2, any, p, fts3TokenizerFunc, 0, 0);
+   }
+ #ifdef SQLITE_TEST
+   if( SQLITE_OK==rc ){
+--- src/main.c
+++ src/main.c
+@@ -797,8 +797,9 @@
+         int op;      /* The opcode */
+         u32 mask;    /* Mask of the bit in sqlite3.flags to set/clear */
+       } aFlagOp[] = {
+-        { SQLITE_DBCONFIG_ENABLE_FKEY,    SQLITE_ForeignKeys    },
+-        { SQLITE_DBCONFIG_ENABLE_TRIGGER, SQLITE_EnableTrigger  },
+        { SQLITE_DBCONFIG_ENABLE_FKEY,           SQLITE_ForeignKeys    },
+        { SQLITE_DBCONFIG_ENABLE_TRIGGER,        SQLITE_EnableTrigger  },
+        { SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, SQLITE_Fts3Tokenizer  },
+       };
+       unsigned int i;
+       rc = SQLITE_ERROR; /* IMP: R-42790-23372 */
+@@ -2815,6 +2816,9 @@
+ #if defined(SQLITE_ENABLE_OVERSIZE_CELL_CHECK)
+                  | SQLITE_CellSizeCk
+ #endif
+#if defined(SQLITE_ENABLE_FTS3_TOKENIZER)
+                 | SQLITE_Fts3Tokenizer
+#endif
+       ;
+   sqlite3HashInit(&db->aCollSeq);
+ #ifndef SQLITE_OMIT_VIRTUALTABLE
+--- src/sqlite.h.in
+++ src/sqlite.h.in
+@@ -1904,11 +1904,25 @@
+ ** following this call.  The second parameter may be a NULL pointer, in
+ ** which case the trigger setting is not reported back. </dd>
+ **
+** <dt>SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER</dt>
+** <dd> ^This option is used to enable or disable the two-argument
+** version of the [fts3_tokenizer()] function which is part of the
+** [FTS3] full-text search engine extension.
+** There should be two additional arguments.
+** The first argument is an integer which is 0 to disable fts3_tokenizer() or
+** positive to enable fts3_tokenizer() or negative to leave the setting
+** unchanged.
+** The second parameter is a pointer to an integer into which
+** is written 0 or 1 to indicate whether fts3_tokenizer is disabled or enabled
+** following this call.  The second parameter may be a NULL pointer, in
+** which case the new setting is not reported back. </dd>
+**
+ ** </dl>
+ */
+-#define SQLITE_DBCONFIG_LOOKASIDE       1001  /* void* int int */
+-#define SQLITE_DBCONFIG_ENABLE_FKEY     1002  /* int int* */
+-#define SQLITE_DBCONFIG_ENABLE_TRIGGER  1003  /* int int* */
+#define SQLITE_DBCONFIG_LOOKASIDE             1001 /* void* int int */
+#define SQLITE_DBCONFIG_ENABLE_FKEY           1002 /* int int* */
+#define SQLITE_DBCONFIG_ENABLE_TRIGGER        1003 /* int int* */
+#define SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1004 /* int int* */
+ 
+ 
+ /*
+--- src/sqliteInt.h
+++ src/sqliteInt.h
+@@ -1317,6 +1317,7 @@
+ #define SQLITE_VdbeEQP        0x04000000  /* Debug EXPLAIN QUERY PLAN */
+ #define SQLITE_Vacuum         0x08000000  /* Currently in a VACUUM */
+ #define SQLITE_CellSizeCk     0x10000000  /* Check btree cell sizes on load */
+#define SQLITE_Fts3Tokenizer  0x20000000  /* Enable fts3_tokenizer(2) */
+ 
+ 
+ /*
+--- src/test1.c
+++ src/test1.c
+@@ -6921,6 +6921,53 @@
+ }
+ 
+ /*
+** tclcmd:   sqlite3_db_config DB SETTING VALUE
+**
+** Invoke sqlite3_db_config() for one of the setting values.
+*/
+static int test_sqlite3_db_config(
+  void *clientData,
+  Tcl_Interp *interp,
+  int objc,
+  Tcl_Obj *CONST objv[]
+){
+  static const struct {
+    const char *zName;
+    int eVal;
+  } aSetting[] = {
+    { "FKEY",            SQLITE_DBCONFIG_ENABLE_FKEY },
+    { "TRIGGER",         SQLITE_DBCONFIG_ENABLE_TRIGGER },
+    { "FTS3_TOKENIZER",  SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER },
+  };
+  int i;
+  int v;
+  const char *zSetting;
+  sqlite3 *db;
+
+  if( objc!=4 ){
+    Tcl_WrongNumArgs(interp, 1, objv, "DB SETTING VALUE");
+    return TCL_ERROR;
+  }
+  if( getDbPointer(interp, Tcl_GetString(objv[1]), &db) ) return TCL_ERROR;
+  zSetting = Tcl_GetString(objv[2]);
+  if( sqlite3_strglob("SQLITE_*", zSetting)==0 ) zSetting += 7;
+  if( sqlite3_strglob("DBCONFIG_*", zSetting)==0 ) zSetting += 9;
+  if( sqlite3_strglob("ENABLE_*", zSetting)==0 ) zSetting += 7;
+  for(i=0; i<ArraySize(aSetting); i++){
+    if( strcmp(zSetting, aSetting[i].zName)==0 ) break;
+  }
+  if( i>=ArraySize(aSetting) ){
+    Tcl_SetObjResult(interp,
+      Tcl_NewStringObj("unknown sqlite3_db_config setting", -1));
+    return TCL_ERROR;
+  }
+  if( Tcl_GetIntFromObj(interp, objv[3], &v) ) return TCL_ERROR;
+  sqlite3_db_config(db, aSetting[i].eVal, v, &v);
+  Tcl_SetObjResult(interp, Tcl_NewIntObj(v));
+  return TCL_OK;
+}
+
+/*
+ ** Register commands with the TCL interpreter.
+ */
+ int Sqlitetest1_Init(Tcl_Interp *interp){
+@@ -6989,6 +7036,7 @@
+      Tcl_ObjCmdProc *xProc;
+      void *clientData;
+   } aObjCmd[] = {
+     { "sqlite3_db_config",             test_sqlite3_db_config, 0 },
+      { "bad_behavior",                  test_bad_behavior,  (void*)&iZero },
+      { "register_dbstat_vtab",          test_register_dbstat_vtab  },
+      { "sqlite3_connection_pointer",    get_sqlite_pointer, 0 },
+--- src/test_config.c
+++ src/test_config.c
+@@ -370,12 +370,6 @@
+   Tcl_SetVar2(interp, "sqlite_options", "fts3", "0", TCL_GLOBAL_ONLY);
+ #endif
+ 
+-#ifdef SQLITE_ENABLE_FTS3_TOKENIZER
+-  Tcl_SetVar2(interp, "sqlite_options", "fts3_tokenizer", "1", TCL_GLOBAL_ONLY);
+-#else
+-  Tcl_SetVar2(interp, "sqlite_options", "fts3_tokenizer", "0", TCL_GLOBAL_ONLY);
+-#endif
+-
+ #ifdef SQLITE_ENABLE_FTS5
+   Tcl_SetVar2(interp, "sqlite_options", "fts5", "1", TCL_GLOBAL_ONLY);
+ #else
+--- test/fts3atoken.test
+++ test/fts3atoken.test
+@@ -56,40 +56,41 @@
+ #
+ #   5: Test that the table created to use tokenizer 'blah' is usable.
+ #
+-ifcapable fts3_tokenizer {
+-  do_test fts3atoken-1.1 {
+-    catchsql {
+-      CREATE VIRTUAL TABLE t1 USING fts3(content, tokenize blah);
+-    }
+-  } {1 {unknown tokenizer: blah}}
+-  do_test fts3atoken-1.2 {
+-    execsql {
+-      SELECT fts3_tokenizer('blah', fts3_tokenizer('simple')) IS NULL;
+-    }
+-  } {0}
+-  do_test fts3atoken-1.3 {
+-    execsql {
+-      SELECT fts3_tokenizer('blah') == fts3_tokenizer('simple');
+-    }
+-  } {1}
+-  do_test fts3atoken-1.4 {
+-    catchsql {
+-      CREATE VIRTUAL TABLE t1 USING fts3(content, tokenize blah);
+-    }
+-  } {0 {}}
+-  do_test fts3atoken-1.5 {
+-    execsql {
+-      INSERT INTO t1(content) VALUES('There was movement at the station');
+-      INSERT INTO t1(content) VALUES('For the word has passed around');
+-      INSERT INTO t1(content) VALUES('That the colt from ol regret had got');
+-      SELECT content FROM t1 WHERE content MATCH 'movement'
+-    }
+-  } {{There was movement at the station}}
+-} else {
+-  do_catchsql_test 1.6 {
+sqlite3_db_config db SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1
+do_test fts3atoken-1.1 {
+  catchsql {
+    CREATE VIRTUAL TABLE t1 USING fts3(content, tokenize blah);
+  }
+} {1 {unknown tokenizer: blah}}
+do_test fts3atoken-1.2 {
+  execsql {
+     SELECT fts3_tokenizer('blah', fts3_tokenizer('simple')) IS NULL;
+-  } {1 {fts3tokenize: disabled - rebuild with -DSQLITE_ENABLE_FTS3_TOKENIZER}}
+-}
+  }
+} {0}
+do_test fts3atoken-1.3 {
+  execsql {
+    SELECT fts3_tokenizer('blah') == fts3_tokenizer('simple');
+  }
+} {1}
+do_test fts3atoken-1.4 {
+  catchsql {
+    CREATE VIRTUAL TABLE t1 USING fts3(content, tokenize blah);
+  }
+} {0 {}}
+do_test fts3atoken-1.5 {
+  execsql {
+    INSERT INTO t1(content) VALUES('There was movement at the station');
+    INSERT INTO t1(content) VALUES('For the word has passed around');
+    INSERT INTO t1(content) VALUES('That the colt from ol regret had got');
+    SELECT content FROM t1 WHERE content MATCH 'movement'
+  }
+} {{There was movement at the station}}
+
+sqlite3_db_config db SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 0
+do_catchsql_test 1.6 {
+  SELECT fts3_tokenizer('blah', fts3_tokenizer('simple')) IS NULL;
+} {1 {fts3tokenize disabled}}
+
+ 
+ #--------------------------------------------------------------------------
+ # Test cases fts3atoken-2.* test error cases in the scalar function based
+@@ -212,14 +213,14 @@
+ do_catchsql_test 6.2.1 {
+   SELECT fts3_tokenizer(NULL);
+ } {1 {unknown tokenizer: }}
+-ifcapable fts3_tokenizer {
+-  do_catchsql_test 6.2.2 {
+-    SELECT fts3_tokenizer(NULL, X'1234567812345678');
+-  } {1 {argument type mismatch}}
+-  do_catchsql_test 6.2.3 {
+-    SELECT fts3_tokenizer(NULL, X'12345678');
+-  } {1 {argument type mismatch}}
+-}
+
+sqlite3_db_config db SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1
+do_catchsql_test 6.2.2 {
+  SELECT fts3_tokenizer(NULL, X'1234567812345678');
+} {1 {argument type mismatch}}
+do_catchsql_test 6.2.3 {
+  SELECT fts3_tokenizer(NULL, X'12345678');
+} {1 {argument type mismatch}}
+ 
+ 
+ finish_test
+--- test/fts4langid.test
+++ test/fts4langid.test
+@@ -358,31 +358,30 @@
+   }
+ }
+ 
+-ifcapable fts3_tokenizer {
+-  do_test 4.1.0 {
+-    reset_db
+-    set ptr [fts3_test_tokenizer]
+-    execsql { SELECT fts3_tokenizer('testtokenizer', $ptr) }
+-    build_multilingual_db_2 db
+-  } {}
+-  do_execsql_test 4.1.1 {
+-    SELECT docid FROM t4 WHERE t4 MATCH 'quick';
+-  } {0}
+-  do_execsql_test 4.1.2 {
+-    SELECT docid FROM t4 WHERE t4 MATCH 'quick' AND lid=1;
+-  } {}
+-  do_execsql_test 4.1.3 {
+-    SELECT docid FROM t4 WHERE t4 MATCH 'Quick' AND lid=1;
+-  } {1}
+-  for {set i 0} {$i < 50} {incr i} {
+-    do_execsql_test 4.1.4.$i {
+-      SELECT count(*) FROM t4 WHERE t4 MATCH 'fox' AND lid=$i;
+-    } [expr 0==($i%2)]
+-  }
+-  do_catchsql_test 4.1.5 {
+-    INSERT INTO t4(content, lid) VALUES('hello world', 101)
+-  } {1 {SQL logic error or missing database}}
+do_test 4.1.0 {
+  reset_db
+  set ptr [fts3_test_tokenizer]
+  sqlite3_db_config db SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1
+  execsql { SELECT fts3_tokenizer('testtokenizer', $ptr) }
+  build_multilingual_db_2 db
+} {}
+do_execsql_test 4.1.1 {
+  SELECT docid FROM t4 WHERE t4 MATCH 'quick';
+} {0}
+do_execsql_test 4.1.2 {
+  SELECT docid FROM t4 WHERE t4 MATCH 'quick' AND lid=1;
+} {}
+do_execsql_test 4.1.3 {
+  SELECT docid FROM t4 WHERE t4 MATCH 'Quick' AND lid=1;
+} {1}
+for {set i 0} {$i < 50} {incr i} {
+  do_execsql_test 4.1.4.$i {
+    SELECT count(*) FROM t4 WHERE t4 MATCH 'fox' AND lid=$i;
+  } [expr 0==($i%2)]
+ }
+do_catchsql_test 4.1.5 {
+  INSERT INTO t4(content, lid) VALUES('hello world', 101)
+} {1 {SQL logic error or missing database}}
+ 
+ #-------------------------------------------------------------------------
+ # Test cases 5.*
--- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.11.0-full_tarball-build.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.11.0-full_tarball-build.patch
@ -0,0 +1,132 @@
+Link executables against libsqlite3.so.
+Increase timeout for fuzzcheck.
+Fix building with dlopen() not available.
+
+--- Makefile.in
+++ Makefile.in
+@@ -550,7 +550,7 @@
+ # Extra compiler options for various shell tools
+ #
+ SHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4
+-SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_DBSTAT_VTAB
+ FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1
+ FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5
+ 
+@@ -571,18 +571,18 @@
+ 
+ libtclsqlite3.la:	tclsqlite.lo libsqlite3.la
+ 	$(LTLINK) -no-undefined -o $@ tclsqlite.lo \
+-		libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
+		libsqlite3.la @TCL_STUB_LIB_SPEC@ \
+ 		-rpath "$(TCLLIBDIR)" \
+ 		-version-info "8:6:8" \
+ 		-avoid-version
+ 
+-sqlite3$(TEXE):	$(TOP)/src/shell.c sqlite3.c
+-	$(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
+-		$(TOP)/src/shell.c sqlite3.c \
+-		$(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
+sqlite3$(TEXE):	$(TOP)/src/shell.c libsqlite3.la
+	$(LTLINK) $(READLINE_FLAGS) -o $@ \
+		$(TOP)/src/shell.c libsqlite3.la \
+		$(LIBREADLINE)
+ 
+-sqldiff$(TEXE):	$(TOP)/tool/sqldiff.c sqlite3.c sqlite3.h
+-	$(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.c $(TLIBS)
+sqldiff$(TEXE):	$(TOP)/tool/sqldiff.c libsqlite3.la
+	$(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la
+ 
+ srcck1$(BEXE):	$(TOP)/tool/srcck1.c
+ 	$(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c
+@@ -650,7 +650,7 @@
+ # Rule to build the amalgamation
+ #
+ sqlite3.lo:	sqlite3.c
+-	$(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c
+	$(LTCOMPILE) $(SHELL_OPT) $(TEMP_STORE) -c sqlite3.c
+ 
+ # Rules to build the LEMON compiler generator
+ #
+@@ -1074,13 +1074,13 @@
+ 
+ # Fuzz testing
+ fuzztest:	fuzzcheck$(TEXE) $(FUZZDATA)
+-	./fuzzcheck$(TEXE) $(FUZZDATA)
+	./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA)
+ 
+ fastfuzztest:	fuzzcheck$(TEXE) $(FUZZDATA)
+-	./fuzzcheck$(TEXE) --limit-mem 100M $(FUZZDATA)
+	./fuzzcheck$(TEXE) --limit-mem 100M --timeout 3600 $(FUZZDATA)
+ 
+ valgrindfuzz:	fuzzcheck$(TEXT) $(FUZZDATA)
+-	valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
+	valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA)
+ 
+ # Minimal testing that runs in less than 3 minutes
+ #
+@@ -1106,29 +1106,29 @@
+ smoketest:	$(TESTPROGS) fuzzcheck$(TEXE)
+ 	./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
+ 
+-sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl
+sqlite3_analyzer.c:	$(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl
+ 	echo "#define TCLSH 2" > $@
+ 	echo "#define SQLITE_ENABLE_DBSTAT_VTAB 1" >> $@
+-	cat sqlite3.c $(TOP)/src/tclsqlite.c >> $@
+	cat $(TOP)/src/tclsqlite.c >> $@
+ 	echo "static const char *tclsh_main_loop(void){" >> $@
+ 	echo "static const char *zMainloop = " >> $@
+ 	$(TCLSH_CMD) $(TOP)/tool/tostr.tcl $(TOP)/tool/spaceanal.tcl >> $@
+ 	echo "; return zMainloop; }" >> $@
+ 
+-sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
+-	$(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
+sqlite3_analyzer$(TEXE):	sqlite3_analyzer.c libsqlite3.la
+	$(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL)
+ 
+-showdb$(TEXE):	$(TOP)/tool/showdb.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS)
+showdb$(TEXE):	$(TOP)/tool/showdb.c libsqlite3.la
+	$(LTLINK) -o $@ $(TOP)/tool/showdb.c libsqlite3.la
+ 
+-showstat4$(TEXE):	$(TOP)/tool/showstat4.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS)
+showstat4$(TEXE):	$(TOP)/tool/showstat4.c libsqlite3.la
+	$(LTLINK) -o $@ $(TOP)/tool/showstat4.c libsqlite3.la
+ 
+-showjournal$(TEXE):	$(TOP)/tool/showjournal.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS)
+showjournal$(TEXE):	$(TOP)/tool/showjournal.c
+	$(LTLINK) -o $@ $(TOP)/tool/showjournal.c
+ 
+-showwal$(TEXE):	$(TOP)/tool/showwal.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS)
+showwal$(TEXE):	$(TOP)/tool/showwal.c
+	$(LTLINK) -o $@ $(TOP)/tool/showwal.c
+ 
+ rollback-test$(TEXE):	$(TOP)/tool/rollback-test.c sqlite3.lo
+ 	$(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS)
+@@ -1142,8 +1142,8 @@
+ speedtest1$(TEXE):	$(TOP)/test/speedtest1.c sqlite3.lo
+ 	$(LTLINK) -o $@ $(TOP)/test/speedtest1.c sqlite3.lo $(TLIBS)
+ 
+-rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo 
+-	$(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS)
+rbu$(EXE):	$(TOP)/ext/rbu/rbu.c libsqlite3.la
+	$(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la
+ 
+ loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
+ 	$(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)
+--- configure.ac
+++ configure.ac
+@@ -570,6 +570,9 @@
+ if test "${use_loadextension}" = "yes" ; then
+   OPT_FEATURE_FLAGS=""
+   AC_SEARCH_LIBS(dlopen, dl)
+  if test "${ac_cv_search_dlopen}" = "no" ; then
+    OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
+  fi
+ else
+   OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
+ fi
--- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.11.0-nonfull_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.11.0-nonfull_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch
@ -0,0 +1,232 @@
+https://www.sqlite.org/cgi/src/info/374b5108087a2eae
+
+--- sqlite3.c
+++ sqlite3.c
+@@ -2121,11 +2121,25 @@
+ ** following this call.  The second parameter may be a NULL pointer, in
+ ** which case the trigger setting is not reported back. </dd>
+ **
+** <dt>SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER</dt>
+** <dd> ^This option is used to enable or disable the two-argument
+** version of the [fts3_tokenizer()] function which is part of the
+** [FTS3] full-text search engine extension.
+** There should be two additional arguments.
+** The first argument is an integer which is 0 to disable fts3_tokenizer() or
+** positive to enable fts3_tokenizer() or negative to leave the setting
+** unchanged.
+** The second parameter is a pointer to an integer into which
+** is written 0 or 1 to indicate whether fts3_tokenizer is disabled or enabled
+** following this call.  The second parameter may be a NULL pointer, in
+** which case the new setting is not reported back. </dd>
+**
+ ** </dl>
+ */
+-#define SQLITE_DBCONFIG_LOOKASIDE       1001  /* void* int int */
+-#define SQLITE_DBCONFIG_ENABLE_FKEY     1002  /* int int* */
+-#define SQLITE_DBCONFIG_ENABLE_TRIGGER  1003  /* int int* */
+#define SQLITE_DBCONFIG_LOOKASIDE             1001 /* void* int int */
+#define SQLITE_DBCONFIG_ENABLE_FKEY           1002 /* int int* */
+#define SQLITE_DBCONFIG_ENABLE_TRIGGER        1003 /* int int* */
+#define SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1004 /* int int* */
+ 
+ 
+ /*
+@@ -12206,6 +12220,7 @@
+ #define SQLITE_VdbeEQP        0x04000000  /* Debug EXPLAIN QUERY PLAN */
+ #define SQLITE_Vacuum         0x08000000  /* Currently in a VACUUM */
+ #define SQLITE_CellSizeCk     0x10000000  /* Check btree cell sizes on load */
+#define SQLITE_Fts3Tokenizer  0x20000000  /* Enable fts3_tokenizer(2) */
+ 
+ 
+ /*
+@@ -133589,8 +133604,9 @@
+         int op;      /* The opcode */
+         u32 mask;    /* Mask of the bit in sqlite3.flags to set/clear */
+       } aFlagOp[] = {
+-        { SQLITE_DBCONFIG_ENABLE_FKEY,    SQLITE_ForeignKeys    },
+-        { SQLITE_DBCONFIG_ENABLE_TRIGGER, SQLITE_EnableTrigger  },
+        { SQLITE_DBCONFIG_ENABLE_FKEY,           SQLITE_ForeignKeys    },
+        { SQLITE_DBCONFIG_ENABLE_TRIGGER,        SQLITE_EnableTrigger  },
+        { SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, SQLITE_Fts3Tokenizer  },
+       };
+       unsigned int i;
+       rc = SQLITE_ERROR; /* IMP: R-42790-23372 */
+@@ -135607,6 +135623,9 @@
+ #if defined(SQLITE_ENABLE_OVERSIZE_CELL_CHECK)
+                  | SQLITE_CellSizeCk
+ #endif
+#if defined(SQLITE_ENABLE_FTS3_TOKENIZER)
+                 | SQLITE_Fts3Tokenizer
+#endif
+       ;
+   sqlite3HashInit(&db->aCollSeq);
+ #ifndef SQLITE_OMIT_VIRTUALTABLE
+@@ -146857,6 +146876,18 @@
+ /* #include <string.h> */
+ 
+ /*
+** Return true if the two-argument version of fts3_tokenizer()
+** has been activated via a prior call to sqlite3_db_config(db,
+** SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, 0);
+*/
+static int fts3TokenizerEnabled(sqlite3_context *context){
+  sqlite3 *db = sqlite3_context_db_handle(context);
+  int isEnabled = 0;
+  sqlite3_db_config(db,SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER,-1,&isEnabled);
+  return isEnabled;
+}
+
+/*
+ ** Implementation of the SQL scalar function for accessing the underlying 
+ ** hash table. This function may be called as follows:
+ **
+@@ -146876,7 +146907,7 @@
+ ** is a blob containing the pointer stored as the hash data corresponding
+ ** to string <key-name> (after the hash-table is updated, if applicable).
+ */
+-static void scalarFunc(
+static void fts3TokenizerFunc(
+   sqlite3_context *context,
+   int argc,
+   sqlite3_value **argv
+@@ -146894,27 +146925,23 @@
+   nName = sqlite3_value_bytes(argv[0])+1;
+ 
+   if( argc==2 ){
+-#ifdef SQLITE_ENABLE_FTS3_TOKENIZER
+-    void *pOld;
+-    int n = sqlite3_value_bytes(argv[1]);
+-    if( zName==0 || n!=sizeof(pPtr) ){
+-      sqlite3_result_error(context, "argument type mismatch", -1);
+-      return;
+-    }
+-    pPtr = *(void **)sqlite3_value_blob(argv[1]);
+-    pOld = sqlite3Fts3HashInsert(pHash, (void *)zName, nName, pPtr);
+-    if( pOld==pPtr ){
+-      sqlite3_result_error(context, "out of memory", -1);
+    if( fts3TokenizerEnabled(context) ){
+      void *pOld;
+      int n = sqlite3_value_bytes(argv[1]);
+      if( zName==0 || n!=sizeof(pPtr) ){
+        sqlite3_result_error(context, "argument type mismatch", -1);
+        return;
+      }
+      pPtr = *(void **)sqlite3_value_blob(argv[1]);
+      pOld = sqlite3Fts3HashInsert(pHash, (void *)zName, nName, pPtr);
+      if( pOld==pPtr ){
+        sqlite3_result_error(context, "out of memory", -1);
+      }
+    }else{
+      sqlite3_result_error(context, "fts3tokenize disabled", -1);
+       return;
+     }
+-#else
+-    sqlite3_result_error(context, "fts3tokenize: " 
+-        "disabled - rebuild with -DSQLITE_ENABLE_FTS3_TOKENIZER", -1
+-    );
+-    return;
+-#endif /* SQLITE_ENABLE_FTS3_TOKENIZER */
+-  }else
+-  {
+  }else{
+     if( zName ){
+       pPtr = sqlite3Fts3HashFind(pHash, zName, nName);
+     }
+@@ -146925,7 +146952,6 @@
+       return;
+     }
+   }
+-
+   sqlite3_result_blob(context, (void *)&pPtr, sizeof(pPtr), SQLITE_TRANSIENT);
+ }
+ 
+@@ -147163,7 +147189,6 @@
+   Tcl_DecrRefCount(pRet);
+ }
+ 
+-#ifdef SQLITE_ENABLE_FTS3_TOKENIZER
+ static
+ int registerTokenizer(
+   sqlite3 *db, 
+@@ -147185,7 +147210,6 @@
+ 
+   return sqlite3_finalize(pStmt);
+ }
+-#endif /* SQLITE_ENABLE_FTS3_TOKENIZER */
+ 
+ 
+ static
+@@ -147258,13 +147282,13 @@
+   assert( 0==strcmp(sqlite3_errmsg(db), "unknown tokenizer: nosuchtokenizer") );
+ 
+   /* Test the storage function */
+-#ifdef SQLITE_ENABLE_FTS3_TOKENIZER
+-  rc = registerTokenizer(db, "nosuchtokenizer", p1);
+-  assert( rc==SQLITE_OK );
+-  rc = queryTokenizer(db, "nosuchtokenizer", &p2);
+-  assert( rc==SQLITE_OK );
+-  assert( p2==p1 );
+-#endif
+  if( fts3TokenizerEnabled(context) ){
+    rc = registerTokenizer(db, "nosuchtokenizer", p1);
+    assert( rc==SQLITE_OK );
+    rc = queryTokenizer(db, "nosuchtokenizer", &p2);
+    assert( rc==SQLITE_OK );
+    assert( p2==p1 );
+  }
+ 
+   sqlite3_result_text(context, "ok", -1, SQLITE_STATIC);
+ }
+@@ -147280,7 +147304,7 @@
+ **    sqlite3Fts3HashInit(pHash, FTS3_HASH_STRING, 1);
+ **
+ ** This function adds a scalar function (see header comment above
+-** scalarFunc() in this file for details) and, if ENABLE_TABLE is
+** fts3TokenizerFunc() in this file for details) and, if ENABLE_TABLE is
+ ** defined at compilation time, a temporary virtual table (see header 
+ ** comment above struct HashTableVtab) to the database schema. Both 
+ ** provide read/write access to the contents of *pHash.
+@@ -147309,10 +147333,10 @@
+ #endif
+ 
+   if( SQLITE_OK==rc ){
+-    rc = sqlite3_create_function(db, zName, 1, any, p, scalarFunc, 0, 0);
+    rc = sqlite3_create_function(db, zName, 1, any, p, fts3TokenizerFunc, 0, 0);
+   }
+   if( SQLITE_OK==rc ){
+-    rc = sqlite3_create_function(db, zName, 2, any, p, scalarFunc, 0, 0);
+    rc = sqlite3_create_function(db, zName, 2, any, p, fts3TokenizerFunc, 0, 0);
+   }
+ #ifdef SQLITE_TEST
+   if( SQLITE_OK==rc ){
+--- sqlite3.h
+++ sqlite3.h
+@@ -1904,11 +1904,25 @@
+ ** following this call.  The second parameter may be a NULL pointer, in
+ ** which case the trigger setting is not reported back. </dd>
+ **
+** <dt>SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER</dt>
+** <dd> ^This option is used to enable or disable the two-argument
+** version of the [fts3_tokenizer()] function which is part of the
+** [FTS3] full-text search engine extension.
+** There should be two additional arguments.
+** The first argument is an integer which is 0 to disable fts3_tokenizer() or
+** positive to enable fts3_tokenizer() or negative to leave the setting
+** unchanged.
+** The second parameter is a pointer to an integer into which
+** is written 0 or 1 to indicate whether fts3_tokenizer is disabled or enabled
+** following this call.  The second parameter may be a NULL pointer, in
+** which case the new setting is not reported back. </dd>
+**
+ ** </dl>
+ */
+-#define SQLITE_DBCONFIG_LOOKASIDE       1001  /* void* int int */
+-#define SQLITE_DBCONFIG_ENABLE_FKEY     1002  /* int int* */
+-#define SQLITE_DBCONFIG_ENABLE_TRIGGER  1003  /* int int* */
+#define SQLITE_DBCONFIG_LOOKASIDE             1001 /* void* int int */
+#define SQLITE_DBCONFIG_ENABLE_FKEY           1002 /* int int* */
+#define SQLITE_DBCONFIG_ENABLE_TRIGGER        1003 /* int int* */
+#define SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1004 /* int int* */
+ 
+ 
+ /*
--- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.11.0-nonfull_tarball-build.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.11.0-nonfull_tarball-build.patch
@ -0,0 +1,38 @@
+Link executables against libsqlite3.so.
+Fix building with dlopen() not available.
+
+--- Makefile.am
+++ Makefile.am
+@@ -1,15 +1,16 @@
+ 
+-AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ @JSON1_FLAGS@ -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE
+AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ @JSON1_FLAGS@ -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE
+ 
+ lib_LTLIBRARIES = libsqlite3.la
+ libsqlite3_la_SOURCES = sqlite3.c
+ libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
+ 
+ bin_PROGRAMS = sqlite3
+-sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h
+-sqlite3_LDADD = @READLINE_LIBS@
+sqlite3_SOURCES = shell.c sqlite3.h
+EXTRA_sqlite3_SOURCES = sqlite3.c
+sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@
+ sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@
+-sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+sqlite3_CFLAGS = $(AM_CFLAGS)
+ 
+ include_HEADERS = sqlite3.h sqlite3ext.h
+ 
+--- configure.ac
+++ configure.ac
+@@ -89,6 +89,9 @@
+   [], [enable_dynamic_extensions=yes])
+ if test x"$enable_dynamic_extensions" != "xno"; then
+   AC_SEARCH_LIBS(dlopen, dl)
+  if test "${ac_cv_search_dlopen}" = "no" ; then
+    DYNAMIC_EXTENSION_FLAGS=-DSQLITE_OMIT_LOAD_EXTENSION=1
+  fi
+ else
+   DYNAMIC_EXTENSION_FLAGS=-DSQLITE_OMIT_LOAD_EXTENSION=1
+ fi
--- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.12.0-nonfull_tarball-build.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.12.0-nonfull_tarball-build.patch
@ -1,6 +1,8 @@
+Fix building with dlopen() not available.
+
 --- configure.ac
 +++ configure.ac
-@@ -70,6 +70,9 @@
+@@ -89,6 +89,9 @@
   [], [enable_dynamic_extensions=yes])
 if test x"$enable_dynamic_extensions" != "xno"; then
   AC_SEARCH_LIBS(dlopen, dl)
--- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.13.0-full_tarball-build.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.13.0-full_tarball-build.patch
@ -0,0 +1,137 @@
+Link executables against libsqlite3.so.
+Increase timeout for fuzzcheck.
+Fix building with dlopen() not available.
+
+--- Makefile.in
+++ Makefile.in
+@@ -555,7 +555,7 @@
+ # Extra compiler options for various shell tools
+ #
+ SHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4
+-SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_DBSTAT_VTAB
+ FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1
+ FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5
+ 
+@@ -576,18 +576,18 @@
+ 
+ libtclsqlite3.la:	tclsqlite.lo libsqlite3.la
+ 	$(LTLINK) -no-undefined -o $@ tclsqlite.lo \
+-		libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
+		libsqlite3.la @TCL_STUB_LIB_SPEC@ \
+ 		-rpath "$(TCLLIBDIR)" \
+ 		-version-info "8:6:8" \
+ 		-avoid-version
+ 
+-sqlite3$(TEXE):	$(TOP)/src/shell.c sqlite3.c
+-	$(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
+-		$(TOP)/src/shell.c sqlite3.c \
+-		$(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
+sqlite3$(TEXE):	$(TOP)/src/shell.c libsqlite3.la
+	$(LTLINK) $(READLINE_FLAGS) -o $@ \
+		$(TOP)/src/shell.c libsqlite3.la \
+		$(LIBREADLINE)
+ 
+-sqldiff$(TEXE):	$(TOP)/tool/sqldiff.c sqlite3.c sqlite3.h
+-	$(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.c $(TLIBS)
+sqldiff$(TEXE):	$(TOP)/tool/sqldiff.c libsqlite3.la
+	$(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la
+ 
+ srcck1$(BEXE):	$(TOP)/tool/srcck1.c
+ 	$(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c
+@@ -656,7 +656,7 @@
+ # Rule to build the amalgamation
+ #
+ sqlite3.lo:	sqlite3.c
+-	$(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c
+	$(LTCOMPILE) $(SHELL_OPT) $(TEMP_STORE) -c sqlite3.c
+ 
+ # Rules to build the LEMON compiler generator
+ #
+@@ -1082,13 +1082,13 @@
+ 
+ # Fuzz testing
+ fuzztest:	fuzzcheck$(TEXE) $(FUZZDATA)
+-	./fuzzcheck$(TEXE) $(FUZZDATA)
+	./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA)
+ 
+ fastfuzztest:	fuzzcheck$(TEXE) $(FUZZDATA)
+-	./fuzzcheck$(TEXE) --limit-mem 100M $(FUZZDATA)
+	./fuzzcheck$(TEXE) --limit-mem 100M --timeout 3600 $(FUZZDATA)
+ 
+ valgrindfuzz:	fuzzcheck$(TEXT) $(FUZZDATA)
+-	valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
+	valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA)
+ 
+ # Minimal testing that runs in less than 3 minutes
+ #
+@@ -1114,32 +1114,32 @@
+ smoketest:	$(TESTPROGS) fuzzcheck$(TEXE)
+ 	./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
+ 
+-sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl
+sqlite3_analyzer.c:	$(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl
+ 	echo "#define TCLSH 2" > $@
+ 	echo "#define SQLITE_ENABLE_DBSTAT_VTAB 1" >> $@
+-	cat sqlite3.c $(TOP)/src/tclsqlite.c >> $@
+	cat $(TOP)/src/tclsqlite.c >> $@
+ 	echo "static const char *tclsh_main_loop(void){" >> $@
+ 	echo "static const char *zMainloop = " >> $@
+ 	$(TCLSH_CMD) $(TOP)/tool/tostr.tcl $(TOP)/tool/spaceanal.tcl >> $@
+ 	echo "; return zMainloop; }" >> $@
+ 
+-sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
+-	$(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
+sqlite3_analyzer$(TEXE):	sqlite3_analyzer.c libsqlite3.la
+	$(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL)
+ 
+-showdb$(TEXE):	$(TOP)/tool/showdb.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS)
+showdb$(TEXE):	$(TOP)/tool/showdb.c libsqlite3.la
+	$(LTLINK) -o $@ $(TOP)/tool/showdb.c libsqlite3.la
+ 
+-showstat4$(TEXE):	$(TOP)/tool/showstat4.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS)
+showstat4$(TEXE):	$(TOP)/tool/showstat4.c libsqlite3.la
+	$(LTLINK) -o $@ $(TOP)/tool/showstat4.c libsqlite3.la
+ 
+-showjournal$(TEXE):	$(TOP)/tool/showjournal.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS)
+showjournal$(TEXE):	$(TOP)/tool/showjournal.c
+	$(LTLINK) -o $@ $(TOP)/tool/showjournal.c
+ 
+-showwal$(TEXE):	$(TOP)/tool/showwal.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS)
+showwal$(TEXE):	$(TOP)/tool/showwal.c
+	$(LTLINK) -o $@ $(TOP)/tool/showwal.c
+ 
+-changeset$(TEXE):	$(TOP)/ext/session/changeset.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS)
+changeset$(TEXE):	$(TOP)/ext/session/changeset.c libsqlite3.la
+	$(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la
+ 
+ rollback-test$(TEXE):	$(TOP)/tool/rollback-test.c sqlite3.lo
+ 	$(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS)
+@@ -1153,8 +1153,8 @@
+ speedtest1$(TEXE):	$(TOP)/test/speedtest1.c sqlite3.lo
+ 	$(LTLINK) -o $@ $(TOP)/test/speedtest1.c sqlite3.lo $(TLIBS)
+ 
+-rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo 
+-	$(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS)
+rbu$(EXE):	$(TOP)/ext/rbu/rbu.c libsqlite3.la
+	$(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la
+ 
+ loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
+ 	$(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)
+--- configure.ac
+++ configure.ac
+@@ -570,6 +570,9 @@
+ if test "${use_loadextension}" = "yes" ; then
+   OPT_FEATURE_FLAGS=""
+   AC_SEARCH_LIBS(dlopen, dl)
+  if test "${ac_cv_search_dlopen}" = "no" ; then
+    OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
+  fi
+ else
+   OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
+ fi
--- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.8.1-src-dlopen_check.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.8.1-src-dlopen_check.patch
@ -1,12 +0,0 @@
--- configure.ac
-+++ configure.ac
-@@ -611,6 +611,9 @@
- if test "${use_loadextension}" = "yes" ; then
-   OPT_FEATURE_FLAGS=""
-   AC_SEARCH_LIBS(dlopen, dl)
-+  if test "${ac_cv_search_dlopen}" = "no" ; then
-+    OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
-+  fi
- else
-   OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
- fi
--- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.8.1-tests-icu-52.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.8.1-tests-icu-52.patch
@ -1,49 +0,0 @@
--- test/fts4unicode.test
-+++ test/fts4unicode.test
-@@ -366,27 +366,26 @@
-   do_isspace_test 6.$T.1 $T    32
-   do_isspace_test 6.$T.2 $T    160
-   do_isspace_test 6.$T.3 $T    5760
-  do_isspace_test 6.$T.4 $T    6158
-  do_isspace_test 6.$T.5 $T    8192
-  do_isspace_test 6.$T.6 $T    8193
-  do_isspace_test 6.$T.7 $T    8194
-  do_isspace_test 6.$T.8 $T    8195
-  do_isspace_test 6.$T.9 $T    8196
-  do_isspace_test 6.$T.10 $T    8197
-  do_isspace_test 6.$T.11 $T    8198
-  do_isspace_test 6.$T.12 $T    8199
-  do_isspace_test 6.$T.13 $T    8200
-  do_isspace_test 6.$T.14 $T    8201
-  do_isspace_test 6.$T.15 $T    8202
-  do_isspace_test 6.$T.16 $T    8239
-  do_isspace_test 6.$T.17 $T    8287
-  do_isspace_test 6.$T.18 $T   12288
-+  do_isspace_test 6.$T.4 $T    8192
-+  do_isspace_test 6.$T.5 $T    8193
-+  do_isspace_test 6.$T.6 $T    8194
-+  do_isspace_test 6.$T.7 $T    8195
-+  do_isspace_test 6.$T.8 $T    8196
-+  do_isspace_test 6.$T.9 $T    8197
-+  do_isspace_test 6.$T.10 $T    8198
-+  do_isspace_test 6.$T.11 $T    8199
-+  do_isspace_test 6.$T.12 $T    8200
-+  do_isspace_test 6.$T.13 $T    8201
-+  do_isspace_test 6.$T.14 $T    8202
-+  do_isspace_test 6.$T.15 $T    8239
-+  do_isspace_test 6.$T.16 $T    8287
-+  do_isspace_test 6.$T.17 $T   12288
- 
-  do_isspace_test 6.$T.19 $T   {32 160 5760 6158}
-  do_isspace_test 6.$T.20 $T   {8192 8193 8194 8195}
-  do_isspace_test 6.$T.21 $T   {8196 8197 8198 8199}
-  do_isspace_test 6.$T.22 $T   {8200 8201 8202 8239}
-  do_isspace_test 6.$T.23 $T   {8287 12288}
-+  do_isspace_test 6.$T.18 $T   {32 160 5760}
-+  do_isspace_test 6.$T.19 $T   {8192 8193 8194 8195}
-+  do_isspace_test 6.$T.20 $T   {8196 8197 8198 8199}
-+  do_isspace_test 6.$T.21 $T   {8200 8201 8202 8239}
-+  do_isspace_test 6.$T.22 $T   {8287 12288}
- }
- 
- #-------------------------------------------------------------------------
--- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/metadata.xml
@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
    <email>arfrever.fta@gmail.com</email>
    <name>Arfrever Frehtes Taifersar Arahesis</name>
  </maintainer>
-  <herd>proxy-maintainers</herd>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
  <use>
    <flag name="secure-delete">Enable overwriting of deleted content with zeros by default (http://sqlite.org/pragma.html#pragma_secure_delete), causing some performance penalty</flag>
    <flag name="tools">Install additional tools</flag>
--- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-2.8.16-r5.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-2.8.16-r5.ebuild
@ -1,127 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils alternatives multilib toolchain-funcs
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-
-DESCRIPTION="SQLite: an SQL Database Engine in a C Library"
-HOMEPAGE="http://www.sqlite.org/"
-SRC_URI="http://www.sqlite.org/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-IUSE="doc nls tcl"
-
-DEPEND="doc? ( dev-lang/tcl )
-		tcl? ( dev-lang/tcl )"
-
-RDEPEND="tcl? ( dev-lang/tcl )"
-
-SOURCE="/usr/bin/lemon"
-ALTERNATIVES="${SOURCE}-3 ${SOURCE}-0"
-
-RESTRICT="!tcl? ( test )"
-
-src_unpack() {
-	# test
-	if has test ${FEATURES}; then
-		if ! has userpriv ${FEATURES}; then
-			ewarn "The userpriv feature must be enabled to run tests."
-			eerror "Testsuite will not be run."
-		fi
-		if ! use tcl; then
-			ewarn "You must enable the tcl use flag if you want to run the test"
-			ewarn "suite."
-			eerror "Testsuite will not be run."
-		fi
-	fi
-
-	unpack ${A}
-	cd "${S}"
-
-	use hppa && epatch "${FILESDIR}"/${PN}-2.8.15-alignement-fix.patch
-
-	epatch \
-		"${FILESDIR}"/${P}-multilib.patch \
-		"${FILESDIR}"/${P}-exit.patch
-
-	epunt_cxx
-
-	if use nls ; then
-		ENCODING=${ENCODING-"UTF8"}
-	else
-		ENCODING="ISO8859"
-	fi
-
-	sed -i -e "s:@@S@@:${S}:g" \
-		-e "s:@@CC@@:$(tc-getCC):g" \
-		-e "s:@@CFLAGS@@:${CFLAGS}:g" \
-		-e "s:@@AR@@:$(tc-getAR):g" \
-		-e "s:@@RANLIB@@:$(tc-getRANLIB):g" \
-		-e "s:@@ENCODING@@:${ENCODING}:g" \
-		"${S}"/Makefile.linux-gcc
-
-	sed -i \
-		-e '/^LTLINK/s:$(TCC):& $(LDFLAGS):' \
-		-e '/lemon/s:-o:$(LDFLAGS) &:' \
-		"${S}"/{main.mk,Makefile.in}
-}
-
-src_compile() {
-	local myconf="--enable-incore-db --enable-tempdb-in-ram"
-
-	if ! use tcl ; then
-		myconf="${myconf} --without-tcl"
-	fi
-
-	econf ${myconf} \
-		--disable-static \
-		$(use_enable nls utf8)
-
-	emake all || die "emake all failed"
-
-	if use doc ; then
-		emake doc || die "emake doc failed"
-	fi
-
-	if use tcl ; then
-		cp -P "${FILESDIR}"/maketcllib.sh "${S}"
-		chmod +x ./maketcllib.sh
-		./maketcllib.sh
-	fi
-}
-
-src_test() {
-	if use tcl ; then
-		if has userpriv ${FEATURES} ; then
-			elog "SQLite 2.x is known to have problems on 64 bit architectures."
-			elog "If you observe segmentation faults please use 3.x instead!"
-
-			cd "${S}"
-			emake test || die "some test failed"
-		fi
-	fi
-}
-
-src_install () {
-	dodir /usr/{bin,include,$(get_libdir)}
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	find "${D}" -name '*.la' -exec rm -f {} +
-
-	newbin lemon lemon-${SLOT}
-
-	dodoc README VERSION
-	doman sqlite.1
-
-	use doc && dohtml doc/*.html doc/*.txt doc/*.png
-
-	if use tcl ; then
-		mkdir "${D}"/usr/$(get_libdir)/tclsqlite${PV}
-		cp "${S}"/tclsqlite.so "${D}"/usr/$(get_libdir)/tclsqlite${PV}/
-		cp "${S}"/pkgIndex.tcl "${D}"/usr/$(get_libdir)/tclsqlite${PV}/
-	fi
-}
--- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.8.11.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.8.11.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -11,25 +11,22 @@ DOC_PV="${SRC_PV}"
 # DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"

 DESCRIPTION="A SQL Database Engine in a C Library"
-HOMEPAGE="http://sqlite.org/"
-SRC_URI="doc? ( http://sqlite.org/2015/${PN}-doc-${DOC_PV}.zip )
-	tcl? ( http://sqlite.org/2015/${PN}-src-${SRC_PV}.zip )
-	test? ( http://sqlite.org/2015/${PN}-src-${SRC_PV}.zip )
-	tools? ( http://sqlite.org/2015/${PN}-src-${SRC_PV}.zip )
-	!tcl? ( !test? ( !tools? ( http://sqlite.org/2015/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
+HOMEPAGE="https://sqlite.org/"
+SRC_URI="doc? ( https://sqlite.org/2016/${PN}-doc-${DOC_PV}.zip )
+	tcl? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
+	test? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
+	tools? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
+	!tcl? ( !test? ( !tools? ( https://sqlite.org/2016/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"

 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"

 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
 	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
 	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r14
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+	tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	doc? ( app-arch/unzip )
 	tcl? ( app-arch/unzip )
@ -37,58 +34,99 @@ DEPEND="${RDEPEND}
 		app-arch/unzip
 		dev-lang/tcl:0[${MULTILIB_USEDEP}]
 	)
-	tools? ( dev-lang/tcl:0 )"
+	tools? ( app-arch/unzip )"

-amalgamation() {
-	! use tcl && ! use test && ! use tools
+full_tarball() {
+	use tcl || use test || use tools
 }

 pkg_setup() {
-	if amalgamation; then
-		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
-	else
+	if full_tarball; then
 		S="${WORKDIR}/${PN}-src-${SRC_PV}"
+	else
+		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
 	fi
 }

 src_prepare() {
-	if amalgamation; then
-		epatch "${FILESDIR}/${PN}-3.8.1-autoconf-dlopen_check.patch"
-	else
-		epatch "${FILESDIR}/${PN}-3.8.1-src-dlopen_check.patch"
+	if full_tarball; then
+		epatch "${FILESDIR}/${PN}-3.11.0-full_tarball-build.patch"
+		epatch "${FILESDIR}/${PN}-3.11.0-full_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch"

 		# Fix shell1-5.0 test.
-		# http://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2015-May/002575.html
+		# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2015-May/002575.html
 		sed -e "/if {\$i==0x0D /s/\$i==0x0D /&|| (\$i>=0xE0 \&\& \$i<=0xEF) /" -i test/shell1.test
+	else
+		epatch "${FILESDIR}/${PN}-3.11.0-nonfull_tarball-build.patch"
+		epatch "${FILESDIR}/${PN}-3.11.0-nonfull_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch"
 	fi

 	eautoreconf

-	# At least ppc-aix, x86-interix and *-solaris need newer libtool.
-	# use prefix && eautoreconf
-
-	# Fix building with Full-Text Search version 5.
-	sed \
-		-e "/^LIBOBJS1 =/s/$/ fts5.lo/" \
-		-e "s/\$(LIBOBJ) \$(TLIBS)/& -lm/" \
-		-e "/^TESTFIXTURE_SRC1 =/s/$/ fts5.c/" \
-		-e "s/\$(TESTFIXTURE_SRC) \$(LIBTCL) \$(TLIBS)/& -lm/" \
-		-i Makefile.in || die "sed failed"
-
-	if use icu; then
-		if amalgamation; then
-			sed -e "s/LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
-		else
-			sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
-		fi
-	fi
-
 	multilib_copy_sources
 }

-src_configure() {
-	# `configure` from amalgamation tarball does not add -DSQLITE_DEBUG or -DNDEBUG flag.
-	if amalgamation; then
+multilib_src_configure() {
+	local CPPFLAGS="${CPPFLAGS}" options=()
+
+	options+=(
+		--enable-$(full_tarball && echo load-extension || echo dynamic-extensions)
+		--enable-threadsafe
+	)
+	if ! full_tarball; then
+		options+=(--disable-static-shell)
+	fi
+
+	# Support detection of misuse of SQLite API.
+	# https://sqlite.org/compile.html#enable_api_armor
+	append-cppflags -DSQLITE_ENABLE_API_ARMOR
+
+	# Support column metadata functions.
+	# https://sqlite.org/c3ref/column_database_name.html
+	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+	# Support dbstat virtual table.
+	# https://sqlite.org/dbstat.html
+	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
+
+	# Support Full-Text Search versions 3, 4 and 5.
+	# https://sqlite.org/fts3.html
+	# https://sqlite.org/fts5.html
+	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
+	options+=(--enable-fts5)
+
+	# Support hidden columns.
+	append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
+
+	# Support JSON1 extension.
+	# https://sqlite.org/json1.html
+	append-cppflags -DSQLITE_ENABLE_JSON1
+
+	# Support Resumable Bulk Update extension.
+	# https://sqlite.org/rbu.html
+	append-cppflags -DSQLITE_ENABLE_RBU
+
+	# Support R*Trees.
+	# https://sqlite.org/rtree.html
+	append-cppflags -DSQLITE_ENABLE_RTREE
+
+	# Support scan status functions.
+	# https://sqlite.org/c3ref/stmt_scanstatus.html
+	# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
+	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
+
+	# Support unlock notification.
+	# https://sqlite.org/unlock_notify.html
+	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+
+	# Support soundex() function.
+	# https://sqlite.org/lang_corefunc.html#soundex
+	append-cppflags -DSQLITE_SOUNDEX
+
+	# debug USE flag.
+	if full_tarball; then
+		options+=($(use_enable debug))
+	else
 		if use debug; then
 			append-cppflags -DSQLITE_DEBUG
 		else
@ -96,56 +134,42 @@ src_configure() {
 		fi
 	fi

-	# Support detection of misuse of SQLite API.
-	# http://sqlite.org/compile.html#enable_api_armor
-	append-cppflags -DSQLITE_ENABLE_API_ARMOR
-
-	# Support column metadata functions.
-	# http://sqlite.org/c3ref/column_database_name.html
-	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
-
-	# Support dbstat virtual table.
-	# http://sqlite.org/dbstat.html
-	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
-
-	# Support Full-Text Search versions 3, 4 and 5.
-	# http://sqlite.org/fts3.html
-	# http://sqlite.org/fts5.html
-	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5
-
-	# Support Resumable Bulk Update extension.
-	# http://sqlite.org/rbu.html
-	append-cppflags -DSQLITE_ENABLE_RBU
-
-	# Support R*Trees.
-	# http://sqlite.org/rtree.html
-	append-cppflags -DSQLITE_ENABLE_RTREE
-
-	# Support scan status functions.
-	# http://sqlite.org/c3ref/stmt_scanstatus.html
-	# http://sqlite.org/c3ref/stmt_scanstatus_reset.html
-	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
-
-	# Support unlock notification.
-	# http://sqlite.org/unlock_notify.html
-	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
-
-	# Support soundex() function.
-	# http://sqlite.org/lang_corefunc.html#soundex
-	append-cppflags -DSQLITE_SOUNDEX
-
+	# icu USE flag.
 	if use icu; then
 		# Support ICU extension.
-		# http://sqlite.org/compile.html#enable_icu
+		# https://sqlite.org/compile.html#enable_icu
 		append-cppflags -DSQLITE_ENABLE_ICU
+		if full_tarball; then
+			sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		else
+			sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		fi
 	fi

+	# readline USE flag.
+	options+=(
+		--disable-editline
+		$(use_enable readline)
+	)
+	if full_tarball && use readline; then
+		options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline")
+	fi
+
+	# secure-delete USE flag.
 	if use secure-delete; then
 		# Enable secure_delete pragma by default.
-		# http://sqlite.org/pragma.html#pragma_secure_delete
+		# https://sqlite.org/pragma.html#pragma_secure_delete
 		append-cppflags -DSQLITE_SECURE_DELETE
 	fi

+	# static-libs USE flag.
+	options+=($(use_enable static-libs static))
+
+	# tcl, test, tools USE flags.
+	if full_tarball; then
+		options+=(--enable-tcl)
+	fi
+
 	if [[ "${CHOST}" == *-mint* ]]; then
 		append-cppflags -DSQLITE_OMIT_WAL
 	fi
@ -160,27 +184,14 @@ src_configure() {
 		append-cppflags -DUSE_PREAD64 -D_LARGEFILE64_SOURCE
 	fi

-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# `configure` from amalgamation tarball does not support
-	# --with-readline-inc and --(enable|disable)-tcl options.
-	econf \
-		--enable-$(amalgamation && echo dynamic-extensions || echo load-extension) \
-		--enable-threadsafe \
-		$(use_enable readline) \
-		$(use_enable static-libs static) \
-		$(amalgamation || echo --with-readline-inc="-I${EPREFIX}/usr/include/readline") \
-		$(amalgamation || use_enable debug) \
-		$(amalgamation || if use tcl || use test; then echo --enable-tcl; else echo --disable-tcl; fi)
+	econf "${options[@]}"
 }

 multilib_src_compile() {
-	emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+	emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"

 	if use tools && multilib_is_native_abi; then
-		emake showdb showjournal showstat4 showwal sqldiff
+		emake rbu showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer
 	fi
 }

@ -190,18 +201,30 @@ multilib_src_test() {
 		return
 	fi

-	emake $(use debug && echo fulltest || echo test)
+	emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
 }

 multilib_src_install() {
 	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install

 	if use tools && multilib_is_native_abi; then
-		newbin showdb sqlite3-show-db
-		newbin showjournal sqlite3-show-journal
-		newbin showstat4 sqlite3-show-stat4
-		newbin showwal sqlite3-show-wal
-		newbin sqldiff sqlite3-diff
+		install_tool() {
+			if [[ -f ".libs/${1}" ]]; then
+				newbin ".libs/${1}" "${2}"
+			else
+				newbin "${1}" "${2}"
+			fi
+		}
+
+		install_tool rbu sqlite3-rbu
+		install_tool showdb sqlite3-show-db
+		install_tool showjournal sqlite3-show-journal
+		install_tool showstat4 sqlite3-show-stat4
+		install_tool showwal sqlite3-show-wal
+		install_tool sqldiff sqlite3-diff
+		install_tool sqlite3_analyzer sqlite3-analyzer
+
+		unset -f install_tool
 	fi
 }

@ -211,6 +234,6 @@ multilib_src_install_all() {
 	doman sqlite3.1

 	if use doc; then
-		dohtml -A ico,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
+		dohtml -A ico,odf,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
 	fi
 }
--- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.12.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.12.0.ebuild
@ -0,0 +1,238 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
+
+SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
+DOC_PV="${SRC_PV}"
+# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
+
+DESCRIPTION="A SQL Database Engine in a C Library"
+HOMEPAGE="https://sqlite.org/"
+SRC_URI="doc? ( https://sqlite.org/2016/${PN}-doc-${DOC_PV}.zip )
+	tcl? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
+	test? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
+	tools? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
+	!tcl? ( !test? ( !tools? ( https://sqlite.org/2016/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
+
+LICENSE="public-domain"
+SLOT="3"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
+
+RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
+	tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )
+	tcl? ( app-arch/unzip )
+	test? (
+		app-arch/unzip
+		dev-lang/tcl:0[${MULTILIB_USEDEP}]
+	)
+	tools? ( app-arch/unzip )"
+
+full_tarball() {
+	use tcl || use test || use tools
+}
+
+pkg_setup() {
+	if full_tarball; then
+		S="${WORKDIR}/${PN}-src-${SRC_PV}"
+	else
+		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
+	fi
+}
+
+src_prepare() {
+	if full_tarball; then
+		epatch "${FILESDIR}/${PN}-3.11.0-full_tarball-build.patch"
+
+		# Fix AC_CHECK_FUNCS.
+		# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
+		sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac
+	else
+		epatch "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch"
+
+		# Fix AC_CHECK_FUNCS.
+		# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
+		sed \
+			-e "s/AC_CHECK_FUNCS(\[fdatasync.*/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" \
+			-e "/AC_CHECK_FUNCS(posix_fallocate)/d" \
+			-i configure.ac
+	fi
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local CPPFLAGS="${CPPFLAGS}" options=()
+
+	options+=(
+		--enable-$(full_tarball && echo load-extension || echo dynamic-extensions)
+		--enable-threadsafe
+	)
+	if ! full_tarball; then
+		options+=(--disable-static-shell)
+	fi
+
+	# Support detection of misuse of SQLite API.
+	# https://sqlite.org/compile.html#enable_api_armor
+	append-cppflags -DSQLITE_ENABLE_API_ARMOR
+
+	# Support column metadata functions.
+	# https://sqlite.org/c3ref/column_database_name.html
+	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+	# Support dbstat virtual table.
+	# https://sqlite.org/dbstat.html
+	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
+
+	# Support comments in output of EXPLAIN.
+	# https://sqlite.org/compile.html#enable_explain_comments
+	append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+
+	# Support Full-Text Search versions 3, 4 and 5.
+	# https://sqlite.org/fts3.html
+	# https://sqlite.org/fts5.html
+	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
+	options+=(--enable-fts5)
+
+	# Support hidden columns.
+	append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
+
+	# Support JSON1 extension.
+	# https://sqlite.org/json1.html
+	append-cppflags -DSQLITE_ENABLE_JSON1
+
+	# Support Resumable Bulk Update extension.
+	# https://sqlite.org/rbu.html
+	append-cppflags -DSQLITE_ENABLE_RBU
+
+	# Support R*Trees.
+	# https://sqlite.org/rtree.html
+	append-cppflags -DSQLITE_ENABLE_RTREE
+
+	# Support scan status functions.
+	# https://sqlite.org/c3ref/stmt_scanstatus.html
+	# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
+	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
+
+	# Support unlock notification.
+	# https://sqlite.org/unlock_notify.html
+	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+
+	# Support soundex() function.
+	# https://sqlite.org/lang_corefunc.html#soundex
+	append-cppflags -DSQLITE_SOUNDEX
+
+	# debug USE flag.
+	if full_tarball; then
+		options+=($(use_enable debug))
+	else
+		if use debug; then
+			append-cppflags -DSQLITE_DEBUG
+		else
+			append-cppflags -DNDEBUG
+		fi
+	fi
+
+	# icu USE flag.
+	if use icu; then
+		# Support ICU extension.
+		# https://sqlite.org/compile.html#enable_icu
+		append-cppflags -DSQLITE_ENABLE_ICU
+		if full_tarball; then
+			sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		else
+			sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		fi
+	fi
+
+	# readline USE flag.
+	options+=(
+		--disable-editline
+		$(use_enable readline)
+	)
+	if full_tarball && use readline; then
+		options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline")
+	fi
+
+	# secure-delete USE flag.
+	if use secure-delete; then
+		# Enable secure_delete pragma by default.
+		# https://sqlite.org/pragma.html#pragma_secure_delete
+		append-cppflags -DSQLITE_SECURE_DELETE
+	fi
+
+	# static-libs USE flag.
+	options+=($(use_enable static-libs static))
+
+	# tcl, test, tools USE flags.
+	if full_tarball; then
+		options+=(--enable-tcl)
+	fi
+
+	if [[ "${CHOST}" == *-mint* ]]; then
+		append-cppflags -DSQLITE_OMIT_WAL
+	fi
+
+	econf "${options[@]}"
+}
+
+multilib_src_compile() {
+	emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+
+	if use tools && multilib_is_native_abi; then
+		emake rbu showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer
+	fi
+}
+
+multilib_src_test() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		ewarn "Skipping tests due to root permissions"
+		return
+	fi
+
+	emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
+
+	if use tools && multilib_is_native_abi; then
+		install_tool() {
+			if [[ -f ".libs/${1}" ]]; then
+				newbin ".libs/${1}" "${2}"
+			else
+				newbin "${1}" "${2}"
+			fi
+		}
+
+		install_tool rbu sqlite3-rbu
+		install_tool showdb sqlite3-show-db
+		install_tool showjournal sqlite3-show-journal
+		install_tool showstat4 sqlite3-show-stat4
+		install_tool showwal sqlite3-show-wal
+		install_tool sqldiff sqlite3-diff
+		install_tool sqlite3_analyzer sqlite3-analyzer
+
+		unset -f install_tool
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+
+	doman sqlite3.1
+
+	if use doc; then
+		dohtml -A ico,odf,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
+	fi
+}
--- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.12.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.12.1.ebuild
@ -0,0 +1,238 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
+
+SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
+DOC_PV="${SRC_PV}"
+# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
+
+DESCRIPTION="A SQL Database Engine in a C Library"
+HOMEPAGE="https://sqlite.org/"
+SRC_URI="doc? ( https://sqlite.org/2016/${PN}-doc-${DOC_PV}.zip )
+	tcl? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
+	test? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
+	tools? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
+	!tcl? ( !test? ( !tools? ( https://sqlite.org/2016/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
+
+LICENSE="public-domain"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
+
+RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
+	tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )
+	tcl? ( app-arch/unzip )
+	test? (
+		app-arch/unzip
+		dev-lang/tcl:0[${MULTILIB_USEDEP}]
+	)
+	tools? ( app-arch/unzip )"
+
+full_tarball() {
+	use tcl || use test || use tools
+}
+
+pkg_setup() {
+	if full_tarball; then
+		S="${WORKDIR}/${PN}-src-${SRC_PV}"
+	else
+		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
+	fi
+}
+
+src_prepare() {
+	if full_tarball; then
+		epatch "${FILESDIR}/${PN}-3.11.0-full_tarball-build.patch"
+
+		# Fix AC_CHECK_FUNCS.
+		# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
+		sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac
+	else
+		epatch "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch"
+
+		# Fix AC_CHECK_FUNCS.
+		# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
+		sed \
+			-e "s/AC_CHECK_FUNCS(\[fdatasync.*/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" \
+			-e "/AC_CHECK_FUNCS(posix_fallocate)/d" \
+			-i configure.ac
+	fi
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local CPPFLAGS="${CPPFLAGS}" options=()
+
+	options+=(
+		--enable-$(full_tarball && echo load-extension || echo dynamic-extensions)
+		--enable-threadsafe
+	)
+	if ! full_tarball; then
+		options+=(--disable-static-shell)
+	fi
+
+	# Support detection of misuse of SQLite API.
+	# https://sqlite.org/compile.html#enable_api_armor
+	append-cppflags -DSQLITE_ENABLE_API_ARMOR
+
+	# Support column metadata functions.
+	# https://sqlite.org/c3ref/column_database_name.html
+	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+	# Support dbstat virtual table.
+	# https://sqlite.org/dbstat.html
+	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
+
+	# Support comments in output of EXPLAIN.
+	# https://sqlite.org/compile.html#enable_explain_comments
+	append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+
+	# Support Full-Text Search versions 3, 4 and 5.
+	# https://sqlite.org/fts3.html
+	# https://sqlite.org/fts5.html
+	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
+	options+=(--enable-fts5)
+
+	# Support hidden columns.
+	append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
+
+	# Support JSON1 extension.
+	# https://sqlite.org/json1.html
+	append-cppflags -DSQLITE_ENABLE_JSON1
+
+	# Support Resumable Bulk Update extension.
+	# https://sqlite.org/rbu.html
+	append-cppflags -DSQLITE_ENABLE_RBU
+
+	# Support R*Trees.
+	# https://sqlite.org/rtree.html
+	append-cppflags -DSQLITE_ENABLE_RTREE
+
+	# Support scan status functions.
+	# https://sqlite.org/c3ref/stmt_scanstatus.html
+	# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
+	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
+
+	# Support unlock notification.
+	# https://sqlite.org/unlock_notify.html
+	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+
+	# Support soundex() function.
+	# https://sqlite.org/lang_corefunc.html#soundex
+	append-cppflags -DSQLITE_SOUNDEX
+
+	# debug USE flag.
+	if full_tarball; then
+		options+=($(use_enable debug))
+	else
+		if use debug; then
+			append-cppflags -DSQLITE_DEBUG
+		else
+			append-cppflags -DNDEBUG
+		fi
+	fi
+
+	# icu USE flag.
+	if use icu; then
+		# Support ICU extension.
+		# https://sqlite.org/compile.html#enable_icu
+		append-cppflags -DSQLITE_ENABLE_ICU
+		if full_tarball; then
+			sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		else
+			sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		fi
+	fi
+
+	# readline USE flag.
+	options+=(
+		--disable-editline
+		$(use_enable readline)
+	)
+	if full_tarball && use readline; then
+		options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline")
+	fi
+
+	# secure-delete USE flag.
+	if use secure-delete; then
+		# Enable secure_delete pragma by default.
+		# https://sqlite.org/pragma.html#pragma_secure_delete
+		append-cppflags -DSQLITE_SECURE_DELETE
+	fi
+
+	# static-libs USE flag.
+	options+=($(use_enable static-libs static))
+
+	# tcl, test, tools USE flags.
+	if full_tarball; then
+		options+=(--enable-tcl)
+	fi
+
+	if [[ "${CHOST}" == *-mint* ]]; then
+		append-cppflags -DSQLITE_OMIT_WAL
+	fi
+
+	econf "${options[@]}"
+}
+
+multilib_src_compile() {
+	emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+
+	if use tools && multilib_is_native_abi; then
+		emake rbu showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer
+	fi
+}
+
+multilib_src_test() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		ewarn "Skipping tests due to root permissions"
+		return
+	fi
+
+	emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
+
+	if use tools && multilib_is_native_abi; then
+		install_tool() {
+			if [[ -f ".libs/${1}" ]]; then
+				newbin ".libs/${1}" "${2}"
+			else
+				newbin "${1}" "${2}"
+			fi
+		}
+
+		install_tool rbu sqlite3-rbu
+		install_tool showdb sqlite3-show-db
+		install_tool showjournal sqlite3-show-journal
+		install_tool showstat4 sqlite3-show-stat4
+		install_tool showwal sqlite3-show-wal
+		install_tool sqldiff sqlite3-diff
+		install_tool sqlite3_analyzer sqlite3-analyzer
+
+		unset -f install_tool
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+
+	doman sqlite3.1
+
+	if use doc; then
+		dohtml -A ico,odf,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
+	fi
+}
--- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.12.2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.12.2.ebuild
@ -0,0 +1,238 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
+
+SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
+DOC_PV="${SRC_PV}"
+# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
+
+DESCRIPTION="A SQL Database Engine in a C Library"
+HOMEPAGE="https://sqlite.org/"
+SRC_URI="doc? ( https://sqlite.org/2016/${PN}-doc-${DOC_PV}.zip )
+	tcl? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
+	test? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
+	tools? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
+	!tcl? ( !test? ( !tools? ( https://sqlite.org/2016/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
+
+LICENSE="public-domain"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
+
+RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
+	tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )
+	tcl? ( app-arch/unzip )
+	test? (
+		app-arch/unzip
+		dev-lang/tcl:0[${MULTILIB_USEDEP}]
+	)
+	tools? ( app-arch/unzip )"
+
+full_tarball() {
+	use tcl || use test || use tools
+}
+
+pkg_setup() {
+	if full_tarball; then
+		S="${WORKDIR}/${PN}-src-${SRC_PV}"
+	else
+		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
+	fi
+}
+
+src_prepare() {
+	if full_tarball; then
+		epatch "${FILESDIR}/${PN}-3.11.0-full_tarball-build.patch"
+
+		# Fix AC_CHECK_FUNCS.
+		# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
+		sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac
+	else
+		epatch "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch"
+
+		# Fix AC_CHECK_FUNCS.
+		# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
+		sed \
+			-e "s/AC_CHECK_FUNCS(\[fdatasync.*/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" \
+			-e "/AC_CHECK_FUNCS(posix_fallocate)/d" \
+			-i configure.ac
+	fi
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local CPPFLAGS="${CPPFLAGS}" options=()
+
+	options+=(
+		--enable-$(full_tarball && echo load-extension || echo dynamic-extensions)
+		--enable-threadsafe
+	)
+	if ! full_tarball; then
+		options+=(--disable-static-shell)
+	fi
+
+	# Support detection of misuse of SQLite API.
+	# https://sqlite.org/compile.html#enable_api_armor
+	append-cppflags -DSQLITE_ENABLE_API_ARMOR
+
+	# Support column metadata functions.
+	# https://sqlite.org/c3ref/column_database_name.html
+	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+	# Support dbstat virtual table.
+	# https://sqlite.org/dbstat.html
+	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
+
+	# Support comments in output of EXPLAIN.
+	# https://sqlite.org/compile.html#enable_explain_comments
+	append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+
+	# Support Full-Text Search versions 3, 4 and 5.
+	# https://sqlite.org/fts3.html
+	# https://sqlite.org/fts5.html
+	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
+	options+=(--enable-fts5)
+
+	# Support hidden columns.
+	append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
+
+	# Support JSON1 extension.
+	# https://sqlite.org/json1.html
+	append-cppflags -DSQLITE_ENABLE_JSON1
+
+	# Support Resumable Bulk Update extension.
+	# https://sqlite.org/rbu.html
+	append-cppflags -DSQLITE_ENABLE_RBU
+
+	# Support R*Trees.
+	# https://sqlite.org/rtree.html
+	append-cppflags -DSQLITE_ENABLE_RTREE
+
+	# Support scan status functions.
+	# https://sqlite.org/c3ref/stmt_scanstatus.html
+	# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
+	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
+
+	# Support unlock notification.
+	# https://sqlite.org/unlock_notify.html
+	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+
+	# Support soundex() function.
+	# https://sqlite.org/lang_corefunc.html#soundex
+	append-cppflags -DSQLITE_SOUNDEX
+
+	# debug USE flag.
+	if full_tarball; then
+		options+=($(use_enable debug))
+	else
+		if use debug; then
+			append-cppflags -DSQLITE_DEBUG
+		else
+			append-cppflags -DNDEBUG
+		fi
+	fi
+
+	# icu USE flag.
+	if use icu; then
+		# Support ICU extension.
+		# https://sqlite.org/compile.html#enable_icu
+		append-cppflags -DSQLITE_ENABLE_ICU
+		if full_tarball; then
+			sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		else
+			sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		fi
+	fi
+
+	# readline USE flag.
+	options+=(
+		--disable-editline
+		$(use_enable readline)
+	)
+	if full_tarball && use readline; then
+		options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline")
+	fi
+
+	# secure-delete USE flag.
+	if use secure-delete; then
+		# Enable secure_delete pragma by default.
+		# https://sqlite.org/pragma.html#pragma_secure_delete
+		append-cppflags -DSQLITE_SECURE_DELETE
+	fi
+
+	# static-libs USE flag.
+	options+=($(use_enable static-libs static))
+
+	# tcl, test, tools USE flags.
+	if full_tarball; then
+		options+=(--enable-tcl)
+	fi
+
+	if [[ "${CHOST}" == *-mint* ]]; then
+		append-cppflags -DSQLITE_OMIT_WAL
+	fi
+
+	econf "${options[@]}"
+}
+
+multilib_src_compile() {
+	emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+
+	if use tools && multilib_is_native_abi; then
+		emake rbu showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer
+	fi
+}
+
+multilib_src_test() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		ewarn "Skipping tests due to root permissions"
+		return
+	fi
+
+	emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
+
+	if use tools && multilib_is_native_abi; then
+		install_tool() {
+			if [[ -f ".libs/${1}" ]]; then
+				newbin ".libs/${1}" "${2}"
+			else
+				newbin "${1}" "${2}"
+			fi
+		}
+
+		install_tool rbu sqlite3-rbu
+		install_tool showdb sqlite3-show-db
+		install_tool showjournal sqlite3-show-journal
+		install_tool showstat4 sqlite3-show-stat4
+		install_tool showwal sqlite3-show-wal
+		install_tool sqldiff sqlite3-diff
+		install_tool sqlite3_analyzer sqlite3-analyzer
+
+		unset -f install_tool
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+
+	doman sqlite3.1
+
+	if use doc; then
+		dohtml -A ico,odf,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
+	fi
+}
--- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.13.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.13.0.ebuild
@ -0,0 +1,243 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
+
+SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
+DOC_PV="${SRC_PV}"
+# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
+
+DESCRIPTION="A SQL Database Engine in a C Library"
+HOMEPAGE="https://sqlite.org/"
+SRC_URI="doc? ( https://sqlite.org/2016/${PN}-doc-${DOC_PV}.zip )
+	tcl? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
+	test? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
+	tools? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
+	!tcl? ( !test? ( !tools? ( https://sqlite.org/2016/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
+
+LICENSE="public-domain"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
+
+RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
+	tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )
+	tcl? ( app-arch/unzip )
+	test? (
+		app-arch/unzip
+		dev-lang/tcl:0[${MULTILIB_USEDEP}]
+	)
+	tools? ( app-arch/unzip )"
+
+full_tarball() {
+	use tcl || use test || use tools
+}
+
+pkg_setup() {
+	if full_tarball; then
+		S="${WORKDIR}/${PN}-src-${SRC_PV}"
+	else
+		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
+	fi
+}
+
+src_prepare() {
+	if full_tarball; then
+		epatch "${FILESDIR}/${PN}-3.13.0-full_tarball-build.patch"
+
+		# Fix AC_CHECK_FUNCS.
+		# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
+		sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac
+	else
+		epatch "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch"
+
+		# Fix AC_CHECK_FUNCS.
+		# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
+		sed \
+			-e "s/AC_CHECK_FUNCS(\[fdatasync.*/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" \
+			-e "/AC_CHECK_FUNCS(posix_fallocate)/d" \
+			-i configure.ac
+	fi
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local CPPFLAGS="${CPPFLAGS}" options=()
+
+	options+=(
+		--enable-$(full_tarball && echo load-extension || echo dynamic-extensions)
+		--enable-threadsafe
+	)
+	if ! full_tarball; then
+		options+=(--disable-static-shell)
+	fi
+
+	# Support detection of misuse of SQLite API.
+	# https://sqlite.org/compile.html#enable_api_armor
+	append-cppflags -DSQLITE_ENABLE_API_ARMOR
+
+	# Support column metadata functions.
+	# https://sqlite.org/c3ref/column_database_name.html
+	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+	# Support dbstat virtual table.
+	# https://sqlite.org/dbstat.html
+	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
+
+	# Support comments in output of EXPLAIN.
+	# https://sqlite.org/compile.html#enable_explain_comments
+	append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+
+	# Support Full-Text Search versions 3, 4 and 5.
+	# https://sqlite.org/fts3.html
+	# https://sqlite.org/fts5.html
+	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
+	options+=(--enable-fts5)
+
+	# Support hidden columns.
+	append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
+
+	# Support JSON1 extension.
+	# https://sqlite.org/json1.html
+	append-cppflags -DSQLITE_ENABLE_JSON1
+
+	# Support Resumable Bulk Update extension.
+	# https://sqlite.org/rbu.html
+	append-cppflags -DSQLITE_ENABLE_RBU
+
+	# Support R*Trees.
+	# https://sqlite.org/rtree.html
+	append-cppflags -DSQLITE_ENABLE_RTREE
+
+	# Support scan status functions.
+	# https://sqlite.org/c3ref/stmt_scanstatus.html
+	# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
+	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
+
+	# Support Session extension.
+	# https://sqlite.org/sessionintro.html
+	options+=(--enable-session)
+
+	# Support unlock notification.
+	# https://sqlite.org/unlock_notify.html
+	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+
+	# Support soundex() function.
+	# https://sqlite.org/lang_corefunc.html#soundex
+	append-cppflags -DSQLITE_SOUNDEX
+
+	# debug USE flag.
+	if full_tarball; then
+		options+=($(use_enable debug))
+	else
+		if use debug; then
+			append-cppflags -DSQLITE_DEBUG
+		else
+			append-cppflags -DNDEBUG
+		fi
+	fi
+
+	# icu USE flag.
+	if use icu; then
+		# Support ICU extension.
+		# https://sqlite.org/compile.html#enable_icu
+		append-cppflags -DSQLITE_ENABLE_ICU
+		if full_tarball; then
+			sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		else
+			sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		fi
+	fi
+
+	# readline USE flag.
+	options+=(
+		--disable-editline
+		$(use_enable readline)
+	)
+	if full_tarball && use readline; then
+		options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline")
+	fi
+
+	# secure-delete USE flag.
+	if use secure-delete; then
+		# Enable secure_delete pragma by default.
+		# https://sqlite.org/pragma.html#pragma_secure_delete
+		append-cppflags -DSQLITE_SECURE_DELETE
+	fi
+
+	# static-libs USE flag.
+	options+=($(use_enable static-libs static))
+
+	# tcl, test, tools USE flags.
+	if full_tarball; then
+		options+=(--enable-tcl)
+	fi
+
+	if [[ "${CHOST}" == *-mint* ]]; then
+		append-cppflags -DSQLITE_OMIT_WAL
+	fi
+
+	econf "${options[@]}"
+}
+
+multilib_src_compile() {
+	emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+
+	if use tools && multilib_is_native_abi; then
+		emake changeset rbu showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer
+	fi
+}
+
+multilib_src_test() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		ewarn "Skipping tests due to root permissions"
+		return
+	fi
+
+	emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
+
+	if use tools && multilib_is_native_abi; then
+		install_tool() {
+			if [[ -f ".libs/${1}" ]]; then
+				newbin ".libs/${1}" "${2}"
+			else
+				newbin "${1}" "${2}"
+			fi
+		}
+
+		install_tool changeset sqlite3-changeset
+		install_tool rbu sqlite3-rbu
+		install_tool showdb sqlite3-show-db
+		install_tool showjournal sqlite3-show-journal
+		install_tool showstat4 sqlite3-show-stat4
+		install_tool showwal sqlite3-show-wal
+		install_tool sqldiff sqlite3-diff
+		install_tool sqlite3_analyzer sqlite3-analyzer
+
+		unset -f install_tool
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+
+	doman sqlite3.1
+
+	if use doc; then
+		dohtml -A ico,odf,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
+	fi
+}
--- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.8.10.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.8.10.1.ebuild
@ -1,210 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
-
-SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
-DOC_PV="${SRC_PV}"
-# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
-
-DESCRIPTION="A SQL Database Engine in a C Library"
-HOMEPAGE="http://sqlite.org/"
-SRC_URI="doc? ( http://sqlite.org/2015/${PN}-doc-${DOC_PV}.zip )
-	tcl? ( http://sqlite.org/2015/${PN}-src-${SRC_PV}.zip )
-	test? ( http://sqlite.org/2015/${PN}-src-${SRC_PV}.zip )
-	tools? ( http://sqlite.org/2015/${PN}-src-${SRC_PV}.zip )
-	!tcl? ( !test? ( !tools? ( http://sqlite.org/2015/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
-
-LICENSE="public-domain"
-SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
-
-RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
-	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r14
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )
-	tcl? ( app-arch/unzip )
-	test? (
-		app-arch/unzip
-		dev-lang/tcl:0[${MULTILIB_USEDEP}]
-	)
-	tools? ( dev-lang/tcl:0 )"
-
-amalgamation() {
-	! use tcl && ! use test && ! use tools
-}
-
-pkg_setup() {
-	if amalgamation; then
-		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
-	else
-		S="${WORKDIR}/${PN}-src-${SRC_PV}"
-	fi
-}
-
-src_prepare() {
-	if amalgamation; then
-		epatch "${FILESDIR}/${PN}-3.8.1-autoconf-dlopen_check.patch"
-
-		# http://www.sqlite.org/cgi/src/info/85bfa9a67f997084
-		sed \
-			-e "s/^sqlite3_SOURCES = shell.c sqlite3.h$/sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h/" \
-			-e "s/^sqlite3_LDADD = sqlite3.\$(OBJEXT) @READLINE_LIBS@$/sqlite3_LDADD = @READLINE_LIBS@\nsqlite3_CFLAGS = \$(AM_CFLAGS)/" \
-			-i Makefile.am
-	else
-		epatch "${FILESDIR}/${PN}-3.8.1-src-dlopen_check.patch"
-		epatch "${FILESDIR}/${PN}-3.8.1-tests-icu-52.patch"
-
-		# Fix shell1-5.0 test.
-		# http://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2015-May/002575.html
-		sed -e "/if {\$i==0x0D /s/\$i==0x0D /&|| (\$i>=0xE0 \&\& \$i<=0xEF) /" -i test/shell1.test
-	fi
-
-	eautoreconf
-
-	# At least ppc-aix, x86-interix and *-solaris need newer libtool.
-	# use prefix && eautoreconf
-
-	if use icu; then
-		if amalgamation; then
-			sed -e "s/LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
-		else
-			sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
-		fi
-	fi
-
-	multilib_copy_sources
-}
-
-src_configure() {
-	# `configure` from amalgamation tarball does not add -DSQLITE_DEBUG or -DNDEBUG flag.
-	if amalgamation; then
-		if use debug; then
-			append-cppflags -DSQLITE_DEBUG
-		else
-			append-cppflags -DNDEBUG
-		fi
-	fi
-
-	# Support detection of misuse of SQLite API.
-	# http://sqlite.org/compile.html#enable_api_armor
-	append-cppflags -DSQLITE_ENABLE_API_ARMOR
-
-	# Support column metadata functions.
-	# http://sqlite.org/c3ref/column_database_name.html
-	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
-
-	# Support dbstat virtual table.
-	# http://sqlite.org/dbstat.html
-	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
-
-	# Support Full-Text Search versions 3 and 4.
-	# http://sqlite.org/fts3.html
-	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
-
-	# Support R*Trees.
-	# http://sqlite.org/rtree.html
-	append-cppflags -DSQLITE_ENABLE_RTREE
-
-	# Support scan status functions.
-	# http://sqlite.org/c3ref/stmt_scanstatus.html
-	# http://sqlite.org/c3ref/stmt_scanstatus_reset.html
-	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
-
-	# Support unlock notification.
-	# http://sqlite.org/unlock_notify.html
-	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
-
-	# Support soundex() function.
-	# http://sqlite.org/lang_corefunc.html#soundex
-	append-cppflags -DSQLITE_SOUNDEX
-
-	if use icu; then
-		# Support ICU extension.
-		# http://sqlite.org/compile.html#enable_icu
-		append-cppflags -DSQLITE_ENABLE_ICU
-	fi
-
-	if use secure-delete; then
-		# Enable secure_delete pragma by default.
-		# http://sqlite.org/pragma.html#pragma_secure_delete
-		append-cppflags -DSQLITE_SECURE_DELETE
-	fi
-
-	if [[ "${CHOST}" == *-mint* ]]; then
-		append-cppflags -DSQLITE_OMIT_WAL
-	fi
-
-	# Use pread(), pread64(), pwrite(), pwrite64() functions for better performance if they are available.
-	if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -Werror=implicit-function-declaration -x c - -o "${T}/pread_pwrite_test" <<< $'#include <unistd.h>\nint main()\n{\n  pread(0, NULL, 0, 0);\n  pwrite(0, NULL, 0, 0);\n  return 0;\n}' &> /dev/null; then
-		append-cppflags -DUSE_PREAD
-	fi
-	if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -Werror=implicit-function-declaration -x c - -o "${T}/pread64_pwrite64_test" <<< $'#include <unistd.h>\nint main()\n{\n  pread64(0, NULL, 0, 0);\n  pwrite64(0, NULL, 0, 0);\n  return 0;\n}' &> /dev/null; then
-		append-cppflags -DUSE_PREAD64
-	elif $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -D_LARGEFILE64_SOURCE -Werror=implicit-function-declaration -x c - -o "${T}/pread64_pwrite64_test" <<< $'#include <unistd.h>\nint main()\n{\n  pread64(0, NULL, 0, 0);\n  pwrite64(0, NULL, 0, 0);\n  return 0;\n}' &> /dev/null; then
-		append-cppflags -DUSE_PREAD64 -D_LARGEFILE64_SOURCE
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# `configure` from amalgamation tarball does not support
-	# --with-readline-inc and --(enable|disable)-tcl options.
-	econf \
-		--enable-$(amalgamation && echo dynamic-extensions || echo load-extension) \
-		--enable-threadsafe \
-		$(use_enable readline) \
-		$(use_enable static-libs static) \
-		$(amalgamation || echo --with-readline-inc="-I${EPREFIX}/usr/include/readline") \
-		$(amalgamation || use_enable debug) \
-		$(amalgamation || if use tcl || use test; then echo --enable-tcl; else echo --disable-tcl; fi)
-}
-
-multilib_src_compile() {
-	emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
-
-	if use tools && multilib_is_native_abi; then
-		emake showdb showjournal showstat4 showwal sqldiff
-	fi
-}
-
-multilib_src_test() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		ewarn "Skipping tests due to root permissions"
-		return
-	fi
-
-	emake $(use debug && echo fulltest || echo test)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
-
-	if use tools && multilib_is_native_abi; then
-		newbin showdb sqlite3-show-db
-		newbin showjournal sqlite3-show-journal
-		newbin showstat4 sqlite3-show-stat4
-		newbin showwal sqlite3-show-wal
-		newbin sqldiff sqlite3-diff
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-
-	doman sqlite3.1
-
-	if use doc; then
-		dohtml -A ico,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
-	fi
-}
--- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.8.10.2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.8.10.2.ebuild
@ -1,210 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
-
-SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
-DOC_PV="${SRC_PV}"
-# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
-
-DESCRIPTION="A SQL Database Engine in a C Library"
-HOMEPAGE="http://sqlite.org/"
-SRC_URI="doc? ( http://sqlite.org/2015/${PN}-doc-${DOC_PV}.zip )
-	tcl? ( http://sqlite.org/2015/${PN}-src-${SRC_PV}.zip )
-	test? ( http://sqlite.org/2015/${PN}-src-${SRC_PV}.zip )
-	tools? ( http://sqlite.org/2015/${PN}-src-${SRC_PV}.zip )
-	!tcl? ( !test? ( !tools? ( http://sqlite.org/2015/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
-
-LICENSE="public-domain"
-SLOT="3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
-
-RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
-	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r14
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )
-	tcl? ( app-arch/unzip )
-	test? (
-		app-arch/unzip
-		dev-lang/tcl:0[${MULTILIB_USEDEP}]
-	)
-	tools? ( dev-lang/tcl:0 )"
-
-amalgamation() {
-	! use tcl && ! use test && ! use tools
-}
-
-pkg_setup() {
-	if amalgamation; then
-		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
-	else
-		S="${WORKDIR}/${PN}-src-${SRC_PV}"
-	fi
-}
-
-src_prepare() {
-	if amalgamation; then
-		epatch "${FILESDIR}/${PN}-3.8.1-autoconf-dlopen_check.patch"
-
-		# http://www.sqlite.org/cgi/src/info/85bfa9a67f997084
-		sed \
-			-e "s/^sqlite3_SOURCES = shell.c sqlite3.h$/sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h/" \
-			-e "s/^sqlite3_LDADD = sqlite3.\$(OBJEXT) @READLINE_LIBS@$/sqlite3_LDADD = @READLINE_LIBS@\nsqlite3_CFLAGS = \$(AM_CFLAGS)/" \
-			-i Makefile.am
-	else
-		epatch "${FILESDIR}/${PN}-3.8.1-src-dlopen_check.patch"
-		epatch "${FILESDIR}/${PN}-3.8.1-tests-icu-52.patch"
-
-		# Fix shell1-5.0 test.
-		# http://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2015-May/002575.html
-		sed -e "/if {\$i==0x0D /s/\$i==0x0D /&|| (\$i>=0xE0 \&\& \$i<=0xEF) /" -i test/shell1.test
-	fi
-
-	eautoreconf
-
-	# At least ppc-aix, x86-interix and *-solaris need newer libtool.
-	# use prefix && eautoreconf
-
-	if use icu; then
-		if amalgamation; then
-			sed -e "s/LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
-		else
-			sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
-		fi
-	fi
-
-	multilib_copy_sources
-}
-
-src_configure() {
-	# `configure` from amalgamation tarball does not add -DSQLITE_DEBUG or -DNDEBUG flag.
-	if amalgamation; then
-		if use debug; then
-			append-cppflags -DSQLITE_DEBUG
-		else
-			append-cppflags -DNDEBUG
-		fi
-	fi
-
-	# Support detection of misuse of SQLite API.
-	# http://sqlite.org/compile.html#enable_api_armor
-	append-cppflags -DSQLITE_ENABLE_API_ARMOR
-
-	# Support column metadata functions.
-	# http://sqlite.org/c3ref/column_database_name.html
-	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
-
-	# Support dbstat virtual table.
-	# http://sqlite.org/dbstat.html
-	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
-
-	# Support Full-Text Search versions 3 and 4.
-	# http://sqlite.org/fts3.html
-	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
-
-	# Support R*Trees.
-	# http://sqlite.org/rtree.html
-	append-cppflags -DSQLITE_ENABLE_RTREE
-
-	# Support scan status functions.
-	# http://sqlite.org/c3ref/stmt_scanstatus.html
-	# http://sqlite.org/c3ref/stmt_scanstatus_reset.html
-	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
-
-	# Support unlock notification.
-	# http://sqlite.org/unlock_notify.html
-	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
-
-	# Support soundex() function.
-	# http://sqlite.org/lang_corefunc.html#soundex
-	append-cppflags -DSQLITE_SOUNDEX
-
-	if use icu; then
-		# Support ICU extension.
-		# http://sqlite.org/compile.html#enable_icu
-		append-cppflags -DSQLITE_ENABLE_ICU
-	fi
-
-	if use secure-delete; then
-		# Enable secure_delete pragma by default.
-		# http://sqlite.org/pragma.html#pragma_secure_delete
-		append-cppflags -DSQLITE_SECURE_DELETE
-	fi
-
-	if [[ "${CHOST}" == *-mint* ]]; then
-		append-cppflags -DSQLITE_OMIT_WAL
-	fi
-
-	# Use pread(), pread64(), pwrite(), pwrite64() functions for better performance if they are available.
-	if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -Werror=implicit-function-declaration -x c - -o "${T}/pread_pwrite_test" <<< $'#include <unistd.h>\nint main()\n{\n  pread(0, NULL, 0, 0);\n  pwrite(0, NULL, 0, 0);\n  return 0;\n}' &> /dev/null; then
-		append-cppflags -DUSE_PREAD
-	fi
-	if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -Werror=implicit-function-declaration -x c - -o "${T}/pread64_pwrite64_test" <<< $'#include <unistd.h>\nint main()\n{\n  pread64(0, NULL, 0, 0);\n  pwrite64(0, NULL, 0, 0);\n  return 0;\n}' &> /dev/null; then
-		append-cppflags -DUSE_PREAD64
-	elif $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -D_LARGEFILE64_SOURCE -Werror=implicit-function-declaration -x c - -o "${T}/pread64_pwrite64_test" <<< $'#include <unistd.h>\nint main()\n{\n  pread64(0, NULL, 0, 0);\n  pwrite64(0, NULL, 0, 0);\n  return 0;\n}' &> /dev/null; then
-		append-cppflags -DUSE_PREAD64 -D_LARGEFILE64_SOURCE
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# `configure` from amalgamation tarball does not support
-	# --with-readline-inc and --(enable|disable)-tcl options.
-	econf \
-		--enable-$(amalgamation && echo dynamic-extensions || echo load-extension) \
-		--enable-threadsafe \
-		$(use_enable readline) \
-		$(use_enable static-libs static) \
-		$(amalgamation || echo --with-readline-inc="-I${EPREFIX}/usr/include/readline") \
-		$(amalgamation || use_enable debug) \
-		$(amalgamation || if use tcl || use test; then echo --enable-tcl; else echo --disable-tcl; fi)
-}
-
-multilib_src_compile() {
-	emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
-
-	if use tools && multilib_is_native_abi; then
-		emake showdb showjournal showstat4 showwal sqldiff
-	fi
-}
-
-multilib_src_test() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		ewarn "Skipping tests due to root permissions"
-		return
-	fi
-
-	emake $(use debug && echo fulltest || echo test)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
-
-	if use tools && multilib_is_native_abi; then
-		newbin showdb sqlite3-show-db
-		newbin showjournal sqlite3-show-journal
-		newbin showstat4 sqlite3-show-stat4
-		newbin showwal sqlite3-show-wal
-		newbin sqldiff sqlite3-diff
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-
-	doman sqlite3.1
-
-	if use doc; then
-		dohtml -A ico,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
-	fi
-}
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python/ChangeLog
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/ChangeLog
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python/ChangeLog-2015
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/ChangeLog-2015
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/Manifest
@ -1,63 +1,42 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-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.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 3.5-secondary-targets.patch 506 SHA256 c8d9a9b1cd71c290a7a2eb7a5a221317732fad763a7c52a80f164df0d43b7678 SHA512 22afcf07040df79b8da32759047be104fc6f47e73ed670bb15e217f1efb0dd9026ccbfe90083561da08aeb1c64c538dc751d03cba7bad172a7c6105c898fb2bc WHIRLPOOL a2e4e125907c20ed67bc382d12896164fc6aea182f1d4f1211163a95ddf81e1f080784f21caa021cd4c8e9f560ec2d94f9d881ce953d59193b10c0cafd354dc3
+AUX 3.5.1-cross-compile.patch 2544 SHA256 e735e4a78c3ee39816ba150ef298c5c74070d65afe3b41fd04e0b4fe4f0a9f12 SHA512 9b1adadb3589e42324c9fcd2d2964308943fa25d32992f0cf2e14fbca52d835030ddb91cc43537ae98142347a29c0f93a5eae8406bd46b6f3d4fd6634f2ae82a WHIRLPOOL bbde19e273ac96f007da42083313baadc8969b3591dc724b5d2cc193e9961113ab0841181d12523ce82d76b4193e918bf203ce87fa843e8492217bb61006b032
+AUX pydoc.conf 176 SHA256 7a617b3e705d14c30e9c1d49cf88df3985e50d97990f08520d0a67e4afadb6e8 SHA512 d26e3f59d05d68fb7fe330029afbf0b46361bb6b5ca1e5051ecf2a82439885514a3d1faddf939c83c8b58b23d8e16b1c0c8027a1f897c3a7ee2cc8719665b622 WHIRLPOOL 2ae620030dfe06704aa01d7d1e97eabd5d58d53a5439350c9261327e256cb0a7907e2c1d6989a6483bae532967bf23b740064f7725ca149889bc192f11d5142a
+AUX pydoc.init 615 SHA256 646d633d8afc9b3aa2305d2fe25908dab5d581aad381375d991fb93de6860c5e SHA512 95a474183870257c63a1a114bd2cacbb3a93738cd2387e4b31d2f62c54207d1f19a7bf2989d2c92a64e34efaf7bb24a097b4a8e6d816e85211668976e4372515 WHIRLPOOL 0e9069cc42a9d002d09ff29b1c49d77ef23543767836f6e6242d35c081a819bb5300e2000f3e7a982c00ef1173abd294fb270f24f07153b0b8afdfd7e9e89e02
+AUX python-2.7.10-cross-compile-warn-test.patch 775 SHA256 d5574b08e9ba7612971565c7a8e9881e4a0a07c63e79c2ca056a51ed1cf2badd SHA512 652941239541f6139ee3580ec0ea5240baf07ae1afb786f76a69b1d748de1f4dda2740a95c28866e9b0b59023410f8a1e86507642595991c0d90d187519cb758 WHIRLPOOL 95c9c404e9788fdbd7a202b7ff6df4010b6c035b097c20d6183919320a794bede013c938a6806365f9bdabd73917576f6ef0a07b20dd4d168fdc294facbfdccf
+AUX python-2.7.10-system-libffi.patch 1232 SHA256 d119def22ac8b15da95486981d9ddb2b19199dfeeed364de223c6321d592cdc9 SHA512 3c888638180edc81b98a869478085de63741668ea62bdb919a60708fd64cb394e60f44a3730e2ccf3e41d1d61b72b469242fe2ccd20dc61bc2064b3e759c52bd WHIRLPOOL bf69573ae6b804d44338a64c727f4b4ebde60964b89d546f4ca45d6d03619d84c69c88cc4e72975514c24cd9be31ee7fd9c3ea3cda9bce6384fa5a10cf28b2bd
 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-libressl.patch 5011 SHA256 fa5cfbf768c783393ba8987819eebbe499915189cde22d6b3ed6971fd2cd5c3b SHA512 1353a08dd65af2c98309ea692c8fb932d2a4fc4bfb18ec1b9c0b7622295bba924d7b28b50d6563f847dad005cbd66e0dd6a522248db509c3acc3065a69508c93 WHIRLPOOL 7de68cc99e238ecae113a02b3b4d42b36948949dab104d74a8c8e2973498421be92485224b2c19cdcd4b87c34df85c89a2786560dddf96637ab24afeac594186
 AUX python-3.3.5-ncurses-pkg-config.patch 1175 SHA256 2a64b3b5628f9114c091bfc5221c244f8966d83ce08e81971ec890a59f2d93c3 SHA512 25e37ac17a8fc5907bf9ce55e5c58337895a38cf4d4a6bd333a44f30a0f6ac65510a8594d3e953f477a8d724de9932450e6df56e79d7884bc451b23c9a7ad8e0 WHIRLPOOL b213fa0c9707b1e04036fd3cd85f040b7d459f1046b90c619f85a4c221e946b09ffb2d1a7c5b10f795674f89af886ac7f93ff8fd440c2f7014ee40e77b752e21
+AUX python-3.4-gcc-5.patch 1191 SHA256 1bab646b6aef1567f56fb8c26f6ec6a2a90a1ef050996dcfb78aca1e29c5cbdc SHA512 418f71fc9a9c5905ebfb56982ff8d276250c86372443b2f54c5f146b33498461d3af8700760351e7d00415517865df57175ba59d5ecf66362f95f281dab529a8 WHIRLPOOL 5f44f17d5b524d8253774d861a99f004c969db9a055791b42c0bbe93ca06ceae0efd30abff1a93f3e24cb9221a017c0c734906ab714bb81108a5fc14bb084674
 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.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
+AUX python-3.5-distutils-OO-build.patch 3667 SHA256 fc552ecaee8f2b10d96f51d60ad88d13a2593b086f54e8f8fc12766976fc5021 SHA512 5e25d46a7d11b16a7183aaecf82f914506fae552aaaa3d69aca6445c131dff39d4cf13588fa109ce16d41e43355539bee8390a2c454f3696df5a06edb6a5ca77 WHIRLPOOL 9aa810ab40c195a3f62d23439e9b2c49c0873cde6b54f934c54a59756eb4fcaceb30d7692d95f1c65691e8a7c4909b90a910f54cc04d50c859985576fe25c41c
+DIST Python-2.7.10.tar.xz 12250696 SHA256 1cd3730781b91caf0fa1c4d472dc29274186480161a150294c42ce9b5c5effc0 SHA512 67615a6defbcda062f15a09f9dd3b9441afd01a8cc3255e5bc45b925378a0ddc38d468b7701176f6cc153ec52a4f21671b433780d9bde343aa9b9c1b2ae29feb WHIRLPOOL 3a9dcfc55b107dc55ad0ae93fb24a11eab7d4d9b4cfbe6b6830a090b6e5f71bb2ac91526b89c6f3e4f2610fa1a2cc4e82b58a83c599aa71f94894c74181b504b
+DIST Python-2.7.11.tar.xz 12277476 SHA256 962b4c45af50124ea61f11a30deb4342fc0bc21126790fa1d7f6c79809413f46 SHA512 72166763a2fe6aab45ecf378f55a1efc7322d1742c4638bae84f4ed4b9fb4c01f2a0293733c64426ae2c70df24d95ff2b1e2a4f3c2715de00d8f320d4d939ea0 WHIRLPOOL 7ebcff7a2fe775a21a3847dee10369b73aaea8685eb63b4bc33dab0f562b8fb984c398cb34e8158cf1e24f106002829649540aad30a5ec7f4de0018ce7449f69
 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.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-3.4.4.tar.xz 14307620 SHA256 a797d3820155ec6cb654a652b9acfb11792d4e7d568eef1f9199009e042b6ba2 SHA512 2e114636f2b8bc02f30816cc69781e24065855bc294bb500b8cc44913a21fb6061a6918d4ac810511c829f183ec026897f73848cc026679b34fa6ff5d6e8166f WHIRLPOOL 9031e5de8527a40447290a360764cb546031aeb68918334ecc2f263f5d777f59769e8647d17810792ad855da971db0d4430d107b790c29a0cb872cb876af2b54
+DIST Python-3.5.0.tar.xz 14808460 SHA256 d6d7aa1634a5eeeca6ed4fca266982a04f84bd8f3945a9179e20b24ad2e2be91 SHA512 f06bd652484aa89371021d0f9fcb08e6e905e90b39ae065d7df75b367e66b7ea43a818ca33ce04aa3d6746b5e8b1b83e90b709ac2203324fb7a595c1017be149 WHIRLPOOL aef3970297911324537e4e1e9d0e179c925bf51fea9d6a6413a08e3f349fd244d834e6fe732e9120669b762c302b47f821de170ce083d2cc39b7e35f51fdd1f0
+DIST Python-3.5.1.tar.xz 14830408 SHA256 c6d57c0c366d9060ab6c0cdf889ebf3d92711d466cc0119c441dbf2746f725c9 SHA512 261c9e42ae351853c718707a8887817e308b3ba7a37e9463a0bc8f50ee9be9ac1a011b2891f8877ecdb40beab99279bcfa8e04f813b8998fcf6cefb7fd52d850 WHIRLPOOL 7ff4ddb852c74f75d1f327e418f5af09ae66403cc3fb2431ab31786c046cec2d761ee57e8c6674a92bb08f95cfff7c7c7d5ddd965994096a0380fbd6b55fcc8f
+DIST python-gentoo-patches-2.7.10-0.tar.xz 12892 SHA256 c9a838bd62ae50cc385da23a837acfd05f2b74e4f086c9c76eb4d3aa5366ef6d SHA512 5f100944635e360691dc0a2b340a906646c4ae9ee558246ddffc56e8b15d389f25f1fbdc1db4cc08e7d29560d04d66b058b3904902899d58ecae8c408ebdf056 WHIRLPOOL f69e9a518bb7ee50c1b262a21e70e1e2443f859ee6d2f4fa84421120dbd054a06ce8dd6cfea8512cbc64bce806322b879c25c561d5eb05e1ba6cc15035b373a9
+DIST python-gentoo-patches-2.7.11-0.tar.xz 12916 SHA256 e14b47bb1fd64d366d7dfb8339cc2cbf4a53fc288b11dd83f575eb36a8a6408d SHA512 f0447bb699a163afc08df39b111394377539935546ae23732d7239e78d2bff0c04bc94949f86aef0c1be83736127dbd25c2c531e49befed2d638c3cd4940ac52 WHIRLPOOL 305992849d9d244da1e308e739c9bf62a3ef5c74eb65c765bdc666fb5767eb16c7a609f7c442c17da17f76c3ab81e4b09fa8c21e43f89366539a6a9d656bea77
 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.7.9-r1.ebuild 10532 SHA256 b257af119d2bb1fe14c9ffb9d7f5eb083446ecb2e455d54de878bd081ae52342 SHA512 46199fa81a8aa897f853ad50bc9d63127ab16f4062f57e10b536f49c09c37ba1fb357f449ad4570b3878414c58b80f14019ec1ecd12d1fe764c0c14a883478e7 WHIRLPOOL fe66cf76e68fa1ac211c0a60bc75b69f0d55ecf151611aa7b7f3ecaa6f5f42979b471ce9d7ce275083b9d1e2ba1b1d43b4a0c913730099036213a646d151a6e1
-EBUILD python-2.7.9-r2.ebuild 10605 SHA256 b494d909b0d283db23f3089fb2caad41f0c3a5755567305eadefcfc05859b63e SHA512 f1be3673b883d4778c9d514316a5bc71155f2606f739cd34522eb9e0ca261b33e1de61edcf380a7fd6136207d855b005a5ddcf1cc47f5fe358ac6a366ea882f4 WHIRLPOOL 6ab0c956b1249a8480c0c0e973fae1cbdedd31041536e9452d471c905f15e294b6679a564ce2b38671b9b913e0ca32272f346b09d2eb4c7080550a13471e4887
-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 40333 SHA256 7fcc3ac5823047f7297f603c1958eb5aee5db6bf13be7a5d30a043a86f575717 SHA512 e586966aa7f457b09140fe1e75bb85df7f51999ccf49443af658680dfd10b1eb68c044fc08182766789c3e59e198fbfe96b511fb3ea608bf8c11baf8f350aada WHIRLPOOL 08652f34d0426e71e861696acd4de97e67ed46337dce5f68824dd0d8cb7e13982aa453abf96bc50e7a4c36c812ed79bb21f53dc86c3237ac8a5e5de74dd6da88
+DIST python-gentoo-patches-3.4.4-0.tar.xz 11748 SHA256 94aa14d0f7894b99d2ee9d3448f999aeea5faa1c41350a2fb92c912bbebb9292 SHA512 e9852063fbab34cead5bc6f39d8fe28105d51767930174d418ed3dfcd661b8011f2eb1bc60900e6bbc7069ca72b6633bf7bb0bce54d28d16d0202eedd5b5db2d WHIRLPOOL 2bf1a8e18c77c834ce6a110699a5214e22ad311bba769eb4374192ed73554d0b5ff66caca20d3522c1ef3aec9e585266e7ae8a5efc28901b0f67c87d541010ab
+DIST python-gentoo-patches-3.5.0-0.tar.xz 11872 SHA256 8d1830aee5f7e019250447ee084203e26143bdf47c95435861e3e0eda5106eb6 SHA512 d7b6c7fdfdea9d7577b14febf2e4680839908a8eba05f3bc17e71f2fe4c360816a8126de5fa69cfba6930be9793bf1b9cafcde2ae621c1150cb9f1ffecc4a3d4 WHIRLPOOL 01202442c789cd9f54748ec80f9c5b1d2728c5df876a2c8fa417c3078a6e9cc55103ee07fce76f402b15afe1625c5b0497734dc4b601fb304e75bf652ce2f058
+DIST python-gentoo-patches-3.5.1-0.tar.xz 11788 SHA256 668fabdb9326ba3df81dd299619d5245b7806934e9341ef89a06f90c9a98018b SHA512 3948af801e3e70b55b15165d6cc56fb33cdb9fcc9d80b913550c8609273bad28db0c10ec64cb14d010b80020716a1e45d720e08864f6ac850291cb1713800a1a WHIRLPOOL 2fd3b25186c26412dc642f76228d8e75f24cdc7452407dd105f027be5841b1b865f6b5b74a0072a0299153e5d5af699542253b366e4eb78dfbf114ad02b14bcc
+EBUILD python-2.7.10-r1.ebuild 10510 SHA256 8e44f9140ff22d7d5641cdf4b96a648fc99d2f394bb70fc17165dc1e78a2dbbc SHA512 b9a762f395be38e0e89615af8512666677fa3251b0984cbfcc131d624e7ce1db4625966ac99eb3431b1d949a477c5918fc3284ec0a9465d5cf162d73d89981a2 WHIRLPOOL 5cfd62a70bb9bf991c88d49964be8407418df7f630bb370ae3d234936292375c0e6f7e968c48760b7cde8061fe4d42cfde6c6f8edf3dd4f14204960950a1e1c3
+EBUILD python-2.7.11-r2.ebuild 10883 SHA256 73eb79cc216b50a1864e012587f86014bac35fe1de2ab3830187778877ab83cc SHA512 b37d558ea1350bd4c907c27eafe88d05bca4b12cea0f9c8df2e66331c2999059e093847a8ab443ba99f5b14ea9ea107fdc6dcb75ecc28af65c208c88a280331f WHIRLPOOL 20976722dcab3f0bfd29e87afea867b498e21d6dffa93991c82f681fea5528fc6a79da8102ef318b7f14640ec59c75642e55ecd94dcd720410bba35217be84c3
+EBUILD python-3.3.5-r3.ebuild 9598 SHA256 f4666cff012c3270fee188fe78f7601a07a4a22554cf9f9acef4336dd4f03e45 SHA512 63f51fe86c7f16aa5e542d2b4d62ad18831b98879d7231dd44ba4b6760a80aa4f3d73a4ad0bede71ab871eef48d16f516799bb27d4671b9831e37b743a3bb894 WHIRLPOOL 947aef4e5572cb0f279b696a00f39889793ae6948924bcda45050aa6a242d3b8d1a051e7112453a79e73109b980019fa256a7ff89385e72a35a0e35074843c9d
+EBUILD python-3.3.5-r8.ebuild 11245 SHA256 5712fd7425280853a62001799ba65cbc61d0defad92d27fed1c487e3ee755681 SHA512 70728befced66d39c2b975bdb3c8cee59a5679a1564c4d54ae51c077f12c3ca18d85f4e9e8d86ba2b7018338a938e6a5914311dc124b90192697049ab2b32d79 WHIRLPOOL 8751b4ac89f3248ed4f058c325617fdaf792f78d2ab8086fa0abe4edc7ed7d2377e2a38a94f9acebb379f31e1e69001afde01b9b003eaab21e103c2268d52415
+EBUILD python-3.4.3-r1.ebuild 9206 SHA256 ec06b5921fa6459da3339a3e722e1c1a136d0fe77280669c13525025125cc385 SHA512 84545572324540f1c45fdef57b97168e77d33115943e8486a0634761236499f5c254053783a92721fdd24033bfd7f64ccf8c2a68aba70a58cc99272d45eec454 WHIRLPOOL 1ce986d4d33ec0a2068d39363724d7158b13d7b490397298ff8f41985c1b8b47901de37899e9a9135d021fd4226a8b3bfad1c14a79ca661aaba3de8a99c01c45
+EBUILD python-3.4.3-r7.ebuild 10437 SHA256 4af699b6e3239380ffc36d93bb01169bab4de50f5115a8ea3982c936bd6b486e SHA512 7dc10c738b6ac4a128e7187e5794e4329d483ee1b2e6e8957cbaa017cd6762c36527fefe72e17fa2f5b656023e031f7fae200a16dd640d85dc0f2cb4ea329207 WHIRLPOOL c36fe46dc1d0917e84406ae13c528aa0e26048695997d34aa7199dd56c338d93d3e957116ee7f8ffb3afff51bcdf23f7d6bb00162dc2eebd19a7eae63cb5e7b0
+EBUILD python-3.4.4.ebuild 10399 SHA256 a208bb7e96893f3e2e55bb3697b8312378b89fc696ceeca9f3e3cb7d4c45b69f SHA512 7adb3500e49a67b3bd1ec5fe9fa2af7c2cc3ab6f733abdfdc1bde91bed1a846bc2ec4af87c88d03ceac7f110bb18ddb1d9fe697843e844f1dc9025cab8e45312 WHIRLPOOL a640b9b5f26f964e5fd6f29fd188a0837f0e3f07e47680062644b343da5a5b871a84ac5f60b390ffb147a7d08442251455311e13e913473b66b7ae3e200f13aa
+EBUILD python-3.5.0-r2.ebuild 9103 SHA256 bdf4469ca59e50d95a7ba3345624ce1005443da388e32ee618d5f9bff182f2d6 SHA512 3cf0778660e8b315a39d35884e17db6ab6a5efaa3c07b470096327929877b6fbd4e965cddb7a0be6d1340ad1164a561cbb828fe6185f9c25f4781e744c77b8e2 WHIRLPOOL 3f34b12f909e142fa6c795b0368a867652e6ddc2846c127d13d77fce7274e98ce07132a74b234f906969945cd491891f61872bdf844e836417c5c8da3e8b5bbf
+EBUILD python-3.5.1-r2.ebuild 10526 SHA256 25d1d9d83ac9ae828feca02fd203cc8174db48652975217fd40ba4ef00b74529 SHA512 66cb676e3a002da7c0e975247b74af19904bc79b0e0c962bae980b2d1764503210325190e56ce4bec9f2ea01d42b3f892f6aa7ea200ad8cf74f38ec43a7501e1 WHIRLPOOL 8b1685fbc8c7c4db2820ba73176edb5388a72ecb81799abe815dbf60f8563926ff5011d6ef90081aef2d42645de3b2c030bf9a40e74fa57151fcdd25f6208bf9
+EBUILD python-3.5.1-r3.ebuild 10583 SHA256 827df8fe18c653bb4995758ca1abc40e11a7ea3dbd5365c1cc86e7238656ad1f SHA512 8ccd1b049b06e7c9d4b92152513fc0f5e52ada578d2fcbdee8741730a1a11d7a95a77206a0bb08e974b8a80818fcde11350f1b42102ff37b98593434c675b1ee WHIRLPOOL 250aefe0e7fcd88c500b6796567712260adf14744a3d3380967f2ff6bcac0a4d950026cbbd29d4c4ae4f4bf9448038783671a5a2ed308ba088c1c4bf9d66baa8
+MISC ChangeLog 21345 SHA256 b801b732d473eb5e3bf314bc44401ecb193a01ccb26a9edf71cddc8d1f178fde SHA512 128cc19aa679b27b03295abeadd8f32644e7933b5a2d74d216b495e0bcdd781f21522b7870102c0215919a4e4abdc6c2d3509d0101cb3b93be2111066d9bdf9c WHIRLPOOL 5bf5b012f7b8358e92a71abe32af2e3d3bb671d9c4f757e6fa0627911562e1fca1db2f51fabb5655f1c5770d09f6125947bc0536b846054cd584ae6298f06d45
 MISC ChangeLog-2011 100599 SHA256 23129cb47321b2a6b1cb9323f1815d0cd11d6f30c3893908ed51575c270a0cc8 SHA512 4181ba9d965139ba58218da5b960c87b7a611b27606a1ab1ce1b4c3c9255b4e0e2947307cbfffc531f0f8b6b545ee11e083fcb29dc7b2b7ba31c6bb40b8ab128 WHIRLPOOL 4ceebb6a6ed58b906d3a7331795748ac6e4fe2e1401bcccae9024a8e81e2c444aebc5fec610398cfe6002354ad3b10487484598da5091867874727f07e239c56
-MISC metadata.xml 661 SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908 SHA512 871989a29417ce20d95da950fa385f1a958139de7b1567beb9cda28a1217901243cd9d25235fe3c7b0e43a82176d72286e31e4e97310b26488d2a3252ef3a8a0 WHIRLPOOL b694b1b4270ba15640d04a3b0b26a08575ea4afc9be256717f7f3b1768d75da9f71ceca6afd2f69971906227d5ba42263d2df2fc9387441aa240222d39fd094e
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQGcBAEBCAAGBQJVGuusAAoJEJQzkH1pP7W4+L4L/1bB56UUHysfz7xIID/RDEEC
-RnwA7LEOQD2IwY0Ajc4xuwbcHMz5K3MFQ8kRORR6qGfILxO813GFBQZu8Lzg255T
-2EDX+iiQ5aJ8qVcyjSOe+T34wBhZ9NP2C/fYpkIXyg7TJsW00M1oKKV/ucpQAAG+
-NNBWn3sJPnJaOwM9IMpwYZ93s+QRpfDLrU45aBHdRb/Z86dDpUn0G/N/saifXJZe
-Oa6nWXFisf+zWm3yH83U2fowWqyO1BqJh28OHKqTHFueFiqPp4GBx5Ic7rVwvkTN
-vk1TWfUMaqX+J0Bv2dfGr1v7PWX2Emh/HAMDFdJCVxCoLwcCB+ViGml40wKdG2ap
-X9Ohy3BlbIfVZWAl1JttCwm6MT+opgalE0hvmb8GV8BpywrnYkQQKnq0MBRxb3qY
-2/ELjcOSMjYSBsKlJugSpy4lVYO2Xlmy7oyaROSzk6tAXswjTCtbASrxhSUsHKWl
-/ESCNDFsmdVVzzFilcDh+fDK7/7UbquOQM296E9yEQ==
-=P3Cu
-----END PGP SIGNATURE-----
+MISC ChangeLog-2015 40926 SHA256 f5d1dfa6038a588334062ea3e00e9ef9647ef13c7d667a0288a0cec4958aaa85 SHA512 36477f494cfe71e85401b97f1bf5035ebe255e4995886b74a2d535c9d77ca287d324adf239a3213e3be010793835d88f3f513b869bbeee57feb3cb2737549530 WHIRLPOOL b80dc69c8fa4666dbeb71e13c801ed332fbb80141076dc31e1e5b91f34531727f9b2004bee04b2415ad709c77e0be23318e96f4a7219c05dec79f99c22ffc853
+MISC metadata.xml 738 SHA256 beed28468aa4bb66e15e519f9816d94ee0f6a2e9a9e058cda3e6b7f2574b8465 SHA512 f938683740658db5d8eb363bf0eb88a81aab75b7a9e4c5e33bca73722c3b1a8b879151bda58099d67c5596a7dd5d487f15b0f7327918e35ac997e15feaf89847 WHIRLPOOL 0dbb9ae204b4bf8451b35ab170cd9d339a4fcc29f36000220fb148dddcf7c2c1515d41cccd4b759bda3dc8b88545ce1e99f3abff77564905e7dc50131b987dcf
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/3.5-secondary-targets.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/3.5-secondary-targets.patch
@ -0,0 +1,19 @@
+Mark all targets as "secondary"
+
+This allows make to avoid rebuilding unnecessary intermediate files, which
+is useful when cross-compiling.
+
+See Parser/pgen and Programs/_freeze_importlib in Makefile.pre.in.
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+--- a/Makefile.pre.in
+++ b/Makefile.pre.in
+@@ -1672,6 +1672,8 @@
+ .PHONY: smelly funny patchcheck touch altmaninstall commoninstall
+ .PHONY: gdbhooks
+ 
+.SECONDARY:
+
+ # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+ # Local Variables:
+ # mode: makefile
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/3.5.1-cross-compile.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/3.5.1-cross-compile.patch
@ -0,0 +1,75 @@
+# HG changeset patch
+# User Martin Panter <vadmium+py@gmail.com>
+# Date 1461373124 0
+# Node ID 66e40df31faca467937c7b9d5d2e825471f97822
+# Parent  a246047734b3496a7dc4ebaf1f0232dadf22eab6
+Issue #22359: Disable running cross-compiled _freeze_importlib and pgen
+
+Patch by Xavier de Gaye.
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+--- a/Makefile.pre.in
+++ b/Makefile.pre.in
+@@ -221,6 +221,7 @@ LIBOBJS=	@LIBOBJS@
+ PYTHON=		python$(EXE)
+ BUILDPYTHON=	python$(BUILDEXE)
+ 
+cross_compiling=@cross_compiling@
+ PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@
+ _PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@
+ BUILD_GNU_TYPE=	@build@
+@@ -718,12 +719,16 @@ Programs/_freeze_importlib: Programs/_fr
+ 	$(LINKCC) $(PY_LDFLAGS) -o $@ Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+ 
+ Python/importlib_external.h: $(srcdir)/Lib/importlib/_bootstrap_external.py Programs/_freeze_importlib
+-	./Programs/_freeze_importlib \
+-		$(srcdir)/Lib/importlib/_bootstrap_external.py Python/importlib_external.h
+	if test "$(cross_compiling)" != "yes"; then \
+	    ./Programs/_freeze_importlib \
+	        $(srcdir)/Lib/importlib/_bootstrap_external.py Python/importlib_external.h; \
+	fi
+ 
+ Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib
+-	./Programs/_freeze_importlib \
+-		$(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h
+	if test "$(cross_compiling)" != "yes"; then \
+	    ./Programs/_freeze_importlib \
+	        $(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h; \
+	fi
+ 
+ 
+ ############################################################################
+@@ -784,10 +789,18 @@ Python/sysmodule.o: $(srcdir)/Python/sys
+ $(IO_OBJS): $(IO_H)
+ 
+ $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN)
+-		@$(MKDIR_P) Include
+-		$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
+	@$(MKDIR_P) Include
+	if test "$(cross_compiling)" != "yes"; then \
+		$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C); \
+	else \
+		cp $(srcdir)/Include/graminit.h $(GRAMMAR_H); \
+	fi
+ $(GRAMMAR_C): $(GRAMMAR_H)
+-		touch $(GRAMMAR_C)
+	if test "$(cross_compiling)" != "yes"; then \
+		touch $(GRAMMAR_C); \
+	else \
+		cp $(srcdir)/Python/graminit.c $(GRAMMAR_C); \
+	fi
+ 
+ $(PGEN): $(PGENOBJS)
+ 		$(CC) $(OPT) $(PY_LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
+++ b/configure.ac
+@@ -49,6 +49,7 @@ fi
+ AC_CONFIG_SRCDIR([Include/object.h])
+ AC_CONFIG_HEADER(pyconfig.h)
+ 
+AC_SUBST(cross_compiling)
+ AC_CANONICAL_HOST
+ AC_SUBST(build)
+ AC_SUBST(host)
+
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/CVE-2013-4238_py27.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/CVE-2013-4238_py27.patch
@ -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@python.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@python.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@python.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@python.org'),))
-+        self.assertEqual(p['subject'], subject)
-+        self.assertEqual(p['issuer'], subject)
-+        self.assertEqual(p['subjectAltName'],
-+                         (('DNS', 'altnull.python.org\x00example.com'),
-+                         ('email', 'null@python.org\x00user@example.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 */
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/CVE-2013-4238_py33.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/CVE-2013-4238_py33.patch
@ -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@python.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@python.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@python.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@python.org'),))
-+        self.assertEqual(p['subject'], subject)
-+        self.assertEqual(p['issuer'], subject)
-+        self.assertEqual(p['subjectAltName'],
-+                         (('DNS', 'altnull.python.org\x00example.com'),
-+                         ('email', 'null@python.org\x00user@example.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 */
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/pydoc.conf
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/pydoc.conf
@ -1,5 +1,5 @@
 # /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 $
+# $Id$

 # This file contains the configuration for pydoc's internal webserver.

--- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/pydoc.init
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/pydoc.init
@ -1,7 +1,7 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Technologies, Inc.
+#!/sbin/openrc-run
+# Copyright 1999-2016 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 $
+# $Id$

 start() {
 	local pydoc_port="${@PYDOC_PORT_VARIABLE@-${PYDOC_PORT}}"
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7-issue16248.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7-issue16248.patch
@ -1,19 +0,0 @@
-# HG changeset patch
-# User Antoine Pitrou <solipsis@pitrou.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'):
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7-issue18851.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7-issue18851.patch
@ -1,287 +0,0 @@
-# HG changeset patch
-# User Antoine Pitrou <solipsis@pitrou.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)
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7.10-cross-compile-warn-test.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7.10-cross-compile-warn-test.patch
@ -0,0 +1,24 @@
+https://bugs.python.org/issue25397
+
+improve the cross-compile tests to be more focused
+
+--- a/configure.ac
+++ b/configure.ac
+@@ -1339,7 +1339,7 @@ if test "$GCC" = "yes"
+ then
+   AC_MSG_CHECKING(whether gcc supports ParseTuple __format__)
+   save_CFLAGS=$CFLAGS
+-  CFLAGS="$CFLAGS -Werror -Wformat"
+  CFLAGS="$CFLAGS -Werror=format"
+   AC_COMPILE_IFELSE([
+     AC_LANG_PROGRAM([[void f(char*,...)__attribute((format(PyArg_ParseTuple, 1, 2)));]], [[]])
+   ],[
+@@ -4458,7 +4458,7 @@ then
+   [ac_cv_have_long_long_format="cross -- assuming no"
+    if test x$GCC = xyes; then
+     save_CFLAGS=$CFLAGS
+-    CFLAGS="$CFLAGS -Werror -Wformat"
+    CFLAGS="$CFLAGS -Werror=format"
+     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+         #include <stdio.h>
+         #include <stddef.h>
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7.10-system-libffi.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7.10-system-libffi.patch
@ -0,0 +1,36 @@
+make sure we respect the system libffi setting in our build config.
+the compiler probing is fragile and can break in some situations.
+
+--- a/setup.py
+++ b/setup.py
+@@ -2069,7 +2069,7 @@ class PyBuildExt(build_ext):
+         return True
+ 
+     def detect_ctypes(self, inc_dirs, lib_dirs):
+-        self.use_system_libffi = False
+        self.use_system_libffi = ('--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"))
+         include_dirs = []
+         extra_compile_args = []
+         extra_link_args = []
+@@ -2113,7 +2113,7 @@ class PyBuildExt(build_ext):
+                              sources=['_ctypes/_ctypes_test.c'])
+         self.extensions.extend([ext, ext_test])
+ 
+-        if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"):
+        if not self.use_system_libffi:
+             return
+ 
+         if host_platform == 'darwin':
+@@ -2141,10 +2141,10 @@ class PyBuildExt(build_ext):
+                     ffi_lib = lib_name
+                     break
+ 
+-        if ffi_inc and ffi_lib:
+        if ffi_inc:
+             ext.include_dirs.extend(ffi_inc)
+        if ffi_lib:
+             ext.libraries.append(ffi_lib)
+-            self.use_system_libffi = True
+ 
+ 
+ class PyBuildInstall(install):
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7.5-library-path.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7.5-library-path.patch
@ -1,25 +0,0 @@
-# HG changeset patch
-# User Ned Deily <nad@acm.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
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7.5-re_unsigned_ptrdiff.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7.5-re_unsigned_ptrdiff.patch
@ -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;
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7.6-recvfrom_into_buffer_overflow.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7.6-recvfrom_into_buffer_overflow.patch
@ -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 */
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.2-CVE-2013-2099.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.2-CVE-2013-2099.patch
@ -1,51 +0,0 @@
-# HG changeset patch
-# User Antoine Pitrou <solipsis@pitrou.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)
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.2-CVE-2014-1912.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.2-CVE-2014-1912.patch
@ -1,51 +0,0 @@
-# HG changeset patch
-# User Benjamin Peterson <benjamin@python.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);
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.2-CVE-2014-4616.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.2-CVE-2014-4616.patch
@ -1,39 +0,0 @@
-# HG changeset patch
-# User Benjamin Peterson <benjamin@python.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;
-     }
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.2-issue16248.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.2-issue16248.patch
@ -1,19 +0,0 @@
-# HG changeset patch
-# User Georg Brandl <georg@python.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'):
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.3-CVE-2013-2099.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.3-CVE-2013-2099.patch
@ -1,51 +0,0 @@
-# HG changeset patch
-# User Antoine Pitrou <solipsis@pitrou.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)
--- a/Show More
+++ b/Show More