diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-4.3_p5 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-4.3_p5
index 6b81a5e01a..71d405e73d 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-4.3_p5
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-4.3_p5
@@ -8,4 +8,4 @@ RDEPEND=>=sys-libs/ncurses-5.2-r2
 SLOT=4
 SRC_URI=mirror://gnu/readline/readline-4.3.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-001 ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-002 ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-003 ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-004 ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-005 mirror://gnu/readline/readline-4.3-patches/readline43-001 mirror://gnu/readline/readline-4.3-patches/readline43-002 mirror://gnu/readline/readline-4.3-patches/readline43-003 mirror://gnu/readline/readline-4.3-patches/readline43-004 mirror://gnu/readline/readline-4.3-patches/readline43-005
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=5ffd12e120de58eef91c8c514a491ff9
+_md5_=e94af1cf3a5ee4f7f4a1e2d2d9d0cf87
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-5.2_p14 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-5.2_p14
index ce15d9a5da..fd17f8ea85 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-5.2_p14
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-5.2_p14
@@ -8,4 +8,4 @@ RDEPEND=>=sys-libs/ncurses-5.2-r2
 SLOT=5
 SRC_URI=mirror://gnu/readline/readline-5.2.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-001 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-002 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-003 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-004 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-005 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-006 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-007 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-008 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-009 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-010 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-011 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-012 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-013 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-014 mirror://gnu/readline/readline-5.2-patches/readline52-001 mirror://gnu/readline/readline-5.2-patches/readline52-002 mirror://gnu/readline/readline-5.2-patches/readline52-003 mirror://gnu/readline/readline-5.2-patches/readline52-004 mirror://gnu/readline/readline-5.2-patches/readline52-005 mirror://gnu/readline/readline-5.2-patches/readline52-006 mirror://gnu/readline/readline-5.2-patches/readline52-007 mirror://gnu/readline/readline-5.2-patches/readline52-008 mirror://gnu/readline/readline-5.2-patches/readline52-009 mirror://gnu/readline/readline-5.2-patches/readline52-010 mirror://gnu/readline/readline-5.2-patches/readline52-011 mirror://gnu/readline/readline-5.2-patches/readline52-012 mirror://gnu/readline/readline-5.2-patches/readline52-013 mirror://gnu/readline/readline-5.2-patches/readline52-014
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=390d33220af644a97c7ff37bab9e5820
+_md5_=232c0142cbc465f913e15a151df9e645
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-6.2_p5-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-6.2_p5-r1
index b86df7641b..0e08af5ce7 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-6.2_p5-r1
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-6.2_p5-r1
@@ -10,4 +10,4 @@ RDEPEND=>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 SLOT=0
 SRC_URI=mirror://gnu/readline/readline-6.2.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/readline62-001 ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/readline62-002 ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/readline62-003 ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/readline62-004 ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/readline62-005 mirror://gnu/readline/readline-6.2-patches/readline62-001 mirror://gnu/readline/readline-6.2-patches/readline62-002 mirror://gnu/readline/readline-6.2-patches/readline62-003 mirror://gnu/readline/readline-6.2-patches/readline62-004 mirror://gnu/readline/readline-6.2-patches/readline62-005
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=278996f998c95b7e303589e5ef12a5bb
+_md5_=fab39484798a7686ecad8bb7ef406e63
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-6.3_p8-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-6.3_p8-r1
index c7a2af464a..54bcd49c84 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-6.3_p8-r1
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-6.3_p8-r1
@@ -10,4 +10,4 @@ RDEPEND=>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 SLOT=0
 SRC_URI=mirror://gnu/readline/readline-6.3.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-001 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-002 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-003 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-004 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-005 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-006 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-007 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-008 mirror://gnu/readline/readline-6.3-patches/readline63-001 mirror://gnu/readline/readline-6.3-patches/readline63-002 mirror://gnu/readline/readline-6.3-patches/readline63-003 mirror://gnu/readline/readline-6.3-patches/readline63-004 mirror://gnu/readline/readline-6.3-patches/readline63-005 mirror://gnu/readline/readline-6.3-patches/readline63-006 mirror://gnu/readline/readline-6.3-patches/readline63-007 mirror://gnu/readline/readline-6.3-patches/readline63-008
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=4b3048576f8756d1838e5b92756974f8
+_md5_=eca30b4187e2163398a6cc48c4373d46
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-6.3_p8-r2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-6.3_p8-r2
index d864493049..02450489a7 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-6.3_p8-r2
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-6.3_p8-r2
@@ -3,11 +3,11 @@ DEPEND=>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 DESCRIPTION=Another cute console display library
 EAPI=4
 HOMEPAGE=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-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
