Merge pull request #641 from dm0-/glibc

Sync profiles and bump Python

sdk_container/src/third_party/portage-stable/dev-libs/glib/Manifest

@@ -1,22 +1,5 @@
-AUX glib-1.2.10-automake-1.13.patch 655 SHA256 60b7ee39df624177c3a58c982bc3c8b1649d5501997f57a549927d94406c98ec SHA512 3abbcdb8c7e4bec4fa10340b42cc1f088955baf50995b62c92525bd633ce159d204c37c744fe22e144eb01201dbcc23313c1424e0e3d5bfebe746c7a470f465b WHIRLPOOL 45fe4e51d62e31efdb4d2b25d5f30f0468684327745e57a6b427c8f441c8026639a462a27e7843eef52e9502f28a0f81617bf1a11ece680ff1fa62151c21996e
+DIST glib-2.50.3.tar.xz 7589284 BLAKE2B 8648e5d9e8f4c943ca3ec5a5ec01f380f55f76555bf4ec731e211b33d0e23c29ea2a9323e2e839f35f89f292863df76d4e8c622fc44c0e5905eb904576618dbd SHA512 ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af
-AUX glib-1.2.10-automake.patch 827 SHA256 db6d22caf4054c09467b50b6d85566eec7479a29169460950e423c083332ef67 SHA512 5334044b5c16695ad21648b9ddbaf85480ebb9a6a8fe49675cc471541665af4e493612fdf7bc28508391a21bc3585faee1b576d9d6510bf823508dec8b4c9af7 WHIRLPOOL b2f2d3acfeb26d9a3d3767b53b662055f46dc64952c976d654558531b28c3c922be4da6b6aa077753960f4c3cc7f9b73ef6b9bb9169434e6c9d7b8dcca2fc840
+DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
-AUX glib-1.2.10-configure-LANG.patch 1464 SHA256 32377819896297caf9628f382c7bba09ee0a049bd977e9ea927314c0c2e669b4 SHA512 a83e3d51775ee696dd4f862eef9d973e62bb157562c4ba5d6e25708f4140af35e4473b92e61541c0efea175223b64575fd23e08f666980ad8063ba1acb19b002 WHIRLPOOL a46a8f5e3574feeba640262823705584da98f3bfbb4699378a746d66290edf65804add1f59ec244c04d78492dcb2b4a7a9981ab9633ec0b3b373fd105b5175f6
+DIST glib-2.54.3-patchset.tar.xz 39488 BLAKE2B 0bebd1f8eadd1796c355dbad20739ec2428a5b67e363e6ea61e2bab1e672506c438c80c602e87ec7d221ad92ad5c52adf7b57fb13441835e41f1e1208c26c6db SHA512 3d880c2681893da9267c8b2ba9a695eddbb1cef63f4ea26e052ce2f69e1e9d78eccdb27b235cbf0693ecd262bd70d020b24f82fc72ab11a4dbc2c929cfb72942
-AUX glib-1.2.10-gcc34-fix.patch 2008 SHA256 848620bc200c2a42d726744fe6c36e20a396624e82b0c742b726dd72287e6cdd SHA512 2f8bec2a10828c57da507d73a308ffec6b1069cdd7704e3128aeabe9f031952c71c900062de782bd464bec101bbf925586f88336bb0f8ac05dda00b1a269158a WHIRLPOOL 602ce9ff26da42417be8f8c03e2cad33e31a3a8fea0b1392fb95253fb7c3f8424b28a2c910cd532b1932a37c9b334d0150d273c43d1389bd7107c897b3923c9a
+DIST glib-2.54.3.tar.xz 7836536 BLAKE2B 140e7cf09a41b72a5b22e5b87e9674cbfdfe1b82f3cf5f0fd3ecb2ed6b1f62a90f8b4c0bc2f655e297f91394f771f6ecad210357e31f104ee49ca178be6b9d76 SHA512 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d
-AUX glib-1.2.10-m4.patch 225 SHA256 c470b3ecc3b8fd6a2d52df816a1c4ccb3ad2d6048e37894f415c8ea9c7925b68 SHA512 b754a680cff0fdbaade899152e597cfc4351cbbf6adf931a5f4f856823e1e6e68b54aa5f318f33476d497a8ae39b0d2dbb2a32792aec1727d196a014315cac12 WHIRLPOOL fbd2fd7b06a7fd0617f1b0ea4746d59a68977a9133e7eb37a64fad5f825e58b64a42c920f2435b61deeb075fe6e5401a361b30d3cdd175007f5ab5f2453b182b
+DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
-AUX glib-2.34.0-testsuite-skip-thread4.patch 1296 SHA256 91cc22f43c04599826e9e15efffb3a668f73208391b047f321c993e27c3a9dd9 SHA512 e7e12c40d3da03c3420c1d0e161d5583e30a3185300a660408ddf78ffe0bbf2d812eb9180b6e7e013370a880d5f5e020cbdf45bebaa8fa8d74f6f4af8822c5aa WHIRLPOOL 876a1740f520d0e9f4cc26b55a20e6f6b0d979de801edeb8262b53a68130e35c0a968081658ea89ae47e4a9a7e273ee6ef2c74dfe011e103c69cfb9bfc4d6c0f
-AUX glib-2.40.0-external-gdbus-codegen.patch 3901 SHA256 d06d2775c3632212c11eceb715f0da6a3b1ab6d8d901bb2fcb7c1fc3ca6b004a SHA512 2f960a53cf51f809af6788664e2cd6d67a29eb58dfe34156f665e2d5ae1fd53a3c792714672fc82dcbfae38e1c793a3eef07116484511ef21d96536559339b00 WHIRLPOOL 39dc4d38e6a3450cbba3a1843096da330b6b2bc8954b9cce4a890454e5546d3e6440ddd237772407bd4ffec05b78eb6ddddb5c4cb6c86a86e01a5ad4c96fe8b0
-AUX glib-2.44.1-bionic-nameser.patch 431 SHA256 1271536b08bdf777f861f26c304bb75bb93698f146150f54c8be00b224cf8d30 SHA512 793327765d4f18e7a018cd6f3de76b51cef6b04359f3fd3ae1335b91bd9db55607ced717eee5aaa824ee5879fae9149fd03ae252a6e064155e1ede5d3618d56a WHIRLPOOL 178417ed8cf89df233bc7e8b044a950699ce6297556fbe4927fcd9027af53a734842c2bee101b8aca745f470d94e6e3e7f3c9c1e5a4f4b2a2cee3132c84fa6e7
-DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 SHA256 3bb8c45706f97b526da851061c89618bc258fa61f9100802c1340548e4bb2731 SHA512 e65c7f66254eae22deaa67bf621ebd1d7af897b93d93ba6cffaa4ce9894cf14c140e6888d877b6b36fcea8be1b8d1ef4fcc7ec1719bd23b1cc6fd662876c70ae WHIRLPOOL 20254678a86595353058ee8dc81a02e4ae7bb16ba9ba34e036fe2e99d3fffa25c825f8961bdeb5fa50c49582ce37e65684e414631c74653c4523c2baee34c341
-DIST glib-1.2.10.tar.gz 421480 SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f SHA512 4452b741382194d4ca425f084fa60e1a9e30040ac2e839c9136047d0461cf4b1ebcc16aac4e65998d1b9329ead8f617966b3d09317a83634f14d556a7e14b7a8 WHIRLPOOL 478957ce8e49228d022bae50b042cdfc6d522d0d4880a0328b5695471295450c81c5e186e1760e56e317a4c4c95aabc5f2010d7a9b912fc451d04e14610e7dca
-DIST glib-2.40.2.tar.xz 7001344 SHA256 e8ff8af2950897e805408480c454c415d1eade4e670ec5fb507f5e5853726c7a SHA512 6d4c254a033a2e558574fb1aa95f6f3215a24d49d69cdb353f0186cac186eb1301563ab271ac86d82734dd1586d88fdd9d53f1c0e2b43f103aae53223884c153 WHIRLPOOL 2b5bfb3647cd802264716cc69ea0e7e26385b9b0db0610ea7078ba99a0a90dadc9197c49fa122cc8082a8edb166ad8f2d6be76e5b7491e786c74ce4aac91d472
-DIST glib-2.42.2.tar.xz 7002480 SHA256 a3cc1ebd2bd310a9fdf42ae4293ee713cdf1764bd29f552febf3bf44cadae7db SHA512 6b46e4ac67d79ca2cc5c32ceb7cc8112140645032cb3c8c9ba2f59a0d3c2aee06707b7573bbd72f6c21ea7798a7351bd205aa57857a58b0be008c75f897ef782 WHIRLPOOL 5c25c5f6d20217cce4f8c34d9d05cd39197b4b36c5a85447943fcab47cd343253879516b722eb0c4895eebae5f3d4e76c820730b9e7f6c890aca9c87dc963564
-DIST glib-2.44.1.tar.xz 7132940 SHA256 8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07 SHA512 c24d307408e061b2657f7e7d1b8245c55605ebda26ee2dcc3497ee9d90bfc137d8e5f42f0cd5acf4b49ea28c424fa901e81f75ecf81833f6d0fe51d5e36e5888 WHIRLPOOL 6a1eef94b3ffed4d5cb551f4def6859ddff8ea0aac50048e706863f2bd4957c40b7034946852fa4604a109eb121c55b94ec51b3708a325ace5692f61fd1babb7
-DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
-EBUILD glib-1.2.10-r5.ebuild 1695 SHA256 af1a1f3d778e648aeb8b543ec868ee75ed30a279ff811fa11b58c9a3ef79d4d3 SHA512 f2568684b4d6478542d8efb2348b643b751c521d19cb0afe2a501e956a1a2c0355f074f4805a6dcb4d0fbf4ece226958006ffd55db22aa39dd5910687379f471 WHIRLPOOL 98e94e6a8b548f8445044d507977d3b96afb4534b4c49c705bf4a0d244ab936ec7c24aa28234df870f74db63559caad07c00af4ddf4451e21bea61b51480710d
-EBUILD glib-1.2.10-r6.ebuild 1943 SHA256 ee926301dbb2471839505525af070a68055d23554f189c8296a7a03cb512d392 SHA512 a05064d3710007a6c995c7bfda8a8b7e54052267b495d58fe917854a567586bdd8a0f99761a997f64716725a0e3cd0f532025c26cc4a1697e1b0787e469ca890 WHIRLPOOL 34ed4949081dabf0e2b7aeace4fcc6a2efa150af39c53f6d9260cb3d34bc4d4790e40185c36e6a3c6b582b7c660ddb4d5e538f737f6fbead69cfe1daf2206b7b
-EBUILD glib-2.40.2.ebuild 9517 SHA256 677f98fa4c079683d82261bd9c1658199b6c06609e8607e219278dc5725829f3 SHA512 b0de5e7aab2da3ff1fcd1bca8e4f03340e660357242c1f6ed6c404a6c67ce992a6280d586c73abe44afe8e96d156f57833bae76709d74dac015aea6120ecf6b1 WHIRLPOOL 799a3146041651e733a60ececfa2ad697bbefd620e94520717fe69c8d4c443a2e89a3ed2a812b14a8f3b6fd5fcac237fd6c98a0f97ce8e3ebd32eddb730d208a
-EBUILD glib-2.42.2.ebuild 9380 SHA256 df54675f7596385831c2d3baaf5c5b42803e62e1555e4b709ae9aa02bb17dea7 SHA512 7f3bbe6b2030472bc62694bbb896bac13580be86c4f74d6b3ba13c9240e29457e60b207f5d4d89ea59eb0c728d0a3df761b59199d01aa4d96ad9aedbef24c055 WHIRLPOOL f854ef91c9962ac749f33d2c365c21d630bed4fecb92cf13dc6ed04023533db2cfd1513629ae88cf8b29e9de8c0de059620cda19e9e10610699a29926eda5c02
-EBUILD glib-2.44.1-r1.ebuild 9900 SHA256 c79c77937e91719fd2c25934262df740542c408ae110a5bb3b2dbfca6968d162 SHA512 3fd30711d4ea000f5fb37146baaeb9582f17e828f4cbd8c38cc6cf64f4ee7e2716107f60f4f06b09e4a1decf0c9db5891f52dfd39eeddfa77f520bb27ffb6160 WHIRLPOOL 300d8fd37325901685ed9c862e24fe9e358a4f853b1c750aa6308533537daf0763c3c9fb286b1bbc5293bee36a624f1067b01422a44a6b1558de73ed331e0708
-EBUILD glib-2.44.1.ebuild 9383 SHA256 8584b02794d1bb4c28c2ba59143f0ae27866e8e595829fb676785c2041f4f6ed SHA512 9da12d3296f5fc1d2352f847b0f005619423963ed420f2268584f4432299cfd99b0422384d55b9280693413be58c7f8022aace468150dc5594ba49c62115bf71 WHIRLPOOL 3020d1d57193af71503b56342af14b988c7557bfe537ea74085ee6d532d5f6424d4ec015d3739a8e17c7a40c5bc7b1af0fb15238d4bc2d873b72f929899dcb88
-MISC ChangeLog 92374 SHA256 30a20f59548fd99c9a9ddb519d9ae68e9319cd71f98ba2c5c2c8b13f72157af5 SHA512 d5c234d42873ec089c5c8cb2b8a449921581eb5fbf15d99c0cdbc3225a351d5dbee9ca87ac247a288d8fae19e737abf7e25af3ada02c9652697d374a9d1604e0 WHIRLPOOL a8fe2063c847f3330b09ef231aa49566934ec69e7aa5c0f23d42446af537aeb53bf801743808dcb447062026d15c5f1ce54ae0c58278a398fae5990d6b1f997b
-MISC metadata.xml 856 SHA256 d672c4abe98897f017bb0b12e4d18a7b18d32a26ba1ba77ae79d496f207df119 SHA512 20bd4843474cdd7c6bf3cad3b64d6dd95428ccf18dd7c24592ace7fce3875c15db23042d4b353ee22db0773f46ebe2528ad607220189cdc4cdf15e14adee67b9 WHIRLPOOL d6a031d6d9b30f484908174b2f48266d03f1a2e7272ede4948a81ba76fb3243cbf5c0c458c6d9548fa421c9e883b96c85a797114dfb68df532db7a76adcb08d3

sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-1.2.10-automake-1.13.patch

@@ -1,23 +0,0 @@
-Replace macros deprecated in automake-1.13; fixed upstream in glib-2.36
-
-diff --git a/configure.in b/configure.in
-index e94cc77..d88d834 100644
---- a/configure.in
-+++ b/configure.in
-@@ -60,7 +60,7 @@ PACKAGE=glib
- AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
- 
- # Specify a configuration file
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- AC_DEFINE_UNQUOTED(GLIB_MAJOR_VERSION, $GLIB_MAJOR_VERSION)
- AC_DEFINE_UNQUOTED(GLIB_MINOR_VERSION, $GLIB_MINOR_VERSION)
-@@ -151,7 +151,6 @@ AC_DEFINE_UNQUOTED(G_COMPILED_WITH_DEBUGGING, "${enable_debug}")
- 
- # Checks for programs.
- AC_PROG_CC
--AM_PROG_CC_STDC
- AC_PROG_INSTALL
- 
- changequote(,)dnl

sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-1.2.10-automake.patch

@@ -1,29 +0,0 @@
-fix errors with newer automake:
-
-gmodule/Makefile.am:44: testgmodule_LDFLAGS must be set with `=' before using `+='
-
-Makefile.am:73: BUILT_SOURCES multiply defined in condition TRUE ...
-Makefile.am:11: ... `BUILT_SOURCES' previously defined here
-
---- Makefile.am
-+++ Makefile.am
-@@ -70,7 +70,7 @@
- 
- CONFIGURE_DEPENDENCIES = acglib.m4		
- 
--BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
-+BUILT_SOURCES += stamp-gc-h #note: not glibconfig.h
- glibconfig.h: stamp-gc-h
- 	@:
- stamp-gc-h: config.status
---- gmodule/Makefile.am
-+++ gmodule/Makefile.am
-@@ -41,7 +41,7 @@
- libgplugin_b_la_LIBADD = @G_MODULE_LIBS@  $(libglib)
- 
- noinst_PROGRAMS = testgmodule
--testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@
-+testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@
- testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@
- 
- .PHONY: files release

sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-1.2.10-configure-LANG.patch

@@ -1,44 +0,0 @@
-The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in 
-option parsing, it may break.
-
-http://bugs.gentoo.org/133679
-
---- configure
-+++ configure
-@@ -54,6 +54,19 @@
- infodir='${prefix}/info'
- mandir='${prefix}/man'
- 
-+# NLS nuisances.
-+for as_var in \
-+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+  LC_TELEPHONE LC_TIME
-+do
-+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+    eval $as_var=C; export $as_var
-+  else
-+    unset $as_var
-+  fi
-+done
-+
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-@@ -452,16 +463,6 @@
-   esac
- done
- 
--# NLS nuisances.
--# Only set these to C if already set.  These must not be set unconditionally
--# because not all systems understand e.g. LANG=C (notably SCO).
--# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
--# Non-C LC_CTYPE values break the ctype check.
--if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
--if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
--if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
--if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
--
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
- rm -rf conftest* confdefs.h
- # AIX cpp loses on an empty file, so make sure it contains at least a newline.

sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-1.2.10-gcc34-fix.patch

@@ -1,41 +0,0 @@
---- glib-1.2.10/gstrfuncs.c.orig	2001-02-27 07:00:22.000000000 +0100
-+++ glib-1.2.10/gstrfuncs.c	2004-03-01 13:19:49.531603760 +0100
-@@ -867,7 +867,7 @@
-                   /* beware of positional parameters
-                    */
-                 case '$':
--                  g_warning (G_GNUC_PRETTY_FUNCTION
-+                  g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION,
-                              "(): unable to handle positional parameters (%%n$)");
-                   len += 1024; /* try adding some safety padding */
-                   break;
-@@ -1034,7 +1034,7 @@
-                   /*          n   .   dddddddddddddddddddddddd   E   +-  eeee */
-                   conv_len += 1 + 1 + MAX (24, spec.precision) + 1 + 1 + 4;
-                   if (spec.mod_extra_long)
--                    g_warning (G_GNUC_PRETTY_FUNCTION
-+                    g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION,
-                                "(): unable to handle long double, collecting double only");
- #ifdef HAVE_LONG_DOUBLE
- #error need to implement special handling for long double
-@@ -1077,7 +1077,7 @@
-                   conv_done = TRUE;
-                   if (spec.mod_long)
-                     {
--                      g_warning (G_GNUC_PRETTY_FUNCTION
-+                      g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION,
-                                  "(): unable to handle wide char strings");
-                       len += 1024; /* try adding some safety padding */
-                     }
-@@ -1108,9 +1108,8 @@
-                   conv_len += format - spec_start;
-                   break;
-                 default:
--                  g_warning (G_GNUC_PRETTY_FUNCTION
--                             "(): unable to handle `%c' while parsing format",
--                             c);
-+                  g_warning ("%s(): unable to handle `%c' while parsing format",
-+                             G_GNUC_PRETTY_FUNCTION, c);
-                   break;
-                 }
-               conv_done |= conv_len > 0;

sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-1.2.10-m4.patch

@@ -1,9 +0,0 @@
-Fix aclocal warning:
-/usr/share/aclocal/glib.m4:8: warning: underquoted definition of AM_PATH_GLIB
---- glib-1.2.10/glib.m4
-+++ glib-1.2.10/glib.m4
-@@ -7,3 +7,3 @@
- dnl
--AC_DEFUN(AM_PATH_GLIB,
-+AC_DEFUN([AM_PATH_GLIB],
- [dnl 

sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch

@@ -1,44 +0,0 @@
-From 4881b5d303512208b55f5bf78b91cd6a85e5034c Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Tue, 3 Jul 2012 11:21:56 +0300
-Subject: [PATCH 2/4] Gentoo: skip over thread/thread4 test failure
-
-https://bugzilla.gnome.org/show_bug.cgi?id=679306
----
- glib/tests/thread.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/glib/tests/thread.c b/glib/tests/thread.c
-index 539782e..179ec06 100644
---- a/glib/tests/thread.c
-+++ b/glib/tests/thread.c
-@@ -124,6 +124,8 @@ test_thread3 (void)
-   g_assert_cmpint (GPOINTER_TO_INT(result), ==, 9);
- }
- 
-+#if 0
-+// https://bugzilla.gnome.org/show_bug.cgi?id=679306
- /* test that thread creation fails as expected,
-  * by setting RLIMIT_NPROC ridiculously low
-  */
-@@ -158,6 +160,7 @@ test_thread4 (void)
-     g_error ("resetting RLIMIT_NPROC failed: %s\n", g_strerror (ret));
- #endif
- }
-+#endif
- 
- static void
- test_thread5 (void)
-@@ -203,7 +206,9 @@ main (int argc, char *argv[])
-   g_test_add_func ("/thread/thread1", test_thread1);
-   g_test_add_func ("/thread/thread2", test_thread2);
-   g_test_add_func ("/thread/thread3", test_thread3);
-+#if 0
-   g_test_add_func ("/thread/thread4", test_thread4);
-+#endif
-   g_test_add_func ("/thread/thread5", test_thread5);
-   g_test_add_func ("/thread/thread6", test_thread6);
- 
--- 
-1.8.3.2
-

sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.44.1-bionic-nameser.patch

@@ -1,15 +0,0 @@
-https://bugzilla.gnome.org/756477
-
-fix build w/newer releases of bionic (android)
-
---- a/gio/gthreadedresolver.c
-+++ b/gio/gthreadedresolver.c
-@@ -263,7 +263,7 @@ lookup_by_address_finish (GResolver     *resolver,
- 
- #if defined(G_OS_UNIX)
- 
--#ifdef __BIONIC__
-+#if defined __BIONIC__ && !defined BIND_4_COMPAT
- /* Copy from bionic/libc/private/arpa_nameser_compat.h
-  * and bionic/libc/private/arpa_nameser.h */
- typedef struct {

sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.50.0-external-gdbus-codegen.patch

@@ -1,8 +1,8 @@
 diff --git a/configure.ac b/configure.ac
-index a01e58d..59d4527 100644
+index e8e7553..216e59d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -367,14 +367,14 @@ AC_SUBST(PERL_PATH)
+@@ -385,14 +385,14 @@ AC_SUBST(PERL_PATH)
  # option to specify python interpreter to use; this just sets $PYTHON, so that
  # we will fallback to reading $PYTHON if --with-python is not given, and
  # python.m4 will get the expected input
@@ -25,7 +25,7 @@ index a01e58d..59d4527 100644
  
  
  dnl ***********************
-@@ -3580,7 +3580,6 @@ gobject/glib-mkenums
+@@ -3453,7 +3453,6 @@ gobject/glib-mkenums
  gobject/tests/Makefile
  gthread/Makefile
  gio/Makefile
@@ -34,21 +34,19 @@ index a01e58d..59d4527 100644
  gio/gnetworking.h
  gio/xdgmime/Makefile
 diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
-index 47fdd38..c7eb136 100644
+index 5741a3e..d38e768 100644
 --- a/docs/reference/gio/Makefile.am
 +++ b/docs/reference/gio/Makefile.am
-@@ -157,8 +157,7 @@ man_MANS +=			\
+@@ -177,7 +177,6 @@ man_MANS +=				\
- 	glib-compile-resources.1	\
+ 	gsettings.1			\
- 	gsettings.1		\
+ 	gresource.1			\
- 	gresource.1		\
+ 	gdbus.1				\
--	gdbus.1			\
+-	gdbus-codegen.1			\
--	gdbus-codegen.1
+ 	gio.1				\
-+	gdbus.1
+ 	$(NULL)
  
- XSLTPROC_FLAGS = \
-         --nonet \
 diff --git a/gio/Makefile.am b/gio/Makefile.am
-index e993e2f..025ad94 100644
+index ffe5ee2..929d1b5 100644
 --- a/gio/Makefile.am
 +++ b/gio/Makefile.am
 @@ -1,6 +1,6 @@
@@ -60,10 +58,10 @@ index e993e2f..025ad94 100644
  if OS_UNIX
  SUBDIRS += xdgmime
 diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index 2c54e59..3cd3c5a 100644
+index 749267b..f2a8c63 100644
 --- a/gio/tests/Makefile.am
 +++ b/gio/tests/Makefile.am
-@@ -437,10 +437,8 @@ gnotification_SOURCES                    = $(gdbus_sessionbus_sources) gnotifica
+@@ -449,10 +449,8 @@ gnotification_SOURCES                    = $(gdbus_sessionbus_sources) gnotifica
  
  BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
  gdbus-test-codegen.o: gdbus-test-codegen-generated.h
@@ -77,7 +75,7 @@ index 2c54e59..3cd3c5a 100644
  		--generate-c-code gdbus-test-codegen-generated \
  		--c-generate-object-manager \
 diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
-index d6d1412..62ef706 100644
+index 1d0464c..0603d9b 100644
 --- a/gio/tests/gdbus-object-manager-example/Makefile.am
 +++ b/gio/tests/gdbus-object-manager-example/Makefile.am
 @@ -11,10 +11,8 @@ GDBUS_GENERATED = \

sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.50.3-fix-gdatetime-tests.patch

@@ -0,0 +1,52 @@
+From ec02a1875f29ecb8e46c0d8c1403cd00a0b3a9e4 Mon Sep 17 00:00:00 2001
+From: Iain Lane <iain@orangesquash.org.uk>
+Date: Mon, 13 Mar 2017 16:52:11 +0000
+Subject: [PATCH] tests/gdatetime: Use a real rather than invented timezone
+
+The tzdata maintainers had previously invented abbreviations for
+timezones. As of their 2017a release, the one we were testing ("BRT")
+has been dropped.
+
+Switch to testing PST, which is a real timezone abbreviation.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=779799
+---
+ glib/tests/gdatetime.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/glib/tests/gdatetime.c b/glib/tests/gdatetime.c
+index dcb8a8f..c54031d 100644
+--- a/glib/tests/gdatetime.c
++++ b/glib/tests/gdatetime.c
+@@ -635,22 +635,22 @@ test_GDateTime_new_full (void)
+   g_date_time_unref (dt);
+ 
+ #ifdef G_OS_UNIX
+-  tz = g_time_zone_new ("America/Recife");
++  tz = g_time_zone_new ("America/Tijuana");
+ #elif defined G_OS_WIN32
+-  tz = g_time_zone_new ("E. South America Standard Time");
++  tz = g_time_zone_new ("Pacific Standard Time");
+ #endif
+-  dt = g_date_time_new (tz, 2010, 5, 24, 8, 4, 0);
++  dt = g_date_time_new (tz, 2010, 11, 24, 8, 4, 0);
+   g_time_zone_unref (tz);
+   g_assert_cmpint (2010, ==, g_date_time_get_year (dt));
+-  g_assert_cmpint (5, ==, g_date_time_get_month (dt));
++  g_assert_cmpint (11, ==, g_date_time_get_month (dt));
+   g_assert_cmpint (24, ==, g_date_time_get_day_of_month (dt));
+   g_assert_cmpint (8, ==, g_date_time_get_hour (dt));
+   g_assert_cmpint (4, ==, g_date_time_get_minute (dt));
+   g_assert_cmpint (0, ==, g_date_time_get_second (dt));
+ #ifdef G_OS_UNIX
+-  g_assert_cmpstr ("BRT", ==, g_date_time_get_timezone_abbreviation (dt));
++  g_assert_cmpstr ("PST", ==, g_date_time_get_timezone_abbreviation (dt));
+ #elif defined G_OS_WIN32
+-  g_assert_cmpstr ("E. South America Standard Time", ==,
++  g_assert_cmpstr ("Pacific Standard Time", ==,
+                     g_date_time_get_timezone_abbreviation (dt));
+ #endif
+   g_assert (!g_date_time_is_daylight_savings (dt));
+-- 
+2.10.1
+

sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen.patch

@@ -0,0 +1,86 @@
+From 2e47d49bc91d83cd0abea4c1944bfca4336040fa Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <sobhan@gentoo.org>
+Date: Fri, 23 Feb 2018 15:27:33 +0330
+Subject: [PATCH] glib-2.54.3-external-gdbus-codegen-for-autotools
+
+---
+ configure.ac                                       |  1 -
+ docs/reference/gio/Makefile.am                     |  1 -
+ gio/Makefile.am                                    |  2 +-
+ gio/tests/Makefile.am                              |  6 ++----
+ gio/tests/gdbus-object-manager-example/Makefile.am |  6 ++----
+ 5 files changed, 5 insertions(+), 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0457c90..07166c9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3469,7 +3469,6 @@ gobject/glib-mkenums
+ gobject/tests/Makefile
+ gthread/Makefile
+ gio/Makefile
+-gio/gdbus-2.0/codegen/Makefile
+ gio/gdbus-2.0/codegen/config.py
+ gio/gnetworking.h
+ gio/xdgmime/Makefile
+diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
+index 5741a3e..d38e768 100644
+--- a/docs/reference/gio/Makefile.am
++++ b/docs/reference/gio/Makefile.am
+@@ -177,7 +177,6 @@ man_MANS +=				\
+ 	gsettings.1			\
+ 	gresource.1			\
+ 	gdbus.1				\
+-	gdbus-codegen.1			\
+ 	gio.1				\
+ 	$(NULL)
+ 
+diff --git a/gio/Makefile.am b/gio/Makefile.am
+index b2db995..53d7162 100644
+--- a/gio/Makefile.am
++++ b/gio/Makefile.am
+@@ -1,6 +1,6 @@
+ include $(top_srcdir)/glib.mk
+ 
+-SUBDIRS = gdbus-2.0/codegen
++SUBDIRS = 
+ 
+ if OS_UNIX
+ if !OS_COCOA
+diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
+index acc1da4..7c51eab 100644
+--- a/gio/tests/Makefile.am
++++ b/gio/tests/Makefile.am
+@@ -460,10 +460,8 @@ gnotification_SOURCES                    = $(gdbus_sessionbus_sources) gnotifica
+ 
+ BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
+ gdbus-test-codegen.o: gdbus-test-codegen-generated.h
+-gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
+-	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
+-		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
+-		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
++gdbus-test-codegen-generated.h: test-codegen.xml Makefile
++	$(AM_V_GEN) gdbus-codegen \
+ 		--interface-prefix org.project. \
+ 		--generate-c-code gdbus-test-codegen-generated \
+ 		--c-generate-object-manager \
+diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
+index 1d0464c..f390dca 100644
+--- a/gio/tests/gdbus-object-manager-example/Makefile.am
++++ b/gio/tests/gdbus-object-manager-example/Makefile.am
+@@ -11,10 +11,8 @@ GDBUS_GENERATED = \
+ 	gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml	\
+ 	$(NULL)
+ 
+-$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
+-	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
+-		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
+-		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
++$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile
++	$(AM_V_GEN) gdbus-codegen \
+ 		--interface-prefix org.gtk.GDBus.Example.ObjectManager. \
+ 		--c-namespace Example \
+ 		--c-generate-object-manager \
+-- 
+2.16.1
+

sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-1.2.10-r5.ebuild

@@ -1,66 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit autotools libtool flag-o-matic eutils portability
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v1.2/${P}.tar.gz
-	 ftp://ftp.gnome.org/pub/GNOME/stable/sources/glib/${P}.tar.gz
-	 mirror://gentoo/glib-1.2.10-r1-as-needed.patch.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="hardened"
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-automake.patch
-	epatch "${FILESDIR}"/${P}-m4.patch
-	epatch "${FILESDIR}"/${P}-configure-LANG.patch #133679
-
-	# Allow glib to build with gcc-3.4.x #47047
-	epatch "${FILESDIR}"/${P}-gcc34-fix.patch
-
-	# Fix for -Wl,--as-needed (bug #133818)
-	epatch "${DISTDIR}"/glib-1.2.10-r1-as-needed.patch.bz2
-
-	# build failure with automake-1.13
-	epatch "${FILESDIR}/${P}-automake-1.13.patch"
-
-	use ppc64 && use hardened && replace-flags -O[2-3] -O1
-	append-ldflags $(dlopen_lib)
-
-	rm -f acinclude.m4 #168198
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	# Bug 48839: pam fails to build on ia64
-	# The problem is that it attempts to link a shared object against
-	# libglib.a; this library needs to be built with -fPIC.  Since
-	# this package doesn't contain any significant binaries, build the
-	# whole thing with -fPIC (23 Apr 2004 agriffis)
-	append-flags -fPIC
-
-	econf \
-		--with-threads=posix \
-		--enable-debug=yes
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog README* INSTALL NEWS
-	dohtml -r docs
-
-	cd "${D}"/usr/$(get_libdir) || die
-	chmod 755 libgmodule-1.2.so.*
-}

sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-1.2.10-r6.ebuild

@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GNOME_TARBALL_SUFFIX="gz"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 libtool flag-o-matic portability multilib-minimal
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="${SRC_URI}
-	 mirror://gentoo/glib-1.2.10-r1-as-needed.patch.bz2
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE="hardened static-libs"
-
-DEPEND=""
-RDEPEND=""
-
-MULTILIB_CHOST_TOOLS=(/usr/bin/glib-config)
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-automake.patch
-	epatch "${FILESDIR}"/${P}-m4.patch
-	epatch "${FILESDIR}"/${P}-configure-LANG.patch #133679
-
-	# Allow glib to build with gcc-3.4.x #47047
-	epatch "${FILESDIR}"/${P}-gcc34-fix.patch
-
-	# Fix for -Wl,--as-needed (bug #133818)
-	epatch "${DISTDIR}"/glib-1.2.10-r1-as-needed.patch.bz2
-
-	# build failure with automake-1.13
-	epatch "${FILESDIR}/${P}-automake-1.13.patch"
-
-	use ppc64 && use hardened && replace-flags -O[2-3] -O1
-	sed -i "/libglib_la_LDFLAGS/i libglib_la_LIBADD = $(dlopen_lib)" Makefile.am || die
-
-	rm -f acinclude.m4 #168198
-
-	mv configure.in configure.ac || die
-
-	eautoreconf
-	elibtoolize
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	# Bug 48839: pam fails to build on ia64
-	# The problem is that it attempts to link a shared object against
-	# libglib.a; this library needs to be built with -fPIC.  Since
-	# this package doesn't contain any significant binaries, build the
-	# whole thing with -fPIC (23 Apr 2004 agriffis)
-	append-flags -fPIC
-
-	ECONF_SOURCE="${S}" \
-	gnome2_src_configure \
-		--with-threads=posix \
-		--enable-debug=yes \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	gnome2_src_install
-
-	chmod 755 "${ED}"/usr/$(get_libdir)/libgmodule-1.2.so.* || die
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dohtml -r docs
-}

sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.40.2.ebuild

@@ -1,275 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-# Building with --disable-debug highly unrecommended.  It will build glib in
-# an unusable form as it disables some commonly used API.  Please do not
-# convert this to the use_enable form, as it results in a broken build.
-GCONF_DEBUG="yes"
-# Completely useless with or without USE static-libs, people need to use
-# pkg-config
-GNOME2_LA_PUNT="yes"
-
-inherit autotools bash-completion-r1 gnome2 libtool eutils flag-o-matic	multilib \
-	pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="${SRC_URI}
-	http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
-REQUIRED_USE="
-	utils? ( ${PYTHON_REQUIRED_USE} )
-	test? ( ${PYTHON_REQUIRED_USE} )
-"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-RDEPEND="
-	!<dev-util/gdbus-codegen-${PV}
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	|| (
-		>=dev-libs/elfutils-0.142
-		>=dev-libs/libelf-0.8.12
-		>=sys-freebsd/freebsd-lib-9.2_rc1
-		)
-	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
-	xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
-	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-	utils? (
-		${PYTHON_DEPS}
-		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-libs/libxslt-1.0
-	>=sys-devel/gettext-0.11
-	>=dev-util/gtk-doc-am-1.20
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	test? (
-		sys-devel/gdb
-		${PYTHON_DEPS}
-		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
-		>=sys-apps/dbus-1.2.14 )
-	!<dev-util/gtk-doc-1.15-r2
-"
-# gobject-introspection blocker to ensure people don't mix
-# different g-i and glib major versions
-
-PDEPEND="!<gnome-base/gvfs-1.6.4-r990
-	mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# Earlier versions of gvfs do not work with glib
-
-#DOCS="AUTHORS ChangeLog* NEWS* README"
-
-pkg_setup() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		if use test; then
-			CONFIG_CHECK="~IPV6"
-			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
-			export IPV6_DISABLED="yes"
-		fi
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
-	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
-
-	# Fix gmodule issues on fbsd; bug #184301, upstream bug #107626
-	# Upstream doesn't even know if this is needed, looks like openBSD
-	# people is not needing it
-#	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
-
-	if use test; then
-		# Do not try to remove files on live filesystem, upstream bug #619274
-		sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
-			-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
-
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die
-			sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
-			sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
-		fi
-
-		# gdesktopappinfo requires existing terminal (gnome-terminal or any
-		# other), falling back to xterm if one doesn't exist
-		if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
-			ewarn "Some tests will be skipped due to missing terminal program"
-			sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
-		fi
-
-		# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
-		if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:3' ; then
-			ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3"
-			ewarn "not being present on your system, think on installing them to get these tests run."
-			sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
-			sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
-			sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
-			sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
-			sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die
-			sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
-			# needed to prevent gdbus-threading from asserting
-			ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
-		fi
-
-		# Some tests need ipv6, upstream bug #667468
-		if [[ -n "${IPV6_DISABLED}" ]]; then
-			sed -i -e "/socket\/ipv6_sync/d" gio/tests/socket.c || die
-			sed -i -e "/socket\/ipv6_async/d" gio/tests/socket.c || die
-			sed -i -e "/socket\/ipv6_v4mapped/d" gio/tests/socket.c || die
-		fi
-
-		# Test relies on /usr/bin/true, but we have /bin/true, upstream bug #698655
-		sed -i -e "s:/usr/bin/true:/bin/true:" gio/tests/desktop-app-info.c || die
-
-		# thread test fails, upstream bug #679306
-		epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
-
-		# This test is prone to fail, bug #504024, upstream bug #723719
-		sed -i -e '/gdbus-close-pending/d' gio/tests/Makefile.am || die
-	else
-		# Don't build tests, also prevents extra deps, bug #512022
-		sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
-	fi
-
-	# gdbus-codegen is a separate package
-	epatch "${FILESDIR}/${PN}-2.40.0-external-gdbus-codegen.patch"
-
-	# leave python shebang alone
-	sed -e '/${PYTHON}/d' \
-		-i glib/Makefile.{am,in} || die
-
-	# Gentoo handles completions in a different directory
-	sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
-		gio/Makefile.am || die
-
-	epatch_user
-
-	# Also needed to prevent cross-compile failures, see bug #267603
-	eautoreconf
-
-	gnome2_src_prepare
-
-	epunt_cxx
-}
-
-multilib_src_configure() {
-	# Avoid circular depend with dev-util/pkgconfig and
-	# native builds (cross-compiles won't need pkg-config
-	# in the target ROOT to work here)
-	if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
-		if has_version sys-apps/dbus; then
-			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
-			export DBUS1_LIBS="-ldbus-1"
-		fi
-		export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
-		export LIBFFI_LIBS="-lffi"
-	fi
-
-	local myconf
-
-	case "${CHOST}" in
-		*-mingw*) myconf="${myconf} --with-threads=win32" ;;
-		*)        myconf="${myconf} --with-threads=posix" ;;
-	esac
-
-	# Only used by the gresource bin
-	multilib_is_native_abi || myconf="${myconf} --disable-libelf"
-
-	# Always use internal libpcre, bug #254659
-	ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
-		$(use_enable xattr) \
-		$(use_enable fam) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable systemtap systemtap) \
-		--disable-compile-warnings \
-		--enable-man \
-		--with-pcre=internal \
-		--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
-
-	if multilib_is_native_abi; then
-		local d
-		for d in glib gio gobject; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	unset GSETTINGS_BACKEND # bug 352451
-	export LC_TIME=C # bug #411967
-	python_export_best
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	# Hardened: gdb needs this, bug #338891
-	if host-is-pax ; then
-		pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
-			|| die "Hardened adjustment failed"
-	fi
-
-	# Need X for dbus-launch session X11 initialization
-	Xemake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog* NEWS* README"
-	einstalldocs
-
-	if use utils ; then
-		python_replicate_script "${ED}"/usr/bin/gtester-report
-	else
-		rm "${ED}usr/bin/gtester-report"
-		rm "${ED}usr/share/man/man1/gtester-report.1"
-	fi
-
-	# Do not install charset.alias even if generated, leave it to libiconv
-	rm -f "${ED}/usr/lib/charset.alias"
-
-	# Don't install gdb python macros, bug 291328
-	rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if has_version '<x11-libs/gtk+-3.0.12:3'; then
-		# To have a clear upgrade path for gtk+-3.0.x users, have to resort to
-		# a warning instead of a blocker
-		ewarn
-		ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes."
-		ewarn "You should upgrade to a newer version of gtk+:3 immediately."
-	fi
-}

sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.44.1.ebuild

@@ -1,270 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
-# adding new dependencies end up making stage3 to grow. Every addition needs
-# then to be think very closely.
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-# Building with --disable-debug highly unrecommended.  It will build glib in
-# an unusable form as it disables some commonly used API.  Please do not
-# convert this to the use_enable form, as it results in a broken build.
-GCONF_DEBUG="yes"
-# Completely useless with or without USE static-libs, people need to use
-# pkg-config
-GNOME2_LA_PUNT="yes"
-
-inherit autotools bash-completion-r1 gnome2 libtool eutils flag-o-matic	multilib \
-	pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="${SRC_URI}
-	http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="dbus fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
-REQUIRED_USE="
-	utils? ( ${PYTHON_REQUIRED_USE} )
-	test? ( ${PYTHON_REQUIRED_USE} )
-"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-RDEPEND="
-	!<dev-util/gdbus-codegen-${PV}
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	|| (
-		>=dev-libs/elfutils-0.142
-		>=dev-libs/libelf-0.8.12
-		>=sys-freebsd/freebsd-lib-9.2_rc1
-		)
-	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
-	xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
-	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-	utils? (
-		${PYTHON_DEPS}
-		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-libs/libxslt-1.0
-	>=sys-devel/gettext-0.11
-	>=dev-util/gtk-doc-am-1.20
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	test? (
-		sys-devel/gdb
-		${PYTHON_DEPS}
-		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
-		>=sys-apps/dbus-1.2.14 )
-	!<dev-util/gtk-doc-1.15-r2
-"
-# gobject-introspection blocker to ensure people don't mix
-# different g-i and glib major versions
-
-PDEPEND="!<gnome-base/gvfs-1.6.4-r990
-	dbus? ( gnome-base/dconf )
-	mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# dconf is needed to be able to save settings, bug #498436
-# Earlier versions of gvfs do not work with glib
-
-pkg_setup() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		if use test; then
-			CONFIG_CHECK="~IPV6"
-			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
-			export IPV6_DISABLED="yes"
-		fi
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
-	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
-
-	if use test; then
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die
-			sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
-			sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
-		fi
-
-		# gdesktopappinfo requires existing terminal (gnome-terminal or any
-		# other), falling back to xterm if one doesn't exist
-		if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
-			ewarn "Some tests will be skipped due to missing terminal program"
-			sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
-		fi
-
-		# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
-		if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:3' ; then
-			ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3"
-			ewarn "not being present on your system, think on installing them to get these tests run."
-			sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
-			sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
-			sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
-			sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
-			sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die
-			sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
-			# needed to prevent gdbus-threading from asserting
-			ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
-		fi
-
-		# Some tests need ipv6, upstream bug #667468
-		if [[ -n "${IPV6_DISABLED}" ]]; then
-			sed -i -e "/gdbus\/peer-to-peer/d" gio/tests/gdbus-peer.c || die
-			sed -i -e "/gdbus\/delayed-message-processing/d" gio/tests/gdbus-peer.c || die
-			sed -i -e "/gdbus\/nonce-tcp/d" gio/tests/gdbus-peer.c || die
-		fi
-
-		# thread test fails, upstream bug #679306
-		# FIXME: we need to check if it's still failing as upstream thinks something
-		# is wrong in our setups
-		#epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
-
-		# This test is prone to fail, bug #504024, upstream bug #723719
-		sed -i -e '/gdbus-close-pending/d' gio/tests/Makefile.am || die
-	else
-		# Don't build tests, also prevents extra deps, bug #512022
-		sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
-	fi
-
-	# gdbus-codegen is a separate package
-	epatch "${FILESDIR}/${PN}-2.40.0-external-gdbus-codegen.patch"
-
-	# leave python shebang alone
-	sed -e '/${PYTHON}/d' \
-		-i glib/Makefile.{am,in} || die
-
-	# Gentoo handles completions in a different directory
-	sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
-		gio/Makefile.am || die
-
-	epatch_user
-
-	# Also needed to prevent cross-compile failures, see bug #267603
-	eautoreconf
-
-	gnome2_src_prepare
-
-	epunt_cxx
-}
-
-multilib_src_configure() {
-	# Avoid circular depend with dev-util/pkgconfig and
-	# native builds (cross-compiles won't need pkg-config
-	# in the target ROOT to work here)
-	if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
-		if has_version sys-apps/dbus; then
-			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
-			export DBUS1_LIBS="-ldbus-1"
-		fi
-		export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
-		export LIBFFI_LIBS="-lffi"
-	fi
-
-	local myconf
-
-	case "${CHOST}" in
-		*-mingw*) myconf="${myconf} --with-threads=win32" ;;
-		*)        myconf="${myconf} --with-threads=posix" ;;
-	esac
-
-	# Only used by the gresource bin
-	multilib_is_native_abi || myconf="${myconf} --disable-libelf"
-
-	# FIXME: Always use internal libpcre, bug #254659
-	# (maybe consider going back to system lib
-	ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
-		$(use_enable xattr) \
-		$(use_enable fam) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable systemtap systemtap) \
-		--disable-compile-warnings \
-		--enable-man \
-		--with-pcre=internal \
-		--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
-
-	if multilib_is_native_abi; then
-		local d
-		for d in glib gio gobject; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	unset GSETTINGS_BACKEND # bug 352451
-	export LC_TIME=C # bug #411967
-	python_export_best
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	# Hardened: gdb needs this, bug #338891
-	if host-is-pax ; then
-		pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
-			|| die "Hardened adjustment failed"
-	fi
-
-	# Need X for dbus-launch session X11 initialization
-	Xemake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog* NEWS* README"
-	einstalldocs
-
-	if use utils ; then
-		python_replicate_script "${ED}"/usr/bin/gtester-report
-	else
-		rm "${ED}usr/bin/gtester-report"
-		rm "${ED}usr/share/man/man1/gtester-report.1"
-	fi
-
-	# Do not install charset.alias even if generated, leave it to libiconv
-	rm -f "${ED}/usr/lib/charset.alias"
-
-	# Don't install gdb python macros, bug 291328
-	rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if has_version '<x11-libs/gtk+-3.0.12:3'; then
-		# To have a clear upgrade path for gtk+-3.0.x users, have to resort to
-		# a warning instead of a blocker
-		ewarn
-		ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes."
-		ewarn "You should upgrade to a newer version of gtk+:3 immediately."
-	fi
-}

sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.50.3-r1.ebuild

@@ -1,59 +1,53 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 # Until bug #537330 glib is a reverse dependency of pkgconfig and, then
 # adding new dependencies end up making stage3 to grow. Every addition needs
 # then to be think very closely.
 
-EAPI="5"
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
-# Building with --disable-debug highly unrecommended.  It will build glib in
-# an unusable form as it disables some commonly used API.  Please do not
-# convert this to the use_enable form, as it results in a broken build.
-GCONF_DEBUG="yes"
 # Completely useless with or without USE static-libs, people need to use
 # pkg-config
 GNOME2_LA_PUNT="yes"
 
-inherit autotools bash-completion-r1 gnome2 libtool eutils flag-o-matic	multilib \
+inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \
-	pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal
+	multilib multilib-minimal pax-utils python-r1 toolchain-funcs versionator virtualx
 
 DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
+HOMEPAGE="https://www.gtk.org/"
 SRC_URI="${SRC_URI}
-	http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
+	https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
 
 LICENSE="LGPL-2+"
 SLOT="2"
-IUSE="dbus fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
+IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
 REQUIRED_USE="
 	utils? ( ${PYTHON_REQUIRED_USE} )
 	test? ( ${PYTHON_REQUIRED_USE} )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+# Added util-linux multilib dependency to have libmount support (which
+# is always turned on on linux systems, unless explicitly disabled, but
+# this ebuild does not do that anyway) (bug #599586)
 
 RDEPEND="
 	!<dev-util/gdbus-codegen-${PV}
+	>=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?]
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
 	>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
+	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
 	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
 	xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
 	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
 	utils? (
 		${PYTHON_DEPS}
 		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
-		|| (
+		virtual/libelf:0=
-			>=dev-libs/elfutils-0.142
-			>=dev-libs/libelf-0.8.12
-			>=sys-freebsd/freebsd-lib-9.2_rc1
-		)
-	)
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
 	)
 "
 DEPEND="${RDEPEND}
@@ -69,9 +63,6 @@ DEPEND="${RDEPEND}
 		>=sys-apps/dbus-1.2.14 )
 	!<dev-util/gtk-doc-1.15-r2
 "
-# gobject-introspection blocker to ensure people don't mix
-# different g-i and glib major versions
-
 PDEPEND="!<gnome-base/gvfs-1.6.4-r990
 	dbus? ( gnome-base/dconf )
 	mime? ( x11-misc/shared-mime-info )