+IUSE=static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+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
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r7 )
 SLOT=0
 SRC_URI=mirror://gnu/readline/readline-6.3.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-001 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-002 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-003 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-004 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-005 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-006 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-007 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-008 mirror://gnu/readline/readline-6.3-patches/readline63-001 mirror://gnu/readline/readline-6.3-patches/readline63-002 mirror://gnu/readline/readline-6.3-patches/readline63-003 mirror://gnu/readline/readline-6.3-patches/readline63-004 mirror://gnu/readline/readline-6.3-patches/readline63-005 mirror://gnu/readline/readline-6.3-patches/readline63-006 mirror://gnu/readline/readline-6.3-patches/readline63-007 mirror://gnu/readline/readline-6.3-patches/readline63-008
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=6fb85c9ebaae36cd6ee74e55376b964f
+_md5_=4049b82ac116f906ee2aa0359501165b
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-7.0_alpha b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-7.0_alpha
new file mode 100644
index 0000000000..a2ef16be05
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-7.0_alpha
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
+DEPEND=>=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r7 ) virtual/pkgconfig
+DESCRIPTION=Another cute console display library
+EAPI=5
+HOMEPAGE=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
+IUSE=static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+LICENSE=GPL-3
+RDEPEND=>=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r7 )
+SLOT=0/7
+SRC_URI=ftp://ftp.cwru.edu/pub/bash/readline-7.0-alpha.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=cddf26803f123ee5fd27b184b97b17c3
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/ChangeLog b/sdk_container/src/third_party/portage-stable/sys-libs/readline/ChangeLog
index 77ae408e87..293be86adc 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/readline/ChangeLog
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/readline/ChangeLog
@@ -1,6 +1,42 @@
 # ChangeLog for sys-libs/readline
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.220 2015/01/21 11:50:44 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.231 2015/07/13 07:18:09 vapier Exp $
+
+  13 Jul 2015; Mike Frysinger <vapier@gentoo.org> readline-6.3_p8-r2.ebuild:
+  Mark sparc stable #548756.
+
+*readline-7.0_alpha (13 Jul 2015)
+
+  13 Jul 2015; Mike Frysinger <vapier@gentoo.org> +readline-7.0_alpha.ebuild:
+  Version bump.
+
+  30 May 2015; Mikle Kolyada <zlogene@gentoo.org> readline-6.3_p8-r2.ebuild:
+  ppc stable wrt bug #548756
+
+  27 May 2015; Jeroen Roovers <jer@gentoo.org> readline-6.3_p8-r2.ebuild:
+  Stable for PPC64 (bug #548756).
+
+  27 May 2015; Jeroen Roovers <jer@gentoo.org> readline-6.3_p8-r2.ebuild:
+  Stable for HPPA (bug #548756).
+
+  26 May 2015; Mike Frysinger <vapier@gentoo.org> metadata.xml,
+  readline-6.3_p8-r2.ebuild:
+  Add USE=utils to control install of rlfe util.
+
+  23 May 2015; Mikle Kolyada <zlogene@gentoo.org> readline-6.3_p8-r2.ebuild:
+  ia64 stable wrt bug #548756
+
+  22 May 2015; Mikle Kolyada <zlogene@gentoo.org> readline-6.3_p8-r2.ebuild:
+  arm stable wrt bug #548756
+
+  22 May 2015; Mikle Kolyada <zlogene@gentoo.org> readline-6.3_p8-r2.ebuild:
+  x86 stable wrt bug #548756
+
+  21 May 2015; Mikle Kolyada <zlogene@gentoo.org> readline-6.3_p8-r2.ebuild:
+  amd64 stable wrt bug #548756
+
+  21 May 2015; Matt Turner <mattst88@gentoo.org> readline-6.3_p8-r2.ebuild:
+  alpha stable, bug 548756.
 
 *readline-6.3_p8-r2 (21 Jan 2015)
 
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/readline/Manifest
index 5da6005dd4..117564ef30 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/readline/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/readline/Manifest
@@ -1,15 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX readline-5.0-no_rpath.patch 363 SHA256 59df6107772d1a93550bacc267a2c00f9dfd6d5380b8497d8fd756a7191b9e4b SHA512 c0344c5b831433ad3a8499a91d36615e849a9b520f8ca35cd9cae6d5bc55729adbf97d003e335d210cb3806b2f39af273b4b5f98380dac371dc184053e245bb2 WHIRLPOOL c0d2fe9d1d1f36cf89279f315c373a7385d255ebbeab8ebf1ede7b99196660611499c7db85554b036ad3df4f0b4375558b1d1ce7cbae5f5731172181f7d167ac
 AUX readline-5.2-no-ignore-shlib-errors.patch 688 SHA256 2c585c4e2d69d6b91157f378a3dd11cb49beefab808eef3350cf1b8357b2efc6 SHA512 23f88aee11a9ebe15406293695f3de2a7a6c52b8b138c199c64f9dbb9b59d9063f12f8693656e61611e72f6298f7d919016cd240434e78ea2232876690a8b738 WHIRLPOOL ae87d544fa32dbd2b6f27f164dd4e6d0e8a3f399d4a9bde81bcb631985c6e69db11705dc372c21a4f9d3a26cf4279023aeae97fd0d243ca8e1c0e547b59084a4
 AUX readline-6.2-rlfe-tgoto.patch 379 SHA256 6bd5db93cba1cdf751b424a25a1f08c87bae2b42ff59c6c0aa34d659115cbfc1 SHA512 1d2c3aafc949d92fdf6abbee60a60c80f0327f81694d5d8f3a166f1c24d37346caca3e72c9971106b96b2758a9a01269346954fe20bc381eb9da2e6a2737fc3c WHIRLPOOL daab79312136fa728ea77839d6ad663554055e2acd7acff036b8d168f4a0791d57503aa196be4f834caf32ba72ec73c3125adb9b11b5d6898bb796016e83175a
-AUX readline-6.3-fix-long-prompt-vi-search.patch 669 SHA256 787f9ed371c550aeecfe5c57e250aa9bfc101dfccb19437fbca135e19610ef9b SHA512 19e8a342c305e6f68e13bf3eec619971a5bb8f2a542838a28f72e77f672f5e8e9f501f446facae3528e14646e6e41a29546837f0407a1ddaddf20244914d6d9d WHIRLPOOL 5636b9d0638be1b214b1710d42b7b812e8b8714e9aa0546be6d187992e6c0dc0fe513a11dd9386c1d8949c792775fc26c8d8cbe0b44ca5cba6854089332f4513
+AUX readline-6.3-fix-long-prompt-vi-search.patch 736 SHA256 42177ae7f747eeac432c60d67d31d6903edb919d0fd6bf31137ff4459061d99e SHA512 ad5bb44ba00f6f5e355b95078209e2e51f8d8ba9a924d00ef6aa3286e09c15fe0024efa0817f9e6d86b7aecb73150fcd69d0051a0f7fb37475921478f62ce0e0 WHIRLPOOL 117e007fa59669f73c69dd9acb02896231fb58524feab8bfeded9538dc9d4106ac678279e31c48cccb41a14c281aee9a94f5943d540fdddd99f768d53ee24a67
 AUX readline-6.3-read-eof.patch 1913 SHA256 508323403e752296a63619e9a3fe4fdcd233f368f0f9944ccdc2c6bd69eebc2c SHA512 99728e35d64b466e2bea570412eec719c70841d205a5190c0000bcae55cf3ac2d659ae18e57b4c332525261d83e160054800cd89f4009ce3c76d1c3b4ac27223 WHIRLPOOL beda5876ea05f69f0b2e8005c60dca8290cc7943475352b6c26ab656273290d06a07ae62f28e3fc21c3c31ae628c744a6e5a8ebbc5328fa896f215d419dea270
 DIST readline-4.3.tar.gz 961662 SHA256 eeaf6f050b9f515b0636e5b4f2c153f9ef78e9061ee5dd74f612fab54c77bf88 SHA512 4dbc4d9f16a453f8cf6adefb5723b0f35ef79b8db7dcdfcdd2d6465cb62ca961035e5e9547bfa46d4cb1370d738b042e0e10f9233c3751925c6bccab41e7d182 WHIRLPOOL bad0852f5a97b747c79923bbef29dc48bb7730b96ba86dd444f63d9ee78fe0dda3edd249607dbaf98b3a8932b69cbcf0f79592cfc3757887791e38673dccb352
 DIST readline-5.2.tar.gz 2037705 SHA256 12e88d96aee2cd1192500356f0535540db499282ca7f76339fb4228c31249f45 SHA512 74318b32c56e888716bda2507228ecc374a24e85b2faeec4778227a9f04eb19de1fc8468c78746954c84f9e616a06dd0f8a4332ba4b438fefb7e222699baa379 WHIRLPOOL 8641abf42316ab278207c0a25d9155d4d4fddaf0e704255b40708875b9f31bd3e6caf903550783c15b160bd2b86ffc129b2eb7a1fb4a641d8d58edc3b53145c3
 DIST readline-6.2.tar.gz 2277926 SHA256 79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381 SHA512 fa5b4f1b6f81bc0b3be0739adb06dab0668603ff256fe62b59ebfe21d5a9e340a758a8eef569df8c4c4ecb86cdd9698a6dabc2ee8c70a769de2bd5930c32ff59 WHIRLPOOL 5d92645085f253206c16533e3cb35bb382d6fe616bf2144feb06f9ffb9b4d7cc25ceaa846b98f17aa442552a0e80642a62d57fe20982e0ed8fdefb75c2f9bbf0
 DIST readline-6.3.tar.gz 2468560 SHA256 56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43 SHA512 f70efaf46d570b85c7637172b0ee2eb9a4aa73ba38a62bb45075e665929d9701b96fba0aea6c767fd9a2a0d39dfe8e70ab06da08f8524aee76a7c502f370a401 WHIRLPOOL 7c68627559890dbebf1394b911cfd4675ec8862b84d4e067a207dd37a0a94482c8d92216195df2873bcdf03a0a86150663a9604cd65a0d78363376bc8ee4cfda
+DIST readline-7.0-alpha.tar.gz 2929686 SHA256 415d6769f2b93db61f01ed3cdb34ba1878e19c69320570546f16ef543cb79632 SHA512 a3240668c2b31e4f171b034341bac7e0e0348869c9d59179724e036bb4cee57675c4aced2da53d7bca2d32ae710f0f6528bbc0af9fb6e3d1943031ee12cf5614 WHIRLPOOL e051293f8147e0c1882ae958b7c8b84dd1ffb2cf68dcb38a349c794f788d4691e8152dc56d5243ce34da52e2685bed71d674070a40db51ddd14d115a0ad5da39
 DIST readline43-001 1126 SHA256 787244afefceeaf8bfbdc95eef0c4d163ab05ecf178bb631fff287354df0d955 SHA512 1bfcaf9fd36d154230682ef66a9561281822f09629f9923acfbacbaafd650974b4d94267e1bf74ab4a66f0e2da95e64894c78373c82bee593bd9afbae4af58bc WHIRLPOOL 080c0cffb0637bba2f6819524291c8efd1832b42b7ca619fda551b00ed82558d9c03a6f739b350b8a1de2c32e6ab92fd86137a9620473439c5b6ced6d3a06f91
 DIST readline43-002 738 SHA256 3fd4694c4043b61010c44778ed61581073ac5ddee53436b0e4e1ad2bbe4da226 SHA512 546a7bfab27dd0b77f8b0683b82358a295d47e4e249e01d2e49612a2f113c18580c8276b17451e1edab61a26ddcff0267457a804120d5e0052dfe8e88632ddd2 WHIRLPOOL d3b43145a4ed207f353c5b95b52bdb81be31bd5b077ad60152799333ca582c7524c5587a4e0d9a0fc9246a114552f0c26933d2bc8f60e9de2536a8b6ec9f2cda
 DIST readline43-003 2202 SHA256 346120970e3860c776e3cf5fd78e4f09b0d326a3b633a508f35f3f0b56f4412b SHA512 fbabbe5a11c2a17dd0cb47adfb40940c860069f0e99b1478546b0351471663094d032c8049e1a2ca060f4b51835bb6a824276e1864a627711e0805268386cb8e WHIRLPOOL 076d101812e7a98d445fd447d816fd0b15c9690869f4a567d76287c495c257f85e4e79f11f7e6e8354093613ca1c0a758514672cec98d303279daf597dee2577
@@ -42,27 +40,11 @@ DIST readline63-005 1664 SHA256 877788f9228d1a9907a4bcfe3d6dd0439c08d728949458b4
 DIST readline63-006 1982 SHA256 5c237ab3c6c97c23cf52b2a118adc265b7fb411b57c93a5f7c221d50fafbe556 SHA512 e9fbfa38d7b03ab2aff2e9e48918b85b4b67a729862ee47d1cc8e0aeb90c3224394a79f68829951e1377cae65742aa5385eae865f75e9c0b2e2abde42889431c WHIRLPOOL 7b88ad9fcad9eee0762d881307d2f865c66a9ee246bc1a648d6203677fc307759ca7ee216fb632114d3da76ca27a67222aefd830bcf99ee9a96d1ba2f2105290
 DIST readline63-007 1428 SHA256 4d79b5a2adec3c2e8114cbd3d63c1771f7c6cf64035368624903d257014f5bea SHA512 abee331894846b360203a521d9a66fa02c03214120d5cafbd1cb4d680bd7bbef14321ae845dd67f7b5e8c87322801fd96fc9a5fd0ae026b41d98dc24a8949854 WHIRLPOOL fc9d866a6e0f0c2a2f752c65e6fcae56a1b0e1b5cef45154ff51b5d1b49fc75ffaa30bdf90c221fb6493381b9d67eb20168bdfd273fa0dd89602f18680bb3e5f
 DIST readline63-008 1452 SHA256 3bc093cf526ceac23eb80256b0ec87fa1735540d659742107b6284d635c43787 SHA512 8e30bbca3aa5cea8c2ee511abe0ec8f131608d74fe5ab24d68bcf452267f0f97446ed6e7cd482360876ce6c027280e4f4450cae05eb18f56046240f4c224841c WHIRLPOOL 94d9371e6ca35e72565c1990e0ec8bedf8a141f0a3d061e4928f6184c3ef4a4b472f4278d443b990a53977ad6f3f7bdbf41e51a999202b48414df3a946bb9796
-EBUILD readline-4.3_p5.ebuild 1591 SHA256 a0f153f8c647359666a214d47647514853a17c2dde8a5a52e0ff934cebb55b4a SHA512 0fe334f4cf3e1a4b0d00bcea4bbdac0664db730462e7dfc8fc231a70795e05fa97285ae301b0b0aa01154cd9f6def741bc2e21a7b82831daa51b3f2ff552a439 WHIRLPOOL 87337d29334668dba75f965228acbd3d850059f0b0a3a34282d4c263b418ee2f99dc0eac1ccef59a09c71b4ba2ee13e5924cfdf48d3a514d7a0732b82bad261c
-EBUILD readline-5.2_p14.ebuild 1905 SHA256 170279df1909b218b3c9ff6b9cc3e315b1a72b8f1a6b5615010e903d67c65259 SHA512 1ad3ccb540e9a50c5bcc6e37689b6534371d4038db57cefb826eb112cf8a28ac1b647cead266dbf5b13a14b0da541a4a3e42343ac67461eefae5670adfec947f WHIRLPOOL 9a72cccb826deffed24f144ec1aeceb3b2c5194a0f072bffba1de42eba0708931d9eb75482847316803796ddc6afa5bd0ca1ce71edd4aef0fc0d2cecc9be1a30
-EBUILD readline-6.2_p5-r1.ebuild 4138 SHA256 5dd233e4e9e1d66aabdba6631551eaa174af1af70c5d0110ac8c9784150085ec SHA512 c281c67b15a590a9c9aa0c3a84bdb151ff7fdf3efe33f4a30d4e63ea6cbb29b48c820fbd0b2a233aa8b2349379b464c119b5c793854e36c4b012b53ba986a87d WHIRLPOOL 588bac8a9c53fce242166a6c89644aa42396b2d5922cdcf0de03decdd13d1ce9f1ec4b97259a642edf5f2d520366ef72f088ff5abdc9fa410e02c8054b96836d
-EBUILD readline-6.3_p8-r1.ebuild 4562 SHA256 d77fcecf028f4bbf80e976675051d2401e91af11848d37ebf3630dccebeec397 SHA512 a4c021c3339ac6b34212dcfd19d5abd4028c28aba2e9d0c15c9313832e14aefe1f63545a1e86405fa7ff7f89be08a02e7cdc325b1d4d116a85fc17187d7ef5ad WHIRLPOOL 5f7abb327b5cee3af7db5683dac9956e6c0e633602ec0483ac50e68418b185af7f19b78e6118956111a17891f857819910dfd593f9aecb4c5fdaf370eca756df
-EBUILD readline-6.3_p8-r2.ebuild 4609 SHA256 af02922367f70fbb051d5e601c71916e7a880d050e643dfabe46ea605b764dc0 SHA512 1822c8d0de6217bdc96487b73b9c46de79617685dbf42b53334004b3e39c1faa9239fbee19955bd5cc704b57126a25b164897f0a8281043474b59e6b698bb615 WHIRLPOOL fda8e77e7b6aa3368f958c71f753db5002800c509a2f2d2347707d89ece4bb364b97dc6cd350ec0c071224df0f309f37533713a08134da029d950ced9d8c06a5
-MISC ChangeLog 29715 SHA256 7002988928a858554f228a4714e2994e897ea7c9ccc549192a54c6b489e61ace SHA512 dd94ad1d76510455e786da2f65a08ddc216db02709f79b5e3700e9ddcc807db3feee7e2de2fcebd37d04dd318ea8dc2e68b0a1073939788bec8f898eebfa547e WHIRLPOOL 252d2254f13e93cd3d3481f0fc4736fcce0139ff9c35c108bdebccdbe86e661164637de9cd95e739e5c16a6152090a696138a3d645bc5a3f2e9533fb16e40c1f
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJUv5KVAAoJEPiazRVxLXTFMAYP/jlQfaKzUHALx9X5YIj0jJlZ
-1t1AYdxRv7TYZQVGhg5RRcyP/CNT0JRnZv8A1y6DNzSve1oQ1JThPsa663WvYvZS
-5prkyozNPU+pYCSP9uJ1T3uJfv+EH7pjihLn9KGwWFu7vcx4q7D+IrTMlWzSu7mz
-McBSDcdQ3Tic1/tmlMMdGQ6wVwAfxEHnX04vy6cN1Gaa2/AsVZhmdmWwgPJFXwcF
-yQQ1Mc/856+R/b+/PBbmTfYhRAyMxH/LZSPv5Wxeoml7mvki0yHWZqYQp0FwUOgq
-dzANZDltoC1CEnEOzQ/bS9dlr4z2qvFPxmxSqRjdBUB54WcTWugLzXy0DcCrdkHa
-nEa/+QSlKbXlTQ5uUQ6nnM+AmH0s5A2QhEO2VrnnPi7FKutiY0tUlAQOcCuedKYG
-CmTBdueGkGh6GQ1U8DH8snVSD7hNcRi/+dv7R95B+U634Paits7R7XelmyB7T5FE
-UWim7FhAO3VrhyuxXO+FyymKYkkPF8nA6BAGntn8jTu4703zkBx9nEKgmdwXBefI
-kBaiBMDJfjQ4V8o8jRXMluZ7NlVptDHA2Wy9RAkBKEkcJPAPbjNNvz9mcKrM4TtX
-Awy3zW2EzEVJchuX4jLw92c36dFyaoj+ehuV7uscWkrRGAfFnGGp6EMUZguQ7oVu
-RE1iey1ac73THi4qNMaM
-=IRq5
------END PGP SIGNATURE-----
+EBUILD readline-4.3_p5.ebuild 1483 SHA256 36cf6e303de607dd8742e9342494271e474aca0e4b3cbc8270e64f0bb6116d38 SHA512 7c7535161e5b459a607caea228aa3e46cc950ee48a1eb4efd38d73486e2050122315db69f5b49962b5bd3b311e5c2dfb15d87b0be7095b6fda7b4d69d70b9062 WHIRLPOOL 5a75f91f7af6944fb5e1df02d1089a68a3e5a83c1f562584b2f3c46db5dd7f45d23022595da17ebfeee111fd59053a4db61574b387d5720802a00fbb26f28538
+EBUILD readline-5.2_p14.ebuild 1796 SHA256 fc8834104b6607d53fc83e720a440e0b490d908f21bce93c0530ca8b94344fe5 SHA512 8a2278b6d10e329fbc60b95a02823c0cba7a41bc0e1c2a089c9d72f23cfb71330f2659733bd7ab3329b2d921d7fb977ed1abcb154b23538aee7cbc04f5739055 WHIRLPOOL 29b5955fa13814643ef779ea31976fb40ca80e619dfc6fcd9d47684c6d1075c03139bd2f8800d3a9254eb246c0ba710c18aadbe6dbf9237f616b41bff3fed689
+EBUILD readline-6.2_p5-r1.ebuild 4027 SHA256 da9d848f39cba97da60a4e2d108cab1e477f5ea0888a7bcc593e7dc25de73fd3 SHA512 f2f796258fd00277ab3fd26457de30d9a7077da62c5f70ad3ef76237983c5aec4b2499e80efad18274656eb8daf7059bf8b10098af9d344286545718fc522e59 WHIRLPOOL 280c25116139fb33e12ef5de78d5d10dd5d74ece567916a9860ac41722930f995a0bc7140063504dca09d854b36c853674ae0f5c6f4319a5a48c59466b961752
+EBUILD readline-6.3_p8-r1.ebuild 4446 SHA256 d73939cde41967752bcb95c22d9fbf80342a3aa4e7467e177df2a32a47201123 SHA512 ba592cef45f737b97d888bd34b3848474abcedf95cb513713bda2e4dae14b6c028e6b2277152a1581dafa3cc2812501461d0f5a5019c3ecdd62f5fbe6dd5147e WHIRLPOOL 4f678688c7f39158457f4a3b0b55a64065e7e4d61a2c1bcec2de3b749dd579b0a4863992ce9651869f7c0a26096cf17f3ffc27000b72ce5dc70c6aa0e920ce93
+EBUILD readline-6.3_p8-r2.ebuild 4525 SHA256 cfd6a88954892a0cab7c7d41fc9045e61e8b3d6c3651d30dc5242f40b0cd57b2 SHA512 3c2b89e952e62242d56453da1e3046045bb30dbf357d1011a7361817bb456c1edf16f41b342279dafd18d48eaa3f8302c0c31032bc6ea60aceca7ee23031664b WHIRLPOOL ec07c935f5dcd883f20acaf80dcf61dcfc2531393b54c87e167cd1caaf7e58e0c3802654d501a5bfa2a7ef7ec75894463531b232440f2ce44f0a3e5d6a133049
+EBUILD readline-7.0_alpha.ebuild 4566 SHA256 2a47fcea88b7d5aa27aad7aa378477918e29ddb2bff228bffb59e8c37b0bfdde SHA512 0f7c233f093a4291ba3849370ca3e9d772cca990c345dfbbecdc03cbe5af71e97f7351b7c5bee161ebb3e7133960f4513091015e88f05588d2a95eb65e297bd1 WHIRLPOOL 247a6dc58e65a26286496ee4e923b29379271ef0b4832253de5a92251a2120537cbe881fe85ab61ba34dfee6105ec5f8a9ba1994e38a57b30c47cbb4c0878790
+MISC ChangeLog 30949 SHA256 c5b14aa54438b8a51d21198b6e9d57759cc88d5be3724e8e70cb472707dd8541 SHA512 d6d1fd54d62e4b69742153c23d8bf7026644daa30f4f405ee6fd2766528bbd530ebfe77778d14c7aa6a79ca1edefac5edf6be9e2f0e641a7dfac7a8d9ced5bf2 WHIRLPOOL 3cb3cd7617334cb3dd169960ab4ad9a456fe0dc9b12610e387ee21c5b5e6ff2902afa429957433e2724b9e2709bf9c8dd910d0c706fdc43007c5af043675901c
+MISC metadata.xml 309 SHA256 7c83ec0354dd516ee3f52b82272ad328db98053fb70455f54de9f5156693c745 SHA512 78531c577a53db9540f4b037d1172d4704ad2b34d34b60f5d64f9ca7af5cb371e0cbddbc8a5626d55d13c7e4468aa2c71dde69ac697d6e6f664d2bd5c58f4e40 WHIRLPOOL 069f2d74eb4dab1ea79c69799a6f0030711f146134cb9fedff975b18fefd45a611d8c24e2c8424acbcc117be28a324aa7c571d74c17683408eac1d91115c0678
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/files/readline-6.3-fix-long-prompt-vi-search.patch b/sdk_container/src/third_party/portage-stable/sys-libs/readline/files/readline-6.3-fix-long-prompt-vi-search.patch
index 8bf2994deb..23d785054e 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/readline/files/readline-6.3-fix-long-prompt-vi-search.patch
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/readline/files/readline-6.3-fix-long-prompt-vi-search.patch
@@ -1,3 +1,5 @@
+https://lists.gnu.org/archive/html/bug-bash/2014-08/msg00082.html
+
 From 2774192e93991e3d85ccc37c714aa018e442af6d Mon Sep 17 00:00:00 2001
 From: Dylan Cali <calid1984@gmail.com>
 Date: Sat, 23 Aug 2014 02:26:05 -0500
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-libs/readline/metadata.xml
index 96a2d58636..6172776f3e 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/readline/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/readline/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>base-system</herd>
+	<herd>base-system</herd>
+	<use>
+		<flag name="utils">Install rlfe (ReadLine Front-End) helper tool -- a wrapper program for making any stdin use readline</flag>
+	</use>
 </pkgmetadata>
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-4.3_p5.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-4.3_p5.ebuild
index eae94580e0..986d7449da 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-4.3_p5.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-4.3_p5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.3_p5.ebuild,v 1.2 2009/10/03 23:38:24 vapier Exp $
+# $Id$
 
 # This version is just for the ABI .4 library
 
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-5.2_p14.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-5.2_p14.ebuild
index bfee929b3a..89f18029e8 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-5.2_p14.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-5.2_p14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.2_p14.ebuild,v 1.2 2010/01/05 00:54:25 vapier Exp $
+# $Id$
 
 # This version is just for the ABI .5 library
 
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-6.2_p5-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-6.2_p5-r1.ebuild
index 7ae50e18fa..36ffdf456f 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-6.2_p5-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-6.2_p5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.2_p5-r1.ebuild,v 1.19 2014/10/27 01:53:06 vapier Exp $
+# $Id$
 
 EAPI="4"
 
@@ -77,7 +77,7 @@ src_prepare() {
 src_configure() {
 	# fix implicit decls with widechar funcs
 	append-cppflags -D_GNU_SOURCE
-	# http://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
+	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
 	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
 
 	# Make sure configure picks a better ar than `ar`. #484866
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-6.3_p8-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-6.3_p8-r1.ebuild
index 96a2236107..98588d90f9 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-6.3_p8-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-6.3_p8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.3_p8-r1.ebuild,v 1.2 2014/12/29 07:42:08 polynomial-c Exp $
+# $Id$
 
 EAPI=4
 
@@ -77,7 +77,7 @@ src_prepare() {
 src_configure() {
 	# fix implicit decls with widechar funcs
 	append-cppflags -D_GNU_SOURCE
-	# http://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
+	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
 	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
 
 	# Make sure configure picks a better ar than `ar`. #484866
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-6.3_p8-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-6.3_p8-r2.ebuild
index 22aef253cb..ad21882af2 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-6.3_p8-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-6.3_p8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.3_p8-r2.ebuild,v 1.1 2015/01/21 11:50:44 polynomial-c Exp $
+# $Id$
 
 EAPI=4
 
@@ -34,8 +34,8 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-3"
 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"
-IUSE="static-libs"
+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"
+IUSE="static-libs utils"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}]
 	abi_x86_32? (
@@ -78,7 +78,7 @@ src_prepare() {
 src_configure() {
 	# fix implicit decls with widechar funcs
 	append-cppflags -D_GNU_SOURCE
-	# http://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
+	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
 	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
 
 	# Make sure configure picks a better ar than `ar`. #484866
@@ -111,7 +111,7 @@ multilib_src_configure() {
 		--with-curses \
 		$(use_enable static-libs static)
 
-	if multilib_is_native_abi && ! tc-is-cross-compiler ; then
+	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
 		# code is full of AC_TRY_RUN()
 		mkdir -p examples/rlfe || die
 		cd examples/rlfe || die
@@ -123,7 +123,7 @@ multilib_src_configure() {
 multilib_src_compile() {
 	emake
 
-	if multilib_is_native_abi && ! tc-is-cross-compiler ; then
+	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
 		# code is full of AC_TRY_RUN()
 		cd examples/rlfe || die
 		local l
@@ -141,7 +141,7 @@ multilib_src_install() {
 	if multilib_is_native_abi ; then
 		gen_usr_ldscript -a readline history #4411
 
-		if ! tc-is-cross-compiler; then
+		if use utils && ! tc-is-cross-compiler; then
 			dobin examples/rlfe/rlfe
 		fi
 	fi
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-7.0_alpha.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-7.0_alpha.ebuild
new file mode 100644
index 0000000000..d57eb81b4c
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-7.0_alpha.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal
+
+# Official patches
+# See ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/
+PLEVEL=${PV##*_p}
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+	[[ ${PLEVEL} -eq 0 ]] && return 1
+	local opt=$1
+	eval set -- {1..${PLEVEL}}
+	set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
+	if [[ ${opt} == -s ]] ; then
+		echo "${@/#/${DISTDIR}/}"
+	else
+		local u
+		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
+			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
+		done
+	fi
+}
+
+DESCRIPTION="Another cute console display library"
+HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
+case ${PV} in
+*_alpha*|*_rc*) SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" ;;
+*) SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)" ;;
+esac
+
+LICENSE="GPL-3"
+SLOT="0/7"  # subslot matches SONAME major
+#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"
+IUSE="static-libs utils"
+
+RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r7
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+	epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
+	epatch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
+
+	# Force ncurses linking. #71420
+	# Use pkg-config to get the right values. #457558
+	local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs)
+	sed -i \
+		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
+		support/shobj-conf || die
+	sed -i \
+		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
+		examples/rlfe/configure || die
+
+	# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
+	# objformat for years, so we don't want to rely on that.
+	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
+
+	ln -s ../.. examples/rlfe/readline # for local readline headers
+}
+
+src_configure() {
+	# fix implicit decls with widechar funcs
+	append-cppflags -D_GNU_SOURCE
+	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
+	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
+
+	# Make sure configure picks a better ar than `ar`. #484866
+	export ac_cv_prog_AR=$(tc-getAR)
+
+	# Force the test since we used sed above to force it.
+	export bash_cv_termcap_lib=ncurses
+
+	# Control cross-compiling cases when we know the right answer.
+	# In cases where the C library doesn't support wide characters, readline
+	# itself won't work correctly, so forcing the answer below should be OK.
+	if tc-is-cross-compiler ; then
+		export bash_cv_func_sigsetjmp='present'
+		export bash_cv_func_ctype_nonascii='yes'
+		export bash_cv_wcwidth_broken='no' #503312
+	fi
+
+	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
+	# so we can re-use the config cache file between the two.
+	append-ldflags -L.
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--cache-file="${BUILD_DIR}"/config.cache \
+		--docdir=/usr/share/doc/${PF} \
+		--with-curses \
+		$(use_enable static-libs static)
+
+	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
+		# code is full of AC_TRY_RUN()
+		mkdir -p examples/rlfe || die
+		cd examples/rlfe || die
+		ECONF_SOURCE=${S}/examples/rlfe \
+		econf --cache-file="${BUILD_DIR}"/config.cache
+	fi
+}
+
+multilib_src_compile() {
+	emake
+
+	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
+		# code is full of AC_TRY_RUN()
+		cd examples/rlfe || die
+		local l
+		for l in readline history ; do
+			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname)
+			ln -sf ../../lib${l}.a lib${l}.a
+		done
+		emake
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi ; then
+		gen_usr_ldscript -a readline history #4411
+
+		if use utils && ! tc-is-cross-compiler; then
+			dobin examples/rlfe/rlfe
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc USAGE
+	dohtml -r doc/.
+	docinto ps
+	dodoc doc/*.ps
+}
+
+pkg_preinst() {
+	preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5} #29865
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5}
+}