@@ -80,13 +71,16 @@ PDEPEND="!<gnome-base/gvfs-1.6.4-r990
 # dconf is needed to be able to save settings, bug #498436
 # Earlier versions of gvfs do not work with glib
 
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gio-querymodules$(get_exeext)
+)
+
 pkg_setup() {
 	if use kernel_linux ; then
 		CONFIG_CHECK="~INOTIFY_USER"
-		if use test; then
+		if use test ; then
 			CONFIG_CHECK="~IPV6"
 			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
-			export IPV6_DISABLED="yes"
 		fi
 		linux-info_pkg_setup
 	fi
@@ -102,9 +96,7 @@ src_prepare() {
 			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
 			ewarn "think on installing it to get these tests run."
 			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
-			sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
-			sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
 		fi
 
 		# gdesktopappinfo requires existing terminal (gnome-terminal or any
@@ -114,55 +106,29 @@ src_prepare() {
 			sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
 		fi
 
-		# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
+		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
-		if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:3' ; then
+		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
-			ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3"
+		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-			ewarn "not being present on your system, think on installing them to get these tests run."
-			sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
-			sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
-			sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
-			sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
-			sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die
-			sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
-			# needed to prevent gdbus-threading from asserting
-			ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
-		fi
 
-		# Some tests need ipv6, upstream bug #667468
+		ewarn "Tests for search-utils have been skipped"
-		if [[ -n "${IPV6_DISABLED}" ]]; then
+		sed -i -e "/search-utils/d" glib/tests/Makefile.am || die
-			sed -i -e "/gdbus\/peer-to-peer/d" gio/tests/gdbus-peer.c || die
-			sed -i -e "/gdbus\/delayed-message-processing/d" gio/tests/gdbus-peer.c || die
-			sed -i -e "/gdbus\/nonce-tcp/d" gio/tests/gdbus-peer.c || die
-		fi
-
-		# thread test fails, upstream bug #679306
-		# FIXME: we need to check if it's still failing as upstream thinks something
-		# is wrong in our setups
-		#epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
-
-		# This test is prone to fail, bug #504024, upstream bug #723719
-		sed -i -e '/gdbus-close-pending/d' gio/tests/Makefile.am || die
 	else
 		# Don't build tests, also prevents extra deps, bug #512022
 		sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
 	fi
 
+	# Fix tests with timezone-data-2017a and newer
+	eapply "${FILESDIR}"/${P}-fix-gdatetime-tests.patch
+
 	# gdbus-codegen is a separate package
-	epatch "${FILESDIR}/${PN}-2.40.0-external-gdbus-codegen.patch"
+	eapply "${FILESDIR}"/${PN}-2.50.0-external-gdbus-codegen.patch
 
-	epatch "${FILESDIR}/${PN}-2.44.1-bionic-nameser.patch"
+	# Leave python shebang alone - handled by python_replicate_script
-
+	# We could call python_setup and give configure a valid --with-python
-	# leave python shebang alone
+	# arg, but that would mean a build dep on python when USE=utils.
 	sed -e '/${PYTHON}/d' \
 		-i glib/Makefile.{am,in} || die
 
-	# Gentoo handles completions in a different directory
-	sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
-		gio/Makefile.am || die
-
-	epatch_user
-
 	# Also needed to prevent cross-compile failures, see bug #267603
 	eautoreconf
 
@@ -182,6 +148,8 @@ multilib_src_configure() {
 		fi
 		export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
 		export LIBFFI_LIBS="-lffi"
+		export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass
+		export PCRE_LIBS="-lpcre"
 	fi
 
 	# These configure tests don't work when cross-compiling.
@@ -204,12 +172,12 @@ multilib_src_configure() {
 		*)        myconf="${myconf} --with-threads=posix" ;;
 	esac
 
-	# FIXME: Always use internal libpcre, bug #254659
-	# (maybe consider going back to system lib)
 	# libelf used only by the gresource bin
 	ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
+		$(usex debug --enable-debug=yes ' ') \
 		$(use_enable xattr) \
 		$(use_enable fam) \
+		$(use_enable kernel_linux libmount) \
 		$(use_enable selinux) \
 		$(use_enable static-libs static) \
 		$(use_enable systemtap dtrace) \
@@ -217,7 +185,7 @@ multilib_src_configure() {
 		$(multilib_native_use_enable utils libelf) \
 		--disable-compile-warnings \
 		--enable-man \
-		--with-pcre=internal \
+		--with-pcre=system \
 		--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
 
 	if multilib_is_native_abi; then
@@ -229,13 +197,12 @@ multilib_src_configure() {
 }
 
 multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
 	export XDG_CONFIG_DIRS=/etc/xdg
 	export XDG_DATA_DIRS=/usr/local/share:/usr/share
 	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	unset GSETTINGS_BACKEND # bug 352451
 	export LC_TIME=C # bug #411967
-	python_export_best
+	unset GSETTINGS_BACKEND # bug #596380
+	python_setup
 
 	# Related test is a bit nitpicking
 	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
@@ -248,15 +215,15 @@ multilib_src_test() {
 	fi
 
 	# Need X for dbus-launch session X11 initialization
-	Xemake check
+	virtx emake check
 }
 
 multilib_src_install() {
-	gnome2_src_install
+	gnome2_src_install completiondir="$(get_bashcompdir)"
+	keepdir /usr/$(get_libdir)/gio/modules
 }
 
 multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog* NEWS* README"
 	einstalldocs
 
 	if use utils ; then
@@ -273,13 +240,64 @@ multilib_src_install_all() {
 	rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
 }
 
-pkg_postinst() {
+pkg_preinst() {
-	gnome2_pkg_postinst
+	gnome2_pkg_preinst
-	if has_version '<x11-libs/gtk+-3.0.12:3'; then
+
-		# To have a clear upgrade path for gtk+-3.0.x users, have to resort to
+	# Make gschemas.compiled belong to glib alone
-		# a warning instead of a blocker
+	local cache="usr/share/glib-2.0/schemas/gschemas.compiled"
-		ewarn
+
-		ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes."
+	if [[ -e ${EROOT}${cache} ]]; then
-		ewarn "You should upgrade to a newer version of gtk+:3 immediately."
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"/${cache} || die
+	fi
+
+	multilib_pkg_preinst() {
+		# Make giomodule.cache belong to glib alone
+		local cache="usr/$(get_libdir)/gio/modules/giomodule.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+
+	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
+	# file due to inability to create it and GIO might not look at any of the modules there
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	# force (re)generation of gschemas.compiled
+	GNOME2_ECLASS_GLIB_SCHEMAS="force"
+
+	gnome2_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_postinst
+	else
+		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
+		ewarn "You might want to run gio-querymodules manually on the target for"
+		ewarn "your final image for performance reasons and re-run it when packages"
+		ewarn "installing GIO modules get upgraded or added to the image."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+		rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled
 	fi
 }

sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.52.3.ebuild

@@ -1,58 +1,53 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 # Until bug #537330 glib is a reverse dependency of pkgconfig and, then
 # adding new dependencies end up making stage3 to grow. Every addition needs
 # then to be think very closely.
 
-EAPI="5"
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
-# Building with --disable-debug highly unrecommended.  It will build glib in
-# an unusable form as it disables some commonly used API.  Please do not
-# convert this to the use_enable form, as it results in a broken build.
-GCONF_DEBUG="yes"
 # Completely useless with or without USE static-libs, people need to use
 # pkg-config
 GNOME2_LA_PUNT="yes"
 
-inherit autotools bash-completion-r1 gnome2 libtool eutils flag-o-matic	multilib \
+inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \
-	pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal
+	multilib multilib-minimal pax-utils python-r1 toolchain-funcs versionator virtualx
 
 DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
+HOMEPAGE="https://www.gtk.org/"
 SRC_URI="${SRC_URI}
-	http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
+	https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
 
-LICENSE="LGPL-2+"
+LICENSE="LGPL-2.1+"
 SLOT="2"
-IUSE="dbus fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
+IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
 REQUIRED_USE="
 	utils? ( ${PYTHON_REQUIRED_USE} )
 	test? ( ${PYTHON_REQUIRED_USE} )
 "
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+# Added util-linux multilib dependency to have libmount support (which
+# is always turned on on linux systems, unless explicitly disabled, but
+# this ebuild does not do that anyway) (bug #599586)
 
 RDEPEND="
 	!<dev-util/gdbus-codegen-${PV}
+	>=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?]
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
 	>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
+	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	|| (
+	kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
-		>=dev-libs/elfutils-0.142
-		>=dev-libs/libelf-0.8.12
-		>=sys-freebsd/freebsd-lib-9.2_rc1
-		)
 	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
 	xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
 	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
 	utils? (
 		${PYTHON_DEPS}
-		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] )
+		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
-	abi_x86_32? (
+		virtual/libelf:0=
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
 	)
 "
 DEPEND="${RDEPEND}
@@ -68,9 +63,6 @@ DEPEND="${RDEPEND}
 		>=sys-apps/dbus-1.2.14 )
 	!<dev-util/gtk-doc-1.15-r2
 "
-# gobject-introspection blocker to ensure people don't mix
-# different g-i and glib major versions
-
 PDEPEND="!<gnome-base/gvfs-1.6.4-r990
 	dbus? ( gnome-base/dconf )
 	mime? ( x11-misc/shared-mime-info )
@@ -79,13 +71,16 @@ PDEPEND="!<gnome-base/gvfs-1.6.4-r990
 # dconf is needed to be able to save settings, bug #498436
 # Earlier versions of gvfs do not work with glib
 
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gio-querymodules$(get_exeext)
+)
+
 pkg_setup() {
 	if use kernel_linux ; then
 		CONFIG_CHECK="~INOTIFY_USER"
-		if use test; then
+		if use test ; then
 			CONFIG_CHECK="~IPV6"
 			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
-			export IPV6_DISABLED="yes"
 		fi
 		linux-info_pkg_setup
 	fi
@@ -101,9 +96,7 @@ src_prepare() {
 			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
 			ewarn "think on installing it to get these tests run."
 			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
-			sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
-			sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
 		fi
 
 		# gdesktopappinfo requires existing terminal (gnome-terminal or any
@@ -113,53 +106,26 @@ src_prepare() {
 			sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
 		fi
 
-		# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
+		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
-		if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:3' ; then
+		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
-			ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3"
+		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-			ewarn "not being present on your system, think on installing them to get these tests run."
-			sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
-			sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
-			sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
-			sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
-			sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die
-			sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
-			# needed to prevent gdbus-threading from asserting
-			ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
-		fi
 
-		# Some tests need ipv6, upstream bug #667468
+		ewarn "Tests for search-utils have been skipped"
-		if [[ -n "${IPV6_DISABLED}" ]]; then
+		sed -i -e "/search-utils/d" glib/tests/Makefile.am || die
-			sed -i -e "/gdbus\/peer-to-peer/d" gio/tests/gdbus-peer.c || die
-			sed -i -e "/gdbus\/delayed-message-processing/d" gio/tests/gdbus-peer.c || die
-			sed -i -e "/gdbus\/nonce-tcp/d" gio/tests/gdbus-peer.c || die
-		fi
-
-		# thread test fails, upstream bug #679306
-		# FIXME: we need to check if it's still failing as upstream thinks something
-		# is wrong in our setups
-		#epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
-
-		# This test is prone to fail, bug #504024, upstream bug #723719
-		sed -i -e '/gdbus-close-pending/d' gio/tests/Makefile.am || die
 	else
 		# Don't build tests, also prevents extra deps, bug #512022
 		sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
 	fi
 
 	# gdbus-codegen is a separate package
-	epatch "${FILESDIR}/${PN}-2.40.0-external-gdbus-codegen.patch"
+	eapply "${FILESDIR}"/${PN}-2.50.0-external-gdbus-codegen.patch
 
-	# leave python shebang alone
+	# Leave python shebang alone - handled by python_replicate_script
+	# We could call python_setup and give configure a valid --with-python
+	# arg, but that would mean a build dep on python when USE=utils.
 	sed -e '/${PYTHON}/d' \
 		-i glib/Makefile.{am,in} || die
 
-	# Gentoo handles completions in a different directory
-	sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
-		gio/Makefile.am || die
-
-	epatch_user
-
 	# Also needed to prevent cross-compile failures, see bug #267603
 	eautoreconf
 
@@ -179,6 +145,21 @@ multilib_src_configure() {
 		fi
 		export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
 		export LIBFFI_LIBS="-lffi"
+		export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass
+		export PCRE_LIBS="-lpcre"
+	fi
+
+	# These configure tests don't work when cross-compiling.
+	if tc-is-cross-compiler ; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
+		case ${CHOST} in
+		hppa*|metag*) export glib_cv_stack_grows=yes ;;
+		*)            export glib_cv_stack_grows=no ;;
+		esac
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756474
+		export glib_cv_uscore=no
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756475
+		export ac_cv_func_posix_get{pwuid,grgid}_r=yes
 	fi
 
 	local myconf
@@ -188,21 +169,20 @@ multilib_src_configure() {
 		*)        myconf="${myconf} --with-threads=posix" ;;
 	esac
 
-	# Only used by the gresource bin
+	# libelf used only by the gresource bin
-	multilib_is_native_abi || myconf="${myconf} --disable-libelf"
-
-	# FIXME: Always use internal libpcre, bug #254659
-	# (maybe consider going back to system lib
 	ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
+		$(usex debug --enable-debug=yes ' ') \
 		$(use_enable xattr) \
 		$(use_enable fam) \
+		$(use_enable kernel_linux libmount) \
 		$(use_enable selinux) \
 		$(use_enable static-libs static) \
 		$(use_enable systemtap dtrace) \
 		$(use_enable systemtap systemtap) \
+		$(multilib_native_use_enable utils libelf) \
 		--disable-compile-warnings \
 		--enable-man \
-		--with-pcre=internal \
+		--with-pcre=system \
 		--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
 
 	if multilib_is_native_abi; then
@@ -214,13 +194,12 @@ multilib_src_configure() {
 }
 
 multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
 	export XDG_CONFIG_DIRS=/etc/xdg
 	export XDG_DATA_DIRS=/usr/local/share:/usr/share
 	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	unset GSETTINGS_BACKEND # bug 352451
 	export LC_TIME=C # bug #411967
-	python_export_best
+	unset GSETTINGS_BACKEND # bug #596380
+	python_setup
 
 	# Related test is a bit nitpicking
 	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
@@ -233,15 +212,15 @@ multilib_src_test() {
 	fi
 
 	# Need X for dbus-launch session X11 initialization
-	Xemake check
+	virtx emake check
 }
 
 multilib_src_install() {
-	gnome2_src_install
+	gnome2_src_install completiondir="$(get_bashcompdir)"
+	keepdir /usr/$(get_libdir)/gio/modules
 }
 
 multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog* NEWS* README"
 	einstalldocs
 
 	if use utils ; then
@@ -258,13 +237,64 @@ multilib_src_install_all() {
 	rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
 }
 
-pkg_postinst() {
+pkg_preinst() {
-	gnome2_pkg_postinst
+	gnome2_pkg_preinst
-	if has_version '<x11-libs/gtk+-3.0.12:3'; then
+
-		# To have a clear upgrade path for gtk+-3.0.x users, have to resort to
+	# Make gschemas.compiled belong to glib alone
-		# a warning instead of a blocker
+	local cache="usr/share/glib-2.0/schemas/gschemas.compiled"
-		ewarn
+
-		ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes."
+	if [[ -e ${EROOT}${cache} ]]; then
-		ewarn "You should upgrade to a newer version of gtk+:3 immediately."
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"/${cache} || die
+	fi
+
+	multilib_pkg_preinst() {
+		# Make giomodule.cache belong to glib alone
+		local cache="usr/$(get_libdir)/gio/modules/giomodule.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+
+	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
+	# file due to inability to create it and GIO might not look at any of the modules there
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	# force (re)generation of gschemas.compiled
+	GNOME2_ECLASS_GLIB_SCHEMAS="force"
+
+	gnome2_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_postinst
+	else
+		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
+		ewarn "You might want to run gio-querymodules manually on the target for"
+		ewarn "your final image for performance reasons and re-run it when packages"
+		ewarn "installing GIO modules get upgraded or added to the image."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+		rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled
 	fi
 }

sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.54.3-r6.ebuild

@@ -0,0 +1,304 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
+# adding new dependencies end up making stage3 to grow. Every addition needs
+# then to be think very closely.
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+# Completely useless with or without USE static-libs, people need to use
+# pkg-config
+GNOME2_LA_PUNT="yes"
+
+inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \
+	multilib multilib-minimal pax-utils python-single-r1 toolchain-funcs versionator virtualx
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="https://www.gtk.org/"
+SRC_URI="${SRC_URI} https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz
+	https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	test? ( ${PYTHON_REQUIRED_USE} )
+" # test dep left here and elsewhere to not forget, as global python requirement is supposed to be temporary until a split package is made with meson
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+# Added util-linux multilib dependency to have libmount support (which
+# is always turned on on linux systems, unless explicitly disabled, but
+# this ebuild does not do that anyway) (bug #599586)
+
+RDEPEND="
+	!<dev-util/gdbus-codegen-${PV}
+	>=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?]
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
+	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+	xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
+	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+	${PYTHON_DEPS}
+	utils? (
+		>=dev-util/gdbus-codegen-${PV}
+		virtual/libelf:0=
+	)
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-libs/libxslt-1.0
+	>=sys-devel/gettext-0.11
+	>=dev-util/gtk-doc-am-1.20
+	systemtap? ( >=dev-util/systemtap-1.3 )
+	test? (
+		sys-devel/gdb
+		${PYTHON_DEPS}
+		>=dev-util/gdbus-codegen-${PV}
+		>=sys-apps/dbus-1.2.14 )
+	!<dev-util/gtk-doc-1.15-r2
+"
+PDEPEND="!<gnome-base/gvfs-1.6.4-r990
+	dbus? ( gnome-base/dconf )
+	mime? ( x11-misc/shared-mime-info )
+"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf is needed to be able to save settings, bug #498436
+# Earlier versions of gvfs do not work with glib
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gio-querymodules$(get_exeext)
+)
+
+pkg_setup() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		if use test ; then
+			CONFIG_CHECK="~IPV6"
+			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+		fi
+		linux-info_pkg_setup
+	fi
+	# FIXME: Move python deps that are only required at build time of other packages to a split package
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
+	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
+
+	if use test; then
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
+		if ! has_version dev-util/desktop-file-utils ; then
+			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+			ewarn "think on installing it to get these tests run."
+			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
+		fi
+
+		# gdesktopappinfo requires existing terminal (gnome-terminal or any
+		# other), falling back to xterm if one doesn't exist
+		if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+			ewarn "Some tests will be skipped due to missing terminal program"
+			sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+		fi
+
+		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
+		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
+		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
+
+		ewarn "Tests for search-utils have been skipped"
+		sed -i -e "/search-utils/d" glib/tests/Makefile.am || die
+	else
+		# Don't build tests, also prevents extra deps, bug #512022
+		sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
+	fi
+
+	# gdbus-codegen is a separate package
+	eapply "${FILESDIR}"/${PN}-2.54.3-external-gdbus-codegen.patch
+
+	# Upstream glib-2-54 branch; includes fixups for potential libreoffice lockups
+	eapply "${WORKDIR}"/patches/
+
+	# Leave gtester-report python shebang alone - handled by python_fix_shebang
+	sed -e '/${PYTHON}/d' -i glib/Makefile.{am,in} || die
+
+	# Also needed to prevent cross-compile failures, see bug #267603
+	eautoreconf
+
+	gnome2_src_prepare
+
+	epunt_cxx
+}
+
+multilib_src_configure() {
+	# Avoid circular depend with dev-util/pkgconfig and
+	# native builds (cross-compiles won't need pkg-config
+	# in the target ROOT to work here)
+	if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
+		if has_version sys-apps/dbus; then
+			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
+			export DBUS1_LIBS="-ldbus-1"
+		fi
+		export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
+		export LIBFFI_LIBS="-lffi"
+		export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass
+		export PCRE_LIBS="-lpcre"
+	fi
+
+	# These configure tests don't work when cross-compiling.
+	if tc-is-cross-compiler ; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
+		case ${CHOST} in
+		hppa*|metag*) export glib_cv_stack_grows=yes ;;
+		*)            export glib_cv_stack_grows=no ;;
+		esac
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756474
+		export glib_cv_uscore=no
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756475
+		export ac_cv_func_posix_get{pwuid,grgid}_r=yes
+	fi
+
+	local myconf
+
+	case "${CHOST}" in
+		*-mingw*) myconf="${myconf} --with-threads=win32" ;;
+		*)        myconf="${myconf} --with-threads=posix" ;;
+	esac
+
+	# libelf used only by the gresource bin
+	ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable xattr) \
+		$(use_enable fam) \
+		$(use_enable kernel_linux libmount) \
+		$(use_enable selinux) \
+		$(use_enable static-libs static) \
+		$(use_enable systemtap dtrace) \
+		$(use_enable systemtap systemtap) \
+		$(multilib_native_use_enable utils libelf) \
+		--with-python=${EPYTHON} \
+		--disable-compile-warnings \
+		--enable-man \
+		--with-pcre=system \
+		--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
+
+	if multilib_is_native_abi; then
+		local d
+		for d in glib gio gobject; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	export XDG_CONFIG_DIRS=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
+	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+	export LC_TIME=C # bug #411967
+	unset GSETTINGS_BACKEND # bug #596380
+	python_setup
+
+	# Related test is a bit nitpicking
+	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+
+	# Hardened: gdb needs this, bug #338891
+	if host-is-pax ; then
+		pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
+			|| die "Hardened adjustment failed"
+	fi
+
+	# Need X for dbus-launch session X11 initialization
+	virtx emake check
+}
+
+multilib_src_install() {
+	gnome2_src_install completiondir="$(get_bashcompdir)"
+	keepdir /usr/$(get_libdir)/gio/modules
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use utils ; then
+		python_fix_shebang "${ED}"/usr/bin/gtester-report
+	else
+		# gtester-report is heavily deprecated, so do not install by default - https://bugzilla.gnome.org/show_bug.cgi?id=668035#c4
+		rm "${ED}usr/bin/gtester-report"
+		rm "${ED}usr/share/man/man1/gtester-report.1"
+	fi
+
+	# Do not install charset.alias even if generated, leave it to libiconv
+	rm -f "${ED}/usr/lib/charset.alias"
+
+	# Don't install gdb python macros, bug 291328
+	rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	# Make gschemas.compiled belong to glib alone
+	local cache="usr/share/glib-2.0/schemas/gschemas.compiled"
+
+	if [[ -e ${EROOT}${cache} ]]; then
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"/${cache} || die
+	fi
+
+	multilib_pkg_preinst() {
+		# Make giomodule.cache belong to glib alone
+		local cache="usr/$(get_libdir)/gio/modules/giomodule.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+
+	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
+	# file due to inability to create it and GIO might not look at any of the modules there
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	# force (re)generation of gschemas.compiled
+	GNOME2_ECLASS_GLIB_SCHEMAS="force"
+
+	gnome2_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_postinst
+	else
+		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
+		ewarn "You might want to run gio-querymodules manually on the target for"
+		ewarn "your final image for performance reasons and re-run it when packages"
+		ewarn "installing GIO modules get upgraded or added to the image."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+		rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled
+	fi
+}

sdk_container/src/third_party/portage-stable/dev-libs/glib/metadata.xml

@@ -1,20 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+	<maintainer type="project">
-  <use>
+		<email>gnome@gentoo.org</email>
-	<flag name="dbus">Enable dependencies required by glib libraries
+		<name>Gentoo GNOME Desktop</name>
-		using dbus service to manage settings saving</flag>
+	</maintainer>
-  	<flag name="mime">Pull in shared MIME database that many glib-based
+	<use>
-		applications require at runtime to detect or open files. Warning:
+		<flag name="dbus">
-		do not disable this flag unless installing on a headless server.</flag>
+			Enable dependencies required by glib libraries
-	<flag name="systemtap">Build support for profiling and tracing using 
+			using dbus service to manage settings saving
-		<pkg>dev-util/systemtap</pkg></flag>
+		</flag>
-	<flag name="utils">Install gtester-report utility to generate test
+		<flag name="mime">
-		report files for your software; build gresource utility with
+			Pull in shared MIME database that many glib-based
-		ELF support.</flag>
+			applications require at runtime to detect or open files. Warning:
-  </use>
+			do not disable this flag unless installing on a headless server.
-  <upstream>
+		</flag>
-    <remote-id type="cpe">cpe:/a:gnome:glib</remote-id>
+		<flag name="systemtap">
-  </upstream>
+			Build support for profiling and tracing using
+			<pkg>dev-util/systemtap</pkg>
+		</flag>
+		<flag name="utils">
+			Install gtester-report utility to generate test
+			report files for your software; build gresource utility with
+			ELF support.
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gnome:glib</remote-id>
+	</upstream>
 </pkgmetadata>

sdk_container/src/third_party/portage-stable/dev-python/boto/ChangeLog

@@ -1,482 +0,0 @@
-# ChangeLog for dev-python/boto
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/boto/ChangeLog,v 1.114 2015/06/08 01:37:31 idella4 Exp $
-
-*boto-2.38.0 (08 Jun 2015)
-
-  08 Jun 2015; Ian Delaney <idella4@gentoo.org> +boto-2.38.0.ebuild,
-  -boto-2.11.0.ebuild, -boto-2.19.0.ebuild, -boto-2.20.0.ebuild,
-  -boto-2.20.1.ebuild, -boto-2.21.0.ebuild, -boto-2.21.1.ebuild,
-  -boto-2.22.0.ebuild, -boto-2.23.0.ebuild, -boto-2.24.0.ebuild,
-  -boto-2.25.0.ebuild, -boto-2.26.0.ebuild, -boto-2.26.1.ebuild,
-  -boto-2.28.0.ebuild, -boto-2.29.1.ebuild:
-  bump add doc build, rm old
-
-  06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
-  Add github to remote-id in metadata.xml
-
-  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
-  Add pypi to remote-id in metadata.xml
-
-  08 Apr 2015; Michał Górny <mgorny@gentoo.org> boto-2.11.0.ebuild,
-  boto-2.19.0.ebuild, boto-2.20.0.ebuild, boto-2.20.1.ebuild,
-  boto-2.21.0.ebuild, boto-2.21.1.ebuild, boto-2.22.0.ebuild,
-  boto-2.23.0.ebuild, boto-2.24.0.ebuild, boto-2.25.0.ebuild,
-  boto-2.26.0.ebuild, boto-2.26.1.ebuild, boto-2.27.0.ebuild,
-  boto-2.28.0.ebuild, boto-2.29.1.ebuild:
-  Drop old Python implementations
-
-  08 Mar 2015; Pacho Ramos <pacho@gentoo.org> boto-2.35.1.ebuild:
-  x86 stable, bug 540290
-
-  07 Mar 2015; Pacho Ramos <pacho@gentoo.org> boto-2.35.1.ebuild:
-  ppc stable, bug 540290
-
-  06 Mar 2015; Pacho Ramos <pacho@gentoo.org> boto-2.35.1.ebuild:
-  amd64 stable, bug 540290
-
-  27 Feb 2015; Agostino Sarubbo <ago@gentoo.org> boto-2.35.1.ebuild:
-  Stable for sparc, wrt bug #535316
-
-  26 Feb 2015; Markus Meier <maekke@gentoo.org> boto-2.35.1.ebuild:
-  arm stable, bug #535316
-
-  25 Feb 2015; Agostino Sarubbo <ago@gentoo.org> boto-2.35.1.ebuild:
-  Stable for x86, wrt bug #535316
-
-  21 Feb 2015; Agostino Sarubbo <ago@gentoo.org> boto-2.35.1.ebuild:
-  Stable for ppc, wrt bug #535316
-
-  19 Feb 2015; Agostino Sarubbo <ago@gentoo.org> boto-2.35.1.ebuild:
-  Stable for amd64, wrt bug #535316
-
-  10 Jan 2015; Tim Harder <radhermit@gentoo.org> boto-2.35.1.ebuild:
-  Add python3_3 and python3_4 to PYTHON_COMPAT and update test functionality.
-
-*boto-2.35.1 (10 Jan 2015)
-
-  10 Jan 2015; Tim Harder <radhermit@gentoo.org> +boto-2.35.1.ebuild:
-  Version bump.
-
-*boto-2.34.0 (18 Nov 2014)
-
-  18 Nov 2014; Matthew Thode <prometheanfire@gentoo.org> +boto-2.34.0.ebuild:
-  bup for glance
-
-*boto-2.31.1 (10 Jul 2014)
-
-  10 Jul 2014; Tim Harder <radhermit@gentoo.org> +boto-2.31.1.ebuild:
-  Version bump.
-
-  04 Jun 2014; Mike Frysinger <vapier@gentoo.org> boto-2.27.0.ebuild:
-  Mark arm/ppc/sparc stable #508570 by Tim Harder.
-
-*boto-2.29.1 (02 Jun 2014)
-
-  02 Jun 2014; Tim Harder <radhermit@gentoo.org> +boto-2.29.1.ebuild:
-  Version bump.
-
-  20 May 2014; Tim Harder <radhermit@gentoo.org> boto-2.27.0.ebuild:
-  Keywording amd64/x86 (bug #508570).
-
-*boto-2.28.0 (09 May 2014)
-
-  09 May 2014; Tim Harder <radhermit@gentoo.org> +boto-2.28.0.ebuild:
-  Version bump.
-
-*boto-2.27.0 (07 Mar 2014)
-
-  07 Mar 2014; Tim Harder <radhermit@gentoo.org> +boto-2.27.0.ebuild:
-  Version bump.
-
-*boto-2.26.1 (06 Mar 2014)
-
-  06 Mar 2014; Tim Harder <radhermit@gentoo.org> +boto-2.26.1.ebuild:
-  Version bump.
-
-*boto-2.26.0 (28 Feb 2014)
-
-  28 Feb 2014; Tim Harder <radhermit@gentoo.org> +boto-2.26.0.ebuild:
-  Version bump.
-
-  24 Feb 2014; Mike Frysinger <vapier@gentoo.org> boto-2.25.0.ebuild:
-  Add arm love for Chromium OS.
-
-*boto-2.25.0 (08 Feb 2014)
-
-  08 Feb 2014; Tim Harder <radhermit@gentoo.org> +boto-2.25.0.ebuild:
-  Version bump.
-
-*boto-2.24.0 (30 Jan 2014)
-
-  30 Jan 2014; Tim Harder <radhermit@gentoo.org> +boto-2.24.0.ebuild:
-  Version bump.
-
-*boto-2.23.0 (23 Jan 2014)
-
-  23 Jan 2014; Tim Harder <radhermit@gentoo.org> +boto-2.23.0.ebuild:
-  Version bump.
-
-*boto-2.22.0 (03 Jan 2014)
-
-  03 Jan 2014; Tim Harder <radhermit@gentoo.org> +boto-2.22.0.ebuild:
-  Version bump.
-
-*boto-2.21.1 (24 Dec 2013)
-
-  24 Dec 2013; Tim Harder <radhermit@gentoo.org> +boto-2.21.1.ebuild:
-  Version bump.
-
-  20 Dec 2013; Tim Harder <radhermit@gentoo.org> -boto-2.1.1.ebuild,
-  -boto-2.3.0.ebuild, -boto-2.9.9.ebuild, -boto-2.10.0.ebuild,
-  -boto-2.13.3.ebuild, -boto-2.15.0.ebuild, -boto-2.16.0.ebuild,
-  -boto-2.17.0.ebuild, -boto-2.18.0.ebuild:
-  Remove old.
-
-*boto-2.21.0 (20 Dec 2013)
-
-  20 Dec 2013; Tim Harder <radhermit@gentoo.org> +boto-2.21.0.ebuild:
-  Version bump.
-
-*boto-2.20.1 (17 Dec 2013)
-
-  17 Dec 2013; Tim Harder <radhermit@gentoo.org> +boto-2.20.1.ebuild:
-  Version bump.
-
-*boto-2.20.0 (13 Dec 2013)
-
-  13 Dec 2013; Tim Harder <radhermit@gentoo.org> +boto-2.20.0.ebuild:
-  Version bump.
-
-*boto-2.19.0 (28 Nov 2013)
-
-  28 Nov 2013; Tim Harder <radhermit@gentoo.org> +boto-2.19.0.ebuild:
-  Version bump.
-
-*boto-2.18.0 (24 Nov 2013)
-
-  24 Nov 2013; Tim Harder <radhermit@gentoo.org> +boto-2.18.0.ebuild:
-  Version bump.
-
-  24 Nov 2013; Agostino Sarubbo <ago@gentoo.org> boto-2.11.0.ebuild:
-  Stable for ppc, wrt bug #486280
-
-  24 Nov 2013; Agostino Sarubbo <ago@gentoo.org> boto-2.11.0.ebuild:
-  Stable for sparc, wrt bug #486280
-
-*boto-2.17.0 (14 Nov 2013)
-
-  14 Nov 2013; Tim Harder <radhermit@gentoo.org> +boto-2.17.0.ebuild:
-  Version bump, drop m2crypto dep (bug #491142).
-
-*boto-2.16.0 (09 Nov 2013)
-
-  09 Nov 2013; Tim Harder <radhermit@gentoo.org> +boto-2.16.0.ebuild:
-  Version bump.
-
-  22 Oct 2013; Fabian Groffen <grobian@gentoo.org> boto-2.15.0.ebuild:
-  Marked ~x64-macos, bug #487670
-
-*boto-2.15.0 (18 Oct 2013)
-
-  18 Oct 2013; Tim Harder <radhermit@gentoo.org> +boto-2.15.0.ebuild:
-  Version bump.
-
-  30 Sep 2013; Agostino Sarubbo <ago@gentoo.org> boto-2.11.0.ebuild:
-  Stable for x86, wrt bug #486280
-
-  28 Sep 2013; Agostino Sarubbo <ago@gentoo.org> boto-2.11.0.ebuild:
-  Stable for amd64, wrt bug #486280
-
-*boto-2.13.3 (17 Sep 2013)
-
-  17 Sep 2013; Tim Harder <radhermit@gentoo.org> +boto-2.13.3.ebuild:
-  Version bump.
-
-  05 Sep 2013; Michał Górny <mgorny@gentoo.org> boto-2.1.1.ebuild,
-  boto-2.10.0.ebuild, boto-2.11.0.ebuild, boto-2.9.9.ebuild:
-  Clean up PYTHON_COMPAT from old implementations.
-
-*boto-2.11.0 (29 Aug 2013)
-
-  29 Aug 2013; Tim Harder <radhermit@gentoo.org> +boto-2.11.0.ebuild:
-  Version bump.
-
-  27 Aug 2013; Tim Harder <radhermit@gentoo.org> -boto-2.6.0.ebuild,
-  -boto-2.7.0.ebuild, -boto-2.8.0.ebuild, -boto-2.9.2.ebuild,
-  -boto-2.9.3.ebuild, -boto-2.9.4.ebuild, -boto-2.9.5.ebuild,
-  -boto-2.9.6.ebuild, -boto-2.9.7.ebuild, -boto-2.9.8.ebuild:
-  Remove old.
-
-*boto-2.10.0 (27 Aug 2013)
-
-  27 Aug 2013; Tim Harder <radhermit@gentoo.org> +boto-2.10.0.ebuild:
-  Version bump.
-
-*boto-2.9.9 (24 Jul 2013)
-
-  24 Jul 2013; Tim Harder <radhermit@gentoo.org> +boto-2.9.9.ebuild:
-  Version bump.
-
-*boto-2.9.8 (21 Jul 2013)
-
-  21 Jul 2013; Tim Harder <radhermit@gentoo.org> +boto-2.9.8.ebuild:
-  Version bump.
-
-*boto-2.9.7 (10 Jul 2013)
-
-  10 Jul 2013; Tim Harder <radhermit@gentoo.org> +boto-2.9.7.ebuild:
-  Version bump.
-
-*boto-2.9.6 (19 Jun 2013)
-
-  19 Jun 2013; Tim Harder <radhermit@gentoo.org> +boto-2.9.6.ebuild:
-  Version bump.
-
-  03 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> boto-2.9.5.ebuild:
-  Keyword amd64-linux and x86-linux
-
-*boto-2.9.5 (29 May 2013)
-
-  29 May 2013; Tim Harder <radhermit@gentoo.org> +boto-2.9.5.ebuild:
-  Version bump.
-
-*boto-2.9.4 (21 May 2013)
-
-  21 May 2013; Tim Harder <radhermit@gentoo.org> +boto-2.9.4.ebuild:
-  Version bump.
-
-*boto-2.9.3 (16 May 2013)
-
-  16 May 2013; Tim Harder <radhermit@gentoo.org> +boto-2.9.3.ebuild:
-  Version bump.
-
-*boto-2.9.2 (01 May 2013)
-
-  01 May 2013; Tim Harder <radhermit@gentoo.org> +boto-2.9.2.ebuild:
-  Version bump.
-
-  20 Feb 2013; Matthew Thode <prometheanfire@gentoo.org> boto-2.1.1.ebuild:
-  added comment to boto-2.1.1 to hopefully prevent bad pruning
-
-  20 Feb 2013; Matthew Thode <prometheanfire@gentoo.org> boto-2.1.1.ebuild:
-  readding boto-2.1.1 as sys-cluster/nova requires it
-
-  05 Feb 2013; Tim Harder <radhermit@gentoo.org> -boto-2.0.ebuild,
-  -boto-2.1.1.ebuild, -boto-2.2.2.ebuild, -boto-2.2.2-r1.ebuild,
-  -files/boto-2.2.2-no-install-tests.patch, -boto-2.4.1.ebuild,
-  -boto-2.5.2.ebuild:
-  Remove old.
-
-*boto-2.8.0 (05 Feb 2013)
-
-  05 Feb 2013; Tim Harder <radhermit@gentoo.org> +boto-2.8.0.ebuild:
-  Version bump.
-
-*boto-2.7.0 (25 Jan 2013)
-
-  25 Jan 2013; Tim Harder <radhermit@gentoo.org> +boto-2.7.0.ebuild:
-  Version bump, migrate to distutils-r1 (bug #453922).
-
-*boto-2.6.0 (29 Sep 2012)
-
-  29 Sep 2012; Tim Harder <radhermit@gentoo.org> +boto-2.6.0.ebuild:
-  Version bump.
-
-  29 Jul 2012; Raúl Porcel <armin76@gentoo.org> boto-2.3.0.ebuild:
-  sparc stable wrt #416861
-
-*boto-2.5.2 (17 Jul 2012)
-
-  17 Jul 2012; Mike Frysinger <vapier@gentoo.org> +boto-2.5.2.ebuild:
-  Version bump #425176 by Ian Delaney.
-
-  13 Jun 2012; Tim Harder <radhermit@gentoo.org> boto-2.3.0.ebuild,
-  boto-2.4.1.ebuild:
-  Remove unused eutils inherit.
-
-  29 May 2012; Brent Baude <ranger@gentoo.org> boto-2.3.0.ebuild:
-  Marking boto-2.3.0 ppc for bug 416861
-
-  21 May 2012; Agostino Sarubbo <ago@gentoo.org> boto-2.3.0.ebuild:
-  Stable for amd64, wrt bug #416861
-
-*boto-2.4.1 (21 May 2012)
-
-  21 May 2012; Mike Frysinger <vapier@gentoo.org> +boto-2.4.1.ebuild:
-  Version bump #416811 by Johan Bergström.
-
-  21 May 2012; Jeff Horelick <jdhore@gentoo.org> boto-2.3.0.ebuild:
-  marked x86 per bug 416861
-
-*boto-2.3.0 (09 Apr 2012)
-
-  09 Apr 2012; Mike Gilbert <floppym@gentoo.org> +boto-2.3.0.ebuild:
-  Version bump, round 2.
-
-  09 Apr 2012; Mike Gilbert <floppym@gentoo.org> -boto-2.3.0.ebuild:
-  Remove broken ebuild.
-
-*boto-2.3.0 (08 Apr 2012)
-
-  08 Apr 2012; Mike Gilbert <floppym@gentoo.org> +boto-2.3.0.ebuild:
-  Version bump, #411037 by Ian Delaney.
-
-*boto-2.2.2-r1 (29 Feb 2012)
-
-  29 Feb 2012; Mike Frysinger <vapier@gentoo.org> +boto-2.2.2-r1.ebuild,
-  +files/boto-2.2.2-no-install-tests.patch:
-  Add fix from upstream to not install tests #404979 by Patrick Lauer.
-
-  23 Feb 2012; Tim Harder <radhermit@gentoo.org> -boto-1.9b.ebuild:
-  Remove old.
-
-  22 Feb 2012; Mike Frysinger <vapier@gentoo.org> boto-2.0.ebuild:
-  Mark sparc stable #391437.
-
-  22 Feb 2012; Mike Frysinger <vapier@gentoo.org> metadata.xml:
-  Add myself as maintainer.
-
-*boto-2.2.2 (18 Feb 2012)
-
-  18 Feb 2012; Tim Harder <radhermit@gentoo.org> +boto-2.2.2.ebuild:
-  Version bump (fixes bug #404153).
-
-  01 Feb 2012; Brent Baude <ranger@gentoo.org> boto-2.0.ebuild:
-  Marking boto-2.0 ppc for bug 391437
-
-  28 Nov 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> boto-2.0.ebuild:
-  x86 stable wrt bug #391437
-
-  26 Nov 2011; Markos Chandras <hwoarang@gentoo.org> boto-2.0.ebuild:
-  Stable on amd64 wrt bug #391437
-
-*boto-2.1.1 (09 Nov 2011)
-
-  09 Nov 2011; Tim Harder <radhermit@gentoo.org> +boto-2.1.1.ebuild:
-  Version bump.
-
-*boto-2.0 (20 Jul 2011)
-
-  20 Jul 2011; Tim Harder <radhermit@gentoo.org> -boto-2.0_beta3.ebuild,
-  -boto-2.0_beta4.ebuild, +boto-2.0.ebuild:
-  Version bump and remove old.
-
-*boto-2.0_beta4 (02 May 2011)
-
-  02 May 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-  +boto-2.0_beta4.ebuild:
-  Version bump.
-
-  04 Jan 2011; Michael Weber <xmw@gentoo.org> boto-1.9b.ebuild,
-  boto-2.0_beta3.ebuild:
-  added ~sparc keyword (bug 279975)
-
-*boto-2.0_beta3 (16 Oct 2010)
-
-  16 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-  -boto-2.0_beta2.ebuild, +boto-2.0_beta3.ebuild:
-  Version bump.
-
-  28 Sep 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-  -boto-1.6b.ebuild:
-  Delete.
-
-  28 Sep 2010; Brent Baude <ranger@gentoo.org> boto-1.9b.ebuild:
-  stable ppc, bug 326815
-
-*boto-2.0_beta2 (27 Sep 2010)
-
-  27 Sep 2010; Dirkjan Ochtman <djc@gentoo.org> +boto-2.0_beta2.ebuild:
-  Version bump to 2.0b2.
-
-  27 Sep 2010; Dirkjan Ochtman <djc@gentoo.org> -boto-1.8d.ebuild:
-  Remove old unneeded version.
-
-  17 Jul 2010; Christian Faulhammer <fauli@gentoo.org> boto-1.9b.ebuild:
-  stable x86, bug 326815
-
-  04 Jul 2010; Markos Chandras <hwoarang@gentoo.org> boto-1.9b.ebuild:
-  Stable on amd64 wrt bug #326815
-
-  24 Jun 2010; Pacho Ramos <pacho@gentoo.org> boto-1.8d.ebuild:
-  stable amd64, bug 322461
-
-  14 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> boto-1.8d.ebuild:
-  x86 stable wrt bug #322461
-
-  11 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-  boto-1.9b.ebuild:
-  Set SUPPORT_PYTHON_ABIS.
-
-*boto-1.9b (02 Jun 2010)
-
-  02 Jun 2010; Dirkjan Ochtman <djc@gentoo.org> +boto-1.9b.ebuild:
-  Version bump to 1.9b (bug 320653).
-
-  02 Jun 2010; Dirkjan Ochtman <djc@gentoo.org> metadata.xml:
-  python takes over maintainership.
-
-  02 Jun 2010; Torsten Veller <tove@gentoo.org> metadata.xml:
-  Remove caleb from metadata.xml (#317071)
-
-  20 Dec 2009; Fabian Groffen <grobian@gentoo.org> boto-1.8d.ebuild:
-  Marked ~x86-linux, ~x86-macos and ~ppc-macos, bug #296932
-
-  05 Sep 2009; Patrick Lauer <patrick@gentoo.org> -boto-1.7a.ebuild:
-  Remove old
-
-*boto-1.8d (25 Jul 2009)
-
-  25 Jul 2009; Patrick Lauer <patrick@gentoo.org> +boto-1.8d.ebuild:
-  Bump to 1.8d, fixes #279029
-
-  30 Apr 2009; Patrick Lauer <patrick@gentoo.org> -boto-1.0a.ebuild:
-  Remove old
-
-  27 Apr 2009; Markus Meier <maekke@gentoo.org> boto-1.6b.ebuild:
-  amd64/x86 stable, bug #267340
-
-  26 Apr 2009; Brent Baude <ranger@gentoo.org> boto-1.6b.ebuild:
-  stable ppc, bug 267340
-
-*boto-1.7a (24 Apr 2009)
-
-  24 Apr 2009; Patrick Lauer <patrick@gentoo.org> +boto-1.7a.ebuild:
-  Bump to 1.7a
-
-  24 Apr 2009; Patrick Lauer <patrick@gentoo.org> -boto-1.3a.ebuild,
-  -boto-1.4a.ebuild, -boto-1.4c.ebuild:
-  Remove old
-
-  17 Apr 2009; Brent Baude <ranger@gentoo.org> boto-1.3a.ebuild,
-  boto-1.4a.ebuild, boto-1.4c.ebuild, boto-1.6b.ebuild:
-  Marking 1.3, 1.4, 1.6 ~ppc for bug 265361
-
-*boto-1.6b (08 Jan 2009)
-
-  08 Jan 2009; Patrick Lauer <patrick@gentoo.org> +boto-1.6b.ebuild:
-  Bump to 1.6b, closes #254218
-
-*boto-1.4c (11 Nov 2008)
-
-  11 Nov 2008; Caleb Tennis <caleb@gentoo.org> +boto-1.4c.ebuild:
-  version bump
-
-*boto-1.4a (20 Sep 2008)
-
-  20 Sep 2008; Caleb Tennis <caleb@gentoo.org> +boto-1.4a.ebuild:
-  version bump per #236670
-
-*boto-1.3a (13 Jul 2008)
-
-  13 Jul 2008; Caleb Tennis <caleb@gentoo.org> +boto-1.3a.ebuild:
-  version bump
-
-  14 Mar 2008; Caleb Tennis <caleb@gentoo.org> boto-1.0a.ebuild:
-  amd64 stable
-
-*boto-1.0a (18 Jan 2008)
-
-  18 Jan 2008; Caleb Tennis <caleb@gentoo.org> +boto-1.0a.ebuild:
-  Initial import

sdk_container/src/third_party/portage-stable/dev-python/boto/Manifest

@@ -1,12 +1,2 @@
-DIST boto-2.27.0.tar.gz 6789802 SHA256 5b20c6c22177c8048b4299bed7c357b6418932abd434c277c5b6050a18dc284b SHA512 56caf13c0e9ccfe13a36f986f69f4f5630c4ced7558adb9a982bad4cad63828a958fcf7406954a3311ab0b5654c9804739655a121f82e661f1dc3db065529e54 WHIRLPOOL 9404b92a33b20d376a14a57a64df9c71382a17d1bde51a9674c526f9d3f4c988b25fc493dfdb844bf664587d18e5a749774f21f35694d1d9983ae3d18b32f3d8
+DIST boto-2.41.0.tar.gz 1440323 BLAKE2B 9d72fcd09cbf57d22dc45d42699af8cecef6f2c8e4009c9d70b54a9b84e23801ecbb5f7bc484692ca93ae302793b4d2f511c1209bcd33d0703a39b809bda1e00 SHA512 ffb503e8f7ec84ec973e109ae9524e1db2ef5f34d9424c380eed9a85871f07f8c9c798ca358fefd772ff45a72226bb02eebbbf6ab2d56b2442c41ede736f6f5e
-DIST boto-2.31.1.tar.gz 7078455 SHA256 dadccbe69a9f8d858506bb9b14ff288fa91b81dec1fefd8867792324b8cb33f3 SHA512 473f8c83dfe73ee9d5a3cb694793b99543264a7ef3b54346d11a5136e8b26b40fb8b1d7c9a23deaf34fb962ddf90923c6399f7cc3c8d6a1f5aa492d9a070393c WHIRLPOOL 6ac0cf73c4216ef18cecf591c7108651f1e1636d6863c5f31378965e9f7453dc42b36de032bcdee7956ba98694e1e706ef086df6923782b6266b5f9e09a072a9
+DIST boto-2.48.0.tar.gz 1461372 BLAKE2B 0069ddc6def7d8698471bd66a5d8d4b62d49f49138036b3ae6a9655e7b7432af5449f2812e83f2012be2f01e93a61d9608157c9fd4ea0a52f8801e31877a78a7 SHA512 ce8e302b059ef31e81078ef21999b96b8770d2ef0c70358624c8cc6a79b1a43a78e1c206cbcba50eafb9c964c4eda5b9b0b127ea9523dcf7438453b4b2293f9f
-DIST boto-2.34.0.tar.gz 7302242 SHA256 33baab022ecb803414ad0d6cf4041d010cfc2755ff8acc3bea7b32e77ba98be0 SHA512 5784ab3eb785784fa348f9f572d8e885d297d0e569f503229f0ae3aa66389699c9fe21cd1737e20a9683735dc4e7a765aa2345b013c75a3292ed5995f20699d2 WHIRLPOOL 33c42d3f012410e9f3acead7293073dfea3e97cffa93248d735a76266480ab912935d8300839ef742820f1ed1a093dbf5555c163bd8ee34cf28f09a62a01dff5
-DIST boto-2.35.1.tar.gz 1367029 SHA256 62604f0fdf68a2b9a6c6bd5111c82e10281b498695152d21f56c9e4a0691d45d SHA512 4be15cbb4ccc9f984fed11213ce1e64fefe7adbc747314dc0030928f2876b55322344f325228d95209e0411ef22fe1a3bede91ffbf3e9eed1a1a2d2507bff92d WHIRLPOOL 060f3e2483a3a5be26b67a2a94df2f88a9eccb3f62cc4020e26b7ac0111d30d938638641f4c83c71095602d5b79e365de6211f884b4adbeacf6d7187bb04d071
-DIST boto-2.38.0.tar.gz 1423863 SHA256 d9083f91e21df850c813b38358dc83df16d7f253180a1344ecfedce24213ecf2 SHA512 577672007348db846d041c0906806c62eb77653b1335645cc852c603f5d32991ca648aacb884676af02043914c91ab6f41666b36b5b1ae23a3a354bdf9f3f75a WHIRLPOOL de704484ed38a0d0322ef289fd0657b6d1141c0f77aa6725e338dd51d78bed39a7ef1ebdec54a659d83dae30c14196f2410507d9aeec070126bbe13565b210ba
-EBUILD boto-2.27.0.ebuild 612 SHA256 3b4854d89664d7ce85cfedc8297590be6a1bafdc534a20738ee79b46fab00895 SHA512 c2286cf2d01701527e343e99a6b22602a086a035a69cc9171901a206e0190fc3374f72e6d85e9ad269dbbcf8a9749736e3db1d527aa2460607180c26d8c44fa2 WHIRLPOOL 5e80ae6b442fa60b25a21e171a135c64dd581d6e4304050cfe522906aa81946d2e778720c974bdc3a42224917f70b64a57d172dc54a3e388434067145e2730f2
-EBUILD boto-2.31.1.ebuild 617 SHA256 bc5adc8220293bf5aa480d6cd6c49963e6bfc2c3ff760717a12f196f900eeba5 SHA512 b3cffe474c746f54ff3167dae812a35c47c8357d8c0f58298c9efc58671caed6d46ee56315ba508e6527f4e7270ac14130ac4888fe5492c6e602985980b5319e WHIRLPOOL bbe90dee7c9b3963eb5ea35b274d77fee49c8c1c1fc4d7d61485e9db0675f2e84883d94c07e68946ef1d1de5d94c75e42458081b2bb25397d1998a0445b957db
-EBUILD boto-2.34.0.ebuild 617 SHA256 bc5adc8220293bf5aa480d6cd6c49963e6bfc2c3ff760717a12f196f900eeba5 SHA512 b3cffe474c746f54ff3167dae812a35c47c8357d8c0f58298c9efc58671caed6d46ee56315ba508e6527f4e7270ac14130ac4888fe5492c6e602985980b5319e WHIRLPOOL bbe90dee7c9b3963eb5ea35b274d77fee49c8c1c1fc4d7d61485e9db0675f2e84883d94c07e68946ef1d1de5d94c75e42458081b2bb25397d1998a0445b957db
-EBUILD boto-2.35.1.ebuild 729 SHA256 3c1f05f90a6549d74495daf3f2cc420b55b30b64d3196282d35690e4bc8bc9e3 SHA512 790634d6417e055e225e4c80987466648fab086a89812b077dccd4d52851f518fc593b3823a41080c59ffa783b98db83281984fb64cbe297e91d93fdf9dead91 WHIRLPOOL 1e5529b7843589e228ef25175dc67668a950385627966ac4d6649246db2512fdd29b4a941764279288e244e45f142e305bea7862a58d983fdc8953740e71bc0f
-EBUILD boto-2.38.0.ebuild 1276 SHA256 313904a9bfe2bccf3b0ce24464c8ba818a7c3b77458f369e7ca5b613ce2480dd SHA512 2f43912414e866bede779aab423348c676c22d2a53325893bf85ebcddfe3f0ed867780f59a6ffb617933b447f6566eb1730f76cfa5d84aa718b1528a7f6542b6 WHIRLPOOL caf51d00c40355e814e7f57cabcf4d5818219243f76482f9e1012f62957f8c39c909a1cf2a5cd15a84bdccd7c2666fc089b658159ca4f05e4f4da388f9ab91f9
-MISC ChangeLog 14215 SHA256 0d08f640442ca674ccd26357d14842f8c0e79836d2a3d98a661525f7200ba8a2 SHA512 2f369ba0735f22a78af209c90ea25ac5f1336a065af523964b4fec526211489143de46295840c626f8f1bd2479a684c14d98d9250c35ad7cb0556d94bd24f32a WHIRLPOOL 14681b465a797765293787ebac3bfea6f488731c10b87e9acb025a9a4baccee09e6f3c3330e195c1ae70704158dc2558885535e553f96015057d8062d991ae2f
-MISC metadata.xml 402 SHA256 c2ca3feaff7399330b02f1311e0bec04ea4cd4abfca1c5a2502b817ff021bd19 SHA512 8b46b0bf772a4e7612fbbd58b7d746d3d5af99f87b23d798d120c716c70a26cbdc65220371485d629263182d3a687bcaf0007d802b3c1f6a692f28a9c40f7855 WHIRLPOOL 85c09bc0d225de1c7d4517699970683dcde7ba4f8c6b082b0ec8de9df5ea97a837719df6eed23590d160440c00b9d15e175b4b10496e88414a4cf19b7cebcf6d

sdk_container/src/third_party/portage-stable/dev-python/boto/boto-2.27.0.ebuild

@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Amazon Web Services API"
-HOMEPAGE="https://github.com/boto/boto https://pypi.python.org/pypi/boto"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# requires Amazon Web Services keys to pass some tests
-RESTRICT="test"
-
-python_test() {
-	esetup.py test
-}

sdk_container/src/third_party/portage-stable/dev-python/boto/boto-2.31.1.ebuild

@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Amazon Web Services API"
-HOMEPAGE="https://github.com/boto/boto https://pypi.python.org/pypi/boto"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# requires Amazon Web Services keys to pass some tests
-RESTRICT="test"
-
-python_test() {
-	esetup.py test
-}

sdk_container/src/third_party/portage-stable/dev-python/boto/boto-2.34.0.ebuild

@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Amazon Web Services API"
-HOMEPAGE="https://github.com/boto/boto https://pypi.python.org/pypi/boto"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# requires Amazon Web Services keys to pass some tests
-RESTRICT="test"
-
-python_test() {
-	esetup.py test
-}

sdk_container/src/third_party/portage-stable/dev-python/boto/boto-2.35.1.ebuild

@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Amazon Web Services API"
-HOMEPAGE="https://github.com/boto/boto https://pypi.python.org/pypi/boto"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-# requires Amazon Web Services keys to pass some tests
-RESTRICT="test"
-
-python_test() {
-	"${PYTHON}" tests/test.py -v || die "Tests fail with ${EPYTHON}"
-}

sdk_container/src/third_party/portage-stable/dev-python/boto/boto-2.41.0.ebuild

@@ -1,28 +1,35 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI="5"
+EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit distutils-r1
 
 DESCRIPTION="Amazon Web Services API"
-HOMEPAGE="https://github.com/boto/boto https://pypi.python.org/pypi/boto"
+HOMEPAGE="https://github.com/boto/boto https://pypi.org/project/boto/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
 # requires Amazon Web Services keys to pass some tests
 RESTRICT="test"
 
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
 python_test() {
 	"${PYTHON}" tests/test.py -v || die "Tests fail with ${EPYTHON}"
 }

sdk_container/src/third_party/portage-stable/dev-python/boto/boto-2.48.0.ebuild

@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Amazon Web Services API"
+HOMEPAGE="https://github.com/boto/boto https://pypi.org/project/boto/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# requires Amazon Web Services keys to pass some tests
+RESTRICT="test"
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_test() {
+	"${PYTHON}" tests/test.py -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/source/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		# Appease the doc build and supply a file for _static
+		# the usual emake -C docs doesn't work under this authorship
+		cd docs && mkdir source/_static  || die
+		emake html
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}

sdk_container/src/third_party/portage-stable/dev-python/boto/metadata.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer type="project">
-  <maintainer>
+    <email>python@gentoo.org</email>
-    <email>vapier@gentoo.org</email>
+    <name>Python</name>
   </maintainer>
   <upstream>
     <remote-id type="google-code">boto</remote-id>

sdk_container/src/third_party/portage-stable/dev-python/certifi/Manifest

@@ -1,9 +1 @@
-DIST certifi-2016.9.26.tar.gz 374637 SHA256 8275aef1bbeaf05c53715bfc5d8569bd1e04ca1e8e69608cc52bcaac2604eb19 SHA512 e89c07dab0d926754012c89e12fff9ee59f771a5edd24130c8adb7ab32076971f4ea6d266ed9f3ed2010c1aba403505f5b5e97af3b5efcf3d039ddc7a7b2af39 WHIRLPOOL 52412b9cf57544ac19e89a493bf65dc212a06f053778b7c5de3d6254a7189fed9f051af99e0176efec6d7c318760f9a9fca51d1ddcf56024c973a6ffbe803496
+DIST certifi-2018.4.16.tar.gz 149967 BLAKE2B 4a69ec495266d54032dfabc9c17d0b1e78ad1467214f9f981feb4fae279c1f4b5f0bc3f7a643c2229b17d19e32c1ea894dc16d73b036a0b32f17faa9ac55615c SHA512 96369b318df9592ed4ff48d79ae695f89d27d85e8f5de72548fccb19ac15b83a33fb8bc096a3092d7a7f5b201af08805576888418c7927cf48b892df56464682
-DIST certifi-2017.1.23.tar.gz 380397 SHA256 81877fb7ac126e9215dfb15bfef7115fdc30e798e0013065158eed0707fd99ce SHA512 8e7a03236458567545739bdef1526f81f4cef61d6cc708048f2411a0387a9b1b38d21a83739cc5207bd590d67c876e99ef1e22916065a371dae30b4a94cc1e49 WHIRLPOOL df50f3c715802cdff496a482d97d3431b79db629de3708eeac910c423c0b59c5222f73937f349dad114a7fc311f4c31fde39d1a4c0632d7f2486dd463815ff26
-DIST certifi-2017.4.17.tar.gz 373512 SHA256 f7527ebf7461582ce95f7a9e03dd141ce810d40590834f4ec20cddd54234c10a SHA512 0bd054bb2eaa8c196a94a0b7865d2488aea1fcb5e66ddc8c776c68cfa518a198a8c67bed5b485bf55db3f55d26c0ab2b4fc07839bb9175a50cb525e25d3869a5 WHIRLPOOL f949eefd72c41900202944315f058c0f8bab88883a0be1283bddadec4a273b138d012f37cda61d0f5656baadb304d7340816d953db53f624c9bd5c8545ebdf86
-EBUILD certifi-2016.9.26.ebuild 724 SHA256 d26632de3d3a95fd411cdd835a29d10a31be7367674c4fd19fa0fae1ef8e8bd1 SHA512 acbcfcafaafc2b257018df09ebea8680900b69bd82209a21ce0ae9f462f166daae14e1e0d93d7e1104d7c9dc85595a522b87d14bd6f0991efe096b6f642499b7 WHIRLPOOL 94df0e089f83d4992994bc0d2065003967da5311e634a65ba1e74ee0afe296cd62c1e647762ca7821d2a54928488c653f2b6904eec65351a6ef22c5264d89de9
-EBUILD certifi-2017.1.23.ebuild 742 SHA256 5506786185cff6509db96047844937aaed969b124cf06e21c1e6f02324bedc36 SHA512 ea0386f0afee2a0a5a8e19d0e2a62e10803d3253cc1d10980d5d59b650192b9f6fc8d4b41cbed6558de81f70d4c58e346bded9295b98ba45539eb19af9da10de WHIRLPOOL 42198ee7fb4fc5dbcfd17b0de284f741e1f51cdde9831b12a7c0983cf14fd4e1537303d124744f2b26f1289ecb23174d168c4eb7645b5b8237c827114bd9fbdb
-EBUILD certifi-2017.4.17.ebuild 749 SHA256 34b9c4b461013af9383be769a4e68d7eae6f42974e599dc6f6c12430f47ae913 SHA512 44add0b424734e0e088b77ce3e15b9aed359b465cbc818de7125c6f74a9c2d4fe93f24b63e9877a2475a671a22142db5a41a88751105472003d6c351892bc7c3 WHIRLPOOL d4efc5f23c8c499f6181125b0e3e3bdc9c671c42379783e1ed0aedeb4a31837003ac9ce4902f009b52398bfea7006c0907a50c976770c9ce628ab114a4a3421f
-MISC ChangeLog 8110 SHA256 3dd557deaecbb5a90035cc4de72f417965549679e52ef69b8e61d6e65b8473c8 SHA512 474e5fa1135a22de1e251807d49b3d9c8422375bbef9024159958581bd19c18c0b7ba170fb7342dce205fe8d52dfd42f225ba309ddfac869be9867420be81c8f WHIRLPOOL e14382ff91ecd97d88d74bb250d63d1d47247b9c4dad1f464d57457859f9461d3c16bcfc0b0ba7acf938e4123a5544db80cc3a0c74ab811200547668697d8e39
-MISC ChangeLog-2015 1269 SHA256 7f03c766028c0a93b71ea9473b1da396493355a0c331925225b1921f1f48f811 SHA512 c37a4995e51cd9016e3ac7d51580161268f6d9c1a9dd427f4645e84a8ab1a6663da1970ae43bbc5af80be74624e060a72fa35be8b0c5c6660563a6132236c74b WHIRLPOOL d6103146e2677da460d722e33f5ed663da6f5b368a3ca3d366107336eb043bab7e840963f50b30356aa9ec65b6bb4a2c2093cfa7e8a3e9d26e75f238349b53a5
-MISC metadata.xml 320 SHA256 9efa83da8ded9fa37cec1a22436f3f38b1c92fd3796de28404612f4d3dd7c4c0 SHA512 0e99564887f0a0b314056b2e1f4b6e3afcaf908de6824a2cc87deab9d1832566e97b8ba88cc7d2bdc5d11e7f1c8532830fc59602efd8c2f1a6061c0ad4853fdd WHIRLPOOL d100397d0568108f6856d147e4aaf96f22f33fa2916242454812ee968caddb3528efc26bd15331c437d4a184efdc9d61b3b7f4fce9b003fc85539a42bea3343f

sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-2016.9.26.ebuild

@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package for providing Mozilla's CA Bundle"
-HOMEPAGE="http://certifi.io/ https://pypi.python.org/pypi/certifi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"

sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-2017.1.23.ebuild

@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package for providing Mozilla's CA Bundle"
-HOMEPAGE="http://certifi.io/ https://pypi.python.org/pypi/certifi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"

sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-2017.4.17.ebuild

@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package for providing Mozilla's CA Bundle"
-HOMEPAGE="http://certifi.io/ https://pypi.python.org/pypi/certifi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"

sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-2018.4.16.ebuild

@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1 prefix readme.gentoo-r1 versionator
+
+DESCRIPTION="Python package for providing Mozilla's CA Bundle"
+HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="app-misc/ca-certificates"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# Do not drop this patch -- this will affect system's security
+PATCHES=( "${FILESDIR}"/certifi-2018.4.16-use-system-cacerts.patch )
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	eprefixify certifi/core.py
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local DOC_CONTENTS="
+		In Gentoo, we don't use certifi's bundled CA certificates.
+		Instead we remove bundled cacert.pem and patch certifi
+		to return system's CA certificates.
+	"
+	readme.gentoo_create_doc
+
+	# Precaution -- nothing should use bundled CA certificates
+	find "${D}" -name 'cacert.pem' -delete || die "Failed to delete bundled CA certificates"
+}

sdk_container/src/third_party/portage-stable/dev-python/certifi/files/certifi-2018.4.16-use-system-cacerts.patch

@@ -0,0 +1,15 @@
+Use system's CA certificate store
+
+--- a/certifi/core.py
++++ b/certifi/core.py
+@@ -19,9 +19,7 @@ class DeprecatedBundleWarning(DeprecationWarning):
+ 
+ 
+ def where():
+-    f = os.path.dirname(__file__)
+-
+-    return os.path.join(f, 'cacert.pem')
++    return "@GENTOO_PORTAGE_EPREFIX@/etc/ssl/certs/ca-certificates.crt"
+ 
+ 
+ def old_where():

sdk_container/src/third_party/portage-stable/dev-python/cffi/Manifest

@@ -1,2 +1,4 @@
 DIST cffi-1.11.2.tar.gz 435142 BLAKE2B ba90cc377261a75557cef626f1c6b8c0c625c67212b546d42ca56c3360496d01c59984f72d5ce61b1160aa6117b869e567b17df8458de2c88a42dc5e653f6129 SHA512 8ccd8988bb6b4beb760abe5d8cac7cbf65a7dcfad5a535343e5961912751f426fdf6e602a983430e6aa9f56f2f623855b0cfb5ed8e5294a95d122866a4533eda
+DIST cffi-1.11.4.tar.gz 436857 BLAKE2B 46b5d1adf4aca2a75ea02ba01ae934821d0e864accd9c355745a681d11a08ed34c33c473204c78ecb2113b2d59fbc762ca0607ff92f6cd2dc411907844bbdaf3 SHA512 184572ab8c1f7a72f00084c23894efe1691aa20f9e822a3f7184ebbed16e757586ac47e7f1d12dd7b14b4322bf5b88e35465dc3bc8b0caf0dc8e2b626a52615e
+DIST cffi-1.11.5.tar.gz 438498 BLAKE2B 2e22cf3c2d50d76f8f25b7ac31a77fac8a49e2b2f4952e3b1a1da79c0ad2ca5c6e450000cadd1efa06df53d14f711e0acd73a075bea45ebd61e667fb650a10ab SHA512 6770d5293cfd7405e733d60c96655641b5bcc5878fc66a737f4a8308f465d459ee0e3fcaa47893d8f57fb195e5534dd7e4728c868f33d7e657688f45e1fb1880
 DIST cffi-1.9.1.tar.gz 407108 BLAKE2B f95e99cbb7a10aacb714d6ddbe85755e24d4fbdebb9ada0ab87c95b58aa56b364df612fbdfbf6fcc3a9dfff6e96fe5e979ee37b1c6c9b62b6ba8d3a9565def2f SHA512 6e76f181b6b7b760a14ad70338edd104a8b8e2eac5680e336d3868e0bd031a1665608e29a65dc0c56806afb8a8c03811586f151f3acef11e54e60c1bfcf902e3

sdk_container/src/third_party/portage-stable/dev-python/cffi/cffi-1.11.2.ebuild

@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.python.org/pypi/cffi"
+HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.org/project/cffi/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"

sdk_container/src/third_party/portage-stable/dev-python/cffi/cffi-1.11.4.ebuild

@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# DO NOT ADD pypy to PYTHON_COMPAT
+# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Foreign Function Interface for Python calling C code"
+HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.org/project/cffi/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="doc test"
+
+RDEPEND="
+	virtual/libffi
+	dev-python/pycparser[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	einfo "$PYTHONPATH"
+	$PYTHON -c "import _cffi_backend as backend" || die
+	PYTHONPATH="${PYTHONPATH}" \
+	py.test -x -v \
+		--ignore testing/test_zintegration.py \
+		--ignore testing/embedding \
+		c/ testing/ \
+		|| die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}

sdk_container/src/third_party/portage-stable/dev-python/cffi/cffi-1.11.5.ebuild

@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# DO NOT ADD pypy to PYTHON_COMPAT
+# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Foreign Function Interface for Python calling C code"
+HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.org/project/cffi/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="doc test"
+
+RDEPEND="
+	virtual/libffi
+	dev-python/pycparser[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	einfo "$PYTHONPATH"
+	$PYTHON -c "import _cffi_backend as backend" || die
+	PYTHONPATH="${PYTHONPATH}" \
+	py.test -x -v \
+		--ignore testing/test_zintegration.py \
+		--ignore testing/embedding \
+		c/ testing/ \
+		|| die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}

sdk_container/src/third_party/portage-stable/dev-python/cffi/cffi-1.9.1.ebuild

@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.python.org/pypi/cffi"
+HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.org/project/cffi/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"

sdk_container/src/third_party/portage-stable/dev-python/crcmod/ChangeLog

@@ -1,51 +0,0 @@
-# ChangeLog for dev-python/crcmod
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/crcmod/ChangeLog,v 1.13 2015/06/09 15:07:49 jlec Exp $
-
-  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
-  Updating remote-id in metadata.xml
-
-  07 Jun 2015; Markus Meier <maekke@gentoo.org> crcmod-1.7-r2.ebuild:
-  arm stable, bug #540290
-
-  08 Mar 2015; Pacho Ramos <pacho@gentoo.org> crcmod-1.7-r2.ebuild:
-  x86 stable, bug 540290
-
-  06 Mar 2015; Pacho Ramos <pacho@gentoo.org> crcmod-1.7-r2.ebuild:
-  amd64 stable, bug 540290
-
-  23 Jan 2015; Manuel Rüger <mrueg@gentoo.org> -crcmod-1.7-r1.ebuild:
-  Remove old.
-
-*crcmod-1.7-r2 (30 Nov 2014)
-
-  30 Nov 2014; Michał Górny <mgorny@gentoo.org> +crcmod-1.7-r2.ebuild:
-  Convert to distutils-r1.
-
-  24 Feb 2014; Mike Frysinger <vapier@gentoo.org> crcmod-1.7-r1.ebuild:
-  Add arm love for Chromium OS.
-
-  22 Jul 2013; Dirkjan Ochtman <djc@gentoo.org> metadata.xml:
-  Add python herd.
-
-  21 Jul 2013; Pacho Ramos <pacho@gentoo.org> -crcmod-1.7.ebuild, metadata.xml:
-  Cleanup due #92799
-
-  10 Feb 2012; Patrick Lauer <patrick@gentoo.org> crcmod-1.7-r1.ebuild,
-  crcmod-1.7.ebuild:
-  Changing python deps in preparation for 2.4 removal
-
-*crcmod-1.7-r1 (10 Oct 2011)
-
-  10 Oct 2011; Stefan Briesenick <sbriesen@gentoo.org> +crcmod-1.7-r1.ebuild:
-  added python 3.2 abi support, solves bug #378923.
-
-  10 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-  crcmod-1.7.ebuild:
-  Update EAPI.
-
-*crcmod-1.7 (22 Jul 2010)
-
-  22 Jul 2010; Stefan Briesenick <sbriesen@gentoo.org> +crcmod-1.7.ebuild,
-  +metadata.xml:
-  initial commit.

sdk_container/src/third_party/portage-stable/dev-python/crcmod/Manifest

@@ -1,4 +1 @@
-DIST crcmod-1.7.tar.gz 89670 SHA256 dc7051a0db5f2bd48665a990d3ec1cc305a466a77358ca4492826f41f283601e SHA512 3c2f65004761c84f19d6ba95a0af74512108bad5007d9e20f8e684822e4196ce17073e58b47d2fa997e058e3d82782f3393458b6f0e86935418f38877d319a31 WHIRLPOOL 17b05332b71c5043ff870146714e49c84ce58fd9c408c040fcfdc4e9ebd3a340326da7cbc900f7ebf43f3b68e9cd4666ae5f0089aa327b47a0fda5a56ae89591
+DIST crcmod-1.7.tar.gz 89670 BLAKE2B 542bdde18f4565f574a2746de5e1fcb10d015d5c89f3eba7a0c316a3e53eb5a895664e2f51e54dcbab7d2ee6f30055137f22498f44b6c27d40d0692ff9652813 SHA512 3c2f65004761c84f19d6ba95a0af74512108bad5007d9e20f8e684822e4196ce17073e58b47d2fa997e058e3d82782f3393458b6f0e86935418f38877d319a31
-EBUILD crcmod-1.7-r2.ebuild 505 SHA256 054570ac9316cfcedaad8afcd5a7ed98b91c2ce95353a92b12c482f6c672867d SHA512 fcd4b1830866a999ebe09f2ced940ce8640e974c6f8757b6adb1903670d8e0179c9c0e3d8bc3a4879510b4bb70b803ac57cd7a14b66ff72fb0b20a0c383887bc WHIRLPOOL 1bfff3056df0a0e103a61029fb5acf0511277f0f132de63ce7e23669911fbb1e26d9ed5fedb5aa0040a1d260428534838c7a7503502fcc5fea85f89b51fc02f3
-MISC ChangeLog 1654 SHA256 e4cda1bd381255dac71c39bc55ce59938b38ea37e20c964453d992e8c9e74976 SHA512 423babc1ec0b891c881c567c6c42bc6393e29b128b8d64770c308667db40a4811b35a7249ab5a9ec20a559ace587b5c7ef22bad4abac559b69b6423015cbc583 WHIRLPOOL 429687d4c6261d83f57be982d5dc6f9a90eceebddd4eba5c6215883ffc2313685ea088eeed9e09fe0aa5a2e00b3069293015bd208831f2b0d880a40a95defbc6
-MISC metadata.xml 512 SHA256 086ae429620969fdca3b3ab2ca8db35f4920e37f1b4201f29a0efe733a35963b SHA512 60a5441da532818ccf8696b802ab0ef3b3b675669cbc98975bec449ccd744c23a9ce4b5a4463a251e14b1d86854548e85ebf45b4694dc2eb0eb414b36c174988 WHIRLPOOL 89b02bb0c6ec4099c7002d1c6adf9e509549fab7f740c69bfc66a8479a54997fd59e60ecfb6f941be8b55bfdbae79b69faed020c8f49b2bd58c039f6456f1827

sdk_container/src/third_party/portage-stable/dev-python/crcmod/crcmod-1.7-r2.ebuild

@@ -1,10 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 
 inherit distutils-r1
 

sdk_container/src/third_party/portage-stable/dev-python/crcmod/metadata.xml

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		The software in this package is a Python module for generating objects
 		that compute the Cyclic Redundancy Check (CRC). It includes a (optional)

sdk_container/src/third_party/portage-stable/dev-python/ipaddress/ChangeLog

@@ -1,37 +0,0 @@
-# ChangeLog for dev-python/ipaddress
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipaddress/ChangeLog,v 1.9 2015/07/27 20:34:50 jlec Exp $
-
-*ipaddress-1.0.14 (27 Jul 2015)
-
-  27 Jul 2015; Justin Lecher <jlec@gentoo.org> +ipaddress-1.0.14.ebuild:
-  Version Bump
-
-*ipaddress-1.0.12 (19 Jul 2015)
-
-  19 Jul 2015; Ian Delaney <idella4@gentoo.org> +ipaddress-1.0.12.ebuild:
-  bump; extend DESCRIPTION and add py3 pypy3 support
-
-  21 Jun 2015; Markus Meier <maekke@gentoo.org> ipaddress-1.0.7.ebuild:
-  add ~arm, bug #549518
-
-  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
-  Add github to remote-id in metadata.xml
-
-  03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
-  Add pypi to remote-id in metadata.xml
-
-  17 May 2015; Jeroen Roovers <jer@gentoo.org> ipaddress-1.0.7.ebuild:
-  Mark ~hppa (bug #549518).
-
-  17 May 2015; Jeroen Roovers <jer@gentoo.org> ipaddress-1.0.7.ebuild:
-  Mark ~ppc64 (bug #549518).
-
-  16 May 2015; Justin Lecher <jlec@gentoo.org> ipaddress-1.0.7.ebuild:
-  Fix LICENSE, HOMPAGE and DESCRIPTION, bug #549528
-
-*ipaddress-1.0.7 (15 May 2015)
-
-  15 May 2015; Justin Lecher <jlec@gentoo.org> +ipaddress-1.0.7.ebuild,
-  +metadata.xml:
-  New package; ebuild written by me

sdk_container/src/third_party/portage-stable/dev-python/ipaddress/Manifest

@@ -1,4 +1,3 @@
-DIST ipaddress-1.0.14.tar.gz 30429 SHA256 226f4be44c6cb64055e23060848266f51f329813baae28b53dc50e93488b3b3e SHA512 fb33b484ca435f4e8817c735a1084f2fa749abca4643a10be644003fdb73cc9205fc28f484ef96d2db90e8b27d8a238d1d7cf20140f7942e39be12c7524e8d6f WHIRLPOOL 30e21d5b7568125575fecd0f8cac4172713c029faa81f88cd2a6111b47da1fb3bea9305a9311ce1a7b2795e9d54b58f2cbef1e5b66f355b8c91633ead0836d04
+DIST ipaddress-1.0.14.tar.gz 30429 BLAKE2B cbd9db35c965adca5162db0d263920f537377b378fd9ab94c9e1ff8a409611cc076bd1cea2a92c37bfbb804cc67d7c7ec6a40b16db690cea4e47ca843455f009 SHA512 fb33b484ca435f4e8817c735a1084f2fa749abca4643a10be644003fdb73cc9205fc28f484ef96d2db90e8b27d8a238d1d7cf20140f7942e39be12c7524e8d6f
-EBUILD ipaddress-1.0.14.ebuild 643 SHA256 580ace9a5d2a1a63b21de4be8eb8a3e9b73ed54c9f4d6c0250381e574d2c98b8 SHA512 00095850dc566ec5ef742b713d72fcbcc59fa56ec43903efb92810e69c5f7a22584f2658bd4f00ca66376f206445a6035839abad45c7a7c50af63957c16203c5 WHIRLPOOL 31b0fd4a1168bbbfa7fa00d93e105961c16d92be94290ca5eea5a3c4e7c3f35f7cf6b6bf71b6d1fe91a971de3c835a91d2cce07896f41484dfda88bcb44292d4
+DIST ipaddress-1.0.18.tar.gz 32475 BLAKE2B 7d116b1aad36bc58f9a6769b562e0b6dd260fc497a4fd697cf13d506c8828ba7e63f86f1908ec9cff1f1bb15aa76a0e850c628c30e22d5440df320b3c8ad0328 SHA512 7d1c8cf67db5b55a872783390ca214bb39e243d313311674afe10008e86638838bef5f9e6d703803bdcfde6d27520b1fc19d0adb19d482e27a327fb735aa0312
-MISC ChangeLog 1279 SHA256 f7b05a20439a05bcf3b654f419f36159146b0b35da6b41982b026ca1eebedb1e SHA512 060cf0c5eed68069f12fb9b8bca5f224e9f618b1ed7b585612a7a67e2b60240d4379da53fd7419b12e0c472e5a3b84ae1e509c8ac548d12507adea607790b924 WHIRLPOOL c2733d1995ca39b4857408f3bc901109eac0a5e378732bbe946a4b997ef8ccffd9303ded64e71ac879d9c4d1c183cbf54c962744f0b2dbd7b461846af5c55c7f
+DIST ipaddress-1.0.19.tar.gz 32854 BLAKE2B ea6bd0ac5418dca343e39c12e31a96aa6b13b091da05b7afcb3051251d3c8b8ce76a19f1d6b7ad2caf3f0077f6b522c4e0915a7a8eae28a72700732278ae4c6b SHA512 e49d0d0b76c108f985a5d209092495b5839195d9c4d5c975cc17c89e98d9b6bf0983f71f3b183c3974eccf0529cfb22aa8fbe384485be019da3fb74d50f1f4f1
-MISC metadata.xml 392 SHA256 30d542ac1d340fc97ab10b215be7af03b6e0a59a44b9ac13432d3fcd823633bf SHA512 195096f20271cc5308fbdb60d06a18eac0fac8ba00686eb2b099d18496849179280b58857665112c035ee2b6c4b97478136c8625e00c89346274b5ef5c5d6c68 WHIRLPOOL 610d71a4c52bb45296f2f1f4ef00c76f532b5311a4fb94f5857c2d0a07e211d7d9f07a137d45b9ba6ca459b5006d043945f3d164d505730375326a5e7a8f333c

sdk_container/src/third_party/portage-stable/dev-python/ipaddress/ipaddress-1.0.14.ebuild

@@ -1,20 +1,19 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 pypy pypy3 )
 
 inherit distutils-r1
 
-DESCRIPTION="IPv4/IPv6 manipulation library, a port of the ipaddress module"
+DESCRIPTION="IPv4/IPv6 manipulation library, backport of the ipaddress module"
 HOMEPAGE="https://github.com/phihag/ipaddress"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""

sdk_container/src/third_party/portage-stable/dev-python/ipaddress/ipaddress-1.0.18.ebuild

@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="IPv4/IPv6 manipulation library, backport of the ipaddress module"
+HOMEPAGE="https://github.com/phihag/ipaddress"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" test_ipaddress.py || die
+}

sdk_container/src/third_party/portage-stable/dev-python/ipaddress/ipaddress-1.0.19.ebuild

@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="IPv4/IPv6 manipulation library, backport of the ipaddress module"
+HOMEPAGE="https://github.com/phihag/ipaddress"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" test_ipaddress.py || die
+}

sdk_container/src/third_party/portage-stable/dev-python/ipaddress/metadata.xml

@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer type="person">
-  <maintainer>
+    <email>prometheanfire@gentoo.org</email>
-    <email>jlec@gentoo.org</email>
+    <name>Matthew Thode</name>
-    <name>Justin Lecher</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
   </maintainer>
   <upstream>
     <remote-id type="pypi">ipaddress</remote-id>

sdk_container/src/third_party/portage-stable/dev-python/ply/ChangeLog

@@ -1,184 +0,0 @@
-# ChangeLog for dev-python/ply
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ply/ChangeLog,v 1.50 2015/08/06 14:41:06 klausman Exp $
-
-  06 Aug 2015; Tobias Klausmann <klausman@gentoo.org> ply-3.6-r1.ebuild:
-  Stable on alpha, bug 556428
-
-  02 Aug 2015; Pacho Ramos <pacho@gentoo.org> ply-3.4-r1.ebuild:
-  sparc stable wrt bug #530294
-
-  11 Jul 2015; Tobias Klausmann <klausman@gentoo.org> ply-3.4-r1.ebuild:
-  Stable on alpha, bug 530294
-
-*ply-3.6-r1 (17 May 2015)
-
-  17 May 2015; Mike Gilbert <floppym@gentoo.org> +files/3.6-lextab-None.patch,
-  +files/3.6-picklefile-IOError.patch, +ply-3.6-r1.ebuild, -ply-3.6.ebuild:
-  Resolve chromium build issues, bug 549328.
-
-*ply-3.6 (11 May 2015)
-
-  11 May 2015; Patrick Lauer <patrick@gentoo.org> +ply-3.6.ebuild:
-  Bump
-
-  04 Apr 2015; Mike Frysinger <vapier@gentoo.org> ply-3.4-r1.ebuild:
-  Mark arm64/ia64/m68k/s390/sh stable.
-
-  01 Apr 2015; Tobias Klausmann <klausman@gentoo.org> ply-3.4-r1.ebuild:
-  Keyworded on alpha, bug 503094
-
-  05 Mar 2015; Manuel Rüger <mrueg@gentoo.org> -ply-3.4.ebuild:
-  Remove old.
-
-  02 Mar 2015; Yixun Lan <dlan@gentoo.org> ply-3.4-r1.ebuild:
-  add arm64 support, tested on A53 board
-
-  07 Feb 2015; Agostino Sarubbo <ago@gentoo.org> ply-3.4-r1.ebuild:
-  Stable for ppc, wrt bug #530592
-
-  18 Dec 2014; Pacho Ramos <pacho@gentoo.org> ply-3.4-r1.ebuild:
-  Set only one RESTRICT and add a reference to relevant bug report
-
-  16 Dec 2014; Markus Meier <maekke@gentoo.org> ply-3.4-r1.ebuild:
-  arm stable, bug #530592
-
-  13 Dec 2014; Ian Delaney <idella4@gentoo.org> ply-3.4-r1.ebuild:
-  tests retricted, closes bug #458648, finally
-
-  09 Dec 2014; Jeroen Roovers <jer@gentoo.org> ply-3.4-r1.ebuild:
-  Stable for HPPA (bug #530294).
-
-  08 Dec 2014; Agostino Sarubbo <ago@gentoo.org> ply-3.4-r1.ebuild:
-  Stable for ppc64, wrt bug #530592
-
-  02 Dec 2014; Ian Delaney <idella4@gentoo.org> ply-3.4-r1.ebuild:
-  clean old impls
-
-  26 Oct 2014; Fabian Groffen <grobian@gentoo.org> ply-3.4-r1.ebuild:
-  Added Prefix keywords, bug #503094
-
-  13 Sep 2014; Patrick Lauer <patrick@gentoo.org> ply-3.4-r1.ebuild:
-  Restrict tests until they have a chance of not failing
-
-  02 Apr 2014; Tim Harder <radhermit@gentoo.org> ply-3.4-r1.ebuild:
-  Add python3_4 support.
-
-  31 Mar 2014; Michał Górny <mgorny@gentoo.org> ply-3.4-r1.ebuild:
-  Add support for the new PyPy slotting.
-
-  22 Mar 2014; Markos Chandras <hwoarang@gentoo.org> ply-3.4-r1.ebuild:
-  Add ~mips. Bug #503094
-
-  04 Mar 2014; Naohiro Aota <naota@gentoo.org> ply-3.4-r1.ebuild:
-  Add ~x86-fbsd wrt bug #503094
-
-  03 Mar 2014; Jeroen Roovers <jer@gentoo.org> ply-3.4-r1.ebuild:
-  Marked ~hppa (bug #503094).
-
-  07 Dec 2013; Pacho Ramos <pacho@gentoo.org> ply-3.4-r1.ebuild:
-  x86 stable, bug #488738
-
-  29 Nov 2013; Pacho Ramos <pacho@gentoo.org> ply-3.4-r1.ebuild:
-  amd64 stable, bug #488738
-
-  05 Sep 2013; Michał Górny <mgorny@gentoo.org> ply-3.4-r1.ebuild:
-  Clean up PYTHON_COMPAT from old implementations.
-
-  23 May 2013; Patrick Lauer <patrick@gentoo.org> ply-3.4.ebuild:
-  Fixing dependency, thanks to amesists for the hint
-
-  22 May 2013; Mike Gilbert <floppym@gentoo.org> ply-3.4-r1.ebuild,
-  ply-3.4.ebuild:
-  Depend on setuptools, thanks to Arfrever.
-
-*ply-3.4-r1 (21 Feb 2013)
-
-  21 Feb 2013; Michał Górny <mgorny@gentoo.org> +ply-3.4-r1.ebuild:
-  Migrate to distutils-r1.
-
-  31 Dec 2012; Agostino Sarubbo <ago@gentoo.org> ply-3.4.ebuild:
-  Add ~ppc64, wrt bug #412329
-
-  06 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> ply-3.4.ebuild:
-  Keyword amd64-linux and x86-linux
-
-  27 Jun 2012; Markus Meier <maekke@gentoo.org> ply-3.4.ebuild:
-  add ~arm, bug #412329
-
-  14 Jun 2012; Michael Weber <xmw@gentoo.org> ply-3.4.ebuild:
-  ppc stable (bug 403759)
-
-  04 Apr 2012; Jeff Horelick <jdhore@gentoo.org> ply-3.4.ebuild:
-  marked x86 per bug 403759
-
-  16 Mar 2012; Patrick Lauer <patrick@gentoo.org> ply-3.4.ebuild:
-  Test fix for #408145
-
-  17 Feb 2012; Agostino Sarubbo <ago@gentoo.org> ply-3.4.ebuild:
-  Stable for amd64, wrt bug #403759
-
-*ply-3.4 (18 Feb 2011)
-
-  18 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-  -ply-3.3.ebuild, +ply-3.4.ebuild:
-  Version bump. Fixed support for Python 3 in ply.cpp (bug #343641). Fixed
-  tests with Python 3.2 (bug #343753).
-
-  16 Aug 2010; Dirkjan Ochtman <djc@gentoo.org> ply-3.3.ebuild:
-  Update license (see homepage; bug 333025).
-
-*ply-3.3 (07 Sep 2009)
-
-  07 Sep 2009; Patrick Lauer <patrick@gentoo.org> +ply-3.3.ebuild:
-  Bump
-
-*ply-3.2 (29 Aug 2009)
-
-  30 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-  -ply-2.3.ebuild, +ply-3.2.ebuild:
-  Version bump. Set SUPPORT_PYTHON_ABIS.
-
-*ply-2.5 (01 Jul 2009)
-
-  01 Jul 2009; Patrick Lauer <patrick@gentoo.org> +ply-2.5.ebuild:
-  Bump to 2.5. Small fixes to remove deprecation warnings. Tests fail
-  because of a path mismatch although the results would be valid.
-
-  03 Jul 2007; Lukasz Strzygowski <lucass@gentoo.org> -ply-2.2.ebuild:
-  Dropped old version.
-
-*ply-2.3 (24 Feb 2007)
-
-  24 Feb 2007; Lukasz Strzygowski <lucass@gentoo.org> +ply-2.3.ebuild:
-  Version bump (bug #168243).
-
-*ply-2.2 (06 Jan 2007)
-
-  06 Jan 2007; Tiziano Müller <dev-zero@gentoo.org> -ply-1.5.ebuild,
-  -ply-1.6.ebuild, +ply-2.2.ebuild:
-  Version bump, bug #147202. Dropped old versions.
-
-  01 Apr 2006; Aron Griffis <agriffis@gentoo.org> ply-1.6.ebuild:
-  Mark 1.6 ~ia64
-
-*ply-1.6 (16 Mar 2006)
-
-  16 Mar 2006; Lukasz Strzygowski <lucass@gentoo.org> metadata.xml,
-  ply-1.5.ebuild, +ply-1.6.ebuild:
-  Version bump, fixed SRC_URI and HOMEPAGE (bug #109585). Removed trailing
-  whitespaces from metadata.
-
-  19 Nov 2005; Chris White <chriswhite@gentoo.org> metadata.xml:
-  Added japanese metadata.xml translation thanks to Yoshino-san.
-
-  02 Sep 2004; Travis Tilley <lv@gentoo.org> ply-1.5.ebuild:
-  added ~amd64 keyword
-
-  28 Jun 2004; David Holm <dholm@gentoo.org> ply-1.5.ebuild:
-  Added to ~ppc.
-
-*ply-1.5 (27 Jun 2004)
-
-  27 Jun 2004; Lukasz Strzygowski <lucass@gentoo.org> +ply-1.5.ebuild:
-  Initial commit. Thanks to Yann Ramin in bug #49932.

sdk_container/src/third_party/portage-stable/dev-python/ply/Manifest

@@ -1,10 +1,4 @@
-AUX 3.6-lextab-None.patch 1705 SHA256 243a8841d80800c00079ed35fe75a754a149037763cde0a6b1b9a61200cf7442 SHA512 c5e0d2976d7633bbde91fc957eb2ee9fdf9d8e0f43dac37163ca01d6f6b33da9f7b4e396fba034a53d1270bd1aa0f1683eb507bdb5562a5d3e82823ccf292109 WHIRLPOOL 4989ed71a000f8d85e0bafb8fafe5a29162f267f5625f249bc15a92fd960e33a5200a0239d2fbf6e757c8a1fdf042d16451f72df800db52739a613e3c7a77459
+DIST ply-3.10.tar.gz 150926 BLAKE2B b7373bfb83f66c35b77f244e67443f5c4805cb5e586e9e9f0bba9746cf72a1ec66ae5e638a29793dc835ef3e7bed061f1b3befd71597b82f86c9a2adbafcef04 SHA512 67fa60ea3fe2cafe165b7c105eb4b08c0c75c98720bbbb19da275215b333d3ce0742c90e558fbe97df396c6faaf85da744063728ab211651beae10e0cad01d44
-AUX 3.6-picklefile-IOError.patch 681 SHA256 7803e49594f43b091ed6301fbb24b6332fd0d7b43f5b3794ec1d7ab773655bc4 SHA512 6dce69df1cc538ff9787cb70617437ac36972b68a998922123bd4f0529dd6f155befe4104741e704e7e8a1ed8822f2e99580867bbc894fc57896aad4130c317b WHIRLPOOL 0f2d10b830b3e2424d26507cbc21d889416119a4c727f6e61f93445b84eab765edf7c405adfb8d581d8ebdda53a5aefabf99e0c66d102aa648de9f2cd3517518
+DIST ply-3.11.tar.gz 159130 BLAKE2B 58c50b9dad445ad83a64aaa8174ed4602b36f5c8df33a7d62590a92388c4a21c9800599c1d4e4db6f02630e8dee4c8482611e26498e4aa8ccdb2cf3453ae1db4 SHA512 37e39a4f930874933223be58a3da7f259e155b75135f1edd47069b3b40e5e96af883ebf1c8a1bbd32f914a9e92cfc12e29fec05cf61b518f46c1d37421b20008
-DIST ply-3.4.tar.gz 138342 SHA256 af435f11b7bdd69da5ffbc3fecb8d70a7073ec952e101764c88720cdefb2546b SHA512 6f6ee528393ff83eff2530ca468caf12e4c89b817a38302738597f1478dd41758036c8f32f88f60d1a26e70d9cfceab5530ddcfd3f058c1ee722be95c27e6bcc WHIRLPOOL f2f58e2d0c1170d35554999ca643c102d6821a7535b5782ee7317a4100cf56b5648d643c274cefd66a7b484ae3a9e952bcf4b98d50e7fd1ff220853f982a2f4c
+DIST ply-3.6.tar.gz 281690 BLAKE2B 1a8e9e925c1a70832e3312208470a3bc4831b7ba18a0c2eb3a8b31fc9a850ae192809b9dec098f8479f2060e63ae781063b362227db2c6080aad85a2fb8648a2 SHA512 1a408d7cd4cdc9d747154623672e6baaf37ad2190cb9d6d6a7c1e1cc3cb40f15547734441b8fc99ecd67d7804d767576bdf0ed219cc669bf3d0df37498c55c55
-DIST ply-3.6.tar.gz 281690 SHA256 61367b9eb2f4b819f69ea116750305270f1df8859992c9e356d6a851f25a4b47 SHA512 1a408d7cd4cdc9d747154623672e6baaf37ad2190cb9d6d6a7c1e1cc3cb40f15547734441b8fc99ecd67d7804d767576bdf0ed219cc669bf3d0df37498c55c55 WHIRLPOOL 2868a0046519750a446b683a85966650407afc1ea32ab6d8209b46b280529ca6aa8c47816782020b4c90f6f92d4733dd07565b6518e20c7a036d743edc629496
+DIST ply-3.9.tar.gz 150750 BLAKE2B cb32c3837f2b4bd33ef2074dcb3f1421a54e820faf0e65def16f4c354643dc3e467f7c482dfc5b7f62cfb367945632e346b6e02e16cc79a91bb6f9241e315eb1 SHA512 c3beca6f70e9fdfd11f9fc7beb18efb03f0b32be3cdc949e96c4df3d060e7e9da3ee42d1f58f7a9225d333cb7864a4253fd3a9b75c496364276fe9969ebd7641
-DIST ply-3.8.tar.gz 157286 SHA256 e7d1bdff026beb159c9942f7a17e102c375638d9478a7ecd4cc0c76afd8de0b8 SHA512 2c8cf0ee49ca6dec9ec8d5146e98885e871c26125fb5764988fbefae984ee94b4240f265762aaab26d6ec24989b35a4fd6905c3c0d14aac8a085e89b7d6159ef WHIRLPOOL f4258065a479033d2100c2fe9f725a8fbdfb278dabc71a6aa27d7846352dc11496cf34596a0ca0669ce72238702978f1c8a587313410218aa014b80bc98dec37
-EBUILD ply-3.4-r1.ebuild 1067 SHA256 4182884d4335a6b8def3cad4167f22581fe42ff40eeeb939d22a1d735f605be0 SHA512 ea242ad9568cb596778866bbfa97e900e6325f50a72dbd5fca07b228733870acfb29530e6371e95da08ea1f6934c46e267099c1289dcbbc1579c5d10fc7e578a WHIRLPOOL 6a182e388a153b182562fbe366387d9fe9b51757962f7e21697695af9a3c24702e1d3ac360ca508479e2ade425e8cc078dc7a3c4db230122e24b22677a5749db
-EBUILD ply-3.6-r1.ebuild 1151 SHA256 a6137013551dc9dc5e0283954f0eb53b530a10b7dc41f8430546783dab3ac9e6 SHA512 96558c45e44c8abeba72f9f0ce538477a0f755181e8ee94d567844ac68ba457d496b36eefdaae4dbed9d2a7a8b1120e5e59e79c964403e54639301486dc9e179 WHIRLPOOL c8dcc0c9a93e40090eca4118cbd6ef174afabac2d6f75ee2c15e639b753b18fda484e51726db942f5f4823f5de17f1d5e142f2e41e1fd84b020e6af4d78347d5
-EBUILD ply-3.8.ebuild 1139 SHA256 0ae6024a7acba89b00d4695954bcf681aaab4de718f8bd9c8fbbd78f6d810ef5 SHA512 ea167dfc78ee4f98089159f9adc5028ed3f24fd1c4771a15938c54e0608293f79722d14d62e32acb5d1b182f375eea679d264b489c05131d1d25208329b8e19a WHIRLPOOL 0f89c8d50f88e433c6729baf5c89c85d4df25a0865199f98d75cff47e18bdc00234edccd88381b4543a92de76792d2b7374f2fd4f285632d71a8086e45a1010a
-MISC ChangeLog 6080 SHA256 64fa8612534839522ab2c96ac39c8e4fe923bb26d017a1a8a547ead167f8dae1 SHA512 6d59b71212488563bb47e77fbb0f5182eaa39ffbbe97ac51786b9fe4095d703119aba27af89ece98fc624399184a2edfd9440562483a9f9631c4fa4aa4cd992e WHIRLPOOL 13a3440e7e9fde5af915d09fbbfedc2affd16fe5cda1102698c1a5ce4ea57af86ca3179e9467dec4a2299c8e178645dce548e62e55871a324ae2bae950169340
-MISC metadata.xml 1342 SHA256 23b118df5fb8b5cdfb6ca64d922bf7346db9d9ff173aed41711d9ad8280e3bd7 SHA512 5b7d8999699200a05072b9a94e48fcb9354cbccf7951a402c42b334af8d897fe8c7aa373da1972b821b93bbda43f3da046236fda497ef052d3981f06909835ed WHIRLPOOL 602c643a3aee72fb38c0d42a916989a86e3c1ed2718b2925ee48deab4895c63bdc53dd2df6f6083188f5f6c9145fc8354756bd653b63b9ab878c138f19dcacc9

sdk_container/src/third_party/portage-stable/dev-python/ply/metadata.xml

@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 PLY is a Python-only implementation of the popular compiler construction
 tools lex and yacc. The implementation borrows ideas from a number of
@@ -13,7 +16,7 @@ more so than other Python parsing tools.
 	</longdescription>
 	<longdescription lang="ja">
 PLYはLexとYaccの有名なコンパイラ・コンストラクション・ツールのPython言語実装です
-。この実装は以前の試みから幾つものアイディアを借りています。そのほとんどがJohn AycockのSPARKツールキットからです。しかしながら、実装の全体像はC言語によるLexとYaccにより近いモデルです。PLYの他の重要点は幅広い入力バリデーションとエラー報告を&gt;提供する点です。 -- その二点は他のPython言語パーサーより優れています。
+。この実装は以前の試みから幾つものアイディアを借りています。そのほとんどがJohn AycockのSPARKツールキットからです。しかしながら、実装の全体像はC言語によるLexとYaccにより近いモデルです。PLYの他の重要点は幅広い入力バリデーションとエラー報告を提供する点です。 -- その二点は他のPython言語パーサーより優れています。
 	</longdescription>
 	<upstream>
 		<remote-id type="pypi">ply</remote-id>

sdk_container/src/third_party/portage-stable/dev-python/ply/ply-3.10.ebuild

@@ -1,28 +1,24 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=5
+EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="Python Lex-Yacc library"
-HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.python.org/pypi/ply"
+HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.org/project/ply/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="examples"
 
 RDEPEND=""
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
-# See bug #458648 for reference
-RESTRICT="test"
-
 DOCS=( ANNOUNCE CHANGES TODO )
 
 PATCHES=( "${FILESDIR}/3.6-picklefile-IOError.patch" )
@@ -31,6 +27,9 @@ python_test() {
 	cp -r -l test "${BUILD_DIR}"/ || die
 	cd "${BUILD_DIR}"/test || die
 
+	# Checks for pyc/pyo files
+	local -x PYTHONDONTWRITEBYTECODE=
+
 	local t
 	for t in testlex.py testyacc.py; do
 		"${PYTHON}" "${t}" || die "${t} fails with ${EPYTHON}"
@@ -39,6 +38,6 @@ python_test() {
 
 python_install_all() {
 	local HTML_DOCS=( doc/. )
-	use examples && local EXAMPLES=( example/. )
+	use examples && dodoc -r example
 	distutils-r1_python_install_all
 }

sdk_container/src/third_party/portage-stable/dev-python/ply/ply-3.11.ebuild

@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Lex-Yacc library"
+HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.org/project/ply/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="examples"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( ANNOUNCE CHANGES TODO )
+
+PATCHES=( "${FILESDIR}/3.6-picklefile-IOError.patch" )
+
+python_test() {
+	cp -r -l test "${BUILD_DIR}"/ || die
+	cd "${BUILD_DIR}"/test || die
+
+	# Checks for pyc/pyo files
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	local t
+	for t in testlex.py testyacc.py; do
+		"${PYTHON}" "${t}" || die "${t} fails with ${EPYTHON}"
+	done
+}
+
+python_install_all() {
+	local HTML_DOCS=( doc/. )
+	use examples && dodoc -r example
+	distutils-r1_python_install_all
+}

sdk_container/src/third_party/portage-stable/dev-python/ply/ply-3.4-r1.ebuild

@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Lex-Yacc library"
-HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.python.org/pypi/ply"
-SRC_URI="http://www.dabeaz.com/ply/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-# See bug #458648 for reference
-RESTRICT="test"
-
-DOCS=( ANNOUNCE CHANGES README TODO )
-
-python_test() {
-	cp -r -l test "${BUILD_DIR}"/ || die
-	cd "${BUILD_DIR}"/test || die
-
-	local t
-	for t in testlex.py testyacc.py; do
-		"${PYTHON}" "${t}" || die "${t} fails with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	local HTML_DOCS=( doc/. )
-	use examples && local EXAMPLES=( example/. )
-	distutils-r1_python_install_all
-}

sdk_container/src/third_party/portage-stable/dev-python/ply/ply-3.6-r1.ebuild

@@ -1,27 +1,23 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 
 inherit distutils-r1
 
 DESCRIPTION="Python Lex-Yacc library"
-HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.python.org/pypi/ply"
+HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.org/project/ply/"
 SRC_URI="http://www.dabeaz.com/ply/${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
 
-# See bug #458648 for reference
-RESTRICT="test"
-
 DOCS=( ANNOUNCE CHANGES TODO )
 PATCHES=(
 	"${FILESDIR}/3.6-lextab-None.patch"
@@ -32,6 +28,9 @@ python_test() {
 	cp -r -l test "${BUILD_DIR}"/ || die
 	cd "${BUILD_DIR}"/test || die
 
+	# Checks for pyc/pyo files
+	local -x PYTHONDONTWRITEBYTECODE=
+
 	local t
 	for t in testlex.py testyacc.py; do
 		"${PYTHON}" "${t}" || die "${t} fails with ${EPYTHON}"

sdk_container/src/third_party/portage-stable/dev-python/ply/ply-3.9.ebuild

@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Lex-Yacc library"
+HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.org/project/ply/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="examples"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( ANNOUNCE CHANGES TODO )
+
+PATCHES=( "${FILESDIR}/3.6-picklefile-IOError.patch" )
+
+python_test() {
+	cp -r -l test "${BUILD_DIR}"/ || die
+	cd "${BUILD_DIR}"/test || die
+
+	# Checks for pyc/pyo files
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	local t
+	for t in testlex.py testyacc.py; do
+		"${PYTHON}" "${t}" || die "${t} fails with ${EPYTHON}"
+	done
+}
+
+python_install_all() {
+	local HTML_DOCS=( doc/. )
+	use examples && dodoc -r example
+	distutils-r1_python_install_all
+}

sdk_container/src/third_party/portage-stable/dev-python/pycparser/ChangeLog

@@ -1,155 +0,0 @@
-# ChangeLog for dev-python/pycparser
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycparser/ChangeLog,v 1.42 2015/08/06 14:41:25 klausman Exp $
-
-  06 Aug 2015; Tobias Klausmann <klausman@gentoo.org> pycparser-2.14.ebuild:
-  Stable on alpha, bug 556428
-
-  02 Aug 2015; Pacho Ramos <pacho@gentoo.org> pycparser-2.10.ebuild:
-  sparc stable wrt bug #530294
-
-  11 Jul 2015; Tobias Klausmann <klausman@gentoo.org> pycparser-2.10.ebuild:
-  Stable on alpha, bug 530294
-
-*pycparser-2.14 (15 Jun 2015)
-
-  15 Jun 2015; Justin Lecher <jlec@gentoo.org> +pycparser-2.14.ebuild:
-  Version Bump
-
-  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
-  Add github to remote-id in metadata.xml
-
-*pycparser-2.13 (15 May 2015)
-
-  15 May 2015; Justin Lecher <jlec@gentoo.org> +pycparser-2.13.ebuild:
-  Version Bump
-
-*pycparser-2.12 (06 May 2015)
-
-  06 May 2015; Mike Gilbert <floppym@gentoo.org> +pycparser-2.12.ebuild,
-  -pycparser-2.11.ebuild:
-  Version bump, should fix bug 548718.
-
-*pycparser-2.11 (05 May 2015)
-
-  05 May 2015; Justin Lecher <jlec@gentoo.org> +pycparser-2.11.ebuild,
-  -pycparser-2.09.1-r1.ebuild, metadata.xml:
-  Version Bump; drop old
-
-  08 Apr 2015; Michał Górny <mgorny@gentoo.org> pycparser-2.09.1-r1.ebuild:
-  Drop old Python implementations
-
-  04 Apr 2015; Mike Frysinger <vapier@gentoo.org> pycparser-2.10.ebuild:
-  Mark arm64/ia64/m68k/s390/sh stable.
-
-  01 Apr 2015; Tobias Klausmann <klausman@gentoo.org> pycparser-2.10.ebuild:
-  Keyworded on alpha, bug 503094
-
-  07 Feb 2015; Agostino Sarubbo <ago@gentoo.org> pycparser-2.10.ebuild:
-  Stable for ppc, wrt bug #530592
-
-  16 Dec 2014; Markus Meier <maekke@gentoo.org> pycparser-2.10.ebuild:
-  arm stable, bug #530592
-
-  09 Dec 2014; Jeroen Roovers <jer@gentoo.org> pycparser-2.10.ebuild:
-  Stable for HPPA (bug #530294).
-
-  08 Dec 2014; Agostino Sarubbo <ago@gentoo.org> pycparser-2.10.ebuild:
-  Stable for ppc64, wrt bug #530592
-
-  02 Dec 2014; Ian Delaney <idella4@gentoo.org> pycparser-2.10.ebuild:
-  clean old impls
-
-  26 Oct 2014; Fabian Groffen <grobian@gentoo.org> pycparser-2.10.ebuild:
-  Added Prefix keywords, bug #503094
-
-  13 Aug 2014; Anthony G. Basile <blueness@gentoo.org> pycparser-2.10.ebuild:
-  Keyword ~ppc and ~ppc64, bug #503094
-
-  06 Jul 2014; Michał Górny <mgorny@gentoo.org> pycparser-2.09.1-r1.ebuild:
-  Replace obsolete mirror://bitbucket with the real URI.
-
-  23 Jun 2014; Tobias Klausmann <klausman@gentoo.org> pycparser-2.10.ebuild:
-  Dekeywording on alpha due to ply being broken (bug 514446)
-
-  22 Jun 2014; Tobias Klausmann <klausman@gentoo.org> pycparser-2.10.ebuild:
-  Keyworded on alpha, bug #503094
-
-  20 Jun 2014; Dirkjan Ochtman <djc@gentoo.org> pycparser-2.09.1-r1.ebuild:
-  Fix SRC_URI to use bitbucket mirrors
-
-  08 Jun 2014; Akinori Hattori <hattya@gentoo.org> pycparser-2.09.1-r1.ebuild,
-  pycparser-2.10.ebuild:
-  keyword ~ia64 wrt bug #503094
-
-  02 Apr 2014; Tim Harder <radhermit@gentoo.org> pycparser-2.10.ebuild:
-  Add python3_4 support.
-
-  31 Mar 2014; Michał Górny <mgorny@gentoo.org> pycparser-2.09.1-r1.ebuild,
-  pycparser-2.10.ebuild:
-  Add support for the new PyPy slotting.
-
-  22 Mar 2014; Markos Chandras <hwoarang@gentoo.org> pycparser-2.10.ebuild:
-  Add ~mips. Bug #503094
-
-  04 Mar 2014; Naohiro Aota <naota@gentoo.org> pycparser-2.10.ebuild:
-  Add ~x86-fbsd wrt bug #503094
-
-  03 Mar 2014; Jeroen Roovers <jer@gentoo.org> pycparser-2.10.ebuild:
-  Marked ~hppa (bug #503094).
-
-  11 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> pycparser-2.10.ebuild:
-  Keyword amd64-linux and x86-linux
-
-  07 Dec 2013; Pacho Ramos <pacho@gentoo.org> pycparser-2.10.ebuild:
-  x86 stable, bug #488738
-
-  29 Nov 2013; Pacho Ramos <pacho@gentoo.org> pycparser-2.10.ebuild:
-  amd64 stable, bug #488738
-
-  05 Sep 2013; Michał Górny <mgorny@gentoo.org> pycparser-2.09.1-r1.ebuild,
-  pycparser-2.10.ebuild:
-  Clean up PYTHON_COMPAT from old implementations.
-
-*pycparser-2.10 (03 Aug 2013)
-
-  03 Aug 2013; Dirkjan Ochtman <djc@gentoo.org> +pycparser-2.10.ebuild:
-  Version bump pycparser to 2.10.
-
-  03 Aug 2013; Dirkjan Ochtman <djc@gentoo.org> -pycparser-2.07.ebuild,
-  -pycparser-2.08.ebuild:
-  Remove old versions.
-
-  09 May 2013; Markus Meier <maekke@gentoo.org> pycparser-2.09.1-r1.ebuild:
-  add ~arm, bug #462506
-
-  08 May 2013; Mike Gilbert <floppym@gentoo.org> pycparser-2.09.1-r1.ebuild:
-  Use pushd/popd.
-
-*pycparser-2.09.1-r1 (08 May 2013)
-
-  08 May 2013; Mike Gilbert <floppym@gentoo.org> +pycparser-2.09.1-r1.ebuild,
-  -pycparser-2.09.1.ebuild:
-  Pregenerate lexer and parser tables.
-
-  08 May 2013; Ian Delaney <idella4@gentoo.org> pycparser-2.09.1.ebuild:
-  Add py3.3 support
-
-  20 Mar 2013; Ian Delaney <idella4@gentoo.org> pycparser-2.09.1.ebuild:
-  pypy support tested, added
-
-*pycparser-2.09.1 (08 Jan 2013)
-
-  08 Jan 2013; Tim Harder <radhermit@gentoo.org> +pycparser-2.09.1.ebuild:
-  Version bump. Migrate to distutils-r1.
-
-*pycparser-2.08 (29 Aug 2012)
-
-  29 Aug 2012; Patrick Lauer <patrick@gentoo.org> +pycparser-2.08.ebuild:
-  Bump
-
-*pycparser-2.07 (27 Jul 2012)
-
-  27 Jul 2012; Dirkjan Ochtman <djc@gentoo.org> +pycparser-2.07.ebuild,
-  +metadata.xml:
-  Initial version (bug 364801).

sdk_container/src/third_party/portage-stable/dev-python/pycparser/Manifest

@@ -1,6 +1,3 @@
-DIST pycparser-2.10.tar.gz 206166 SHA256 957d98b661c0b64b580ab6f94b125e09b6714154ee51de40bca16d3f0076b86c SHA512 afe5079d6b0a39ea7f0df1ce74b1981c78d8687dbef50fb7a692395ca4a7e7a8119ec6abc0dfeb7a0535865ed2fac9dafca189bdbf6ff9205612205560e2d371 WHIRLPOOL 1b373997863001ba3b06376db1d175797c665ade273e75698edc3044713e411228f9f1c4daf0c61ffe01840d3d5e54a232fae729e42a8559e85b8db465e99b90
+DIST pycparser-2.14.tar.gz 223295 BLAKE2B 13dd4e36d7239db4fd6dfb77f08088bdbffa897ab75d748da5bd7297fe0a7dd751ba7153f8bf15f93494e347c653d1ebc7250907d2ccc555e785830e731e93dc SHA512 d5b9ab434a8944898ac23a4f51189db77b02b993bf3e3ca018852b117fc0eb43e460b156beaa5c1d631ad71c81e1649113e9fff7e33506b1e7d4de24d8b464c6
-DIST pycparser-2.14.tar.gz 223295 SHA256 7959b4a74abdc27b312fed1c21e6caf9309ce0b29ea86b591fd2e99ecdf27f73 SHA512 d5b9ab434a8944898ac23a4f51189db77b02b993bf3e3ca018852b117fc0eb43e460b156beaa5c1d631ad71c81e1649113e9fff7e33506b1e7d4de24d8b464c6 WHIRLPOOL 4a541ce696298a355d4e3325a10dffd47bd26756b0164da82b70090310edfacf0428ed9e26de7be7e3d4c2c952ee664262a212562852fe29f909ab0631bfd79f
+DIST pycparser-2.17.tar.gz 231163 BLAKE2B b264fbdf235f63559c96d103ca42fd0faf2c5e125420e75503e7dc2cc6e86a23347b9070a33b1e28721b919d89d0281b69b04c2761b180fa535c748933392172 SHA512 c9caaa8d256748e0623d077b11931abb38d19367136c70a835f7587e1f7ceb64f3acb7a983dcb68bedd2cf187517762a5753844e8ed58d1d9ed6f364c55839b4
-EBUILD pycparser-2.10.ebuild 914 SHA256 249751f5b1bbacced1d611faf4cad2880429a37f5caeb778b97c025f94160c57 SHA512 deaeb775985bfdcd965afab4793562c3c7afd31b2d007fab1f1c45e215a4dd509af4b16ab42236ce180ef9571ff9d270a657d97970ada6cf584466b8b2a621aa WHIRLPOOL 3a2e639512694d6a78090caaecd8ea75b5604d395d3c37a6b8c4d4b49768478b3e4d5f5dfb3f338e25495dbc3d79709ff7093c71e43835f7a80fdd9363c58b53
+DIST pycparser-2.18.tar.gz 245897 BLAKE2B 2f47263c73763f9d76edcb0d90aacd2e6cf0a68ed2e8c5825a0788a5ccb6574167220a5bb7605b2c11dda8956ce8fb1ad28eeb8e91fed7aa0282191b11478b63 SHA512 4754e4e7556d21da328bf7dbabf72f940c9b18f1457260d48208033b05e576919f45ab399e86ea49e82120116980d7d6f53e8b959d21b7b03a3b5bbea3672f13
-EBUILD pycparser-2.14.ebuild 964 SHA256 4b59386360071f5b7e4ab5218299fc80b671179e1268636e4ee1bf5c3a7e680b SHA512 e17fa006441ece5edeaec4f6a46b28b8238df207adee95d56e0cbec9b114c9fad944c271b8528817f98ca379a8f677adc1d0772f77a9ec930606ebbaac0e62c6 WHIRLPOOL dc9675f4bbf005b59a2d7a32e584c7be8ccdd38e9ea6e460a80082afe9efcfdc509c074ca9c02701fec7375f0ae9c89543c24e9090e6e8b7c3f030bd31cd6970
-MISC ChangeLog 5195 SHA256 7f7a9c2ebf1ad037405b514632e45b679d2c1a73ba3b887d9e568912825e5a61 SHA512 5de3d9f510baa1f6b4beeedce1132d4636ed02b78fc8adcf8fb00f8db20feda7b01ec9fc6bb475bc2d12092bbe5b93329f6af7dd5886e8d38b06f5bb3bf49bf5 WHIRLPOOL b5ae4c979a4c1a4d4072adb74a9fe3c887174eeba0d9b1a0854f6f3fc786464006e4d775a42c63058a030837737fb95da0fe388da23c1f6e57955c03427474c5
-MISC metadata.xml 295 SHA256 53ff541e0e430a0a7b8b3410d0eac90355959e8a04b552f67c897608eb46808a SHA512 026c91b0fd4914588f26f67f3faabbfb4659693c46446bf40efe127102f85b760288c267cb13c8f406c7b5d022708d9435e8380c2d1360ad383ea756438421b3 WHIRLPOOL ef374a2d1c9e807553a1da4cbe4360735908573fe276647f5b5b9419fdd52355125c079f49f7e8f2aab0424ba9fdc5d97a9086b9b5e181a86762f2ecc79746b8

sdk_container/src/third_party/portage-stable/dev-python/pycparser/files/pycparser-2.18-OO.patch

@@ -0,0 +1,56 @@
+From 673accec311a027c22b0718d753f8da922915305 Mon Sep 17 00:00:00 2001
+From: Eli Bendersky <eliben@gmail.com>
+Date: Thu, 13 Jul 2017 20:25:29 -0700
+Subject: [PATCH] Address an import of pycparser in -OO mode.
+
+In this mode there are no docstrings; we don't want an instantiation of CParser
+to fail, though it won't actually work correctly if used.
+
+See #197 and #198
+---
+ pycparser/plyparser.py | 21 +++++++++++++++++++--
+ 1 file changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/pycparser/plyparser.py b/pycparser/plyparser.py
+index af91922..b6640fa 100644
+--- a/pycparser/plyparser.py
++++ b/pycparser/plyparser.py
+@@ -8,6 +8,7 @@
+ # License: BSD
+ #-----------------------------------------------------------------
+ 
++import warnings
+ 
+ class Coord(object):
+     """ Coordinates of a syntactic element. Consists of:
+@@ -87,12 +88,28 @@ def template(cls):
+ 
+     See `parameterized` for more information on parameterized rules.
+     """
++    issued_nodoc_warning = False
+     for attr_name in dir(cls):
+         if attr_name.startswith('p_'):
+             method = getattr(cls, attr_name)
+             if hasattr(method, '_params'):
+-                delattr(cls, attr_name)  # Remove template method
+-                _create_param_rules(cls, method)
++                # Remove the template method
++                delattr(cls, attr_name)
++                # Create parameterized rules from this method; only run this if
++                # the method has a docstring. This is to address an issue when
++                # pycparser's users are installed in -OO mode which strips
++                # docstrings away.
++                # See: https://github.com/eliben/pycparser/pull/198/ and
++                #      https://github.com/eliben/pycparser/issues/197
++                # for discussion.
++                if method.__doc__ is not None:
++                    _create_param_rules(cls, method)
++                elif not issued_nodoc_warning:
++                    warnings.warn(
++                        'parsing methods must have __doc__ for pycparser to work properly',
++                        RuntimeWarning,
++                        stacklevel=2)
++                    issued_nodoc_warning = True
+     return cls
+ 
+ 

sdk_container/src/third_party/portage-stable/dev-python/pycparser/metadata.xml

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pycparser</remote-id>
     <remote-id type="github">eliben/pycparser</remote-id>

sdk_container/src/third_party/portage-stable/dev-python/pycparser/pycparser-2.10.ebuild

@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="C parser and AST generator written in Python"
-HOMEPAGE="https://github.com/eliben/pycparser"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-
-RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_compile() {
-	distutils-r1_python_compile
-	pushd "${BUILD_DIR}/lib/pycparser" > /dev/null || die
-	"${PYTHON}" _build_tables.py || die
-	popd > /dev/null || die
-}
-
-python_test() {
-	nosetests || die
-}

sdk_container/src/third_party/portage-stable/dev-python/pycparser/pycparser-2.14.ebuild

@@ -1,10 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 
 inherit distutils-r1 vcs-snapshot
 
@@ -14,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"

sdk_container/src/third_party/portage-stable/dev-python/pycparser/pycparser-2.17.ebuild

@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="C parser and AST generator written in Python"
+HOMEPAGE="https://github.com/eliben/pycparser"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+pkg_pretend() {
+	if has_version "=dev-python/pycparser-2.16"; then
+		eerror "You have a broken version of dev-python/pycparser installed."
+		eerror "Please remove the broken version before continuing."
+		eerror "eg. emerge --unmerge =dev-python/pycparser-2.16"
+		die "Broken dev-python/pycparser"
+	fi
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	pushd "${BUILD_DIR}/lib/pycparser" > /dev/null || die
+	"${PYTHON}" _build_tables.py || die
+	popd > /dev/null || die
+}
+
+python_test() {
+	nosetests || die
+}

sdk_container/src/third_party/portage-stable/dev-python/pycparser/pycparser-2.18-r1.ebuild

@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="C parser and AST generator written in Python"
+HOMEPAGE="https://github.com/eliben/pycparser"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND="dev-python/ply:=[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/pycparser-2.18-OO.patch
+)
+
+python_prepare_all() {
+	# remove the original files to guarantee their regen
+	rm pycparser/{c_ast,lextab,yacctab}.py || die
+
+	# kill sys.path manipulations to force the tests to use built files
+	sed -i -e '/sys\.path/d' tests/*.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# note: tables built by py3.5+ are incompatible with older versions
+	# because of 100 group limit of 're' module -- just generate them
+	# separately optimized for each target instead
+	pushd "${BUILD_DIR}"/lib/pycparser > /dev/null || die
+	"${PYTHON}" _build_tables.py || die
+	popd > /dev/null || die
+}
+
+python_test() {
+	# change workdir to avoid '.' import
+	nosetests -v -w tests || die
+}

sdk_container/src/third_party/portage-stable/dev-python/setuptools/Manifest

@@ -1,5 +1,4 @@
-DIST setuptools-30.4.0.tar.gz 655934 SHA256 2bea341aa5b48ae05521374d9c473713e42dde7f8712a731904a6f8257e896ed SHA512 8239262e11c7702165d7539d57982dadd16e61a992529cb4d5f42141d57ffbab46fd928c765d0439ec4f07db1bc252b9a4604901d8f9951e55076438bdd6f515 WHIRLPOOL 4866efbe00d23291ad07b401d7924f2f150a38664ab0a3d9afe9e00aa4e887de6c9e82f81e7d2ec157b1bf05406b2616a08772fa9f3a45e1e20fddbe27c11fd2
+DIST setuptools-34.0.2.zip 617839 BLAKE2B c06ef384a42430ec8f4d956723d21f70fdcf993e41fb6d6e8b4fd18a7f12eeb957f9aef3e8b81e59f006452bd7dc8f59d6c5dec07ca099156f93fa74b5f4d152 SHA512 8ff6475620fc18e5992900dffd50158bfea980d3e7f2c7c98e8c99180b2f11b3f81c13a60f93516da580def2543a786940cc164dcdc36802d9657c48e45d9266
-DIST setuptools-34.0.2.zip 617839 SHA256 a5bdc45a3c123a88c84e089a789ba70bbc61ee888c1306fd9dac04e037e81c37 SHA512 8ff6475620fc18e5992900dffd50158bfea980d3e7f2c7c98e8c99180b2f11b3f81c13a60f93516da580def2543a786940cc164dcdc36802d9657c48e45d9266 WHIRLPOOL c9350f96628957c0bab680a2cd018d27d93f04afded737b317b9ea527e0bad3ea9c4f4af2a31843a3010573cdb0ec1c7fbdeef371cfc8cb5c8de93b6d762bf1d
+DIST setuptools-36.0.1.zip 711296 BLAKE2B c58a4efd8d3a2d574ff6ba5cd01a196fc7ad61a238119ac95714239965875d91e4613d08439c63ab3b9a0794b04ead5c6e8de09839e0306e4d29f47c2c7a7c58 SHA512 cbcd2591d0d8a7591c5d9a1d4173814afa0b984af29f2e34d26a37c357474b043f371978ac224cea12f50834d91babd9f14b137488c4edcd62594e91aff903d8
-DIST setuptools-35.0.1.zip 624263 SHA256 eea7f2ff55d4a810b6bc39be1ad1c60c2702341b78b2365c71306eaa7316beac SHA512 a3f5362ad64dead468172f9989bc62043ce736180d22e50d9815af25aecbceb58e701bb87a643b9fbbf0beedb37a45268b23b1b5e7e6e397aa124f43b1d4bb0d WHIRLPOOL e33041a6f03dc4ceb4a34db4c18a4d76a908b4e5a726ad18598cc202aca24df0a81241aa72812b7a31b1e452dd265e813c58ea23255e37a75c2c2ec2f73d8787
+DIST setuptools-36.7.2.zip 726758 BLAKE2B 8821d3142f2149fbdea4d231052c3990fa7a14c57c421309683c6a65102ce4911850acd5d492087aa0f14a0026da732e47eb9bf971030443fc1b57f9f909aaaa SHA512 746dce135dbacb65565787a20a2611388605e2371c94f0f8803e7712e515e69c270751d16a21f381bf6e8ddc0a1b39494db7d0c67bb32e6230a90c5d517e78f9
-DIST setuptools-35.0.2.zip 624829 SHA256 1e55496ca8058db68ae12ac29a985d1ee2c2483a5901f7692fb68fa2f9a250fd SHA512 f80789cef8fe86ff1989e7f769637d1f6cb2008c6190609b8f8c5b4fdb63fac83267709895c7f502a09a693779b41e6ee0551e94f3348b64b6108dbc9629a116 WHIRLPOOL 23b22065ced0a7df25ff35b79675b94e6146ec9ca7eff7c27a94d5aea64e4e9356e136fb537f642810a824eb3e0921d817b5739fe9cd3daf083cad99475354e9
+DIST setuptools-38.5.1.zip 737995 BLAKE2B 9772d39928c6633ca529292d646c1c8e96a5a77ed06545af950cc249922837c13722d97de702c1e104581d56e1f808ec3d077041212517f5a51b23aa2e95e734 SHA512 bd04186a6e73cf24440e82aee10fff09889cab53e2e2fbf178bdb1360accf4f787abf8d8421d5e0fcb41005254c091f62d714e8b317ecf68911e2eed87b9fcc4
-DIST setuptools-36.0.1.zip 711296 SHA256 e17c4687fddd6d70a6604ac0ad25e33324cec71b5137267dd5c45e103c4b288a SHA512 cbcd2591d0d8a7591c5d9a1d4173814afa0b984af29f2e34d26a37c357474b043f371978ac224cea12f50834d91babd9f14b137488c4edcd62594e91aff903d8 WHIRLPOOL 9818d419a11ab6493027fcf27a48b087c80a10fe2bf3b0539893bd57b33be23ed5b90572682f0a27850044482f03d299905e04cc890f724d3cf719d34bf36464

sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-30.4.0.ebuild

@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=""
-#	>=dev-python/packaging-16.4[${PYTHON_USEDEP}]
-#	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-#	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pip[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-#	>=dev-python/pyparsing-2.0.6[${PYTHON_USEDEP}]
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
-
-python_prepare_all() {
-	if [[ ${PV} == "9999" ]]; then
-		python_setup
-		${EPYTHON} bootstrap.py || die
-	fi
-
-	# rm -r ./pkg_resources/_vendor || die
-	# disable tests requiring a network connection
-	rm setuptools/tests/test_packageindex.py || die
-
-	# don't run integration tests
-	rm setuptools/tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}

sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-34.0.2-r1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,11 +12,11 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
 
 LICENSE="MIT"
 SLOT="0"

sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-36.0.1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,11 +12,11 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x64-cygwin ~sparc-fbsd ~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 ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
 
 LICENSE="MIT"
 SLOT="0"

sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-36.7.2.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
@@ -12,27 +12,27 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x64-cygwin ~sparc-fbsd ~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"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
 
 LICENSE="MIT"
 SLOT="0"
 IUSE="test"
 
 RDEPEND="
-	>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.4.0-r1[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	test? (
 		dev-python/pip[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.1.0[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
 		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
 	)
 "
 PDEPEND="

sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-38.5.1.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
@@ -12,27 +12,27 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x64-cygwin ~sparc-fbsd ~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 ~amd64-fbsd"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
 
 LICENSE="MIT"
 SLOT="0"
 IUSE="test"
 
 RDEPEND="
-	>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.4.0-r1[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	test? (
 		dev-python/pip[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.1.0[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
 		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
 	)
 "
 PDEPEND="

sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
@@ -12,11 +12,11 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x64-cygwin ~sparc-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
 
 LICENSE="MIT"
 SLOT="0"
@@ -29,7 +29,10 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-python/pip[${PYTHON_USEDEP}]
 		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
 		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
 	)
 "
 PDEPEND="

sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/ChangeLog

@@ -1,477 +0,0 @@
-# ChangeLog for dev-util/gdbus-codegen
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/ChangeLog,v 1.121 2015/07/30 13:22:05 ago Exp $
-
-  30 Jul 2015; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.42.2.ebuild:
-  Stable for sparc, wrt bug #551814
-
-  19 Jul 2015; Tobias Klausmann <klausman@gentoo.org>
-  gdbus-codegen-2.42.2.ebuild:
-  Stable on alpha, bug 553500
-
-  17 Jul 2015; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.42.2.ebuild:
-  Stable for ia64, wrt bug #551814
-
-*gdbus-codegen-2.44.1 (08 Jun 2015)
-
-  08 Jun 2015; Gilles Dartiguelongue <eva@gentoo.org>
-  +gdbus-codegen-2.44.1.ebuild:
-  Version bump for Gnome 3.16.
-
-  07 Jun 2015; Markus Meier <maekke@gentoo.org> gdbus-codegen-2.42.2.ebuild:
-  arm stable, bug #534012
-
-  08 Apr 2015; Michał Górny <mgorny@gentoo.org> gdbus-codegen-2.40.2.ebuild,
-  gdbus-codegen-2.42.1.ebuild, gdbus-codegen-2.42.2.ebuild:
-  Drop old Python implementations
-
-  29 Mar 2015; Jeroen Roovers <jer@gentoo.org> gdbus-codegen-2.42.2.ebuild:
-  Stable for HPPA (bug #534012).
-
-  15 Mar 2015; Pacho Ramos <pacho@gentoo.org> gdbus-codegen-2.42.2.ebuild:
-  x86 stable, bug 534012
-
-  15 Mar 2015; Pacho Ramos <pacho@gentoo.org> gdbus-codegen-2.42.2.ebuild:
-  ppc64 stable, bug 534012
-
-  15 Mar 2015; Pacho Ramos <pacho@gentoo.org> gdbus-codegen-2.42.2.ebuild:
-  ppc stable, bug 534012
-
-  14 Mar 2015; Pacho Ramos <pacho@gentoo.org> gdbus-codegen-2.42.2.ebuild:
-  amd64 stable, bug 534012
-
-*gdbus-codegen-2.42.2 (26 Feb 2015)
-
-  26 Feb 2015; Pacho Ramos <pacho@gentoo.org> +gdbus-codegen-2.42.2.ebuild,
-  -files/gdbus-codegen-2.36.0-sitedir.patch, -gdbus-codegen-2.38.2.ebuild,
-  -gdbus-codegen-2.40.0.ebuild:
-  Version bump, drop old
-
-  11 Feb 2015; Mike Frysinger <vapier@gentoo.org> gdbus-codegen-2.40.0.ebuild,
-  gdbus-codegen-2.40.2.ebuild:
-  Mark arm64/m68k/s390/sh stable.
-
-  02 Jan 2015; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.40.2.ebuild:
-  Stable for alpha, wrt bug #529964
-
-  01 Jan 2015; Markus Meier <maekke@gentoo.org> gdbus-codegen-2.40.2.ebuild:
-  arm stable, bug #529964
-
-  01 Jan 2015; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.40.2.ebuild:
-  Stable for sparc, wrt bug #529964
-
-  31 Dec 2014; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.40.2.ebuild:
-  Stable for ia64, wrt bug #529964
-
-  30 Dec 2014; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.40.2.ebuild:
-  Stable for ppc64, wrt bug #529964
-
-  28 Dec 2014; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.40.2.ebuild:
-  Stable for ppc, wrt bug #529964
-
-  19 Dec 2014; Pacho Ramos <pacho@gentoo.org> gdbus-codegen-2.40.2.ebuild:
-  amd64 stable, bug 529964
-
-  18 Dec 2014; Pacho Ramos <pacho@gentoo.org> gdbus-codegen-2.40.2.ebuild:
-  x86 stable, bug 529964
-
-*gdbus-codegen-2.42.1 (14 Dec 2014)
-
-  14 Dec 2014; Gilles Dartiguelongue <eva@gentoo.org>
-  +gdbus-codegen-2.42.1.ebuild:
-  Version bump for Gnome 3.14.
-
-  12 Dec 2014; Jeroen Roovers <jer@gentoo.org> gdbus-codegen-2.40.2.ebuild:
-  Stable for HPPA (bug #529964).
-
-  24 Nov 2014; Pacho Ramos <pacho@gentoo.org> gdbus-codegen-2.40.2.ebuild:
-  Support python 3.4
-
-  11 Oct 2014; Markus Meier <maekke@gentoo.org> gdbus-codegen-2.40.0.ebuild:
-  arm stable, bug #512012
-
-*gdbus-codegen-2.40.2 (28 Sep 2014)
-
-  28 Sep 2014; Pacho Ramos <pacho@gentoo.org> +gdbus-codegen-2.40.2.ebuild:
-  Version bump
-
-  15 Sep 2014; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.40.0.ebuild:
-  Stable for sparc, wrt bug #512012
-
-  25 Aug 2014; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.40.0.ebuild:
-  Stable for alpha, wrt bug #512012
-
-  23 Aug 2014; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.40.0.ebuild:
-  Stable for ia64, wrt bug #512012
-
-  21 Aug 2014; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.40.0.ebuild:
-  Stable for ppc64, wrt bug #512012
-
-  07 Aug 2014; Jeroen Roovers <jer@gentoo.org> gdbus-codegen-2.40.0.ebuild:
-  Stable for HPPA (bug #512012).
-
-  04 Aug 2014; Christoph Junghans <ottxor@gentoo.org>
-  gdbus-codegen-2.40.0.ebuild:
-  added ~x86-macos (tested by me)
-
-  28 Jul 2014; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.40.0.ebuild:
-  Stable for ppc, wrt bug #512012
-
-  23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.40.0.ebuild:
-  Stable for x86, wrt bug #512012
-
-  22 Jul 2014; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.40.0.ebuild:
-  Stable for amd64, wrt bug #512912
-
-*gdbus-codegen-2.40.0 (27 Apr 2014)
-
-  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org>
-  +gdbus-codegen-2.40.0.ebuild, +files/gdbus-codegen-2.40.0-sitedir.patch,
-  metadata.xml:
-  Version bump for Gnome 3.12.
-
-  25 Apr 2014; Pacho Ramos <pacho@gentoo.org>
-  -files/gdbus-codegen-2.32.4-sitedir.patch,
-  -files/gdbus-codegen-2.36.4-input-encoding.patch,
-  -gdbus-codegen-2.32.4-r1.ebuild, -gdbus-codegen-2.32.4-r2.ebuild,
-  -gdbus-codegen-2.34.3-r1.ebuild, -gdbus-codegen-2.36.4-r1.ebuild:
-  Drop old
-
-  21 Apr 2014; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.38.2.ebuild:
-  Stable for arm, wrt bug #507568
-
-  19 Apr 2014; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.38.2.ebuild:
-  Stable for sparc, wrt bug #507568
-
-  18 Apr 2014; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.38.2.ebuild:
-  Stable for alpha, wrt bug #507568
-
-  17 Apr 2014; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.38.2.ebuild:
-  Stable for ia64, wrt bug #507568
-
-  16 Apr 2014; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.38.2.ebuild:
-  Stable for ppc64, wrt bug #507568
-
-  14 Apr 2014; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.38.2.ebuild:
-  Stable for ppc, wrt bug #507568
-
-  28 Mar 2014; Jeroen Roovers <jer@gentoo.org> gdbus-codegen-2.38.2.ebuild:
-  Stable for HPPA (bug #499954).
-
-  26 Mar 2014; Mike Frysinger <vapier@gentoo.org> gdbus-codegen-2.38.2.ebuild:
-  Mark arm64/m68k/s390/sh stable.
-
-  13 Mar 2014; Christoph Junghans <ottxor@gentoo.org>
-  gdbus-codegen-2.38.2.ebuild:
-  added ~x64-macos (tested by me)
-
-  09 Mar 2014; Pacho Ramos <pacho@gentoo.org> gdbus-codegen-2.38.2.ebuild:
-  x86 stable, bug 499954
-
-  09 Mar 2014; Pacho Ramos <pacho@gentoo.org> gdbus-codegen-2.38.2.ebuild:
-  amd64 stable, bug 499954
-
-  22 Feb 2014; Pacho Ramos <pacho@gentoo.org> gdbus-codegen-2.38.2.ebuild:
-  Fix wrong commit, bug 502160
-
-  22 Feb 2014; Akinori Hattori <hattya@gentoo.org>
-  gdbus-codegen-2.36.4-r1.ebuild:
-  ia64 stable wrt bug #494132
-
-*gdbus-codegen-2.38.2 (23 Dec 2013)
-
-  23 Dec 2013; Gilles Dartiguelongue <eva@gentoo.org>
-  -gdbus-codegen-2.34.3.ebuild, -gdbus-codegen-2.36.4.ebuild,
-  +gdbus-codegen-2.38.2.ebuild:
-  Version bump for Gnome 3.10. Clean up old revisions.
-
-  22 Dec 2013; Jeroen Roovers <jer@gentoo.org> gdbus-codegen-2.36.4-r1.ebuild:
-  Stable for HPPA (bug #478252).
-
-  08 Dec 2013; Pacho Ramos <pacho@gentoo.org> gdbus-codegen-2.36.4-r1.ebuild:
-  x86 stable, bug #478252
-
-  30 Nov 2013; Pacho Ramos <pacho@gentoo.org> gdbus-codegen-2.36.4-r1.ebuild:
-  amd64 stable, bug #478252
-
-  14 Nov 2013; Matt Turner <mattst88@gentoo.org> gdbus-codegen-2.34.3-r1.ebuild:
-  alpha stable, bug 476364.
-
-  24 Oct 2013; Jeroen Roovers <jer@gentoo.org> gdbus-codegen-2.34.3-r1.ebuild:
-  Stable for HPPA (bug #476364).
-
-  17 Oct 2013; Markus Meier <maekke@gentoo.org> gdbus-codegen-2.34.3-r1.ebuild:
-  arm stable, bug #476364
-
-  29 Sep 2013; Michał Górny <mgorny@gentoo.org> -gdbus-codegen-2.32.4.ebuild:
-  Drop old.
-
-  06 Sep 2013; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.32.4-r1.ebuild:
-  Stable for sparc, wrt bug #479506
-
-  05 Sep 2013; Michał Górny <mgorny@gentoo.org> gdbus-codegen-2.32.4-r1.ebuild,
-  gdbus-codegen-2.32.4-r2.ebuild, gdbus-codegen-2.32.4.ebuild,
-  gdbus-codegen-2.34.3-r1.ebuild, gdbus-codegen-2.34.3.ebuild,
-  gdbus-codegen-2.36.4-r1.ebuild, gdbus-codegen-2.36.4.ebuild:
-  Remove Python 2.5 and 3.1 support.
-
-  02 Sep 2013; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.32.4-r1.ebuild:
-  Stable for alpha, wrt bug #479506
-
-*gdbus-codegen-2.36.4-r1 (01 Sep 2013)
-*gdbus-codegen-2.34.3-r1 (01 Sep 2013)
-*gdbus-codegen-2.32.4-r2 (01 Sep 2013)
-
-  01 Sep 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
-  +gdbus-codegen-2.32.4-r2.ebuild, +gdbus-codegen-2.34.3-r1.ebuild,
-  -gdbus-codegen-2.36.3.ebuild, +gdbus-codegen-2.36.4-r1.ebuild,
-  +files/gdbus-codegen-2.36.4-input-encoding.patch:
-  Do not open input files as build-environment encoding text when using python3
-  as the python interpreter (bug #483060, thanks to Fernando V. (likewhoa)).
-
-  29 Aug 2013; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.32.4-r1.ebuild:
-  Stable for ia64, wrt bug #479506
-
-  18 Aug 2013; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.32.4-r1.ebuild:
-  Stable for x86, wrt bug #479506
-
-  16 Aug 2013; Jeroen Roovers <jer@gentoo.org> gdbus-codegen-2.32.4-r1.ebuild:
-  Stable for HPPA (bug #479506).
-
-*gdbus-codegen-2.36.4 (16 Aug 2013)
-
-  16 Aug 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
-  -gdbus-codegen-2.36.2.ebuild, +gdbus-codegen-2.36.4.ebuild:
-  Version bump, remove old.
-
-  15 Aug 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
-  gdbus-codegen-2.34.3.ebuild:
-  Don't patch twice (bug #481142, thanks to Patrick Lauer).
-
-  14 Aug 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
-  gdbus-codegen-2.32.4-r1.ebuild, gdbus-codegen-2.34.3.ebuild,
-  gdbus-codegen-2.36.2.ebuild, gdbus-codegen-2.36.3.ebuild:
-  Silence distutils-r1 QA warnings (bug #481052, thanks to Michael Palimaka
-  (kensington)).
-
-  10 Aug 2013; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.32.4-r1.ebuild:
-  Stable for ppc64, wrt bug #479506
-
-  10 Aug 2013; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.32.4-r1.ebuild:
-  Stable for ppc, wrt bug #479506
-
-  10 Aug 2013; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.32.4-r1.ebuild:
-  Stable for amd64, wrt bug #479506
-
-  09 Aug 2013; Markus Meier <maekke@gentoo.org> gdbus-codegen-2.32.4-r1.ebuild:
-  arm stable, bug #479506
-
-*gdbus-codegen-2.32.4-r1 (02 Aug 2013)
-
-  02 Aug 2013; Michał Górny <mgorny@gentoo.org> +gdbus-codegen-2.32.4-r1.ebuild:
-  Backport the distutils-r1 conversion.
-
-*gdbus-codegen-2.36.3 (10 Jun 2013)
-
-  10 Jun 2013; Pacho Ramos <pacho@gentoo.org> +gdbus-codegen-2.36.3.ebuild,
-  -gdbus-codegen-2.36.1.ebuild:
-  Version bump, drop old
-
-*gdbus-codegen-2.36.2 (14 May 2013)
-
-  14 May 2013; Pacho Ramos <pacho@gentoo.org> +gdbus-codegen-2.36.2.ebuild,
-  -gdbus-codegen-2.36.0.ebuild:
-  Version bump, drop old
-
-*gdbus-codegen-2.36.1 (23 Apr 2013)
-
-  23 Apr 2013; Pacho Ramos <pacho@gentoo.org> +gdbus-codegen-2.36.1.ebuild,
-  -gdbus-codegen-2.30.3.ebuild, -gdbus-codegen-2.34.2.ebuild:
-  Version bump, drop old
-
-  29 Mar 2013; Pacho Ramos <pacho@gentoo.org>
-  +files/gdbus-codegen-2.36.0-sitedir.patch, gdbus-codegen-2.36.0.ebuild:
-  Forgot to commit ebuild using updated patch (#463656 by Maciej Piechotka)
-
-*gdbus-codegen-2.36.0 (28 Mar 2013)
-
-  28 Mar 2013; Pacho Ramos <pacho@gentoo.org> +gdbus-codegen-2.36.0.ebuild:
-  Version bump for Gnome 3.8
-
-  25 Feb 2013; Zac Medico <zmedico@gentoo.org> gdbus-codegen-2.34.3.ebuild:
-  Add ~arm-linux keyword.
-
-  17 Dec 2012; Michał Górny <mgorny@gentoo.org> gdbus-codegen-2.34.2.ebuild:
-  Bump to EAPI=5 to make Paludis happy, bug #447524.
-
-  10 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
-  gdbus-codegen-2.34.2.ebuild, gdbus-codegen-2.34.3.ebuild:
-  Migrate to distutils-r1.eclass, enable python3.3 support.
-
-*gdbus-codegen-2.34.3 (27 Nov 2012)
-
-  27 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
-  -gdbus-codegen-2.34.1.ebuild, +gdbus-codegen-2.34.3.ebuild:
-  Version bump, no code changes. Drop old.
-
-*gdbus-codegen-2.34.2 (10 Nov 2012)
-
-  10 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
-  -gdbus-codegen-2.34.0.ebuild, +gdbus-codegen-2.34.2.ebuild:
-  Version bump, no code changes. Drop old.
-
-*gdbus-codegen-2.34.1 (17 Oct 2012)
-
-  17 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
-  +gdbus-codegen-2.34.1.ebuild:
-  Version bump.
-
-  14 Oct 2012; Raúl Porcel <armin76@gentoo.org> gdbus-codegen-2.32.4.ebuild:
-  ia64/m68k/s390/sh/sparc stable wrt #436028
-
-  06 Oct 2012; Anthony G. Basile <blueness@gentoo.org>
-  gdbus-codegen-2.32.4.ebuild:
-  stable ppc ppc64, bug #427544
-
-  06 Oct 2012; Markus Meier <maekke@gentoo.org> gdbus-codegen-2.32.4.ebuild:
-  arm stable, bug #427544
-
-  04 Oct 2012; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.32.4.ebuild:
-  Stable for amd64, wrt bug #427544
-
-  03 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
-  gdbus-codegen-2.32.4.ebuild, gdbus-codegen-2.34.0.ebuild:
-  Use PYTHON_USE.
-
-  03 Oct 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
-  gdbus-codegen-2.32.4.ebuild:
-  x86 stable wrt bug #427544
-
-  02 Oct 2012; Jeroen Roovers <jer@gentoo.org> gdbus-codegen-2.32.4.ebuild:
-  Stable for HPPA (bug #427544).
-
-  26 Sep 2012; Matt Turner <mattst88@gentoo.org> gdbus-codegen-2.32.4.ebuild:
-  Stable on alpha, bug 427544.
-
-*gdbus-codegen-2.34.0 (25 Sep 2012)
-
-  25 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
-  -gdbus-codegen-2.30.2.ebuild, -gdbus-codegen-2.32.3.ebuild,
-  gdbus-codegen-2.30.3.ebuild, gdbus-codegen-2.32.4.ebuild,
-  +gdbus-codegen-2.34.0.ebuild:
-  Version bump, drop old. Make license more precise.
-
-*gdbus-codegen-2.32.4 (16 Jul 2012)
-
-  16 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
-  -gdbus-codegen-2.32.2.ebuild, +files/setup.py-2.32.4,
-  +gdbus-codegen-2.32.4.ebuild, +files/gdbus-codegen-2.32.4-sitedir.patch:
-  Version bump, now with python3 support. Drop old.
-
-  15 Jul 2012; Raúl Porcel <armin76@gentoo.org> gdbus-codegen-2.30.3.ebuild:
-  alpha/ia64/m68k/s390/sh/sparc stable wrt #410611
-
-  24 May 2012; Samuli Suominen <ssuominen@gentoo.org>
-  gdbus-codegen-2.30.3.ebuild:
-  ppc stable wrt #410611
-
-  16 May 2012; Jeroen Roovers <jer@gentoo.org> gdbus-codegen-2.30.3.ebuild:
-  Stable for HPPA (bug #410611).
-
-*gdbus-codegen-2.32.3 (15 May 2012)
-
-  15 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
-  -gdbus-codegen-2.32.1.ebuild, +gdbus-codegen-2.32.3.ebuild:
-  Version bump. Drop old.
-
-*gdbus-codegen-2.32.2 (01 May 2012)
-
-  01 May 2012; Pacho Ramos <pacho@gentoo.org> +gdbus-codegen-2.32.2.ebuild,
-  -gdbus-codegen-2.32.0.ebuild:
-  Version bump, remove old.
-
-  29 Apr 2012; Markus Meier <maekke@gentoo.org> gdbus-codegen-2.30.3.ebuild:
-  x86 stable, bug #410611
-
-  28 Apr 2012; Alexis Ballier <aballier@gentoo.org>
-  gdbus-codegen-2.32.1.ebuild:
-  keyword ~amd64-fbsd
-
-  25 Apr 2012; Markus Meier <maekke@gentoo.org> gdbus-codegen-2.30.3.ebuild:
-  arm stable, bug #410611
-
-  19 Apr 2012; Brent Baude <ranger@gentoo.org> gdbus-codegen-2.30.3.ebuild:
-  Marking gdbus-codegen-2.30.3 ppc64 stable for bug 410611
-
-  18 Apr 2012; Agostino Sarubbo <ago@gentoo.org> gdbus-codegen-2.30.3.ebuild:
-  Stable for amd64, wrt bug #410611
-
-*gdbus-codegen-2.32.1 (14 Apr 2012)
-
-  14 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
-  +gdbus-codegen-2.32.1.ebuild:
-  Version bump.
-
-  25 Mar 2012; Raúl Porcel <armin76@gentoo.org> gdbus-codegen-2.30.2.ebuild:
-  ia64/m68k/s390/sparc stable 
-
-*gdbus-codegen-2.32.0 (25 Mar 2012)
-
-  25 Mar 2012; Nirbheek Chauhan <nirbheek@gentoo.org>
-  +gdbus-codegen-2.32.0.ebuild:
-  Bump to 2.32, used by clutter and GNOME 3.4; package.masked because it breaks
-  a lot of stuff
-
-*gdbus-codegen-2.30.3 (14 Mar 2012)
-
-  14 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
-  +gdbus-codegen-2.30.3.ebuild:
-  Version bump.
-
-  05 Mar 2012; Brent Baude <ranger@gentoo.org> gdbus-codegen-2.30.2.ebuild:
-  Marking gdbus-codegen-2.30.2 ppc stable for bug 393007
-
-  05 Mar 2012; Brent Baude <ranger@gentoo.org> gdbus-codegen-2.30.2.ebuild:
-  Marking gdbus-codegen-2.30.2 ppc64 stable for bug 393007
-
-  17 Feb 2012; Tobias Klausmann <klausman@gentoo.org>
-  gdbus-codegen-2.30.2.ebuild:
-  Stable on alpha, bug #401513
-
-  16 Feb 2012; Nathan Phillip Brink <binki@gentoo.org>
-  gdbus-codegen-2.30.2.ebuild:
-  Add ~amd64-linux keyword, tested on ubuntu 10.
-
-  18 Jan 2012; Markus Meier <maekke@gentoo.org> gdbus-codegen-2.30.2.ebuild:
-  arm stable, bug #393007
-
-  17 Jan 2012; Pacho Ramos <pacho@gentoo.org> -gdbus-codegen-2.30.1.ebuild,
-  gdbus-codegen-2.30.2.ebuild:
-  Rewrite skipping tests message to try to explain the issue a bit better and
-  prevent misunderstandings like reported in bug #398943 by Toralf Förster.
-
-  14 Jan 2012; Markus Meier <maekke@gentoo.org> gdbus-codegen-2.30.2.ebuild:
-  x86 stable, bug #393007
-
-  29 Dec 2011; Pacho Ramos <pacho@gentoo.org> gdbus-codegen-2.30.2.ebuild:
-  amd64 stable, bug 393007
-
-  20 Dec 2011; Jeroen Roovers <jer@gentoo.org> gdbus-codegen-2.30.2.ebuild:
-  Stable for HPPA (bug #393007).
-
-*gdbus-codegen-2.30.2 (14 Nov 2011)
-
-  14 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
-  -gdbus-codegen-2.30.0.ebuild, +gdbus-codegen-2.30.2.ebuild:
-  Version bump, drop old.
-
-*gdbus-codegen-2.30.1 (16 Oct 2011)
-
-  16 Oct 2011; Pacho Ramos <pacho@gentoo.org> +gdbus-codegen-2.30.1.ebuild:
-  Version bump.
-
-*gdbus-codegen-2.30.0 (27 Sep 2011)
-
-  27 Sep 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
-  +gdbus-codegen-2.30.0.ebuild, +metadata.xml:
-  Move from GNOME overlay for GNOME 3.2. Ebuild by tetromino.

sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/Manifest

@@ -1,12 +1,3 @@
-AUX gdbus-codegen-2.40.0-sitedir.patch 1086 SHA256 a77c2cb1c2fcda471583e07c0af5478a0ba856ce19ce1fbf6ab107885fc85d40 SHA512 e860da78f31cb61896c450b4728cfc1d8eb57f0c06c9440fa4c3d4344429e41b12531b59e6ad6c8cb4ff146f9f63ddd9ed0e6b7f493a11adba46ea628bcc3499 WHIRLPOOL 98bc4f10d4ecc3fe476e3f81b538b94a096afb9cd726f4dcf9f8e07a89466c3a89b21fa3a70d7123e61f50fb4a6c866af1f3c87b881ca40eba273614cef4a849
+DIST glib-2.50.3.tar.xz 7589284 BLAKE2B 8648e5d9e8f4c943ca3ec5a5ec01f380f55f76555bf4ec731e211b33d0e23c29ea2a9323e2e839f35f89f292863df76d4e8c622fc44c0e5905eb904576618dbd SHA512 ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af
-AUX setup.py-2.32.4 192 SHA256 1b65204a147672a3d4ed17bea9e8dd8b8fa6230c17ea30bfb883be34be01c230 SHA512 45e823f507db103543f024ad557d35f7c09fb51db8a78b978c762ca77d941cdecc5837d2b248fc2c5da6a93b56fe8ded359efd98fb0a74fdf9533783d8eebcfa WHIRLPOOL d7969e4bd317b382a756b70e7010c9619e98bd91c11a8c46a2514086e5123c9f23d28b1c5b302e2c0569b39480a00c95a24eda6561081890161f68a1d541093e
+DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
-DIST glib-2.40.2.tar.xz 7001344 SHA256 e8ff8af2950897e805408480c454c415d1eade4e670ec5fb507f5e5853726c7a SHA512 6d4c254a033a2e558574fb1aa95f6f3215a24d49d69cdb353f0186cac186eb1301563ab271ac86d82734dd1586d88fdd9d53f1c0e2b43f103aae53223884c153 WHIRLPOOL 2b5bfb3647cd802264716cc69ea0e7e26385b9b0db0610ea7078ba99a0a90dadc9197c49fa122cc8082a8edb166ad8f2d6be76e5b7491e786c74ce4aac91d472
+DIST glib-2.54.3.tar.xz 7836536 BLAKE2B 140e7cf09a41b72a5b22e5b87e9674cbfdfe1b82f3cf5f0fd3ecb2ed6b1f62a90f8b4c0bc2f655e297f91394f771f6ecad210357e31f104ee49ca178be6b9d76 SHA512 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d
-DIST glib-2.42.1.tar.xz 6985120 SHA256 8f3f0865280e45b8ce840e176ef83bcfd511148918cc8d39df2ee89b67dcf89a SHA512 0d273e3e24f164f16f6663f88866ae412714eab7d15c1901fdef61f13649a08f9962e49f9d52e8a1683100f9c2dcc468b9a5bf8a9b3d6ca7b0d9488bc58f3f1e WHIRLPOOL 5cf0dbce9890a61210f0c1c0b43a6147bfff107ee8d37de959fc533b56fa9e253d74996ed3ad05b2d756aecf65c1bd8cb1faaaa50096304df2b2f09d05b28804
-DIST glib-2.42.2.tar.xz 7002480 SHA256 a3cc1ebd2bd310a9fdf42ae4293ee713cdf1764bd29f552febf3bf44cadae7db SHA512 6b46e4ac67d79ca2cc5c32ceb7cc8112140645032cb3c8c9ba2f59a0d3c2aee06707b7573bbd72f6c21ea7798a7351bd205aa57857a58b0be008c75f897ef782 WHIRLPOOL 5c25c5f6d20217cce4f8c34d9d05cd39197b4b36c5a85447943fcab47cd343253879516b722eb0c4895eebae5f3d4e76c820730b9e7f6c890aca9c87dc963564
-DIST glib-2.44.1.tar.xz 7132940 SHA256 8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07 SHA512 c24d307408e061b2657f7e7d1b8245c55605ebda26ee2dcc3497ee9d90bfc137d8e5f42f0cd5acf4b49ea28c424fa901e81f75ecf81833f6d0fe51d5e36e5888 WHIRLPOOL 6a1eef94b3ffed4d5cb551f4def6859ddff8ea0aac50048e706863f2bd4957c40b7034946852fa4604a109eb121c55b94ec51b3708a325ace5692f61fd1babb7
-EBUILD gdbus-codegen-2.40.2.ebuild 1424 SHA256 29bbf61cfecd992616b7d91ea3e90f1673be15665fc41aadf909f2f4a4bdbc0d SHA512 400f4257ffb14f6875e4bb3f68611ae6f18410e199b94e30b86cc905e4316c94595f5bcb5718fe18b6f7e3d943ef7d07057fab8e8b08ea79c661bcd1487262fb WHIRLPOOL 32a30ad58bf9681779c60de9e77a40a161ca37126b9414edb52b6b964d5b2856ff6bb39acafe3adae7f32b514c1b6ca7eeac969765ca27f7c8795f0850dda309
-EBUILD gdbus-codegen-2.42.1.ebuild 1437 SHA256 6dee6b99197edd61a8f67b7c45a80f1882a4f16a9117590aed50a65c200b9238 SHA512 6ce92429a114635d71277efca62441660c0dfedc45296e36d51e37596ab95b206e8d2eb6106887a21e364de04ef2102e219403e0335c757c58cc3f966ef5b310 WHIRLPOOL 04abc8b556e4753a6cdada2129a35b3cefad0132e0b14ee0f33ea9bbf510a06a0d52ace4ba4ee04b095f3bdaf699c47ec97da4f871c896f3f5b9ba097df99772
-EBUILD gdbus-codegen-2.42.2.ebuild 1334 SHA256 f131c3205d373872316b488fd632e2aac7b791429791597bc4d0046b03f6b49e SHA512 e586b08ddd9f77bc2808ee035be00e5bdb9282dad02e810425448dfe94f60fc1d9189a379718cf71f336f4a3a68c80cbba7efaba0d2a5ae416ee922b85099012 WHIRLPOOL d183a5cc6a47467308f82451e9920d9e80c5841b2b1c0093bc8375581853409ac11831d5d19d7019bd41f5cca6517e8c89f939d2d6c2264f3fa2a24c83370d43
-EBUILD gdbus-codegen-2.44.1.ebuild 1337 SHA256 4a0cb46f0fecce04f6e42a6d78727b30c52d0f45091c0e715d7a39aa497c14e1 SHA512 307404e2ff0b4b9791e7d1dcdf29a645820eab8cc1476dea55d826046c254d317f00374aa3a2b8d2d2da909793e2da5982c3eec406d17c424a39366bb5672e1e WHIRLPOOL a332676dec4c920efef5f993dbee183ec54f44c1807be5e62d4c20aa8105830b79b706ac517efcc9341140afb6bc3760f34155e01b651dc0904413ce904916c1
-MISC ChangeLog 16992 SHA256 58d04623e7e5d427b1afa2cbe324566592d650cdc9ca60d50103aed45fba8d6b SHA512 56e766ea7f51152eed9fb469dada3c1f02c2a7209e0820a7a71630d726c240a1431b8b551ad01a2e0cfc089cf7618290a7e4a0ee8ef87f5aa78c3821aa23ce89 WHIRLPOOL 8aec0d9ca5550913f3370f98bb1187ee3126816a550dd58533a02483d2dc4bbd2dc50b96286a51719cfd2997e34f15ba6781c844b5284d266badcceed3177f3f
-MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e

sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/files/gdbus-codegen-2.54.3-sitedir.patch

@@ -0,0 +1,22 @@
+diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
+index 8050981..932410a 100644
+--- a/gdbus-codegen.in
++++ b/gdbus-codegen.in
+@@ -28,16 +28,7 @@ filedir = os.path.dirname(__file__)
+ 
+ if srcdir is not None:
+     path = os.path.join(srcdir, 'gio', 'gdbus-2.0')
+-elif os.path.basename(filedir) == 'bin':
+-    # Make the prefix containing gdbus-codegen 'relocatable' at runtime by
+-    # adding /some/prefix/bin/../share/glib-2.0 to the python path
+-    path = os.path.join(filedir, '..', 'share', 'glib-2.0')
+ else:
+-    # Assume that the modules we need are in the current directory and add the
+-    # parent directory to the python path.
+-    path = os.path.join(filedir, '..')
+-
+-sys.path.insert(0, os.path.abspath(path))
+-from codegen import codegen_main
++    from gdbus_codegen import codegen_main
+ 
+ sys.exit(codegen_main.codegen_main())

sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.40.2.ebuild

@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE="xml"
-
-inherit eutils gnome.org distutils-r1
-
-DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-# To prevent circular dependencies with glib[test]
-PDEPEND=">=dev-libs/glib-${PV}:2"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.40.0-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-	sed -e "s:\"/usr/local\":\"${EPREFIX}/usr\":" \
-		-i config.py || die "sed config.py failed"
-
-	sed -e 's:#!@PYTHON@:#!/usr/bin/env python:' gdbus-codegen.in > gdbus-codegen || die
-	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
-	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
-}
-
-src_test() {
-	einfo "Skipping tests. This package is tested by dev-libs/glib"
-	einfo "when merged with FEATURES=test"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all # no-op, but prevents QA warning
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}

sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.50.3.ebuild

@@ -1,20 +1,19 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="5"
 GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 PYTHON_REQ_USE="xml"
 
-inherit eutils gnome.org distutils-r1
+inherit gnome.org distutils-r1
 
 DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="http://www.gtk.org/"
+HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"

sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild

@@ -1,20 +1,19 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="5"
 GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE="xml"
 
-inherit eutils gnome.org distutils-r1
+inherit gnome.org distutils-r1
 
 DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="http://www.gtk.org/"
+HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"

sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild

@@ -1,20 +1,19 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI="5"
+EAPI=6
 GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE="xml"
 
-inherit eutils gnome.org distutils-r1
+inherit gnome.org distutils-r1
 
 DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="http://www.gtk.org/"
+HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
@@ -27,13 +26,11 @@ S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
 
 python_prepare_all() {
 	PATCHES=(
-		"${FILESDIR}/${PN}-2.40.0-sitedir.patch"
+		"${FILESDIR}/${PN}-2.54.3-sitedir.patch"
 	)
 	distutils-r1_python_prepare_all
-	sed -e "s:\"/usr/local\":\"${EPREFIX}/usr\":" \
-		-i config.py || die "sed config.py failed"
 
-	sed -e 's:#!@PYTHON@:#!/usr/bin/env python:' gdbus-codegen.in > gdbus-codegen || die
+	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
 	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
 	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
 }

sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/metadata.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

sdk_container/src/third_party/portage-stable/eclass/ant-tasks.eclass

@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
 
 # @ECLASS: ant-tasks.eclass
@@ -16,20 +16,21 @@
 JAVA_ANT_DISABLE_ANT_CORE_DEP=true
 # rewriting build.xml for are the testcases has no reason atm
 JAVA_PKG_BSFIX_ALL=no
-inherit versionator java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
+[[ ${EAPI:-0} == [0123456] ]] && inherit eapi7-ver
 
 EXPORT_FUNCTIONS src_unpack src_compile src_install
 
 # @ECLASS-VARIABLE: ANT_TASK_JDKVER
 # @DESCRIPTION:
 # Affects the >=virtual/jdk version set in DEPEND string. Defaults to 1.5, can
-# be overriden from ebuild BEFORE inheriting this eclass.
+# be overridden from ebuild BEFORE inheriting this eclass.
 ANT_TASK_JDKVER=${ANT_TASK_JDKVER-1.5}
 
 # @ECLASS-VARIABLE: ANT_TASK_JREVER
 # @DESCRIPTION:
 # Affects the >=virtual/jre version set in DEPEND string. Defaults to 1.5, can
-# be overriden from ebuild BEFORE inheriting this eclass.
+# be overridden from ebuild BEFORE inheriting this eclass.
 ANT_TASK_JREVER=${ANT_TASK_JREVER-1.5}
 
 # @ECLASS-VARIABLE: ANT_TASK_NAME
@@ -60,24 +61,22 @@ if [[ ${PV} == *beta2* ]]; then
 	MY_PV=${PV/_beta2/beta}
 	UPSTREAM_PREFIX="http://people.apache.org/dist/ant/v1.7.1beta2/src"
 	GENTOO_PREFIX="https://dev.gentoo.org/~caster/distfiles"
-	ANT_TASK_PV=$(get_version_component_range 1-3)
+	ANT_TASK_PV=$(ver_cut 1-3)
 elif [[ ${PV} == *_rc* ]]; then
 	MY_PV=${PV/_rc/RC}
 	UPSTREAM_PREFIX="https://dev.gentoo.org/~caster/distfiles"
 	GENTOO_PREFIX="https://dev.gentoo.org/~caster/distfiles"
-	ANT_TASK_PV=$(get_version_component_range 1-3)
+	ANT_TASK_PV=$(ver_cut 1-3)
 else
 	# default for final releases
 	MY_PV=${PV}
-	UPSTREAM_PREFIX="mirror://apache/ant/source"
 	case ${PV} in
 	1.9.*)
+		UPSTREAM_PREFIX="https://archive.apache.org/dist/ant/source"
 		GENTOO_PREFIX="https://dev.gentoo.org/~tomwij/files/dist"
 		;;
-	1.8.4)
-		GENTOO_PREFIX="https://dev.gentoo.org/~sera/distfiles"
-		;;
 	*)
+		UPSTREAM_PREFIX="mirror://apache/ant/source"
 		GENTOO_PREFIX="https://dev.gentoo.org/~caster/distfiles"
 		;;
 	esac
@@ -86,7 +85,7 @@ fi
 # source/workdir name
 MY_P="apache-ant-${MY_PV}"
 
-# Default values for standard ebuild variables, can be overriden from ebuild.
+# Default values for standard ebuild variables, can be overridden from ebuild.
 DESCRIPTION="Apache Ant's optional tasks depending on ${ANT_TASK_DEPNAME}"
 HOMEPAGE="http://ant.apache.org/"
 SRC_URI="${UPSTREAM_PREFIX}/${MY_P}-src.tar.bz2
@@ -103,7 +102,7 @@ if [[ -z "${ANT_TASK_DISABLE_VM_DEPS}" ]]; then
 fi
 
 # we need direct blockers with old ant-tasks for file collisions - bug #252324
-if version_is_at_least 1.7.1 ; then
+if ver_test -ge 1.7.1; then
 	DEPEND+=" !dev-java/ant-tasks"
 fi
 
@@ -169,7 +168,7 @@ ant-tasks_src_install() {
 	java-pkg_register-ant-task --version "${ANT_TASK_PV}"
 
 	# create the compatibility symlink
-	if version_is_at_least 1.7.1_beta2; then
+	if ver_test -ge 1.7.1_beta2; then
 		dodir /usr/share/ant/lib
 		dosym /usr/share/${PN}/lib/${PN}.jar /usr/share/ant/lib/${PN}.jar
 	fi

sdk_container/src/third_party/portage-stable/eclass/apache-2.eclass

@@ -24,12 +24,12 @@ esac
 case $(get_version_component_range 1-2) in
 	2.4)
 		DEFAULT_MPM_THREADED="event" #509922
-		RDEPEND=">=dev-libs/apr-1.5.1
+		CDEPEND=">=dev-libs/apr-1.5.1:=
 			!www-apache/mod_macro" #492578 #477702
 	;;
 	2.2)
 		DEFAULT_MPM_THREADED="worker"
-		RDEPEND=">=dev-libs/apr-1.4.5" #368651
+		CDEPEND=">=dev-libs/apr-1.4.5:=" #368651
 	;;
 	*)
 		die "Unknown MAJOR.MINOR apache version."
@@ -47,14 +47,14 @@ esac
 # If you want to override this in an ebuild, use:
 # ORIG_PR="(revision of Gentoo stuff you want)"
 # GENTOO_PATCHNAME="gentoo-${PN}-${PV}${ORIG_PR:+-${ORIG_PR}}"
-[[ -n "$GENTOO_PATCHNAME" ]] || GENTOO_PATCHNAME="gentoo-${PF}"
+[[ -n "${GENTOO_PATCHNAME}" ]] || GENTOO_PATCHNAME="gentoo-${PF}"
 
 # @ECLASS-VARIABLE: GENTOO_PATCHDIR
 # @DESCRIPTION:
 # This internal variable contains the working directory where patches and config
 # files are located.
 # Defaults to the patchset name appended to the working directory.
-[[ -n "$GENTOO_PATCHDIR" ]] || GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
+[[ -n "${GENTOO_PATCHDIR}" ]] || GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
 
 # @VARIABLE: GENTOO_DEVELOPER
 # @DESCRIPTION:
@@ -70,7 +70,7 @@ esac
 # @DESCRIPTION:
 # This variable should contain the entire filename of patch tarball.
 # Defaults to the name of the patchset, with a datestamp.
-[[ -n "$GENTOO_PATCH_A" ]] || GENTOO_PATCH_A="${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"
+[[ -n "${GENTOO_PATCH_A}" ]] || GENTOO_PATCH_A="${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"
 
 SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
 	https://dev.gentoo.org/~${GENTOO_DEVELOPER}/dist/apache/${GENTOO_PATCH_A}"
@@ -91,26 +91,52 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
 # built-in modules
 
 IUSE_MPMS="${IUSE_MPMS_FORK} ${IUSE_MPMS_THREAD}"
-IUSE="${IUSE} debug doc ldap libressl selinux ssl static suexec threads"
+IUSE="${IUSE} debug doc gdbm ldap libressl selinux ssl static suexec threads"
 
 for module in ${IUSE_MODULES} ; do
 	IUSE="${IUSE} apache2_modules_${module}"
 done
 
-for mpm in ${IUSE_MPMS} ; do
+_apache2_set_mpms() {
-	IUSE="${IUSE} apache2_mpms_${mpm}"
+	local mpm
-done
+	local ompm
 
-DEPEND="dev-lang/perl
+	for mpm in ${IUSE_MPMS} ; do
-	=dev-libs/apr-1*
+		IUSE="${IUSE} apache2_mpms_${mpm}"
-	=dev-libs/apr-util-1*[ldap?]
+
+		REQUIRED_USE+=" apache2_mpms_${mpm}? ("
+		for ompm in ${IUSE_MPMS} ; do
+			if [[ "${mpm}" != "${ompm}" ]] ; then
+				REQUIRED_USE+=" !apache2_mpms_${ompm}"
+			fi
+		done
+
+		if has ${mpm} ${IUSE_MPMS_FORK} ; then
+			REQUIRED_USE+=" !threads"
+		else
+			REQUIRED_USE+=" threads"
+		fi
+		REQUIRED_USE+=" )"
+	done
+
+	if [[ "${PV}" != 2.2* ]] ; then
+		REQUIRED_USE+=" apache2_mpms_prefork? ( !apache2_modules_http2 )"
+	fi
+}
+_apache2_set_mpms
+unset -f _apache2_set_mpms
+
+DEPEND="${CDEPEND}
+	dev-lang/perl
+	=dev-libs/apr-util-1*:=[gdbm=,ldap?]
 	dev-libs/libpcre
 	apache2_modules_deflate? ( sys-libs/zlib )
 	apache2_modules_mime? ( app-misc/mime-types )
+	gdbm? ( sys-libs/gdbm:= )
 	ldap? ( =net-nds/openldap-2* )
 	ssl? (
 		!libressl? ( >=dev-libs/openssl-1.0.2:0= )
-		libressl? ( dev-libs/libressl:= )
+		libressl? ( dev-libs/libressl:0= )
 	)
 	!=www-servers/apache-1*"
 RDEPEND+=" ${DEPEND}
@@ -119,6 +145,23 @@ PDEPEND="~app-admin/apache-tools-${PV}"
 
 S="${WORKDIR}/httpd-${PV}"
 
+# @VARIABLE: MODULE_DEPENDS
+# @DESCRIPTION:
+# This variable needs to be set in the ebuild and contains a space-separated
+# list of dependency tokens each with a module and the module it depends on
+# separated by a colon
+
+# now extend REQUIRED_USE to reflect the module dependencies to portage
+_apache2_set_module_depends() {
+	local dep
+
+	for dep in ${MODULE_DEPENDS} ; do
+		REQUIRED_USE+=" apache2_modules_${dep%:*}? ( apache2_modules_${dep#*:} )"
+	done
+}
+_apache2_set_module_depends
+unset -f _apache2_set_module_depends
+
 # ==============================================================================
 # INTERNAL FUNCTIONS
 # ==============================================================================
@@ -135,16 +178,12 @@ setup_mpm() {
 	MY_MPM=""
 	for x in ${IUSE_MPMS} ; do
 		if use apache2_mpms_${x} ; then
-			if [[ -z "${MY_MPM}" ]] ; then
+			# there can at most be one MPM selected because of REQUIRED_USE constraints
-				MY_MPM=${x}
+			MY_MPM=${x}
-				elog
+			elog
-				elog "Selected MPM: ${MY_MPM}"
+			elog "Selected MPM: ${MY_MPM}"
-				elog
+			elog
-			else
+			break
-				eerror "You have selected more then one mpm USE-flag."
-				eerror "Only one MPM is supported."
-				die "more then one mpm was specified"
-			fi
 		fi
 	done
 
@@ -161,20 +200,6 @@ setup_mpm() {
 			elog
 		fi
 	fi
-
-	if has ${MY_MPM} ${IUSE_MPMS_THREAD} && ! use threads ; then
-		eerror "You have selected a threaded MPM but USE=threads is disabled"
-		die "invalid use flag combination"
-	fi
-
-	if has ${MY_MPM} ${IUSE_MPMS_FORK} && use threads ; then
-		eerror "You have selected a non-threaded MPM but USE=threads is enabled"
-		die "invalid use flag combination"
-	fi
-
-	if [[ "${PV}" != 2.2* ]] && [[ "${MY_MPM}" = *prefork* ]] && use apache2_modules_http2 ; then
-		die "http2 does not work with prefork MPM."
-	fi
 }
 
 # @VARIABLE: MODULE_CRITICAL
@@ -207,35 +232,6 @@ check_module_critical() {
 	fi
 }
 
-# @VARIABLE: MODULE_DEPENDS
-# @DESCRIPTION:
-# This variable needs to be set in the ebuild and contains a space-separated
-# list of dependency tokens each with a module and the module it depends on
-# separated by a colon
-
-# @FUNCTION: check_module_depends
-# @DESCRIPTION:
-# This internal function makes sure that all inter-module dependencies are
-# satisfied with the current module selection
-check_module_depends() {
-	local err=0
-
-	for m in ${MY_MODS[@]} ; do
-		for dep in ${MODULE_DEPENDS} ; do
-			if [[ "${m}" == "${dep%:*}" ]] ; then
-				if ! use apache2_modules_${dep#*:} ; then
-					eerror "Module '${m}' depends on '${dep#*:}'"
-					err=1
-				fi
-			fi
-		done
-	done
-
-	if [[ ${err} -ne 0 ]] ; then
-		die "invalid use flag combination"
-	fi
-}
-
 # @ECLASS-VARIABLE: MY_CONF
 # @DESCRIPTION:
 # This internal variable contains the econf options for the current module
@@ -316,7 +312,6 @@ setup_modules() {
 
 	# sort and uniquify MY_MODS
 	MY_MODS=( $(echo ${MY_MODS[@]} | tr ' ' '\n' | sort -u) )
-	check_module_depends
 	check_module_critical
 }
 
@@ -332,7 +327,7 @@ setup_modules() {
 # This internal function generates the LoadModule lines for httpd.conf based on
 # the current module selection and MODULE_DEFINES
 generate_load_module() {
-	local endit=0 mod_lines= mod_dir="${ED}/usr/$(get_libdir)/apache2/modules"
+	local endit=0 mod_lines= mod_dir="${ED%/}/usr/$(get_libdir)/apache2/modules"
 
 	if use static; then
 		sed -i -e "/%%LOAD_MODULE%%/d" \
@@ -534,24 +529,25 @@ apache-2_src_configure() {
 
 	# econf overwrites the stuff from config.layout, so we have to put them into
 	# our myconf line too
+	MY_CONF+=(
+		--includedir="${EPREFIX}"/usr/include/apache2
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+		--datadir="${EPREFIX}"/var/www/localhost
+		--sysconfdir="${EPREFIX}"/etc/apache2
+		--localstatedir="${EPREFIX}"/var
+		--with-mpm=${MY_MPM}
+		--with-apr="${SYSROOT}${EPREFIX}"/usr
+		--with-apr-util="${SYSROOT}${EPREFIX}"/usr
+		--with-pcre="${T}"/pcre-config
+		--with-z="${EPREFIX}"/usr
+		--with-port=80
+		--with-program-name=apache2
+		--enable-layout=Gentoo
+	)
 	ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
-	econf \
+	econf "${MY_CONF[@]}"
-		--includedir="${EPREFIX}"/usr/include/apache2 \
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules \
-		--datadir="${EPREFIX}"/var/www/localhost \
-		--sysconfdir="${EPREFIX}"/etc/apache2 \
-		--localstatedir="${EPREFIX}"/var \
-		--with-mpm=${MY_MPM} \
-		--with-apr="${SYSROOT}${EPREFIX}"/usr \
-		--with-apr-util="${SYSROOT}${EPREFIX}"/usr \
-		--with-pcre="${T}"/pcre-config \
-		--with-z="${EPREFIX}"/usr \
-		--with-port=80 \
-		--with-program-name=apache2 \
-		--enable-layout=Gentoo \
-		"${MY_CONF[@]}"
 
-	sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h
+	sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h || die
 }
 
 # @FUNCTION: apache-2_src_install
@@ -575,15 +571,15 @@ apache-2_src_install() {
 
 	# generate a sane default APACHE2_OPTS
 	APACHE2_OPTS="-D DEFAULT_VHOST -D INFO"
-	use doc && APACHE2_OPTS="${APACHE2_OPTS} -D MANUAL"
+	use doc && APACHE2_OPTS+=" -D MANUAL"
-	use ssl && APACHE2_OPTS="${APACHE2_OPTS} -D SSL -D SSL_DEFAULT_VHOST"
+	use ssl && APACHE2_OPTS+=" -D SSL -D SSL_DEFAULT_VHOST"
-	use suexec && APACHE2_OPTS="${APACHE2_OPTS} -D SUEXEC"
+	use suexec && APACHE2_OPTS+=" -D SUEXEC"
 	if has negotiation ${APACHE2_MODULES} && use apache2_modules_negotiation; then
-		APACHE2_OPTS="${APACHE2_OPTS} -D LANGUAGE"
+		APACHE2_OPTS+=" -D LANGUAGE"
 	fi
 
 	sed -i -e "s:APACHE2_OPTS=\".*\":APACHE2_OPTS=\"${APACHE2_OPTS}\":" \
-		"${GENTOO_PATCHDIR}"/init/apache2.confd || die "sed failed"
+		"${GENTOO_PATCHDIR}"/init/apache2.confd || die
 
 	newconfd "${GENTOO_PATCHDIR}"/init/apache2.confd apache2
 	newinitd "${GENTOO_PATCHDIR}"/init/apache2.initd apache2
@@ -605,19 +601,19 @@ apache-2_src_install() {
 
 	# drop in a convenient link to the manual
 	if use doc ; then
-		sed -i -e "s:VERSION:${PVR}:" "${ED}/etc/apache2/modules.d/00_apache_manual.conf"
+		sed -i -e "s:VERSION:${PVR}:" "${ED%/}/etc/apache2/modules.d/00_apache_manual.conf"
 		docompress -x /usr/share/doc/${PF}/manual # 503640
 	else
-		rm -f "${ED}/etc/apache2/modules.d/00_apache_manual.conf"
+		rm -f "${ED%/}/etc/apache2/modules.d/00_apache_manual.conf"
-		rm -Rf "${ED}/usr/share/doc/${PF}/manual"
+		rm -Rf "${ED%/}/usr/share/doc/${PF}/manual"
 	fi
 
 	# the default icons and error pages get stored in
 	# /usr/share/apache2/{error,icons}
 	dodir /usr/share/apache2
-	mv -f "${ED}/var/www/localhost/error" "${ED}/usr/share/apache2/error"
+	mv -f "${ED%/}/var/www/localhost/error" "${ED%/}/usr/share/apache2/error"
-	mv -f "${ED}/var/www/localhost/icons" "${ED}/usr/share/apache2/icons"
+	mv -f "${ED%/}/var/www/localhost/icons" "${ED%/}/usr/share/apache2/icons"
-	rm -rf "${ED}/var/www/localhost/"
+	rm -rf "${ED%/}/var/www/localhost/"
 	eend $?
 
 	# set some sane permissions for suexec

sdk_container/src/third_party/portage-stable/eclass/autotools.eclass

@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: autotools.eclass
@@ -46,16 +46,20 @@ inherit libtool
 # @INTERNAL
 # @DESCRIPTION:
 # CONSTANT!
-# The latest major version/slot of automake available on each arch.  #312315
+# The latest major unstable and stable version/slot of automake available
-# We should list both the latest stable, and the latest unstable.  #465732
+# on each arch.
-# This way the stable builds will still work, but the unstable are allowed
+# List latest unstable version first to boost testing adoption rate because
-# to build & test things for us ahead of time (if they have it installed).
+# most package manager dependency resolver will pick the first suitable
+# version.
 # If a newer slot is stable on any arch, and is NOT reflected in this list,
 # then circular dependencies may arise during emerge @system bootstraps.
+# 
+# See bug 312315 and 465732 for further information and context.
+# 
 # Do NOT change this variable in your ebuilds!
 # If you want to force a newer minor version, you can specify the correct
 # WANT value by using a colon:  <PV>:<WANT_AUTOMAKE>
-_LATEST_AUTOMAKE=( 1.15:1.15 )
+_LATEST_AUTOMAKE=( 1.16.1:1.16 1.15.1:1.15 )
 
 _automake_atom="sys-devel/automake"
 _autoconf_atom="sys-devel/autoconf"
@@ -438,9 +442,17 @@ autotools_env_setup() {
 	if [[ ${WANT_AUTOMAKE} == "latest" ]]; then
 		local pv
 		for pv in ${_LATEST_AUTOMAKE[@]/#*:} ; do
-			# has_version respects ROOT, but in this case, we don't want it to,
+			# Break on first hit to respect _LATEST_AUTOMAKE order.
-			# thus "ROOT=/" prefix:
+			local hv_args=""
-			ROOT=/ has_version "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="${pv}"
+			case ${EAPI:-0} in
+				5|6)
+					hv_args="--host-root"
+					;;
+				7)
+					hv_args="-b"
+					;;
+			esac
+			ROOT=/ has_version ${hv_args} "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="${pv}" && break
 		done
 		[[ ${WANT_AUTOMAKE} == "latest" ]] && \
 			die "Cannot find the latest automake! Tried ${_LATEST_AUTOMAKE[*]}"

sdk_container/src/third_party/portage-stable/eclass/base.eclass

@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # DEPRECATED
@@ -41,18 +41,21 @@ esac
 EXPORT_FUNCTIONS ${BASE_EXPF}
 
 # @ECLASS-VARIABLE: DOCS
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Array containing documents passed to dodoc command.
 #
 # DOCS=( "${S}/doc/document.txt" "${S}/doc/doc_folder/" )
 
 # @ECLASS-VARIABLE: HTML_DOCS
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Array containing documents passed to dohtml command.
 #
 # HTML_DOCS=( "${S}/doc/document.html" "${S}/doc/html_folder/" )
 
 # @ECLASS-VARIABLE: PATCHES
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # PATCHES array variable containing all various patches to be applied.
 # This variable is expected to be defined in global scope of ebuild.

sdk_container/src/third_party/portage-stable/eclass/bash-completion-r1.eclass

@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: bash-completion-r1.eclass
@@ -25,7 +25,7 @@
 inherit toolchain-funcs
 
 case ${EAPI:-0} in
-	0|1|2|3|4|5|6) ;;
+	0|1|2|3|4|5|6|7) ;;
 	*) die "EAPI ${EAPI} unsupported (yet)."
 esac
 
@@ -98,6 +98,7 @@ dobashcomp() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	(
+		insopts -m 0644
 		insinto "$(_bash-completion-r1_get_bashcompdir)"
 		doins "${@}"
 	)
@@ -112,6 +113,7 @@ newbashcomp() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	(
+		insopts -m 0644
 		insinto "$(_bash-completion-r1_get_bashcompdir)"
 		newins "${@}"
 	)

sdk_container/src/third_party/portage-stable/eclass/bitcoincore.eclass

@@ -1,410 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-#
-# @ECLASS: bitcoincore.eclass
-# @MAINTAINER:
-# Luke Dashjr <luke_gentoo_bitcoin@dashjr.org>
-# @BLURB: common code for Bitcoin Core ebuilds
-# @DESCRIPTION:
-# This eclass is used in Bitcoin Core ebuilds (bitcoin-qt, bitcoind,
-# libbitcoinconsensus) to provide a single common place for the common ebuild
-# stuff.
-#
-# The eclass provides all common dependencies as well as common use flags.
-
-has "${EAPI:-0}" 5 || die "EAPI=${EAPI} not supported"
-
-if [[ ! ${_BITCOINCORE_ECLASS} ]]; then
-
-in_bcc_iuse() {
-	local liuse=( ${BITCOINCORE_IUSE} )
-	has "${1}" "${liuse[@]#[+-]}"
-}
-
-in_bcc_policy() {
-	local liuse=( ${BITCOINCORE_POLICY_PATCHES} )
-	has "${1}" "${liuse[@]#[+-]}"
-}
-
-DB_VER="4.8"
-inherit autotools db-use eutils
-
-if [ -z "$BITCOINCORE_COMMITHASH" ]; then
-	inherit git-2
-fi
-
-fi
-
-EXPORT_FUNCTIONS src_prepare src_test src_install
-
-if in_bcc_iuse ljr || in_bcc_iuse knots || in_bcc_iuse 1stclassmsg || in_bcc_iuse zeromq || [ -n "$BITCOINCORE_POLICY_PATCHES" ]; then
-	EXPORT_FUNCTIONS pkg_pretend
-fi
-
-if [[ ! ${_BITCOINCORE_ECLASS} ]]; then
-
-# @ECLASS-VARIABLE: BITCOINCORE_COMMITHASH
-# @DESCRIPTION:
-# Set this variable before the inherit line, to the upstream commit hash.
-
-# @ECLASS-VARIABLE: BITCOINCORE_IUSE
-# @DESCRIPTION:
-# Set this variable before the inherit line, to the USE flags supported.
-
-# @ECLASS-VARIABLE: BITCOINCORE_LJR_DATE
-# @DESCRIPTION:
-# Set this variable before the inherit line, to the datestamp of the Knots
-# patchset.
-
-# @ECLASS-VARIABLE: BITCOINCORE_POLICY_PATCHES
-# @DESCRIPTION:
-# Set this variable before the inherit line, to a space-delimited list of
-# supported policies.
-
-MyPV="${PV/_/}"
-MyPN="bitcoin"
-MyP="${MyPN}-${MyPV}"
-
-# These are expected to change in future versions
-DOCS="${DOCS} doc/README.md doc/release-notes.md"
-OPENSSL_DEPEND="dev-libs/openssl:0[-bindist]"
-WALLET_DEPEND="sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]"
-LIBEVENT_DEPEND=""
-UNIVALUE_DEPEND=""
-BITCOINCORE_LJR_NAME=ljr
-BITCOINCORE_KNOTS_USE=knots
-[ -n "${BITCOINCORE_LJR_PV}" ] || BITCOINCORE_LJR_PV="${PV}"
-
-case "${PV}" in
-0.13*)
-	BITCOINCORE_MINOR=$(get_version_component_range 2)
-	IUSE="${IUSE} libressl"
-	OPENSSL_DEPEND="!libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl )"
-	if in_bcc_iuse libevent; then
-		LIBEVENT_DEPEND="libevent? ( dev-libs/libevent )"
-	else
-		LIBEVENT_DEPEND="dev-libs/libevent"
-	fi
-	LIBSECP256K1_DEPEND="=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery]"
-	UNIVALUE_DEPEND="dev-libs/univalue"
-	BITCOINCORE_LJR_NAME=knots
-	if in_bcc_iuse ljr; then
-		BITCOINCORE_KNOTS_USE=ljr
-	fi
-	if in_bcc_policy spamfilter; then
-		REQUIRED_USE="${REQUIRED_USE} bitcoin_policy_spamfilter? ( ${BITCOINCORE_KNOTS_USE} )"
-	fi
-	;;
-9999*)
-	BITCOINCORE_MINOR=9999
-	BITCOINCORE_SERIES="9999"
-	LIBEVENT_DEPEND="dev-libs/libevent"
-	LIBSECP256K1_DEPEND=">dev-libs/libsecp256k1-0.0.0_pre20150422"
-	UNIVALUE_DEPEND="dev-libs/univalue"
-	;;
-*)
-	die "Unrecognised version"
-	;;
-esac
-
-[ -n "${BITCOINCORE_SERIES}" ] || BITCOINCORE_SERIES="0.${BITCOINCORE_MINOR}.x"
-
-LJR_PV() {
-	local testsfx=
-	if [ -n "${BITCOINCORE_LJR_PREV}" ]; then
-		if [ "$1" = "dir" ]; then
-			testsfx="/test/${BITCOINCORE_LJR_PREV}"
-		else
-			testsfx=".${BITCOINCORE_LJR_PREV}"
-		fi
-	fi
-	echo "${BITCOINCORE_LJR_PV}.${BITCOINCORE_LJR_NAME}${BITCOINCORE_LJR_DATE}${testsfx}"
-}
-LJR_PATCHDIR="${MyPN}-$(LJR_PV ljr).patches"
-LJR_PATCH() { echo "${WORKDIR}/${LJR_PATCHDIR}/${MyPN}-$(LJR_PV ljr).$@.patch"; }
-LJR_PATCH_DESC="http://luke.dashjr.org/programs/${MyPN}/files/${MyPN}d/luke-jr/${BITCOINCORE_SERIES}/$(LJR_PV ljr)/${MyPN}-$(LJR_PV ljr).desc.txt"
-if [ "$BITCOINCORE_MINOR" -ge 12 ]; then
-	LJR_PATCH_DESC="http://bitcoinknots.org/files/${BITCOINCORE_SERIES}/$(LJR_PV dir)/${MyPN}-$(LJR_PV).desc.html"
-fi
-
-HOMEPAGE="http://bitcoincore.org/"
-
-if [ -z "$BITCOINCORE_COMMITHASH" ]; then
-	EGIT_PROJECT='bitcoin'
-	EGIT_REPO_URI="https://github.com/bitcoin/bitcoin.git"
-else
-	SRC_URI="https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}${BITCOINCORE_SRC_SUFFIX}.tgz"
-	if [ -z "${BITCOINCORE_NO_SYSLIBS}" ]; then
-		SRC_URI="${SRC_URI} http://bitcoinknots.org/files/${BITCOINCORE_SERIES}/$(LJR_PV dir)/${LJR_PATCHDIR}.txz -> ${LJR_PATCHDIR}.tar.xz"
-	fi
-	if in_bcc_iuse addrindex; then
-		SRC_URI="${SRC_URI} addrindex? ( https://github.com/btcdrak/bitcoin/compare/${BITCOINCORE_ADDRINDEX_DIFF}.diff -> ${BITCOINCORE_ADDRINDEX_PATCHFILE} )"
-	fi
-	if in_bcc_iuse xt; then
-		BITCOINXT_PATCHFILE="${MyPN}xt-v${PV}.patch"
-		SRC_URI="${SRC_URI} xt? ( https://github.com/bitcoinxt/bitcoinxt/compare/${BITCOINCORE_XT_DIFF}.diff -> ${BITCOINXT_PATCHFILE} )"
-	fi
-	if in_bcc_policy rbf && [ -n "${BITCOINCORE_RBF_DIFF}" ]; then
-		SRC_URI="${SRC_URI} bitcoin_policy_rbf? ( https://github.com/petertodd/bitcoin/compare/${BITCOINCORE_RBF_DIFF}.diff -> ${BITCOINCORE_RBF_PATCHFILE} )"
-	fi
-	S="${WORKDIR}/${MyPN}-${BITCOINCORE_COMMITHASH}"
-fi
-
-bitcoincore_policy_iuse() {
-	local mypolicy iuse_def new_BITCOINCORE_IUSE=
-	for mypolicy in ${BITCOINCORE_POLICY_PATCHES}; do
-		if [[ "${mypolicy:0:1}" =~ ^[+-] ]]; then
-			iuse_def=${mypolicy:0:1}
-			mypolicy="${mypolicy:1}"
-		else
-			iuse_def=
-		fi
-		new_BITCOINCORE_IUSE="$new_BITCOINCORE_IUSE ${iuse_def}bitcoin_policy_${mypolicy}"
-	done
-	echo $new_BITCOINCORE_IUSE
-}
-IUSE="$IUSE $BITCOINCORE_IUSE $(bitcoincore_policy_iuse)"
-if in_bcc_policy rbf && in_bcc_iuse xt; then
-	REQUIRED_USE="${REQUIRED_USE} bitcoin_policy_rbf? ( !xt )"
-fi
-
-BITCOINCORE_COMMON_DEPEND="
-	${OPENSSL_DEPEND}
-"
-if ! has libevent ${BITCOINCORE_NO_DEPEND}; then
-	BITCOINCORE_COMMON_DEPEND="${BITCOINCORE_COMMON_DEPEND} ${LIBEVENT_DEPEND}"
-fi
-if [ "${BITCOINCORE_NEED_LIBSECP256K1}" = "1" ]; then
-	BITCOINCORE_COMMON_DEPEND="${BITCOINCORE_COMMON_DEPEND} $LIBSECP256K1_DEPEND"
-fi
-if [ "${PN}" = "libbitcoinconsensus" ]; then
-	DEPEND="$DEPEND ${BITCOINCORE_COMMON_DEPEND}
-		test? (
-			${UNIVALUE_DEPEND}
-			>=dev-libs/boost-1.52.0[threads(+)]
-		)
-	"
-else
-	BITCOINCORE_COMMON_DEPEND="${BITCOINCORE_COMMON_DEPEND}
-		${UNIVALUE_DEPEND}
-		>=dev-libs/boost-1.52.0[threads(+)]
-	"
-fi
-bitcoincore_common_depend_use() {
-	in_bcc_iuse "$1" || return
-	BITCOINCORE_COMMON_DEPEND="${BITCOINCORE_COMMON_DEPEND} $1? ( $2 )"
-}
-bitcoincore_common_depend_use upnp net-libs/miniupnpc
-bitcoincore_common_depend_use wallet "${WALLET_DEPEND}"
-bitcoincore_common_depend_use zeromq net-libs/zeromq
-RDEPEND="${RDEPEND} ${BITCOINCORE_COMMON_DEPEND}"
-DEPEND="${DEPEND} ${BITCOINCORE_COMMON_DEPEND}
-	>=app-shells/bash-4.1
-	sys-apps/sed
-"
-if [ "${BITCOINCORE_NEED_LEVELDB}" = "1" ]; then
-	RDEPEND="${RDEPEND} virtual/bitcoin-leveldb"
-fi
-if in_bcc_iuse ${BITCOINCORE_KNOTS_USE}; then
-	if [ "${BITCOINCORE_LJR_NAME}" = "knots" ]; then
-		DEPEND="${DEPEND} ${BITCOINCORE_KNOTS_USE}? ( dev-lang/perl )"
-	fi
-fi
-
-bitcoincore_policymsg() {
-	local USEFlag="bitcoin_policy_$1"
-	in_iuse "${USEFlag}" || return
-	if use "${USEFlag}"; then
-		[ -n "$2" ] && einfo "$2"
-	else
-		[ -n "$3" ] && einfo "$3"
-	fi
-	bitcoincore_policymsg_flag=true
-}
-
-bitcoincore_pkg_pretend() {
-	bitcoincore_policymsg_flag=false
-	if use_if_iuse ${BITCOINCORE_KNOTS_USE} || use_if_iuse 1stclassmsg || use_if_iuse addrindex || use_if_iuse xt || { use_if_iuse zeromq && [ "${BITCOINCORE_MINOR}" -lt 12 ]; }; then
-		einfo "Extra functionality improvements to Bitcoin Core are enabled."
-		bitcoincore_policymsg_flag=true
-		if use_if_iuse addrindex addrindex; then
-			einfo "Please be aware that the addrindex functionality is known to be unreliable."
-		fi
-	fi
-	bitcoincore_policymsg cltv \
-		"CLTV policy is enabled: Your node will recognise and assist OP_CHECKLOCKTIMEVERIFY (BIP65) transactions." \
-		"CLTV policy is disabled: Your node will not recognise OP_CHECKLOCKTIMEVERIFY (BIP65) transactions."
-	bitcoincore_policymsg cpfp \
-		"CPFP policy is enabled: If you mine, you will give consideration to child transaction fees to pay for their parents." \
-		"CPFP policy is disabled: If you mine, you will ignore transactions unless they have sufficient fee themselves, even if child transactions offer a fee to cover their cost."
-	bitcoincore_policymsg dcmp \
-		"Data Carrier Multi-Push policy is enabled: Your node will assist transactions with at most a single multiple-'push' data carrier output." \
-		"Data Carrier Multi-Push policy is disabled: Your node will assist transactions with at most a single data carrier output with only a single 'push'."
-	bitcoincore_policymsg rbf \
-		"Replace By Fee policy is enabled: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order." \
-		"Replace By Fee policy is disabled: Your node will only accept the first transaction seen consuming a conflicting input, regardless of fee offered by later ones."
-	bitcoincore_policymsg spamfilter \
-		"Enhanced spam filter policy is enabled: Your node will identify notorious spam scripts and avoid assisting them. This may impact your ability to use some services (see link for a list)." \
-		"Enhanced spam filter policy is disabled: Your node will not be checking for notorious spam scripts, and may assist them."
-	$bitcoincore_policymsg_flag && einfo "For more information on any of the above, see ${LJR_PATCH_DESC}"
-}
-
-bitcoincore_predelete_patch() {
-	local patchfile="$1"
-	mkdir -p "${WORKDIR}/pdp"
-	local tmpfile="${WORKDIR}/pdp/${patchfile##*/}"
-	perl -ne '
-		newline:
-		if (m[(^diff .* b/(.*)$)]) {
-			$a = "$1\n";
-			$f = $2;
-			$_ = <>;
-			if (m[^deleted file]) {
-				unlink($f) || die;
-				while (!m[^diff ]) {
-					$_ = <>
-				}
-				goto newline
-			} else {
-				print($a)
-			}
-		}
-		print
-	' <"${patchfile}" >"${tmpfile}" || die
-	epatch "${tmpfile}"
-}
-
-bitcoincore_prepare() {
-	local mypolicy
-	if [ -n "${BITCOINCORE_NO_SYSLIBS}" ]; then
-		true
-	elif [ "${PV}" = "9999" ]; then
-		epatch "${FILESDIR}/${PV}-syslibs.patch"
-	else
-		epatch "$(LJR_PATCH syslibs)"
-	fi
-	if use_if_iuse ${BITCOINCORE_KNOTS_USE}; then
-		if [ "${BITCOINCORE_LJR_NAME}" = "knots" ]; then
-			bitcoincore_predelete_patch "$(LJR_PATCH f)"
-			bitcoincore_predelete_patch "$(LJR_PATCH branding)"
-			epatch "$(LJR_PATCH ts)"
-		else
-			epatch "$(LJR_PATCH ljrF)"
-		fi
-	fi
-	if use_if_iuse 1stclassmsg; then
-		epatch "$(LJR_PATCH 1stclassmsg)"
-	fi
-	if use_if_iuse addrindex; then
-		epatch "${DISTDIR}/${BITCOINCORE_ADDRINDEX_PATCHFILE}"
-	fi
-	if use_if_iuse xt; then
-		epatch "${DISTDIR}/${BITCOINXT_PATCHFILE}"
-	fi
-	{ use_if_iuse zeromq && [ "${BITCOINCORE_MINOR}" -lt 12 ]; } && epatch "$(LJR_PATCH zeromq)"
-	for mypolicy in ${BITCOINCORE_POLICY_PATCHES}; do
-		mypolicy="${mypolicy#[-+]}"
-
-		if [ "${BITCOINCORE_MINOR}" -ge 12 ]; then
-			case "${mypolicy}" in
-			rbf)
-				use bitcoin_policy_rbf || sed -i 's/\(DEFAULT_ENABLE_REPLACEMENT = \)true/\1false/' src/main.h
-				;;
-			spamfilter)
-				use bitcoin_policy_spamfilter || sed -i 's/\(DEFAULT_SPAMFILTER = \)true/\1false/' src/main.h
-				;;
-			*)
-				die "Unknown policy ${mypolicy}"
-			esac
-			continue
-		fi
-
-		use bitcoin_policy_${mypolicy} || continue
-		case "${mypolicy}" in
-		rbf)
-			if [ -n "${BITCOINCORE_RBF_PATCHFILE}" ]; then
-				epatch "${DISTDIR}/${BITCOINCORE_RBF_PATCHFILE}"
-			else
-				epatch "$(LJR_PATCH ${mypolicy})"
-			fi
-			;;
-		*)
-			epatch "$(LJR_PATCH ${mypolicy})"
-			;;
-		esac
-	done
-
-	echo '#!/bin/true' >share/genbuild.sh
-	mkdir -p src/obj
-	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h
-}
-
-bitcoincore_autoreconf() {
-	eautoreconf
-	rm -r src/leveldb || die
-	rm -r src/secp256k1 || die
-}
-
-bitcoincore_src_prepare() {
-	 bitcoincore_prepare
-	 bitcoincore_autoreconf
-}
-
-bitcoincore_conf() {
-	local my_econf=
-	if use_if_iuse upnp; then
-		my_econf="${my_econf} --with-miniupnpc --enable-upnp-default"
-	else
-		my_econf="${my_econf} --without-miniupnpc --disable-upnp-default"
-	fi
-	if use_if_iuse test; then
-		my_econf="${my_econf} --enable-tests"
-	else
-		my_econf="${my_econf} --disable-tests"
-	fi
-	if use_if_iuse wallet; then
-		my_econf="${my_econf} --enable-wallet"
-	else
-		my_econf="${my_econf} --disable-wallet"
-	fi
-	if ! use_if_iuse zeromq; then
-		# NOTE: Older (pre-0.12) patches would disable ZMQ if --enable-zmq was passed
-		my_econf="${my_econf} --disable-zmq"
-	fi
-	if [ -z "${BITCOINCORE_NO_SYSLIBS}" ]; then
-		my_econf="${my_econf} --disable-util-cli --disable-util-tx"
-	else
-		my_econf="${my_econf} --without-utils"
-	fi
-	# Knots 0.12.0 errors if --with-libevent used for bitcoin{d,-cli}, so only disable it when not wanted
-	if has libevent ${BITCOINCORE_NO_DEPEND} || { in_bcc_iuse libevent && ! use libevent; }; then
-		my_econf="${my_econf} --without-libevent"
-	fi
-	if [ "${BITCOINCORE_NEED_LEVELDB}" = "1" ]; then
-		# Passing --with-system-leveldb fails if leveldb is not installed, so only use it for targets that use LevelDB
-		my_econf="${my_econf} --with-system-leveldb"
-	fi
-	econf \
-		--disable-bench  \
-		--disable-ccache \
-		--disable-static \
-		--with-system-libsecp256k1  \
-		--with-system-univalue  \
-		--without-libs    \
-		--without-daemon  \
-		--without-gui     \
-		${my_econf}  \
-		"$@"
-}
-
-bitcoincore_src_test() {
-	emake check
-}
-
-bitcoincore_src_install() {
-	default
-	[ "${PN}" = "libbitcoinconsensus" ] || rm "${D}/usr/bin/test_bitcoin"
-}
-
-_BITCOINCORE_ECLASS=1
-fi

sdk_container/src/third_party/portage-stable/eclass/bzr.eclass

@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 #
 # @ECLASS: bzr.eclass
 # @MAINTAINER:
-# No maintainer <maintainer-needed@gentoo.org>
+# Ulrich Müller <ulm@gentoo.org>
 # @AUTHOR:
 # Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
 # Mark Lee <bzr-gentoo-overlay@lazymalevolence.com>
@@ -11,28 +11,28 @@
 # Christian Faulhammer <fauli@gentoo.org>
 # @BLURB: generic fetching functions for the Bazaar VCS
 # @DESCRIPTION:
-# The bzr.eclass provides functions to fetch, unpack, patch, and
+# The bzr.eclass provides functions to fetch and unpack sources from
-# bootstrap sources from repositories of the Bazaar distributed version
+# repositories of the Bazaar distributed version control system.
-# control system.  The eclass was originally derived from git.eclass.
+# The eclass was originally derived from git.eclass.
 #
 # Note: Just set EBZR_REPO_URI to the URI of the branch and src_unpack()
 # of this eclass will export the branch to ${WORKDIR}/${P}.
 
-inherit eutils
-
 EBZR="bzr.eclass"
 
-case "${EAPI:-0}" in
+if [[ ${EBZR_REPO_URI%%:*} = sftp ]]; then
-	0|1) EXPORT_FUNCTIONS src_unpack ;;
+	DEPEND=">=dev-vcs/bzr-2.6.0[sftp]"
-	*)   EXPORT_FUNCTIONS src_unpack src_prepare ;;
+else
+	DEPEND=">=dev-vcs/bzr-2.6.0"
+fi
+
+case ${EAPI:-0} in
+	2|3|4|5|6) ;;
+	7) BDEPEND="${DEPEND}"; DEPEND="" ;;
+	*) die "${EBZR}: EAPI ${EAPI:-0} is not supported" ;;
 esac
 
-DEPEND=">=dev-vcs/bzr-2.0.1"
+EXPORT_FUNCTIONS src_unpack
-case "${EAPI:-0}" in
-	0|1) ;;
-	*) [[ ${EBZR_REPO_URI%%:*} = sftp ]] \
-		&& DEPEND=">=dev-vcs/bzr-2.0.1[sftp]" ;;
-esac
 
 # @ECLASS-VARIABLE: EBZR_STORE_DIR
 # @DESCRIPTION:
@@ -57,7 +57,7 @@ esac
 # @ECLASS-VARIABLE: EBZR_UPDATE_CMD
 # @DESCRIPTION:
 # The Bazaar command to update the sources.
-: ${EBZR_UPDATE_CMD:="bzr pull"}
+: ${EBZR_UPDATE_CMD:="bzr pull --overwrite-tags"}
 
 # @ECLASS-VARIABLE: EBZR_EXPORT_CMD
 # @DESCRIPTION:
@@ -85,9 +85,8 @@ esac
 # @DESCRIPTION:
 # The repository URI for the source package.
 #
-# Note: If the ebuild uses an sftp:// URI, then in EAPI 0 or 1 it must
+# Note: If the ebuild uses an sftp:// URI, then the eclass will depend
-# make sure that dev-vcs/bzr was built with USE="sftp".  In EAPI 2 or
+# on dev-vcs/bzr[sftp].
-# later, the eclass will depend on dev-vcs/bzr[sftp].
 
 # @ECLASS-VARIABLE: EBZR_INITIAL_URI
 # @DEFAULT_UNSET
@@ -100,21 +99,6 @@ esac
 #
 # Normally, this variable needs not be set.
 
-# @ECLASS-VARIABLE: EBZR_BOOTSTRAP
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Bootstrap script or command like autogen.sh or etc.
-
-# @ECLASS-VARIABLE: EBZR_PATCHES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# bzr.eclass can apply patches in bzr_bootstrap().  You can use regular
-# expressions in this variable like *.diff or *.patch and the like.
-# Note: These patches will be applied before EBZR_BOOTSTRAP is processed.
-#
-# Patches are searched both in ${PWD} and ${FILESDIR}.  If not found in
-# either location, the installation dies.
-
 # @ECLASS-VARIABLE: EBZR_PROJECT
 # @DESCRIPTION:
 # The project name of your ebuild.  Normally, the branch will be stored
@@ -276,65 +260,9 @@ bzr_fetch() {
 	popd > /dev/null
 }
 
-# @FUNCTION: bzr_bootstrap
-# @DESCRIPTION:
-# Apply patches in ${EBZR_PATCHES} and run ${EBZR_BOOTSTRAP} if specified.
-bzr_bootstrap() {
-	local patch lpatch
-
-	pushd "${S}" > /dev/null || die "${EBZR}: can't chdir to ${S}"
-
-	if [[ -n ${EBZR_PATCHES} ]] ; then
-		einfo "apply patches -->"
-
-		for patch in ${EBZR_PATCHES} ; do
-			if [[ -f ${patch} ]] ; then
-				epatch "${patch}"
-			else
-				# This loop takes care of wildcarded patches given via
-				# EBZR_PATCHES in an ebuild
-				for lpatch in "${FILESDIR}"/${patch} ; do
-					if [[ -f ${lpatch} ]] ; then
-						epatch "${lpatch}"
-					else
-						die "${EBZR}: ${patch} is not found"
-					fi
-				done
-			fi
-		done
-	fi
-
-	if [[ -n ${EBZR_BOOTSTRAP} ]] ; then
-		einfo "begin bootstrap -->"
-
-		if [[ -f ${EBZR_BOOTSTRAP} ]] && [[ -x ${EBZR_BOOTSTRAP} ]] ; then
-			einfo "   bootstrap with a file: ${EBZR_BOOTSTRAP}"
-			"./${EBZR_BOOTSTRAP}" \
-				|| die "${EBZR}: can't execute EBZR_BOOTSTRAP"
-		else
-			einfo "   bootstrap with commands: ${EBZR_BOOTSTRAP}"
-			"${EBZR_BOOTSTRAP}" \
-				|| die "${EBZR}: can't eval EBZR_BOOTSTRAP"
-		fi
-	fi
-
-	popd > /dev/null
-}
-
 # @FUNCTION: bzr_src_unpack
 # @DESCRIPTION:
-# Default src_unpack(), calls bzr_fetch.  For EAPIs 0 and 1, also calls
+# Default src_unpack(), calls bzr_fetch.
-# bzr_src_prepare.
 bzr_src_unpack() {
 	bzr_fetch
-	case "${EAPI:-0}" in
-		0|1) bzr_src_prepare ;;
-	esac
-}
-
-# @FUNCTION: bzr_src_prepare
-# @DESCRIPTION:
-# Default src_prepare(), calls bzr_bootstrap.
-bzr_src_prepare() {
-	bzr_bootstrap
 }

sdk_container/src/third_party/portage-stable/eclass/cargo.eclass

@@ -16,6 +16,8 @@ case ${EAPI} in
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
+inherit multiprocessing
+
 EXPORT_FUNCTIONS src_unpack src_compile src_install
 
 IUSE="${IUSE} debug"
@@ -117,7 +119,7 @@ cargo_src_compile() {
 
 	export CARGO_HOME="${ECARGO_HOME}"
 
-	cargo build -v $(usex debug "" --release) \
+	cargo build -v -j $(makeopts_jobs) $(usex debug "" --release) \
 		|| die "cargo build failed"
 }
 
@@ -127,7 +129,7 @@ cargo_src_compile() {
 cargo_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	cargo install --root="${D}/usr" $(usex debug --debug "") \
+	cargo install -j $(makeopts_jobs) --root="${D}/usr" $(usex debug --debug "") \
 		|| die "cargo install failed"
 	rm -f "${D}/usr/.crates.toml"
 

sdk_container/src/third_party/portage-stable/eclass/cdrom.eclass

@@ -71,7 +71,12 @@ fi
 # eclass, see that function's description.
 cdrom_get_cds() {
 	unset CDROM_SET
-	export CDROM_CURRENT_CD=0 CDROM_CHECKS=( "${@}" )
+	export CDROM_CURRENT_CD=0
+    export CDROM_NUM_CDS="${#}"
+    local i
+    for i in $(seq ${#}); do
+        export CDROM_CHECK_${i}="${!i}"
+    done
 
 	# If the user has set CD_ROOT or CD_ROOT_1, don't bother informing
 	# them about which discs are needed as they presumably already know.
@@ -190,7 +195,8 @@ cdrom_load_next_cd() {
 		local i cdset
 		: CD_ROOT_${CDROM_CURRENT_CD}
 		export CDROM_ROOT=${CD_ROOT:-${!_}}
-		IFS=: read -r -a cdset -d "" <<< "${CDROM_CHECKS[$((${CDROM_CURRENT_CD} - 1))]}"
+		local var="CDROM_CHECK_${CDROM_CURRENT_CD}"
+		IFS=: read -r -a cdset -d "" <<< "${!var}"
 
 		for i in $(seq ${CDROM_SET:-0} ${CDROM_SET:-$((${#cdset[@]} - 1))}); do
 			local f=${cdset[${i}]} point= node= fs= opts=
@@ -222,7 +228,7 @@ cdrom_load_next_cd() {
 		fi
 
 		if [[ ${showedmsg} -eq 0 ]] ; then
-			if [[ ${#CDROM_CHECKS[@]} -eq 1 ]] ; then
+			if [[ ${CDROM_NUM_CDS} -eq 1 ]] ; then
 				einfo "Please insert+mount the ${CDROM_NAME:-CD for ${PN}} now !"
 			else
 				local var="CDROM_NAME_${CDROM_CURRENT_CD}"

sdk_container/src/third_party/portage-stable/eclass/check-reqs.eclass

@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: check-reqs.eclass
@@ -39,8 +39,6 @@
 
 if [[ ! ${_CHECK_REQS_ECLASS_} ]]; then
 
-inherit eutils
-
 # @ECLASS-VARIABLE: CHECKREQS_MEMORY
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -68,22 +66,11 @@ case "${EAPI:-0}" in
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
-# @FUNCTION: check_reqs
-# @DESCRIPTION:
 # Obsolete function executing all the checks and printing out results
 check_reqs() {
-	debug-print-function ${FUNCNAME} "$@"
+	eerror "Package calling old ${FUNCNAME} function."
-
+	eerror "It should call check-reqs_pkg_pretend and check-reqs_pkg_setup."
-	[[ ${EAPI:-0} == [012345] ]] || die "${FUNCNAME} is banned in EAPI > 5"
+	die "${FUNCNAME} is banned"
-
-	echo
-	eqawarn "Package calling old ${FUNCNAME} function."
-	eqawarn "Please file a bug against the package."
-	eqawarn "It should call check-reqs_pkg_pretend and check-reqs_pkg_setup"
-	eqawarn "and possibly use EAPI=4 or later."
-	echo
-
-	check-reqs_pkg_setup "$@"
 }
 
 # @FUNCTION: check-reqs_pkg_setup
@@ -176,10 +163,9 @@ check-reqs_get_kibibytes() {
 	local size=${1%[GMT]}
 
 	case ${unit} in
-		G) echo $((1024 * 1024 * size)) ;;
 		M) echo $((1024 * size)) ;;
+		G) echo $((1024 * 1024 * size)) ;;
 		T) echo $((1024 * 1024 * 1024 * size)) ;;
-		[0-9]) echo $((1024 * size)) ;;
 		*)
 			die "${FUNCNAME}: Unknown unit: ${unit}"
 		;;
@@ -196,17 +182,8 @@ check-reqs_get_number() {
 
 	[[ -z ${1} ]] && die "Usage: ${FUNCNAME} [size]"
 
-	local unit=${1:(-1)}
 	local size=${1%[GMT]}
-	local msg=eerror
+	[[ ${size} == ${1} ]] && die "${FUNCNAME}: Missing unit: ${1}"
-	[[ ${EAPI:-0} == [012345] ]] && msg=eqawarn
-
-	# Check for unset units and warn about them.
-	# Backcompat.
-	if [[ ${size} == ${1} ]]; then
-		${msg} "Package does not specify unit for the size check"
-		${msg} "File bug against the package. It should specify the unit."
-	fi
 
 	echo ${size}
 }
@@ -224,8 +201,8 @@ check-reqs_get_unit() {
 	local unit=${1:(-1)}
 
 	case ${unit} in
+		M) echo "MiB" ;;
 		G) echo "GiB" ;;
-		[M0-9]) echo "MiB" ;;
 		T) echo "TiB" ;;
 		*)
 			die "${FUNCNAME}: Unknown unit: ${unit}"

sdk_container/src/third_party/portage-stable/eclass/chromium-2.eclass

@@ -71,15 +71,13 @@ chromium_remove_language_paks() {
 	# Look for missing pak files.
 	for lang in ${CHROMIUM_LANGS}; do
 		if [[ ! -e ${lang}.pak ]]; then
-			# https://bugs.gentoo.org/583762
+			eqawarn "L10N warning: no .pak file for ${lang} (${lang}.pak not found)"
-			if [[ ${lang} != sr-ME || ! -e me.pak  ]]; then
-				eqawarn "L10N warning: no .pak file for ${lang} (${lang}.pak not found)"
-			fi
 		fi
 	done
 
 	# Bug 588198
 	rm -f fake-bidi.pak || die
+	rm -f fake-bidi.pak.info || die
 
 	# Look for extra pak files.
 	# Remove pak files that the user does not want.
@@ -90,22 +88,14 @@ chromium_remove_language_paks() {
 			continue
 		fi
 
-		# https://bugs.gentoo.org/583762
-		if [[ ${lang} == me ]]; then
-			if ! has sr-ME ${CHROMIUM_LANGS}; then
-				eqawarn "L10N warning: no sr-ME in LANGS"
-			elif ! use l10n_sr-ME; then
-				rm "${pak}" || die
-			fi
-			continue
-		fi
-
 		if ! has ${lang} ${CHROMIUM_LANGS}; then
 			eqawarn "L10N warning: no ${lang} in LANGS"
 			continue
 		fi
+
 		if ! use l10n_${lang}; then
 			rm "${pak}" || die
+			rm -f "${pak}.info" || die
 		fi
 	done
 }

sdk_container/src/third_party/portage-stable/eclass/cmake-utils.eclass

@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: cmake-utils.eclass
@@ -9,6 +9,7 @@
 # Maciej Mrozowski <reavertm@gentoo.org>
 # (undisclosed contributors)
 # Original author: Zephyrus (zephyrus@mirach.it)
+# @SUPPORTED_EAPIS: 5 6
 # @BLURB: common ebuild functions for cmake-based packages
 # @DESCRIPTION:
 # The cmake-utils eclass makes creating ebuilds for cmake-based packages much easier.
@@ -44,6 +45,7 @@ _CMAKE_UTILS_ECLASS=1
 : ${CMAKE_BUILD_TYPE:=Gentoo}
 
 # @ECLASS-VARIABLE: CMAKE_IN_SOURCE_BUILD
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Set to enable in-source build.
 
@@ -56,7 +58,7 @@ _CMAKE_UTILS_ECLASS=1
 # @ECLASS-VARIABLE: CMAKE_MIN_VERSION
 # @DESCRIPTION:
 # Specify the minimum required CMake version.
-: ${CMAKE_MIN_VERSION:=3.7.2}
+: ${CMAKE_MIN_VERSION:=3.9.6}
 
 # @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES
 # @DESCRIPTION:
@@ -88,12 +90,14 @@ _CMAKE_UTILS_ECLASS=1
 # "no" to disable (default) or anything else to enable.
 
 # @ECLASS-VARIABLE: CMAKE_EXTRA_CACHE_FILE
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Specifies an extra cache file to pass to cmake. This is the analog of EXTRA_ECONF
 # for econf and is needed to pass TRY_RUN results when cross-compiling.
 # Should be set by user in a per-package basis in /etc/portage/package.env.
 
 # @ECLASS-VARIABLE: CMAKE_UTILS_QA_SRC_DIR_READONLY
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # After running cmake-utils_src_prepare, sets ${S} to read-only. This is
 # a user flag and should under _no circumstances_ be set in the ebuild.
@@ -105,8 +109,12 @@ case ${EAPI} in
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
-inherit toolchain-funcs multilib ninja-utils flag-o-matic eutils \
+inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing xdg-utils
-	multiprocessing versionator
+
+case ${EAPI} in
+	7) ;;
+	*) inherit eapi7-ver eutils multilib ;;
+esac
 
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
 
@@ -487,7 +495,7 @@ cmake-utils_src_configure() {
 	_cmake_check_build_dir
 
 	# Fix xdg collision with sandbox
-	local -x XDG_CONFIG_HOME="${T}"
+	xdg_environment_reset
 
 	# @SEE CMAKE_BUILD_TYPE
 	if [[ ${CMAKE_BUILD_TYPE} = Gentoo ]]; then
@@ -504,7 +512,7 @@ cmake-utils_src_configure() {
 	# we need to add "<INCLUDES>"
 	local includes=
 	if [[ ${PN} == cmake ]] ; then
-		if $(version_is_at_least 3.4.0 $(get_version_component_range 1-3 ${PV})) ; then
+		if $(ver_test $(ver_cut 1-3 ${PV}) -ge 3.4.0) ; then
 			includes="<INCLUDES>"
 		fi
 	elif ROOT=/ has_version \>=dev-util/cmake-3.4.0_rc1 ; then
@@ -512,6 +520,8 @@ cmake-utils_src_configure() {
 	fi
 	cat > "${build_rules}" <<- _EOF_ || die
 		SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
+		SET (CMAKE_ASM-ATT_COMPILE_OBJECT "<CMAKE_ASM-ATT_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c -x assembler <SOURCE>" CACHE STRING "ASM-ATT compile command" FORCE)
+		SET (CMAKE_ASM-ATT_LINK_FLAGS "-nostdlib" CACHE STRING "ASM-ATT link flags" FORCE)
 		SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
 		SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
 		SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> ${includes} ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE)
@@ -527,6 +537,7 @@ cmake-utils_src_configure() {
 	local toolchain_file=${BUILD_DIR}/gentoo_toolchain.cmake
 	cat > ${toolchain_file} <<- _EOF_ || die
 		SET (CMAKE_ASM_COMPILER "${myCC/ /;}")
+		SET (CMAKE_ASM-ATT_COMPILER "${myCC/ /;}")
 		SET (CMAKE_C_COMPILER "${myCC/ /;}")
 		SET (CMAKE_CXX_COMPILER "${myCXX/ /;}")
 		SET (CMAKE_Fortran_COMPILER "${myFC/ /;}")
@@ -562,10 +573,10 @@ cmake-utils_src_configure() {
 			# When cross-compiling with a sysroot (e.g. with crossdev's emerge wrappers)
 			# we need to tell cmake to use libs/headers from the sysroot but programs from / only.
 			cat >> "${toolchain_file}" <<- _EOF_ || die
-				set(CMAKE_FIND_ROOT_PATH "${SYSROOT}")
+				SET (CMAKE_FIND_ROOT_PATH "${SYSROOT}")
-				set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+				SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-				set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+				SET (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-				set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+				SET (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 			_EOF_
 		fi
 	fi
@@ -581,13 +592,11 @@ cmake-utils_src_configure() {
 
 			ELSE ()
 
-			SET(CMAKE_PREFIX_PATH "${EPREFIX}/usr" CACHE STRING "" FORCE)
+			SET (CMAKE_PREFIX_PATH "${EPREFIX}/usr" CACHE STRING "" FORCE)
-			SET(CMAKE_SKIP_BUILD_RPATH OFF CACHE BOOL "" FORCE)
+			SET (CMAKE_MACOSX_RPATH ON CACHE BOOL "" FORCE)
-			SET(CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
+			SET (CMAKE_SKIP_BUILD_RPATH OFF CACHE BOOL "" FORCE)
-			SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE CACHE BOOL "")
+			SET (CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
-			SET(CMAKE_INSTALL_RPATH "${EPREFIX}/usr/lib;${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)" CACHE STRING "" FORCE)
+			SET (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "" FORCE)
-			SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "" FORCE)
-			SET(CMAKE_INSTALL_NAME_DIR "${EPREFIX}/usr/lib" CACHE STRING "" FORCE)
 
 			ENDIF (NOT APPLE)
 		_EOF_
@@ -600,13 +609,22 @@ cmake-utils_src_configure() {
 		SET (CMAKE_GENTOO_BUILD ON CACHE BOOL "Indicate Gentoo package build")
 		SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE)
 		SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries")
+		SET (CMAKE_INSTALL_INFODIR "${EPREFIX}/usr/share/info" CACHE PATH "")
+		SET (CMAKE_INSTALL_MANDIR "${EPREFIX}/usr/share/man" CACHE PATH "")
 	_EOF_
 	[[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}"
 
+	if [[ ${EAPI} != [56] ]]; then
+		cat >> "${common_config}" <<- _EOF_ || die
+			SET (CMAKE_INSTALL_DOCDIR "${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "")
+		_EOF_
+	fi
+
 	# Wipe the default optimization flags out of CMake
 	if [[ ${CMAKE_BUILD_TYPE} != Gentoo && ${EAPI} != 5 ]]; then
 		cat >> ${common_config} <<- _EOF_ || die
 			SET (CMAKE_ASM_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			SET (CMAKE_ASM-ATT_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
 			SET (CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
 			SET (CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
 			SET (CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
@@ -641,7 +659,7 @@ cmake-utils_src_configure() {
 	fi
 
 	# Common configure parameters (overridable)
-	# NOTE CMAKE_BUILD_TYPE can be only overriden via CMAKE_BUILD_TYPE eclass variable
+	# NOTE CMAKE_BUILD_TYPE can be only overridden via CMAKE_BUILD_TYPE eclass variable
 	# No -DCMAKE_BUILD_TYPE=xxx definitions will be in effect.
 	local cmakeargs=(
 		${warn_unused_cli}

sdk_container/src/third_party/portage-stable/eclass/common-lisp-3.eclass

@@ -14,7 +14,7 @@ inherit eutils
 # @ECLASS-VARIABLE: CLIMPLEMENTATIONS
 # @DESCRIPTION:
 # Common Lisp implementations
-CLIMPLEMENTATIONS="sbcl clisp clozurecl cmucl ecls gcl"
+CLIMPLEMENTATIONS="sbcl clisp clozurecl cmucl ecls gcl abcl"
 
 # @ECLASS-VARIABLE: CLSOURCEROOT
 # @DESCRIPTION:
@@ -194,6 +194,11 @@ common-lisp-export-impl-args() {
 	fi
 	CL_BINARY="${1}"
 	case "${CL_BINARY}" in
+		sbcl)
+			CL_NORC="--sysinit /dev/null --userinit /dev/null"
+			CL_LOAD="--load"
+			CL_EVAL="--eval"
+			;;
 		clisp)
 			CL_NORC="-norc"
 			CL_LOAD="-i"
@@ -216,8 +221,8 @@ common-lisp-export-impl-args() {
 			CL_LOAD="-load"
 			CL_EVAL="-eval"
 			;;
-		sbcl)
+		abcl)
-			CL_NORC="--sysinit /dev/null --userinit /dev/null"
+			CL_NORC="--noinit"
 			CL_LOAD="--load"
 			CL_EVAL="--eval"
 			;;

sdk_container/src/third_party/portage-stable/eclass/common-lisp-common.eclass

@@ -1,211 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: common-lisp-common.eclass
-# @MAINTAINER:
-# Common Lisp project <common-lisp@gentoo.org>
-# @AUTHOR: Matthew Kennedy <mkennedy@gentoo.org>
-# @BLURB: eclass for installing Common Lisp packages.
-# @DESCRIPTION:
-# Sundry code common to many Common Lisp related ebuilds.
-
-inherit eutils multilib
-
-# Some handy constants
-CLFASLROOT=/usr/$(get_libdir)/common-lisp/
-CLSOURCEROOT=/usr/share/common-lisp/source/
-CLSYSTEMROOT=/usr/share/common-lisp/systems/
-
-# Many of our Common Lisp ebuilds are either inspired by, or actually
-# use packages and files from the Debian project's archives.
-
-do-debian-credits() {
-	docinto debian
-	for i in copyright README.Debian changelog; do
-		# be silent, since all files are not always present
-		dodoc "${S}"/debian/${i} &>/dev/null || true
-	done
-	docinto .
-}
-
-# Most of the code below is from Debian's Common Lisp Controller
-# package
-
-register-common-lisp-implementation() {
-	PROGNAME=$(basename $0)
-	# first check if there is at least a compiler-name:
-	if [ -z "$1"  ] ; then
-		cat <<EOF
-usage: $PROGNAME compiler-name
-
-registers a Common Lisp compiler to the
-Common-Lisp-Controller system.
-EOF
-		exit 1
-	fi
-	IMPL=$1
-	FILE="/usr/$(get_libdir)/common-lisp/bin/$IMPL.sh"
-	if [ ! -f "$FILE" ] ; then
-		cat <<EOF
-$PROGNAME: I cannot find the script $FILE for the implementation $IMPL
-EOF
-		exit 2
-	fi
-	if [ ! -r "$FILE" ] ; then
-		cat <<EOF
-$PROGNAME: I cannot read the script $FILE for the implementation $IMPL
-EOF
-		exit 2
-	fi
-	# install CLC into the lisp
-	sh "$FILE" install-clc || (echo "Installation of CLC failed" >&2 ; exit 3)
-	mkdir /usr/$(get_libdir)/common-lisp/$IMPL &>/dev/null || true
-	chown cl-builder:cl-builder /usr/$(get_libdir)/common-lisp/$IMPL
-
-	# now recompile the stuff
-	for i  in /usr/share/common-lisp/systems/*.asd	; do
-		if [ -f $i -a -r $i ] ; then
-			i=${i%.asd}
-			package=${i##*/}
-			clc-autobuild-check $IMPL $package
-			if [ $? = 0 ]; then
-				echo recompiling package $package for implementation $IMPL
-				/usr/bin/clc-send-command --quiet recompile $package $IMPL
-			fi
-		fi
-	done
-	for i  in /usr/share/common-lisp/systems/*.system  ; do
-		if [ -f $i -a -r $i ] ; then
-			i=${i%.system}
-			package=${i##*/}
-			clc-autobuild-check $IMPL $package
-			if [ $? = 0 ]; then
-				echo recompiling package $package for implementation $IMPL
-				/usr/bin/clc-send-command --quiet recompile $package $IMPL
-			fi
-		fi
-	done
-	echo "$PROGNAME: Compiler $IMPL installed"
-}
-
-unregister-common-lisp-implementation() {
-	PROGNAME=$(basename $0)
-	if [ `id -u` != 0 ] ; then
-		echo $PROGNAME: you need to be root to run this program
-		exit 1
-	fi
-	if [ -z "$1" ] ; then
-		cat <<EOF
-usage: $PROGNAME compiler-name
-
-un-registers a Common Lisp compiler to the
-Common-Lisp-Controller system.
-EOF
-		exit 1
-	fi
-	IMPL=$1
-	IMPL_BIN="/usr/$(get_libdir)/common-lisp/bin/$IMPL.sh"
-	if [ ! -f "$IMPL_BIN" ] ; then
-		cat <<EOF
-$PROGNAME: No implementation of the name $IMPL is registered
-Cannot find the file $IMPL_BIN
-
-Maybe you already removed it?
-EOF
-		exit 0
-	fi
-	if [ ! -r "$IMPL_BIN" ] ; then
-		cat <<EOF
-$PROGNAME: No implementation of the name $IMPL is registered
-Cannot read the file $IMPL_BIN
-
-Maybe you already removed it?
-EOF
-		exit 0
-	fi
-	# Uninstall the CLC
-	sh $IMPL_BIN remove-clc || echo "De-installation of CLC failed" >&2
-	clc-autobuild-impl $IMPL inherit
-	# Just remove the damn subtree
-	(cd / ; rm -rf "/usr/$(get_libdir)/common-lisp/$IMPL/" ; true )
-	echo "$PROGNAME: Common Lisp implementation $IMPL uninstalled"
-}
-
-reregister-all-common-lisp-implementations() {
-	# Rebuilds all common lisp implementations
-	# Written by Kevin Rosenberg <kmr@debian.org>
-	# GPL-2 license
-	local clc_bin_dir=/usr/$(get_libdir)/common-lisp/bin
-	local opt=$(shopt nullglob); shopt -s nullglob
-	cd $clc_bin_dir
-	for impl_bin in *.sh; do
-		impl=$(echo $impl_bin | sed 's/\(.*\).sh/\1/')
-		unregister-common-lisp-implementation $impl
-		register-common-lisp-implementation $impl
-	done
-	cd - >/dev/null
-	[[ $opt = *off ]] && shopt -u nullglob
-}
-
-# BIG FAT HACK: Since the Portage emerge step kills file timestamp
-# information, we need to compensate by ensuring all FASL files are
-# more recent than their source files.
-
-# The following `impl-*-timestamp-hack' functions SHOULD NOT be used
-# outside of this eclass.
-
-impl-save-timestamp-hack() {
-	local impl=$1
-	dodir /usr/share/${impl}
-	tar cpjf "${D}"/usr/share/${impl}/portage-timestamp-compensate -C "${D}"/usr/$(get_libdir)/${impl} .
-}
-
-impl-restore-timestamp-hack() {
-	local impl=$1
-	tar xjpfo /usr/share/${impl}/portage-timestamp-compensate -C /usr/$(get_libdir)/${impl}
-}
-
-impl-remove-timestamp-hack() {
-	local impl=$1
-	rm -rf /usr/$(get_libdir)/${impl} &>/dev/null || true
-}
-
-test-in() {
-	local symbol=$1
-	shift
-	for i in $@; do
-		if [ $i == ${symbol} ]; then
-			return 0			# true
-		fi
-	done
-	false
-}
-
-standard-impl-postinst() {
-	local impl=$1
-	rm -rf /usr/$(get_libdir)/common-lisp/${impl}/* &>/dev/null || true
-	chown cl-builder:cl-builder /usr/$(get_libdir)/common-lisp/${impl}
-	if test-in ${impl} cmucl sbcl; then
-		impl-restore-timestamp-hack ${impl}
-	fi
-	chown -R root:0 /usr/$(get_libdir)/${impl}
-	/usr/bin/clc-autobuild-impl ${impl} yes
-	register-common-lisp-implementation ${impl}
-}
-
-standard-impl-postrm() {
-	local impl=$1 impl_binary=$2
-	# Since we keep our own time stamps we must manually remove them
-	# here.
-	if [ ! -x ${impl_binary} ]; then
-		if test-in ${impl} cmucl sbcl; then
-			impl-remove-timestamp-hack ${impl}
-		fi
-		rm -rf /usr/$(get_libdir)/common-lisp/${impl}/*
-	fi
-}
-
-# Local Variables: ***
-# mode: shell-script ***
-# tab-width: 4 ***
-# End: ***

sdk_container/src/third_party/portage-stable/eclass/common-lisp.eclass

@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: common-lisp.eclass
-# @MAINTAINER:
-# Common Lisp project <common-lisp@gentoo.org>
-# @AUTHOR: Matthew Kennedy <mkennedy@gentoo.org>
-# @BLURB: eclass for installing Common Lisp packages.
-# @DESCRIPTION:
-# This eclass supports the common-lisp-controller installation of many
-# Common Lisp libraries
-
-inherit common-lisp-common
-
-CLPACKAGE=
-DEPEND="dev-lisp/common-lisp-controller"
-
-EXPORT_FUNCTIONS pkg_preinst pkg_postinst pkg_postrm
-
-common-lisp_pkg_postinst() {
-	if [ -z "${CLPACKAGE}" ]; then
-		die "CLPACKAGE was empty or undefined upon call to pkg_prerm"
-	else
-		for package in ${CLPACKAGE}; do
-			einfo "Registering Common Lisp source for ${package}"
-			register-common-lisp-source ${package}
-		done
-	fi
-}
-
-common-lisp_pkg_postrm() {
-	if [ -z "${CLPACKAGE}" ]; then
-		die "CLPACKAGE was empty or undefined upon call to pkg_prerm"
-	else
-		for package in ${CLPACKAGE}; do
-			if [ ! -d ${CLSOURCEROOT}/${package} ]; then
-				einfo "Unregistering Common Lisp source for ${package}"
-#				rm -rf ${CLFASLROOT}/*/${package}
-				unregister-common-lisp-source ${package}
-			fi
-		done
-	fi
-}
-
-#
-# In pkg_preinst, we remove the FASL files for the previous version of
-# the source.
-#
-common-lisp_pkg_preinst() {
-	if [ -z "${CLPACKAGE}" ]; then
-		die "CLPACKAGE was empty or undefined upon call to pkg_preinst"
-	else
-		for package in ${CLPACKAGE}; do
-			einfo "Removing FASL files for previous version of Common Lisp package ${package}"
-			rm -rf ${CLFASLROOT}/*/${package} || true
-		done
-	fi
-}
-
-common-lisp-install() {
-	insinto ${CLSOURCEROOT}/${CLPACKAGE}
-	doins $@
-}
-
-common-lisp-system-symlink() {
-	dodir ${CLSYSTEMROOT}/`dirname ${CLPACKAGE}`
-	if [ $# -eq 0 ]; then
-		dosym ${CLSOURCEROOT}/${CLPACKAGE}/${CLPACKAGE}.asd \
-			${CLSYSTEMROOT}/${CLPACKAGE}.asd
-	else
-		for package in "$@" ; do
-			dosym ${CLSOURCEROOT}/$CLPACKAGE/${package}.asd \
-				${CLSYSTEMROOT}/${package}.asd
-		done
-	fi
-}
-
-# Local Variables: ***
-# mode: shell-script ***
-# tab-width: 4 ***
-# End: ***

sdk_container/src/third_party/portage-stable/eclass/cron.eclass

@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: cron.eclass
@@ -155,6 +155,6 @@ cron_pkg_postinst() {
 
 	einfo "You may wish to read the Gentoo Linux Cron Guide, which can be"
 	einfo "found online at:"
-	einfo "    https://www.gentoo.org/doc/en/cron-guide.xml"
+	einfo "    https://wiki.gentoo.org/wiki/Cron"
 	echo
 }

sdk_container/src/third_party/portage-stable/eclass/db.eclass

@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: db.eclass
@@ -17,7 +17,8 @@ DEPEND="test? ( >=dev-lang/tcl-8.4 )"
 RDEPEND=""
 
 db_fix_so() {
-	LIB="${ROOT}/usr/$(get_libdir)"
+	has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}"
+	LIB="${EROOT}/usr/$(get_libdir)"
 
 	cd "${LIB}"
 
@@ -50,7 +51,7 @@ db_fix_so() {
 
 	# do the same for headers now
 	# but since there are only two of them, just overwrite them
-	cd "${ROOT}"/usr/include
+	cd "${EROOT}"/usr/include
 	target=`find . -maxdepth 1 -type d -name 'db[0-9]*' | sort -n |cut -d/ -f2- | tail -n1`
 	if [ -n "${target}" ] && [ -e "${target}/db.h" ] && ( ! [[ -e db.h ]] || [[ -h db.h ]] ); then
 		einfo "Creating db.h symlinks to ${target}"
@@ -67,19 +68,21 @@ db_fix_so() {
 }
 
 db_src_install_doc() {
+	has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}"
 	# not everybody wants this wad of documentation as it is primarily API docs
 	if use doc; then
 		dodir /usr/share/doc/${PF}/html
-		mv "${D}"/usr/docs/* "${D}"/usr/share/doc/${PF}/html/
+		mv "${ED}"/usr/docs/* "${ED}"/usr/share/doc/${PF}/html/
-		rm -rf "${D}"/usr/docs
+		rm -rf "${ED}"/usr/docs
 	else
-		rm -rf "${D}"/usr/docs
+		rm -rf "${ED}"/usr/docs
 	fi
 
 	db_src_install_examples
 }
 
 db_src_install_examples() {
+	has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}"
 	if use examples ; then
 		local langs="c cxx stl"
 		[[ "${IUSE/java}" != "${IUSE}" ]] \
@@ -90,15 +93,16 @@ db_src_install_examples() {
 			src="${S}/../examples_${i}/"
 			if [ -f "${src}" ]; then
 				dodir "${destdir}"
-				cp -ra "${src}" "${D}${destdir}/"
+				cp -ra "${src}" "${ED}${destdir}/"
 			fi
 		done
 	fi
 }
 
 db_src_install_usrbinslot() {
+	has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}"
 	# slot all program names to avoid overwriting
-	for fname in "${D}"/usr/bin/db*
+	for fname in "${ED}"/usr/bin/db*
 	do
 		dn="$(dirname "${fname}")"
 		bn="$(basename "${fname}")"
@@ -109,18 +113,20 @@ db_src_install_usrbinslot() {
 }
 
 db_src_install_headerslot() {
+	has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}"
 	# install all headers in a slotted location
 	dodir /usr/include/db${SLOT}
-	mv "${D}"/usr/include/*.h "${D}"/usr/include/db${SLOT}/
+	mv "${ED}"/usr/include/*.h "${ED}"/usr/include/db${SLOT}/
 }
 
 db_src_install_usrlibcleanup() {
-	LIB="${D}/usr/$(get_libdir)"
+	has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}"
+	LIB="${ED}/usr/$(get_libdir)"
 	# Clean out the symlinks so that they will not be recorded in the
 	# contents (bug #60732)
 
-	if [ "${D}" = "" ]; then
+	if [ "${ED}" = "" ]; then
-		die "Calling clean_links while \$D not defined"
+		die "Calling clean_links while \$ED not defined"
 	fi
 
 	if [ -e "${LIB}"/libdb.a ] && [ ! -e "${LIB}"/libdb-${SLOT}.a ]; then
@@ -139,7 +145,7 @@ db_src_install_usrlibcleanup() {
 	find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*a' -exec rm \{} \;
 
 	rm -f \
-		"${D}"/usr/include/{db,db_185}.h \
+		"${ED}"/usr/include/{db,db_185}.h \
 		"${LIB}"/libdb{,_{cxx,sql,stl,java,tcl}}.a
 }
 

sdk_container/src/third_party/portage-stable/eclass/desktop.eclass

@@ -0,0 +1,400 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: desktop.eclass
+# @MAINTAINER:
+# base-system@gentoo.org
+# @BLURB: support for desktop files, menus, and icons
+
+if [[ -z ${_DESKTOP_ECLASS} ]]; then
+_DESKTOP_ECLASS=1
+
+# @FUNCTION: make_desktop_entry
+# @USAGE: make_desktop_entry(<command>, [name], [icon], [type], [fields])
+# @DESCRIPTION:
+# Make a .desktop file.
+#
+# @CODE
+# binary:   what command does the app run with ?
+# name:     the name that will show up in the menu
+# icon:     the icon to use in the menu entry
+#           this can be relative (to /usr/share/pixmaps) or
+#           a full path to an icon
+# type:     what kind of application is this?
+#           for categories:
+#           https://specifications.freedesktop.org/menu-spec/latest/apa.html
+#           if unset, function tries to guess from package's category
+# fields:	extra fields to append to the desktop file; a printf string
+# @CODE
+make_desktop_entry() {
+	[[ -z $1 ]] && die "make_desktop_entry: You must specify the executable"
+
+	local exec=${1}
+	local name=${2:-${PN}}
+	local icon=${3:-${PN}}
+	local type=${4}
+	local fields=${5}
+
+	if [[ -z ${type} ]] ; then
+		local catmaj=${CATEGORY%%-*}
+		local catmin=${CATEGORY##*-}
+		case ${catmaj} in
+			app)
+				case ${catmin} in
+					accessibility) type="Utility;Accessibility";;
+					admin)         type=System;;
+					antivirus)     type=System;;
+					arch)          type="Utility;Archiving";;
+					backup)        type="Utility;Archiving";;
+					cdr)           type="AudioVideo;DiscBurning";;
+					dicts)         type="Office;Dictionary";;
+					doc)           type=Documentation;;
+					editors)       type="Utility;TextEditor";;
+					emacs)         type="Development;TextEditor";;
+					emulation)     type="System;Emulator";;
+					laptop)        type="Settings;HardwareSettings";;
+					office)        type=Office;;
+					pda)           type="Office;PDA";;
+					vim)           type="Development;TextEditor";;
+					xemacs)        type="Development;TextEditor";;
+				esac
+				;;
+
+			dev)
+				type="Development"
+				;;
+
+			games)
+				case ${catmin} in
+					action|fps) type=ActionGame;;
+					arcade)     type=ArcadeGame;;
+					board)      type=BoardGame;;
+					emulation)  type=Emulator;;
+					kids)       type=KidsGame;;
+					puzzle)     type=LogicGame;;
+					roguelike)  type=RolePlaying;;
+					rpg)        type=RolePlaying;;
+					simulation) type=Simulation;;
+					sports)     type=SportsGame;;
+					strategy)   type=StrategyGame;;
+				esac
+				type="Game;${type}"
+				;;
+
+			gnome)
+				type="Gnome;GTK"
+				;;
+
+			kde)
+				type="KDE;Qt"
+				;;
+
+			mail)
+				type="Network;Email"
+				;;
+
+			media)
+				case ${catmin} in
+					gfx)
+						type=Graphics
+						;;
+					*)
+						case ${catmin} in
+							radio) type=Tuner;;
+							sound) type=Audio;;
+							tv)    type=TV;;
+							video) type=Video;;
+						esac
+						type="AudioVideo;${type}"
+						;;
+				esac
+				;;
+
+			net)
+				case ${catmin} in
+					dialup) type=Dialup;;
+					ftp)    type=FileTransfer;;
+					im)     type=InstantMessaging;;
+					irc)    type=IRCClient;;
+					mail)   type=Email;;
+					news)   type=News;;
+					nntp)   type=News;;
+					p2p)    type=FileTransfer;;
+					voip)   type=Telephony;;
+				esac
+				type="Network;${type}"
+				;;
+
+			sci)
+				case ${catmin} in
+					astro*)  type=Astronomy;;
+					bio*)    type=Biology;;
+					calc*)   type=Calculator;;
+					chem*)   type=Chemistry;;
+					elec*)   type=Electronics;;
+					geo*)    type=Geology;;
+					math*)   type=Math;;
+					physics) type=Physics;;
+					visual*) type=DataVisualization;;
+				esac
+				type="Education;Science;${type}"
+				;;
+
+			sys)
+				type="System"
+				;;
+
+			www)
+				case ${catmin} in
+					client) type=WebBrowser;;
+				esac
+				type="Network;${type}"
+				;;
+
+			*)
+				type=
+				;;
+		esac
+	fi
+	local slot=${SLOT%/*}
+	if [[ ${slot} == "0" ]] ; then
+		local desktop_name="${PN}"
+	else
+		local desktop_name="${PN}-${slot}"
+	fi
+	local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
+	#local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
+
+	# Don't append another ";" when a valid category value is provided.
+	type=${type%;}${type:+;}
+
+	if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then
+		ewarn "As described in the Icon Theme Specification, icon file extensions are not"
+		ewarn "allowed in .desktop files if the value is not an absolute path."
+		icon=${icon%.*}
+	fi
+
+	cat <<-EOF > "${desktop}"
+	[Desktop Entry]
+	Name=${name}
+	Type=Application
+	Comment=${DESCRIPTION}
+	Exec=${exec}
+	TryExec=${exec%% *}
+	Icon=${icon}
+	Categories=${type}
+	EOF
+
+	if [[ ${fields:-=} != *=* ]] ; then
+		# 5th arg used to be value to Path=
+		ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}"
+		fields="Path=${fields}"
+	fi
+	[[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}"
+
+	(
+		# wrap the env here so that the 'insinto' call
+		# doesn't corrupt the env of the caller
+		insopts -m 0644
+		insinto /usr/share/applications
+		doins "${desktop}"
+	) || die "installing desktop file failed"
+}
+
+# @FUNCTION: make_session_desktop
+# @USAGE: <title> <command> [command args...]
+# @DESCRIPTION:
+# Make a GDM/KDM Session file.  The title is the file to execute to start the
+# Window Manager.  The command is the name of the Window Manager.
+#
+# You can set the name of the file via the ${wm} variable.
+make_session_desktop() {
+	[[ -z $1 ]] && eerror "$0: You must specify the title" && return 1
+	[[ -z $2 ]] && eerror "$0: You must specify the command" && return 1
+
+	local title=$1
+	local command=$2
+	local desktop=${T}/${wm:-${PN}}.desktop
+	shift 2
+
+	cat <<-EOF > "${desktop}"
+	[Desktop Entry]
+	Name=${title}
+	Comment=This session logs you into ${title}
+	Exec=${command} $*
+	TryExec=${command}
+	Type=XSession
+	EOF
+
+	(
+	# wrap the env here so that the 'insinto' call
+	# doesn't corrupt the env of the caller
+	insopts -m 0644
+	insinto /usr/share/xsessions
+	doins "${desktop}"
+	)
+}
+
+# @FUNCTION: domenu
+# @USAGE: <menus>
+# @DESCRIPTION:
+# Install the list of .desktop menu files into the appropriate directory
+# (/usr/share/applications).
+domenu() {
+	(
+	# wrap the env here so that the 'insinto' call
+	# doesn't corrupt the env of the caller
+	local i j ret=0
+	insopts -m 0644
+	insinto /usr/share/applications
+	for i in "$@" ; do
+		if [[ -f ${i} ]] ; then
+			doins "${i}"
+			((ret+=$?))
+		elif [[ -d ${i} ]] ; then
+			for j in "${i}"/*.desktop ; do
+				doins "${j}"
+				((ret+=$?))
+			done
+		else
+			((++ret))
+		fi
+	done
+	exit ${ret}
+	)
+}
+
+# @FUNCTION: newmenu
+# @USAGE: <menu> <newname>
+# @DESCRIPTION:
+# Like all other new* functions, install the specified menu as newname.
+newmenu() {
+	(
+	# wrap the env here so that the 'insinto' call
+	# doesn't corrupt the env of the caller
+	insopts -m 0644
+	insinto /usr/share/applications
+	newins "$@"
+	)
+}
+
+# @FUNCTION: _iconins
+# @INTERNAL
+# @DESCRIPTION:
+# function for use in doicon and newicon
+_iconins() {
+	(
+	# wrap the env here so that the 'insinto' call
+	# doesn't corrupt the env of the caller
+	insopts -m 0644
+	local funcname=$1; shift
+	local size dir
+	local context=apps
+	local theme=hicolor
+
+	while [[ $# -gt 0 ]] ; do
+		case $1 in
+		-s|--size)
+			if [[ ${2%%x*}x${2%%x*} == "$2" ]] ; then
+				size=${2%%x*}
+			else
+				size=${2}
+			fi
+			case ${size} in
+			16|22|24|32|36|48|64|72|96|128|192|256|512)
+				size=${size}x${size};;
+			scalable)
+				;;
+			*)
+				eerror "${size} is an unsupported icon size!"
+				exit 1;;
+			esac
+			shift 2;;
+		-t|--theme)
+			theme=${2}
+			shift 2;;
+		-c|--context)
+			context=${2}
+			shift 2;;
+		*)
+			if [[ -z ${size} ]] ; then
+				insinto /usr/share/pixmaps
+			else
+				insinto /usr/share/icons/${theme}/${size}/${context}
+			fi
+
+			if [[ ${funcname} == doicon ]] ; then
+				if [[ -f $1 ]] ; then
+					doins "${1}"
+				elif [[ -d $1 ]] ; then
+					shopt -s nullglob
+					doins "${1}"/*.{png,svg}
+					shopt -u nullglob
+				else
+					eerror "${1} is not a valid file/directory!"
+					exit 1
+				fi
+			else
+				break
+			fi
+			shift 1;;
+		esac
+	done
+	if [[ ${funcname} == newicon ]] ; then
+		newins "$@"
+	fi
+	) || die
+}
+
+# @FUNCTION: doicon
+# @USAGE: [options] <icons>
+# @DESCRIPTION:
+# Install icon into the icon directory /usr/share/icons or into
+# /usr/share/pixmaps if "--size" is not set.
+# This is useful in conjunction with creating desktop/menu files.
+#
+# @CODE
+#  options:
+#  -s, --size
+#    !!! must specify to install into /usr/share/icons/... !!!
+#    size of the icon, like 48 or 48x48
+#    supported icon sizes are:
+#    16 22 24 32 36 48 64 72 96 128 192 256 512 scalable
+#  -c, --context
+#    defaults to "apps"
+#  -t, --theme
+#    defaults to "hicolor"
+#
+# icons: list of icons
+#
+# example 1: doicon foobar.png fuqbar.svg suckbar.png
+# results in: insinto /usr/share/pixmaps
+#             doins foobar.png fuqbar.svg suckbar.png
+#
+# example 2: doicon -s 48 foobar.png fuqbar.png blobbar.png
+# results in: insinto /usr/share/icons/hicolor/48x48/apps
+#             doins foobar.png fuqbar.png blobbar.png
+# @CODE
+doicon() {
+	_iconins ${FUNCNAME} "$@"
+}
+
+# @FUNCTION: newicon
+# @USAGE: [options] <icon> <newname>
+# @DESCRIPTION:
+# Like doicon, install the specified icon as newname.
+#
+# @CODE
+# example 1: newicon foobar.png NEWNAME.png
+# results in: insinto /usr/share/pixmaps
+#             newins foobar.png NEWNAME.png
+#
+# example 2: newicon -s 48 foobar.png NEWNAME.png
+# results in: insinto /usr/share/icons/hicolor/48x48/apps
+#             newins foobar.png NEWNAME.png
+# @CODE
+newicon() {
+	_iconins ${FUNCNAME} "$@"
+}
+
+fi

sdk_container/src/third_party/portage-stable/eclass/distutils-r1.eclass

@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: distutils-r1.eclass
@@ -46,7 +46,7 @@ case "${EAPI:-0}" in
 	0|1|2|3|4)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	5|6)
+	5|6|7)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
@@ -79,7 +79,8 @@ esac
 if [[ ! ${_DISTUTILS_R1} ]]; then
 
 [[ ${EAPI} == [45] ]] && inherit eutils
-inherit toolchain-funcs xdg-utils
+[[ ${EAPI} == [56] ]] && inherit xdg-utils
+inherit toolchain-funcs
 
 if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
 	inherit multiprocessing python-r1
@@ -97,7 +98,11 @@ if [[ ! ${_DISTUTILS_R1} ]]; then
 
 if [[ ! ${DISTUTILS_OPTIONAL} ]]; then
 	RDEPEND=${PYTHON_DEPS}
-	DEPEND=${PYTHON_DEPS}
+	if [[ ${EAPI} != [56] ]]; then
+		BDEPEND=${PYTHON_DEPS}
+	else
+		DEPEND=${PYTHON_DEPS}
+	fi
 	REQUIRED_USE=${PYTHON_REQUIRED_USE}
 fi
 
@@ -230,13 +235,13 @@ fi
 # @USAGE: [<args>...]
 # @DESCRIPTION:
 # Run setup.py using currently selected Python interpreter
-# (if ${PYTHON} is set; fallback 'python' otherwise).
+# (if ${EPYTHON} is set; fallback 'python' otherwise).
 #
 # setup.py will be passed the following, in order:
 # 1. ${mydistutilsargs[@]}
 # 2. additional arguments passed to the esetup.py function.
 #
-# Please note that setup.py will respect defaults (unless overriden
+# Please note that setup.py will respect defaults (unless overridden
 # via command-line options) from setup.cfg that is created
 # in distutils-r1_python_compile and in distutils-r1_python_install.
 #
@@ -249,7 +254,7 @@ esetup.py() {
 
 	[[ ${BUILD_DIR} ]] && _distutils-r1_create_setup_cfg
 
-	set -- "${PYTHON:-python}" setup.py "${mydistutilsargs[@]}" "${@}"
+	set -- "${EPYTHON:-python}" setup.py "${mydistutilsargs[@]}" "${@}"
 
 	echo "${@}" >&2
 	"${@}" || die "${die_args[@]}"
@@ -390,7 +395,7 @@ _distutils-r1_create_setup_cfg() {
 		#
 		# note: due to some packages (wxpython) relying on separate
 		# platlib & purelib dirs, we do not set --build-lib (which
-		# can not be overriden with --build-*lib)
+		# can not be overridden with --build-*lib)
 		build-platlib = %(build-base)s/lib
 		build-purelib = %(build-base)s/lib
 
@@ -412,7 +417,7 @@ _distutils-r1_create_setup_cfg() {
 			[install]
 			compile = True
 			optimize = 2
-			root = ${D}
+			root = ${D%/}
 		_EOF_
 
 		if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
@@ -582,7 +587,7 @@ distutils-r1_python_install() {
 
 	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
 		_distutils-r1_wrap_scripts "${root}" "${scriptdir}"
-		multibuild_merge_root "${root}" "${D}"
+		multibuild_merge_root "${root}" "${D%/}"
 	fi
 }
 
@@ -739,7 +744,7 @@ distutils-r1_src_prepare() {
 
 distutils-r1_src_configure() {
 	python_export_utf8_locale
-	xdg_environment_reset # Bug 577704
+	[[ ${EAPI} == [56] ]] && xdg_environment_reset # Bug 577704
 
 	if declare -f python_configure >/dev/null; then
 		_distutils-r1_run_foreach_impl python_configure
@@ -797,7 +802,7 @@ _distutils-r1_check_namespace_pth() {
 
 	while IFS= read -r -d '' f; do
 		pth+=( "${f}" )
-	done < <(find "${ED}" -name '*-nspkg.pth' -print0)
+	done < <(find "${ED%/}" -name '*-nspkg.pth' -print0)
 
 	if [[ ${pth[@]} ]]; then
 		ewarn "The following *-nspkg.pth files were found installed:"